Date: Tuesday, October 16, 2018 @ 21:09:21 Author: bisson Revision: 336776
prepare for 7.9 release Added: openssh/trunk/openssl.patch Modified: openssh/trunk/PKGBUILD.snap ---------------+ PKGBUILD.snap | 14 ++++++-------- openssl.patch | 12 ++++++++++++ 2 files changed, 18 insertions(+), 8 deletions(-) Modified: PKGBUILD.snap =================================================================== --- PKGBUILD.snap 2018-10-16 20:22:17 UTC (rev 336775) +++ PKGBUILD.snap 2018-10-16 21:09:21 UTC (rev 336776) @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 314130 2018-01-06 07:47:20Z bisson $ # Maintainer: Gaetan Bisson <bis...@archlinux.org> # Contributor: Aaron Griffin <aa...@archlinux.org> # Contributor: judd <jvi...@zeroflux.org> pkgname=openssh -pkgver=7.7snap20180330 +pkgver=7.9snap20181017 pkgrel=1 pkgdesc='Premier connectivity tool for remote login with the SSH protocol' url='https://www.openssh.com/portable.html' @@ -16,8 +15,8 @@ 'x11-ssh-askpass: input passphrase in X') validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30') #source=("https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc} -source=("http://www.mindrot.org/openssh_snap/openssh-SNAP-20180330.tar.gz"; - 'openssl-1.1.0.patch' +source=("http://www.mindrot.org/openssh_snap/openssh-SNAP-20181017.tar.gz"; + 'openssl.patch' 'sshdgenkeys.service' 'sshd@.service' 'sshd.service' @@ -26,8 +25,8 @@ 'sshd.pam') #sha256sums=('a323caeeddfe145baaa0db16e98d784b1fbc7dd436a6bf1f479dfd5cd1d21723' # 'SKIP' -sha256sums=('df30a1f3cd4f7b0b6456b4d120e698f29b279f8e8a9fdb20135f2e12783cbf10' - 'fa91849cc3161916f563bda5413676342e0bcc2705857e9d01b73c70e4904adf' +sha256sums=('9981061d56b92e647ee0c911378f34043e154e487e24af46cc782e2e342d6891' + '48631e7520cd2bf0a1b02f9f593770075c1ff7feef8b305a4ac70186cced4d10' '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7' '3a0845737207f4eda221c9c9fb64e766ade9684562d8ba4f705f7ae6826886e5' 'c5ed9fa629f8f8dbf3bae4edbad4441c36df535088553fe82695c52d7bde30aa' @@ -41,8 +40,7 @@ # cd "${srcdir}/${pkgname}-${pkgver}" cd "${srcdir}/${pkgname}" - # OpenSSL 1.1.0 patch from http://vega.pgw.jp/~kabe/vsd/patch/openssh-7.4p1-openssl-1.1.0c.patch.html - patch -p1 -i ../openssl-1.1.0.patch + patch -p1 -i ../openssl.patch } build() { Added: openssl.patch =================================================================== --- openssl.patch (rev 0) +++ openssl.patch 2018-10-16 21:09:21 UTC (rev 336776) @@ -0,0 +1,12 @@ +diff -Naur old/openbsd-compat/openssl-compat.c new/openbsd-compat/openssl-compat.c +--- old/openbsd-compat/openssl-compat.c 2018-10-15 17:45:57.000000000 -1000 ++++ new/openbsd-compat/openssl-compat.c 2018-10-16 10:26:49.674621575 -1000 +@@ -80,7 +80,7 @@ + OPENSSL_config(NULL); + #else + OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS | +- OPENSSL_INIT_ADD_ALL_DIGESTS | OPENSSL_INIT_LOAD_CONFIG); ++ OPENSSL_INIT_ADD_ALL_DIGESTS | OPENSSL_INIT_LOAD_CONFIG, NULL); + #endif + } + #endif
