From 913f2e68dedea16a7ad6bfad28c02309b6bd379c Mon Sep 17 00:00:00 2001 From: Jeroen Ooms Date: Fri, 1 Nov 2024 23:08:21 +0100 Subject: [PATCH] libssh2 bump (#13) --- mingw-w64-libssh2/PKGBUILD | 19 ++++++++++--------- mingw-w64-libssh2/fix-pkgconfig.patch | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/mingw-w64-libssh2/PKGBUILD b/mingw-w64-libssh2/PKGBUILD index 0d8af28..5d424a0 100644 --- a/mingw-w64-libssh2/PKGBUILD +++ b/mingw-w64-libssh2/PKGBUILD @@ -4,29 +4,30 @@ _realname=libssh2 pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-wincng") -pkgver=1.11.0 -pkgrel=2 +pkgver=1.11.1 +pkgrel=1 pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') url="https://libssh2.org/" +msys2_references=( + 'cpe: cpe:/a:libssh2:libssh2' +) license=("BSD") makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-openssl" "${MINGW_PACKAGE_PREFIX}-zlib") -source=("https://libssh2.org/download/${_realname}-${pkgver}.tar.gz"{,.asc} - fix-pkgconfig.patch) -sha256sums=('3736161e41e2693324deb38c26cfdc3efe6209d634ba4258db1cecff6a5ad461' - 'SKIP' - '7a6545f6d457ad008aacefe04a60727c02d33927c8a903745bf191f69cc8ba55') +source=("https://libssh2.org/download/${_realname}-${pkgver}.tar.gz"{,.asc}) +sha256sums=('d9ec76cbe34db98eec3539fe2c899d26b0c837cb3eb466a56b0f109cabf658f7' + 'SKIP') validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2' # Daniel Stenberg '914C533DF9B2ADA2204F586D78E11C6B279D5C91') # Daniel Stenberg (old key) prepare() { cd ${_realname}-${pkgver} - patch -p1 -i "${srcdir}/fix-pkgconfig.patch" - autoreconf -fi + #patch -p1 -i "${srcdir}/fix-pkgconfig.patch" + #autoreconf -fi } _do_build() { diff --git a/mingw-w64-libssh2/fix-pkgconfig.patch b/mingw-w64-libssh2/fix-pkgconfig.patch index 60285ca..75c0290 100644 --- a/mingw-w64-libssh2/fix-pkgconfig.patch +++ b/mingw-w64-libssh2/fix-pkgconfig.patch @@ -4,7 +4,7 @@ Description: Library for SSH-based communication Version: @LIBSSH2VER@ Requires.private: @LIBSREQUIRED@ --Libs: -L${libdir} -lssh2 @LIBS@ +-Libs: -L${libdir} -lssh2 @LIBSSH2_PC_LIBS@ +Libs: -L${libdir} -lssh2 Libs.private: @LIBS@ Cflags: -I${includedir}