Solaris/dbpware-for-solaris
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openssh: update to 7.5p1

Browse Source
This commit is contained in:
Tom G. Christensen 2017-03-31 08:53:35 +02:00
parent 83e5ffcdff
commit 0e17ec33cc
4 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openssh/build.sh
View File

@ -6,11 +6,11 @@
########################################################### ###########################################################
# Check the following 4 variables before running the script # Check the following 4 variables before running the script
topdir=openssh topdir=openssh
version=7.4p1 version=7.5p1
pkgver=1 pkgver=1
source[0]=ftp://ftp.heanet.ie/pub/OpenBSD/OpenSSH/portable/$topdir-$version.tar.gz source[0]=ftp://ftp.heanet.ie/pub/OpenBSD/OpenSSH/portable/$topdir-$version.tar.gz
# If there are no patches, simply comment this # If there are no patches, simply comment this
#patch[0]= patch[0]=0001-Treat-empty-codeset-value-as-ascii.patch
# Source function library # Source function library
. ${BUILDPKG_SCRIPTS}/buildpkg.functions . ${BUILDPKG_SCRIPTS}/buildpkg.functions

3
openssh/meta/ChangeLog
View File

@ -1,5 +1,8 @@
CHANGELOG CHANGELOG
--------- ---------
* Sun Mar 26 2017 Tom G. Christensen <swpkg@jupiterrise.com> - 7.5p1-1
- Update to 7.5p1
* Tue Dec 20 2016 Tom G. Christensen <swpkg@jupiterrise.com> - 7.4p1-1 * Tue Dec 20 2016 Tom G. Christensen <swpkg@jupiterrise.com> - 7.4p1-1
- Update to 7.4p1 - Update to 7.4p1

29
openssh/src/0001-Treat-empty-codeset-value-as-ascii.patch Normal file
View File

@ -0,0 +1,29 @@
From 19b8662207ca1e515eccb8fd0b1edcb49b62700b Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
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

6
openssh/src/sshd.init
View File

@ -5,7 +5,6 @@
SSHD=/usr/tgcware/sbin/sshd SSHD=/usr/tgcware/sbin/sshd
KEYGEN=/usr/tgcware/bin/ssh-keygen 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 RSA_KEY=/usr/tgcware/etc/ssh/ssh_host_rsa_key
DSA_KEY=/usr/tgcware/etc/ssh/ssh_host_dsa_key DSA_KEY=/usr/tgcware/etc/ssh/ssh_host_dsa_key
ECDSA_KEY=/usr/tgcware/etc/ssh/ssh_host_ecdsa_key ECDSA_KEY=/usr/tgcware/etc/ssh/ssh_host_ecdsa_key
@ -25,11 +24,6 @@ check_pid_dir()
do_hostkeygen() 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 if [ ! -s $RSA_KEY ]; then
$ECHO "Generating $RSA_KEY:\c" $ECHO "Generating $RSA_KEY:\c"
$KEYGEN -q -t rsa -f $RSA_KEY -N '' > /dev/null 2>&1 $KEYGEN -q -t rsa -f $RSA_KEY -N '' > /dev/null 2>&1