pkgsrc-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[patch] syntax error in rc.d/sshd



Hi,

attached patch fixes syntax errors in the rc.d/sshd script, in the
HAVE_ED25519_START / HAVE_ED25519_STOP "magic comments" (C-style instead
of shell comments).

Probably adapted from the HAVE_ECDSA_... section above it, but those get
handled by Makefile at post-configure stage. No such handling exists for
HAVE_ED25519.

OTOH, is this still needed anyway? Does anybody use pkgsrc to build ssh
against a non-pkgsrc version of openssl? This post-configure handling
might as well be dropped.

Regards
Matthias
--- security/openssh/files/sshd.sh.orig	2014-05-22 05:25:11.000000000 +0200
+++ security/openssh/files/sshd.sh	2015-01-17 01:14:20.000000000 +0100
@@ -42,22 +42,22 @@
 	else
 		${keygen_command} -t rsa -f @PKG_SYSCONFDIR@/ssh_host_rsa_key -N ''
 	fi
-/* HAVE_ECDSA_START */
+# HAVE_ECDSA_START
 	if [ -f @PKG_SYSCONFDIR@/ssh_host_ecdsa_key ]; then
 		@ECHO@ "You already have a ECDSA host key in @PKG_SYSCONFDIR@/ssh_host_ecdsa_key"
 		@ECHO@ "Skipping protocol version 2 ECDSA Key Generation"
 	else
 		${keygen_command} -t ecdsa -f @PKG_SYSCONFDIR@/ssh_host_ecdsa_key -N ''
 	fi
-/* HAVE_ECDSA_STOP */
-/* HAVE_ED25519_START */
+# HAVE_ECDSA_STOP
+# HAVE_ED25519_START
 	if [ -f @PKG_SYSCONFDIR@/ssh_host_ed25519_key ]; then
 		@ECHO@ "You already have a ED25519 host key in @PKG_SYSCONFDIR@/ssh_host_ed25519_key"
 		@ECHO@ "Skipping protocol version 2 ED25519 Key Generation"
 	else
 		${keygen_command} -t ed25519 -f @PKG_SYSCONFDIR@/ssh_host_ed25519_key -N ''
 	fi
-/* HAVE_ED25519_STOP */
+# HAVE_ED25519_STOP
 	)
 }
 


Home | Main Index | Thread Index | Old Index