Date: Thursday, January 30, 2014 @ 08:21:23
  Author: bisson
Revision: 204877

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

Added:
  openssh/repos/testing-i686/
  openssh/repos/testing-i686/PKGBUILD
    (from rev 204876, openssh/trunk/PKGBUILD)
  openssh/repos/testing-i686/install
    (from rev 204876, openssh/trunk/install)
  openssh/repos/testing-i686/sshd.pam
    (from rev 204876, openssh/trunk/sshd.pam)
  openssh/repos/testing-i686/sshd.service
    (from rev 204876, openssh/trunk/sshd.service)
  openssh/repos/testing-i686/sshd.socket
    (from rev 204876, openssh/trunk/sshd.socket)
  openssh/repos/testing-i686/sshd@.service
    (from rev 204876, openssh/trunk/sshd@.service)
  openssh/repos/testing-i686/sshdgenkeys.service
    (from rev 204876, openssh/trunk/sshdgenkeys.service)
  openssh/repos/testing-x86_64/
  openssh/repos/testing-x86_64/PKGBUILD
    (from rev 204876, openssh/trunk/PKGBUILD)
  openssh/repos/testing-x86_64/install
    (from rev 204876, openssh/trunk/install)
  openssh/repos/testing-x86_64/sshd.pam
    (from rev 204876, openssh/trunk/sshd.pam)
  openssh/repos/testing-x86_64/sshd.service
    (from rev 204876, openssh/trunk/sshd.service)
  openssh/repos/testing-x86_64/sshd.socket
    (from rev 204876, openssh/trunk/sshd.socket)
  openssh/repos/testing-x86_64/sshd@.service
    (from rev 204876, openssh/trunk/sshd@.service)
  openssh/repos/testing-x86_64/sshdgenkeys.service
    (from rev 204876, openssh/trunk/sshdgenkeys.service)

------------------------------------+
 testing-i686/PKGBUILD              |   88 +++++++++++++++++++++++++++++++++++
 testing-i686/install               |   10 +++
 testing-i686/sshd.pam              |    6 ++
 testing-i686/sshd.service          |   17 ++++++
 testing-i686/sshd.socket           |   10 +++
 testing-i686/sshd@.service         |    8 +++
 testing-i686/sshdgenkeys.service   |   17 ++++++
 testing-x86_64/PKGBUILD            |   88 +++++++++++++++++++++++++++++++++++
 testing-x86_64/install             |   10 +++
 testing-x86_64/sshd.pam            |    6 ++
 testing-x86_64/sshd.service        |   17 ++++++
 testing-x86_64/sshd.socket         |   10 +++
 testing-x86_64/sshd@.service       |    8 +++
 testing-x86_64/sshdgenkeys.service |   17 ++++++
 14 files changed, 312 insertions(+)

Copied: openssh/repos/testing-i686/PKGBUILD (from rev 204876, 
openssh/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD                               (rev 0)
+++ testing-i686/PKGBUILD       2014-01-30 07:21:23 UTC (rev 204877)
@@ -0,0 +1,88 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+# Contributor: Aaron Griffin <aa...@archlinux.org>
+# Contributor: judd <jvi...@zeroflux.org>
+
+pkgname=openssh
+pkgver=6.5p1
+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')
+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=('3363a72b4fee91b29cf2024ff633c17f6cd2f86d' 'SKIP'
+          'cc1ceec606c98c7407e7ac21ade23aed81e31405'
+          '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
+          'ec49c6beba923e201505f5669cea48cad29014db'
+          'e12fa910b26a5634e5a6ac39ce1399a132cf6796'
+          'd93dca5ebda4610ff7647187f8928a3de28703f3')
+
+backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
+
+install=install
+
+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-mantype=man \
+               --with-md5-passwords \
+               --with-pid-dir=/run \
+
+       make
+}
+
+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.
+}
+
+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 
"${pkgdir}"/usr/lib/systemd/system/sshd.service
+       install -Dm644 ../sshd.socket 
"${pkgdir}"/usr/lib/systemd/system/sshd.socket
+       install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd
+
+       install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh
+       install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id
+       install -Dm644 contrib/ssh-copy-id.1 
"${pkgdir}"/usr/share/man/man1/ssh-copy-id.1
+
+       sed \
+               -e '/^#ChallengeResponseAuthentication yes$/c 
ChallengeResponseAuthentication no' \
+               -e '/^#PrintMotd yes$/c PrintMotd no # pam does that' \
+               -e '/^#UsePAM no$/c UsePAM yes' \
+               -i "${pkgdir}"/etc/ssh/sshd_config
+}

Copied: openssh/repos/testing-i686/install (from rev 204876, 
openssh/trunk/install)
===================================================================
--- testing-i686/install                                (rev 0)
+++ testing-i686/install        2014-01-30 07:21:23 UTC (rev 204877)
@@ -0,0 +1,10 @@
+post_upgrade() {
+       if [[ $(vercmp $2 6.2p2) = -1 ]]; then
+               cat <<EOF
+
+==> The sshd daemon has been moved to /usr/bin alongside all binaries.
+==> Please update this path in your scripts if applicable.
+
+EOF
+       fi
+}

Copied: openssh/repos/testing-i686/sshd.pam (from rev 204876, 
openssh/trunk/sshd.pam)
===================================================================
--- testing-i686/sshd.pam                               (rev 0)
+++ testing-i686/sshd.pam       2014-01-30 07:21:23 UTC (rev 204877)
@@ -0,0 +1,6 @@
+#%PAM-1.0
+#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

Copied: openssh/repos/testing-i686/sshd.service (from rev 204876, 
openssh/trunk/sshd.service)
===================================================================
--- testing-i686/sshd.service                           (rev 0)
+++ testing-i686/sshd.service   2014-01-30 07:21:23 UTC (rev 204877)
@@ -0,0 +1,17 @@
+[Unit]
+Description=OpenSSH Daemon
+Wants=sshdgenkeys.service
+After=sshdgenkeys.service
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/sshd -D
+ExecReload=/bin/kill -HUP $MAINPID
+KillMode=process
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+
+# 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.

Copied: openssh/repos/testing-i686/sshd.socket (from rev 204876, 
openssh/trunk/sshd.socket)
===================================================================
--- testing-i686/sshd.socket                            (rev 0)
+++ testing-i686/sshd.socket    2014-01-30 07:21:23 UTC (rev 204877)
@@ -0,0 +1,10 @@
+[Unit]
+Conflicts=sshd.service
+Wants=sshdgenkeys.service
+
+[Socket]
+ListenStream=22
+Accept=yes
+
+[Install]
+WantedBy=sockets.target

Copied: openssh/repos/testing-i686/sshd@.service (from rev 204876, 
openssh/trunk/sshd@.service)
===================================================================
--- testing-i686/sshd@.service                          (rev 0)
+++ testing-i686/sshd@.service  2014-01-30 07:21:23 UTC (rev 204877)
@@ -0,0 +1,8 @@
+[Unit]
+Description=OpenSSH Per-Connection Daemon
+After=sshdgenkeys.service
+
+[Service]
+ExecStart=-/usr/bin/sshd -i
+StandardInput=socket
+StandardError=syslog

Copied: openssh/repos/testing-i686/sshdgenkeys.service (from rev 204876, 
openssh/trunk/sshdgenkeys.service)
===================================================================
--- testing-i686/sshdgenkeys.service                            (rev 0)
+++ testing-i686/sshdgenkeys.service    2014-01-30 07:21:23 UTC (rev 204877)
@@ -0,0 +1,17 @@
+[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
+ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub
+ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key
+ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key.pub
+
+[Service]
+ExecStart=/usr/bin/ssh-keygen -A
+Type=oneshot
+RemainAfterExit=yes

Copied: openssh/repos/testing-x86_64/PKGBUILD (from rev 204876, 
openssh/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD                             (rev 0)
+++ testing-x86_64/PKGBUILD     2014-01-30 07:21:23 UTC (rev 204877)
@@ -0,0 +1,88 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+# Contributor: Aaron Griffin <aa...@archlinux.org>
+# Contributor: judd <jvi...@zeroflux.org>
+
+pkgname=openssh
+pkgver=6.5p1
+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')
+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=('3363a72b4fee91b29cf2024ff633c17f6cd2f86d' 'SKIP'
+          'cc1ceec606c98c7407e7ac21ade23aed81e31405'
+          '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
+          'ec49c6beba923e201505f5669cea48cad29014db'
+          'e12fa910b26a5634e5a6ac39ce1399a132cf6796'
+          'd93dca5ebda4610ff7647187f8928a3de28703f3')
+
+backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
+
+install=install
+
+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-mantype=man \
+               --with-md5-passwords \
+               --with-pid-dir=/run \
+
+       make
+}
+
+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.
+}
+
+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 
"${pkgdir}"/usr/lib/systemd/system/sshd.service
+       install -Dm644 ../sshd.socket 
"${pkgdir}"/usr/lib/systemd/system/sshd.socket
+       install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd
+
+       install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh
+       install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id
+       install -Dm644 contrib/ssh-copy-id.1 
"${pkgdir}"/usr/share/man/man1/ssh-copy-id.1
+
+       sed \
+               -e '/^#ChallengeResponseAuthentication yes$/c 
ChallengeResponseAuthentication no' \
+               -e '/^#PrintMotd yes$/c PrintMotd no # pam does that' \
+               -e '/^#UsePAM no$/c UsePAM yes' \
+               -i "${pkgdir}"/etc/ssh/sshd_config
+}

Copied: openssh/repos/testing-x86_64/install (from rev 204876, 
openssh/trunk/install)
===================================================================
--- testing-x86_64/install                              (rev 0)
+++ testing-x86_64/install      2014-01-30 07:21:23 UTC (rev 204877)
@@ -0,0 +1,10 @@
+post_upgrade() {
+       if [[ $(vercmp $2 6.2p2) = -1 ]]; then
+               cat <<EOF
+
+==> The sshd daemon has been moved to /usr/bin alongside all binaries.
+==> Please update this path in your scripts if applicable.
+
+EOF
+       fi
+}

Copied: openssh/repos/testing-x86_64/sshd.pam (from rev 204876, 
openssh/trunk/sshd.pam)
===================================================================
--- testing-x86_64/sshd.pam                             (rev 0)
+++ testing-x86_64/sshd.pam     2014-01-30 07:21:23 UTC (rev 204877)
@@ -0,0 +1,6 @@
+#%PAM-1.0
+#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

Copied: openssh/repos/testing-x86_64/sshd.service (from rev 204876, 
openssh/trunk/sshd.service)
===================================================================
--- testing-x86_64/sshd.service                         (rev 0)
+++ testing-x86_64/sshd.service 2014-01-30 07:21:23 UTC (rev 204877)
@@ -0,0 +1,17 @@
+[Unit]
+Description=OpenSSH Daemon
+Wants=sshdgenkeys.service
+After=sshdgenkeys.service
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/sshd -D
+ExecReload=/bin/kill -HUP $MAINPID
+KillMode=process
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+
+# 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.

Copied: openssh/repos/testing-x86_64/sshd.socket (from rev 204876, 
openssh/trunk/sshd.socket)
===================================================================
--- testing-x86_64/sshd.socket                          (rev 0)
+++ testing-x86_64/sshd.socket  2014-01-30 07:21:23 UTC (rev 204877)
@@ -0,0 +1,10 @@
+[Unit]
+Conflicts=sshd.service
+Wants=sshdgenkeys.service
+
+[Socket]
+ListenStream=22
+Accept=yes
+
+[Install]
+WantedBy=sockets.target

Copied: openssh/repos/testing-x86_64/sshd@.service (from rev 204876, 
openssh/trunk/sshd@.service)
===================================================================
--- testing-x86_64/sshd@.service                                (rev 0)
+++ testing-x86_64/sshd@.service        2014-01-30 07:21:23 UTC (rev 204877)
@@ -0,0 +1,8 @@
+[Unit]
+Description=OpenSSH Per-Connection Daemon
+After=sshdgenkeys.service
+
+[Service]
+ExecStart=-/usr/bin/sshd -i
+StandardInput=socket
+StandardError=syslog

Copied: openssh/repos/testing-x86_64/sshdgenkeys.service (from rev 204876, 
openssh/trunk/sshdgenkeys.service)
===================================================================
--- testing-x86_64/sshdgenkeys.service                          (rev 0)
+++ testing-x86_64/sshdgenkeys.service  2014-01-30 07:21:23 UTC (rev 204877)
@@ -0,0 +1,17 @@
+[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
+ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub
+ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key
+ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key.pub
+
+[Service]
+ExecStart=/usr/bin/ssh-keygen -A
+Type=oneshot
+RemainAfterExit=yes

Reply via email to