From 1c74a94611d85f6ad4d3f3ea75ff10e023d9a8b8 Mon Sep 17 00:00:00 2001 From: "Tom G. Christensen" Date: Thu, 10 Oct 2019 18:23:26 +0200 Subject: [PATCH] openssh: update to 8.1p1 --- openssh/build.sh | 8 ++-- openssh/meta/ChangeLog | 3 ++ ...-correct-according-to-POSIX-format-f.patch | 37 ------------------- 3 files changed, 7 insertions(+), 41 deletions(-) delete mode 100644 openssh/src/0001-upstream-Use-the-correct-according-to-POSIX-format-f.patch diff --git a/openssh/build.sh b/openssh/build.sh index 9a340cf..f00d3a8 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=8.0p1 -pkgver=2 -source[0]=ftp://ftp.heanet.ie/pub/OpenBSD/OpenSSH/portable/$topdir-$version.tar.gz +version=8.1p1 +pkgver=1 +source[0]=https://cloudflare.cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/$topdir-$version.tar.gz # If there are no patches, simply comment this -patch[0]=0001-upstream-Use-the-correct-according-to-POSIX-format-f.patch +#patch[0]= # Source function library . ${BUILDPKG_SCRIPTS}/buildpkg.functions diff --git a/openssh/meta/ChangeLog b/openssh/meta/ChangeLog index 052c479..ad08b72 100644 --- a/openssh/meta/ChangeLog +++ b/openssh/meta/ChangeLog @@ -1,5 +1,8 @@ CHANGELOG --------- +* Wed Oct 09 2019 Tom G. Christensen - 8.1p1-1 +- Update to 8.1p1 + * Sun May 19 2019 Tom G. Christensen - 8.0p1-2 - Add upstream patch to fix scp progress output diff --git a/openssh/src/0001-upstream-Use-the-correct-according-to-POSIX-format-f.patch b/openssh/src/0001-upstream-Use-the-correct-according-to-POSIX-format-f.patch deleted file mode 100644 index a5ce00e..0000000 --- a/openssh/src/0001-upstream-Use-the-correct-according-to-POSIX-format-f.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 62dd70613b77b229f53db3cc1c3e8a206fa2b582 Mon Sep 17 00:00:00 2001 -From: "dtucker@openbsd.org" -Date: Fri, 3 May 2019 06:06:30 +0000 -Subject: [PATCH] upstream: Use the correct (according to POSIX) format for - -left-justification in snmprintf. bz#3002, patch from velemas at gmail.com, ok -markus@. - -OpenBSD-Commit-ID: 65d252b799be0cc8f68b6c47cece0a57bb00fea7 ---- - progressmeter.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/progressmeter.c b/progressmeter.c -index e385c125..0e58edde 100644 ---- a/progressmeter.c -+++ b/progressmeter.c -@@ -1,4 +1,4 @@ --/* $OpenBSD: progressmeter.c,v 1.47 2019/01/24 16:52:17 dtucker Exp $ */ -+/* $OpenBSD: progressmeter.c,v 1.48 2019/05/03 06:06:30 dtucker Exp $ */ - /* - * Copyright (c) 2003 Nils Nordman. All rights reserved. - * -@@ -169,8 +169,8 @@ refresh_progress_meter(int force_update) - file_len = win_size - 36; - if (file_len > 0) { - buf[0] = '\r'; -- snmprintf(buf+1, sizeof(buf)-1 , &file_len, "%*s", -- file_len * -1, file); -+ snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s", -+ file_len, file); - } - - /* percent of transfer done */ --- -2.16.5 -