Skip to contentSkip to conversation

openssh: bump to version 6.5p1

PATCH New Gustavo Zacarias 3 participants 3 messages Feb 3, 2014 – Feb 4, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 package/openssh/S50sshd                            |   9 +-
 package/openssh/openssh-01-drop-SUSv3-legacy.patch | 579 ---------------------
 ...openssh-01-fix-pam-uclibc-pthreads-clash.patch} |   0
 package/openssh/openssh.mk                         |  12 +-
 4 files changed, 18 insertions(+), 582 deletions(-)
 delete mode 100644 package/openssh/openssh-01-drop-SUSv3-legacy.patch
 rename package/openssh/{openssh-02-fix-pam-uclibc-pthreads-clash.patch => openssh-01-fix-pam-uclibc-pthreads-clash.patch} (100%)
package/openssh/S50sshd +7 -2
index b65b3c8..d3abf7c 100644
@@ -21,7 +21,6 @@ fi
 # Check for the SSH2 DSA key
 if [ ! -f /etc/ssh_host_dsa_key ] ; then
 	echo Generating DSA Key...
-	echo THIS CAN TAKE A MINUTE OR TWO DEPENDING ON YOUR PROCESSOR!
 	echo
 	/usr/bin/ssh-keygen -t dsa -f /etc/ssh_host_dsa_key -C '' -N ''
 fi
@@ -29,11 +28,17 @@ fi
 # Check for the SSH2 ECDSA key
 if [ ! -f /etc/ssh_host_ecdsa_key ]; then
 	echo Generating ECDSA Key...
-	echo THIS CAN TAKE A MINUTE OR TWO DEPENDING ON YOUR PROCESSOR!
 	echo
 	/usr/bin/ssh-keygen -t ecdsa -f /etc/ssh_host_ecdsa_key -C '' -N ''
 fi
 
+# Check for the ed25519 key
+if [ ! -f /etc/ssh_host_ed25519_key ]; then
+	echo Generating ed25519 Key...
+	echo
+	/usr/bin/ssh-keygen -t ed25519 -f /etc/ssh_host_ed25519_key -C '' -N ''
+fi
+
 umask 077
 
 start() {
package/openssh/openssh-01-drop-SUSv3-legacy.patch deleted +0 -579

579 lines not on this page · raw message

package/openssh/openssh-01-fix-pam-uclibc-pthreads-clash.patch renamed from package/openssh/openssh-02-fix-pam-uclibc-pthreads-clash.patch +0 -0
similarity index 100%
rename from package/openssh/openssh-02-fix-pam-uclibc-pthreads-clash.patch
rename to package/openssh/openssh-01-fix-pam-uclibc-pthreads-clash.patch
package/openssh/openssh.mk +11 -1
index 60b65af..f5f334e 100644
@@ -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))
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 1/1 openssh: bump to version 6.5p1

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Convert the ever growing drop-SUSv3-legacy patch to a sed expression. Modify the initscript to create ed25519 server key.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 openssh: bump to version 6.5p1

In reply to Gustavo Zacarias

Hi Gustavo,

Quoted 1 line · Gustavo Zacarias

Convert the ever growing drop-SUSv3-legacy patch to a sed expression.

Since bzero is clearly deprecated even on xBSD, perhaps upstream can be
nudged to accept a patch that replaces it with memset?

Regards,
Arnout

Quoted 3 lines

Modify the initscript to create ed25519 server key.

[snip]

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F