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

openssh: update to 7.6p1

Browse Source
This commit is contained in:
Tom G. Christensen 2017-10-05 20:23:10 +02:00
parent 0c2b1093ec
commit 0cffb97ade
4 changed files with 56 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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.5p1 version=7.6p1
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]=0001-Treat-empty-codeset-value-as-ascii.patch patch[0]=0001-permitopen-fix.patch
# Source function library # Source function library
. ${BUILDPKG_SCRIPTS}/buildpkg.functions . ${BUILDPKG_SCRIPTS}/buildpkg.functions
@ -20,7 +20,7 @@ export LDFLAGS="-R$prefix/lib -L$prefix/lib"
export CPPFLAGS="-I$prefix/include" export CPPFLAGS="-I$prefix/include"
make_check_target="tests" make_check_target="tests"
configure_args=(--prefix=$prefix --mandir=$prefix/$_mandir --sysconfdir=$prefix/${_sysconfdir}/ssh --datadir=$prefix/${_sharedir}/openssh --with-default-path=/usr/bin:$prefix/${_bindir} --with-mantype=cat --with-pam --with-privsep-user=sshd --with-privsep-path=/var/empty/sshd --with-superuser-path=/usr/bin:/usr/sbin:$prefix/$_bindir:$prefix/$_sbindir --with-lastlog=/var/adm/lastlog --without-zlib-version-check --with-ssh1) configure_args=(--prefix=$prefix --mandir=$prefix/$_mandir --sysconfdir=$prefix/${_sysconfdir}/ssh --datadir=$prefix/${_sharedir}/openssh --with-default-path=/usr/bin:$prefix/${_bindir} --with-mantype=cat --with-pam --with-privsep-user=sshd --with-privsep-path=/var/empty/sshd --with-superuser-path=/usr/bin:/usr/sbin:$prefix/$_bindir:$prefix/$_sbindir --with-lastlog=/var/adm/lastlog --without-zlib-version-check)
reg prep reg prep
prep() prep()

4
openssh/meta/ChangeLog
View File

@ -1,5 +1,9 @@
CHANGELOG CHANGELOG
--------- ---------
* Wed Oct 04 2017 Tom G. Christensen <swpkg@jupiterrise.com> - 7.6p1-1
- Update to 7.6p1
- Add post 7.6 fix for PermitOpen
* Sun Mar 26 2017 Tom G. Christensen <swpkg@jupiterrise.com> - 7.5p1-1 * Sun Mar 26 2017 Tom G. Christensen <swpkg@jupiterrise.com> - 7.5p1-1
- Update to 7.5p1 - Update to 7.5p1

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

@ -1,29 +0,0 @@
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

49
openssh/src/0001-permitopen-fix.patch Normal file
View File

@ -0,0 +1,49 @@
From 7c9613fac3371cf65fb07739212cdd1ebf6575da Mon Sep 17 00:00:00 2001
From: "djm@openbsd.org" <djm@openbsd.org>
Date: Wed, 4 Oct 2017 18:49:30 +0000
Subject: [PATCH] upstream commit
fix (another) problem in PermitOpen introduced during the
channels.c refactor: the third and subsequent arguments to PermitOpen were
being silently ignored; ok markus@
Upstream-ID: 067c89f1f53cbc381628012ba776d6861e6782fd
---
servconf.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/servconf.c b/servconf.c
index 2c321a4a..95686295 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: servconf.c,v 1.312 2017/10/02 19:33:20 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.313 2017/10/04 18:49:30 djm Exp $ */
/*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved
@@ -1663,9 +1663,9 @@ process_server_config_line(ServerOptions *options, char *line,
if (!arg || *arg == '\0')
fatal("%s line %d: missing PermitOpen specification",
filename, linenum);
- i = options->num_permitted_opens; /* modified later */
+ value = options->num_permitted_opens; /* modified later */
if (strcmp(arg, "any") == 0 || strcmp(arg, "none") == 0) {
- if (*activep && i == 0) {
+ if (*activep && value == 0) {
options->num_permitted_opens = 1;
options->permitted_opens = xcalloc(1,
sizeof(*options->permitted_opens));
@@ -1683,7 +1683,7 @@ process_server_config_line(ServerOptions *options, char *line,
if (arg == NULL || ((port = permitopen_port(arg)) < 0))
fatal("%s line %d: bad port number in "
"PermitOpen", filename, linenum);
- if (*activep && i == 0) {
+ if (*activep && value == 0) {
options->permitted_opens = xrecallocarray(
options->permitted_opens,
options->num_permitted_opens,
--
2.14.2