aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValery Kartel <valery.kartel@gmail.com>2016-03-13 23:58:43 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2016-03-18 09:33:30 +0000
commit71eb72d62425082850604f526dbcbfdcf2808c31 (patch)
tree3a2e976a8bf9b37b4510c831a3f9e3b42f9fb2b4
parentaaa595b864419c14130b221b831841c9bfd4a7cb (diff)
downloadaports-71eb72d62425082850604f526dbcbfdcf2808c31.tar.bz2
aports-71eb72d62425082850604f526dbcbfdcf2808c31.tar.xz
main/openssh: security upgrade to 7.2_p2, closed http://www.openssh.com/txt/x11fwd.adv
-rw-r--r--main/openssh/APKBUILD16
-rw-r--r--main/openssh/openssh7.1-dynwindows.diff2
2 files changed, 9 insertions, 9 deletions
diff --git a/main/openssh/APKBUILD b/main/openssh/APKBUILD
index df6dd4348f..e2a74258b9 100644
--- a/main/openssh/APKBUILD
+++ b/main/openssh/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=openssh
-pkgver=7.2_p1
+pkgver=7.2_p2
_myver=${pkgver%_*}${pkgver#*_}
pkgrel=0
pkgdesc="Port of OpenBSD's free SSH release"
@@ -53,6 +53,7 @@ build() {
--datadir=/usr/share/openssh \
--libexecdir=/usr/lib/ssh \
--mandir=/usr/share/man \
+ --with-pid-dir=/run \
--with-mantype=man \
--with-ldflags="${LDFLAGS}" \
--disable-strip \
@@ -87,7 +88,6 @@ client() {
install -d "$subpkgdir"/usr/bin \
"$subpkgdir"/usr/lib/ssh \
"$subpkgdir"/etc/ssh \
- "$subpkgdir"/var/run \
"$subpkgdir"/var/empty
mv "$pkgdir"/usr/bin/* \
@@ -117,25 +117,25 @@ sftp() {
"$subpkgdir"/usr/lib/ssh/ || return 1
}
-md5sums="b984775f0cfff1f7ff18b8797fce8a28 openssh-7.2p1.tar.gz
+md5sums="13009a9156510d8f27e752659075cced openssh-7.2p2.tar.gz
cd52fe99cb4b7d0d847bf5d710d93564 openssh6.5-peaktput.diff
-9e9e9ef454c19544aaf152e37320cfa8 openssh7.1-dynwindows.diff
+6337ad8a38783c8f1285cf4f97fc451f openssh7.1-dynwindows.diff
37fbfe9cfb9a5e2454382ea8c79ed2e1 openssh-fix-utmp.diff
177e3fc8239080bbba5617b373d10e73 bsd-compatible-realpath.patch
8590e08286f47a777725655873dd318f sshd.initd
b35e9f3829f4cfca07168fcba98749c7 sshd.confd
2dd7e366607e95f9762273067309fd6e openssh-sftp-interactive.diff"
-sha256sums="973cc37b2f3597e4cf599b09e604e79c0fe5d9b6f595a24e91ed0662860b4ac3 openssh-7.2p1.tar.gz
+sha256sums="a72781d1a043876a224ff1b0032daa4094d87565a68528759c1c2cab5482548c openssh-7.2p2.tar.gz
bf49212e47a86d10650f739532cea514a310925e6445b4f8011031b6b55f3249 openssh6.5-peaktput.diff
-ec2b52b1ba06a0d80e4b64d4dbc3d09a65a7a39e960dc2b9be6e1841b9852206 openssh7.1-dynwindows.diff
+861132af07c18f5e0ac7b64f389a929e61a051887bf44bda770a97e3afd9bfb6 openssh7.1-dynwindows.diff
1c85437fd94aa4fc269e6297e4eb790baa98c39949ec0410792c09ee31ba9782 openssh-fix-utmp.diff
75930926f8381883c63d6de7a1f4ed63c2eedd1b682d4e9da8c760ac9242e1c6 bsd-compatible-realpath.patch
c31a116bba900c6c4795b061766169e6455d6e1b7cf9aa2ee5ba4eaa1afa76b0 sshd.initd
29c6d57ac3ec6018cadc6ba6cd9b90c9ed46e20049b970fdcc68ee2481a2ee41 sshd.confd
4ce1ad5f767c0f4e854a0cfeef0e2e400f333c649e552df1ecc317e6a6557376 openssh-sftp-interactive.diff"
-sha512sums="e6a1a6fbc420c5af76892f05ac5d7601533629a595869c6143edc3a21322faa72c5638ccb2e346d25af5703d77c1e1bebf2ace488d75aaaa5b3d5a65a53bdb54 openssh-7.2p1.tar.gz
+sha512sums="44f62b3a7bc50a0735d496a5aedeefb71550d8c10ad8f22b94e29fcc8084842db96e8c4ca41fced17af69e1aab09ed1182a12ad8650d9a46fd8743a0344df95b openssh-7.2p2.tar.gz
e041398e177674f698480e23be037160bd07b751c754956a3ddf1b964da24c85e826fb75e7c23c9826d36761da73d08db9583c047d58a08dc7b2149a949075b1 openssh6.5-peaktput.diff
-3fec7cf352604206b20f6b41f362d9e35b3992558e0688de75e953c6ae596d336c25b93afe54d5318cb111294e5a7907df932c98e0c04d3fc8f0deea2f67120f openssh7.1-dynwindows.diff
+72a7dc21d18388c635d14dda762ac50caeefd38f0153d8ea36d18e9d7c982e104f7b7a3af8c18fd479c31201fbdee1639f3a1ec60d035d4ca8721a8563fa11a0 openssh7.1-dynwindows.diff
f35fffcd26635249ce5d820e7b3e406e586f2d2d7f6a045f221e2f9fb53aebc1ab1dd1e603b3389462296ed77921a1d08456e7aaa3825cbed08f405b381a58e1 openssh-fix-utmp.diff
0f5299c8ac921a3e75934bd6145c35f9151c33f9dd4bf3067412c7bf3c8b8f5668edf9d0a8bfac3f9eaa0a3a0819e9292742d131aab1185cac2b358b4e89fec2 bsd-compatible-realpath.patch
7e4378daebd8f5df0cd2f0709af806a0d4a78c948b8fc3baaf3585e5f5ec5d0793f7e4d0a450bc43bbcb92daa09bfab482cbceb396b993c0545adfe56573cd44 sshd.initd
diff --git a/main/openssh/openssh7.1-dynwindows.diff b/main/openssh/openssh7.1-dynwindows.diff
index 7c0644f570..933623ab2c 100644
--- a/main/openssh/openssh7.1-dynwindows.diff
+++ b/main/openssh/openssh7.1-dynwindows.diff
@@ -865,7 +865,7 @@ index d917ca1..41a6023 100644
@@ -3,4 +3,5 @@
#define SSH_VERSION "OpenSSH_7.2"
- #define SSH_PORTABLE "p1"
+ #define SSH_PORTABLE "p2"
-#define SSH_RELEASE SSH_VERSION SSH_PORTABLE
+#define SSH_HPN "-hpn14v4"
+#define SSH_RELEASE SSH_VERSION SSH_PORTABLE SSH_HPN