浏览代码

update to latest upstream

Waldemar Brodkorb 10 年之前
父节点
当前提交
99232c868f
共有 3 个文件被更改,包括 4 次插入28 次删除
  1. 2 2
      package/openssh/Makefile
  2. 2 2
      package/openssh/patches/patch-digest-openssl_c
  3. 0 24
      package/openssh/patches/patch-mac_c

+ 2 - 2
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

+ 2 - 2
package/openssh/patches/patch-digest_c → package/openssh/patches/patch-digest-openssl_c

@@ -1,5 +1,5 @@
---- 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
+--- 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[] = {

+ 0 - 24
package/openssh/patches/patch-mac_c

@@ -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 },
-