Subject: [alpine-aports] [PATCH] main/openssh: upgrade to 7.4_p1

From: Valery Kartel <[email-masked]>
Date: Tue, 20 Dec 2016 10:03:03 +0200

---
 main/openssh/APKBUILD | 38 ++++++++++++++------------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/main/openssh/APKBUILD b/main/openssh/APKBUILD
index b713e3b3b7..479e390deb 100644
--- a/main/openssh/APKBUILD
+++ b/main/openssh/APKBUILD
@@ -1,21 +1,19 @@
 # Conptributor: Valery Kartel <[email-masked]>
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=openssh
-pkgver=7.3_p1
-_myver=${pkgver%_*}${pkgver#*_}
-pkgrel=2
+pkgver=7.4_p1
+pkgrel=0
+_pkgver=${pkgver%_*}${pkgver#*_}
 pkgdesc="Port of OpenBSD's free SSH release"
 url="http://www.openssh.org/portable.html"
 arch="all"
 license="as-is"
 options="suid"
 depends="openssh-client openssh-sftp-server"
-makedepends_build=""
-makedepends_host="libressl-dev zlib-dev linux-headers"
-makedepends="$makedepends_build $makedepends_host"
+makedepends="libressl-dev zlib-dev linux-headers"
 subpackages="$pkgname-doc $pkgname-client $pkgname-keysign
 	$pkgname-sftp-server:sftp"
-source="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.tar.gz
+source="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_pkgver.tar.gz
 	openssh6.5-peaktput.diff
 	openssh7.1-dynwindows.diff
 	openssh-fix-utmp.diff
@@ -25,8 +23,8 @@ source="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.tar
 	openssh-sftp-interactive.diff
 	"
 # HPN patches are from: http://www.psc.edu/index.php/hpn-ssh
+builddir="$srcdir"/$pkgname-$_pkgver
 
-builddir="$srcdir"/$pkgname-$_myver
 prepare() {
 	cd "$builddir"
 	default_prepare
@@ -64,10 +62,8 @@ package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	mkdir -p "$pkgdir"/var/empty
-	install -D -m755 "$srcdir"/sshd.initd \
-		"$pkgdir"/etc/init.d/sshd || return 1
-	install -D -m644 "$srcdir"/sshd.confd \
-		"$pkgdir"/etc/conf.d/sshd || return 1
+	install -Dm755 "$srcdir"/sshd.initd "$pkgdir"/etc/init.d/sshd
+	install -Dm644 "$srcdir"/sshd.confd "$pkgdir"/etc/conf.d/sshd
 	install -Dm644 "$builddir"/contrib/ssh-copy-id.1 \
 		"$pkgdir"/usr/share/man/man1/ssh-copy-id.1 || return 1
 	sed -i 's/#UseDNS yes/UseDNS no/' "$pkgdir"/etc/ssh/sshd_config
@@ -75,20 +71,14 @@ package() {
 
 client() {
 	pkgdesc="OpenBSD's SSH client"
-	replaces="openssh"
-	depends=
-	install -d "$subpkgdir"/usr/bin \
-		"$subpkgdir"/usr/lib/ssh \
+	depends=""
+	mkdir -p "$subpkgdir"/usr/lib/ssh \
 		"$subpkgdir"/etc/ssh \
 		"$subpkgdir"/var/empty
-
-	mv "$pkgdir"/usr/bin/* \
-		"$subpkgdir"/usr/bin/ || return 1
+	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
 	mv "$pkgdir"/etc/ssh/ssh_config \
 		"$pkgdir"/etc/ssh/moduli \
 		"$subpkgdir"/etc/ssh/ || return 1
-	install -Dm755 "$builddir"/contrib/findssl.sh \
-		"$subpkgdir"/usr/bin/findssl.sh || return 1
 	install -Dm755 "$builddir"/contrib/ssh-copy-id \
 		"$subpkgdir"/usr/bin/ssh-copy-id || return 1
 }
@@ -109,7 +99,7 @@ sftp() {
 		"$subpkgdir"/usr/lib/ssh/ || return 1
 }
 
-md5sums="dfadd9f035d38ce5d58a3bf130b86d08  openssh-7.3p1.tar.gz
+md5sums="b2db2a83caf66a208bb78d6d287cdaa3  openssh-7.4p1.tar.gz
 cd52fe99cb4b7d0d847bf5d710d93564  openssh6.5-peaktput.diff
 6337ad8a38783c8f1285cf4f97fc451f  openssh7.1-dynwindows.diff
 37fbfe9cfb9a5e2454382ea8c79ed2e1  openssh-fix-utmp.diff
@@ -117,7 +107,7 @@ e21243d6ddff1bb929eed3676b4b9a2a  bsd-compatible-realpath.patch
 8ae02e304db5d42790b7269b03a8985f  sshd.initd
 ccff4ede2075bcdaa070940cb4eadba2  sshd.confd
 2dd7e366607e95f9762273067309fd6e  openssh-sftp-interactive.diff"
-sha256sums="3ffb989a6dcaa69594c3b550d4855a5a2e1718ccdde7f5e36387b424220fbecc  openssh-7.3p1.tar.gz
+sha256sums="1b1fc4a14e2024293181924ed24872e6f2e06293f3e8926a376b8aec481f19d1  openssh-7.4p1.tar.gz
 bf49212e47a86d10650f739532cea514a310925e6445b4f8011031b6b55f3249  openssh6.5-peaktput.diff
 861132af07c18f5e0ac7b64f389a929e61a051887bf44bda770a97e3afd9bfb6  openssh7.1-dynwindows.diff
 1c85437fd94aa4fc269e6297e4eb790baa98c39949ec0410792c09ee31ba9782  openssh-fix-utmp.diff
@@ -125,7 +115,7 @@ a843cacd7002a68e9d09b5d8ea1466c9980fa35fa3ccd8d9357ac793017de2a6  bsd-compatible
 18521d52f5e38d5820732356d210fb45922f7b848b7c9ca0bb3823de9e088e1d  sshd.initd
 3342d2fc9b174f898f887237002f04fa9bc01c31e9a851e063ca7de8825ad0eb  sshd.confd
 4ce1ad5f767c0f4e854a0cfeef0e2e400f333c649e552df1ecc317e6a6557376  openssh-sftp-interactive.diff"
-sha512sums="7ba2d6140f38bd359ebf32ef17626e0ae1c00c3a38c01877b7c6b0317d030f10a8f82a0a51fc3b6273619de9ed73e24b8cf107b1e968f927053a3bedf97ff801  openssh-7.3p1.tar.gz
+sha512sums="4f3256f461f01366c5d5e0e45285eec65016e2643b3284b407f48f53d81087bf2c1caf7d5f7530d307a15c91c64de91446e1cba948e8fc68f82098290fe3b292  openssh-7.4p1.tar.gz
 e041398e177674f698480e23be037160bd07b751c754956a3ddf1b964da24c85e826fb75e7c23c9826d36761da73d08db9583c047d58a08dc7b2149a949075b1  openssh6.5-peaktput.diff
 72a7dc21d18388c635d14dda762ac50caeefd38f0153d8ea36d18e9d7c982e104f7b7a3af8c18fd479c31201fbdee1639f3a1ec60d035d4ca8721a8563fa11a0  openssh7.1-dynwindows.diff
 f35fffcd26635249ce5d820e7b3e406e586f2d2d7f6a045f221e2f9fb53aebc1ab1dd1e603b3389462296ed77921a1d08456e7aaa3825cbed08f405b381a58e1  openssh-fix-utmp.diff
-- 
2.11.0

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---