summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/openssh/Makefile12
-rw-r--r--package/openssh/patches/patch-channels_c10
-rw-r--r--package/openssh/patches/patch-cipher_c30
-rw-r--r--package/openssh/patches/patch-configure_ac13
-rw-r--r--package/openssh/patches/patch-digest-openssl_c8
5 files changed, 30 insertions, 43 deletions
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index 1eef11a96..1d8678e88 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -4,9 +4,9 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= openssh
-PKG_VERSION:= 6.6p1
+PKG_VERSION:= 6.7p1
PKG_RELEASE:= 1
-PKG_MD5SUM:= 3e9800e6bca1fbac0eea4d41baa7f239
+PKG_MD5SUM:= 3246aa79317b1d23cae783a3bf8275d6
PKG_DESCR:= secure shell implementation
PKG_SECTION:= net/security
PKG_BUILDDEP:= zlib openssl
@@ -45,6 +45,8 @@ $(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
@@ -55,6 +57,12 @@ else
CONFIGURE_ARGS+= --without-stackprotect
endif
+ifeq ($(ADK_TARGET_USE_PIE),y)
+CONFIGURE_ARGS+= --with-pie
+else
+CONFIGURE_ARGS+= --without-pie
+endif
+
CONFIGURE_ENV+= LD='${TARGET_CC}' \
ac_cv_func_setlogin=no \
ac_cv_have_decl_PR_SET_NO_NEW_PRIVS=no \
diff --git a/package/openssh/patches/patch-channels_c b/package/openssh/patches/patch-channels_c
deleted file mode 100644
index 11b870703..000000000
--- a/package/openssh/patches/patch-channels_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- openssh-6.2p1.orig/channels.c 2012-12-02 23:50:55.000000000 +0100
-+++ openssh-6.2p1/channels.c 2013-08-20 18:00:56.929029538 +0200
-@@ -42,6 +42,7 @@
- #include "includes.h"
-
- #include <sys/types.h>
-+#include <sys/param.h>
- #include <sys/ioctl.h>
- #include <sys/un.h>
- #include <sys/socket.h>
diff --git a/package/openssh/patches/patch-cipher_c b/package/openssh/patches/patch-cipher_c
index 059d3cf86..1f6e6ec66 100644
--- a/package/openssh/patches/patch-cipher_c
+++ b/package/openssh/patches/patch-cipher_c
@@ -1,19 +1,9 @@
-diff -Nur openssh-6.2p1.orig/cipher.c openssh-6.2p1/cipher.c
---- openssh-6.5p1.orig/cipher.c 2014-01-25 23:37:26.000000000 +0100
-+++ openssh-6.5p1/cipher.c 2014-02-11 15:26:16.000000000 +0100
-@@ -75,23 +75,33 @@ static const struct Cipher ciphers[] = {
- { "none", SSH_CIPHER_NONE, 8, 0, 0, 0, 0, 0, EVP_enc_null },
- { "des", SSH_CIPHER_DES, 8, 8, 0, 0, 0, 1, EVP_des_cbc },
- { "3des", SSH_CIPHER_3DES, 8, 16, 0, 0, 0, 1, evp_ssh1_3des },
-+#ifndef OPENSSL_NO_BF
- { "blowfish", SSH_CIPHER_BLOWFISH, 8, 32, 0, 0, 0, 1, evp_ssh1_bf },
-+#endif
-
+--- openssh-6.7p1.orig/cipher.c 2014-07-20 18:24:59.000000000 +0200
++++ openssh-6.7p1/cipher.c 2014-10-11 21:51:33.000000000 +0200
+@@ -88,8 +88,10 @@ static const struct sshcipher ciphers[]
{ "3des-cbc", SSH_CIPHER_SSH2, 8, 24, 0, 0, 0, 1, EVP_des_ede3_cbc },
-+#ifndef OPENSSL_NO_BF
{ "blowfish-cbc",
SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 1, EVP_bf_cbc },
-+#endif
+#ifndef OPENSSL_NO_CAST
{ "cast128-cbc",
SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 1, EVP_cast5_cbc },
@@ -21,17 +11,3 @@ diff -Nur openssh-6.2p1.orig/cipher.c openssh-6.2p1/cipher.c
{ "arcfour", SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 0, EVP_rc4 },
{ "arcfour128", SSH_CIPHER_SSH2, 8, 16, 0, 0, 1536, 0, EVP_rc4 },
{ "arcfour256", SSH_CIPHER_SSH2, 8, 32, 0, 0, 1536, 0, EVP_rc4 },
- { "aes128-cbc", SSH_CIPHER_SSH2, 16, 16, 0, 0, 0, 1, EVP_aes_128_cbc },
-+#ifndef OPENSSL_NO_AES192
- { "aes192-cbc", SSH_CIPHER_SSH2, 16, 24, 0, 0, 0, 1, EVP_aes_192_cbc },
-+#endif
- { "aes256-cbc", SSH_CIPHER_SSH2, 16, 32, 0, 0, 0, 1, EVP_aes_256_cbc },
- { "rijndael-cbc@lysator.liu.se",
- SSH_CIPHER_SSH2, 16, 32, 0, 0, 0, 1, EVP_aes_256_cbc },
- { "aes128-ctr", SSH_CIPHER_SSH2, 16, 16, 0, 0, 0, 0, EVP_aes_128_ctr },
-+#ifndef OPENSSL_NO_AES192
- { "aes192-ctr", SSH_CIPHER_SSH2, 16, 24, 0, 0, 0, 0, EVP_aes_192_ctr },
-+#endif
- { "aes256-ctr", SSH_CIPHER_SSH2, 16, 32, 0, 0, 0, 0, EVP_aes_256_ctr },
- #ifdef OPENSSL_HAVE_EVPGCM
- { "aes128-gcm@openssh.com",
diff --git a/package/openssh/patches/patch-configure_ac b/package/openssh/patches/patch-configure_ac
new file mode 100644
index 000000000..eceb331cd
--- /dev/null
+++ b/package/openssh/patches/patch-configure_ac
@@ -0,0 +1,13 @@
+--- 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"
+ ]
+ )
diff --git a/package/openssh/patches/patch-digest-openssl_c b/package/openssh/patches/patch-digest-openssl_c
index dc8aeb4f6..e45e83072 100644
--- a/package/openssh/patches/patch-digest-openssl_c
+++ b/package/openssh/patches/patch-digest-openssl_c
@@ -1,6 +1,6 @@
---- 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 {
+--- 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 },
@@ -8,5 +8,5 @@
{ 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 },
+ { SSH_DIGEST_SHA384, "SHA384", 48, EVP_sha384 },