diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/openssh/Makefile | 2 | ||||
| -rw-r--r-- | package/openssh/patches/patch-digest-openssl_c | 12 | ||||
| -rw-r--r-- | package/openssl/Makefile | 4 |
3 files changed, 3 insertions, 15 deletions
diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 1d8678e88..0951ee9d1 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= openssh PKG_VERSION:= 6.7p1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 3246aa79317b1d23cae783a3bf8275d6 PKG_DESCR:= secure shell implementation PKG_SECTION:= net/security diff --git a/package/openssh/patches/patch-digest-openssl_c b/package/openssh/patches/patch-digest-openssl_c deleted file mode 100644 index e45e83072..000000000 --- a/package/openssh/patches/patch-digest-openssl_c +++ /dev/null @@ -1,12 +0,0 @@ ---- openssh-6.7p1.orig/digest-openssl.c 2014-07-17 01:01:26.000000000 +0200 -+++ openssh-6.7p1/digest-openssl.c 2014-10-11 21:35:47.000000000 +0200 -@@ -54,7 +54,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 }, - { SSH_DIGEST_SHA256, "SHA256", 32, EVP_sha256 }, - { SSH_DIGEST_SHA384, "SHA384", 48, EVP_sha384 }, diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 769bdf628..be0b943c3 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= openssl PKG_VERSION:= 1.0.1i -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= c8dc151a671b9b92ff3e4c118b174972 PKG_DESCR:= secure socket layer libraries PKG_SECTION:= libs/crypto @@ -37,7 +37,7 @@ BUILD_STYLE:= manual INSTALL_TARGET:= install_sw FAKE_FLAGS+= INSTALL_PREFIX=${WRKINST} -OPENSSL_OPTIONS:= shared threads no-err no-krb5 zlib-dynamic no-engines no-camellia no-idea no-rc5 no-mdc2 no-sha0 no-smime no-aes192 no-ripemd no-cast +OPENSSL_OPTIONS:= shared threads no-err no-krb5 zlib-dynamic no-engines no-camellia no-idea no-rc5 no-mdc2 no-sha0 no-smime no-aes192 no-cast ifneq ($(ADK_PACKAGE_LIBOPENSSL_WITH_CRYPTODEV),) OPENSSL_OPTIONS+= -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS |