From b0f9e06469526a7b755a0bb7ec6fd8dc43a8d3db Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Sun, 19 May 2019 13:11:20 +0200
Subject: [PATCH] openssh: fix scp progress output

---
 openssh/build.sh                              |  4 +-
 openssh/meta/ChangeLog                        |  3 ++
 ...-correct-according-to-POSIX-format-f.patch | 37 +++++++++++++++++++
 3 files changed, 42 insertions(+), 2 deletions(-)
 create 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 52cb04a..9a340cf 100755
--- a/openssh/build.sh
+++ b/openssh/build.sh
@@ -7,10 +7,10 @@
 # Check the following 4 variables before running the script
 topdir=openssh
 version=8.0p1
-pkgver=1
+pkgver=2
 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-upstream-Use-the-correct-according-to-POSIX-format-f.patch
 
 # Source function library
 . ${BUILDPKG_SCRIPTS}/buildpkg.functions
diff --git a/openssh/meta/ChangeLog b/openssh/meta/ChangeLog
index 791bcde..052c479 100644
--- a/openssh/meta/ChangeLog
+++ b/openssh/meta/ChangeLog
@@ -1,5 +1,8 @@
 CHANGELOG
 ---------
+* Sun May 19 2019 Tom G. Christensen <swpkg@jupiterrise.com> - 8.0p1-2
+- Add upstream patch to fix scp progress output
+
 * Mon Apr 22 2019 Tom G. Christensen <swpkg@jupiterrise.com> - 8.0p1-1
 - Update to 8.0p1
 
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
new file mode 100644
index 0000000..a5ce00e
--- /dev/null
+++ b/openssh/src/0001-upstream-Use-the-correct-according-to-POSIX-format-f.patch
@@ -0,0 +1,37 @@
+From 62dd70613b77b229f53db3cc1c3e8a206fa2b582 Mon Sep 17 00:00:00 2001
+From: "dtucker@openbsd.org" <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
+