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

[Levente Polyak via arch-commits]

Date: Saturday, September 26, 2020 @ 19:50:01
  Author: anthraxx
Revision: 396591

upgpkg: openssh 8.3p1-5: libxcrypt rebuild

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2020-09-26 19:36:50 UTC (rev 396590)
+++ PKGBUILD2020-09-26 19:50:01 UTC (rev 396591)
@@ -1,17 +1,18 @@
-# Maintainer: Gaetan Bisson 
+# Maintainer: Levente Polyak 
+# Contributor: Gaetan Bisson 
 # Contributor: Aaron Griffin 
 # Contributor: judd 
 
 pkgname=openssh
 pkgver=8.3p1
-pkgrel=4
+pkgrel=5
 pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
 url='https://www.openssh.com/portable.html'
 license=('custom:BSD')
 arch=('x86_64')
+depends=('glibc' 'krb5' 'openssl' 'libedit' 'ldns' 'libxcrypt' 'libcrypt.so' 
'zlib' 'pam')
+makedepends=('linux-headers' 'libfido2')
 checkdepends=('inetutils')
-makedepends=('linux-headers' 'libfido2')
-depends=('krb5' 'openssl' 'libedit' 'ldns')
 optdepends=('xorg-xauth: X11 forwarding'
 'x11-ssh-askpass: input passphrase in X'
 'libfido2: FIDO/U2F support')

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

[Evangelos Foutras via arch-commits]

Date: Sunday, August 30, 2020 @ 11:02:36
  Author: foutrelis
Revision: 394977

upgpkg: openssh 8.3p1-4: rebuild bisson's pkgs

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2020-08-30 11:02:34 UTC (rev 394976)
+++ PKGBUILD2020-08-30 11:02:36 UTC (rev 394977)
@@ -4,7 +4,7 @@
 
 pkgname=openssh
 pkgver=8.3p1
-pkgrel=3
+pkgrel=4
 pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
 url='https://www.openssh.com/portable.html'
 license=('custom:BSD')

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

[Gaëtan Bisson via arch-commits]

Date: Wednesday, July 15, 2020 @ 21:33:08
  Author: bisson
Revision: 391951

fix FS#67290

Modified:
  openssh/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-07-15 20:28:43 UTC (rev 391950)
+++ PKGBUILD2020-07-15 21:33:08 UTC (rev 391951)
@@ -4,7 +4,7 @@
 
 pkgname=openssh
 pkgver=8.3p1
-pkgrel=1
+pkgrel=2
 pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
 url='https://www.openssh.com/portable.html'
 license=('custom:BSD')
@@ -18,6 +18,7 @@
 validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30')
 #source=("git://anongit.mindrot.org/openssh.git?signed#tag=V_8_2_P1"
 
source=("https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc}
+
'67290.patch::https://anongit.mindrot.org/openssh.git/patch/?id=c514f3c0522855b4d548286eaa113e209051a6d2'
 'sshdgenkeys.service'
 'sshd.service'
 'sshd.conf'
@@ -25,6 +26,7 @@
 'glibc-2.31.patch')
 sha256sums=('f2befbe0472fe7eb75d23340eb17531cb6b3aac24075e2066b41f814e12387b2'
 'SKIP'
+'3ccc1c6672521782c154c89607d2c2d7a67e0f66a349260e00e28ae999ea54f5'
 '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
 'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7'
 '4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6'
@@ -37,6 +39,7 @@
 
 prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
+   patch -p1 -i ../67290.patch # FS#67290
patch -p1 -i ../glibc-2.31.patch
autoreconf
 }

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

[Gaëtan Bisson via arch-commits]

Date: Saturday, May 30, 2020 @ 18:33:52
  Author: bisson
Revision: 387920

fix FS#66840

Modified:
  openssh/trunk/PKGBUILD

--+
 PKGBUILD |1 +
 1 file changed, 1 insertion(+)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-30 16:48:31 UTC (rev 387919)
+++ PKGBUILD2020-05-30 18:33:52 UTC (rev 387920)
@@ -9,6 +9,7 @@
 url='https://www.openssh.com/portable.html'
 license=('custom:BSD')
 arch=('x86_64')
+checkdepends=('inetutils')
 makedepends=('linux-headers' 'libfido2')
 depends=('krb5' 'openssl' 'libedit' 'ldns')
 optdepends=('xorg-xauth: X11 forwarding'

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

[Gaëtan Bisson via arch-commits]

Date: Wednesday, May 27, 2020 @ 07:01:09
  Author: bisson
Revision: 387696

upstream update

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2020-05-26 20:11:12 UTC (rev 387695)
+++ PKGBUILD2020-05-27 07:01:09 UTC (rev 387696)
@@ -3,8 +3,8 @@
 # Contributor: judd 
 
 pkgname=openssh
-pkgver=8.2p1
-pkgrel=3
+pkgver=8.3p1
+pkgrel=1
 pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
 url='https://www.openssh.com/portable.html'
 license=('custom:BSD')
@@ -22,7 +22,7 @@
 'sshd.conf'
 'sshd.pam'
 'glibc-2.31.patch')
-sha256sums=('43925151e6cf6cee1450190c0e9af4dc36b41c12737619edff8bcebdff64e671'
+sha256sums=('f2befbe0472fe7eb75d23340eb17531cb6b3aac24075e2066b41f814e12387b2'
 'SKIP'
 '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
 'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7'

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

[Gaëtan Bisson via arch-commits]

Date: Tuesday, March 24, 2020 @ 01:51:35
  Author: bisson
Revision: 378423

remove git as optdepends since we switched back to tarballs

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2020-03-23 23:06:01 UTC (rev 378422)
+++ PKGBUILD2020-03-24 01:51:35 UTC (rev 378423)
@@ -9,7 +9,7 @@
 url='https://www.openssh.com/portable.html'
 license=('custom:BSD')
 arch=('x86_64')
-makedepends=('linux-headers' 'git' 'libfido2')
+makedepends=('linux-headers' 'libfido2')
 depends=('krb5' 'openssl' 'libedit' 'ldns')
 optdepends=('xorg-xauth: X11 forwarding'
 'x11-ssh-askpass: input passphrase in X'

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

[Gaëtan Bisson via arch-commits]

Date: Monday, February 17, 2020 @ 01:21:52
  Author: bisson
Revision: 375722

better fix

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/install

--+
 PKGBUILD |2 +-
 install  |   20 
 2 files changed, 13 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-02-17 01:13:30 UTC (rev 375721)
+++ PKGBUILD2020-02-17 01:21:52 UTC (rev 375722)
@@ -4,7 +4,7 @@
 
 pkgname=openssh
 pkgver=8.2p1
-pkgrel=2
+pkgrel=3
 pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
 url='https://www.openssh.com/portable.html'
 license=('custom:BSD')

Modified: install
===
--- install 2020-02-17 01:13:30 UTC (rev 375721)
+++ install 2020-02-17 01:21:52 UTC (rev 375722)
@@ -1,12 +1,4 @@
 pre_upgrade() {
-   if (( $(vercmp $2 8.2p1-2) < 0 )); then
-   cat < Your current SSH daemon may be unable to accept new connections.
-==> To fix this, please restart it right now using:
-==> systemctl restart sshd
-EOF
-   fi
-
# Remove socket activation. See: https://bugs.archlinux.org/task/62248
if (( $(vercmp $2 8.0p1-3) < 0 )); then
if systemctl is-enabled -q sshd.socket; then
@@ -26,3 +18,15 @@
fi
fi
 }
+
+post_upgrade() {
+   if (( $(vercmp $2 8.2p1-3) < 0 )); then
+   if systemctl is-active sshd.service >/dev/null; then
+   cat < After this upgrade, your existing SSH daemon may be unable to accept
+==> new connections. To fix this, your SSH daemon will now be restarted.
+EOF
+   systemctl restart sshd.service
+   fi
+   fi
+}

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

[Gaëtan Bisson via arch-commits]

Date: Monday, February 17, 2020 @ 01:12:45
  Author: bisson
Revision: 375720

enable builtin u2f, add announcement for compat break

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/install

--+
 PKGBUILD |   27 +--
 install  |8 
 2 files changed, 21 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-02-17 01:01:27 UTC (rev 375719)
+++ PKGBUILD2020-02-17 01:12:45 UTC (rev 375720)
@@ -4,24 +4,26 @@
 
 pkgname=openssh
 pkgver=8.2p1
-pkgrel=1
+pkgrel=2
 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' 'git')
+makedepends=('linux-headers' 'git' 'libfido2')
 depends=('krb5' 'openssl' 'libedit' 'ldns')
 optdepends=('xorg-xauth: X11 forwarding'
-'x11-ssh-askpass: input passphrase in X')
+'x11-ssh-askpass: input passphrase in X'
+'libfido2: FIDO/U2F support')
 validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30')
-#source=("https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc}
-source=("git://anongit.mindrot.org/openssh.git?signed#tag=V_8_2_P1"
+#source=("git://anongit.mindrot.org/openssh.git?signed#tag=V_8_2_P1"
+source=("https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc}
 'sshdgenkeys.service'
 'sshd.service'
 'sshd.conf'
 'sshd.pam'
 'glibc-2.31.patch')
-sha256sums=('SKIP'
+sha256sums=('43925151e6cf6cee1450190c0e9af4dc36b41c12737619edff8bcebdff64e671'
+'SKIP'
 '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
 'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7'
 '4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6'
@@ -33,15 +35,13 @@
 install=install
 
 prepare() {
-#  cd "${srcdir}/${pkgname}-${pkgver}"
-   cd "${srcdir}/${pkgname}"
+   cd "${srcdir}/${pkgname}-${pkgver}"
patch -p1 -i ../glibc-2.31.patch
autoreconf
 }
 
 build() {
-#  cd "${srcdir}/${pkgname}-${pkgver}"
-   cd "${srcdir}/${pkgname}"
+   cd "${srcdir}/${pkgname}-${pkgver}"
 
./configure \
--prefix=/usr \
@@ -51,6 +51,7 @@
--disable-strip \
--with-ldns \
--with-libedit \
+   --with-security-key-builtin \
--with-ssl-engine \
--with-pam \
--with-privsep-user=nobody \
@@ -64,8 +65,7 @@
 }
 
 check() {
-#  cd "${srcdir}/${pkgname}-${pkgver}"
-   cd "${srcdir}/${pkgname}"
+   cd "${srcdir}/${pkgname}-${pkgver}"
 
# Tests require openssh to be already installed system-wide,
# also connectivity tests will fail under makechrootpkg since
@@ -77,8 +77,7 @@
 }
 
 package() {
-#  cd "${srcdir}/${pkgname}-${pkgver}"
-   cd "${srcdir}/${pkgname}"
+   cd "${srcdir}/${pkgname}-${pkgver}"
 
make DESTDIR="${pkgdir}" install
 

Modified: install
===
--- install 2020-02-17 01:01:27 UTC (rev 375719)
+++ install 2020-02-17 01:12:45 UTC (rev 375720)
@@ -1,4 +1,12 @@
 pre_upgrade() {
+   if (( $(vercmp $2 8.2p1-2) < 0 )); then
+   cat < Your current SSH daemon may be unable to accept new connections.
+==> To fix this, please restart it right now using:
+==> systemctl restart sshd
+EOF
+   fi
+
# Remove socket activation. See: https://bugs.archlinux.org/task/62248
if (( $(vercmp $2 8.0p1-3) < 0 )); then
if systemctl is-enabled -q sshd.socket; then

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

[Gaëtan Bisson via arch-commits]

Date: Friday, February 14, 2020 @ 20:05:42
  Author: bisson
Revision: 375610

upstream update

Modified:
  openssh/trunk/PKGBUILD

--+
 PKGBUILD |   27 ---
 1 file changed, 16 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-02-14 17:09:02 UTC (rev 375609)
+++ PKGBUILD2020-02-14 20:05:42 UTC (rev 375610)
@@ -3,25 +3,25 @@
 # Contributor: judd 
 
 pkgname=openssh
-pkgver=8.1p1
-pkgrel=4
+pkgver=8.2p1
+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')
+makedepends=('linux-headers' 'git')
 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=("https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc}
+source=("git://anongit.mindrot.org/openssh.git?signed#tag=V_8_2_P1"
 'sshdgenkeys.service'
 'sshd.service'
 'sshd.conf'
 'sshd.pam'
 'glibc-2.31.patch')
-sha256sums=('02f5dbef3835d0753556f973cd57b4c19b6b1f6cd24c03445e23ac77ca1b93ff'
-'SKIP'
+sha256sums=('SKIP'
 '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
 'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7'
 '4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6'
@@ -33,12 +33,15 @@
 install=install
 
 prepare() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   patch -p1 -i "${srcdir}/glibc-2.31.patch"
+#  cd "${srcdir}/${pkgname}-${pkgver}"
+   cd "${srcdir}/${pkgname}"
+   patch -p1 -i ../glibc-2.31.patch
+   autoreconf
 }
 
 build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
+#  cd "${srcdir}/${pkgname}-${pkgver}"
+   cd "${srcdir}/${pkgname}"
 
./configure \
--prefix=/usr \
@@ -61,7 +64,8 @@
 }
 
 check() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
+#  cd "${srcdir}/${pkgname}-${pkgver}"
+   cd "${srcdir}/${pkgname}"
 
# Tests require openssh to be already installed system-wide,
# also connectivity tests will fail under makechrootpkg since
@@ -73,7 +77,8 @@
 }
 
 package() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
+#  cd "${srcdir}/${pkgname}-${pkgver}"
+   cd "${srcdir}/${pkgname}"
 
make DESTDIR="${pkgdir}" install
 

[arch-commits] Commit in openssh/trunk (PKGBUILD glibc-2.31.patch)

[Bartłomiej Piotrowski via arch-commits]

Date: Wednesday, February 5, 2020 @ 14:31:34
  Author: bpiotrowski
Revision: 374666

8.1p1-4: recreate the patch

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/glibc-2.31.patch

--+
 PKGBUILD |4 
 glibc-2.31.patch | 2214 +
 2 files changed, 47 insertions(+), 2171 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-02-05 14:10:35 UTC (rev 374665)
+++ PKGBUILD2020-02-05 14:31:34 UTC (rev 374666)
@@ -4,7 +4,7 @@
 
 pkgname=openssh
 pkgver=8.1p1
-pkgrel=3
+pkgrel=4
 pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
 url='https://www.openssh.com/portable.html'
 license=('custom:BSD')
@@ -26,7 +26,7 @@
 'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7'
 '4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6'
 '64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846'
-'8b5a992576f57a55495e28431dd667117f3c2eac71f0e7fcf5e56f4ea2df9019')
+'25b4a4d9e2d9d3289ef30636a30e85fa1c71dd930d5efd712cca1a01a5019f93')
 
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
 

Modified: glibc-2.31.patch
===
--- glibc-2.31.patch2020-02-05 14:10:35 UTC (rev 374665)
+++ glibc-2.31.patch2020-02-05 14:31:34 UTC (rev 374666)
@@ -49,2176 +49,52 @@
  #ifdef __NR__newselect
SC_ALLOW(__NR__newselect),
  #endif
+From 030b4c2b8029563bc8a9fd764288fde08fa2347c Mon Sep 17 00:00:00 2001
+From: Darren Tucker 
+Date: Mon, 16 Dec 2019 13:55:56 +1100
+Subject: [PATCH] Allow clock_nanosleep_time64 in seccomp sandbox.
 
+Needed on Linux ARM.  bz#3100, patch from jje...@redhat.com.
+---
+ sandbox-seccomp-filter.c | 3 +++
+ 1 file changed, 3 insertions(+)
 
+diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
+index be2397671..3ef30c9d5 100644
+--- a/sandbox-seccomp-filter.c
 b/sandbox-seccomp-filter.c
+@@ -245,6 +245,9 @@ static const struct sock_filter preauth_insns[] = {
+ #ifdef __NR_clock_nanosleep
+   SC_ALLOW(__NR_clock_nanosleep),
+ #endif
++#ifdef __NR_clock_nanosleep_time64
++  SC_ALLOW(__NR_clock_nanosleep_time64),
++#endif
+ #ifdef __NR__newselect
+   SC_ALLOW(__NR__newselect),
+ #endif
+From a991cc5ed5a7c455fefe909a30cf082011ef5dff Mon Sep 17 00:00:00 2001
+From: Khem Raj 
+Date: Tue, 7 Jan 2020 16:26:45 -0800
+Subject: [PATCH] seccomp: Allow clock_gettime64() in sandbox.
 
+This helps sshd accept connections on mips platforms with
+upcoming glibc ( 2.31 )
+---
+ sandbox-seccomp-filter.c | 3 +++
+ 1 file changed, 3 insertions(+)
 
-
-
-
-
-  
-
-  https://github.githubassets.com;>
-  https://avatars0.githubusercontent.com;>
-  https://avatars1.githubusercontent.com;>
-  https://avatars2.githubusercontent.com;>
-  https://avatars3.githubusercontent.com;>
-  https://github-cloud.s3.amazonaws.com;>
-  https://user-images.githubusercontent.com/;>
-
-
-
-  https://github.githubassets.com/assets/frameworks-5abe724ecf200f8d9bbf52e5e4a2d7af.css;
 />
-  https://github.githubassets.com/assets/site-0e7050856189ee27195382cf843e8595.css;
 />
-https://github.githubassets.com/assets/github-8d42095504ad71bfb33917b9aba4e058.css;
 />
-
-
-
-
-
-
-  
-  
-  Allow clock_nanosleep_time64 in seccomp sandbox. · 
openssh/openssh-portable@030b4c2 · GitHub
-
-
-  https://github.com/fluidicon.png; 
title="GitHub">
-  
-
-https://avatars2.githubusercontent.com/u/4781274?s=200v=4; 
/>
-https://avatars2.githubusercontent.com/u/4781274?s=200v=4; 
/>https://github.com/openssh/openssh-portable/commit/030b4c2b8029563bc8a9fd764288fde08fa2347c;
 />
-
-  https://github.githubassets.com/;>
-  
-  
-
-
-
-
-
-  
-
-  
-
-  
-
-  
-
-
-
-  https://collector.githubapp.com/github-external/browser_event; />
-
-
-
-
-
-
-
-
-
-
-
-  
-
-  
-
-
-  
-
-
-
-
-  
-  
-
-  
-  
-
-  
-  https://github.com/openssh/openssh-portable/commits/030b4c2b8029563bc8a9fd764288fde08fa2347c.atom;
 rel="alternate" title="Recent Commits to 
openssh-portable:030b4c2b8029563bc8a9fd764288fde08fa2347c" 
type="application/atom+xml">
-
-  https://github.com/openssh/openssh-portable.git;>
-
-  
-
-
-
-
-  https://api.github.com/_private/browser/stats;>
-
-  https://api.github.com/_private/browser/errors;>
-
-  https://github.githubassets.com/pinned-octocat.svg; color="#00">
-  https://github.githubassets.com/favicon.ico;>
-
-
-
-
-  
-
-  
-
-  
-
-
-  
-Skip to content
-
-  
-
-
-
-
-
-
-
-
-  
-
-https://github.com/; aria-label="Homepage" 
data-ga-click="(Logged out) Header, go to homepage, icon:logo-wordmark">
-  
-
-
-
-
-  
-
-  
-
-  
-
-
-  
-  
-
-  
- 

[arch-commits] Commit in openssh/trunk (PKGBUILD glibc-2.31.patch)

[Bartłomiej Piotrowski via arch-commits]

Date: Wednesday, February 5, 2020 @ 13:54:54
  Author: bpiotrowski
Revision: 374654

8.1p1-3: backport glibc 2.31 compatibility fixes

Added:
  openssh/trunk/glibc-2.31.patch
Modified:
  openssh/trunk/PKGBUILD

--+
 PKGBUILD |   13 
 glibc-2.31.patch | 2224 +
 2 files changed, 2234 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-02-05 11:14:50 UTC (rev 374653)
+++ PKGBUILD2020-02-05 13:54:54 UTC (rev 374654)
@@ -4,7 +4,7 @@
 
 pkgname=openssh
 pkgver=8.1p1
-pkgrel=2
+pkgrel=3
 pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
 url='https://www.openssh.com/portable.html'
 license=('custom:BSD')
@@ -18,18 +18,25 @@
 'sshdgenkeys.service'
 'sshd.service'
 'sshd.conf'
-'sshd.pam')
+'sshd.pam'
+'glibc-2.31.patch')
 sha256sums=('02f5dbef3835d0753556f973cd57b4c19b6b1f6cd24c03445e23ac77ca1b93ff'
 'SKIP'
 '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
 'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7'
 '4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6'
-'64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846')
+'64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846'
+'8b5a992576f57a55495e28431dd667117f3c2eac71f0e7fcf5e56f4ea2df9019')
 
 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}"
 

Added: glibc-2.31.patch
===
--- glibc-2.31.patch(rev 0)
+++ glibc-2.31.patch2020-02-05 13:54:54 UTC (rev 374654)
@@ -0,0 +1,2224 @@
+From beee0ef61866cb567b9abc23bd850f922e59e3f0 Mon Sep 17 00:00:00 2001
+From: Darren Tucker 
+Date: Wed, 13 Nov 2019 23:19:35 +1100
+Subject: [PATCH] seccomp: Allow clock_nanosleep() in sandbox.
+
+seccomp: Allow clock_nanosleep() to make OpenSSH working with latest
+glibc.  Patch from Jakub Jelen  via bz #3093.
+---
+ sandbox-seccomp-filter.c | 6 ++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
+index b5cda70bb..96ab141f7 100644
+--- a/sandbox-seccomp-filter.c
 b/sandbox-seccomp-filter.c
+@@ -242,6 +242,12 @@ static const struct sock_filter preauth_insns[] = {
+ #ifdef __NR_nanosleep
+   SC_ALLOW(__NR_nanosleep),
+ #endif
++#ifdef __NR_clock_nanosleep
++  SC_ALLOW(__NR_clock_nanosleep),
++#endif
++#ifdef __NR_clock_nanosleep
++  SC_ALLOW(__NR_clock_nanosleep),
++#endif
+ #ifdef __NR__newselect
+   SC_ALLOW(__NR__newselect),
+ #endif
+From 69298ebfc2c066acee5d187eac8ce9f38c796630 Mon Sep 17 00:00:00 2001
+From: Darren Tucker 
+Date: Wed, 13 Nov 2019 23:27:31 +1100
+Subject: [PATCH] Remove duplicate __NR_clock_nanosleep
+
+---
+ sandbox-seccomp-filter.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
+index 96ab141f7..be2397671 100644
+--- a/sandbox-seccomp-filter.c
 b/sandbox-seccomp-filter.c
+@@ -245,9 +245,6 @@ static const struct sock_filter preauth_insns[] = {
+ #ifdef __NR_clock_nanosleep
+   SC_ALLOW(__NR_clock_nanosleep),
+ #endif
+-#ifdef __NR_clock_nanosleep
+-  SC_ALLOW(__NR_clock_nanosleep),
+-#endif
+ #ifdef __NR__newselect
+   SC_ALLOW(__NR__newselect),
+ #endif
+
+
+
+
+
+
+
+
+  
+
+  https://github.githubassets.com;>
+  https://avatars0.githubusercontent.com;>
+  https://avatars1.githubusercontent.com;>
+  https://avatars2.githubusercontent.com;>
+  https://avatars3.githubusercontent.com;>
+  https://github-cloud.s3.amazonaws.com;>
+  https://user-images.githubusercontent.com/;>
+
+
+
+  https://github.githubassets.com/assets/frameworks-5abe724ecf200f8d9bbf52e5e4a2d7af.css;
 />
+  https://github.githubassets.com/assets/site-0e7050856189ee27195382cf843e8595.css;
 />
+https://github.githubassets.com/assets/github-8d42095504ad71bfb33917b9aba4e058.css;
 />
+
+
+
+
+
+
+  
+  
+  Allow clock_nanosleep_time64 in seccomp sandbox. · 
openssh/openssh-portable@030b4c2 · GitHub
+
+
+  https://github.com/fluidicon.png; 
title="GitHub">
+  
+
+https://avatars2.githubusercontent.com/u/4781274?s=200v=4; 
/>
+https://avatars2.githubusercontent.com/u/4781274?s=200v=4; 
/>https://github.com/openssh/openssh-portable/commit/030b4c2b8029563bc8a9fd764288fde08fa2347c;
 />
+
+  https://github.githubassets.com/;>
+  
+  
+
+
+
+
+
+  
+
+  
+
+  
+
+  
+
+
+
+  https://collector.githubapp.com/github-external/browser_event; />
+
+
+
+
+
+
+
+
+
+
+
+  
+
+  
+
+
+  
+
+
+
+
+  
+  
+
+ 

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

[Felix Yan via arch-commits]

Date: Wednesday, November 13, 2019 @ 15:53:10
  Author: felixonmars
Revision: 368123

[core] mass rebuild

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2019-11-13 15:53:09 UTC (rev 368122)
+++ PKGBUILD2019-11-13 15:53:10 UTC (rev 368123)
@@ -4,7 +4,7 @@
 
 pkgname=openssh
 pkgver=8.1p1
-pkgrel=1
+pkgrel=2
 pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
 url='https://www.openssh.com/portable.html'
 license=('custom:BSD')

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

[Gaëtan Bisson via arch-commits]

Date: Monday, October 21, 2019 @ 19:10:09
  Author: bisson
Revision: 365277

implement FS#64196

Modified:
  openssh/trunk/PKGBUILD

--+
 PKGBUILD |1 +
 1 file changed, 1 insertion(+)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-21 18:15:43 UTC (rev 365276)
+++ PKGBUILD2019-10-21 19:10:09 UTC (rev 365277)
@@ -38,6 +38,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)

[Gaëtan Bisson via arch-commits]

Date: Wednesday, October 9, 2019 @ 18:53:45
  Author: bisson
Revision: 364289

upstream update

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2019-10-09 18:43:02 UTC (rev 364288)
+++ PKGBUILD2019-10-09 18:53:45 UTC (rev 364289)
@@ -3,8 +3,8 @@
 # Contributor: judd 
 
 pkgname=openssh
-pkgver=8.0p1
-pkgrel=3
+pkgver=8.1p1
+pkgrel=1
 pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
 url='https://www.openssh.com/portable.html'
 license=('custom:BSD')
@@ -19,7 +19,7 @@
 'sshd.service'
 'sshd.conf'
 'sshd.pam')
-sha256sums=('bd943879e69498e8031eb6b7f44d08cdc37d59a7ab689aa0b437320c3481fd68'
+sha256sums=('02f5dbef3835d0753556f973cd57b4c19b6b1f6cd24c03445e23ac77ca1b93ff'
 'SKIP'
 '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
 'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7'

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

[Gaëtan Bisson via arch-commits]

Date: Monday, July 29, 2019 @ 02:29:50
  Author: bisson
Revision: 358707

rebuild for ldns-1.7.1

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2019-07-29 02:26:54 UTC (rev 358706)
+++ PKGBUILD2019-07-29 02:29:50 UTC (rev 358707)
@@ -4,7 +4,7 @@
 
 pkgname=openssh
 pkgver=8.0p1
-pkgrel=1
+pkgrel=2
 pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
 url='https://www.openssh.com/portable.html'
 license=('custom:BSD')

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

[Gaëtan Bisson via arch-commits]

Date: Thursday, April 18, 2019 @ 18:30:02
  Author: bisson
Revision: 350888

upstream update

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/PKGBUILD.snap

---+
 PKGBUILD  |4 ++--
 PKGBUILD.snap |9 -
 2 files changed, 6 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-18 13:41:39 UTC (rev 350887)
+++ PKGBUILD2019-04-18 18:30:02 UTC (rev 350888)
@@ -3,7 +3,7 @@
 # Contributor: judd 
 
 pkgname=openssh
-pkgver=7.9p1
+pkgver=8.0p1
 pkgrel=1
 pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
 url='https://www.openssh.com/portable.html'
@@ -21,7 +21,7 @@
 'sshd.socket'
 'sshd.conf'
 'sshd.pam')
-sha256sums=('6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad'
+sha256sums=('bd943879e69498e8031eb6b7f44d08cdc37d59a7ab689aa0b437320c3481fd68'
 'SKIP'
 '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
 '3a0845737207f4eda221c9c9fb64e766ade9684562d8ba4f705f7ae6826886e5'

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

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

[Gaëtan Bisson via arch-commits]

Date: Monday, June 18, 2018 @ 21:01:56
  Author: bisson
Revision: 327170

fix FS#58737

Added:
  openssh/trunk/tuntap.patch
Modified:
  openssh/trunk/PKGBUILD

--+
 PKGBUILD |6 +-
 tuntap.patch |   35 +++
 2 files changed, 40 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-06-18 20:47:01 UTC (rev 327169)
+++ PKGBUILD2018-06-18 21:01:56 UTC (rev 327170)
@@ -5,7 +5,7 @@
 
 pkgname=openssh
 pkgver=7.7p1
-pkgrel=1
+pkgrel=2
 pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
 url='https://www.openssh.com/portable.html'
 license=('custom:BSD')
@@ -17,6 +17,7 @@
 validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30')
 
source=("https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc}
 'openssl-1.1.0.patch'
+'tuntap.patch'
 'sshdgenkeys.service'
 'sshd@.service'
 'sshd.service'
@@ -26,6 +27,7 @@
 sha256sums=('d73be7e684e99efcd024be15a30bffcbe41b012b2f7b3c9084aed621775e6b8f'
 'SKIP'
 'fa91849cc3161916f563bda5413676342e0bcc2705857e9d01b73c70e4904adf'
+'bd3698425ece4853d67a9f9e934d37ad22948754c9b82e0a872eb854e94220ce'
 '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
 '3a0845737207f4eda221c9c9fb64e766ade9684562d8ba4f705f7ae6826886e5'
 'c5ed9fa629f8f8dbf3bae4edbad4441c36df535088553fe82695c52d7bde30aa'
@@ -40,6 +42,8 @@
 
# 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 ../tuntap.patch
 }
 
 build() {

Added: tuntap.patch
===
--- tuntap.patch(rev 0)
+++ tuntap.patch2018-06-18 21:01:56 UTC (rev 327170)
@@ -0,0 +1,35 @@
+From cfb1d9bc76734681e3dea532a1504fcd466fbe91 Mon Sep 17 00:00:00 2001
+From: Damien Miller 
+Date: Fri, 13 Apr 2018 13:38:06 +1000
+Subject: Fix tunnel forwarding broken in 7.7p1
+
+bz2855, ok dtucker@
+---
+ openbsd-compat/port-net.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/openbsd-compat/port-net.c b/openbsd-compat/port-net.c
+index 7050629..bb53562 100644
+--- a/openbsd-compat/port-net.c
 b/openbsd-compat/port-net.c
+@@ -185,7 +185,7 @@ sys_tun_open(int tun, int mode, char **ifname)
+   else
+   debug("%s: %s mode %d fd %d", __func__, ifr.ifr_name, mode, fd);
+ 
+-  if (ifname != NULL && (*ifname = strdup(ifr.ifr_name)))
++  if (ifname != NULL && (*ifname = strdup(ifr.ifr_name)) == NULL)
+   goto failed;
+ 
+   return (fd);
+@@ -272,7 +272,7 @@ sys_tun_open(int tun, int mode, char **ifname)
+   goto failed;
+   }
+ 
+-  if (ifname != NULL && (*ifname = strdup(ifr.ifr_name)))
++  if (ifname != NULL && (*ifname = strdup(ifr.ifr_name)) == NULL)
+   goto failed;
+ 
+   close(sock);
+-- 
+cgit v1.1
+

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

[Gaëtan Bisson via arch-commits]

Date: Tuesday, April 3, 2018 @ 06:34:13
  Author: bisson
Revision: 320880

update pkgdesc as per upstream webpage

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2018-04-03 06:29:41 UTC (rev 320879)
+++ PKGBUILD2018-04-03 06:34:13 UTC (rev 320880)
@@ -6,7 +6,7 @@
 pkgname=openssh
 pkgver=7.7p1
 pkgrel=1
-pkgdesc='Free version of the SSH connectivity tools'
+pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
 url='https://www.openssh.com/portable.html'
 license=('custom:BSD')
 arch=('x86_64')

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

[Gaëtan Bisson via arch-commits]

Date: Tuesday, April 3, 2018 @ 06:27:49
  Author: bisson
Revision: 320878

upstream update

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/PKGBUILD.snap

---+
 PKGBUILD  |8 
 PKGBUILD.snap |6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-03 01:48:01 UTC (rev 320877)
+++ PKGBUILD2018-04-03 06:27:49 UTC (rev 320878)
@@ -4,8 +4,8 @@
 # Contributor: judd 
 
 pkgname=openssh
-pkgver=7.6p1
-pkgrel=2
+pkgver=7.7p1
+pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 url='https://www.openssh.com/portable.html'
 license=('custom:BSD')
@@ -23,9 +23,9 @@
 'sshd.socket'
 'sshd.conf'
 'sshd.pam')
-sha256sums=('a323caeeddfe145baaa0db16e98d784b1fbc7dd436a6bf1f479dfd5cd1d21723'
+sha256sums=('d73be7e684e99efcd024be15a30bffcbe41b012b2f7b3c9084aed621775e6b8f'
 'SKIP'
-'1fcae9fc461026d96d08b38457e7ffe281b4319caaada1508f9eb74c2566ba5d'
+'fa91849cc3161916f563bda5413676342e0bcc2705857e9d01b73c70e4904adf'
 '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
 '3a0845737207f4eda221c9c9fb64e766ade9684562d8ba4f705f7ae6826886e5'
 'c5ed9fa629f8f8dbf3bae4edbad4441c36df535088553fe82695c52d7bde30aa'

Modified: PKGBUILD.snap
===
--- PKGBUILD.snap   2018-04-03 01:48:01 UTC (rev 320877)
+++ PKGBUILD.snap   2018-04-03 06:27:49 UTC (rev 320878)
@@ -4,7 +4,7 @@
 # Contributor: judd 
 
 pkgname=openssh
-pkgver=7.7snap20180324
+pkgver=7.7snap20180330
 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-20180324.tar.gz;
+source=("http://www.mindrot.org/openssh_snap/openssh-SNAP-20180330.tar.gz;
 'openssl-1.1.0.patch'
 'sshdgenkeys.service'
 'sshd@.service'
@@ -26,7 +26,7 @@
 'sshd.pam')
 #sha256sums=('a323caeeddfe145baaa0db16e98d784b1fbc7dd436a6bf1f479dfd5cd1d21723'
 #'SKIP'
-sha256sums=('276189994c5b23a3efeb20078aac0f733eefec3bc5bb94e6f602b4f9cbe75ed4'
+sha256sums=('df30a1f3cd4f7b0b6456b4d120e698f29b279f8e8a9fdb20135f2e12783cbf10'
 'fa91849cc3161916f563bda5413676342e0bcc2705857e9d01b73c70e4904adf'
 '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
 '3a0845737207f4eda221c9c9fb64e766ade9684562d8ba4f705f7ae6826886e5'

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

[Gaëtan Bisson via arch-commits]

Date: Friday, March 23, 2018 @ 21:09:00
  Author: bisson
Revision: 319877

bikeshedding

Modified:
  openssh/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-23 20:27:26 UTC (rev 319876)
+++ PKGBUILD2018-03-23 21:09:00 UTC (rev 319877)
@@ -36,9 +36,10 @@
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
 
 prepare() {
-   cd $pkgname-$pkgver
+   cd "${srcdir}/${pkgname}-${pkgver}"
+
# OpenSSL 1.1.0 patch from 
http://vega.pgw.jp/~kabe/vsd/patch/openssh-7.4p1-openssl-1.1.0c.patch.html
-   patch -Np1 -i ../openssl-1.1.0.patch
+   patch -p1 -i ../openssl-1.1.0.patch
 }
 
 build() {

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

[Gaëtan Bisson via arch-commits]

Date: Saturday, January 6, 2018 @ 07:47:20
  Author: bisson
Revision: 314130

fix FS#56961

Modified:
  openssh/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-06 07:29:59 UTC (rev 314129)
+++ PKGBUILD2018-01-06 07:47:20 UTC (rev 314130)
@@ -5,7 +5,7 @@
 
 pkgname=openssh
 pkgver=7.6p1
-pkgrel=1
+pkgrel=2
 pkgdesc='Free version of the SSH connectivity tools'
 url='https://www.openssh.com/portable.html'
 license=('custom:BSD')
@@ -58,6 +58,7 @@
--with-xauth=/usr/bin/xauth \
--with-md5-passwords \
--with-pid-dir=/run \
+   --with-default-path='/usr/local/sbin:/usr/local/bin:/usr/bin' \
 
make
 }

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

[Gaëtan Bisson]

Date: Wednesday, October 4, 2017 @ 08:37:49
  Author: bisson
Revision: 306708

upstream update, rebase patch

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/openssl-1.1.0.patch

-+
 PKGBUILD|8 
 openssl-1.1.0.patch |  683 --
 2 files changed, 228 insertions(+), 463 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-10-04 08:35:03 UTC (rev 306707)
+++ PKGBUILD2017-10-04 08:37:49 UTC (rev 306708)
@@ -4,8 +4,8 @@
 # Contributor: judd 
 
 pkgname=openssh
-pkgver=7.5p1
-pkgrel=2
+pkgver=7.6p1
+pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 url='https://www.openssh.com/portable.html'
 license=('custom:BSD')
@@ -23,9 +23,9 @@
 'sshd.socket'
 'sshd.conf'
 'sshd.pam')
-sha256sums=('9846e3c5fab9f0547400b4d2c017992f914222b3fd1f8eee6c7dc6bc5e59f9f0'
+sha256sums=('a323caeeddfe145baaa0db16e98d784b1fbc7dd436a6bf1f479dfd5cd1d21723'
 'SKIP'
-'b895b5f8e9f7d3a60286bf0a5b313d0b2ae2891ee1358e4862f1a0f1ad0ddc7d'
+'1fcae9fc461026d96d08b38457e7ffe281b4319caaada1508f9eb74c2566ba5d'
 '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
 '3a0845737207f4eda221c9c9fb64e766ade9684562d8ba4f705f7ae6826886e5'
 'c5ed9fa629f8f8dbf3bae4edbad4441c36df535088553fe82695c52d7bde30aa'

Modified: openssl-1.1.0.patch
===
--- openssl-1.1.0.patch 2017-10-04 08:35:03 UTC (rev 306707)
+++ openssl-1.1.0.patch 2017-10-04 08:37:49 UTC (rev 306708)
@@ -1,7 +1,7 @@
 diff -Naur old/auth-pam.c new/auth-pam.c
 old/auth-pam.c 2017-03-19 16:39:27.0 -1000
-+++ new/auth-pam.c 2017-03-20 11:01:28.792662449 -1000
-@@ -129,6 +129,10 @@
+--- old/auth-pam.c 2017-10-03 21:49:05.363829772 -1000
 new/auth-pam.c 2017-10-03 21:55:50.869718862 -1000
+@@ -128,6 +128,10 @@
  typedef pthread_t sp_pthread_t;
  #else
  typedef pid_t sp_pthread_t;
@@ -12,171 +12,10 @@
  #endif
  
  struct pam_ctxt {
-diff -Naur old/cipher-3des1.c new/cipher-3des1.c
 old/cipher-3des1.c 2017-03-19 16:39:27.0 -1000
-+++ new/cipher-3des1.c 2017-03-20 11:01:25.018828127 -1000
-@@ -44,7 +44,7 @@
-  */
- struct ssh1_3des_ctx
- {
--  EVP_CIPHER_CTX  k1, k2, k3;
-+  EVP_CIPHER_CTX  *k1, *k2, *k3;
- };
- 
- const EVP_CIPHER * evp_ssh1_3des(void);
-@@ -65,7 +65,7 @@
-   if (key == NULL)
-   return 1;
-   if (enc == -1)
--  enc = ctx->encrypt;
-+  enc = EVP_CIPHER_CTX_encrypting(ctx);
-   k1 = k2 = k3 = (u_char *) key;
-   k2 += 8;
-   if (EVP_CIPHER_CTX_key_length(ctx) >= 16+8) {
-@@ -74,12 +74,17 @@
-   else
-   k1 += 16;
-   }
--  EVP_CIPHER_CTX_init(>k1);
--  EVP_CIPHER_CTX_init(>k2);
--  EVP_CIPHER_CTX_init(>k3);
--  if (EVP_CipherInit(>k1, EVP_des_cbc(), k1, NULL, enc) == 0 ||
--  EVP_CipherInit(>k2, EVP_des_cbc(), k2, NULL, !enc) == 0 ||
--  EVP_CipherInit(>k3, EVP_des_cbc(), k3, NULL, enc) == 0) {
-+  c->k1 = c->k2 = c->k3 = NULL;
-+  c->k1 = EVP_CIPHER_CTX_new();
-+  c->k2 = EVP_CIPHER_CTX_new();
-+  c->k3 = EVP_CIPHER_CTX_new();
-+  if (c->k1 == NULL || c->k2 == NULL || c->k3 == NULL ||
-+  EVP_CipherInit(c->k1, EVP_des_cbc(), k1, NULL, enc) == 0 ||
-+  EVP_CipherInit(c->k2, EVP_des_cbc(), k2, NULL, !enc) == 0 ||
-+  EVP_CipherInit(c->k3, EVP_des_cbc(), k3, NULL, enc) == 0) {
-+  EVP_CIPHER_CTX_free(c->k1);
-+  EVP_CIPHER_CTX_free(c->k2);
-+  EVP_CIPHER_CTX_free(c->k3);
-   explicit_bzero(c, sizeof(*c));
-   free(c);
-   EVP_CIPHER_CTX_set_app_data(ctx, NULL);
-@@ -95,9 +100,9 @@
- 
-   if ((c = EVP_CIPHER_CTX_get_app_data(ctx)) == NULL)
-   return 0;
--  if (EVP_Cipher(>k1, dest, (u_char *)src, len) == 0 ||
--  EVP_Cipher(>k2, dest, dest, len) == 0 ||
--  EVP_Cipher(>k3, dest, dest, len) == 0)
-+  if (EVP_Cipher(c->k1, dest, (u_char *)src, len) == 0 ||
-+  EVP_Cipher(c->k2, dest, dest, len) == 0 ||
-+  EVP_Cipher(c->k3, dest, dest, len) == 0)
-   return 0;
-   return 1;
- }
-@@ -108,9 +113,9 @@
-   struct ssh1_3des_ctx *c;
- 
-   if ((c = EVP_CIPHER_CTX_get_app_data(ctx)) != NULL) {
--  EVP_CIPHER_CTX_cleanup(>k1);
--  EVP_CIPHER_CTX_cleanup(>k2);
--  EVP_CIPHER_CTX_cleanup(>k3);
-+  EVP_CIPHER_CTX_free(c->k1);
-+  EVP_CIPHER_CTX_free(c->k2);
-+  EVP_CIPHER_CTX_free(c->k3);
-   explicit_bzero(c, sizeof(*c));
-   free(c);
-   EVP_CIPHER_CTX_set_app_data(ctx, NULL);
-@@ -128,13 +133,13 @@
-   if ((c = EVP_CIPHER_CTX_get_app_data(evp)) == NULL)
-  

[arch-commits] Commit in openssh/trunk (PKGBUILD sshd@.service)

[Gaëtan Bisson]

Date: Tuesday, April 18, 2017 @ 06:18:11
  Author: bisson
Revision: 293087

implement FS#53687

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/sshd@.service

---+
 PKGBUILD  |2 +-
 sshd@.service |1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-04-18 05:10:43 UTC (rev 293086)
+++ PKGBUILD2017-04-18 06:18:11 UTC (rev 293087)
@@ -27,7 +27,7 @@
 'SKIP'
 'b895b5f8e9f7d3a60286bf0a5b313d0b2ae2891ee1358e4862f1a0f1ad0ddc7d'
 '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
-'69cc2abaaae0aa8071b8eac338b2df725f60ce73381843179b74eaac78ba7f1d'
+'3a0845737207f4eda221c9c9fb64e766ade9684562d8ba4f705f7ae6826886e5'
 'c5ed9fa629f8f8dbf3bae4edbad4441c36df535088553fe82695c52d7bde30aa'
 'de14363e9d4ed92848e524036d9e6b57b2d35cc77d377b7247c38111d2a3defd'
 '4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6'

Modified: sshd@.service
===
--- sshd@.service   2017-04-18 05:10:43 UTC (rev 293086)
+++ sshd@.service   2017-04-18 06:18:11 UTC (rev 293087)
@@ -6,3 +6,4 @@
 ExecStart=-/usr/bin/sshd -i
 StandardInput=socket
 StandardError=syslog
+KillMode=process

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

[Gaëtan Bisson]

Date: Monday, March 20, 2017 @ 20:00:10
  Author: bisson
Revision: 291130

upstream update

Modified:
  openssh/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-20 18:27:34 UTC (rev 291129)
+++ PKGBUILD2017-03-20 20:00:10 UTC (rev 291130)
@@ -4,8 +4,8 @@
 # Contributor: judd 
 
 pkgname=openssh
-pkgver=7.4p1
-pkgrel=3
+pkgver=7.5p1
+pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 url='https://www.openssh.com/portable.html'
 license=('custom:BSD')
@@ -24,7 +24,7 @@
 'sshd.socket'
 'sshd.conf'
 'sshd.pam')
-sha256sums=('1b1fc4a14e2024293181924ed24872e6f2e06293f3e8926a376b8aec481f19d1'
+sha256sums=('9846e3c5fab9f0547400b4d2c017992f914222b3fd1f8eee6c7dc6bc5e59f9f0'
 'SKIP'
 '8f76e62ba7a0d0b9a4a328ab1d42cb4bd3c84fd34e5256c8a1e9786c631ce441'
 '241d8b2adbd50b0431da810f24e960442eef9226da55ea3489034590b421835f'
@@ -40,8 +40,8 @@
 prepare() {
cd $pkgname-$pkgver
# OpenSSL 1.1.0 patch from 
http://vega.pgw.jp/~kabe/vsd/patch/openssh-7.4p1-openssl-1.1.0c.patch.html
-   patch -Np0 -i ../openssh-7.4p1-openssl-1.1.0c.patch
-   patch -Np1 -i ../pthread-defines.patch
+#  patch -Np0 -i ../openssh-7.4p1-openssl-1.1.0c.patch
+#  patch -Np1 -i ../pthread-defines.patch
 }
 
 build() {

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

[Gaëtan Bisson]

Date: Thursday, March 2, 2017 @ 01:34:53
  Author: bisson
Revision: 289828

switch to sha256sum

Modified:
  openssh/trunk/PKGBUILD

--+
 PKGBUILD |   15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-02 01:34:48 UTC (rev 289827)
+++ PKGBUILD2017-03-02 01:34:53 UTC (rev 289828)
@@ -22,13 +22,14 @@
 'sshd.socket'
 'sshd.conf'
 'sshd.pam')
-sha1sums=('2330bbf82ed08cf3ac70e0acf00186ef3eeb97e0' 'SKIP'
-  'caaa801da59a5d14c0c29c43e9de5fef281ea03e'
-  '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
-  'ec49c6beba923e201505f5669cea48cad29014db'
-  'e12fa910b26a5634e5a6ac39ce1399a132cf6796'
-  'c9b2e4ce259cd62ddb00364d3ee6f00a8bf2d05f'
-  'd93dca5ebda4610ff7647187f8928a3de28703f3')
+sha256sums=('1b1fc4a14e2024293181924ed24872e6f2e06293f3e8926a376b8aec481f19d1'
+'SKIP'
+'4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
+'69cc2abaaae0aa8071b8eac338b2df725f60ce73381843179b74eaac78ba7f1d'
+'c5ed9fa629f8f8dbf3bae4edbad4441c36df535088553fe82695c52d7bde30aa'
+'de14363e9d4ed92848e524036d9e6b57b2d35cc77d377b7247c38111d2a3defd'
+'4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6'
+'64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846')
 
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
 

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

[Gaëtan Bisson]

Date: Saturday, February 4, 2017 @ 23:59:32
  Author: bisson
Revision: 288057

make tests' graceful dropout work

Modified:
  openssh/trunk/PKGBUILD

--+
 PKGBUILD |   13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-04 23:30:36 UTC (rev 288056)
+++ PKGBUILD2017-02-04 23:59:32 UTC (rev 288057)
@@ -56,14 +56,13 @@
 check() {
cd "${srcdir}/${pkgname}-${pkgver}"
 
-   [[ -e /.arch-chroot ]] && return
-   # Connectivity tests will fail under makechrootpkg since
-   # it runs as nobody which has /bin/false as login shell.
+   # 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.
 
-   [[ -e /usr/bin/scp ]] || return
-   # Tests require openssh to be already installed system-wide.
-
-   make tests
+   if [[ -e /usr/bin/scp && ! -e /.arch-chroot ]]; then
+   make tests
+   fi
 }
 
 package() {

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

[Gaëtan Bisson]

Date: Saturday, February 4, 2017 @ 07:04:53
  Author: bisson
Revision: 288008

implement FS#52823

Modified:
  openssh/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-04 06:27:00 UTC (rev 288007)
+++ PKGBUILD2017-02-04 07:04:53 UTC (rev 288008)
@@ -56,10 +56,14 @@
 check() {
cd "${srcdir}/${pkgname}-${pkgver}"
 
+   [[ -e /.arch-chroot ]] && return
+   # Connectivity tests will fail under makechrootpkg since
+   # it runs as nobody which has /bin/false as login shell.
+
+   [[ -e /usr/bin/scp ]] || return
+   # Tests require openssh to be already installed system-wide.
+
make tests
-
-   # Connectivity tests will fail with makechrootpkg since
-   # it runs as nobody which has /bin/false as login shell.
 }
 
 package() {

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

[Gaëtan Bisson]

Date: Sunday, January 1, 2017 @ 08:40:34
  Author: bisson
Revision: 285009

rebuild against libldns.so.2

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2017-01-01 07:56:13 UTC (rev 285008)
+++ PKGBUILD2017-01-01 08:40:34 UTC (rev 285009)
@@ -5,7 +5,7 @@
 
 pkgname=openssh
 pkgver=7.4p1
-pkgrel=1
+pkgrel=2
 pkgdesc='Free version of the SSH connectivity tools'
 url='https://www.openssh.com/portable.html'
 license=('custom:BSD')

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

[Gaëtan Bisson]

Date: Wednesday, December 21, 2016 @ 23:34:37
  Author: bisson
Revision: 284403

implement FS#52224

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2016-12-21 23:34:21 UTC (rev 284402)
+++ PKGBUILD2016-12-21 23:34:37 UTC (rev 284403)
@@ -7,7 +7,7 @@
 pkgver=7.4p1
 pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
-url='https://www.openssh.org/portable.html'
+url='https://www.openssh.com/portable.html'
 license=('custom:BSD')
 arch=('i686' 'x86_64')
 makedepends=('linux-headers')

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

[Gaëtan Bisson]

Date: Tuesday, December 20, 2016 @ 05:02:52
  Author: bisson
Revision: 284349

upstream update

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2016-12-20 01:19:18 UTC (rev 284348)
+++ PKGBUILD2016-12-20 05:02:52 UTC (rev 284349)
@@ -4,8 +4,8 @@
 # Contributor: judd 
 
 pkgname=openssh
-pkgver=7.3p1
-pkgrel=2
+pkgver=7.4p1
+pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 url='https://www.openssh.org/portable.html'
 license=('custom:BSD')
@@ -22,7 +22,7 @@
 'sshd.socket'
 'sshd.conf'
 'sshd.pam')
-sha1sums=('bfade84283fcba885e2084343ab19a08c7d123a5' 'SKIP'
+sha1sums=('2330bbf82ed08cf3ac70e0acf00186ef3eeb97e0' 'SKIP'
   'caaa801da59a5d14c0c29c43e9de5fef281ea03e'
   '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
   'ec49c6beba923e201505f5669cea48cad29014db'

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

[Gaëtan Bisson]

Date: Tuesday, November 1, 2016 @ 22:11:52
  Author: bisson
Revision: 279720

add https

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2016-11-01 22:11:48 UTC (rev 279719)
+++ PKGBUILD2016-11-01 22:11:52 UTC (rev 279720)
@@ -7,7 +7,7 @@
 pkgver=7.3p1
 pkgrel=2
 pkgdesc='Free version of the SSH connectivity tools'
-url='http://www.openssh.org/portable.html'
+url='https://www.openssh.org/portable.html'
 license=('custom:BSD')
 arch=('i686' 'x86_64')
 makedepends=('linux-headers')
@@ -15,7 +15,7 @@
 optdepends=('xorg-xauth: X11 forwarding'
 'x11-ssh-askpass: input passphrase in X')
 validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30')
-source=("http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc}
+source=("https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc}
 'sshdgenkeys.service'
 'sshd@.service'
 'sshd.service'

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

[Gaëtan Bisson]

Date: Sunday, October 2, 2016 @ 23:56:56
  Author: bisson
Revision: 277562

i build in VMs and `make tests` works there

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2016-10-02 22:02:24 UTC (rev 277561)
+++ PKGBUILD2016-10-02 23:56:56 UTC (rev 277562)
@@ -56,10 +56,10 @@
 check() {
cd "${srcdir}/${pkgname}-${pkgver}"
 
-   make tests || true
-   # hard to suitably test connectivity:
-   # - fails with /bin/false as login shell
-   # - fails with firewall activated, etc.
+   make tests
+
+   # Connectivity tests will fail with makechrootpkg since
+   # it runs as nobody which has /bin/false as login shell.
 }
 
 package() {

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

[Gaëtan Bisson]

Date: Saturday, October 1, 2016 @ 21:47:28
  Author: bisson
Revision: 277529

fix FS#51170

Modified:
  openssh/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-10-01 20:57:21 UTC (rev 277528)
+++ PKGBUILD2016-10-01 21:47:28 UTC (rev 277529)
@@ -5,7 +5,7 @@
 
 pkgname=openssh
 pkgver=7.3p1
-pkgrel=1
+pkgrel=2
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
 license=('custom:BSD')
@@ -47,7 +47,6 @@
--with-privsep-user=nobody \
--with-kerberos5=/usr \
--with-xauth=/usr/bin/xauth \
-   --with-mantype=man \
--with-md5-passwords \
--with-pid-dir=/run \
 

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

[Gaëtan Bisson]

Date: Monday, August 1, 2016 @ 13:45:48
  Author: bisson
Revision: 272771

upstream update

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2016-08-01 11:04:46 UTC (rev 272770)
+++ PKGBUILD2016-08-01 13:45:48 UTC (rev 272771)
@@ -4,8 +4,8 @@
 # Contributor: judd 
 
 pkgname=openssh
-pkgver=7.2p2
-pkgrel=2
+pkgver=7.3p1
+pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
 license=('custom:BSD')
@@ -22,7 +22,7 @@
 'sshd.socket'
 'sshd.conf'
 'sshd.pam')
-sha1sums=('70e35d7d6386fe08abbd823b3a12a3ca44ac6d38' 'SKIP'
+sha1sums=('bfade84283fcba885e2084343ab19a08c7d123a5' 'SKIP'
   'caaa801da59a5d14c0c29c43e9de5fef281ea03e'
   '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
   'ec49c6beba923e201505f5669cea48cad29014db'

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

[Gaetan Bisson]

Date: Sunday, May 15, 2016 @ 00:24:23
  Author: bisson
Revision: 268047

fix FS#49325:

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/sshdgenkeys.service

-+
 PKGBUILD|4 ++--
 sshdgenkeys.service |6 ++
 2 files changed, 4 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-14 22:03:54 UTC (rev 268046)
+++ PKGBUILD2016-05-14 22:24:23 UTC (rev 268047)
@@ -5,7 +5,7 @@
 
 pkgname=openssh
 pkgver=7.2p2
-pkgrel=1
+pkgrel=2
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
 license=('custom:BSD')
@@ -23,7 +23,7 @@
 'sshd.conf'
 'sshd.pam')
 sha1sums=('70e35d7d6386fe08abbd823b3a12a3ca44ac6d38' 'SKIP'
-  'cc1ceec606c98c7407e7ac21ade23aed81e31405'
+  'caaa801da59a5d14c0c29c43e9de5fef281ea03e'
   '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
   'ec49c6beba923e201505f5669cea48cad29014db'
   'e12fa910b26a5634e5a6ac39ce1399a132cf6796'

Modified: sshdgenkeys.service
===
--- sshdgenkeys.service 2016-05-14 22:03:54 UTC (rev 268046)
+++ sshdgenkeys.service 2016-05-14 22:24:23 UTC (rev 268047)
@@ -1,9 +1,5 @@
 [Unit]
 Description=SSH Key Generation
-ConditionPathExists=|!/etc/ssh/ssh_host_key
-ConditionPathExists=|!/etc/ssh/ssh_host_key.pub
-ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key
-ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub
 ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key
 ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key.pub
 ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key
@@ -10,6 +6,8 @@
 ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub
 ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key
 ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key.pub
+ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key
+ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub
 
 [Service]
 ExecStart=/usr/bin/ssh-keygen -A

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

[Gaetan Bisson]

Date: Saturday, May 7, 2016 @ 06:39:38
  Author: bisson
Revision: 267104

fix FS#49175

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2016-05-07 04:38:29 UTC (rev 267103)
+++ PKGBUILD2016-05-07 04:39:38 UTC (rev 267104)
@@ -15,7 +15,7 @@
 optdepends=('xorg-xauth: X11 forwarding'
 'x11-ssh-askpass: input passphrase in X')
 validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30')
-source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc}
+source=("http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc}
 'sshdgenkeys.service'
 'sshd@.service'
 'sshd.service'

[arch-commits] Commit in openssh/trunk (PKGBUILD dispatch.patch error.patch install)

[Gaetan Bisson]

Date: Monday, February 29, 2016 @ 05:07:41
  Author: bisson
Revision: 260360

upstream update

Modified:
  openssh/trunk/PKGBUILD
Deleted:
  openssh/trunk/dispatch.patch
  openssh/trunk/error.patch
  openssh/trunk/install

+
 PKGBUILD   |6 +---
 dispatch.patch |   81 ---
 error.patch|   25 
 install|   10 --
 4 files changed, 2 insertions(+), 120 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-02-29 03:56:20 UTC (rev 260359)
+++ PKGBUILD2016-02-29 04:07:41 UTC (rev 260360)
@@ -4,7 +4,7 @@
 # Contributor: judd 
 
 pkgname=openssh
-pkgver=7.1p2
+pkgver=7.2p1
 pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
@@ -22,7 +22,7 @@
 'sshd.socket'
 'sshd.conf'
 'sshd.pam')
-sha1sums=('9202f5a2a50c8a55ecfb830609df1e1fde97f758' 'SKIP'
+sha1sums=('d30a6fd472199ab5838a7668c0c5fd885fb8d371' 'SKIP'
   'cc1ceec606c98c7407e7ac21ade23aed81e31405'
   '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
   'ec49c6beba923e201505f5669cea48cad29014db'
@@ -32,8 +32,6 @@
 
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
 
-install=install
-
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"
 

Deleted: dispatch.patch
===
--- dispatch.patch  2016-02-29 03:56:20 UTC (rev 260359)
+++ dispatch.patch  2016-02-29 04:07:41 UTC (rev 260360)
@@ -1,81 +0,0 @@
-From 639d6bc57b1942393ed12fb48f00bc05d4e093e4 Mon Sep 17 00:00:00 2001
-From: d...@openbsd.org 
-Date: Fri, 01 May 2015 07:10:01 +
-Subject: upstream commit
-
-refactor ssh_dispatch_run_fatal() to use sshpkt_fatal()
- to better report error conditions. Teach sshpkt_fatal() about ECONNRESET.
-
-Improves error messages on TCP connection resets. bz#2257
-
-ok dtucker@

-diff --git a/dispatch.c b/dispatch.c
-index afe6182..aac933e 100644
 a/dispatch.c
-+++ b/dispatch.c
-@@ -1,4 +1,4 @@
--/* $OpenBSD: dispatch.c,v 1.26 2015/02/12 20:34:19 dtucker Exp $ */
-+/* $OpenBSD: dispatch.c,v 1.27 2015/05/01 07:10:01 djm Exp $ */
- /*
-  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
-  *
-@@ -137,22 +137,6 @@ ssh_dispatch_run_fatal(struct ssh *ssh, int mode, 
volatile sig_atomic_t *done,
- {
-   int r;
- 
--  if ((r = ssh_dispatch_run(ssh, mode, done, ctxt)) != 0) {
--  switch (r) {
--  case SSH_ERR_CONN_CLOSED:
--  logit("Connection closed by %.200s",
--  ssh_remote_ipaddr(ssh));
--  cleanup_exit(255);
--  case SSH_ERR_CONN_TIMEOUT:
--  logit("Connection to %.200s timed out while "
--  "waiting to read", ssh_remote_ipaddr(ssh));
--  cleanup_exit(255);
--  case SSH_ERR_DISCONNECTED:
--  logit("Disconnected from %.200s",
--  ssh_remote_ipaddr(ssh));
--  cleanup_exit(255);
--  default:
--  fatal("%s: %s", __func__, ssh_err(r));
--  }
--  }
-+  if ((r = ssh_dispatch_run(ssh, mode, done, ctxt)) != 0)
-+  sshpkt_fatal(ssh, __func__, r);
- }
-diff --git a/packet.c b/packet.c
-index 4922573..a7727ef 100644
 a/packet.c
-+++ b/packet.c
-@@ -1,4 +1,4 @@
--/* $OpenBSD: packet.c,v 1.208 2015/02/13 18:57:00 markus Exp $ */
-+/* $OpenBSD: packet.c,v 1.212 2015/05/01 07:10:01 djm Exp $ */
- /*
-  * Author: Tatu Ylonen 
-  * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland
-@@ -1920,9 +1920,19 @@ sshpkt_fatal(struct ssh *ssh, const char *tag, int r)
-   logit("Connection closed by %.200s", ssh_remote_ipaddr(ssh));
-   cleanup_exit(255);
-   case SSH_ERR_CONN_TIMEOUT:
--  logit("Connection to %.200s timed out while "
--  "waiting to write", ssh_remote_ipaddr(ssh));
-+  logit("Connection to %.200s timed out", ssh_remote_ipaddr(ssh));
-   cleanup_exit(255);
-+  case SSH_ERR_DISCONNECTED:
-+  logit("Disconnected from %.200s",
-+  ssh_remote_ipaddr(ssh));
-+  cleanup_exit(255);
-+  case SSH_ERR_SYSTEM_ERROR:
-+  if (errno == ECONNRESET) {
-+  logit("Connection reset by %.200s",
-+  ssh_remote_ipaddr(ssh));
-+  cleanup_exit(255);
-+  }
-+  /* FALLTHROUGH */
-   default:
-   fatal("%s%sConnection to %.200s: %s",
-   tag != NULL ? tag : "", tag != NULL ? ": " : "",
---
-cgit v0.9.2

Deleted: error.patch
===
--- error.patch 

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

[Evangelos Foutras]

Date: Thursday, January 14, 2016 @ 16:51:23
  Author: foutrelis
Revision: 258309

upgpkg: openssh 7.1p2-1

New upstream release; fixes CVE-2016-0777.

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2016-01-14 15:45:04 UTC (rev 258308)
+++ PKGBUILD2016-01-14 15:51:23 UTC (rev 258309)
@@ -4,7 +4,7 @@
 # Contributor: judd 
 
 pkgname=openssh
-pkgver=7.1p1
+pkgver=7.1p2
 pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
@@ -22,7 +22,7 @@
 'sshd.socket'
 'sshd.conf'
 'sshd.pam')
-sha1sums=('ed22af19f962262c493fcc6ed8c8826b2761d9b6' 'SKIP'
+sha1sums=('9202f5a2a50c8a55ecfb830609df1e1fde97f758' 'SKIP'
   'cc1ceec606c98c7407e7ac21ade23aed81e31405'
   '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
   'ec49c6beba923e201505f5669cea48cad29014db'

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

[Gaetan Bisson]

Date: Friday, August 21, 2015 @ 09:49:53
  Author: bisson
Revision: 244461

upstream update

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2015-08-21 04:39:48 UTC (rev 244460)
+++ PKGBUILD2015-08-21 07:49:53 UTC (rev 244461)
@@ -4,7 +4,7 @@
 # Contributor: judd jvi...@zeroflux.org
 
 pkgname=openssh
-pkgver=7.0p1
+pkgver=7.1p1
 pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
@@ -22,7 +22,7 @@
 'sshd.socket'
 'sshd.conf'
 'sshd.pam')
-sha1sums=('d8337c9eab91d360d104f6dd805f8b32089c063c' 'SKIP'
+sha1sums=('ed22af19f962262c493fcc6ed8c8826b2761d9b6' 'SKIP'
   'cc1ceec606c98c7407e7ac21ade23aed81e31405'
   '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
   'ec49c6beba923e201505f5669cea48cad29014db'

[arch-commits] Commit in openssh/trunk (PKGBUILD keyboard-interactive.patch)

[Gaetan Bisson]

Date: Tuesday, August 11, 2015 @ 16:15:07
  Author: bisson
Revision: 243157

upstream update

Modified:
  openssh/trunk/PKGBUILD
Deleted:
  openssh/trunk/keyboard-interactive.patch

+
 PKGBUILD   |   13 ++
 keyboard-interactive.patch |   52 ---
 2 files changed, 3 insertions(+), 62 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-08-11 14:13:04 UTC (rev 243156)
+++ PKGBUILD2015-08-11 14:15:07 UTC (rev 243157)
@@ -4,8 +4,8 @@
 # Contributor: judd jvi...@zeroflux.org
 
 pkgname=openssh
-pkgver=6.9p1
-pkgrel=2
+pkgver=7.0p1
+pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
 license=('custom:BSD')
@@ -16,7 +16,6 @@
 'x11-ssh-askpass: input passphrase in X')
 validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30')
 
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz{,.asc}
-'keyboard-interactive.patch'
 'sshdgenkeys.service'
 'sshd@.service'
 'sshd.service'
@@ -23,8 +22,7 @@
 'sshd.socket'
 'sshd.conf'
 'sshd.pam')
-sha1sums=('86ab57f00d0fd9bf302760f2f6deac1b6e9df265' 'SKIP'
-  'ef9e9327a943839abb3d202783b318e9cd2bdcd5'
+sha1sums=('d8337c9eab91d360d104f6dd805f8b32089c063c' 'SKIP'
   'cc1ceec606c98c7407e7ac21ade23aed81e31405'
   '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
   'ec49c6beba923e201505f5669cea48cad29014db'
@@ -36,11 +34,6 @@
 
 install=install
 
-prepare() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   patch -p1 -i ../keyboard-interactive.patch
-}
-
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
 

Deleted: keyboard-interactive.patch
===
--- keyboard-interactive.patch  2015-08-11 14:13:04 UTC (rev 243156)
+++ keyboard-interactive.patch  2015-08-11 14:15:07 UTC (rev 243157)
@@ -1,52 +0,0 @@
-From 5b64f85bb811246c59ebab70aed331f26ba37b18 Mon Sep 17 00:00:00 2001
-From: d...@openbsd.org d...@openbsd.org
-Date: Sat, 18 Jul 2015 07:57:14 +
-Subject: upstream commit
-
-only query each keyboard-interactive device once per
- authentication request regardless of how many times it is listed; ok markus@
-
-Upstream-ID: d73fafba6e86030436ff673656ec1f33d9ffeda1

- auth2-chall.c | 11 ---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/auth2-chall.c b/auth2-chall.c
-index ddabe1a..4aff09d 100644
 a/auth2-chall.c
-+++ b/auth2-chall.c
-@@ -1,4 +1,4 @@
--/* $OpenBSD: auth2-chall.c,v 1.42 2015/01/19 20:07:45 markus Exp $ */
-+/* $OpenBSD: auth2-chall.c,v 1.43 2015/07/18 07:57:14 djm Exp $ */
- /*
-  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
-  * Copyright (c) 2001 Per Allansson.  All rights reserved.
-@@ -83,6 +83,7 @@ struct KbdintAuthctxt
-   void *ctxt;
-   KbdintDevice *device;
-   u_int nreq;
-+  u_int devices_done;
- };
- 
- #ifdef USE_PAM
-@@ -169,11 +170,15 @@ kbdint_next_device(Authctxt *authctxt, KbdintAuthctxt 
*kbdintctxt)
-   if (len == 0)
-   break;
-   for (i = 0; devices[i]; i++) {
--  if (!auth2_method_allowed(authctxt,
-+  if ((kbdintctxt-devices_done  (1  i)) != 0 ||
-+  !auth2_method_allowed(authctxt,
-   keyboard-interactive, devices[i]-name))
-   continue;
--  if (strncmp(kbdintctxt-devices, devices[i]-name, len) 
== 0)
-+  if (strncmp(kbdintctxt-devices, devices[i]-name,
-+  len) == 0) {
-   kbdintctxt-device = devices[i];
-+  kbdintctxt-devices_done |= 1  i;
-+  }
-   }
-   t = kbdintctxt-devices;
-   kbdintctxt-devices = t[len] ? xstrdup(t+len+1) : NULL;
--- 
-cgit v0.11.2
-

[arch-commits] Commit in openssh/trunk (PKGBUILD keyboard-interactive.patch)

[Gaetan Bisson]

Date: Thursday, July 23, 2015 @ 04:38:36
  Author: bisson
Revision: 242452

fix 
https://kingcope.wordpress.com/2015/07/16/openssh-keyboard-interactive-authentication-brute-force-vulnerability-maxauthtries-bypass/

Added:
  openssh/trunk/keyboard-interactive.patch
Modified:
  openssh/trunk/PKGBUILD

+
 PKGBUILD   |9 ++-
 keyboard-interactive.patch |   52 +++
 2 files changed, 60 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-07-23 00:53:11 UTC (rev 242451)
+++ PKGBUILD2015-07-23 02:38:36 UTC (rev 242452)
@@ -5,7 +5,7 @@
 
 pkgname=openssh
 pkgver=6.9p1
-pkgrel=1
+pkgrel=2
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
 license=('custom:BSD')
@@ -16,6 +16,7 @@
 'x11-ssh-askpass: input passphrase in X')
 validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30')
 
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz{,.asc}
+'keyboard-interactive.patch'
 'sshdgenkeys.service'
 'sshd@.service'
 'sshd.service'
@@ -23,6 +24,7 @@
 'sshd.conf'
 'sshd.pam')
 sha1sums=('86ab57f00d0fd9bf302760f2f6deac1b6e9df265' 'SKIP'
+  'ef9e9327a943839abb3d202783b318e9cd2bdcd5'
   'cc1ceec606c98c7407e7ac21ade23aed81e31405'
   '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
   'ec49c6beba923e201505f5669cea48cad29014db'
@@ -34,6 +36,11 @@
 
 install=install
 
+prepare() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   patch -p1 -i ../keyboard-interactive.patch
+}
+
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
 

Added: keyboard-interactive.patch
===
--- keyboard-interactive.patch  (rev 0)
+++ keyboard-interactive.patch  2015-07-23 02:38:36 UTC (rev 242452)
@@ -0,0 +1,52 @@
+From 5b64f85bb811246c59ebab70aed331f26ba37b18 Mon Sep 17 00:00:00 2001
+From: d...@openbsd.org d...@openbsd.org
+Date: Sat, 18 Jul 2015 07:57:14 +
+Subject: upstream commit
+
+only query each keyboard-interactive device once per
+ authentication request regardless of how many times it is listed; ok markus@
+
+Upstream-ID: d73fafba6e86030436ff673656ec1f33d9ffeda1
+---
+ auth2-chall.c | 11 ---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/auth2-chall.c b/auth2-chall.c
+index ddabe1a..4aff09d 100644
+--- a/auth2-chall.c
 b/auth2-chall.c
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: auth2-chall.c,v 1.42 2015/01/19 20:07:45 markus Exp $ */
++/* $OpenBSD: auth2-chall.c,v 1.43 2015/07/18 07:57:14 djm Exp $ */
+ /*
+  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
+  * Copyright (c) 2001 Per Allansson.  All rights reserved.
+@@ -83,6 +83,7 @@ struct KbdintAuthctxt
+   void *ctxt;
+   KbdintDevice *device;
+   u_int nreq;
++  u_int devices_done;
+ };
+ 
+ #ifdef USE_PAM
+@@ -169,11 +170,15 @@ kbdint_next_device(Authctxt *authctxt, KbdintAuthctxt 
*kbdintctxt)
+   if (len == 0)
+   break;
+   for (i = 0; devices[i]; i++) {
+-  if (!auth2_method_allowed(authctxt,
++  if ((kbdintctxt-devices_done  (1  i)) != 0 ||
++  !auth2_method_allowed(authctxt,
+   keyboard-interactive, devices[i]-name))
+   continue;
+-  if (strncmp(kbdintctxt-devices, devices[i]-name, len) 
== 0)
++  if (strncmp(kbdintctxt-devices, devices[i]-name,
++  len) == 0) {
+   kbdintctxt-device = devices[i];
++  kbdintctxt-devices_done |= 1  i;
++  }
+   }
+   t = kbdintctxt-devices;
+   kbdintctxt-devices = t[len] ? xstrdup(t+len+1) : NULL;
+-- 
+cgit v0.11.2
+

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

[Gaetan Bisson]

Date: Wednesday, July 1, 2015 @ 07:21:46
  Author: bisson
Revision: 241658

upstream update

Modified:
  openssh/trunk/PKGBUILD

--+
 PKGBUILD |   16 +++-
 1 file changed, 3 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-07-01 04:33:57 UTC (rev 241657)
+++ PKGBUILD2015-07-01 05:21:46 UTC (rev 241658)
@@ -4,8 +4,8 @@
 # Contributor: judd jvi...@zeroflux.org
 
 pkgname=openssh
-pkgver=6.8p1
-pkgrel=3
+pkgver=6.9p1
+pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
 license=('custom:BSD')
@@ -16,8 +16,6 @@
 'x11-ssh-askpass: input passphrase in X')
 validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30')
 
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz{,.asc}
-'error.patch'
-'dispatch.patch'
 'sshdgenkeys.service'
 'sshd@.service'
 'sshd.service'
@@ -24,9 +22,7 @@
 'sshd.socket'
 'sshd.conf'
 'sshd.pam')
-sha1sums=('cdbc51e46a902b30d263b05fdc71340920e91c92' 'SKIP'
-  '1b6b11efe9b20b9d1e51a59ac4b16eefb1dc84b8'
-  'e629d45e899bbb2b3e702080f37cb40f3dc2b9b4'
+sha1sums=('86ab57f00d0fd9bf302760f2f6deac1b6e9df265' 'SKIP'
   'cc1ceec606c98c7407e7ac21ade23aed81e31405'
   '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
   'ec49c6beba923e201505f5669cea48cad29014db'
@@ -38,12 +34,6 @@
 
 install=install
 
-prepare() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   patch -p1 -i ../error.patch
-   patch -p1 -i ../dispatch.patch
-}
-
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
 

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

[Gaetan Bisson]

Date: Wednesday, May 20, 2015 @ 11:16:30
  Author: bisson
Revision: 239585

fix FS#45020

Added:
  openssh/trunk/dispatch.patch
Modified:
  openssh/trunk/PKGBUILD

+
 PKGBUILD   |5 ++-
 dispatch.patch |   81 +++
 2 files changed, 85 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-20 07:59:44 UTC (rev 239584)
+++ PKGBUILD2015-05-20 09:16:30 UTC (rev 239585)
@@ -5,7 +5,7 @@
 
 pkgname=openssh
 pkgver=6.8p1
-pkgrel=2
+pkgrel=3
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
 license=('custom:BSD')
@@ -17,6 +17,7 @@
 validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30')
 
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz{,.asc}
 'error.patch'
+'dispatch.patch'
 'sshdgenkeys.service'
 'sshd@.service'
 'sshd.service'
@@ -25,6 +26,7 @@
 'sshd.pam')
 sha1sums=('cdbc51e46a902b30d263b05fdc71340920e91c92' 'SKIP'
   '1b6b11efe9b20b9d1e51a59ac4b16eefb1dc84b8'
+  'e629d45e899bbb2b3e702080f37cb40f3dc2b9b4'
   'cc1ceec606c98c7407e7ac21ade23aed81e31405'
   '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
   'ec49c6beba923e201505f5669cea48cad29014db'
@@ -39,6 +41,7 @@
 prepare() {
cd ${srcdir}/${pkgname}-${pkgver}
patch -p1 -i ../error.patch
+   patch -p1 -i ../dispatch.patch
 }
 
 build() {

Added: dispatch.patch
===
--- dispatch.patch  (rev 0)
+++ dispatch.patch  2015-05-20 09:16:30 UTC (rev 239585)
@@ -0,0 +1,81 @@
+From 639d6bc57b1942393ed12fb48f00bc05d4e093e4 Mon Sep 17 00:00:00 2001
+From: d...@openbsd.org d...@openbsd.org
+Date: Fri, 01 May 2015 07:10:01 +
+Subject: upstream commit
+
+refactor ssh_dispatch_run_fatal() to use sshpkt_fatal()
+ to better report error conditions. Teach sshpkt_fatal() about ECONNRESET.
+
+Improves error messages on TCP connection resets. bz#2257
+
+ok dtucker@
+---
+diff --git a/dispatch.c b/dispatch.c
+index afe6182..aac933e 100644
+--- a/dispatch.c
 b/dispatch.c
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: dispatch.c,v 1.26 2015/02/12 20:34:19 dtucker Exp $ */
++/* $OpenBSD: dispatch.c,v 1.27 2015/05/01 07:10:01 djm Exp $ */
+ /*
+  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
+  *
+@@ -137,22 +137,6 @@ ssh_dispatch_run_fatal(struct ssh *ssh, int mode, 
volatile sig_atomic_t *done,
+ {
+   int r;
+ 
+-  if ((r = ssh_dispatch_run(ssh, mode, done, ctxt)) != 0) {
+-  switch (r) {
+-  case SSH_ERR_CONN_CLOSED:
+-  logit(Connection closed by %.200s,
+-  ssh_remote_ipaddr(ssh));
+-  cleanup_exit(255);
+-  case SSH_ERR_CONN_TIMEOUT:
+-  logit(Connection to %.200s timed out while 
+-  waiting to read, ssh_remote_ipaddr(ssh));
+-  cleanup_exit(255);
+-  case SSH_ERR_DISCONNECTED:
+-  logit(Disconnected from %.200s,
+-  ssh_remote_ipaddr(ssh));
+-  cleanup_exit(255);
+-  default:
+-  fatal(%s: %s, __func__, ssh_err(r));
+-  }
+-  }
++  if ((r = ssh_dispatch_run(ssh, mode, done, ctxt)) != 0)
++  sshpkt_fatal(ssh, __func__, r);
+ }
+diff --git a/packet.c b/packet.c
+index 4922573..a7727ef 100644
+--- a/packet.c
 b/packet.c
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: packet.c,v 1.208 2015/02/13 18:57:00 markus Exp $ */
++/* $OpenBSD: packet.c,v 1.212 2015/05/01 07:10:01 djm Exp $ */
+ /*
+  * Author: Tatu Ylonen y...@cs.hut.fi
+  * Copyright (c) 1995 Tatu Ylonen y...@cs.hut.fi, Espoo, Finland
+@@ -1920,9 +1920,19 @@ sshpkt_fatal(struct ssh *ssh, const char *tag, int r)
+   logit(Connection closed by %.200s, ssh_remote_ipaddr(ssh));
+   cleanup_exit(255);
+   case SSH_ERR_CONN_TIMEOUT:
+-  logit(Connection to %.200s timed out while 
+-  waiting to write, ssh_remote_ipaddr(ssh));
++  logit(Connection to %.200s timed out, ssh_remote_ipaddr(ssh));
+   cleanup_exit(255);
++  case SSH_ERR_DISCONNECTED:
++  logit(Disconnected from %.200s,
++  ssh_remote_ipaddr(ssh));
++  cleanup_exit(255);
++  case SSH_ERR_SYSTEM_ERROR:
++  if (errno == ECONNRESET) {
++  logit(Connection reset by %.200s,
++  ssh_remote_ipaddr(ssh));
++  cleanup_exit(255);
++  }
++  /* FALLTHROUGH */
+   default:
+   fatal(%s%sConnection to %.200s: %s,
+   tag != NULL ? tag : , tag != NULL ? :  : ,
+--
+cgit v0.9.2

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

[Gaetan Bisson]

Date: Wednesday, April 8, 2015 @ 19:56:48
  Author: bisson
Revision: 235747

implement FS#44494

Added:
  openssh/trunk/sshd.conf
Modified:
  openssh/trunk/PKGBUILD

---+
 PKGBUILD  |3 +++
 sshd.conf |1 +
 2 files changed, 4 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2015-04-08 17:04:43 UTC (rev 235746)
+++ PKGBUILD2015-04-08 17:56:48 UTC (rev 235747)
@@ -21,6 +21,7 @@
 'sshd@.service'
 'sshd.service'
 'sshd.socket'
+'sshd.conf'
 'sshd.pam')
 sha1sums=('cdbc51e46a902b30d263b05fdc71340920e91c92' 'SKIP'
   '1b6b11efe9b20b9d1e51a59ac4b16eefb1dc84b8'
@@ -28,6 +29,7 @@
   '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
   'ec49c6beba923e201505f5669cea48cad29014db'
   'e12fa910b26a5634e5a6ac39ce1399a132cf6796'
+  'c9b2e4ce259cd62ddb00364d3ee6f00a8bf2d05f'
   'd93dca5ebda4610ff7647187f8928a3de28703f3')
 
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
@@ -82,6 +84,7 @@
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

Added: sshd.conf
===
--- sshd.conf   (rev 0)
+++ sshd.conf   2015-04-08 17:56:48 UTC (rev 235747)
@@ -0,0 +1 @@
+d /var/empty 0755 root root

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

[Gaetan Bisson]

Date: Friday, March 20, 2015 @ 06:05:03
  Author: bisson
Revision: 234192

fix FS#44267

Added:
  openssh/trunk/error.patch
Modified:
  openssh/trunk/PKGBUILD

-+
 PKGBUILD|9 -
 error.patch |   25 +
 2 files changed, 33 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-20 03:34:00 UTC (rev 234191)
+++ PKGBUILD2015-03-20 05:05:03 UTC (rev 234192)
@@ -5,7 +5,7 @@
 
 pkgname=openssh
 pkgver=6.8p1
-pkgrel=1
+pkgrel=2
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
 license=('custom:BSD')
@@ -16,6 +16,7 @@
 'x11-ssh-askpass: input passphrase in X')
 validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30')
 
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz{,.asc}
+'error.patch'
 'sshdgenkeys.service'
 'sshd@.service'
 'sshd.service'
@@ -22,6 +23,7 @@
 'sshd.socket'
 'sshd.pam')
 sha1sums=('cdbc51e46a902b30d263b05fdc71340920e91c92' 'SKIP'
+  '1b6b11efe9b20b9d1e51a59ac4b16eefb1dc84b8'
   'cc1ceec606c98c7407e7ac21ade23aed81e31405'
   '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
   'ec49c6beba923e201505f5669cea48cad29014db'
@@ -32,6 +34,11 @@
 
 install=install
 
+prepare() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   patch -p1 -i ../error.patch
+}
+
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
 

Added: error.patch
===
--- error.patch (rev 0)
+++ error.patch 2015-03-20 05:05:03 UTC (rev 234192)
@@ -0,0 +1,25 @@
+From 4d24b3b6a4a6383e05e7da26d183b79fa8663697 Mon Sep 17 00:00:00 2001
+From: Damien Miller d...@mindrot.org
+Date: Thu, 19 Mar 2015 22:11:59 +
+Subject: remove error() accidentally inserted for debugging
+
+pointed out by Christian Hesse
+---
+diff --git a/monitor_wrap.c b/monitor_wrap.c
+index b379f05..d39d491 100644
+--- a/monitor_wrap.c
 b/monitor_wrap.c
+@@ -153,10 +153,8 @@ mm_request_receive(int sock, Buffer *m)
+   debug3(%s entering, __func__);
+ 
+   if (atomicio(read, sock, buf, sizeof(buf)) != sizeof(buf)) {
+-  if (errno == EPIPE) {
+-  error(%s: socket closed, __func__);
++  if (errno == EPIPE)
+   cleanup_exit(255);
+-  }
+   fatal(%s: read: %s, __func__, strerror(errno));
+   }
+   msg_len = get_u32(buf);
+--
+cgit v0.9.2

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

[Gaetan Bisson]

Date: Wednesday, March 18, 2015 @ 17:26:13
  Author: bisson
Revision: 234103

upstream update

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2015-03-18 16:16:29 UTC (rev 234102)
+++ PKGBUILD2015-03-18 16:26:13 UTC (rev 234103)
@@ -4,7 +4,7 @@
 # Contributor: judd jvi...@zeroflux.org
 
 pkgname=openssh
-pkgver=6.7p1
+pkgver=6.8p1
 pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
@@ -21,7 +21,7 @@
 'sshd.service'
 'sshd.socket'
 'sshd.pam')
-sha1sums=('14e5fbed710ade334d65925e080d1aaeb9c85bf6' 'SKIP'
+sha1sums=('cdbc51e46a902b30d263b05fdc71340920e91c92' 'SKIP'
   'cc1ceec606c98c7407e7ac21ade23aed81e31405'
   '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
   'ec49c6beba923e201505f5669cea48cad29014db'

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

[Gaetan Bisson]

Date: Tuesday, December 30, 2014 @ 21:02:33
  Author: bisson
Revision: 228191

add validpgpkeys

Modified:
  openssh/trunk/PKGBUILD

--+
 PKGBUILD |1 +
 1 file changed, 1 insertion(+)

Modified: PKGBUILD
===
--- PKGBUILD2014-12-30 19:54:57 UTC (rev 228190)
+++ PKGBUILD2014-12-30 20:02:33 UTC (rev 228191)
@@ -14,6 +14,7 @@
 depends=('krb5' 'openssl' 'libedit' 'ldns')
 optdepends=('xorg-xauth: X11 forwarding'
 'x11-ssh-askpass: input passphrase in X')
+validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30')
 
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz{,.asc}
 'sshdgenkeys.service'
 'sshd@.service'

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

[Gaetan Bisson]

Date: Tuesday, October 7, 2014 @ 04:36:53
  Author: bisson
Revision: 223946

upstream update

Modified:
  openssh/trunk/PKGBUILD
Deleted:
  openssh/trunk/curve25519pad.patch

-+
 PKGBUILD|   13 ---
 curve25519pad.patch |  171 --
 2 files changed, 3 insertions(+), 181 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-10-06 23:34:33 UTC (rev 223945)
+++ PKGBUILD2014-10-07 02:36:53 UTC (rev 223946)
@@ -4,8 +4,8 @@
 # Contributor: judd jvi...@zeroflux.org
 
 pkgname=openssh
-pkgver=6.6p1
-pkgrel=2
+pkgver=6.7p1
+pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
 license=('custom:BSD')
@@ -15,14 +15,12 @@
 optdepends=('xorg-xauth: X11 forwarding'
 'x11-ssh-askpass: input passphrase in X')
 
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz{,.asc}
-'curve25519pad.patch'
 'sshdgenkeys.service'
 'sshd@.service'
 'sshd.service'
 'sshd.socket'
 'sshd.pam')
-sha1sums=('b850fd1af704942d9b3c2eff7ef6b3a59b6a6b6e' 'SKIP'
-  '13b74b57b3d9b9a256eeb44b4fca29a8f27aa7ad'
+sha1sums=('14e5fbed710ade334d65925e080d1aaeb9c85bf6' 'SKIP'
   'cc1ceec606c98c7407e7ac21ade23aed81e31405'
   '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
   'ec49c6beba923e201505f5669cea48cad29014db'
@@ -33,11 +31,6 @@
 
 install=install
 
-prepare() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   patch -p0 -i ../curve25519pad.patch
-}
-
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
 

Deleted: curve25519pad.patch
===
--- curve25519pad.patch 2014-10-06 23:34:33 UTC (rev 223945)
+++ curve25519pad.patch 2014-10-07 02:36:53 UTC (rev 223946)
@@ -1,171 +0,0 @@
-Hi,
-
-So I screwed up when writing the support for the curve25519 KEX method
-that doesn't depend on OpenSSL's BIGNUM type - a bug in my code left
-leading zero bytes where they should have been skipped. The impact of
-this is that OpenSSH 6.5 and 6.6 will fail during key exchange with a
-peer that implements curve25519-sha...@libssh.org properly about 0.2%
-of the time (one in every 512ish connections).
-
-We've fixed this for OpenSSH 6.7 by avoiding the curve25519-sha256
-key exchange for previous versions, but I'd recommend distributors
-of OpenSSH apply this patch so the affected code doesn't become
-too entrenched in LTS releases.
-
-The patch fixes the bug and makes OpenSSH identify itself as 6.6.1 so as
-to distinguish itself from the incorrect versions so the compatibility
-code to disable the affected KEX isn't activated.
-
-I've committed this on the 6.6 branch too.
-
-Apologies for the hassle.
-
--d
-
-Index: version.h
-===
-RCS file: /var/cvs/openssh/version.h,v
-retrieving revision 1.82
-diff -u -p -r1.82 version.h
 version.h  27 Feb 2014 23:01:54 -  1.82
-+++ version.h  20 Apr 2014 03:35:15 -
-@@ -1,6 +1,6 @@
- /* $OpenBSD: version.h,v 1.70 2014/02/27 22:57:40 djm Exp $ */
- 
--#define SSH_VERSION   OpenSSH_6.6
-+#define SSH_VERSION   OpenSSH_6.6.1
- 
- #define SSH_PORTABLE  p1
- #define SSH_RELEASE   SSH_VERSION SSH_PORTABLE
-Index: compat.c
-===
-RCS file: /var/cvs/openssh/compat.c,v
-retrieving revision 1.82
-retrieving revision 1.85
-diff -u -p -r1.82 -r1.85
 compat.c   31 Dec 2013 01:25:41 -  1.82
-+++ compat.c   20 Apr 2014 03:33:59 -  1.85
-@@ -95,6 +95,9 @@ compat_datafellows(const char *version)
-   { Sun_SSH_1.0*,   SSH_BUG_NOREKEY|SSH_BUG_EXTEOF},
-   { OpenSSH_4*, 0 },
-   { OpenSSH_5*, SSH_NEW_OPENSSH|SSH_BUG_DYNAMIC_RPORT},
-+  { OpenSSH_6.6.1*, SSH_NEW_OPENSSH},
-+  { OpenSSH_6.5*,
-+OpenSSH_6.6*,   SSH_NEW_OPENSSH|SSH_BUG_CURVE25519PAD},
-   { OpenSSH*,   SSH_NEW_OPENSSH },
-   { *MindTerm*, 0 },
-   { 2.1.0*, SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
-@@ -251,7 +254,6 @@ compat_cipher_proposal(char *cipher_prop
-   return cipher_prop;
- }
- 
--
- char *
- compat_pkalg_proposal(char *pkalg_prop)
- {
-@@ -263,5 +265,18 @@ compat_pkalg_proposal(char *pkalg_prop)
-   if (*pkalg_prop == '\0')
-   fatal(No supported PK algorithms found);
-   return pkalg_prop;
-+}
-+
-+char *
-+compat_kex_proposal(char *kex_prop)
-+{
-+  if (!(datafellows  SSH_BUG_CURVE25519PAD))
-+  return kex_prop;
-+  debug2(%s: original KEX proposal: %s, __func__, kex_prop);
-+  kex_prop = filter_proposal(kex_prop, curve25519-sha...@libssh.org);
-+  debug2(%s: compat KEX proposal: %s, __func__, kex_prop);
-+  if (*kex_prop == 

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

[Gaetan Bisson]

Date: Sunday, April 20, 2014 @ 21:40:17
  Author: bisson
Revision: 211579

tiny upstream fix

Added:
  openssh/trunk/curve25519pad.patch
Modified:
  openssh/trunk/PKGBUILD

-+
 PKGBUILD|9 ++
 curve25519pad.patch |  171 ++
 2 files changed, 179 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-04-20 16:51:44 UTC (rev 211578)
+++ PKGBUILD2014-04-20 19:40:17 UTC (rev 211579)
@@ -5,7 +5,7 @@
 
 pkgname=openssh
 pkgver=6.6p1
-pkgrel=1
+pkgrel=2
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
 license=('custom:BSD')
@@ -15,6 +15,7 @@
 optdepends=('xorg-xauth: X11 forwarding'
 'x11-ssh-askpass: input passphrase in X')
 
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz{,.asc}
+'curve25519pad.patch'
 'sshdgenkeys.service'
 'sshd@.service'
 'sshd.service'
@@ -21,6 +22,7 @@
 'sshd.socket'
 'sshd.pam')
 sha1sums=('b850fd1af704942d9b3c2eff7ef6b3a59b6a6b6e' 'SKIP'
+  '13b74b57b3d9b9a256eeb44b4fca29a8f27aa7ad'
   'cc1ceec606c98c7407e7ac21ade23aed81e31405'
   '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
   'ec49c6beba923e201505f5669cea48cad29014db'
@@ -31,6 +33,11 @@
 
 install=install
 
+prepare() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   patch -p0 -i ../curve25519pad.patch
+}
+
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
 

Added: curve25519pad.patch
===
--- curve25519pad.patch (rev 0)
+++ curve25519pad.patch 2014-04-20 19:40:17 UTC (rev 211579)
@@ -0,0 +1,171 @@
+Hi,
+
+So I screwed up when writing the support for the curve25519 KEX method
+that doesn't depend on OpenSSL's BIGNUM type - a bug in my code left
+leading zero bytes where they should have been skipped. The impact of
+this is that OpenSSH 6.5 and 6.6 will fail during key exchange with a
+peer that implements curve25519-sha...@libssh.org properly about 0.2%
+of the time (one in every 512ish connections).
+
+We've fixed this for OpenSSH 6.7 by avoiding the curve25519-sha256
+key exchange for previous versions, but I'd recommend distributors
+of OpenSSH apply this patch so the affected code doesn't become
+too entrenched in LTS releases.
+
+The patch fixes the bug and makes OpenSSH identify itself as 6.6.1 so as
+to distinguish itself from the incorrect versions so the compatibility
+code to disable the affected KEX isn't activated.
+
+I've committed this on the 6.6 branch too.
+
+Apologies for the hassle.
+
+-d
+
+Index: version.h
+===
+RCS file: /var/cvs/openssh/version.h,v
+retrieving revision 1.82
+diff -u -p -r1.82 version.h
+--- version.h  27 Feb 2014 23:01:54 -  1.82
 version.h  20 Apr 2014 03:35:15 -
+@@ -1,6 +1,6 @@
+ /* $OpenBSD: version.h,v 1.70 2014/02/27 22:57:40 djm Exp $ */
+ 
+-#define SSH_VERSION   OpenSSH_6.6
++#define SSH_VERSION   OpenSSH_6.6.1
+ 
+ #define SSH_PORTABLE  p1
+ #define SSH_RELEASE   SSH_VERSION SSH_PORTABLE
+Index: compat.c
+===
+RCS file: /var/cvs/openssh/compat.c,v
+retrieving revision 1.82
+retrieving revision 1.85
+diff -u -p -r1.82 -r1.85
+--- compat.c   31 Dec 2013 01:25:41 -  1.82
 compat.c   20 Apr 2014 03:33:59 -  1.85
+@@ -95,6 +95,9 @@ compat_datafellows(const char *version)
+   { Sun_SSH_1.0*,   SSH_BUG_NOREKEY|SSH_BUG_EXTEOF},
+   { OpenSSH_4*, 0 },
+   { OpenSSH_5*, SSH_NEW_OPENSSH|SSH_BUG_DYNAMIC_RPORT},
++  { OpenSSH_6.6.1*, SSH_NEW_OPENSSH},
++  { OpenSSH_6.5*,
++OpenSSH_6.6*,   SSH_NEW_OPENSSH|SSH_BUG_CURVE25519PAD},
+   { OpenSSH*,   SSH_NEW_OPENSSH },
+   { *MindTerm*, 0 },
+   { 2.1.0*, SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
+@@ -251,7 +254,6 @@ compat_cipher_proposal(char *cipher_prop
+   return cipher_prop;
+ }
+ 
+-
+ char *
+ compat_pkalg_proposal(char *pkalg_prop)
+ {
+@@ -263,5 +265,18 @@ compat_pkalg_proposal(char *pkalg_prop)
+   if (*pkalg_prop == '\0')
+   fatal(No supported PK algorithms found);
+   return pkalg_prop;
++}
++
++char *
++compat_kex_proposal(char *kex_prop)
++{
++  if (!(datafellows  SSH_BUG_CURVE25519PAD))
++  return kex_prop;
++  debug2(%s: original KEX proposal: %s, __func__, kex_prop);
++  kex_prop = filter_proposal(kex_prop, curve25519-sha...@libssh.org);
++  debug2(%s: compat KEX proposal: %s, __func__, kex_prop);
++  if (*kex_prop == '\0')
++  fatal(No supported key exchange algorithms found);
++  return kex_prop;
+ }
+ 
+Index: 

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

[Gaetan Bisson]

Date: Sunday, March 16, 2014 @ 03:42:45
  Author: bisson
Revision: 207970

upstream update

Modified:
  openssh/trunk/PKGBUILD
Deleted:
  openssh/trunk/lowercase.patch

-+
 PKGBUILD|   13 +++--
 lowercase.patch |   32 
 2 files changed, 3 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-16 02:22:39 UTC (rev 207969)
+++ PKGBUILD2014-03-16 02:42:45 UTC (rev 207970)
@@ -4,8 +4,8 @@
 # Contributor: judd jvi...@zeroflux.org
 
 pkgname=openssh
-pkgver=6.5p1
-pkgrel=2
+pkgver=6.6p1
+pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
 license=('custom:BSD')
@@ -15,14 +15,12 @@
 optdepends=('xorg-xauth: X11 forwarding'
 'x11-ssh-askpass: input passphrase in X')
 
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz{,.asc}
-'lowercase.patch'
 'sshdgenkeys.service'
 'sshd@.service'
 'sshd.service'
 'sshd.socket'
 'sshd.pam')
-sha1sums=('3363a72b4fee91b29cf2024ff633c17f6cd2f86d' 'SKIP'
-  '3163a71cbaeac39d0783ad4c501fd0630d6c0c22'
+sha1sums=('b850fd1af704942d9b3c2eff7ef6b3a59b6a6b6e' 'SKIP'
   'cc1ceec606c98c7407e7ac21ade23aed81e31405'
   '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
   'ec49c6beba923e201505f5669cea48cad29014db'
@@ -33,11 +31,6 @@
 
 install=install
 
-prepare() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   patch -p1 -i ../lowercase.patch
-}
-
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
 

Deleted: lowercase.patch
===
--- lowercase.patch 2014-03-16 02:22:39 UTC (rev 207969)
+++ lowercase.patch 2014-03-16 02:42:45 UTC (rev 207970)
@@ -1,32 +0,0 @@
-From d56b44d2dfa093883a5c4e91be3f72d99946b170 Mon Sep 17 00:00:00 2001
-From: Damien Miller d...@mindrot.org
-Date: Tue, 04 Feb 2014 00:26:04 +
-Subject:- d...@cvs.openbsd.org 2014/02/04 00:24:29
-
- [ssh.c]
- delay lowercasing of hostname until right before hostname
- canonicalisation to unbreak case-sensitive matching of ssh_config;
- reported by Ike Devolder; ok markus@

-diff --git a/ssh.c b/ssh.c
-index ec95733..add760c 100644
 a/ssh.c
-+++ b/ssh.c
-@@ -780,7 +780,6 @@ main(int ac, char **av)
-   if (!host)
-   usage();
- 
--  lowercase(host);
-   host_arg = xstrdup(host);
- 
-   OpenSSL_add_all_algorithms();
-@@ -914,6 +913,7 @@ main(int ac, char **av)
-   }
- 
-   /* If canonicalization requested then try to apply it */
-+  lowercase(host);
-   if (options.canonicalize_hostname != SSH_CANONICALISE_NO)
-   addrs = resolve_canonicalize(host, options.port);
-   /*
---
-cgit v0.9.2

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

[Gaetan Bisson]

Date: Wednesday, February 5, 2014 @ 06:19:21
  Author: bisson
Revision: 205447

fix FS#38791

Added:
  openssh/trunk/lowercase.patch
Modified:
  openssh/trunk/PKGBUILD

-+
 PKGBUILD|9 -
 lowercase.patch |   32 
 2 files changed, 40 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-05 00:01:59 UTC (rev 205446)
+++ PKGBUILD2014-02-05 05:19:21 UTC (rev 205447)
@@ -5,7 +5,7 @@
 
 pkgname=openssh
 pkgver=6.5p1
-pkgrel=1
+pkgrel=2
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
 license=('custom:BSD')
@@ -15,6 +15,7 @@
 optdepends=('xorg-xauth: X11 forwarding'
 'x11-ssh-askpass: input passphrase in X')
 
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz{,.asc}
+'lowercase.patch'
 'sshdgenkeys.service'
 'sshd@.service'
 'sshd.service'
@@ -21,6 +22,7 @@
 'sshd.socket'
 'sshd.pam')
 sha1sums=('3363a72b4fee91b29cf2024ff633c17f6cd2f86d' 'SKIP'
+  '3163a71cbaeac39d0783ad4c501fd0630d6c0c22'
   'cc1ceec606c98c7407e7ac21ade23aed81e31405'
   '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
   'ec49c6beba923e201505f5669cea48cad29014db'
@@ -31,6 +33,11 @@
 
 install=install
 
+prepare() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   patch -p1 -i ../lowercase.patch
+}
+
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
 

Added: lowercase.patch
===
--- lowercase.patch (rev 0)
+++ lowercase.patch 2014-02-05 05:19:21 UTC (rev 205447)
@@ -0,0 +1,32 @@
+From d56b44d2dfa093883a5c4e91be3f72d99946b170 Mon Sep 17 00:00:00 2001
+From: Damien Miller d...@mindrot.org
+Date: Tue, 04 Feb 2014 00:26:04 +
+Subject:- d...@cvs.openbsd.org 2014/02/04 00:24:29
+
+ [ssh.c]
+ delay lowercasing of hostname until right before hostname
+ canonicalisation to unbreak case-sensitive matching of ssh_config;
+ reported by Ike Devolder; ok markus@
+---
+diff --git a/ssh.c b/ssh.c
+index ec95733..add760c 100644
+--- a/ssh.c
 b/ssh.c
+@@ -780,7 +780,6 @@ main(int ac, char **av)
+   if (!host)
+   usage();
+ 
+-  lowercase(host);
+   host_arg = xstrdup(host);
+ 
+   OpenSSL_add_all_algorithms();
+@@ -914,6 +913,7 @@ main(int ac, char **av)
+   }
+ 
+   /* If canonicalization requested then try to apply it */
++  lowercase(host);
+   if (options.canonicalize_hostname != SSH_CANONICALISE_NO)
+   addrs = resolve_canonicalize(host, options.port);
+   /*
+--
+cgit v0.9.2

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

[Gaetan Bisson]

Date: Thursday, January 30, 2014 @ 08:20:18
  Author: bisson
Revision: 204876

upstream update

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/sshdgenkeys.service

-+
 PKGBUILD|   15 ---
 sshdgenkeys.service |   10 ++
 2 files changed, 14 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-30 03:12:08 UTC (rev 204875)
+++ PKGBUILD2014-01-30 07:20:18 UTC (rev 204876)
@@ -4,7 +4,7 @@
 # Contributor: judd jvi...@zeroflux.org
 
 pkgname=openssh
-pkgver=6.4p1
+pkgver=6.5p1
 pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
@@ -14,14 +14,14 @@
 depends=('krb5' 'openssl' 'libedit' 'ldns')
 optdepends=('xorg-xauth: X11 forwarding'
 'x11-ssh-askpass: input passphrase in X')
-source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz;
+source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz{,.asc}
 'sshdgenkeys.service'
 'sshd@.service'
 'sshd.service'
 'sshd.socket'
 'sshd.pam')
-sha1sums=('cf5fe0eb118d7e4f9296fbc5d6884965885fc55d'
-  '6df5be396f8c593bb511a249a1453294d18a01a6'
+sha1sums=('3363a72b4fee91b29cf2024ff633c17f6cd2f86d' 'SKIP'
+  'cc1ceec606c98c7407e7ac21ade23aed81e31405'
   '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
   'ec49c6beba923e201505f5669cea48cad29014db'
   'e12fa910b26a5634e5a6ac39ce1399a132cf6796'
@@ -56,9 +56,10 @@
 check() {
cd ${srcdir}/${pkgname}-${pkgver}
 
-   make tests ||
-   grep $USER /etc/passwd | grep -q /bin/false
-   # connect.sh fails when run with stupid login shell
+   make tests || true
+   # hard to suitably test connectivity:
+   # - fails with /bin/false as login shell
+   # - fails with firewall activated, etc.
 }
 
 package() {

Modified: sshdgenkeys.service
===
--- sshdgenkeys.service 2014-01-30 03:12:08 UTC (rev 204875)
+++ sshdgenkeys.service 2014-01-30 07:20:18 UTC (rev 204876)
@@ -2,12 +2,14 @@
 Description=SSH Key Generation
 ConditionPathExists=|!/etc/ssh/ssh_host_key
 ConditionPathExists=|!/etc/ssh/ssh_host_key.pub
+ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key
+ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub
+ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key
+ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key.pub
 ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key
 ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub
-ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key
-ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key.pub
-ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key
-ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub
+ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key
+ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key.pub
 
 [Service]
 ExecStart=/usr/bin/ssh-keygen -A

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

[Gaetan Bisson]

Date: Friday, November 8, 2013 @ 06:18:01
  Author: bisson
Revision: 199069

upstream update

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-11-08 04:35:28 UTC (rev 199068)
+++ PKGBUILD2013-11-08 05:18:01 UTC (rev 199069)
@@ -4,7 +4,7 @@
 # Contributor: judd jvi...@zeroflux.org
 
 pkgname=openssh
-pkgver=6.3p1
+pkgver=6.4p1
 pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
@@ -20,7 +20,7 @@
 'sshd.service'
 'sshd.socket'
 'sshd.pam')
-sha1sums=('70845ca79474258cab29dbefae13d93e41a83ccb'
+sha1sums=('cf5fe0eb118d7e4f9296fbc5d6884965885fc55d'
   '6df5be396f8c593bb511a249a1453294d18a01a6'
   '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
   'ec49c6beba923e201505f5669cea48cad29014db'

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

[Gaetan Bisson]

Date: Friday, September 13, 2013 @ 11:03:19
  Author: bisson
Revision: 194317

upstream update

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-09-13 08:17:42 UTC (rev 194316)
+++ PKGBUILD2013-09-13 09:03:19 UTC (rev 194317)
@@ -4,7 +4,7 @@
 # Contributor: judd jvi...@zeroflux.org
 
 pkgname=openssh
-pkgver=6.2p2
+pkgver=6.3p1
 pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
@@ -20,7 +20,7 @@
 'sshd.service'
 'sshd.socket'
 'sshd.pam')
-sha1sums=('c2b4909eba6f5ec6f9f75866c202db47f3b501ba'
+sha1sums=('70845ca79474258cab29dbefae13d93e41a83ccb'
   '6df5be396f8c593bb511a249a1453294d18a01a6'
   '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
   'ec49c6beba923e201505f5669cea48cad29014db'

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

[Gaetan Bisson]

Date: Tuesday, June 11, 2013 @ 08:26:02
  Author: bisson
Revision: 188162

avoid archweb's uncompressed manpages detection

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-06-10 22:30:55 UTC (rev 188161)
+++ PKGBUILD2013-06-11 06:26:02 UTC (rev 188162)
@@ -66,7 +66,7 @@
 
make DESTDIR=${pkgdir} install
 
-   ln -sf ssh.1.gz ${pkgdir}/usr/share/man/man1/slogin.1
+   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

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

[Gaetan Bisson]

Date: Sunday, June 9, 2013 @ 13:54:54
  Author: bisson
Revision: 188096

update sha1sums

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-06-09 11:54:05 UTC (rev 188095)
+++ PKGBUILD2013-06-09 11:54:54 UTC (rev 188096)
@@ -23,7 +23,7 @@
 sha1sums=('c2b4909eba6f5ec6f9f75866c202db47f3b501ba'
   '6df5be396f8c593bb511a249a1453294d18a01a6'
   '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
-  '2d87de52a6b2f764180f9f67cb9747392784b4a5'
+  'ec49c6beba923e201505f5669cea48cad29014db'
   'e12fa910b26a5634e5a6ac39ce1399a132cf6796'
   'd93dca5ebda4610ff7647187f8928a3de28703f3')
 

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

[Gaetan Bisson]

Date: Monday, May 13, 2013 @ 12:07:09
  Author: bisson
Revision: 185322

remove deprecated rc script

Modified:
  openssh/trunk/PKGBUILD
Deleted:
  openssh/trunk/sshd
  openssh/trunk/sshd.confd

+
 PKGBUILD   |   12 +++-
 sshd   |   44 
 sshd.confd |4 
 3 files changed, 3 insertions(+), 57 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-13 10:05:57 UTC (rev 185321)
+++ PKGBUILD2013-05-13 10:07:09 UTC (rev 185322)
@@ -20,20 +20,16 @@
 'sshd@.service'
 'sshd.service'
 'sshd.socket'
-'sshd.confd'
-'sshd.pam'
-'sshd')
+'sshd.pam')
 sha1sums=('8824708c617cc781b2bb29fa20bd905fd3d2a43d'
   '954bf1660aa32620c37034320877f4511b767ccb'
   '6df5be396f8c593bb511a249a1453294d18a01a6'
   'bd6eae36c7ef9efb7147778baad7858b81f2d660'
   'f9af4a442b804ab661cec0edb25dd76dee16d8d2'
   'e12fa910b26a5634e5a6ac39ce1399a132cf6796'
-  'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
-  'd93dca5ebda4610ff7647187f8928a3de28703f3'
-  '1488d4ed33cf3037accf4b0e1c7a7e90b6a097c7')
+  'd93dca5ebda4610ff7647187f8928a3de28703f3')
 
-backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 
'etc/conf.d/sshd')
+backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
 
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -80,9 +76,7 @@
install -Dm644 ../sshd.socket 
${pkgdir}/usr/lib/systemd/system/sshd.socket
 
install -Dm755 ../sshd.close-sessions 
${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions # FS#17389
-   install -Dm644 ../sshd.confd ${pkgdir}/etc/conf.d/sshd
install -Dm644 ../sshd.pam ${pkgdir}/etc/pam.d/sshd
-   install -Dm755 ../sshd ${pkgdir}/etc/rc.d/sshd
 
install -Dm755 contrib/findssl.sh ${pkgdir}/usr/bin/findssl.sh
install -Dm755 contrib/ssh-copy-id ${pkgdir}/usr/bin/ssh-copy-id

Deleted: sshd
===
--- sshd2013-05-13 10:05:57 UTC (rev 185321)
+++ sshd2013-05-13 10:07:09 UTC (rev 185322)
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/sshd
-
-PIDFILE=/run/sshd.pid
-PID=$(cat $PIDFILE 2/dev/null)
-if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then
-   PID=
-   rm $PIDFILE 2/dev/null
-fi
-
-case $1 in
-   start)
-   stat_busy 'Starting Secure Shell Daemon'
-   /usr/bin/ssh-keygen -A
-   [[ -z $PID ]]  /usr/sbin/sshd $SSHD_ARGS
-   if [[ $? -gt 0 ]]; then
-   stat_fail
-   else
-   add_daemon sshd
-   stat_done
-   fi
-   ;;
-   stop)
-   stat_busy 'Stopping Secure Shell Daemon'
-   [[ ! -z $PID ]]  kill $PID  /dev/null
-   if [[ $? -gt 0 ]]; then
-   stat_fail
-   else
-   rm_daemon sshd
-   stat_done
-   fi
-   ;;
-   restart)
-   $0 stop
-   sleep 1
-   $0 start
-   ;;
-   *)
-   echo usage: $0 {start|stop|restart}
-esac
-exit 0

Deleted: sshd.confd
===
--- sshd.confd  2013-05-13 10:05:57 UTC (rev 185321)
+++ sshd.confd  2013-05-13 10:07:09 UTC (rev 185322)
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to sshd
-#
-SSHD_ARGS=

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

[Gaetan Bisson]

Date: Saturday, March 23, 2013 @ 06:30:35
  Author: bisson
Revision: 180547

upstream update

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-03-23 04:22:56 UTC (rev 180546)
+++ PKGBUILD2013-03-23 05:30:35 UTC (rev 180547)
@@ -4,8 +4,8 @@
 # Contributor: judd jvi...@zeroflux.org
 
 pkgname=openssh
-pkgver=6.1p1
-pkgrel=6
+pkgver=6.2p1
+pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
 license=('custom:BSD')
@@ -23,7 +23,7 @@
 'sshd.confd'
 'sshd.pam'
 'sshd')
-sha1sums=('751c92c912310c3aa9cadc113e14458f843fc7b3'
+sha1sums=('8824708c617cc781b2bb29fa20bd905fd3d2a43d'
   '954bf1660aa32620c37034320877f4511b767ccb'
   '6df5be396f8c593bb511a249a1453294d18a01a6'
   'bd6eae36c7ef9efb7147778baad7858b81f2d660'

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

[Gaetan Bisson]

Date: Thursday, February 14, 2013 @ 05:58:02
  Author: bisson
Revision: 178041

fix FS#33836

Modified:
  openssh/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-14 01:37:10 UTC (rev 178040)
+++ PKGBUILD2013-02-14 04:58:02 UTC (rev 178041)
@@ -5,7 +5,7 @@
 
 pkgname=openssh
 pkgver=6.1p1
-pkgrel=5
+pkgrel=6
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
 license=('custom:BSD')
@@ -90,6 +90,7 @@
 
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 sshd.pam)

[Gaetan Bisson]

Date: Monday, February 4, 2013 @ 14:51:17
  Author: bisson
Revision: 177030

implement FS#33696

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/sshd.pam

--+
 PKGBUILD |4 ++--
 sshd.pam |   17 +
 2 files changed, 7 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-04 13:10:00 UTC (rev 177029)
+++ PKGBUILD2013-02-04 13:51:17 UTC (rev 177030)
@@ -5,7 +5,7 @@
 
 pkgname=openssh
 pkgver=6.1p1
-pkgrel=4
+pkgrel=5
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
 license=('custom:BSD')
@@ -30,7 +30,7 @@
   'f9af4a442b804ab661cec0edb25dd76dee16d8d2'
   'e12fa910b26a5634e5a6ac39ce1399a132cf6796'
   'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
-  '659e3ee95c269014783ff8b318c6f50bf7496fbd'
+  'd93dca5ebda4610ff7647187f8928a3de28703f3'
   '1488d4ed33cf3037accf4b0e1c7a7e90b6a097c7')
 
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 
'etc/conf.d/sshd')

Modified: sshd.pam
===
--- sshd.pam2013-02-04 13:10:00 UTC (rev 177029)
+++ sshd.pam2013-02-04 13:51:17 UTC (rev 177030)
@@ -1,13 +1,6 @@
 #%PAM-1.0
-#auth  requiredpam_securetty.so#Disable remote root
-auth   requiredpam_unix.so
-auth   requiredpam_env.so
-accountrequiredpam_nologin.so
-accountrequiredpam_unix.so
-accountrequiredpam_time.so
-password   requiredpam_unix.so
-sessionrequiredpam_unix_session.so
-sessionrequiredpam_limits.so
-session optionalpam_loginuid.so
--session   optionalpam_ck_connector.so nox11
--session   optionalpam_systemd.so
+#auth required  pam_securetty.so #disable remote root
+auth  include   system-remote-login
+account   include   system-remote-login
+password  include   system-remote-login
+session   include   system-remote-login

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

[Gaetan Bisson]

Date: Thursday, November 15, 2012 @ 21:52:41
  Author: bisson
Revision: 171058

rebuild for ldns-1.6.16

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-11-16 02:22:29 UTC (rev 171057)
+++ PKGBUILD2012-11-16 02:52:41 UTC (rev 171058)
@@ -5,7 +5,7 @@
 
 pkgname=openssh
 pkgver=6.1p1
-pkgrel=3
+pkgrel=4
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
 license=('custom:BSD')

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

[Gaetan Bisson]

Date: Tuesday, October 23, 2012 @ 18:57:33
  Author: bisson
Revision: 169588

rebuild for ldns-1.6.14

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-10-23 22:55:24 UTC (rev 169587)
+++ PKGBUILD2012-10-23 22:57:33 UTC (rev 169588)
@@ -5,7 +5,7 @@
 
 pkgname=openssh
 pkgver=6.1p1
-pkgrel=2
+pkgrel=3
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
 license=('custom:BSD')

[arch-commits] Commit in openssh/trunk (PKGBUILD sshd.service sshd@.service)

[Gaetan Bisson]

Date: Sunday, October 21, 2012 @ 19:24:40
  Author: bisson
Revision: 169476

fix FS#32110

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/sshd.service
  openssh/trunk/sshd@.service

---+
 PKGBUILD  |4 ++--
 sshd.service  |1 +
 sshd@.service |1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-21 21:14:01 UTC (rev 169475)
+++ PKGBUILD2012-10-21 23:24:40 UTC (rev 169476)
@@ -26,8 +26,8 @@
 sha1sums=('751c92c912310c3aa9cadc113e14458f843fc7b3'
   '954bf1660aa32620c37034320877f4511b767ccb'
   '6df5be396f8c593bb511a249a1453294d18a01a6'
-  'bd6eae36c7ef9efb7147778baad7858b81f2d660'
-  'f9af4a442b804ab661cec0edb25dd76dee16d8d2'
+  '6cbde9c9e5e13e361a374bd9df2b91dac32694a8'
+  '97b09fe4ebb8919832d9582c660d2a45d9f9f7c5'
   'e12fa910b26a5634e5a6ac39ce1399a132cf6796'
   'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
   '659e3ee95c269014783ff8b318c6f50bf7496fbd'

Modified: sshd.service
===
--- sshd.service2012-10-21 21:14:01 UTC (rev 169475)
+++ sshd.service2012-10-21 23:24:40 UTC (rev 169476)
@@ -2,6 +2,7 @@
 Description=OpenSSH Daemon
 Wants=sshdgenkeys.service
 After=sshdgenkeys.service
+After=network.target
 
 [Service]
 ExecStart=/usr/sbin/sshd -D

Modified: sshd@.service
===
--- sshd@.service   2012-10-21 21:14:01 UTC (rev 169475)
+++ sshd@.service   2012-10-21 23:24:40 UTC (rev 169476)
@@ -1,6 +1,7 @@
 [Unit]
 Description=OpenSSH Per-Connection Daemon
 After=sshdgenkeys.service
+After=network.target
 
 [Service]
 ExecStart=-/usr/sbin/sshd -i

[arch-commits] Commit in openssh/trunk (PKGBUILD sshd.service sshd@.service)

[Gaetan Bisson]

Date: Sunday, October 21, 2012 @ 19:32:29
  Author: bisson
Revision: 169477

remove After=network.target from service files; see: 
https://bugs.archlinux.org/task/32110#comment100872

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/sshd.service
  openssh/trunk/sshd@.service

---+
 PKGBUILD  |4 ++--
 sshd.service  |1 -
 sshd@.service |1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-21 23:24:40 UTC (rev 169476)
+++ PKGBUILD2012-10-21 23:32:29 UTC (rev 169477)
@@ -26,8 +26,8 @@
 sha1sums=('751c92c912310c3aa9cadc113e14458f843fc7b3'
   '954bf1660aa32620c37034320877f4511b767ccb'
   '6df5be396f8c593bb511a249a1453294d18a01a6'
-  '6cbde9c9e5e13e361a374bd9df2b91dac32694a8'
-  '97b09fe4ebb8919832d9582c660d2a45d9f9f7c5'
+  'bd6eae36c7ef9efb7147778baad7858b81f2d660'
+  'f9af4a442b804ab661cec0edb25dd76dee16d8d2'
   'e12fa910b26a5634e5a6ac39ce1399a132cf6796'
   'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
   '659e3ee95c269014783ff8b318c6f50bf7496fbd'

Modified: sshd.service
===
--- sshd.service2012-10-21 23:24:40 UTC (rev 169476)
+++ sshd.service2012-10-21 23:32:29 UTC (rev 169477)
@@ -2,7 +2,6 @@
 Description=OpenSSH Daemon
 Wants=sshdgenkeys.service
 After=sshdgenkeys.service
-After=network.target
 
 [Service]
 ExecStart=/usr/sbin/sshd -D

Modified: sshd@.service
===
--- sshd@.service   2012-10-21 23:24:40 UTC (rev 169476)
+++ sshd@.service   2012-10-21 23:32:29 UTC (rev 169477)
@@ -1,7 +1,6 @@
 [Unit]
 Description=OpenSSH Per-Connection Daemon
 After=sshdgenkeys.service
-After=network.target
 
 [Service]
 ExecStart=-/usr/sbin/sshd -i

[arch-commits] Commit in openssh/trunk (PKGBUILD sshd.service sshd.socket)

[Gaetan Bisson]

Date: Monday, September 3, 2012 @ 08:59:52
  Author: bisson
Revision: 165903

run sshdgenkeys.service, not just enable it

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/sshd.service
  openssh/trunk/sshd.socket

--+
 PKGBUILD |6 +++---
 sshd.service |1 +
 sshd.socket  |1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-09-03 10:37:05 UTC (rev 165902)
+++ PKGBUILD2012-09-03 12:59:52 UTC (rev 165903)
@@ -5,7 +5,7 @@
 
 pkgname=openssh
 pkgver=6.1p1
-pkgrel=1
+pkgrel=2
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
 license=('custom:BSD')
@@ -27,8 +27,8 @@
   '954bf1660aa32620c37034320877f4511b767ccb'
   '6c71de2c2ca9622aa8e863acd94b13e11125'
   'bd6eae36c7ef9efb7147778baad7858b81f2d660'
-  'f27617eeb694f4edd474638adf16733d8a793d85'
-  'a30fb5fda6d0143345bae47684edaffb8d0a92a7'
+  '1fd209980ee2fcdd7b219883e8add0f5ca63388a'
+  'b7acfce018efc111e7ce80dbe37b932caf7c2d53'
   'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
   '659e3ee95c269014783ff8b318c6f50bf7496fbd'
   '1488d4ed33cf3037accf4b0e1c7a7e90b6a097c7')

Modified: sshd.service
===
--- sshd.service2012-09-03 10:37:05 UTC (rev 165902)
+++ sshd.service2012-09-03 12:59:52 UTC (rev 165903)
@@ -1,5 +1,6 @@
 [Unit]
 Description=OpenSSH Daemon
+Wants=sshdgenkeys.service
 After=sshdgenkeys.service
 
 [Service]

Modified: sshd.socket
===
--- sshd.socket 2012-09-03 10:37:05 UTC (rev 165902)
+++ sshd.socket 2012-09-03 12:59:52 UTC (rev 165903)
@@ -1,5 +1,6 @@
 [Unit]
 Conflicts=sshd.service
+Wants=sshdgenkeys.service
 
 [Socket]
 ListenStream=22

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

[Gaetan Bisson]

Date: Monday, September 3, 2012 @ 10:09:08
  Author: bisson
Revision: 165906

update sha1sums

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-09-03 14:04:48 UTC (rev 165905)
+++ PKGBUILD2012-09-03 14:09:08 UTC (rev 165906)
@@ -25,10 +25,10 @@
 'sshd')
 sha1sums=('751c92c912310c3aa9cadc113e14458f843fc7b3'
   '954bf1660aa32620c37034320877f4511b767ccb'
-  '6c71de2c2ca9622aa8e863acd94b13e11125'
+  '6df5be396f8c593bb511a249a1453294d18a01a6'
   'bd6eae36c7ef9efb7147778baad7858b81f2d660'
-  '1fd209980ee2fcdd7b219883e8add0f5ca63388a'
-  'b7acfce018efc111e7ce80dbe37b932caf7c2d53'
+  'f9af4a442b804ab661cec0edb25dd76dee16d8d2'
+  'e12fa910b26a5634e5a6ac39ce1399a132cf6796'
   'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
   '659e3ee95c269014783ff8b318c6f50bf7496fbd'
   '1488d4ed33cf3037accf4b0e1c7a7e90b6a097c7')

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

[Gaetan Bisson]

Date: Wednesday, August 29, 2012 @ 01:13:44
  Author: bisson
Revision: 165683

upstream update, add linux-headers makedepends for seccomp filter

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-08-28 21:38:09 UTC (rev 165682)
+++ PKGBUILD2012-08-29 05:13:44 UTC (rev 165683)
@@ -4,12 +4,13 @@
 # Contributor: judd jvi...@zeroflux.org
 
 pkgname=openssh
-pkgver=6.0p1
-pkgrel=3
+pkgver=6.1p1
+pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
 license=('custom:BSD')
 arch=('i686' 'x86_64')
+makedepends=('linux-headers')
 depends=('krb5' 'openssl' 'libedit' 'ldns')
 optdepends=('xorg-xauth: X11 forwarding'
 'x11-ssh-askpass: input passphrase in X')
@@ -22,7 +23,7 @@
 'sshd.confd'
 'sshd.pam'
 'sshd')
-sha1sums=('f691e53ef83417031a2854b8b1b661c9c08e4422'
+sha1sums=('751c92c912310c3aa9cadc113e14458f843fc7b3'
   '954bf1660aa32620c37034320877f4511b767ccb'
   '6c71de2c2ca9622aa8e863acd94b13e11125'
   'bd6eae36c7ef9efb7147778baad7858b81f2d660'
@@ -57,6 +58,7 @@
 
 check() {
cd ${srcdir}/${pkgname}-${pkgver}
+
make tests ||
grep $USER /etc/passwd | grep -q /bin/false
# connect.sh fails when run with stupid login shell
@@ -64,6 +66,7 @@
 
 package() {
cd ${srcdir}/${pkgname}-${pkgver}
+
make DESTDIR=${pkgdir} install
 
rm ${pkgdir}/usr/share/man/man1/slogin.1

[arch-commits] Commit in openssh/trunk (PKGBUILD sshd sshd.service tmpfiles.d)

[Gaetan Bisson]

Date: Thursday, July 5, 2012 @ 22:47:50
  Author: bisson
Revision: 163029

make check() matter, /var/empty now in filesystem, clean up sshd.service comment

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/sshd
  openssh/trunk/sshd.service
Deleted:
  openssh/trunk/tmpfiles.d

--+
 PKGBUILD |   14 +-
 sshd |1 -
 sshd.service |7 ++-
 tmpfiles.d   |1 -
 4 files changed, 7 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-07-06 01:27:22 UTC (rev 163028)
+++ PKGBUILD2012-07-06 02:47:50 UTC (rev 163029)
@@ -19,7 +19,6 @@
 'sshd@.service'
 'sshd.service'
 'sshd.socket'
-'tmpfiles.d'
 'sshd.confd'
 'sshd.pam'
 'sshd')
@@ -27,12 +26,11 @@
   '954bf1660aa32620c37034320877f4511b767ccb'
   '6c71de2c2ca9622aa8e863acd94b13e11125'
   'bd6eae36c7ef9efb7147778baad7858b81f2d660'
-  '83a257b8f6a62237383262cb0e2583e5609ddac0'
+  'f27617eeb694f4edd474638adf16733d8a793d85'
   'a30fb5fda6d0143345bae47684edaffb8d0a92a7'
-  'b5cf44205e8f4365c00bfbee110d7c0e563627aa'
   'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
   '659e3ee95c269014783ff8b318c6f50bf7496fbd'
-  'ed36e3a522f619ff6b13e253526596e4cca11e9f')
+  '1488d4ed33cf3037accf4b0e1c7a7e90b6a097c7')
 
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 
'etc/conf.d/sshd')
 
@@ -59,10 +57,9 @@
 
 check() {
cd ${srcdir}/${pkgname}-${pkgver}
-
-   # The connect.sh test must be run by a user with a decent login shell;
-   # chroot builds use nobody with /bin/false.
-   make tests || true
+   make tests ||
+   grep $USER /etc/passwd | grep -q /bin/false
+   # connect.sh fails when run with stupid login shell
 }
 
 package() {
@@ -78,7 +75,6 @@
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 ../tmpfiles.d ${pkgdir}/usr/lib/tmpfiles.d/openssh.conf
 
install -Dm755 ../sshd.close-sessions 
${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions # FS#17389
install -Dm644 ../sshd.confd ${pkgdir}/etc/conf.d/sshd

Modified: sshd
===
--- sshd2012-07-06 01:27:22 UTC (rev 163028)
+++ sshd2012-07-06 02:47:50 UTC (rev 163029)
@@ -15,7 +15,6 @@
start)
stat_busy 'Starting Secure Shell Daemon'
/usr/bin/ssh-keygen -A
-   [[ -d /var/empty ]] || mkdir -p /var/empty
[[ -z $PID ]]  /usr/sbin/sshd $SSHD_ARGS
if [[ $? -gt 0 ]]; then
stat_fail

Modified: sshd.service
===
--- sshd.service2012-07-06 01:27:22 UTC (rev 163028)
+++ sshd.service2012-07-06 02:47:50 UTC (rev 163029)
@@ -12,8 +12,5 @@
 WantedBy=multi-user.target
 Also=sshdgenkeys.service
 
-# Note that this is the service file for running a single SSH server for all
-# incoming connections, suitable only for systems with a large amount of SSH
-# traffic. In almost all other cases it is a better idea to use sshd.socket +
-# sshd@.service (i.e. the on-demand spawning version for one instance per
-# connection).
+# This service file runs an SSH daemon that forks for each incoming connection.
+# If you prefer to spawn on-demand daemons, use sshd.socket and sshd@.service.

Deleted: tmpfiles.d
===
--- tmpfiles.d  2012-07-06 01:27:22 UTC (rev 163028)
+++ tmpfiles.d  2012-07-06 02:47:50 UTC (rev 163029)
@@ -1 +0,0 @@
-d /var/empty 0755 root root -

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

[Gaetan Bisson]

Date: Wednesday, June 6, 2012 @ 10:33:32
  Author: bisson
Revision: 160809

move /var/run to /run

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/sshd

--+
 PKGBUILD |1 +
 sshd |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-06 13:17:41 UTC (rev 160808)
+++ PKGBUILD2012-06-06 14:33:32 UTC (rev 160809)
@@ -42,6 +42,7 @@
--with-xauth=/usr/bin/xauth \
--with-mantype=man \
--with-md5-passwords \
+   --with-pid-dir=/run \
 
make
 }

Modified: sshd
===
--- sshd2012-06-06 13:17:41 UTC (rev 160808)
+++ sshd2012-06-06 14:33:32 UTC (rev 160809)
@@ -4,7 +4,7 @@
 . /etc/rc.d/functions
 . /etc/conf.d/sshd
 
-PIDFILE=/var/run/sshd.pid
+PIDFILE=/run/sshd.pid
 PID=$(cat $PIDFILE 2/dev/null)
 if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then
PID=

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

[Gaetan Bisson]

Date: Wednesday, June 6, 2012 @ 10:34:12
  Author: bisson
Revision: 160810

update sha1sums

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-06-06 14:33:32 UTC (rev 160809)
+++ PKGBUILD2012-06-06 14:34:12 UTC (rev 160810)
@@ -22,7 +22,7 @@
   '954bf1660aa32620c37034320877f4511b767ccb'
   'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
   '659e3ee95c269014783ff8b318c6f50bf7496fbd'
-  '21fa88de6cc1c7912e71655f50896ba17991a1c2')
+  'ed36e3a522f619ff6b13e253526596e4cca11e9f')
 
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 
'etc/conf.d/sshd')
 

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

[Gaetan Bisson]

Date: Monday, May 7, 2012 @ 07:15:18
  Author: bisson
Revision: 158690

implement FS#29797

Modified:
  openssh/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-05-07 09:54:25 UTC (rev 158689)
+++ PKGBUILD2012-05-07 11:15:18 UTC (rev 158690)
@@ -11,7 +11,8 @@
 license=('custom:BSD')
 arch=('i686' 'x86_64')
 depends=('krb5' 'openssl' 'libedit' 'ldns')
-optdepends=('x11-ssh-askpass: input passphrase in X without a terminal')
+optdepends=('xorg-xauth: X11 forwarding'
+'x11-ssh-askpass: input passphrase in X')
 
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz;
 'sshd.close-sessions'
 'sshd.confd'

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

[Gaetan Bisson]

Date: Sunday, April 29, 2012 @ 10:11:00
  Author: bisson
Revision: 157787

fix FS#29654

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/sshd.pam

--+
 PKGBUILD |4 ++--
 sshd.pam |1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-29 11:52:40 UTC (rev 157786)
+++ PKGBUILD2012-04-29 14:11:00 UTC (rev 157787)
@@ -5,7 +5,7 @@
 
 pkgname=openssh
 pkgver=6.0p1
-pkgrel=1
+pkgrel=2
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
 license=('custom:BSD')
@@ -20,7 +20,7 @@
 sha1sums=('f691e53ef83417031a2854b8b1b661c9c08e4422'
   '954bf1660aa32620c37034320877f4511b767ccb'
   'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
-  '3413909fd45a28701c92e6e5b59c6b65346ddb0f'
+  '659e3ee95c269014783ff8b318c6f50bf7496fbd'
   '21fa88de6cc1c7912e71655f50896ba17991a1c2')
 
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 
'etc/conf.d/sshd')

Modified: sshd.pam
===
--- sshd.pam2012-04-29 11:52:40 UTC (rev 157786)
+++ sshd.pam2012-04-29 14:11:00 UTC (rev 157787)
@@ -8,5 +8,6 @@
 password   requiredpam_unix.so
 sessionrequiredpam_unix_session.so
 sessionrequiredpam_limits.so
+session optionalpam_loginuid.so
 -session   optionalpam_ck_connector.so nox11
 -session   optionalpam_systemd.so

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

[Gaetan Bisson]

Date: Sunday, April 22, 2012 @ 04:07:11
  Author: bisson
Revision: 156651

upstream update, depend on ldns

see: 
https://mailman.archlinux.org/pipermail/arch-dev-public/2012-February/022548.html

Modified:
  openssh/trunk/PKGBUILD

--+
 PKGBUILD |   37 +++--
 1 file changed, 23 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-22 08:06:30 UTC (rev 156650)
+++ PKGBUILD2012-04-22 08:07:11 UTC (rev 156651)
@@ -4,26 +4,27 @@
 # Contributor: judd jvi...@zeroflux.org
 
 pkgname=openssh
-pkgver=5.9p1
-pkgrel=8
+pkgver=6.0p1
+pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
+url='http://www.openssh.org/portable.html'
+license=('custom:BSD')
 arch=('i686' 'x86_64')
-license=('custom:BSD')
-url='http://www.openssh.org/portable.html'
-backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 
'etc/conf.d/sshd')
-depends=('krb5' 'openssl' 'libedit')
+depends=('krb5' 'openssl' 'libedit' 'ldns')
 optdepends=('x11-ssh-askpass: input passphrase in X without a terminal')
 
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz;
 'sshd.close-sessions'
 'sshd.confd'
 'sshd.pam'
 'sshd')
-sha1sums=('ac4e0055421e9543f0af5da607a72cf5922dcc56'
+sha1sums=('f691e53ef83417031a2854b8b1b661c9c08e4422'
   '954bf1660aa32620c37034320877f4511b767ccb'
   'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
   '3413909fd45a28701c92e6e5b59c6b65346ddb0f'
   '21fa88de6cc1c7912e71655f50896ba17991a1c2')
 
+backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 
'etc/conf.d/sshd')
+
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
 
@@ -31,19 +32,27 @@
--prefix=/usr \
--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-mantype=man \
--with-md5-passwords \
-   --with-pam \
-   --with-mantype=man \
-   --with-xauth=/usr/bin/xauth \
-   --with-kerberos5=/usr \
-   --with-ssl-engine \
-   --with-libedit=/usr/lib \
-   --disable-strip # stripping is done by makepkg
 
make
 }
 
+check() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+
+   # The connect.sh test must be run by a user with a decent login shell;
+   # chroot builds use nobody with /bin/false.
+   make tests || true
+}
+
 package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install

[arch-commits] Commit in openssh/trunk (PKGBUILD sshd.close-sessions)

[Gaetan Bisson]

Date: Tuesday, March 20, 2012 @ 03:01:02
  Author: bisson
Revision: 153862

better fix FS#17389

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/sshd.close-sessions

-+
 PKGBUILD|4 ++--
 sshd.close-sessions |9 ++---
 2 files changed, 8 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-20 06:22:25 UTC (rev 153861)
+++ PKGBUILD2012-03-20 07:01:02 UTC (rev 153862)
@@ -5,7 +5,7 @@
 
 pkgname=openssh
 pkgver=5.9p1
-pkgrel=7
+pkgrel=8
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
 license=('custom:BSD')
@@ -19,7 +19,7 @@
 'sshd.pam'
 'sshd')
 sha1sums=('ac4e0055421e9543f0af5da607a72cf5922dcc56'
-  '3e8efad4578bbeb8f9788432758c69dc2b303c1c'
+  '954bf1660aa32620c37034320877f4511b767ccb'
   'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
   '3413909fd45a28701c92e6e5b59c6b65346ddb0f'
   '21fa88de6cc1c7912e71655f50896ba17991a1c2')

Modified: sshd.close-sessions
===
--- sshd.close-sessions 2012-03-20 06:22:25 UTC (rev 153861)
+++ sshd.close-sessions 2012-03-20 07:01:02 UTC (rev 153862)
@@ -1,13 +1,16 @@
 # Close sshd sessions before shutting down the network; see FS#17389.
 
 sshd_close_sessions () {
+   if ck_daemon sshd; then
+   return
+   fi
/etc/rc.d/sshd stop
stat_busy Stopping Secure Shell Sessions
for i in $(pgrep sshd); do
-   if readlink -q /proc/$i/exe /dev/null | grep -q 
'^/usr/sbin/sshd'; then
-   kill $i /dev/null
+   if readlink -q /proc/$i/exe | grep -q '^/usr/sbin/sshd'; then
+   kill $i
fi
-   done
+   done /dev/null
stat_done
 }
 

[arch-commits] Commit in openssh/trunk (PKGBUILD sshd.close-sessions)

[Gaetan Bisson]

Date: Monday, March 19, 2012 @ 15:12:05
  Author: bisson
Revision: 153821

fix FS#17389

Added:
  openssh/trunk/sshd.close-sessions
Modified:
  openssh/trunk/PKGBUILD

-+
 PKGBUILD|7 ---
 sshd.close-sessions |   14 ++
 2 files changed, 18 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-19 19:10:52 UTC (rev 153820)
+++ PKGBUILD2012-03-19 19:12:05 UTC (rev 153821)
@@ -5,7 +5,7 @@
 
 pkgname=openssh
 pkgver=5.9p1
-pkgrel=6
+pkgrel=7
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
 license=('custom:BSD')
@@ -14,10 +14,12 @@
 depends=('krb5' 'openssl' 'libedit')
 optdepends=('x11-ssh-askpass: input passphrase in X without a terminal')
 
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz;
+'sshd.close-sessions'
 'sshd.confd'
 'sshd.pam'
 'sshd')
 sha1sums=('ac4e0055421e9543f0af5da607a72cf5922dcc56'
+  '3e8efad4578bbeb8f9788432758c69dc2b303c1c'
   'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
   '3413909fd45a28701c92e6e5b59c6b65346ddb0f'
   '21fa88de6cc1c7912e71655f50896ba17991a1c2')
@@ -50,16 +52,15 @@
install -Dm644 ../sshd.pam ${pkgdir}/etc/pam.d/sshd
install -Dm644 ../sshd.confd ${pkgdir}/etc/conf.d/sshd
install -Dm644 LICENCE ${pkgdir}/usr/share/licenses/${pkgname}/LICENCE
+   install -Dm755 ../sshd.close-sessions 
${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions # FS#17389
 
rm ${pkgdir}/usr/share/man/man1/slogin.1
ln -sf ssh.1.gz ${pkgdir}/usr/share/man/man1/slogin.1.gz
 
-   # additional contrib scripts that we like
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
 
-   # PAM is a common, standard feature to have
sed \
-e '/^#ChallengeResponseAuthentication yes$/c 
ChallengeResponseAuthentication no' \
-e '/^#UsePAM no$/c UsePAM yes' \

Added: sshd.close-sessions
===
--- sshd.close-sessions (rev 0)
+++ sshd.close-sessions 2012-03-19 19:12:05 UTC (rev 153821)
@@ -0,0 +1,14 @@
+# Close sshd sessions before shutting down the network; see FS#17389.
+
+sshd_close_sessions () {
+   /etc/rc.d/sshd stop
+   stat_busy Stopping Secure Shell Sessions
+   for i in $(pgrep sshd); do
+   if readlink -q /proc/$i/exe /dev/null | grep -q 
'^/usr/sbin/sshd'; then
+   kill $i /dev/null
+   fi
+   done
+   stat_done
+}
+
+add_hook shutdown_start sshd_close_sessions

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

[Pierre Schmitz]

Date: Wednesday, March 14, 2012 @ 17:37:44
  Author: pierre
Revision: 153475

upgpkg: openssh 5.9p1-6

openssl 1.0.1 rebuild

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-03-14 21:30:55 UTC (rev 153474)
+++ PKGBUILD2012-03-14 21:37:44 UTC (rev 153475)
@@ -5,7 +5,7 @@
 
 pkgname=openssh
 pkgver=5.9p1
-pkgrel=5
+pkgrel=6
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
 license=('custom:BSD')

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

[Gaetan Bisson]

Date: Saturday, November 26, 2011 @ 07:46:01
  Author: bisson
Revision: 143548

implement FS#27255

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/sshd.pam

--+
 PKGBUILD |4 ++--
 sshd.pam |1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-26 10:19:38 UTC (rev 143547)
+++ PKGBUILD2011-11-26 12:46:01 UTC (rev 143548)
@@ -5,7 +5,7 @@
 
 pkgname=openssh
 pkgver=5.9p1
-pkgrel=4
+pkgrel=5
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
 license=('custom:BSD')
@@ -19,7 +19,7 @@
 'sshd')
 sha1sums=('ac4e0055421e9543f0af5da607a72cf5922dcc56'
   'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
-  '07fecd5880b1c4fdd8c94ddb2e89ddce88effdc1'
+  '3413909fd45a28701c92e6e5b59c6b65346ddb0f'
   '21fa88de6cc1c7912e71655f50896ba17991a1c2')
 
 build() {

Modified: sshd.pam
===
--- sshd.pam2011-11-26 10:19:38 UTC (rev 143547)
+++ sshd.pam2011-11-26 12:46:01 UTC (rev 143548)
@@ -9,3 +9,4 @@
 sessionrequiredpam_unix_session.so
 sessionrequiredpam_limits.so
 -session   optionalpam_ck_connector.so nox11
+-session   optionalpam_systemd.so

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

[Gaetan Bisson]

Date: Monday, October 17, 2011 @ 08:34:00
  Author: bisson
Revision: 140604

fix FS#26355

Modified:
  openssh/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-17 12:33:03 UTC (rev 140603)
+++ PKGBUILD2011-10-17 12:34:00 UTC (rev 140604)
@@ -5,13 +5,14 @@
 
 pkgname=openssh
 pkgver=5.9p1
-pkgrel=3
+pkgrel=4
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
 license=('custom:BSD')
 url='http://www.openssh.org/portable.html'
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 
'etc/conf.d/sshd')
 depends=('krb5' 'openssl' 'libedit')
+optdepends=('x11-ssh-askpass: input passphrase in X without a terminal')
 
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz;
 'sshd.confd'
 'sshd.pam'

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

[Gaetan Bisson]

Date: Tuesday, September 6, 2011 @ 20:54:12
  Author: bisson
Revision: 137314

upstream update (yes, with no pkgver bump...)

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-09-06 23:39:59 UTC (rev 137313)
+++ PKGBUILD2011-09-07 00:54:12 UTC (rev 137314)
@@ -5,7 +5,7 @@
 
 pkgname=openssh
 pkgver=5.9p1
-pkgrel=2
+pkgrel=3
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
 license=('custom:BSD')
@@ -16,7 +16,7 @@
 'sshd.confd'
 'sshd.pam'
 'sshd')
-sha1sums=('be8878869bb80ce12ca79282768ffa73cc3f05fc'
+sha1sums=('ac4e0055421e9543f0af5da607a72cf5922dcc56'
   'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
   '07fecd5880b1c4fdd8c94ddb2e89ddce88effdc1'
   '21fa88de6cc1c7912e71655f50896ba17991a1c2')

[arch-commits] Commit in openssh/trunk (PKGBUILD authfile.c.patch sshd)

[Gaetan Bisson]

Date: Tuesday, September 6, 2011 @ 03:37:37
  Author: bisson
Revision: 137089

upstream update, remove obsolete patch, use bash test in rc.d script

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/sshd
Deleted:
  openssh/trunk/authfile.c.patch

--+
 PKGBUILD |   18 +---
 authfile.c.patch |  198 -
 sshd |   65 -
 3 files changed, 38 insertions(+), 243 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-06 07:35:21 UTC (rev 137088)
+++ PKGBUILD2011-09-06 07:37:37 UTC (rev 137089)
@@ -4,8 +4,8 @@
 # Contributor: judd jvi...@zeroflux.org
 
 pkgname=openssh
-pkgver=5.8p2
-pkgrel=9
+pkgver=5.9p1
+pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
 license=('custom:BSD')
@@ -13,21 +13,17 @@
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 
'etc/conf.d/sshd')
 depends=('krb5' 'openssl' 'libedit')
 
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz;
-'authfile.c.patch'
 'sshd.confd'
 'sshd.pam'
 'sshd')
-sha1sums=('64798328d310e4f06c9f01228107520adbc8b3e5'
-  '3669cb5ca6149f69015df5ce8e60b82c540eb0a4'
+sha1sums=('be8878869bb80ce12ca79282768ffa73cc3f05fc'
   'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
   '07fecd5880b1c4fdd8c94ddb2e89ddce88effdc1'
-  '6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5')
+  '038213716d553363b5469eae972f15c1c5a579db')
 
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
 
-   patch -p1 -i ../authfile.c.patch # fix FS#24693 using 
http://anoncvs.mindrot.org/index.cgi/openssh/authfile.c?revision=1.95
-
./configure \
--prefix=/usr \
--libexecdir=/usr/lib/ssh \
@@ -36,7 +32,6 @@
--with-md5-passwords \
--with-pam \
--with-mantype=man \
-   --mandir=/usr/share/man \
--with-xauth=/usr/bin/xauth \
--with-kerberos5=/usr \
--with-ssl-engine \
@@ -64,7 +59,8 @@
install -Dm644 contrib/ssh-copy-id.1 
${pkgdir}/usr/share/man/man1/ssh-copy-id.1
 
# PAM is a common, standard feature to have
-   sed -i  -e '/^#ChallengeResponseAuthentication yes$/c 
ChallengeResponseAuthentication no' \
+   sed \
+   -e '/^#ChallengeResponseAuthentication yes$/c 
ChallengeResponseAuthentication no' \
-e '/^#UsePAM no$/c UsePAM yes' \
-   ${pkgdir}/etc/ssh/sshd_config
+   -i ${pkgdir}/etc/ssh/sshd_config
 }

Deleted: authfile.c.patch
===
--- authfile.c.patch2011-09-06 07:35:21 UTC (rev 137088)
+++ authfile.c.patch2011-09-06 07:37:37 UTC (rev 137089)
@@ -1,198 +0,0 @@
-diff -aur old/authfile.c new/authfile.c
 old/authfile.c 2011-06-12 02:21:52.262338254 +0200
-+++ new/authfile.c 2011-06-12 02:13:43.051467269 +0200
-@@ -1,4 +1,4 @@
--/* $OpenBSD: authfile.c,v 1.87 2010/11/29 18:57:04 markus Exp $ */
-+/* $OpenBSD: authfile.c,v 1.95 2011/05/29 11:42:08 djm Exp $ */
- /*
-  * Author: Tatu Ylonen y...@cs.hut.fi
-  * Copyright (c) 1995 Tatu Ylonen y...@cs.hut.fi, Espoo, Finland
-@@ -69,6 +69,8 @@
- #include misc.h
- #include atomicio.h
- 
-+#define MAX_KEY_FILE_SIZE (1024 * 1024)
-+
- /* Version identification string for SSH v1 identity files. */
- static const char authfile_id_string[] =
- SSH PRIVATE KEY FILE FORMAT 1.1\n;
-@@ -312,12 +314,12 @@
-   return pub;
- }
- 
--/* Load the contents of a key file into a buffer */
--static int
-+/* Load a key from a fd into a buffer */
-+int
- key_load_file(int fd, const char *filename, Buffer *blob)
- {
-+  u_char buf[1024];
-   size_t len;
--  u_char *cp;
-   struct stat st;
- 
-   if (fstat(fd, st)  0) {
-@@ -325,30 +327,45 @@
-   filename == NULL ?  : filename,
-   filename == NULL ?  :  ,
-   strerror(errno));
--  close(fd);
-   return 0;
-   }
--  if (st.st_size  1*1024*1024) {
-+  if ((st.st_mode  (S_IFSOCK|S_IFCHR|S_IFIFO)) == 0 
-+  st.st_size  MAX_KEY_FILE_SIZE) {
-+ toobig:
-   error(%s: key file %.200s%stoo large, __func__,
-   filename == NULL ?  : filename,
-   filename == NULL ?  :  );
--  close(fd);
-   return 0;
-   }
--  len = (size_t)st.st_size;   /* truncated */
--
-   buffer_init(blob);
--  cp = buffer_append_space(blob, len);
--
--  if (atomicio(read, fd, cp, len) != len) {
--  debug(%s: read from key file %.200s%sfailed: %.100s, __func__,
--  filename == NULL ?  : filename,
--  filename == NULL ?  :  ,
--  strerror(errno));
-+  for 

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

[Gaetan Bisson]

Date: Tuesday, September 6, 2011 @ 03:58:39
  Author: bisson
Revision: 137093

hardcode PATH to ssh-keygen in rc.d script

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/sshd

--+
 PKGBUILD |2 +-
 sshd |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-06 07:55:22 UTC (rev 137092)
+++ PKGBUILD2011-09-06 07:58:39 UTC (rev 137093)
@@ -19,7 +19,7 @@
 sha1sums=('be8878869bb80ce12ca79282768ffa73cc3f05fc'
   'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
   '07fecd5880b1c4fdd8c94ddb2e89ddce88effdc1'
-  '038213716d553363b5469eae972f15c1c5a579db')
+  '21fa88de6cc1c7912e71655f50896ba17991a1c2')
 
 build() {
cd ${srcdir}/${pkgname}-${pkgver}

Modified: sshd
===
--- sshd2011-09-06 07:55:22 UTC (rev 137092)
+++ sshd2011-09-06 07:58:39 UTC (rev 137093)
@@ -14,7 +14,7 @@
 case $1 in
start)
stat_busy 'Starting Secure Shell Daemon'
-   ssh-keygen -A
+   /usr/bin/ssh-keygen -A
[[ -d /var/empty ]] || mkdir -p /var/empty
[[ -z $PID ]]  /usr/sbin/sshd $SSHD_ARGS
if [[ $? -gt 0 ]]; then

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

[Gaetan Bisson]

Date: Tuesday, September 6, 2011 @ 04:07:20
  Author: bisson
Revision: 137095

forgot to bump pkgrel...

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-09-06 08:00:39 UTC (rev 137094)
+++ PKGBUILD2011-09-06 08:07:20 UTC (rev 137095)
@@ -5,7 +5,7 @@
 
 pkgname=openssh
 pkgver=5.9p1
-pkgrel=1
+pkgrel=2
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
 license=('custom:BSD')

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

[Gaetan Bisson]

Date: Wednesday, July 13, 2011 @ 03:48:58
  Author: bisson
Revision: 131644

remove tcp_wrappers

Modified:
  openssh/trunk/PKGBUILD

--+
 PKGBUILD |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-07-13 07:03:46 UTC (rev 131643)
+++ PKGBUILD2011-07-13 07:48:58 UTC (rev 131644)
@@ -5,13 +5,13 @@
 
 pkgname=openssh
 pkgver=5.8p2
-pkgrel=8
+pkgrel=9
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
 license=('custom:BSD')
 url='http://www.openssh.org/portable.html'
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 
'etc/conf.d/sshd')
-depends=('tcp_wrappers' 'krb5' 'openssl' 'libedit')
+depends=('krb5' 'openssl' 'libedit')
 
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz;
 'authfile.c.patch'
 'sshd.confd'
@@ -32,7 +32,6 @@
--prefix=/usr \
--libexecdir=/usr/lib/ssh \
--sysconfdir=/etc/ssh \
-   --with-tcp-wrappers \
--with-privsep-user=nobody \
--with-md5-passwords \
--with-pam \

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

[Gaetan Bisson]

Date: Tuesday, June 14, 2011 @ 12:51:03
  Author: bisson
Revision: 127399

fix FS#24716

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/sshd.pam

--+
 PKGBUILD |4 ++--
 sshd.pam |1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-14 13:30:04 UTC (rev 127398)
+++ PKGBUILD2011-06-14 16:51:03 UTC (rev 127399)
@@ -5,7 +5,7 @@
 
 pkgname=openssh
 pkgver=5.8p2
-pkgrel=7
+pkgrel=8
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
 license=('custom:BSD')
@@ -20,7 +20,7 @@
 sha1sums=('64798328d310e4f06c9f01228107520adbc8b3e5'
   '3669cb5ca6149f69015df5ce8e60b82c540eb0a4'
   'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
-  '660092c57bde28bed82078f74011f95fc51c2293'
+  '07fecd5880b1c4fdd8c94ddb2e89ddce88effdc1'
   '6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5')
 
 build() {

Modified: sshd.pam
===
--- sshd.pam2011-06-14 13:30:04 UTC (rev 127398)
+++ sshd.pam2011-06-14 16:51:03 UTC (rev 127399)
@@ -8,3 +8,4 @@
 password   requiredpam_unix.so
 sessionrequiredpam_unix_session.so
 sessionrequiredpam_limits.so
+-session   optionalpam_ck_connector.so nox11

[arch-commits] Commit in openssh/trunk (PKGBUILD authfile.c.patch)

[Gaetan Bisson]

Date: Monday, June 13, 2011 @ 07:08:41
  Author: bisson
Revision: 127348

fix FS#24693

Added:
  openssh/trunk/authfile.c.patch
Modified:
  openssh/trunk/PKGBUILD

--+
 PKGBUILD |   29 +--
 authfile.c.patch |  198 +
 2 files changed, 220 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-13 09:11:03 UTC (rev 127347)
+++ PKGBUILD2011-06-13 11:08:41 UTC (rev 127348)
@@ -5,7 +5,7 @@
 
 pkgname=openssh
 pkgver=5.8p2
-pkgrel=6
+pkgrel=7
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
 license=('custom:BSD')
@@ -13,10 +13,12 @@
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 
'etc/conf.d/sshd')
 depends=('tcp_wrappers' 'krb5' 'openssl' 'libedit')
 
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz;
+'authfile.c.patch'
 'sshd.confd'
 'sshd.pam'
 'sshd')
 sha1sums=('64798328d310e4f06c9f01228107520adbc8b3e5'
+  '3669cb5ca6149f69015df5ce8e60b82c540eb0a4'
   'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
   '660092c57bde28bed82078f74011f95fc51c2293'
   '6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5')
@@ -24,11 +26,24 @@
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
 
-   ./configure --prefix=/usr --libexecdir=/usr/lib/ssh \
-   --sysconfdir=/etc/ssh --with-tcp-wrappers 
--with-privsep-user=nobody \
-   --with-md5-passwords --with-pam --with-mantype=man 
--mandir=/usr/share/man \
-   --with-xauth=/usr/bin/xauth --with-kerberos5=/usr 
--with-ssl-engine \
-   --with-libedit=/usr/lib --disable-strip # stripping is done by 
makepkg
+   patch -p1 -i ../authfile.c.patch # fix FS#24693 using 
http://anoncvs.mindrot.org/index.cgi/openssh/authfile.c?revision=1.95
+
+   ./configure \
+   --prefix=/usr \
+   --libexecdir=/usr/lib/ssh \
+   --sysconfdir=/etc/ssh \
+   --with-tcp-wrappers \
+   --with-privsep-user=nobody \
+   --with-md5-passwords \
+   --with-pam \
+   --with-mantype=man \
+   --mandir=/usr/share/man \
+   --with-xauth=/usr/bin/xauth \
+   --with-kerberos5=/usr \
+   --with-ssl-engine \
+   --with-libedit=/usr/lib \
+   --disable-strip # stripping is done by makepkg
+
make
 }
 
@@ -52,5 +67,5 @@
# PAM is a common, standard feature to have
sed -i  -e '/^#ChallengeResponseAuthentication yes$/c 
ChallengeResponseAuthentication no' \
-e '/^#UsePAM no$/c UsePAM yes' \
-   $pkgdir/etc/ssh/sshd_config
+   ${pkgdir}/etc/ssh/sshd_config
 }

Added: authfile.c.patch
===
--- authfile.c.patch(rev 0)
+++ authfile.c.patch2011-06-13 11:08:41 UTC (rev 127348)
@@ -0,0 +1,198 @@
+diff -aur old/authfile.c new/authfile.c
+--- old/authfile.c 2011-06-12 02:21:52.262338254 +0200
 new/authfile.c 2011-06-12 02:13:43.051467269 +0200
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: authfile.c,v 1.87 2010/11/29 18:57:04 markus Exp $ */
++/* $OpenBSD: authfile.c,v 1.95 2011/05/29 11:42:08 djm Exp $ */
+ /*
+  * Author: Tatu Ylonen y...@cs.hut.fi
+  * Copyright (c) 1995 Tatu Ylonen y...@cs.hut.fi, Espoo, Finland
+@@ -69,6 +69,8 @@
+ #include misc.h
+ #include atomicio.h
+ 
++#define MAX_KEY_FILE_SIZE (1024 * 1024)
++
+ /* Version identification string for SSH v1 identity files. */
+ static const char authfile_id_string[] =
+ SSH PRIVATE KEY FILE FORMAT 1.1\n;
+@@ -312,12 +314,12 @@
+   return pub;
+ }
+ 
+-/* Load the contents of a key file into a buffer */
+-static int
++/* Load a key from a fd into a buffer */
++int
+ key_load_file(int fd, const char *filename, Buffer *blob)
+ {
++  u_char buf[1024];
+   size_t len;
+-  u_char *cp;
+   struct stat st;
+ 
+   if (fstat(fd, st)  0) {
+@@ -325,30 +327,45 @@
+   filename == NULL ?  : filename,
+   filename == NULL ?  :  ,
+   strerror(errno));
+-  close(fd);
+   return 0;
+   }
+-  if (st.st_size  1*1024*1024) {
++  if ((st.st_mode  (S_IFSOCK|S_IFCHR|S_IFIFO)) == 0 
++  st.st_size  MAX_KEY_FILE_SIZE) {
++ toobig:
+   error(%s: key file %.200s%stoo large, __func__,
+   filename == NULL ?  : filename,
+   filename == NULL ?  :  );
+-  close(fd);
+   return 0;
+   }
+-  len = (size_t)st.st_size;   /* truncated */
+-
+   buffer_init(blob);
+-  cp = buffer_append_space(blob, len);
+-
+-  if (atomicio(read, fd, cp, len) != len) {
+-  debug(%s: read from key file 

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

[Gaetan Bisson]

Date: Monday, May 9, 2011 @ 13:39:25
  Author: bisson
Revision: 123287

oops

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-05-09 17:34:36 UTC (rev 123286)
+++ PKGBUILD2011-05-09 17:39:25 UTC (rev 123287)
@@ -5,13 +5,13 @@
 
 pkgname=openssh
 pkgver=5.8p2
-pkgrel=4
+pkgrel=5
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
 license=('custom:BSD')
 url='http://www.openssh.org/portable.html'
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 
'etc/conf.d/sshd')
-depends=('tcp_wrappers' 'krb5' 'openssl' 'libedit')
+depends=('tcp_wrappers' 'heimdal' 'openssl' 'libedit')
 
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz;
 'sshd.confd'
 'sshd.pam'

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

[Gaetan Bisson]

Date: Monday, May 9, 2011 @ 13:45:14
  Author: bisson
Revision: 123290

oops ([testing] version)

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-05-09 17:40:17 UTC (rev 123289)
+++ PKGBUILD2011-05-09 17:45:14 UTC (rev 123290)
@@ -5,13 +5,13 @@
 
 pkgname=openssh
 pkgver=5.8p2
-pkgrel=5
+pkgrel=6
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
 license=('custom:BSD')
 url='http://www.openssh.org/portable.html'
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 
'etc/conf.d/sshd')
-depends=('tcp_wrappers' 'heimdal' 'openssl' 'libedit')
+depends=('tcp_wrappers' 'krb5' 'openssl' 'libedit')
 
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz;
 'sshd.confd'
 'sshd.pam'

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

[Gaetan Bisson]

Date: Thursday, May 5, 2011 @ 08:22:20
  Author: bisson
Revision: 122639

upstream upgrade with no pkgver bump

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-05-05 11:40:02 UTC (rev 122638)
+++ PKGBUILD2011-05-05 12:22:20 UTC (rev 122639)
@@ -5,18 +5,18 @@
 
 pkgname=openssh
 pkgver=5.8p2
-pkgrel=2
+pkgrel=3
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
 license=('custom:BSD')
 url='http://www.openssh.org/portable.html'
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 
'etc/conf.d/sshd')
-depends=('tcp_wrappers' 'krb5' 'libedit')
+depends=('tcp_wrappers' 'heimdal' 'libedit')
 
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz;
 'sshd.confd'
 'sshd.pam'
 'sshd')
-sha1sums=('e610270e0c5484fb291cd81bbcbefbeb5e391a62'
+sha1sums=('64798328d310e4f06c9f01228107520adbc8b3e5'
   'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
   '660092c57bde28bed82078f74011f95fc51c2293'
   '6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5')

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

[Gaetan Bisson]

Date: Thursday, May 5, 2011 @ 08:30:25
  Author: bisson
Revision: 122642

build against krb5 for [staging]

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-05-05 12:22:38 UTC (rev 122641)
+++ PKGBUILD2011-05-05 12:30:25 UTC (rev 122642)
@@ -5,13 +5,13 @@
 
 pkgname=openssh
 pkgver=5.8p2
-pkgrel=3
+pkgrel=4
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
 license=('custom:BSD')
 url='http://www.openssh.org/portable.html'
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 
'etc/conf.d/sshd')
-depends=('tcp_wrappers' 'heimdal' 'libedit')
+depends=('tcp_wrappers' 'krb5' 'openssl' 'libedit')
 
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz;
 'sshd.confd'
 'sshd.pam'

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

[Gaetan Bisson]

Date: Monday, May 2, 2011 @ 22:17:44
  Author: bisson
Revision: 122202

upstream update

Modified:
  openssh/trunk/PKGBUILD

--+
 PKGBUILD |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-02 22:02:51 UTC (rev 122201)
+++ PKGBUILD2011-05-03 02:17:44 UTC (rev 122202)
@@ -1,21 +1,22 @@
 # $Id$
-# Maintainer: Aaron Griffin aa...@archlinux.org
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Aaron Griffin aa...@archlinux.org
 # Contributor: judd jvi...@zeroflux.org
 
 pkgname=openssh
-pkgver=5.8p1
-pkgrel=2
+pkgver=5.8p2
+pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
 license=('custom:BSD')
 url='http://www.openssh.org/portable.html'
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 
'etc/conf.d/sshd')
-depends=('tcp_wrappers' 'krb5' 'libedit')
+depends=('tcp_wrappers' 'heimdal' 'libedit')
 
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz;
 'sshd.confd'
 'sshd.pam'
 'sshd')
-sha1sums=('adebb2faa9aba2a3a3c8b401b2b19677ab53f0de'
+sha1sums=('e610270e0c5484fb291cd81bbcbefbeb5e391a62'
   'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
   '660092c57bde28bed82078f74011f95fc51c2293'
   '6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5')

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

[Gaetan Bisson]

Date: Monday, May 2, 2011 @ 22:22:30
  Author: bisson
Revision: 122205

build against krb5

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-05-03 02:18:02 UTC (rev 122204)
+++ PKGBUILD2011-05-03 02:22:30 UTC (rev 122205)
@@ -5,13 +5,13 @@
 
 pkgname=openssh
 pkgver=5.8p2
-pkgrel=1
+pkgrel=2
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
 license=('custom:BSD')
 url='http://www.openssh.org/portable.html'
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 
'etc/conf.d/sshd')
-depends=('tcp_wrappers' 'heimdal' 'libedit')
+depends=('tcp_wrappers' 'krb5' 'libedit')
 
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz;
 'sshd.confd'
 'sshd.pam'

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

[Stéphane Gaudreault]

Date: Thursday, April 28, 2011 @ 19:41:59
  Author: stephane
Revision: 121075

upgpkg: openssh 5.8p1-2
krb5 rebuild

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-04-28 22:55:09 UTC (rev 121074)
+++ PKGBUILD2011-04-28 23:41:59 UTC (rev 121075)
@@ -4,13 +4,13 @@
 
 pkgname=openssh
 pkgver=5.8p1
-pkgrel=1
+pkgrel=2
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
 license=('custom:BSD')
 url='http://www.openssh.org/portable.html'
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 
'etc/conf.d/sshd')
-depends=('tcp_wrappers' 'heimdal' 'libedit')
+depends=('tcp_wrappers' 'krb5' 'libedit')
 
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz;
 'sshd.confd'
 'sshd.pam'

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

[Gaetan Bisson]

Date: Friday, February 4, 2011 @ 02:33:09
  Author: bisson
Revision: 108830

upstream update

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-02-04 06:41:02 UTC (rev 108829)
+++ PKGBUILD2011-02-04 07:33:09 UTC (rev 108830)
@@ -3,8 +3,8 @@
 # Contributor: judd jvi...@zeroflux.org
 
 pkgname=openssh
-pkgver=5.7p1
-pkgrel=2
+pkgver=5.8p1
+pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
 license=('custom:BSD')
@@ -15,7 +15,7 @@
 'sshd.confd'
 'sshd.pam'
 'sshd')
-sha1sums=('423e27475f06e1055847dfff7f61e1ac632b5372'
+sha1sums=('adebb2faa9aba2a3a3c8b401b2b19677ab53f0de'
   'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
   '660092c57bde28bed82078f74011f95fc51c2293'
   '6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5')

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

[Gaetan Bisson]

Date: Wednesday, January 26, 2011 @ 13:54:29
  Author: bisson
Revision: 107549

re-enable PAM in sshd_config

Modified:
  openssh/trunk/PKGBUILD

--+
 PKGBUILD |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-26 18:43:11 UTC (rev 107548)
+++ PKGBUILD2011-01-26 18:54:29 UTC (rev 107549)
@@ -4,7 +4,7 @@
 
 pkgname=openssh
 pkgver=5.7p1
-pkgrel=1
+pkgrel=2
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
 license=('custom:BSD')
@@ -47,4 +47,9 @@
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
+
+   # PAM is a common, standard feature to have
+   sed -i  -e '/^#ChallengeResponseAuthentication yes$/c 
ChallengeResponseAuthentication no' \
+   -e '/^#UsePAM no$/c UsePAM yes' \
+   $pkgdir/etc/ssh/sshd_config
 }

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

[Gaetan Bisson]

Date: Monday, January 24, 2011 @ 05:27:52
  Author: bisson
Revision: 107350

- major upstream update
- create a host key of type ECDSA in rc.d script
- slightly improve rc.d script (use grep rather than cut+test)

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/sshd

--+
 PKGBUILD |8 
 sshd |3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-24 10:25:24 UTC (rev 107349)
+++ PKGBUILD2011-01-24 10:27:52 UTC (rev 107350)
@@ -3,8 +3,8 @@
 # Contributor: judd jvi...@zeroflux.org
 
 pkgname=openssh
-pkgver=5.6p1
-pkgrel=2
+pkgver=5.7p1
+pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
 license=('custom:BSD')
@@ -15,10 +15,10 @@
 'sshd.confd'
 'sshd.pam'
 'sshd')
-sha1sums=('347dd39c91c3529f41dae63714d452fb95efea1e'
+sha1sums=('423e27475f06e1055847dfff7f61e1ac632b5372'
   'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
   '660092c57bde28bed82078f74011f95fc51c2293'
-  '9738367ee87b6d5a2a34c675b4c483044853109f')
+  '71d67cde8044fe9b11fb5f9e3698ffe4da23f460')
 
 build() {
cd ${srcdir}/${pkgname}-${pkgver}

Modified: sshd
===
--- sshd2011-01-24 10:25:24 UTC (rev 107349)
+++ sshd2011-01-24 10:27:52 UTC (rev 107350)
@@ -6,7 +6,7 @@
 
 PIDFILE=/var/run/sshd.pid
 PID=$(cat $PIDFILE 2/dev/null)
-if [ $(readlink -q /proc/$PID/exe | cut -d ' ' -f 1) != /usr/sbin/sshd ]; 
then
+if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd[ $]'; then
   PID=
   rm $PIDFILE 2/dev/null
 fi
@@ -17,6 +17,7 @@
 [ -f /etc/ssh/ssh_host_key ] || { /usr/bin/ssh-keygen -t rsa1 -N  -f 
/etc/ssh/ssh_host_key /dev/null; }
 [ -f /etc/ssh/ssh_host_rsa_key ] || { /usr/bin/ssh-keygen -t rsa -N  -f 
/etc/ssh/ssh_host_rsa_key /dev/null; }
 [ -f /etc/ssh/ssh_host_dsa_key ] || { /usr/bin/ssh-keygen -t dsa -N  -f 
/etc/ssh/ssh_host_dsa_key /dev/null; }
+[ -f /etc/ssh/ssh_host_ecdsa_key ] || { /usr/bin/ssh-keygen -t ecdsa -N  
-f /etc/ssh/ssh_host_ecdsa_key /dev/null; }
 [ -d /var/empty ] || mkdir -p /var/empty
 [ -z $PID ]  /usr/sbin/sshd $SSHD_ARGS
 if [ $? -gt 0 ]; then

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

[Gaetan Bisson]

Date: Monday, January 24, 2011 @ 06:03:55
  Author: bisson
Revision: 107353

fix typo

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/sshd

--+
 PKGBUILD |2 +-
 sshd |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-24 10:28:23 UTC (rev 107352)
+++ PKGBUILD2011-01-24 11:03:55 UTC (rev 107353)
@@ -18,7 +18,7 @@
 sha1sums=('423e27475f06e1055847dfff7f61e1ac632b5372'
   'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
   '660092c57bde28bed82078f74011f95fc51c2293'
-  '71d67cde8044fe9b11fb5f9e3698ffe4da23f460')
+  '6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5')
 
 build() {
cd ${srcdir}/${pkgname}-${pkgver}

Modified: sshd
===
--- sshd2011-01-24 10:28:23 UTC (rev 107352)
+++ sshd2011-01-24 11:03:55 UTC (rev 107353)
@@ -6,7 +6,7 @@
 
 PIDFILE=/var/run/sshd.pid
 PID=$(cat $PIDFILE 2/dev/null)
-if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd[ $]'; then
+if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then
   PID=
   rm $PIDFILE 2/dev/null
 fi

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

[Guillaume Alaux]

Date: Friday, January 14, 2011 @ 17:13:10
  Author: guillaume
Revision: 106175

upgpkg: openssh 5.6p1-2
-m

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/sshd
  openssh/trunk/sshd.pam

--+
 PKGBUILD |   78 +
 sshd |8 +-
 sshd.pam |2 -
 3 files changed, 40 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-14 22:07:28 UTC (rev 106174)
+++ PKGBUILD2011-01-14 22:13:10 UTC (rev 106175)
@@ -4,61 +4,47 @@
 
 pkgname=openssh
 pkgver=5.6p1
-pkgrel=1
-pkgdesc='A Secure SHell server/client'
+pkgrel=2
+pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
-license=('custom')
-url=http://www.openssh.org/portable.html;
-backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
-depends=('openssl' 'zlib' 'pam' 'tcp_wrappers' 'heimdal')
+license=('custom:BSD')
+url='http://www.openssh.org/portable.html'
+backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 
'etc/conf.d/sshd')
+depends=('tcp_wrappers' 'heimdal' 'libedit')
 
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz;
-'sshd' 'sshd.confd' 'sshd.pam')
-md5sums=('e6ee52e47c768bf0ec42a232b5d18fb0'
- '17b1b1bf0f578a55945ee204bd4462af'
- 'e2cea70ac13af7e63d40eb04415eacd5'
- '1c7c2ea8734ec7e3ca58d820634dc73a')
+'sshd.confd'
+'sshd.pam'
+'sshd')
+sha1sums=('347dd39c91c3529f41dae63714d452fb95efea1e'
+  'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
+  '660092c57bde28bed82078f74011f95fc51c2293'
+  '7f56379ad9e6eb197f0db59e7df6473b83c197a1')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+   cd ${srcdir}/${pkgname}-${pkgver}
 
-  #NOTE we disable-strip so that makepkg can decide whether to strip or not
-  ./configure --prefix=/usr --libexecdir=/usr/lib/ssh \
---sysconfdir=/etc/ssh --with-tcp-wrappers --with-privsep-user=nobody \
---with-md5-passwords --with-pam --with-mantype=man --mandir=/usr/share/man 
\
---with-xauth=/usr/bin/xauth --with-kerberos5=/usr --with-ssl-engine \
---disable-strip
-  make || return 1
+   ./configure --prefix=/usr --libexecdir=/usr/lib/ssh \
+   --sysconfdir=/etc/ssh --with-tcp-wrappers 
--with-privsep-user=nobody \
+   --with-md5-passwords --with-pam --with-mantype=man 
--mandir=/usr/share/man \
+   --with-xauth=/usr/bin/xauth --with-kerberos5=/usr 
--with-ssl-engine \
+   --with-libedit=/usr/lib --disable-strip # stripping is done by 
makepkg
+   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install
 
-  install -Dm755 ${srcdir}/sshd ${pkgdir}/etc/rc.d/sshd
+   install -Dm755 ../sshd ${pkgdir}/etc/rc.d/sshd
+   install -Dm644 ../sshd.pam ${pkgdir}/etc/pam.d/sshd
+   install -Dm644 ../sshd.confd ${pkgdir}/etc/conf.d/sshd
+   install -Dm644 LICENCE ${pkgdir}/usr/share/licenses/${pkgname}/LICENCE
 
-  install -Dm644 LICENCE ${pkgdir}/usr/share/licenses/${pkgname}/LICENCE
-  install -Dm644 ${srcdir}/sshd.pam ${pkgdir}/etc/pam.d/sshd
-  install -Dm644 ${srcdir}/sshd.confd ${pkgdir}/etc/conf.d/sshd
+   rm ${pkgdir}/usr/share/man/man1/slogin.1
+   ln -sf ssh.1.gz ${pkgdir}/usr/share/man/man1/slogin.1.gz
 
-  rm ${pkgdir}/usr/share/man/man1/slogin.1
-  ln -sf ssh.1.gz ${pkgdir}/usr/share/man/man1/slogin.1.gz
-
-  #additional contrib scripts that we like
-  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
-
-  # sshd_config
-  sed -i \
--e 's|^#ListenAddress 0.0.0.0|ListenAddress 0.0.0.0|g' \
--e 's|^#UsePAM no|UsePAM yes|g' \
--e 's|^#ChallengeResponseAuthentication 
yes|ChallengeResponseAuthentication no|g' \
-${pkgdir}/etc/ssh/sshd_config
-  echo HashKnownHosts yes   ${pkgdir}/etc/ssh/ssh_config
-  echo StrictHostKeyChecking ask   ${pkgdir}/etc/ssh/ssh_config
-
-  #ssh_config
-  sed -i \
--e 's|^# Host \*|Host *|g' \
-${pkgdir}/etc/ssh/ssh_config
+   # additional contrib scripts that we like
+   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
 }

Modified: sshd
===
--- sshd2011-01-14 22:07:28 UTC (rev 106174)
+++ sshd2011-01-14 22:13:10 UTC (rev 106175)
@@ -4,7 +4,13 @@
 . /etc/rc.d/functions
 . /etc/conf.d/sshd
 
-PID=$(cat /var/run/sshd.pid 2/dev/null)
+PIDFILE=/var/run/sshd.pid
+PID=$(cat $PIDFILE 2/dev/null)
+if [ $(readlink 

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

[Guillaume Alaux]

Date: Friday, January 14, 2011 @ 18:46:24
  Author: guillaume
Revision: 106183

upgpkg: openssh 5.6p1-2
Bug fixes 20191 19213 22366 17138 20998

Modified:
  openssh/trunk/PKGBUILD
  openssh/trunk/sshd

--+
 PKGBUILD |2 +-
 sshd |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-14 22:21:23 UTC (rev 106182)
+++ PKGBUILD2011-01-14 23:46:24 UTC (rev 106183)
@@ -18,7 +18,7 @@
 sha1sums=('347dd39c91c3529f41dae63714d452fb95efea1e'
   'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
   '660092c57bde28bed82078f74011f95fc51c2293'
-  '7f56379ad9e6eb197f0db59e7df6473b83c197a1')
+  '9738367ee87b6d5a2a34c675b4c483044853109f')
 
 build() {
cd ${srcdir}/${pkgname}-${pkgver}

Modified: sshd
===
--- sshd2011-01-14 22:21:23 UTC (rev 106182)
+++ sshd2011-01-14 23:46:24 UTC (rev 106183)
@@ -6,7 +6,7 @@
 
 PIDFILE=/var/run/sshd.pid
 PID=$(cat $PIDFILE 2/dev/null)
-if [ $(readlink /proc/$PID/exe 2/dev/null) != /usr/sbin/sshd ]; then
+if [ $(readlink -q /proc/$PID/exe | cut -d ' ' -f 1) != /usr/sbin/sshd ]; 
then
   PID=
   rm $PIDFILE 2/dev/null
 fi

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

[Thomas Bächler]

Date: Monday, August 30, 2010 @ 17:38:00
  Author: thomas
Revision: 89278

Upstream update: 5.5p1 - 5.6p1

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2010-08-30 20:00:41 UTC (rev 89277)
+++ PKGBUILD2010-08-30 21:38:00 UTC (rev 89278)
@@ -3,7 +3,7 @@
 # Contributor: judd jvi...@zeroflux.org
 
 pkgname=openssh
-pkgver=5.5p1
+pkgver=5.6p1
 pkgrel=1
 pkgdesc='A Secure SHell server/client'
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
 depends=('openssl' 'zlib' 'pam' 'tcp_wrappers' 'heimdal')
 
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz;
 'sshd' 'sshd.confd' 'sshd.pam')
-md5sums=('88633408f4cb1eb11ec7e2ec58b519eb'
+md5sums=('e6ee52e47c768bf0ec42a232b5d18fb0'
  '17b1b1bf0f578a55945ee204bd4462af'
  'e2cea70ac13af7e63d40eb04415eacd5'
  '1c7c2ea8734ec7e3ca58d820634dc73a')

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

[Allan McRae]

Date: Monday, May 24, 2010 @ 02:39:23
  Author: allan
Revision: 80964

upgpkg: openssh 5.5p1-1
upstream update

Modified:
  openssh/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2010-05-24 06:00:41 UTC (rev 80963)
+++ PKGBUILD2010-05-24 06:39:23 UTC (rev 80964)
@@ -3,8 +3,8 @@
 # Contributor: judd jvi...@zeroflux.org
 
 pkgname=openssh
-pkgver=5.4p1
-pkgrel=4
+pkgver=5.5p1
+pkgrel=1
 pkgdesc='A Secure SHell server/client'
 arch=('i686' 'x86_64')
 license=('custom')
@@ -13,7 +13,7 @@
 depends=('openssl' 'zlib' 'pam' 'tcp_wrappers' 'heimdal')
 
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz;
 'sshd' 'sshd.confd' 'sshd.pam')
-md5sums=('da10af8a789fa2e83e3635f3a1b76f5e'
+md5sums=('88633408f4cb1eb11ec7e2ec58b519eb'
  '17b1b1bf0f578a55945ee204bd4462af'
  'e2cea70ac13af7e63d40eb04415eacd5'
  '1c7c2ea8734ec7e3ca58d820634dc73a')