diff options
| -rw-r--r-- | package/openssh/Makefile | 8 | ||||
| -rw-r--r-- | package/openssh/patches/patch-configure_ac | 13 |
2 files changed, 3 insertions, 18 deletions
diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 183899002..c4ff4103a 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= openssh -PKG_VERSION:= 6.7p1 -PKG_RELEASE:= 4 -PKG_HASH:= b2f8394eae858dabbdef7dac10b99aec00c95462753e80342e530bbb6f725507 +PKG_VERSION:= 6.8p1 +PKG_RELEASE:= 1 +PKG_HASH:= 3ff64ce73ee124480b5bf767b9830d7d3c03bbcb6abe716b78f0192c37ce160e PKG_DESCR:= secure shell implementation PKG_SECTION:= net/security PKG_BUILDDEP:= zlib @@ -52,8 +52,6 @@ $(eval $(call PKG_template,OPENSSH_CLIENT_UTILS,openssh-client-utils,${PKG_VERSI $(eval $(call PKG_template,OPENSSH_SFTP_CLIENT,openssh-sftp-client,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENSSH_SFTP_CLIENT},${PKGSD_OPENSSH_SFTP_CLIENT},${PKG_SECTION})) $(eval $(call PKG_template,OPENSSH_SFTP_SERVER,openssh-sftp-server,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENSSH_SFTP_SERVER},${PKGSD_OPENSSH_SFTP_SERVER},${PKG_SECTION})) -AUTOTOOL_STYLE:= autoreconf - ifeq ($(ADK_PACKAGE_OPENSSH_WITH_KRB5),y) CONFIGURE_ARGS+= --with-kerberos5="${STAGING_TARGET_DIR}/usr" endif diff --git a/package/openssh/patches/patch-configure_ac b/package/openssh/patches/patch-configure_ac deleted file mode 100644 index eceb331cd..000000000 --- a/package/openssh/patches/patch-configure_ac +++ /dev/null @@ -1,13 +0,0 @@ ---- openssh-6.7p1.orig/configure.ac 2014-08-26 22:32:01.000000000 +0200 -+++ openssh-6.7p1/configure.ac 2014-10-11 21:42:45.000000000 +0200 -@@ -2526,8 +2526,8 @@ AC_CHECK_FUNCS([SHA256_Update EVP_sha256 - # Search for RIPE-MD support in OpenSSL - AC_CHECK_FUNCS([EVP_ripemd160], , - [unsupported_algorithms="$unsupported_algorithms \ -- hmac-ripemd160 -- hmac-ripemd160@openssh.com -+ hmac-ripemd160 \ -+ hmac-ripemd160@openssh.com \ - hmac-ripemd160-etm@openssh.com" - ] - ) |