[arch-commits] Commit in openssh/repos (10 files)

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

archrelease: copy trunk to staging-x86_64

Added:
  openssh/repos/staging-x86_64/
  openssh/repos/staging-x86_64/3122.patch
(from rev 396594, openssh/trunk/3122.patch)
  openssh/repos/staging-x86_64/67290.patch
(from rev 396594, openssh/trunk/67290.patch)
  openssh/repos/staging-x86_64/PKGBUILD
(from rev 396594, openssh/trunk/PKGBUILD)
  openssh/repos/staging-x86_64/glibc-2.31.patch
(from rev 396594, openssh/trunk/glibc-2.31.patch)
  openssh/repos/staging-x86_64/install
(from rev 396594, openssh/trunk/install)
  openssh/repos/staging-x86_64/sshd.conf
(from rev 396594, openssh/trunk/sshd.conf)
  openssh/repos/staging-x86_64/sshd.pam
(from rev 396594, openssh/trunk/sshd.pam)
  openssh/repos/staging-x86_64/sshd.service
(from rev 396594, openssh/trunk/sshd.service)
  openssh/repos/staging-x86_64/sshdgenkeys.service
(from rev 396594, openssh/trunk/sshdgenkeys.service)

-+
 3122.patch  |   98 ++
 67290.patch |   49 +
 PKGBUILD|  116 ++
 glibc-2.31.patch|  100 +++
 install |   32 +
 sshd.conf   |1 
 sshd.pam|6 ++
 sshd.service|   14 ++
 sshdgenkeys.service |   15 ++
 9 files changed, 431 insertions(+)

Copied: openssh/repos/staging-x86_64/3122.patch (from rev 396594, 
openssh/trunk/3122.patch)
===
--- staging-x86_64/3122.patch   (rev 0)
+++ staging-x86_64/3122.patch   2020-09-26 19:51:21 UTC (rev 396595)
@@ -0,0 +1,98 @@
+diff -Naur old/servconf.c new/servconf.c
+--- old/servconf.c 2020-05-26 14:38:00.0 -1000
 new/servconf.c 2020-07-16 10:14:14.076284901 -1000
+@@ -550,6 +550,7 @@
+ #define SSHCFG_MATCH  0x02/* allowed inside a Match section */
+ #define SSHCFG_ALL(SSHCFG_GLOBAL|SSHCFG_MATCH)
+ #define SSHCFG_NEVERMATCH 0x04  /* Match never matches; internal only */
++#define SSHCFG_MATCH_ONLY 0x08  /* Match only in conditional blocks; 
internal only */
+ 
+ /* Textual representation of the tokens. */
+ static struct {
+@@ -1259,7 +1260,7 @@
+ static int
+ process_server_config_line_depth(ServerOptions *options, char *line,
+ const char *filename, int linenum, int *activep,
+-struct connection_info *connectinfo, int inc_flags, int depth,
++struct connection_info *connectinfo, int *inc_flags, int depth,
+ struct include_list *includes)
+ {
+   char ch, *cp, ***chararrayptr, **charptr, *arg, *arg2, *p;
+@@ -2002,7 +2003,9 @@
+   parse_server_config_depth(options,
+   item->filename, item->contents,
+   includes, connectinfo,
+-  (oactive ? 0 : SSHCFG_NEVERMATCH),
++  (*inc_flags & SSHCFG_MATCH_ONLY
++  ? SSHCFG_MATCH_ONLY : (oactive
++  ? 0 : SSHCFG_NEVERMATCH)),
+   activep, depth + 1);
+   }
+   found = 1;
+@@ -2050,7 +2053,9 @@
+   parse_server_config_depth(options,
+   item->filename, item->contents,
+   includes, connectinfo,
+-  (oactive ? 0 : SSHCFG_NEVERMATCH),
++  (*inc_flags & SSHCFG_MATCH_ONLY
++  ? SSHCFG_MATCH_ONLY : (oactive
++  ? 0 : SSHCFG_NEVERMATCH)),
+   activep, depth + 1);
+   *activep = oactive;
+   TAILQ_INSERT_TAIL(includes, item, entry);
+@@ -2068,11 +2073,14 @@
+   if (cmdline)
+   fatal("Match directive not supported as a command-line "
+  "option");
+-  value = match_cfg_line(, linenum, connectinfo);
++  value = match_cfg_line(, linenum,
++  (*inc_flags & SSHCFG_NEVERMATCH ? NULL : connectinfo));
+   if (value < 0)
+   fatal("%s line %d: Bad Match condition", filename,
+   linenum);
+-  *activep = (inc_flags & SSHCFG_NEVERMATCH) ? 0 : value;
++  *activep = (*inc_flags & SSHCFG_NEVERMATCH) ? 0 : value;
++  /* The MATCH_ONLY is applicable only until the first match 
block */
++  *inc_flags &= ~SSHCFG_MATCH_ONLY;
+   break;
+ 
+   case

[arch-commits] Commit in openssh/repos (10 files)

2018-08-23 Thread Gaëtan Bisson via arch-commits 
Date: Friday, August 24, 2018 @ 05:03:05
  Author: bisson
Revision: 332898

archrelease: copy trunk to testing-x86_64

Added:
  openssh/repos/testing-x86_64/
  openssh/repos/testing-x86_64/PKGBUILD
(from rev 332897, openssh/trunk/PKGBUILD)
  openssh/repos/testing-x86_64/PKGBUILD.snap
(from rev 332897, openssh/trunk/PKGBUILD.snap)
  openssh/repos/testing-x86_64/openssl-1.1.0.patch
(from rev 332897, openssh/trunk/openssl-1.1.0.patch)
  openssh/repos/testing-x86_64/sshd.conf
(from rev 332897, openssh/trunk/sshd.conf)
  openssh/repos/testing-x86_64/sshd.pam
(from rev 332897, openssh/trunk/sshd.pam)
  openssh/repos/testing-x86_64/sshd.service
(from rev 332897, openssh/trunk/sshd.service)
  openssh/repos/testing-x86_64/sshd.socket
(from rev 332897, openssh/trunk/sshd.socket)
  openssh/repos/testing-x86_64/sshd@.service
(from rev 332897, openssh/trunk/sshd@.service)
  openssh/repos/testing-x86_64/sshdgenkeys.service
(from rev 332897, openssh/trunk/sshdgenkeys.service)

-+
 PKGBUILD|  103 ++
 PKGBUILD.snap   |  109 ++
 openssl-1.1.0.patch | 1950 ++
 sshd.conf   |1 
 sshd.pam|6 
 sshd.service|   17 
 sshd.socket |   10 
 sshd@.service   |9 
 sshdgenkeys.service |   15 
 9 files changed, 2220 insertions(+)

Copied: openssh/repos/testing-x86_64/PKGBUILD (from rev 332897, 
openssh/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2018-08-24 05:03:05 UTC (rev 332898)
@@ -0,0 +1,103 @@
+# $Id$
+# Maintainer: Gaetan Bisson 
+# Contributor: Aaron Griffin 
+# Contributor: judd 
+
+pkgname=openssh
+pkgver=7.8p1
+pkgrel=1
+pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
+url='https://www.openssh.com/portable.html'
+license=('custom:BSD')
+arch=('x86_64')
+makedepends=('linux-headers')
+depends=('krb5' 'openssl' 'libedit' 'ldns')
+optdepends=('xorg-xauth: X11 forwarding'
+'x11-ssh-askpass: input passphrase in X')
+validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30')
+source=("https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc}
+'openssl-1.1.0.patch'
+'sshdgenkeys.service'
+'sshd@.service'
+'sshd.service'
+'sshd.socket'
+'sshd.conf'
+'sshd.pam')
+sha256sums=('1a484bb15152c183bb2514e112aa30dd34138c3cfb032eee5490a66c507144ca'
+'SKIP'
+'d92e3d759b4b5c536aaddf95891bf3baa3a589b4897c56b90103088e1d8f8ebd'
+'4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
+'3a0845737207f4eda221c9c9fb64e766ade9684562d8ba4f705f7ae6826886e5'
+'c5ed9fa629f8f8dbf3bae4edbad4441c36df535088553fe82695c52d7bde30aa'
+'de14363e9d4ed92848e524036d9e6b57b2d35cc77d377b7247c38111d2a3defd'
+'4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6'
+'64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846')
+
+backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
+
+prepare() {
+   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 -p1 -i ../openssl-1.1.0.patch
+}
+
+build() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+
+   ./configure \
+   --prefix=/usr \
+   --sbindir=/usr/bin \
+   --libexecdir=/usr/lib/ssh \
+   --sysconfdir=/etc/ssh \
+   --with-ldns \
+   --with-libedit \
+   --with-ssl-engine \
+   --with-pam \
+   --with-privsep-user=nobody \
+   --with-kerberos5=/usr \
+   --with-xauth=/usr/bin/xauth \
+   --with-md5-passwords \
+   --with-pid-dir=/run \
+   --with-default-path='/usr/local/sbin:/usr/local/bin:/usr/bin' \
+
+   make
+}
+
+check() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+
+   # Tests require openssh to be already installed system-wide,
+   # also connectivity tests will fail under makechrootpkg since
+# it runs as nobody which has /bin/false as login shell.
+
+   if [[ -e /usr/bin/scp && ! -e /.arch-chroot ]]; then
+   make tests
+   fi
+}
+
+package() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+
+   make DESTDIR="${pkgdir}" install
+
+   ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz
+   install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
+
+   install -Dm644 ../sshdgenkeys.service 
"${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service
+   install -Dm644 ../sshd@.service 
"${pkgdir}"/usr/lib/systemd/system/sshd@.service
+   install -Dm644 ../sshd.service

[arch-commits] Commit in openssh/repos (10 files)

2018-04-03 Thread Gaëtan Bisson via arch-commits 
Date: Tuesday, April 3, 2018 @ 06:29:41
  Author: bisson
Revision: 320879

archrelease: copy trunk to testing-x86_64

Added:
  openssh/repos/testing-x86_64/
  openssh/repos/testing-x86_64/PKGBUILD
(from rev 320878, openssh/trunk/PKGBUILD)
  openssh/repos/testing-x86_64/PKGBUILD.snap
(from rev 320878, openssh/trunk/PKGBUILD.snap)
  openssh/repos/testing-x86_64/openssl-1.1.0.patch
(from rev 320878, openssh/trunk/openssl-1.1.0.patch)
  openssh/repos/testing-x86_64/sshd.conf
(from rev 320878, openssh/trunk/sshd.conf)
  openssh/repos/testing-x86_64/sshd.pam
(from rev 320878, openssh/trunk/sshd.pam)
  openssh/repos/testing-x86_64/sshd.service
(from rev 320878, openssh/trunk/sshd.service)
  openssh/repos/testing-x86_64/sshd.socket
(from rev 320878, openssh/trunk/sshd.socket)
  openssh/repos/testing-x86_64/sshd@.service
(from rev 320878, openssh/trunk/sshd@.service)
  openssh/repos/testing-x86_64/sshdgenkeys.service
(from rev 320878, openssh/trunk/sshdgenkeys.service)

-+
 PKGBUILD|  103 ++
 PKGBUILD.snap   |  109 ++
 openssl-1.1.0.patch | 1953 ++
 sshd.conf   |1 
 sshd.pam|6 
 sshd.service|   17 
 sshd.socket |   10 
 sshd@.service   |9 
 sshdgenkeys.service |   15 
 9 files changed, 2223 insertions(+)

Copied: openssh/repos/testing-x86_64/PKGBUILD (from rev 320878, 
openssh/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2018-04-03 06:29:41 UTC (rev 320879)
@@ -0,0 +1,103 @@
+# $Id$
+# Maintainer: Gaetan Bisson 
+# Contributor: Aaron Griffin 
+# Contributor: judd 
+
+pkgname=openssh
+pkgver=7.7p1
+pkgrel=1
+pkgdesc='Free version of the SSH connectivity tools'
+url='https://www.openssh.com/portable.html'
+license=('custom:BSD')
+arch=('x86_64')
+makedepends=('linux-headers')
+depends=('krb5' 'openssl' 'libedit' 'ldns')
+optdepends=('xorg-xauth: X11 forwarding'
+'x11-ssh-askpass: input passphrase in X')
+validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30')
+source=("https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc}
+'openssl-1.1.0.patch'
+'sshdgenkeys.service'
+'sshd@.service'
+'sshd.service'
+'sshd.socket'
+'sshd.conf'
+'sshd.pam')
+sha256sums=('d73be7e684e99efcd024be15a30bffcbe41b012b2f7b3c9084aed621775e6b8f'
+'SKIP'
+'fa91849cc3161916f563bda5413676342e0bcc2705857e9d01b73c70e4904adf'
+'4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
+'3a0845737207f4eda221c9c9fb64e766ade9684562d8ba4f705f7ae6826886e5'
+'c5ed9fa629f8f8dbf3bae4edbad4441c36df535088553fe82695c52d7bde30aa'
+'de14363e9d4ed92848e524036d9e6b57b2d35cc77d377b7247c38111d2a3defd'
+'4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6'
+'64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846')
+
+backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
+
+prepare() {
+   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 -p1 -i ../openssl-1.1.0.patch
+}
+
+build() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+
+   ./configure \
+   --prefix=/usr \
+   --sbindir=/usr/bin \
+   --libexecdir=/usr/lib/ssh \
+   --sysconfdir=/etc/ssh \
+   --with-ldns \
+   --with-libedit \
+   --with-ssl-engine \
+   --with-pam \
+   --with-privsep-user=nobody \
+   --with-kerberos5=/usr \
+   --with-xauth=/usr/bin/xauth \
+   --with-md5-passwords \
+   --with-pid-dir=/run \
+   --with-default-path='/usr/local/sbin:/usr/local/bin:/usr/bin' \
+
+   make
+}
+
+check() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+
+   # Tests require openssh to be already installed system-wide,
+   # also connectivity tests will fail under makechrootpkg since
+# it runs as nobody which has /bin/false as login shell.
+
+   if [[ -e /usr/bin/scp && ! -e /.arch-chroot ]]; then
+   make tests
+   fi
+}
+
+package() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+
+   make DESTDIR="${pkgdir}" install
+
+   ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz
+   install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
+
+   install -Dm644 ../sshdgenkeys.service 
"${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service
+   install -Dm644 ../sshd@.service 
"${pkgdir}"/usr/lib/systemd/system/sshd@.service
+   install

[arch-commits] Commit in openssh/repos (10 files)

2012-03-21 Thread Pierre Schmitz 
Date: Wednesday, March 21, 2012 @ 02:20:48
  Author: pierre
Revision: 153963

db-move: moved openssh from [testing] to [core] (i686)

Added:
  openssh/repos/core-i686/PKGBUILD
(from rev 153960, openssh/repos/testing-i686/PKGBUILD)
  openssh/repos/core-i686/sshd
(from rev 153960, openssh/repos/testing-i686/sshd)
  openssh/repos/core-i686/sshd.close-sessions
(from rev 153960, openssh/repos/testing-i686/sshd.close-sessions)
  openssh/repos/core-i686/sshd.confd
(from rev 153960, openssh/repos/testing-i686/sshd.confd)
  openssh/repos/core-i686/sshd.pam
(from rev 153960, openssh/repos/testing-i686/sshd.pam)
Deleted:
  openssh/repos/core-i686/PKGBUILD
  openssh/repos/core-i686/sshd
  openssh/repos/core-i686/sshd.confd
  openssh/repos/core-i686/sshd.pam
  openssh/repos/testing-i686/

-+
 PKGBUILD|  135 +-
 sshd|   90 -
 sshd.close-sessions |   17 ++
 sshd.confd  |8 +-
 sshd.pam|   24 
 5 files changed, 146 insertions(+), 128 deletions(-)

Deleted: core-i686/PKGBUILD
===
--- core-i686/PKGBUILD  2012-03-21 06:20:46 UTC (rev 153962)
+++ core-i686/PKGBUILD  2012-03-21 06:20:48 UTC (rev 153963)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson bis...@archlinux.org
-# Contributor: Aaron Griffin aa...@archlinux.org
-# Contributor: judd jvi...@zeroflux.org
-
-pkgname=openssh
-pkgver=5.9p1
-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=('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'
-'sshd')
-sha1sums=('ac4e0055421e9543f0af5da607a72cf5922dcc56'
-  'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
-  '3413909fd45a28701c92e6e5b59c6b65346ddb0f'
-  '21fa88de6cc1c7912e71655f50896ba17991a1c2')
-
-build() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-
-   ./configure \
-   --prefix=/usr \
-   --libexecdir=/usr/lib/ssh \
-   --sysconfdir=/etc/ssh \
-   --with-privsep-user=nobody \
-   --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
-}
-
-package() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   make DESTDIR=${pkgdir} install
-
-   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
-
-   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' \
-   -i ${pkgdir}/etc/ssh/sshd_config
-}

Copied: openssh/repos/core-i686/PKGBUILD (from rev 153960, 
openssh/repos/testing-i686/PKGBUILD)
===
--- core-i686/PKGBUILD  (rev 0)
+++ core-i686/PKGBUILD  2012-03-21 06:20:48 UTC (rev 153963)
@@ -0,0 +1,68 @@
+# $Id$
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Aaron Griffin aa...@archlinux.org
+# Contributor: judd jvi...@zeroflux.org
+
+pkgname=openssh
+pkgver=5.9p1
+pkgrel=8
+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.close-sessions'
+'sshd.confd'
+'sshd.pam'
+'sshd')
+sha1sums=('ac4e0055421e9543f0af5da607a72cf5922dcc56'
+

[arch-commits] Commit in openssh/repos (10 files)

2012-03-21 Thread Pierre Schmitz 
Date: Wednesday, March 21, 2012 @ 02:20:49
  Author: pierre
Revision: 153965

db-move: moved openssh from [testing] to [core] (x86_64)

Added:
  openssh/repos/core-x86_64/PKGBUILD
(from rev 153960, openssh/repos/testing-x86_64/PKGBUILD)
  openssh/repos/core-x86_64/sshd
(from rev 153960, openssh/repos/testing-x86_64/sshd)
  openssh/repos/core-x86_64/sshd.close-sessions
(from rev 153960, openssh/repos/testing-x86_64/sshd.close-sessions)
  openssh/repos/core-x86_64/sshd.confd
(from rev 153960, openssh/repos/testing-x86_64/sshd.confd)
  openssh/repos/core-x86_64/sshd.pam
(from rev 153960, openssh/repos/testing-x86_64/sshd.pam)
Deleted:
  openssh/repos/core-x86_64/PKGBUILD
  openssh/repos/core-x86_64/sshd
  openssh/repos/core-x86_64/sshd.confd
  openssh/repos/core-x86_64/sshd.pam
  openssh/repos/testing-x86_64/

-+
 PKGBUILD|  135 +-
 sshd|   90 -
 sshd.close-sessions |   17 ++
 sshd.confd  |8 +-
 sshd.pam|   24 
 5 files changed, 146 insertions(+), 128 deletions(-)

Deleted: core-x86_64/PKGBUILD
===
--- core-x86_64/PKGBUILD2012-03-21 06:20:49 UTC (rev 153964)
+++ core-x86_64/PKGBUILD2012-03-21 06:20:49 UTC (rev 153965)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson bis...@archlinux.org
-# Contributor: Aaron Griffin aa...@archlinux.org
-# Contributor: judd jvi...@zeroflux.org
-
-pkgname=openssh
-pkgver=5.9p1
-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=('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'
-'sshd')
-sha1sums=('ac4e0055421e9543f0af5da607a72cf5922dcc56'
-  'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
-  '3413909fd45a28701c92e6e5b59c6b65346ddb0f'
-  '21fa88de6cc1c7912e71655f50896ba17991a1c2')
-
-build() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-
-   ./configure \
-   --prefix=/usr \
-   --libexecdir=/usr/lib/ssh \
-   --sysconfdir=/etc/ssh \
-   --with-privsep-user=nobody \
-   --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
-}
-
-package() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   make DESTDIR=${pkgdir} install
-
-   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
-
-   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' \
-   -i ${pkgdir}/etc/ssh/sshd_config
-}

Copied: openssh/repos/core-x86_64/PKGBUILD (from rev 153960, 
openssh/repos/testing-x86_64/PKGBUILD)
===
--- core-x86_64/PKGBUILD(rev 0)
+++ core-x86_64/PKGBUILD2012-03-21 06:20:49 UTC (rev 153965)
@@ -0,0 +1,68 @@
+# $Id$
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Aaron Griffin aa...@archlinux.org
+# Contributor: judd jvi...@zeroflux.org
+
+pkgname=openssh
+pkgver=5.9p1
+pkgrel=8
+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.close-sessions'
+'sshd.confd'
+'sshd.pam'
+'sshd')

[arch-commits] Commit in openssh/repos (10 files)

2012-03-14 Thread Pierre Schmitz 
Date: Wednesday, March 14, 2012 @ 17:38:18
  Author: pierre
Revision: 153476

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  openssh/repos/staging-i686/
  openssh/repos/staging-i686/PKGBUILD
(from rev 153475, openssh/trunk/PKGBUILD)
  openssh/repos/staging-i686/sshd
(from rev 153475, openssh/trunk/sshd)
  openssh/repos/staging-i686/sshd.confd
(from rev 153475, openssh/trunk/sshd.confd)
  openssh/repos/staging-i686/sshd.pam
(from rev 153475, openssh/trunk/sshd.pam)
  openssh/repos/staging-x86_64/
  openssh/repos/staging-x86_64/PKGBUILD
(from rev 153475, openssh/trunk/PKGBUILD)
  openssh/repos/staging-x86_64/sshd
(from rev 153475, openssh/trunk/sshd)
  openssh/repos/staging-x86_64/sshd.confd
(from rev 153475, openssh/trunk/sshd.confd)
  openssh/repos/staging-x86_64/sshd.pam
(from rev 153475, openssh/trunk/sshd.pam)

---+
 staging-i686/PKGBUILD |   67 
 staging-i686/sshd |   45 +
 staging-i686/sshd.confd   |4 ++
 staging-i686/sshd.pam |   12 +++
 staging-x86_64/PKGBUILD   |   67 
 staging-x86_64/sshd   |   45 +
 staging-x86_64/sshd.confd |4 ++
 staging-x86_64/sshd.pam   |   12 +++
 8 files changed, 256 insertions(+)

Copied: openssh/repos/staging-i686/PKGBUILD (from rev 153475, 
openssh/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-03-14 21:38:18 UTC (rev 153476)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Aaron Griffin aa...@archlinux.org
+# Contributor: judd jvi...@zeroflux.org
+
+pkgname=openssh
+pkgver=5.9p1
+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=('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'
+'sshd')
+sha1sums=('ac4e0055421e9543f0af5da607a72cf5922dcc56'
+  'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
+  '3413909fd45a28701c92e6e5b59c6b65346ddb0f'
+  '21fa88de6cc1c7912e71655f50896ba17991a1c2')
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+
+   ./configure \
+   --prefix=/usr \
+   --libexecdir=/usr/lib/ssh \
+   --sysconfdir=/etc/ssh \
+   --with-privsep-user=nobody \
+   --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
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install
+
+   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
+
+   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' \
+   -i ${pkgdir}/etc/ssh/sshd_config
+}

Copied: openssh/repos/staging-i686/sshd (from rev 153475, openssh/trunk/sshd)
===
--- staging-i686/sshd   (rev 0)
+++ staging-i686/sshd   2012-03-14 21:38:18 UTC (rev 153476)
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/sshd
+
+PIDFILE=/var/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
+   [[ -d /var/empty ]] || mkdir -p /var/empty
+   [[ -z $PID ]]  /usr/sbin/sshd $SSHD_ARGS
+

[arch-commits] Commit in openssh/repos (10 files)

2011-11-26 Thread Gaetan Bisson 
Date: Saturday, November 26, 2011 @ 07:47:01
  Author: bisson
Revision: 143549

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  openssh/repos/testing-i686/
  openssh/repos/testing-i686/PKGBUILD
(from rev 143548, openssh/trunk/PKGBUILD)
  openssh/repos/testing-i686/sshd
(from rev 143548, openssh/trunk/sshd)
  openssh/repos/testing-i686/sshd.confd
(from rev 143548, openssh/trunk/sshd.confd)
  openssh/repos/testing-i686/sshd.pam
(from rev 143548, openssh/trunk/sshd.pam)
  openssh/repos/testing-x86_64/
  openssh/repos/testing-x86_64/PKGBUILD
(from rev 143548, openssh/trunk/PKGBUILD)
  openssh/repos/testing-x86_64/sshd
(from rev 143548, openssh/trunk/sshd)
  openssh/repos/testing-x86_64/sshd.confd
(from rev 143548, openssh/trunk/sshd.confd)
  openssh/repos/testing-x86_64/sshd.pam
(from rev 143548, openssh/trunk/sshd.pam)

---+
 testing-i686/PKGBUILD |   67 
 testing-i686/sshd |   45 +
 testing-i686/sshd.confd   |4 ++
 testing-i686/sshd.pam |   12 +++
 testing-x86_64/PKGBUILD   |   67 
 testing-x86_64/sshd   |   45 +
 testing-x86_64/sshd.confd |4 ++
 testing-x86_64/sshd.pam   |   12 +++
 8 files changed, 256 insertions(+)

Copied: openssh/repos/testing-i686/PKGBUILD (from rev 143548, 
openssh/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-11-26 12:47:01 UTC (rev 143549)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Aaron Griffin aa...@archlinux.org
+# Contributor: judd jvi...@zeroflux.org
+
+pkgname=openssh
+pkgver=5.9p1
+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=('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'
+'sshd')
+sha1sums=('ac4e0055421e9543f0af5da607a72cf5922dcc56'
+  'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
+  '3413909fd45a28701c92e6e5b59c6b65346ddb0f'
+  '21fa88de6cc1c7912e71655f50896ba17991a1c2')
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+
+   ./configure \
+   --prefix=/usr \
+   --libexecdir=/usr/lib/ssh \
+   --sysconfdir=/etc/ssh \
+   --with-privsep-user=nobody \
+   --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
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install
+
+   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
+
+   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' \
+   -i ${pkgdir}/etc/ssh/sshd_config
+}

Copied: openssh/repos/testing-i686/sshd (from rev 143548, openssh/trunk/sshd)
===
--- testing-i686/sshd   (rev 0)
+++ testing-i686/sshd   2011-11-26 12:47:01 UTC (rev 143549)
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/sshd
+
+PIDFILE=/var/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
+   [[ -d /var/empty ]] || mkdir -p /var/empty
+   [[ -z $PID ]]  /usr/sbin/sshd $SSHD_ARGS
+

[arch-commits] Commit in openssh/repos (10 files)

2011-10-17 Thread Gaetan Bisson 
Date: Monday, October 17, 2011 @ 08:35:05
  Author: bisson
Revision: 140605

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  openssh/repos/testing-i686/
  openssh/repos/testing-i686/PKGBUILD
(from rev 140604, openssh/trunk/PKGBUILD)
  openssh/repos/testing-i686/sshd
(from rev 140604, openssh/trunk/sshd)
  openssh/repos/testing-i686/sshd.confd
(from rev 140604, openssh/trunk/sshd.confd)
  openssh/repos/testing-i686/sshd.pam
(from rev 140604, openssh/trunk/sshd.pam)
  openssh/repos/testing-x86_64/
  openssh/repos/testing-x86_64/PKGBUILD
(from rev 140604, openssh/trunk/PKGBUILD)
  openssh/repos/testing-x86_64/sshd
(from rev 140604, openssh/trunk/sshd)
  openssh/repos/testing-x86_64/sshd.confd
(from rev 140604, openssh/trunk/sshd.confd)
  openssh/repos/testing-x86_64/sshd.pam
(from rev 140604, openssh/trunk/sshd.pam)

---+
 testing-i686/PKGBUILD |   67 
 testing-i686/sshd |   45 +
 testing-i686/sshd.confd   |4 ++
 testing-i686/sshd.pam |   11 +++
 testing-x86_64/PKGBUILD   |   67 
 testing-x86_64/sshd   |   45 +
 testing-x86_64/sshd.confd |4 ++
 testing-x86_64/sshd.pam   |   11 +++
 8 files changed, 254 insertions(+)

Copied: openssh/repos/testing-i686/PKGBUILD (from rev 140604, 
openssh/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-10-17 12:35:05 UTC (rev 140605)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Aaron Griffin aa...@archlinux.org
+# Contributor: judd jvi...@zeroflux.org
+
+pkgname=openssh
+pkgver=5.9p1
+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'
+'sshd')
+sha1sums=('ac4e0055421e9543f0af5da607a72cf5922dcc56'
+  'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
+  '07fecd5880b1c4fdd8c94ddb2e89ddce88effdc1'
+  '21fa88de6cc1c7912e71655f50896ba17991a1c2')
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+
+   ./configure \
+   --prefix=/usr \
+   --libexecdir=/usr/lib/ssh \
+   --sysconfdir=/etc/ssh \
+   --with-privsep-user=nobody \
+   --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
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install
+
+   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
+
+   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' \
+   -i ${pkgdir}/etc/ssh/sshd_config
+}

Copied: openssh/repos/testing-i686/sshd (from rev 140604, openssh/trunk/sshd)
===
--- testing-i686/sshd   (rev 0)
+++ testing-i686/sshd   2011-10-17 12:35:05 UTC (rev 140605)
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/sshd
+
+PIDFILE=/var/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
+   [[ -d /var/empty ]] || mkdir -p /var/empty
+   [[ -z $PID ]]  /usr/sbin/sshd $SSHD_ARGS
+

[arch-commits] Commit in openssh/repos (10 files)

2011-09-07 Thread Gaetan Bisson 
Date: Wednesday, September 7, 2011 @ 22:26:18
  Author: bisson
Revision: 137501

db-move: moved openssh from [testing] to [core] (i686)

Added:
  openssh/repos/core-i686/PKGBUILD
(from rev 137500, openssh/repos/testing-i686/PKGBUILD)
  openssh/repos/core-i686/sshd
(from rev 137500, openssh/repos/testing-i686/sshd)
  openssh/repos/core-i686/sshd.confd
(from rev 137500, openssh/repos/testing-i686/sshd.confd)
  openssh/repos/core-i686/sshd.pam
(from rev 137500, openssh/repos/testing-i686/sshd.pam)
Deleted:
  openssh/repos/core-i686/PKGBUILD
  openssh/repos/core-i686/authfile.c.patch
  openssh/repos/core-i686/sshd
  openssh/repos/core-i686/sshd.confd
  openssh/repos/core-i686/sshd.pam
  openssh/repos/testing-i686/

--+
 PKGBUILD |  136 +---
 authfile.c.patch |  198 -
 sshd |   93 
 sshd.confd   |8 +-
 sshd.pam |   22 ++---
 5 files changed, 126 insertions(+), 331 deletions(-)

Deleted: core-i686/PKGBUILD
===
--- core-i686/PKGBUILD  2011-09-08 00:49:17 UTC (rev 137500)
+++ core-i686/PKGBUILD  2011-09-08 02:26:18 UTC (rev 137501)
@@ -1,70 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson bis...@archlinux.org
-# Contributor: Aaron Griffin aa...@archlinux.org
-# Contributor: judd jvi...@zeroflux.org
-
-pkgname=openssh
-pkgver=5.8p2
-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=('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'
-  '07fecd5880b1c4fdd8c94ddb2e89ddce88effdc1'
-  '6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5')
-
-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 \
-   --sysconfdir=/etc/ssh \
-   --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
-
-   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
-
-   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 -i  -e '/^#ChallengeResponseAuthentication yes$/c 
ChallengeResponseAuthentication no' \
-   -e '/^#UsePAM no$/c UsePAM yes' \
-   ${pkgdir}/etc/ssh/sshd_config
-}

Copied: openssh/repos/core-i686/PKGBUILD (from rev 137500, 
openssh/repos/testing-i686/PKGBUILD)
===
--- core-i686/PKGBUILD  (rev 0)
+++ core-i686/PKGBUILD  2011-09-08 02:26:18 UTC (rev 137501)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Aaron Griffin aa...@archlinux.org
+# Contributor: judd jvi...@zeroflux.org
+
+pkgname=openssh
+pkgver=5.9p1
+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=('krb5' 'openssl' 'libedit')
+source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz;
+'sshd.confd'
+'sshd.pam'
+'sshd')
+sha1sums=('ac4e0055421e9543f0af5da607a72cf5922dcc56'
+

[arch-commits] Commit in openssh/repos (10 files)

2011-09-07 Thread Gaetan Bisson 
Date: Wednesday, September 7, 2011 @ 22:26:19
  Author: bisson
Revision: 137502

db-move: moved openssh from [testing] to [core] (x86_64)

Added:
  openssh/repos/core-x86_64/PKGBUILD
(from rev 137500, openssh/repos/testing-x86_64/PKGBUILD)
  openssh/repos/core-x86_64/sshd
(from rev 137500, openssh/repos/testing-x86_64/sshd)
  openssh/repos/core-x86_64/sshd.confd
(from rev 137500, openssh/repos/testing-x86_64/sshd.confd)
  openssh/repos/core-x86_64/sshd.pam
(from rev 137500, openssh/repos/testing-x86_64/sshd.pam)
Deleted:
  openssh/repos/core-x86_64/PKGBUILD
  openssh/repos/core-x86_64/authfile.c.patch
  openssh/repos/core-x86_64/sshd
  openssh/repos/core-x86_64/sshd.confd
  openssh/repos/core-x86_64/sshd.pam
  openssh/repos/testing-x86_64/

--+
 PKGBUILD |  136 +---
 authfile.c.patch |  198 -
 sshd |   93 
 sshd.confd   |8 +-
 sshd.pam |   22 ++---
 5 files changed, 126 insertions(+), 331 deletions(-)

Deleted: core-x86_64/PKGBUILD
===
--- core-x86_64/PKGBUILD2011-09-08 02:26:18 UTC (rev 137501)
+++ core-x86_64/PKGBUILD2011-09-08 02:26:19 UTC (rev 137502)
@@ -1,70 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson bis...@archlinux.org
-# Contributor: Aaron Griffin aa...@archlinux.org
-# Contributor: judd jvi...@zeroflux.org
-
-pkgname=openssh
-pkgver=5.8p2
-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=('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'
-  '07fecd5880b1c4fdd8c94ddb2e89ddce88effdc1'
-  '6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5')
-
-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 \
-   --sysconfdir=/etc/ssh \
-   --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
-
-   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
-
-   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 -i  -e '/^#ChallengeResponseAuthentication yes$/c 
ChallengeResponseAuthentication no' \
-   -e '/^#UsePAM no$/c UsePAM yes' \
-   ${pkgdir}/etc/ssh/sshd_config
-}

Copied: openssh/repos/core-x86_64/PKGBUILD (from rev 137500, 
openssh/repos/testing-x86_64/PKGBUILD)
===
--- core-x86_64/PKGBUILD(rev 0)
+++ core-x86_64/PKGBUILD2011-09-08 02:26:19 UTC (rev 137502)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Aaron Griffin aa...@archlinux.org
+# Contributor: judd jvi...@zeroflux.org
+
+pkgname=openssh
+pkgver=5.9p1
+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=('krb5' 'openssl' 'libedit')
+source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz;
+'sshd.confd'
+'sshd.pam'
+'sshd')

[arch-commits] Commit in openssh/repos (10 files)

2011-09-06 Thread Gaetan Bisson 
Date: Tuesday, September 6, 2011 @ 03:38:06
  Author: bisson
Revision: 137090

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  openssh/repos/testing-i686/
  openssh/repos/testing-i686/PKGBUILD
(from rev 137089, openssh/trunk/PKGBUILD)
  openssh/repos/testing-i686/sshd
(from rev 137089, openssh/trunk/sshd)
  openssh/repos/testing-i686/sshd.confd
(from rev 137089, openssh/trunk/sshd.confd)
  openssh/repos/testing-i686/sshd.pam
(from rev 137089, openssh/trunk/sshd.pam)
  openssh/repos/testing-x86_64/
  openssh/repos/testing-x86_64/PKGBUILD
(from rev 137089, openssh/trunk/PKGBUILD)
  openssh/repos/testing-x86_64/sshd
(from rev 137089, openssh/trunk/sshd)
  openssh/repos/testing-x86_64/sshd.confd
(from rev 137089, openssh/trunk/sshd.confd)
  openssh/repos/testing-x86_64/sshd.pam
(from rev 137089, openssh/trunk/sshd.pam)

---+
 testing-i686/PKGBUILD |   66 
 testing-i686/sshd |   45 ++
 testing-i686/sshd.confd   |4 ++
 testing-i686/sshd.pam |   11 +++
 testing-x86_64/PKGBUILD   |   66 
 testing-x86_64/sshd   |   45 ++
 testing-x86_64/sshd.confd |4 ++
 testing-x86_64/sshd.pam   |   11 +++
 8 files changed, 252 insertions(+)

Copied: openssh/repos/testing-i686/PKGBUILD (from rev 137089, 
openssh/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-09-06 07:38:06 UTC (rev 137090)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Aaron Griffin aa...@archlinux.org
+# Contributor: judd jvi...@zeroflux.org
+
+pkgname=openssh
+pkgver=5.9p1
+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=('krb5' 'openssl' 'libedit')
+source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz;
+'sshd.confd'
+'sshd.pam'
+'sshd')
+sha1sums=('be8878869bb80ce12ca79282768ffa73cc3f05fc'
+  'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
+  '07fecd5880b1c4fdd8c94ddb2e89ddce88effdc1'
+  '038213716d553363b5469eae972f15c1c5a579db')
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+
+   ./configure \
+   --prefix=/usr \
+   --libexecdir=/usr/lib/ssh \
+   --sysconfdir=/etc/ssh \
+   --with-privsep-user=nobody \
+   --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
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install
+
+   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
+
+   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' \
+   -i ${pkgdir}/etc/ssh/sshd_config
+}

Copied: openssh/repos/testing-i686/sshd (from rev 137089, openssh/trunk/sshd)
===
--- testing-i686/sshd   (rev 0)
+++ testing-i686/sshd   2011-09-06 07:38:06 UTC (rev 137090)
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/sshd
+
+PIDFILE=/var/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'
+   ssh-keygen -A
+   [[ -d /var/empty ]] || mkdir -p /var/empty
+   [[ -z $PID ]]  /usr/sbin/sshd $SSHD_ARGS
+   if [[ $? -gt 0 ]]; then
+   stat_fail
+

[arch-commits] Commit in openssh/repos (10 files)

2011-09-06 Thread Gaetan Bisson 
Date: Tuesday, September 6, 2011 @ 04:00:39
  Author: bisson
Revision: 137094

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  openssh/repos/testing-i686/
  openssh/repos/testing-i686/PKGBUILD
(from rev 137093, openssh/trunk/PKGBUILD)
  openssh/repos/testing-i686/sshd
(from rev 137093, openssh/trunk/sshd)
  openssh/repos/testing-i686/sshd.confd
(from rev 137093, openssh/trunk/sshd.confd)
  openssh/repos/testing-i686/sshd.pam
(from rev 137093, openssh/trunk/sshd.pam)
  openssh/repos/testing-x86_64/
  openssh/repos/testing-x86_64/PKGBUILD
(from rev 137093, openssh/trunk/PKGBUILD)
  openssh/repos/testing-x86_64/sshd
(from rev 137093, openssh/trunk/sshd)
  openssh/repos/testing-x86_64/sshd.confd
(from rev 137093, openssh/trunk/sshd.confd)
  openssh/repos/testing-x86_64/sshd.pam
(from rev 137093, openssh/trunk/sshd.pam)

---+
 testing-i686/PKGBUILD |   66 
 testing-i686/sshd |   45 ++
 testing-i686/sshd.confd   |4 ++
 testing-i686/sshd.pam |   11 +++
 testing-x86_64/PKGBUILD   |   66 
 testing-x86_64/sshd   |   45 ++
 testing-x86_64/sshd.confd |4 ++
 testing-x86_64/sshd.pam   |   11 +++
 8 files changed, 252 insertions(+)

Copied: openssh/repos/testing-i686/PKGBUILD (from rev 137093, 
openssh/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-09-06 08:00:39 UTC (rev 137094)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Aaron Griffin aa...@archlinux.org
+# Contributor: judd jvi...@zeroflux.org
+
+pkgname=openssh
+pkgver=5.9p1
+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=('krb5' 'openssl' 'libedit')
+source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz;
+'sshd.confd'
+'sshd.pam'
+'sshd')
+sha1sums=('be8878869bb80ce12ca79282768ffa73cc3f05fc'
+  'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
+  '07fecd5880b1c4fdd8c94ddb2e89ddce88effdc1'
+  '21fa88de6cc1c7912e71655f50896ba17991a1c2')
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+
+   ./configure \
+   --prefix=/usr \
+   --libexecdir=/usr/lib/ssh \
+   --sysconfdir=/etc/ssh \
+   --with-privsep-user=nobody \
+   --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
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install
+
+   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
+
+   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' \
+   -i ${pkgdir}/etc/ssh/sshd_config
+}

Copied: openssh/repos/testing-i686/sshd (from rev 137093, openssh/trunk/sshd)
===
--- testing-i686/sshd   (rev 0)
+++ testing-i686/sshd   2011-09-06 08:00:39 UTC (rev 137094)
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/sshd
+
+PIDFILE=/var/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
+   [[ -d /var/empty ]] || mkdir -p /var/empty
+   [[ -z $PID ]]  /usr/sbin/sshd $SSHD_ARGS
+   if [[ $? -gt 0 ]]; then
+   stat_fail
+