diff options
| author | Florian Franzmann | 2021-09-04 21:38:00 +0200 |
|---|---|---|
| committer | Florian Franzmann | 2021-09-04 21:39:26 +0200 |
| commit | b7e3acc23e0b862ebc8a27c737d3d2d2e3ef63f8 (patch) | |
| tree | 81d9acdfa4813bd81bdeae6e2d444a9108b2e722 /crypto | |
| parent | 55791fed89b78fa2e4050c2628b9f783bf941efc (diff) | |
crypto/libssh2: version 1.10.0
Diffstat (limited to 'crypto')
| -rwxr-xr-x | crypto/libssh2/DETAILS | 2 | ||||
| -rw-r--r-- | crypto/libssh2/HISTORY | 4 | ||||
| -rwxr-xr-x | crypto/libssh2/PRE_BUILD | 7 | ||||
| -rw-r--r-- | crypto/libssh2/willco007-undefine.patch | 50 |
4 files changed, 5 insertions, 58 deletions
diff --git a/crypto/libssh2/DETAILS b/crypto/libssh2/DETAILS index 50ca29d88b..46987864ee 100755 --- a/crypto/libssh2/DETAILS +++ b/crypto/libssh2/DETAILS @@ -1,5 +1,5 @@ SPELL=libssh2 - VERSION=1.9.0 + VERSION=1.10.0 SECURITY_PATCH=3 SOURCE=$SPELL-$VERSION.tar.gz SOURCE2=$SOURCE.asc diff --git a/crypto/libssh2/HISTORY b/crypto/libssh2/HISTORY index 7234cbe0d4..97a430a9e3 100644 --- a/crypto/libssh2/HISTORY +++ b/crypto/libssh2/HISTORY @@ -1,3 +1,7 @@ +2019-09-04 Florian Franzmann <bwlf@bandrate.org> + * DETAILS: version 1.10.0 + * PRE_BUILD, willco007-undefine.patch: remove obsolete patch + 2021-07-19 Eric Sandall <sandalle@sourcemage.org> * PRE_BUILD: Apply willco007-undefine.patch Fixes configure.ac for newer autoconf versions diff --git a/crypto/libssh2/PRE_BUILD b/crypto/libssh2/PRE_BUILD deleted file mode 100755 index 9073f2611c..0000000000 --- a/crypto/libssh2/PRE_BUILD +++ /dev/null @@ -1,7 +0,0 @@ -default_pre_build && -cd "$SOURCE_DIRECTORY" && -message "${MESSAGE_COLOR}Fixing configure.ac for newer autoconf...${DEFAULT_COLOR}" && -patch -p1 < "${SCRIPT_DIRECTORY}/willco007-undefine.patch" && - -autoreconf -fi - diff --git a/crypto/libssh2/willco007-undefine.patch b/crypto/libssh2/willco007-undefine.patch deleted file mode 100644 index 9e938e4ef3..0000000000 --- a/crypto/libssh2/willco007-undefine.patch +++ /dev/null @@ -1,50 +0,0 @@ -# From https://github.com/libssh2/libssh2/commit/35ac220a4436df4ce50e990a02721369c9779ea9 -From 35ac220a4436df4ce50e990a02721369c9779ea9 Mon Sep 17 00:00:00 2001 -From: Will Cosgrove <will@panic.com> -Date: Wed, 26 May 2021 16:42:38 -0700 -Subject: [PATCH] configure.ac: don't undefine scoped variable (#594) - -* configure.ac: don't undefine scoped variable - -To get this script to run with Autoconf 2.71 on macOS I had to remove the undefine of the backend for loop variable. It seems scoped to the for loop and also isn't referenced later in the script so it seems OK to remove it. - -* configure.ac: remove cygwin specific CFLAGS #598 - -Notes: -Remove cygwin specific Win32 CFLAGS and treat the build like a posix build - -Credit: -Will Cosgrove, Brian Inglis ---- - configure.ac | 9 ++------- - 1 file changed, 2 insertions(+), 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c9696eccac..c4fc3e4e30 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -36,12 +36,9 @@ case "$host" in - CFLAGS="$CFLAGS -DLIBSSH2_WIN32" - LIBS="$LIBS -lws2_32" - ;; -- *-cygwin) -- CFLAGS="$CFLAGS -DLIBSSH2_WIN32" -+ *darwin*) -+ CFLAGS="$CFLAGS -DLIBSSH2_DARWIN" - ;; -- *darwin*) -- CFLAGS="$CFLAGS -DLIBSSH2_DARWIN" -- ;; - *hpux*) - ;; - *osf*) -@@ -128,8 +125,6 @@ fi - m4_set_foreach([crypto_backends], [backend], - [AM_CONDITIONAL(m4_toupper(backend), test "$found_crypto" = "backend")] - ) --m4_undefine([backend]) -- - - # libz - - |