[arch-commits] Commit in openssh/trunk (PKGBUILD.snap)

2020-09-26 Thread Levente Polyak via arch-commits 
Date: Saturday, September 26, 2020 @ 19:51:14
  Author: anthraxx
Revision: 396594

upgpkg: openssh 8.3p1-5: libxcrypt rebuild

Deleted:
  openssh/trunk/PKGBUILD.snap

---+
 PKGBUILD.snap |  105 
 1 file changed, 105 deletions(-)

Deleted: PKGBUILD.snap
===
--- PKGBUILD.snap   2020-09-26 19:50:57 UTC (rev 396593)
+++ PKGBUILD.snap   2020-09-26 19:51:14 UTC (rev 396594)
@@ -1,105 +0,0 @@
-# Maintainer: Gaetan Bisson 
-# Contributor: Aaron Griffin 
-# Contributor: judd 
-
-pkgname=openssh
-_YMD=20200206
-pkgver=8.2p1snap$_YMD
-pkgrel=1
-pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
-url='https://www.openssh.com/portable.html'
-license=('custom:BSD')
-arch=('x86_64')
-makedepends=('linux-headers')
-depends=('krb5' 'openssl' 'libedit' 'ldns')
-optdepends=('xorg-xauth: X11 forwarding'
-'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-$_YMD.tar.gz";
-'sshdgenkeys.service'
-'sshd.service'
-'sshd.conf'
-'sshd.pam'
-'glibc-2.31.patch')
-#sha256sums=('02f5dbef3835d0753556f973cd57b4c19b6b1f6cd24c03445e23ac77ca1b93ff'
-#'SKIP'
-sha256sums=('3158a493c6d29e40246266d16bc3343a8acfb8a1fa55c9978f57e6a9c9a4fb7d'
-'4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
-'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7'
-'4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6'
-'64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846'
-'25b4a4d9e2d9d3289ef30636a30e85fa1c71dd930d5efd712cca1a01a5019f93')
-
-backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
-
-install=install
-
-prepare() {
-#  cd "${srcdir}/${pkgname}-${pkgver}"
-   cd "${srcdir}/${pkgname}"
-
-   patch -p1 -i "${srcdir}/glibc-2.31.patch"
-}
-
-build() {
-#  cd "${srcdir}/${pkgname}-${pkgver}"
-   cd "${srcdir}/${pkgname}"
-
-   ./configure \
-   --prefix=/usr \
-   --sbindir=/usr/bin \
-   --libexecdir=/usr/lib/ssh \
-   --sysconfdir=/etc/ssh \
-   --disable-strip \
-   --with-ldns \
-   --with-libedit \
-   --with-ssl-engine \
-   --with-pam \
-   --with-privsep-user=nobody \
-   --with-kerberos5=/usr \
-   --with-xauth=/usr/bin/xauth \
-   --with-md5-passwords \
-   --with-pid-dir=/run \
-   --with-default-path='/usr/local/sbin:/usr/local/bin:/usr/bin' \
-
-   make
-}
-
-check() {
-#  cd "${srcdir}/${pkgname}-${pkgver}"
-   cd "${srcdir}/${pkgname}"
-
-   # Tests require openssh to be already installed system-wide,
-   # also connectivity tests will fail under makechrootpkg since
-# it runs as nobody which has /bin/false as login shell.
-
-   if [[ -e /usr/bin/scp && ! -e /.arch-chroot ]]; then
-   make tests
-   fi
-}
-
-package() {
-#  cd "${srcdir}/${pkgname}-${pkgver}"
-   cd "${srcdir}/${pkgname}"
-
-   make DESTDIR="${pkgdir}" install
-
-   ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz
-   install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
-
-   install -Dm644 ../sshdgenkeys.service 
"${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service
-   install -Dm644 ../sshd.service 
"${pkgdir}"/usr/lib/systemd/system/sshd.service
-   install -Dm644 ../sshd.conf "${pkgdir}"/usr/lib/tmpfiles.d/sshd.conf
-   install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd
-
-   install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh
-   install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id
-   install -Dm644 contrib/ssh-copy-id.1 
"${pkgdir}"/usr/share/man/man1/ssh-copy-id.1
-
-   sed \
-   -e '/^#ChallengeResponseAuthentication yes$/c 
ChallengeResponseAuthentication no' \
-   -e '/^#PrintMotd yes$/c PrintMotd no # pam does that' \
-   -e '/^#UsePAM no$/c UsePAM yes' \
-   -i "${pkgdir}"/etc/ssh/sshd_config
-}

[arch-commits] Commit in openssh/trunk (PKGBUILD.snap)

2020-02-06 Thread Gaëtan Bisson via arch-commits 
Date: Friday, February 7, 2020 @ 03:18:39
  Author: bisson
Revision: 374969

bump snap version

Modified:
  openssh/trunk/PKGBUILD.snap

---+
 PKGBUILD.snap |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD.snap
===
--- PKGBUILD.snap   2020-02-06 19:46:49 UTC (rev 374968)
+++ PKGBUILD.snap   2020-02-07 03:18:39 UTC (rev 374969)
@@ -4,7 +4,7 @@
 
 pkgname=openssh
 _YMD=20200206
-pkgver=8.1p1snap$_YMD
+pkgver=8.2p1snap$_YMD
 pkgrel=1
 pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
 url='https://www.openssh.com/portable.html'

[arch-commits] Commit in openssh/trunk (PKGBUILD.snap)

2020-02-05 Thread Gaëtan Bisson via arch-commits 
Date: Thursday, February 6, 2020 @ 07:44:53
  Author: bisson
Revision: 374730

fix path

Modified:
  openssh/trunk/PKGBUILD.snap

---+
 PKGBUILD.snap |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Modified: PKGBUILD.snap
===
--- PKGBUILD.snap   2020-02-06 07:38:35 UTC (rev 374729)
+++ PKGBUILD.snap   2020-02-06 07:44:53 UTC (rev 374730)
@@ -36,7 +36,9 @@
 install=install
 
 prepare() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
+#  cd "${srcdir}/${pkgname}-${pkgver}"
+   cd "${srcdir}/${pkgname}"
+
patch -p1 -i "${srcdir}/glibc-2.31.patch"
 }

[arch-commits] Commit in openssh/trunk (PKGBUILD.snap)

2020-02-05 Thread Gaëtan Bisson via arch-commits 
Date: Thursday, February 6, 2020 @ 07:37:30
  Author: bisson
Revision: 374727

update snap PKGBUILD for upcoming release

Modified:
  openssh/trunk/PKGBUILD.snap

---+
 PKGBUILD.snap |   20 +++-
 1 file changed, 15 insertions(+), 5 deletions(-)

Modified: PKGBUILD.snap
===
--- PKGBUILD.snap   2020-02-06 06:16:47 UTC (rev 374726)
+++ PKGBUILD.snap   2020-02-06 07:37:30 UTC (rev 374727)
@@ -3,7 +3,7 @@
 # Contributor: judd 
 
 pkgname=openssh
-_YMD=20191002
+_YMD=20200206
 pkgver=8.1p1snap$_YMD
 pkgrel=1
 pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
@@ -20,17 +20,26 @@
 'sshdgenkeys.service'
 'sshd.service'
 'sshd.conf'
-'sshd.pam')
-#sha256sums=('6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad3'
+'sshd.pam'
+'glibc-2.31.patch')
+#sha256sums=('02f5dbef3835d0753556f973cd57b4c19b6b1f6cd24c03445e23ac77ca1b93ff'
 #'SKIP'
-sha256sums=('bcf8f1316f0bedf863f30ee4d18bc9eaab76502adac81d2fd50f30d8290caf0f'
+sha256sums=('3158a493c6d29e40246266d16bc3343a8acfb8a1fa55c9978f57e6a9c9a4fb7d'
 '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
 'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7'
 '4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6'
-'64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846')
+'64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846'
+'25b4a4d9e2d9d3289ef30636a30e85fa1c71dd930d5efd712cca1a01a5019f93')
 
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
 
+install=install
+
+prepare() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   patch -p1 -i "${srcdir}/glibc-2.31.patch"
+}
+
 build() {
 #  cd "${srcdir}/${pkgname}-${pkgver}"
cd "${srcdir}/${pkgname}"
@@ -40,6 +49,7 @@
--sbindir=/usr/bin \
--libexecdir=/usr/lib/ssh \
--sysconfdir=/etc/ssh \
+   --disable-strip \
--with-ldns \
--with-libedit \
--with-ssl-engine \

[arch-commits] Commit in openssh/trunk (PKGBUILD.snap)

2019-10-11 Thread Gaëtan Bisson via arch-commits 
Date: Friday, October 11, 2019 @ 11:43:55
  Author: bisson
Revision: 364631

needed for proper ordering

Modified:
  openssh/trunk/PKGBUILD.snap

---+
 PKGBUILD.snap |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD.snap
===
--- PKGBUILD.snap   2019-10-11 11:35:09 UTC (rev 364630)
+++ PKGBUILD.snap   2019-10-11 11:43:55 UTC (rev 364631)
@@ -4,7 +4,7 @@
 
 pkgname=openssh
 _YMD=20191002
-pkgver=8.1snap$_YMD
+pkgver=8.1p1snap$_YMD
 pkgrel=1
 pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
 url='https://www.openssh.com/portable.html'

[arch-commits] Commit in openssh/trunk (PKGBUILD.snap)

2019-10-01 Thread Gaëtan Bisson via arch-commits 
Date: Wednesday, October 2, 2019 @ 01:26:24
  Author: bisson
Revision: 363645

release 8.1p1 is near

Modified:
  openssh/trunk/PKGBUILD.snap

---+
 PKGBUILD.snap |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD.snap
===
--- PKGBUILD.snap   2019-10-01 23:39:30 UTC (rev 363644)
+++ PKGBUILD.snap   2019-10-02 01:26:24 UTC (rev 363645)
@@ -3,8 +3,8 @@
 # Contributor: judd 
 
 pkgname=openssh
-_YMD=20190414
-pkgver=8.0snap$_YMD
+_YMD=20191002
+pkgver=8.1snap$_YMD
 pkgrel=1
 pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
 url='https://www.openssh.com/portable.html'
@@ -23,7 +23,7 @@
 'sshd.pam')
 
#sha256sums=('6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad3'
 #'SKIP'
-sha256sums=('6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad'
+sha256sums=('bcf8f1316f0bedf863f30ee4d18bc9eaab76502adac81d2fd50f30d8290caf0f'
 '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
 'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7'
 '4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6'

[arch-commits] Commit in openssh/trunk (PKGBUILD.snap)

2019-04-18 Thread Gaëtan Bisson via arch-commits 
Date: Thursday, April 18, 2019 @ 18:31:54
  Author: bisson
Revision: 350890

restore better snapshot PKGBUILD

Modified:
  openssh/trunk/PKGBUILD.snap

---+
 PKGBUILD.snap |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD.snap
===
--- PKGBUILD.snap   2019-04-18 18:30:40 UTC (rev 350889)
+++ PKGBUILD.snap   2019-04-18 18:31:54 UTC (rev 350890)
@@ -3,7 +3,8 @@
 # Contributor: judd 
 
 pkgname=openssh
-pkgver=7.9snap20181017
+_YMD=20190414
+pkgver=8.0snap$_YMD
 pkgrel=1
 pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
 url='https://www.openssh.com/portable.html'
@@ -15,7 +16,7 @@
 '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-20181017.tar.gz";
+source=("http://www.mindrot.org/openssh_snap/openssh-SNAP-$_YMD.tar.gz";
 'sshdgenkeys.service'
 'sshd@.service'
 'sshd.service'
@@ -22,9 +23,9 @@
 'sshd.socket'
 'sshd.conf'
 'sshd.pam')
-#sha256sums=('a323caeeddfe145baaa0db16e98d784b1fbc7dd436a6bf1f479dfd5cd1d21723'
+#sha256sums=('6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad3'
 #'SKIP'
-sha256sums=('9981061d56b92e647ee0c911378f34043e154e487e24af46cc782e2e342d6891'
+sha256sums=('6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad'
 '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
 '3a0845737207f4eda221c9c9fb64e766ade9684562d8ba4f705f7ae6826886e5'
 'c5ed9fa629f8f8dbf3bae4edbad4441c36df535088553fe82695c52d7bde30aa'

[arch-commits] Commit in openssh/trunk (PKGBUILD.snap)

2019-04-13 Thread Gaëtan Bisson via arch-commits 
Date: Saturday, April 13, 2019 @ 23:09:24
  Author: bisson
Revision: 350774

update snapshot PKGBUILD

Modified:
  openssh/trunk/PKGBUILD.snap

---+
 PKGBUILD.snap |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD.snap
===
--- PKGBUILD.snap   2019-04-13 13:15:23 UTC (rev 350773)
+++ PKGBUILD.snap   2019-04-13 23:09:24 UTC (rev 350774)
@@ -3,7 +3,7 @@
 # Contributor: judd 
 
 pkgname=openssh
-_YMD=20190328
+_YMD=20190414
 pkgver=8.0snap$_YMD
 pkgrel=1
 pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
@@ -25,7 +25,7 @@
 'sshd.pam')
 #sha256sums=('6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad'
 #'SKIP'
-sha256sums=('9981061d56b92e647ee0c911378f34043e154e487e24af46cc782e2e342d6891'
+sha256sums=('6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad'
 '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
 '3a0845737207f4eda221c9c9fb64e766ade9684562d8ba4f705f7ae6826886e5'
 'c5ed9fa629f8f8dbf3bae4edbad4441c36df535088553fe82695c52d7bde30aa'

[arch-commits] Commit in openssh/trunk (PKGBUILD.snap)

2019-03-27 Thread Gaëtan Bisson via arch-commits 
Date: Thursday, March 28, 2019 @ 06:46:25
  Author: bisson
Revision: 349323

upstream update

Modified:
  openssh/trunk/PKGBUILD.snap

---+
 PKGBUILD.snap |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

Modified: PKGBUILD.snap
===
--- PKGBUILD.snap   2019-03-28 06:44:16 UTC (rev 349322)
+++ PKGBUILD.snap   2019-03-28 06:46:25 UTC (rev 349323)
@@ -3,7 +3,8 @@
 # Contributor: judd 
 
 pkgname=openssh
-pkgver=7.9snap20181017
+_YMD=20190328
+pkgver=8.0snap$_YMD
 pkgrel=1
 pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
 url='https://www.openssh.com/portable.html'
@@ -15,8 +16,7 @@
 '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-20181017.tar.gz";
-'openssl.patch'
+source=("http://www.mindrot.org/openssh_snap/openssh-SNAP-$_YMD.tar.gz";
 'sshdgenkeys.service'
 'sshd@.service'
 'sshd.service'
@@ -23,10 +23,9 @@
 'sshd.socket'
 'sshd.conf'
 'sshd.pam')
-#sha256sums=('a323caeeddfe145baaa0db16e98d784b1fbc7dd436a6bf1f479dfd5cd1d21723'
+#sha256sums=('6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad'
 #'SKIP'
 sha256sums=('9981061d56b92e647ee0c911378f34043e154e487e24af46cc782e2e342d6891'
-'48631e7520cd2bf0a1b02f9f593770075c1ff7feef8b305a4ac70186cced4d10'
 '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
 '3a0845737207f4eda221c9c9fb64e766ade9684562d8ba4f705f7ae6826886e5'
 'c5ed9fa629f8f8dbf3bae4edbad4441c36df535088553fe82695c52d7bde30aa'

[arch-commits] Commit in openssh/trunk (PKGBUILD.snap openssl.patch)

2018-10-16 Thread Gaëtan Bisson via arch-commits 
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 
 # Contributor: Aaron Griffin 
 # Contributor: judd 
 
 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.c2018-10-15 17:45:57.0 
-1000
 new/openbsd-compat/openssl-compat.c2018-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

[arch-commits] Commit in openssh/trunk (PKGBUILD.snap)

2018-03-23 Thread Gaëtan Bisson via arch-commits 
Date: Friday, March 23, 2018 @ 21:30:53
  Author: bisson
Revision: 319879

upstream update

Modified:
  openssh/trunk/PKGBUILD.snap

---+
 PKGBUILD.snap |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD.snap
===
--- PKGBUILD.snap   2018-03-23 21:14:24 UTC (rev 319878)
+++ PKGBUILD.snap   2018-03-23 21:30:53 UTC (rev 319879)
@@ -4,7 +4,7 @@
 # Contributor: judd 
 
 pkgname=openssh
-pkgver=7.7snap20180322
+pkgver=7.7snap20180324
 pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 url='https://www.openssh.com/portable.html'
@@ -16,7 +16,7 @@
 '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-20180322.tar.gz";
+source=("http://www.mindrot.org/openssh_snap/openssh-SNAP-20180324.tar.gz";
 'openssl-1.1.0.patch'
 'sshdgenkeys.service'
 'sshd@.service'
@@ -26,8 +26,8 @@
 'sshd.pam')
 #sha256sums=('a323caeeddfe145baaa0db16e98d784b1fbc7dd436a6bf1f479dfd5cd1d21723'
 #'SKIP'
-sha256sums=('f981e8e408c8afcbb5a9d030189254df5218eb3f852087022b11362c4c90f636'
-'ab9c9332b6e6f74bbe0f87806b743b22d4983032d8fecca35c86f4fd8d5d731b'
+sha256sums=('276189994c5b23a3efeb20078aac0f733eefec3bc5bb94e6f602b4f9cbe75ed4'
+'fa91849cc3161916f563bda5413676342e0bcc2705857e9d01b73c70e4904adf'
 '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
 '3a0845737207f4eda221c9c9fb64e766ade9684562d8ba4f705f7ae6826886e5'
 'c5ed9fa629f8f8dbf3bae4edbad4441c36df535088553fe82695c52d7bde30aa'

[arch-commits] Commit in openssh/trunk (PKGBUILD.snap)

2018-03-23 Thread Gaëtan Bisson via arch-commits 
Date: Friday, March 23, 2018 @ 20:27:26
  Author: bisson
Revision: 319876

add PKGBUILD for test snapshots

Added:
  openssh/trunk/PKGBUILD.snap

---+
 PKGBUILD.snap |  109 
 1 file changed, 109 insertions(+)

Added: PKGBUILD.snap
===
--- PKGBUILD.snap   (rev 0)
+++ PKGBUILD.snap   2018-03-23 20:27:26 UTC (rev 319876)
@@ -0,0 +1,109 @@
+# $Id: PKGBUILD 314130 2018-01-06 07:47:20Z bisson $
+# Maintainer: Gaetan Bisson 
+# Contributor: Aaron Griffin 
+# Contributor: judd 
+
+pkgname=openssh
+pkgver=7.7snap20180322
+pkgrel=1
+pkgdesc='Free version of the SSH connectivity tools'
+url='https://www.openssh.com/portable.html'
+license=('custom:BSD')
+arch=('x86_64')
+makedepends=('linux-headers')
+depends=('krb5' 'openssl' 'libedit' 'ldns')
+optdepends=('xorg-xauth: X11 forwarding'
+'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-20180322.tar.gz";
+'openssl-1.1.0.patch'
+'sshdgenkeys.service'
+'sshd@.service'
+'sshd.service'
+'sshd.socket'
+'sshd.conf'
+'sshd.pam')
+#sha256sums=('a323caeeddfe145baaa0db16e98d784b1fbc7dd436a6bf1f479dfd5cd1d21723'
+#'SKIP'
+sha256sums=('f981e8e408c8afcbb5a9d030189254df5218eb3f852087022b11362c4c90f636'
+'ab9c9332b6e6f74bbe0f87806b743b22d4983032d8fecca35c86f4fd8d5d731b'
+'4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
+'3a0845737207f4eda221c9c9fb64e766ade9684562d8ba4f705f7ae6826886e5'
+'c5ed9fa629f8f8dbf3bae4edbad4441c36df535088553fe82695c52d7bde30aa'
+'de14363e9d4ed92848e524036d9e6b57b2d35cc77d377b7247c38111d2a3defd'
+'4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6'
+'64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846')
+
+backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
+
+prepare() {
+#  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
+}
+
+build() {
+#  cd "${srcdir}/${pkgname}-${pkgver}"
+   cd "${srcdir}/${pkgname}"
+
+   ./configure \
+   --prefix=/usr \
+   --sbindir=/usr/bin \
+   --libexecdir=/usr/lib/ssh \
+   --sysconfdir=/etc/ssh \
+   --with-ldns \
+   --with-libedit \
+   --with-ssl-engine \
+   --with-pam \
+   --with-privsep-user=nobody \
+   --with-kerberos5=/usr \
+   --with-xauth=/usr/bin/xauth \
+   --with-md5-passwords \
+   --with-pid-dir=/run \
+   --with-default-path='/usr/local/sbin:/usr/local/bin:/usr/bin' \
+
+   make
+}
+
+check() {
+#  cd "${srcdir}/${pkgname}-${pkgver}"
+   cd "${srcdir}/${pkgname}"
+
+   # Tests require openssh to be already installed system-wide,
+   # also connectivity tests will fail under makechrootpkg since
+# it runs as nobody which has /bin/false as login shell.
+
+   if [[ -e /usr/bin/scp && ! -e /.arch-chroot ]]; then
+   make tests
+   fi
+}
+
+package() {
+#  cd "${srcdir}/${pkgname}-${pkgver}"
+   cd "${srcdir}/${pkgname}"
+
+   make DESTDIR="${pkgdir}" install
+
+   ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz
+   install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
+
+   install -Dm644 ../sshdgenkeys.service 
"${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service
+   install -Dm644 ../sshd@.service 
"${pkgdir}"/usr/lib/systemd/system/sshd@.service
+   install -Dm644 ../sshd.service 
"${pkgdir}"/usr/lib/systemd/system/sshd.service
+   install -Dm644 ../sshd.socket 
"${pkgdir}"/usr/lib/systemd/system/sshd.socket
+   install -Dm644 ../sshd.conf "${pkgdir}"/usr/lib/tmpfiles.d/sshd.conf
+   install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd
+
+   install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh
+   install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id
+   install -Dm644 contrib/ssh-copy-id.1 
"${pkgdir}"/usr/share/man/man1/ssh-copy-id.1
+
+   sed \
+   -e '/^#ChallengeResponseAuthentication yes$/c 
ChallengeResponseAuthentication no' \
+   -e '/^#PrintMotd yes$/c PrintMotd no # pam does that' \
+   -e '/^#UsePAM no$/c UsePAM yes' \
+   -i "${pkgdir}"/etc/ssh/sshd_config
+}