Date: Friday, November 8, 2013 @ 17:53:32 Author: bisson Revision: 199078
db-move: moved openssh from [testing] to [core] (i686, x86_64) Added: openssh/repos/core-i686/PKGBUILD (from rev 199077, openssh/repos/testing-i686/PKGBUILD) openssh/repos/core-i686/install (from rev 199077, openssh/repos/testing-i686/install) openssh/repos/core-i686/sshd.pam (from rev 199077, openssh/repos/testing-i686/sshd.pam) openssh/repos/core-i686/sshd.service (from rev 199077, openssh/repos/testing-i686/sshd.service) openssh/repos/core-i686/sshd.socket (from rev 199077, openssh/repos/testing-i686/sshd.socket) openssh/repos/core-i686/sshd@.service (from rev 199077, openssh/repos/testing-i686/sshd@.service) openssh/repos/core-i686/sshdgenkeys.service (from rev 199077, openssh/repos/testing-i686/sshdgenkeys.service) openssh/repos/core-x86_64/PKGBUILD (from rev 199077, openssh/repos/testing-x86_64/PKGBUILD) openssh/repos/core-x86_64/install (from rev 199077, openssh/repos/testing-x86_64/install) openssh/repos/core-x86_64/sshd.pam (from rev 199077, openssh/repos/testing-x86_64/sshd.pam) openssh/repos/core-x86_64/sshd.service (from rev 199077, openssh/repos/testing-x86_64/sshd.service) openssh/repos/core-x86_64/sshd.socket (from rev 199077, openssh/repos/testing-x86_64/sshd.socket) openssh/repos/core-x86_64/sshd@.service (from rev 199077, openssh/repos/testing-x86_64/sshd@.service) openssh/repos/core-x86_64/sshdgenkeys.service (from rev 199077, openssh/repos/testing-x86_64/sshdgenkeys.service) Deleted: openssh/repos/core-i686/PKGBUILD openssh/repos/core-i686/install openssh/repos/core-i686/sshd.pam openssh/repos/core-i686/sshd.service openssh/repos/core-i686/sshd.socket openssh/repos/core-i686/sshd@.service openssh/repos/core-i686/sshdgenkeys.service openssh/repos/core-x86_64/PKGBUILD openssh/repos/core-x86_64/install openssh/repos/core-x86_64/sshd.pam openssh/repos/core-x86_64/sshd.service openssh/repos/core-x86_64/sshd.socket openssh/repos/core-x86_64/sshd@.service openssh/repos/core-x86_64/sshdgenkeys.service openssh/repos/testing-i686/ openssh/repos/testing-x86_64/ ---------------------------------+ /PKGBUILD | 174 ++++++++++++++++++++++++++++++++++++++ /install | 20 ++++ /sshd.pam | 12 ++ /sshd.service | 34 +++++++ /sshd.socket | 20 ++++ /sshd@.service | 16 +++ /sshdgenkeys.service | 30 ++++++ core-i686/PKGBUILD | 87 ------------------- core-i686/install | 10 -- core-i686/sshd.pam | 6 - core-i686/sshd.service | 17 --- core-i686/sshd.socket | 10 -- core-i686/sshd@.service | 8 - core-i686/sshdgenkeys.service | 15 --- core-x86_64/PKGBUILD | 87 ------------------- core-x86_64/install | 10 -- core-x86_64/sshd.pam | 6 - core-x86_64/sshd.service | 17 --- core-x86_64/sshd.socket | 10 -- core-x86_64/sshd@.service | 8 - core-x86_64/sshdgenkeys.service | 15 --- 21 files changed, 306 insertions(+), 306 deletions(-) Deleted: core-i686/PKGBUILD =================================================================== --- core-i686/PKGBUILD 2013-11-08 16:07:36 UTC (rev 199077) +++ core-i686/PKGBUILD 2013-11-08 16:53:32 UTC (rev 199078) @@ -1,87 +0,0 @@ -# $Id$ -# Maintainer: Gaetan Bisson <bis...@archlinux.org> -# Contributor: Aaron Griffin <aa...@archlinux.org> -# Contributor: judd <jvi...@zeroflux.org> - -pkgname=openssh -pkgver=6.3p1 -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" - 'sshdgenkeys.service' - 'sshd@.service' - 'sshd.service' - 'sshd.socket' - 'sshd.pam') -sha1sums=('70845ca79474258cab29dbefae13d93e41a83ccb' - '6df5be396f8c593bb511a249a1453294d18a01a6' - '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 || - grep $USER /etc/passwd | grep -q /bin/false - # connect.sh fails when run with stupid login shell -} - -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/core-i686/PKGBUILD (from rev 199077, openssh/repos/testing-i686/PKGBUILD) =================================================================== --- core-i686/PKGBUILD (rev 0) +++ core-i686/PKGBUILD 2013-11-08 16:53:32 UTC (rev 199078) @@ -0,0 +1,87 @@ +# $Id$ +# Maintainer: Gaetan Bisson <bis...@archlinux.org> +# Contributor: Aaron Griffin <aa...@archlinux.org> +# Contributor: judd <jvi...@zeroflux.org> + +pkgname=openssh +pkgver=6.4p1 +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" + 'sshdgenkeys.service' + 'sshd@.service' + 'sshd.service' + 'sshd.socket' + 'sshd.pam') +sha1sums=('cf5fe0eb118d7e4f9296fbc5d6884965885fc55d' + '6df5be396f8c593bb511a249a1453294d18a01a6' + '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 || + grep $USER /etc/passwd | grep -q /bin/false + # connect.sh fails when run with stupid login shell +} + +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 +} Deleted: core-i686/install =================================================================== --- core-i686/install 2013-11-08 16:07:36 UTC (rev 199077) +++ core-i686/install 2013-11-08 16:53:32 UTC (rev 199078) @@ -1,10 +0,0 @@ -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/core-i686/install (from rev 199077, openssh/repos/testing-i686/install) =================================================================== --- core-i686/install (rev 0) +++ core-i686/install 2013-11-08 16:53:32 UTC (rev 199078) @@ -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 +} Deleted: core-i686/sshd.pam =================================================================== --- core-i686/sshd.pam 2013-11-08 16:07:36 UTC (rev 199077) +++ core-i686/sshd.pam 2013-11-08 16:53:32 UTC (rev 199078) @@ -1,6 +0,0 @@ -#%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/core-i686/sshd.pam (from rev 199077, openssh/repos/testing-i686/sshd.pam) =================================================================== --- core-i686/sshd.pam (rev 0) +++ core-i686/sshd.pam 2013-11-08 16:53:32 UTC (rev 199078) @@ -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 Deleted: core-i686/sshd.service =================================================================== --- core-i686/sshd.service 2013-11-08 16:07:36 UTC (rev 199077) +++ core-i686/sshd.service 2013-11-08 16:53:32 UTC (rev 199078) @@ -1,17 +0,0 @@ -[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/core-i686/sshd.service (from rev 199077, openssh/repos/testing-i686/sshd.service) =================================================================== --- core-i686/sshd.service (rev 0) +++ core-i686/sshd.service 2013-11-08 16:53:32 UTC (rev 199078) @@ -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. Deleted: core-i686/sshd.socket =================================================================== --- core-i686/sshd.socket 2013-11-08 16:07:36 UTC (rev 199077) +++ core-i686/sshd.socket 2013-11-08 16:53:32 UTC (rev 199078) @@ -1,10 +0,0 @@ -[Unit] -Conflicts=sshd.service -Wants=sshdgenkeys.service - -[Socket] -ListenStream=22 -Accept=yes - -[Install] -WantedBy=sockets.target Copied: openssh/repos/core-i686/sshd.socket (from rev 199077, openssh/repos/testing-i686/sshd.socket) =================================================================== --- core-i686/sshd.socket (rev 0) +++ core-i686/sshd.socket 2013-11-08 16:53:32 UTC (rev 199078) @@ -0,0 +1,10 @@ +[Unit] +Conflicts=sshd.service +Wants=sshdgenkeys.service + +[Socket] +ListenStream=22 +Accept=yes + +[Install] +WantedBy=sockets.target Deleted: core-i686/sshd@.service =================================================================== --- core-i686/sshd@.service 2013-11-08 16:07:36 UTC (rev 199077) +++ core-i686/sshd@.service 2013-11-08 16:53:32 UTC (rev 199078) @@ -1,8 +0,0 @@ -[Unit] -Description=OpenSSH Per-Connection Daemon -After=sshdgenkeys.service - -[Service] -ExecStart=-/usr/bin/sshd -i -StandardInput=socket -StandardError=syslog Copied: openssh/repos/core-i686/sshd@.service (from rev 199077, openssh/repos/testing-i686/sshd@.service) =================================================================== --- core-i686/sshd@.service (rev 0) +++ core-i686/sshd@.service 2013-11-08 16:53:32 UTC (rev 199078) @@ -0,0 +1,8 @@ +[Unit] +Description=OpenSSH Per-Connection Daemon +After=sshdgenkeys.service + +[Service] +ExecStart=-/usr/bin/sshd -i +StandardInput=socket +StandardError=syslog Deleted: core-i686/sshdgenkeys.service =================================================================== --- core-i686/sshdgenkeys.service 2013-11-08 16:07:36 UTC (rev 199077) +++ core-i686/sshdgenkeys.service 2013-11-08 16:53:32 UTC (rev 199078) @@ -1,15 +0,0 @@ -[Unit] -Description=SSH Key Generation -ConditionPathExists=|!/etc/ssh/ssh_host_key -ConditionPathExists=|!/etc/ssh/ssh_host_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 - -[Service] -ExecStart=/usr/bin/ssh-keygen -A -Type=oneshot -RemainAfterExit=yes Copied: openssh/repos/core-i686/sshdgenkeys.service (from rev 199077, openssh/repos/testing-i686/sshdgenkeys.service) =================================================================== --- core-i686/sshdgenkeys.service (rev 0) +++ core-i686/sshdgenkeys.service 2013-11-08 16:53:32 UTC (rev 199078) @@ -0,0 +1,15 @@ +[Unit] +Description=SSH Key Generation +ConditionPathExists=|!/etc/ssh/ssh_host_key +ConditionPathExists=|!/etc/ssh/ssh_host_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 + +[Service] +ExecStart=/usr/bin/ssh-keygen -A +Type=oneshot +RemainAfterExit=yes Deleted: core-x86_64/PKGBUILD =================================================================== --- core-x86_64/PKGBUILD 2013-11-08 16:07:36 UTC (rev 199077) +++ core-x86_64/PKGBUILD 2013-11-08 16:53:32 UTC (rev 199078) @@ -1,87 +0,0 @@ -# $Id$ -# Maintainer: Gaetan Bisson <bis...@archlinux.org> -# Contributor: Aaron Griffin <aa...@archlinux.org> -# Contributor: judd <jvi...@zeroflux.org> - -pkgname=openssh -pkgver=6.3p1 -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" - 'sshdgenkeys.service' - 'sshd@.service' - 'sshd.service' - 'sshd.socket' - 'sshd.pam') -sha1sums=('70845ca79474258cab29dbefae13d93e41a83ccb' - '6df5be396f8c593bb511a249a1453294d18a01a6' - '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 || - grep $USER /etc/passwd | grep -q /bin/false - # connect.sh fails when run with stupid login shell -} - -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/core-x86_64/PKGBUILD (from rev 199077, openssh/repos/testing-x86_64/PKGBUILD) =================================================================== --- core-x86_64/PKGBUILD (rev 0) +++ core-x86_64/PKGBUILD 2013-11-08 16:53:32 UTC (rev 199078) @@ -0,0 +1,87 @@ +# $Id$ +# Maintainer: Gaetan Bisson <bis...@archlinux.org> +# Contributor: Aaron Griffin <aa...@archlinux.org> +# Contributor: judd <jvi...@zeroflux.org> + +pkgname=openssh +pkgver=6.4p1 +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" + 'sshdgenkeys.service' + 'sshd@.service' + 'sshd.service' + 'sshd.socket' + 'sshd.pam') +sha1sums=('cf5fe0eb118d7e4f9296fbc5d6884965885fc55d' + '6df5be396f8c593bb511a249a1453294d18a01a6' + '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 || + grep $USER /etc/passwd | grep -q /bin/false + # connect.sh fails when run with stupid login shell +} + +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 +} Deleted: core-x86_64/install =================================================================== --- core-x86_64/install 2013-11-08 16:07:36 UTC (rev 199077) +++ core-x86_64/install 2013-11-08 16:53:32 UTC (rev 199078) @@ -1,10 +0,0 @@ -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/core-x86_64/install (from rev 199077, openssh/repos/testing-x86_64/install) =================================================================== --- core-x86_64/install (rev 0) +++ core-x86_64/install 2013-11-08 16:53:32 UTC (rev 199078) @@ -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 +} Deleted: core-x86_64/sshd.pam =================================================================== --- core-x86_64/sshd.pam 2013-11-08 16:07:36 UTC (rev 199077) +++ core-x86_64/sshd.pam 2013-11-08 16:53:32 UTC (rev 199078) @@ -1,6 +0,0 @@ -#%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/core-x86_64/sshd.pam (from rev 199077, openssh/repos/testing-x86_64/sshd.pam) =================================================================== --- core-x86_64/sshd.pam (rev 0) +++ core-x86_64/sshd.pam 2013-11-08 16:53:32 UTC (rev 199078) @@ -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 Deleted: core-x86_64/sshd.service =================================================================== --- core-x86_64/sshd.service 2013-11-08 16:07:36 UTC (rev 199077) +++ core-x86_64/sshd.service 2013-11-08 16:53:32 UTC (rev 199078) @@ -1,17 +0,0 @@ -[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/core-x86_64/sshd.service (from rev 199077, openssh/repos/testing-x86_64/sshd.service) =================================================================== --- core-x86_64/sshd.service (rev 0) +++ core-x86_64/sshd.service 2013-11-08 16:53:32 UTC (rev 199078) @@ -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. Deleted: core-x86_64/sshd.socket =================================================================== --- core-x86_64/sshd.socket 2013-11-08 16:07:36 UTC (rev 199077) +++ core-x86_64/sshd.socket 2013-11-08 16:53:32 UTC (rev 199078) @@ -1,10 +0,0 @@ -[Unit] -Conflicts=sshd.service -Wants=sshdgenkeys.service - -[Socket] -ListenStream=22 -Accept=yes - -[Install] -WantedBy=sockets.target Copied: openssh/repos/core-x86_64/sshd.socket (from rev 199077, openssh/repos/testing-x86_64/sshd.socket) =================================================================== --- core-x86_64/sshd.socket (rev 0) +++ core-x86_64/sshd.socket 2013-11-08 16:53:32 UTC (rev 199078) @@ -0,0 +1,10 @@ +[Unit] +Conflicts=sshd.service +Wants=sshdgenkeys.service + +[Socket] +ListenStream=22 +Accept=yes + +[Install] +WantedBy=sockets.target Deleted: core-x86_64/sshd@.service =================================================================== --- core-x86_64/sshd@.service 2013-11-08 16:07:36 UTC (rev 199077) +++ core-x86_64/sshd@.service 2013-11-08 16:53:32 UTC (rev 199078) @@ -1,8 +0,0 @@ -[Unit] -Description=OpenSSH Per-Connection Daemon -After=sshdgenkeys.service - -[Service] -ExecStart=-/usr/bin/sshd -i -StandardInput=socket -StandardError=syslog Copied: openssh/repos/core-x86_64/sshd@.service (from rev 199077, openssh/repos/testing-x86_64/sshd@.service) =================================================================== --- core-x86_64/sshd@.service (rev 0) +++ core-x86_64/sshd@.service 2013-11-08 16:53:32 UTC (rev 199078) @@ -0,0 +1,8 @@ +[Unit] +Description=OpenSSH Per-Connection Daemon +After=sshdgenkeys.service + +[Service] +ExecStart=-/usr/bin/sshd -i +StandardInput=socket +StandardError=syslog Deleted: core-x86_64/sshdgenkeys.service =================================================================== --- core-x86_64/sshdgenkeys.service 2013-11-08 16:07:36 UTC (rev 199077) +++ core-x86_64/sshdgenkeys.service 2013-11-08 16:53:32 UTC (rev 199078) @@ -1,15 +0,0 @@ -[Unit] -Description=SSH Key Generation -ConditionPathExists=|!/etc/ssh/ssh_host_key -ConditionPathExists=|!/etc/ssh/ssh_host_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 - -[Service] -ExecStart=/usr/bin/ssh-keygen -A -Type=oneshot -RemainAfterExit=yes Copied: openssh/repos/core-x86_64/sshdgenkeys.service (from rev 199077, openssh/repos/testing-x86_64/sshdgenkeys.service) =================================================================== --- core-x86_64/sshdgenkeys.service (rev 0) +++ core-x86_64/sshdgenkeys.service 2013-11-08 16:53:32 UTC (rev 199078) @@ -0,0 +1,15 @@ +[Unit] +Description=SSH Key Generation +ConditionPathExists=|!/etc/ssh/ssh_host_key +ConditionPathExists=|!/etc/ssh/ssh_host_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 + +[Service] +ExecStart=/usr/bin/ssh-keygen -A +Type=oneshot +RemainAfterExit=yes