From 99232c868fb3b52ba7405a1d0489c0ef20b285b3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 24 Mar 2014 20:51:56 +0100 Subject: update to latest upstream --- package/openssh/Makefile | 4 ++-- package/openssh/patches/patch-digest-openssl_c | 12 ++++++++++++ package/openssh/patches/patch-digest_c | 12 ------------ package/openssh/patches/patch-mac_c | 24 ------------------------ 4 files changed, 14 insertions(+), 38 deletions(-) create mode 100644 package/openssh/patches/patch-digest-openssl_c delete mode 100644 package/openssh/patches/patch-digest_c delete mode 100644 package/openssh/patches/patch-mac_c (limited to 'package/openssh') diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 409e63c0a..4d0c4e9da 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openssh -PKG_VERSION:= 6.5p1 +PKG_VERSION:= 6.6p1 PKG_RELEASE:= 1 -PKG_MD5SUM:= a084e7272b8cbd25afe0f5dce4802fef +PKG_MD5SUM:= 3e9800e6bca1fbac0eea4d41baa7f239 PKG_DESCR:= OpenSSH PKG_SECTION:= net/security PKG_BUILDDEP:= zlib openssl diff --git a/package/openssh/patches/patch-digest-openssl_c b/package/openssh/patches/patch-digest-openssl_c new file mode 100644 index 000000000..dc8aeb4f6 --- /dev/null +++ b/package/openssh/patches/patch-digest-openssl_c @@ -0,0 +1,12 @@ +--- openssh-6.6p1.orig/digest-openssl.c 2014-02-04 01:25:45.000000000 +0100 ++++ openssh-6.6p1/digest-openssl.c 2014-03-24 13:42:01.000000000 +0100 +@@ -44,7 +44,9 @@ struct ssh_digest { + /* NB. Indexed directly by algorithm number */ + const struct ssh_digest digests[] = { + { SSH_DIGEST_MD5, "MD5", 16, EVP_md5 }, ++#ifndef OPENSSL_NO_RIPEMD + { SSH_DIGEST_RIPEMD160, "RIPEMD160", 20, EVP_ripemd160 }, ++#endif + { SSH_DIGEST_SHA1, "SHA1", 20, EVP_sha1 }, + #ifdef HAVE_EVP_SHA256 /* XXX replace with local if missing */ + { SSH_DIGEST_SHA256, "SHA256", 32, EVP_sha256 }, diff --git a/package/openssh/patches/patch-digest_c b/package/openssh/patches/patch-digest_c deleted file mode 100644 index feead7711..000000000 --- a/package/openssh/patches/patch-digest_c +++ /dev/null @@ -1,12 +0,0 @@ ---- openssh-6.5p1.orig/digest.c 2014-01-20 02:41:53.000000000 +0100 -+++ openssh-6.5p1/digest.c 2014-02-11 17:41:23.000000000 +0100 -@@ -44,7 +44,9 @@ struct ssh_digest { - /* NB. Indexed directly by algorithm number */ - const struct ssh_digest digests[] = { - { SSH_DIGEST_MD5, "MD5", 16, EVP_md5 }, -+#ifndef OPENSSL_NO_RIPEMD - { SSH_DIGEST_RIPEMD160, "RIPEMD160", 20, EVP_ripemd160 }, -+#endif - { SSH_DIGEST_SHA1, "SHA1", 20, EVP_sha1 }, - #ifdef HAVE_EVP_SHA256 /* XXX replace with local if missing */ - { SSH_DIGEST_SHA256, "SHA256", 32, EVP_sha256 }, diff --git a/package/openssh/patches/patch-mac_c b/package/openssh/patches/patch-mac_c deleted file mode 100644 index 7812de4b2..000000000 --- a/package/openssh/patches/patch-mac_c +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur openssh-6.2p1.orig/mac.c openssh-6.2p1/mac.c ---- openssh-6.5p1.orig/mac.c 2014-01-10 00:37:05.000000000 +0100 -+++ openssh-6.5p1/mac.c 2014-02-11 15:26:16.000000000 +0100 -@@ -70,8 +70,10 @@ static const struct macalg macs[] = { - #endif - { "hmac-md5", SSH_EVP, EVP_md5, 0, 0, 0, 0 }, - { "hmac-md5-96", SSH_EVP, EVP_md5, 96, 0, 0, 0 }, -+#ifndef OPENSSL_NO_RIPEMD - { "hmac-ripemd160", SSH_EVP, EVP_ripemd160, 0, 0, 0, 0 }, - { "hmac-ripemd160@openssh.com", SSH_EVP, EVP_ripemd160, 0, 0, 0, 0 }, -+#endif - { "umac-64@openssh.com", SSH_UMAC, NULL, 0, 128, 64, 0 }, - { "umac-128@openssh.com", SSH_UMAC128, NULL, 0, 128, 128, 0 }, - -@@ -84,7 +86,9 @@ static const struct macalg macs[] = { - #endif - { "hmac-md5-etm@openssh.com", SSH_EVP, EVP_md5, 0, 0, 0, 1 }, - { "hmac-md5-96-etm@openssh.com", SSH_EVP, EVP_md5, 96, 0, 0, 1 }, -+#ifndef OPENSSL_NO_RIPEMD - { "hmac-ripemd160-etm@openssh.com", SSH_EVP, EVP_ripemd160, 0, 0, 0, 1 }, -+#endif - { "umac-64-etm@openssh.com", SSH_UMAC, NULL, 0, 128, 64, 1 }, - { "umac-128-etm@openssh.com", SSH_UMAC128, NULL, 0, 128, 128, 1 }, - -- cgit v1.2.3