diff --git a/openssh/build.sh b/openssh/build.sh index 527828e..8e67546 100755 --- a/openssh/build.sh +++ b/openssh/build.sh @@ -6,11 +6,11 @@ ########################################################### # Check the following 4 variables before running the script topdir=openssh -version=7.4p1 +version=7.5p1 pkgver=1 source[0]=ftp://ftp.heanet.ie/pub/OpenBSD/OpenSSH/portable/$topdir-$version.tar.gz # If there are no patches, simply comment this -#patch[0]= +patch[0]=0001-Treat-empty-codeset-value-as-ascii.patch # Source function library . ${BUILDPKG_SCRIPTS}/buildpkg.functions diff --git a/openssh/meta/ChangeLog b/openssh/meta/ChangeLog index b5e742a..d9d4f6f 100644 --- a/openssh/meta/ChangeLog +++ b/openssh/meta/ChangeLog @@ -1,5 +1,8 @@ CHANGELOG --------- +* Sun Mar 26 2017 Tom G. Christensen - 7.5p1-1 +- Update to 7.5p1 + * Tue Dec 20 2016 Tom G. Christensen - 7.4p1-1 - Update to 7.4p1 diff --git a/openssh/src/0001-Treat-empty-codeset-value-as-ascii.patch b/openssh/src/0001-Treat-empty-codeset-value-as-ascii.patch new file mode 100644 index 0000000..9a6286c --- /dev/null +++ b/openssh/src/0001-Treat-empty-codeset-value-as-ascii.patch @@ -0,0 +1,29 @@ +From 19b8662207ca1e515eccb8fd0b1edcb49b62700b Mon Sep 17 00:00:00 2001 +From: "Tom G. Christensen" +Date: Thu, 30 Mar 2017 18:12:42 +0200 +Subject: [PATCH] Treat empty codeset value as ascii + +On Solaris 2.6 locales using an ascii codeset returns an empty value +from nl_langinfo(CODESET) instead of the value '646' as seen in later +Solaris releases. +--- + utf8.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/utf8.c b/utf8.c +index dead79b8..9d63d1d6 100644 +--- a/utf8.c ++++ b/utf8.c +@@ -61,7 +61,8 @@ dangerous_locale(void) { + + loc = nl_langinfo(CODESET); + return strcmp(loc, "US-ASCII") != 0 && strcmp(loc, "UTF-8") != 0 && +- strcmp(loc, "ANSI_X3.4-1968") != 0 && strcmp(loc, "646") != 0; ++ strcmp(loc, "ANSI_X3.4-1968") != 0 && strcmp(loc, "646") != 0 && ++ strcmp(loc, "") != 0; + } + + static int +-- +2.11.0 + diff --git a/openssh/src/sshd.init b/openssh/src/sshd.init index 28ac9b6..8c53943 100755 --- a/openssh/src/sshd.init +++ b/openssh/src/sshd.init @@ -5,7 +5,6 @@ SSHD=/usr/tgcware/sbin/sshd KEYGEN=/usr/tgcware/bin/ssh-keygen -RSA1_KEY=/usr/tgcware/etc/ssh/ssh_host_key RSA_KEY=/usr/tgcware/etc/ssh/ssh_host_rsa_key DSA_KEY=/usr/tgcware/etc/ssh/ssh_host_dsa_key ECDSA_KEY=/usr/tgcware/etc/ssh/ssh_host_ecdsa_key @@ -25,11 +24,6 @@ check_pid_dir() do_hostkeygen() { - if [ ! -s $RSA1_KEY ]; then - $ECHO "Generating $RSA1_KEY:\c" - $KEYGEN -q -t rsa1 -f $RSA1_KEY -N '' > /dev/null 2>&1 - $ECHO "." - fi if [ ! -s $RSA_KEY ]; then $ECHO "Generating $RSA_KEY:\c" $KEYGEN -q -t rsa -f $RSA_KEY -N '' > /dev/null 2>&1