diff --git a/openssh/build.sh b/openssh/build.sh index f295929..b887d8d 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.6p1 +version=7.7p1 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]=0001-permitopen-fix.patch +#patch[0]= # Source function library . ${BUILDPKG_SCRIPTS}/buildpkg.functions diff --git a/openssh/meta/ChangeLog b/openssh/meta/ChangeLog index 3797585..09a5b74 100644 --- a/openssh/meta/ChangeLog +++ b/openssh/meta/ChangeLog @@ -1,5 +1,8 @@ CHANGELOG --------- +* Wed Apr 04 2018 Tom G. Christensen - 7.7p1-1 +- Update to 7.7p1 + * Wed Oct 04 2017 Tom G. Christensen - 7.6p1-1 - Update to 7.6p1 - Add post 7.6 fix for PermitOpen diff --git a/openssh/src/0001-permitopen-fix.patch b/openssh/src/0001-permitopen-fix.patch deleted file mode 100644 index ffbe932..0000000 --- a/openssh/src/0001-permitopen-fix.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 7c9613fac3371cf65fb07739212cdd1ebf6575da Mon Sep 17 00:00:00 2001 -From: "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 , 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 -