summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2018-10-23 04:17:12 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2018-10-23 04:17:12 +0000
commit5f4c070256f086ad385eccdae2b95c16c8ef61dc (patch)
tree34b6643e00d1194befd8eb14cef224ff777805a0
parentee16dd2a37c88e2ada089485683a8a7c1f63891c (diff)
downloadpackages-5f4c070256f086ad385eccdae2b95c16c8ef61dc.tar.gz
packages-5f4c070256f086ad385eccdae2b95c16c8ef61dc.tar.bz2
packages-5f4c070256f086ad385eccdae2b95c16c8ef61dc.tar.xz
packages-5f4c070256f086ad385eccdae2b95c16c8ef61dc.zip
system/openssh: secbump to 7.9_p1
-rw-r--r--system/openssh/APKBUILD10
-rw-r--r--system/openssh/openssh-7.9_p1-openssl-1.0.2-compat.patch13
2 files changed, 20 insertions, 3 deletions
diff --git a/system/openssh/APKBUILD b/system/openssh/APKBUILD
index f4ea3ae3c..4394eb5c2 100644
--- a/system/openssh/APKBUILD
+++ b/system/openssh/APKBUILD
@@ -2,9 +2,9 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Horst Burkhardt <horst@adelielinux.org>
pkgname=openssh
-pkgver=7.7_p1
+pkgver=7.9_p1
_myver=${pkgver%_*}${pkgver#*_}
-pkgrel=2
+pkgrel=0
pkgdesc="Port of OpenBSD's free SSH release"
url="http://www.openssh.org/portable.html"
arch="all"
@@ -29,12 +29,15 @@ source="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.tar
disable-forwarding-by-default.patch
fix-utmpx.patch
openssh7.4-peaktput.patch
+ openssh-7.9_p1-openssl-1.0.2-compat.patch
sftp-interactive.patch
sshd.initd
sshd.confd
"
# secfixes:
+# 7.9_p1:
+# - CVE-2018-15473
# 7.7_p1:
# - CVE-2017-15906
# 7.4_p1:
@@ -150,11 +153,12 @@ server() {
mv "$pkgdir"/usr/sbin/sshd "$subpkgdir"/usr/sbin/
}
-sha512sums="597252cb48209a0cb98ca1928a67e8d63e4275252f25bc37269204c108f034baade6ba0634e32ae63422fddd280f73096a6b31ad2f2e7a848dde75ca30e14261 openssh-7.7p1.tar.gz
+sha512sums="0412c9c429c9287f0794023951469c8e6ec833cdb55821bfa0300dd90d0879ff60484f620cffd93372641ab69bf0b032c2d700ccc680950892725fb631b7708e openssh-7.9p1.tar.gz
f2b8daa537ea3f32754a4485492cc6eb3f40133ed46c0a5a29a89e4bcf8583d82d891d94bf2e5eb1c916fa68ec094abf4e6cd641e9737a6c05053808012b3a73 bsd-compatible-realpath.patch
8df35d72224cd255eb0685d2c707b24e5eb24f0fdd67ca6cc0f615bdbd3eeeea2d18674a6af0c6dab74c2d8247e2370d0b755a84c99f766a431bc50c40b557de disable-forwarding-by-default.patch
0c1e832cec420bc7b57558041d2288912a438db97050b87f6a57e94a2741a374cc5d141fe352968b0d1ba6accaff965794463fe9169d136678a8915a60d2f0b7 fix-utmpx.patch
398096a89aa104abeff31aa043ac406a6348e0fdd4d313b7888ee0b931d38fd71fc21bceee46145e88f03bc27e00890e068442faee2d33f86cfbc04d58ffa4b6 openssh7.4-peaktput.patch
+dde28496df7ee74a2bbcf0aba389abefade3dc41f7d10dc6d3c1a0aca087478bafe10d31ec5e61e758084fa0a2a7c64314502091d900d9cee487c1bdc92722a6 openssh-7.9_p1-openssl-1.0.2-compat.patch
c1d09c65dbc347f0904edc30f91aa9a24b0baee50309536182455b544f1e3f85a8cecfa959e32be8b101d8282ef06dde3febbbc3f315489339dcf04155c859a9 sftp-interactive.patch
394a420a36880bb0dd37dfd8727cea91fd9de6534050169e21212a46513ef3aaafe2752c338699b3d4ccd14871b26cf01a152df8060cd37f86ce0665fd53c63f sshd.initd
ce0abddbd2004891f88efd8522c4b37a4989290269fab339c0fa9aacc051f7fd3b20813e192e92e0e64315750041cb74012d4321260f4865ff69d7a935b259d4 sshd.confd"
diff --git a/system/openssh/openssh-7.9_p1-openssl-1.0.2-compat.patch b/system/openssh/openssh-7.9_p1-openssl-1.0.2-compat.patch
new file mode 100644
index 000000000..c1c310e8f
--- /dev/null
+++ b/system/openssh/openssh-7.9_p1-openssl-1.0.2-compat.patch
@@ -0,0 +1,13 @@
+diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c
+index 8b4a3627..590b66d1 100644
+--- a/openbsd-compat/openssl-compat.c
++++ b/openbsd-compat/openssl-compat.c
+@@ -76,7 +76,7 @@ ssh_OpenSSL_add_all_algorithms(void)
+ ENGINE_load_builtin_engines();
+ ENGINE_register_all_complete();
+
+-#if OPENSSL_VERSION_NUMBER < 0x10001000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ OPENSSL_config(NULL);
+ #else
+ OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS |