Mail archive
alpine-aports

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

From: Valery Kartel <valery.kartel_at_gmail.com>
Date: Mon, 29 Feb 2016 16:47:21 +0200

---
 main/openssh/APKBUILD                      | 24 ++++++++++++------------
 main/openssh/bsd-compatible-realpath.patch |  4 ++--
 main/openssh/openssh7.1-dynwindows.diff    |  4 ++--
 3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/main/openssh/APKBUILD b/main/openssh/APKBUILD
index 7448994..df6dd43 100644
--- a/main/openssh/APKBUILD
+++ b/main/openssh/APKBUILD
_at_@ -1,6 +1,7 @@
+# Contributor: Valery Kartel <valery.kartel_at_gmail.com>
 # Maintainer: Natanael Copa <ncopa_at_alpinelinux.org>
 pkgname=openssh
-pkgver=7.1_p2
+pkgver=7.2_p1
 _myver=${pkgver%_*}${pkgver#*_}
 pkgrel=0
 pkgdesc="Port of OpenBSD's free SSH release"
_at_@ -40,10 +41,9 @@ prepare() {
 	done
 	sed -i -e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \
 		pathnames.h || return 1
-
 }
 
-build () {
+build() {
 	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
_at_@ -117,27 +117,27 @@ sftp() {
 		"$subpkgdir"/usr/lib/ssh/ || return 1
 }
 
-md5sums="4d8547670e2a220d5ef805ad9e47acf2  openssh-7.1p2.tar.gz
+md5sums="b984775f0cfff1f7ff18b8797fce8a28  openssh-7.2p1.tar.gz
 cd52fe99cb4b7d0d847bf5d710d93564  openssh6.5-peaktput.diff
-4104798484927922da11473bb0c3cfad  openssh7.1-dynwindows.diff
+9e9e9ef454c19544aaf152e37320cfa8  openssh7.1-dynwindows.diff
 37fbfe9cfb9a5e2454382ea8c79ed2e1  openssh-fix-utmp.diff
-8a2b8457148c29d9bf90955f6c142269  bsd-compatible-realpath.patch
+177e3fc8239080bbba5617b373d10e73  bsd-compatible-realpath.patch
 8590e08286f47a777725655873dd318f  sshd.initd
 b35e9f3829f4cfca07168fcba98749c7  sshd.confd
 2dd7e366607e95f9762273067309fd6e  openssh-sftp-interactive.diff"
-sha256sums="dd75f024dcf21e06a0d6421d582690bf987a1f6323e32ad6619392f3bfde6bbd  openssh-7.1p2.tar.gz
+sha256sums="973cc37b2f3597e4cf599b09e604e79c0fe5d9b6f595a24e91ed0662860b4ac3  openssh-7.2p1.tar.gz
 bf49212e47a86d10650f739532cea514a310925e6445b4f8011031b6b55f3249  openssh6.5-peaktput.diff
-ba70f20419fcf3cbec3457d8e3c67f193bba08665c8b1621c0ede17b82f8efa3  openssh7.1-dynwindows.diff
+ec2b52b1ba06a0d80e4b64d4dbc3d09a65a7a39e960dc2b9be6e1841b9852206  openssh7.1-dynwindows.diff
 1c85437fd94aa4fc269e6297e4eb790baa98c39949ec0410792c09ee31ba9782  openssh-fix-utmp.diff
-d17751be027684424a72d0d9fe2561a70a72396d75f30248688422687fa5b730  bsd-compatible-realpath.patch
+75930926f8381883c63d6de7a1f4ed63c2eedd1b682d4e9da8c760ac9242e1c6  bsd-compatible-realpath.patch
 c31a116bba900c6c4795b061766169e6455d6e1b7cf9aa2ee5ba4eaa1afa76b0  sshd.initd
 29c6d57ac3ec6018cadc6ba6cd9b90c9ed46e20049b970fdcc68ee2481a2ee41  sshd.confd
 4ce1ad5f767c0f4e854a0cfeef0e2e400f333c649e552df1ecc317e6a6557376  openssh-sftp-interactive.diff"
-sha512sums="d5be60f3645ec238b21e1f2dfd801b2136146674bbc086ebdb14be516c613819bc87c84b5089f3a45fe6e137a7458404f79f42572c69d91571e45ebed9d5e3af  openssh-7.1p2.tar.gz
+sha512sums="e6a1a6fbc420c5af76892f05ac5d7601533629a595869c6143edc3a21322faa72c5638ccb2e346d25af5703d77c1e1bebf2ace488d75aaaa5b3d5a65a53bdb54  openssh-7.2p1.tar.gz
 e041398e177674f698480e23be037160bd07b751c754956a3ddf1b964da24c85e826fb75e7c23c9826d36761da73d08db9583c047d58a08dc7b2149a949075b1  openssh6.5-peaktput.diff
-8501192cfdeb6f02a0ab6783dc99a86b5a057c2ee4bdb9dd83c4d76ad45941a626b4708c6048a9a8518777b958ce29a59f12f2eadbc598411dd32814c3ac96af  openssh7.1-dynwindows.diff
+3fec7cf352604206b20f6b41f362d9e35b3992558e0688de75e953c6ae596d336c25b93afe54d5318cb111294e5a7907df932c98e0c04d3fc8f0deea2f67120f  openssh7.1-dynwindows.diff
 f35fffcd26635249ce5d820e7b3e406e586f2d2d7f6a045f221e2f9fb53aebc1ab1dd1e603b3389462296ed77921a1d08456e7aaa3825cbed08f405b381a58e1  openssh-fix-utmp.diff
-4e551e341e3237cda1bfaf00e770a8b98a2e5ac72238ef305f793279d046c26649b44388b792f79bfc0814468099aa040216407ea9244dfe31ce87d33475b642  bsd-compatible-realpath.patch
+0f5299c8ac921a3e75934bd6145c35f9151c33f9dd4bf3067412c7bf3c8b8f5668edf9d0a8bfac3f9eaa0a3a0819e9292742d131aab1185cac2b358b4e89fec2  bsd-compatible-realpath.patch
 7e4378daebd8f5df0cd2f0709af806a0d4a78c948b8fc3baaf3585e5f5ec5d0793f7e4d0a450bc43bbcb92daa09bfab482cbceb396b993c0545adfe56573cd44  sshd.initd
 b9ae816af54a55e134a9307e376f05367b815f1b3fd545c2a2c312d18aedcf907f413e8bad8db980cdd9aad4011a72a79e1e94594f69500939a9cb46287f2f81  sshd.confd
 c1d09c65dbc347f0904edc30f91aa9a24b0baee50309536182455b544f1e3f85a8cecfa959e32be8b101d8282ef06dde3febbbc3f315489339dcf04155c859a9  openssh-sftp-interactive.diff"
diff --git a/main/openssh/bsd-compatible-realpath.patch b/main/openssh/bsd-compatible-realpath.patch
index 6931143..e3ed33f 100644
--- a/main/openssh/bsd-compatible-realpath.patch
+++ b/main/openssh/bsd-compatible-realpath.patch
_at_@ -28,8 +28,8 @@ index ba4cea9..1e67ebc 100644
   * in which case the path which caused trouble is left in (resolved).
   */
  char *
--realpath(const char *path, char resolved[PATH_MAX])
-+ssh_realpath(const char *path, char resolved[PATH_MAX])
+-realpath(const char *path, char *resolved)
++ssh_realpath(const char *path, char *resolved)
  {
  	struct stat sb;
  	char *p, *q, *s;
diff --git a/main/openssh/openssh7.1-dynwindows.diff b/main/openssh/openssh7.1-dynwindows.diff
index 190ea81..7c0644f 100644
--- a/main/openssh/openssh7.1-dynwindows.diff
+++ b/main/openssh/openssh7.1-dynwindows.diff
_at_@ -863,9 +863,9 @@ index d917ca1..41a6023 100644
 --- a/version.h
 +++ b/version.h
 _at_@ -3,4 +3,5 @@
- #define SSH_VERSION	"OpenSSH_7.1"
+ #define SSH_VERSION	"OpenSSH_7.2"
  
- #define SSH_PORTABLE	"p2"
+ #define SSH_PORTABLE	"p1"
 -#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
 +#define SSH_HPN         "-hpn14v4"
 +#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
-- 
2.7.2
---
Unsubscribe:  alpine-aports+unsubscribe_at_lists.alpinelinux.org
Help:         alpine-aports+help_at_lists.alpinelinux.org
---
Received on Mon Feb 29 2016 - 16:47:21 GMT