summaryrefslogtreecommitdiffstats
path: root/package/openssh
diff options
context:
space:
mode:
Diffstat (limited to 'package/openssh')
-rw-r--r--package/openssh/openssh.hash5
-rw-r--r--package/openssh/openssh.mk6
2 files changed, 8 insertions, 3 deletions
diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash
index 76d0be85c9..84f06672cb 100644
--- a/package/openssh/openssh.hash
+++ b/package/openssh/openssh.hash
@@ -1,3 +1,4 @@
# Locally calculated after checking pgp signature
-# Also from http://www.openssh.com/txt/release-6.9 (sha256 is base64 encoded)
-sha256 6e074df538f357d440be6cf93dc581a21f22d39e236f217fcd8eacbb6c896cfe openssh-6.9p1.tar.gz
+# Also from http://www.openssh.com/txt/release-7.1 (sha256 is base64 encoded)
+# Decode with -> echo <encoded stuff>|base64 -d|hexdump -v -e '/1 "%02x"'
+sha256 fc0a6d2d1d063d5c66dffd952493d0cda256cad204f681de0f84ef85b2ad8428 openssh-7.1p1.tar.gz
diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk
index 5a7162ffda..fb5779e385 100644
--- a/package/openssh/openssh.mk
+++ b/package/openssh/openssh.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OPENSSH_VERSION = 6.9p1
+OPENSSH_VERSION = 7.1p1
OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
OPENSSH_LICENSE = BSD-3c BSD-2c Public Domain
OPENSSH_LICENSE_FILES = LICENCE
@@ -26,6 +26,10 @@ endef
ifeq ($(BR2_arc),y)
OPENSSH_CONF_OPTS += --without-pie
endif
+# PIE and static does not work on Linux
+ifeq ($(BR2_STATIC_LIBS),y)
+OPENSSH_CONF_OPTS += --without-pie
+endif
OPENSSH_DEPENDENCIES = zlib openssl
OpenPOWER on IntegriCloud