diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-10-19 11:08:28 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-10-19 11:08:28 +0200 |
| commit | 4404645c4b980a135411b7e4b13546b15a48d49e (patch) | |
| tree | 61b37643ec6c55138ce88423d2b4b80be743a16b /package/openssh | |
| parent | 2a2aaf69a4294f5f35880221cda874bff1042a43 (diff) | |
| parent | 0d2096fc208944030c02c8700055c6b1a3029941 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/openssh')
| -rw-r--r-- | package/openssh/Makefile | 2 | ||||
| -rw-r--r-- | package/openssh/patches/patch-digest-openssl_c | 12 |
2 files changed, 1 insertions, 13 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 }, |