Date: Sunday, June 10, 2012 @ 09:15:07 Author: bluewind Revision: 161378
archrelease: copy trunk to staging-i686, staging-x86_64 Deleted: openssh/repos/staging-i686/PKGBUILD openssh/repos/staging-i686/sshd openssh/repos/staging-i686/sshd.close-sessions openssh/repos/staging-i686/sshd.confd openssh/repos/staging-i686/sshd.pam openssh/repos/staging-i686/sshd.service openssh/repos/staging-i686/sshd.socket openssh/repos/staging-i686/sshdgenkeys.service openssh/repos/staging-i686/tmpfiles.d openssh/repos/staging-x86_64/PKGBUILD openssh/repos/staging-x86_64/sshd openssh/repos/staging-x86_64/sshd.close-sessions openssh/repos/staging-x86_64/sshd.confd openssh/repos/staging-x86_64/sshd.pam openssh/repos/staging-x86_64/sshd.service openssh/repos/staging-x86_64/sshd.socket openssh/repos/staging-x86_64/sshdgenkeys.service openssh/repos/staging-x86_64/tmpfiles.d ------------------------------------+ staging-i686/PKGBUILD | 96 ----------------------------------- staging-i686/sshd | 45 ---------------- staging-i686/sshd.close-sessions | 17 ------ staging-i686/sshd.confd | 4 - staging-i686/sshd.pam | 13 ---- staging-i686/sshd.service | 19 ------ staging-i686/sshd.socket | 10 --- staging-i686/sshdgenkeys.service | 18 ------ staging-i686/tmpfiles.d | 1 staging-x86_64/PKGBUILD | 96 ----------------------------------- staging-x86_64/sshd | 45 ---------------- staging-x86_64/sshd.close-sessions | 17 ------ staging-x86_64/sshd.confd | 4 - staging-x86_64/sshd.pam | 13 ---- staging-x86_64/sshd.service | 19 ------ staging-x86_64/sshd.socket | 10 --- staging-x86_64/sshdgenkeys.service | 18 ------ staging-x86_64/tmpfiles.d | 1 18 files changed, 446 deletions(-) Deleted: staging-i686/PKGBUILD =================================================================== --- staging-i686/PKGBUILD 2012-06-10 13:13:03 UTC (rev 161377) +++ staging-i686/PKGBUILD 2012-06-10 13:15:07 UTC (rev 161378) @@ -1,96 +0,0 @@ -# $Id$ -# Maintainer: Gaetan Bisson <[email protected]> -# Contributor: Aaron Griffin <[email protected]> -# Contributor: judd <[email protected]> - -pkgname=openssh -pkgver=6.0p1 -pkgrel=3 -pkgdesc='Free version of the SSH connectivity tools' -url='http://www.openssh.org/portable.html' -license=('custom:BSD') -arch=('i686' 'x86_64') -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"; - 'sshd.close-sessions' - 'sshdgenkeys.service' - '[email protected]' - 'sshd.service' - 'sshd.socket' - 'tmpfiles.d' - 'sshd.confd' - 'sshd.pam' - 'sshd') -sha1sums=('f691e53ef83417031a2854b8b1b661c9c08e4422' - '954bf1660aa32620c37034320877f4511b767ccb' - '6c71de2c2ca9622aa8e863acd94b135555e11125' - 'bd6eae36c7ef9efb7147778baad7858b81f2d660' - '83a257b8f6a62237383262cb0e2583e5609ddac0' - 'a30fb5fda6d0143345bae47684edaffb8d0a92a7' - 'b5cf44205e8f4365c00bfbee110d7c0e563627aa' - 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' - '659e3ee95c269014783ff8b318c6f50bf7496fbd' - 'ed36e3a522f619ff6b13e253526596e4cca11e9f') - -backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib/ssh \ - --sysconfdir=/etc/ssh \ - --with-ldns \ - --with-libedit \ - --with-ssl-engine \ - --with-pam \ - --with-privsep-user=nobody \ - --with-kerberos5=/usr \ - --with-xauth=/usr/bin/xauth \ - --with-mantype=man \ - --with-md5-passwords \ - --with-pid-dir=/run \ - - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # The connect.sh test must be run by a user with a decent login shell; - # chroot builds use nobody with /bin/false. - make tests || true -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm "${pkgdir}"/usr/share/man/man1/slogin.1 - ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz - - install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" - - install -Dm644 ../sshdgenkeys.service "${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service - install -Dm644 ../[email protected] "${pkgdir}"/usr/lib/systemd/system/[email protected] - install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/sshd.service - install -Dm644 ../sshd.socket "${pkgdir}"/usr/lib/systemd/system/sshd.socket - install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/openssh.conf - - install -Dm755 ../sshd.close-sessions "${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions" # FS#17389 - install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd - install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd - install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd - - install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh - install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id - install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1 - - sed \ - -e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \ - -e '/^#UsePAM no$/c UsePAM yes' \ - -i "${pkgdir}"/etc/ssh/sshd_config -} Deleted: staging-i686/sshd =================================================================== --- staging-i686/sshd 2012-06-10 13:13:03 UTC (rev 161377) +++ staging-i686/sshd 2012-06-10 13:15:07 UTC (rev 161378) @@ -1,45 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/sshd - -PIDFILE=/run/sshd.pid -PID=$(cat $PIDFILE 2>/dev/null) -if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then - PID= - rm $PIDFILE 2>/dev/null -fi - -case "$1" in - start) - stat_busy 'Starting Secure Shell Daemon' - /usr/bin/ssh-keygen -A - [[ -d /var/empty ]] || mkdir -p /var/empty - [[ -z $PID ]] && /usr/sbin/sshd $SSHD_ARGS - if [[ $? -gt 0 ]]; then - stat_fail - else - add_daemon sshd - stat_done - fi - ;; - stop) - stat_busy 'Stopping Secure Shell Daemon' - [[ ! -z $PID ]] && kill $PID &> /dev/null - if [[ $? -gt 0 ]]; then - stat_fail - else - rm_daemon sshd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 Deleted: staging-i686/sshd.close-sessions =================================================================== --- staging-i686/sshd.close-sessions 2012-06-10 13:13:03 UTC (rev 161377) +++ staging-i686/sshd.close-sessions 2012-06-10 13:15:07 UTC (rev 161378) @@ -1,17 +0,0 @@ -# Close sshd sessions before shutting down the network; see FS#17389. - -sshd_close_sessions () { - if ck_daemon sshd; then - return - fi - /etc/rc.d/sshd stop - stat_busy "Stopping Secure Shell Sessions" - for i in $(pgrep sshd); do - if readlink -q /proc/$i/exe | grep -q '^/usr/sbin/sshd'; then - kill $i - fi - done &>/dev/null - stat_done -} - -add_hook shutdown_start sshd_close_sessions Deleted: staging-i686/sshd.confd =================================================================== --- staging-i686/sshd.confd 2012-06-10 13:13:03 UTC (rev 161377) +++ staging-i686/sshd.confd 2012-06-10 13:15:07 UTC (rev 161378) @@ -1,4 +0,0 @@ -# -# Parameters to be passed to sshd -# -SSHD_ARGS="" Deleted: staging-i686/sshd.pam =================================================================== --- staging-i686/sshd.pam 2012-06-10 13:13:03 UTC (rev 161377) +++ staging-i686/sshd.pam 2012-06-10 13:15:07 UTC (rev 161378) @@ -1,13 +0,0 @@ -#%PAM-1.0 -#auth required pam_securetty.so #Disable remote root -auth required pam_unix.so -auth required pam_env.so -account required pam_nologin.so -account required pam_unix.so -account required pam_time.so -password required pam_unix.so -session required pam_unix_session.so -session required pam_limits.so -session optional pam_loginuid.so --session optional pam_ck_connector.so nox11 --session optional pam_systemd.so Deleted: staging-i686/sshd.service =================================================================== --- staging-i686/sshd.service 2012-06-10 13:13:03 UTC (rev 161377) +++ staging-i686/sshd.service 2012-06-10 13:15:07 UTC (rev 161378) @@ -1,19 +0,0 @@ -[Unit] -Description=OpenSSH Daemon -After=sshdgenkeys.service - -[Service] -ExecStart=/usr/sbin/sshd -D -ExecReload=/bin/kill -HUP $MAINPID -KillMode=process -Restart=always - -[Install] -WantedBy=multi-user.target -Also=sshdgenkeys.service - -# Note that this is the service file for running a single SSH server for all -# incoming connections, suitable only for systems with a large amount of SSH -# traffic. In almost all other cases it is a better idea to use sshd.socket + -# [email protected] (i.e. the on-demand spawning version for one instance per -# connection). Deleted: staging-i686/sshd.socket =================================================================== --- staging-i686/sshd.socket 2012-06-10 13:13:03 UTC (rev 161377) +++ staging-i686/sshd.socket 2012-06-10 13:15:07 UTC (rev 161378) @@ -1,10 +0,0 @@ -[Unit] -Conflicts=sshd.service - -[Socket] -ListenStream=22 -Accept=yes - -[Install] -WantedBy=sockets.target -Also=sshdgenkeys.service Deleted: staging-i686/sshdgenkeys.service =================================================================== --- staging-i686/sshdgenkeys.service 2012-06-10 13:13:03 UTC (rev 161377) +++ staging-i686/sshdgenkeys.service 2012-06-10 13:15:07 UTC (rev 161378) @@ -1,18 +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 - -[Install] -WantedBy=multi-user.target Deleted: staging-i686/tmpfiles.d =================================================================== --- staging-i686/tmpfiles.d 2012-06-10 13:13:03 UTC (rev 161377) +++ staging-i686/tmpfiles.d 2012-06-10 13:15:07 UTC (rev 161378) @@ -1 +0,0 @@ -d /var/empty 0755 root root - Deleted: staging-x86_64/PKGBUILD =================================================================== --- staging-x86_64/PKGBUILD 2012-06-10 13:13:03 UTC (rev 161377) +++ staging-x86_64/PKGBUILD 2012-06-10 13:15:07 UTC (rev 161378) @@ -1,96 +0,0 @@ -# $Id$ -# Maintainer: Gaetan Bisson <[email protected]> -# Contributor: Aaron Griffin <[email protected]> -# Contributor: judd <[email protected]> - -pkgname=openssh -pkgver=6.0p1 -pkgrel=3 -pkgdesc='Free version of the SSH connectivity tools' -url='http://www.openssh.org/portable.html' -license=('custom:BSD') -arch=('i686' 'x86_64') -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"; - 'sshd.close-sessions' - 'sshdgenkeys.service' - '[email protected]' - 'sshd.service' - 'sshd.socket' - 'tmpfiles.d' - 'sshd.confd' - 'sshd.pam' - 'sshd') -sha1sums=('f691e53ef83417031a2854b8b1b661c9c08e4422' - '954bf1660aa32620c37034320877f4511b767ccb' - '6c71de2c2ca9622aa8e863acd94b135555e11125' - 'bd6eae36c7ef9efb7147778baad7858b81f2d660' - '83a257b8f6a62237383262cb0e2583e5609ddac0' - 'a30fb5fda6d0143345bae47684edaffb8d0a92a7' - 'b5cf44205e8f4365c00bfbee110d7c0e563627aa' - 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' - '659e3ee95c269014783ff8b318c6f50bf7496fbd' - 'ed36e3a522f619ff6b13e253526596e4cca11e9f') - -backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib/ssh \ - --sysconfdir=/etc/ssh \ - --with-ldns \ - --with-libedit \ - --with-ssl-engine \ - --with-pam \ - --with-privsep-user=nobody \ - --with-kerberos5=/usr \ - --with-xauth=/usr/bin/xauth \ - --with-mantype=man \ - --with-md5-passwords \ - --with-pid-dir=/run \ - - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # The connect.sh test must be run by a user with a decent login shell; - # chroot builds use nobody with /bin/false. - make tests || true -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm "${pkgdir}"/usr/share/man/man1/slogin.1 - ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz - - install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" - - install -Dm644 ../sshdgenkeys.service "${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service - install -Dm644 ../[email protected] "${pkgdir}"/usr/lib/systemd/system/[email protected] - install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/sshd.service - install -Dm644 ../sshd.socket "${pkgdir}"/usr/lib/systemd/system/sshd.socket - install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/openssh.conf - - install -Dm755 ../sshd.close-sessions "${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions" # FS#17389 - install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd - install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd - install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd - - install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh - install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id - install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1 - - sed \ - -e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \ - -e '/^#UsePAM no$/c UsePAM yes' \ - -i "${pkgdir}"/etc/ssh/sshd_config -} Deleted: staging-x86_64/sshd =================================================================== --- staging-x86_64/sshd 2012-06-10 13:13:03 UTC (rev 161377) +++ staging-x86_64/sshd 2012-06-10 13:15:07 UTC (rev 161378) @@ -1,45 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/sshd - -PIDFILE=/run/sshd.pid -PID=$(cat $PIDFILE 2>/dev/null) -if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then - PID= - rm $PIDFILE 2>/dev/null -fi - -case "$1" in - start) - stat_busy 'Starting Secure Shell Daemon' - /usr/bin/ssh-keygen -A - [[ -d /var/empty ]] || mkdir -p /var/empty - [[ -z $PID ]] && /usr/sbin/sshd $SSHD_ARGS - if [[ $? -gt 0 ]]; then - stat_fail - else - add_daemon sshd - stat_done - fi - ;; - stop) - stat_busy 'Stopping Secure Shell Daemon' - [[ ! -z $PID ]] && kill $PID &> /dev/null - if [[ $? -gt 0 ]]; then - stat_fail - else - rm_daemon sshd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 Deleted: staging-x86_64/sshd.close-sessions =================================================================== --- staging-x86_64/sshd.close-sessions 2012-06-10 13:13:03 UTC (rev 161377) +++ staging-x86_64/sshd.close-sessions 2012-06-10 13:15:07 UTC (rev 161378) @@ -1,17 +0,0 @@ -# Close sshd sessions before shutting down the network; see FS#17389. - -sshd_close_sessions () { - if ck_daemon sshd; then - return - fi - /etc/rc.d/sshd stop - stat_busy "Stopping Secure Shell Sessions" - for i in $(pgrep sshd); do - if readlink -q /proc/$i/exe | grep -q '^/usr/sbin/sshd'; then - kill $i - fi - done &>/dev/null - stat_done -} - -add_hook shutdown_start sshd_close_sessions Deleted: staging-x86_64/sshd.confd =================================================================== --- staging-x86_64/sshd.confd 2012-06-10 13:13:03 UTC (rev 161377) +++ staging-x86_64/sshd.confd 2012-06-10 13:15:07 UTC (rev 161378) @@ -1,4 +0,0 @@ -# -# Parameters to be passed to sshd -# -SSHD_ARGS="" Deleted: staging-x86_64/sshd.pam =================================================================== --- staging-x86_64/sshd.pam 2012-06-10 13:13:03 UTC (rev 161377) +++ staging-x86_64/sshd.pam 2012-06-10 13:15:07 UTC (rev 161378) @@ -1,13 +0,0 @@ -#%PAM-1.0 -#auth required pam_securetty.so #Disable remote root -auth required pam_unix.so -auth required pam_env.so -account required pam_nologin.so -account required pam_unix.so -account required pam_time.so -password required pam_unix.so -session required pam_unix_session.so -session required pam_limits.so -session optional pam_loginuid.so --session optional pam_ck_connector.so nox11 --session optional pam_systemd.so Deleted: staging-x86_64/sshd.service =================================================================== --- staging-x86_64/sshd.service 2012-06-10 13:13:03 UTC (rev 161377) +++ staging-x86_64/sshd.service 2012-06-10 13:15:07 UTC (rev 161378) @@ -1,19 +0,0 @@ -[Unit] -Description=OpenSSH Daemon -After=sshdgenkeys.service - -[Service] -ExecStart=/usr/sbin/sshd -D -ExecReload=/bin/kill -HUP $MAINPID -KillMode=process -Restart=always - -[Install] -WantedBy=multi-user.target -Also=sshdgenkeys.service - -# Note that this is the service file for running a single SSH server for all -# incoming connections, suitable only for systems with a large amount of SSH -# traffic. In almost all other cases it is a better idea to use sshd.socket + -# [email protected] (i.e. the on-demand spawning version for one instance per -# connection). Deleted: staging-x86_64/sshd.socket =================================================================== --- staging-x86_64/sshd.socket 2012-06-10 13:13:03 UTC (rev 161377) +++ staging-x86_64/sshd.socket 2012-06-10 13:15:07 UTC (rev 161378) @@ -1,10 +0,0 @@ -[Unit] -Conflicts=sshd.service - -[Socket] -ListenStream=22 -Accept=yes - -[Install] -WantedBy=sockets.target -Also=sshdgenkeys.service Deleted: staging-x86_64/sshdgenkeys.service =================================================================== --- staging-x86_64/sshdgenkeys.service 2012-06-10 13:13:03 UTC (rev 161377) +++ staging-x86_64/sshdgenkeys.service 2012-06-10 13:15:07 UTC (rev 161378) @@ -1,18 +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 - -[Install] -WantedBy=multi-user.target Deleted: staging-x86_64/tmpfiles.d =================================================================== --- staging-x86_64/tmpfiles.d 2012-06-10 13:13:03 UTC (rev 161377) +++ staging-x86_64/tmpfiles.d 2012-06-10 13:15:07 UTC (rev 161378) @@ -1 +0,0 @@ -d /var/empty 0755 root root -
