aboutsummaryrefslogtreecommitdiff
path: root/package/openssh/openssh.mk
diff options
context:
space:
mode:
authorGravatar Gustavo Zacarias <gustavo@zacarias.com.ar>2014-02-02 23:01:28 -0300
committerGravatar Peter Korsgaard <peter@korsgaard.com>2014-02-03 09:26:56 +0100
commita93c98bb95d9b2fecfaec7c6347c57bf90e51c31 (patch)
treed08e744a5b8225c9887f5d83409e30fd8cd46c97 /package/openssh/openssh.mk
parent3bcb7e74be71990e7c88facd54d6b90d3d04d681 (diff)
downloadbuildroot-a93c98bb95d9b2fecfaec7c6347c57bf90e51c31.tar.gz
buildroot-a93c98bb95d9b2fecfaec7c6347c57bf90e51c31.tar.bz2
openssh: bump to version 6.5p1
Convert the ever growing drop-SUSv3-legacy patch to a sed expression. Modify the initscript to create ed25519 server key. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/openssh/openssh.mk')
-rw-r--r--package/openssh/openssh.mk12
1 files changed, 11 insertions, 1 deletions
diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk
index 60b65af331..f5f334ed0c 100644
--- a/package/openssh/openssh.mk
+++ b/package/openssh/openssh.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OPENSSH_VERSION = 6.4p1
+OPENSSH_VERSION = 6.5p1
OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
OPENSSH_CONF_ENV = LD="$(TARGET_CC)" LDFLAGS="$(TARGET_CFLAGS)"
OPENSSH_CONF_OPT = --disable-lastlog --disable-utmp \
@@ -30,4 +30,14 @@ define OPENSSH_INSTALL_INIT_SYSV
$(TARGET_DIR)/etc/init.d/S50sshd
endef
+# Replace deprecated bcopy/bzero with memset/memcpy
+define OPENSSH_REPLACE_SUSV3_DEPRECATED
+ for src in `find $(@D) -name \*.c`; do \
+ $(SED) "s/bzero(\(.*,\)/memset(\1 0, /" $${src} ;\
+ $(SED) "s/bcopy(\(.*,\) \(.*,\)/memcpy(\2 \1/" $${src} ;\
+ done
+endef
+
+OPENSSH_POST_PATCH_HOOKS += OPENSSH_REPLACE_SUSV3_DEPRECATED
+
$(eval $(autotools-package))