From c7c3f7e35d814f6a500a90267f4ce1f8bad11aad Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Sat, 4 Sep 2010 22:51:04 -0700 Subject: openssh:Bumped/Updated for LinHES 7. --- abs/core-testing/openssh/PKGBUILD | 65 +++++++++++++++++++-------------------- abs/core-testing/openssh/sshd | 3 +- 2 files changed, 33 insertions(+), 35 deletions(-) diff --git a/abs/core-testing/openssh/PKGBUILD b/abs/core-testing/openssh/PKGBUILD index fb2ec18..504ed4a 100644 --- a/abs/core-testing/openssh/PKGBUILD +++ b/abs/core-testing/openssh/PKGBUILD @@ -1,67 +1,64 @@ -# $Id: PKGBUILD 20515 2008-12-05 12:08:00Z allan $ +# $Id: PKGBUILD 80964 2010-05-24 06:39:23Z allan $ # Maintainer: Aaron Griffin # Contributor: judd pkgname=openssh pkgver=5.5p1 pkgrel=1 -#_gsskexver=20080404 pkgdesc='A Secure SHell server/client' -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('custom') url="http://www.openssh.org/portable.html" backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd') -depends=('openssl>=0.9.8g' 'zlib' 'pam' 'tcp_wrappers' 'heimdal>=1.2-1') -source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$pkgver.tar.gz - sshd sshd.confd sshd.pam sshd.patch) - #http://www.sxw.org.uk/computing/patches/$pkgname-$pkgver-gsskex-$_gsskexver.patch +depends=('openssl' 'zlib' 'pam' 'tcp_wrappers' 'heimdal') +source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz" + 'sshd' 'sshd.confd' 'sshd.pam') +md5sums=('88633408f4cb1eb11ec7e2ec58b519eb' + '17b1b1bf0f578a55945ee204bd4462af' + 'e2cea70ac13af7e63d40eb04415eacd5' + '1c7c2ea8734ec7e3ca58d820634dc73a') build() { - cd $startdir/src/$pkgname-$pkgver - patch -p1 < ../sshd.patch - #patch -up0 < $startdir/src/$pkgname-$pkgver-gsskex-$_gsskexver.patch + cd ${srcdir}/${pkgname}-${pkgver} #NOTE we disable-strip so that makepkg can decide whether to strip or not ./configure --prefix=/usr --libexecdir=/usr/lib/ssh \ --sysconfdir=/etc/ssh --with-tcp-wrappers --with-privsep-user=nobody \ - --with-md5-passwords --with-pam --with-mantype=man --mandir=/usr/man \ - --with-xauth=/usr/bin/xauth --with-kerberos5=/usr --disable-strip + --with-md5-passwords --with-pam --with-mantype=man --mandir=/usr/share/man \ + --with-xauth=/usr/bin/xauth --with-kerberos5=/usr --with-ssl-engine \ + --disable-strip make || return 1 - make DESTDIR=$startdir/pkg install +} - #What is this for? Is it needed? - mkdir -p $startdir/pkg/var/empty +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install - install -D -m755 $startdir/src/sshd $startdir/pkg/etc/rc.d/sshd + install -Dm755 ${srcdir}/sshd ${pkgdir}/etc/rc.d/sshd - install -D -m644 LICENCE $startdir/pkg/usr/share/licenses/$pkgname/LICENCE - install -D -m644 $startdir/src/sshd.pam $startdir/pkg/etc/pam.d/sshd - install -D -m644 $startdir/src/sshd.confd $startdir/pkg/etc/conf.d/sshd + install -Dm644 LICENCE ${pkgdir}/usr/share/licenses/${pkgname}/LICENCE + install -Dm644 ${srcdir}/sshd.pam ${pkgdir}/etc/pam.d/sshd + install -Dm644 ${srcdir}/sshd.confd ${pkgdir}/etc/conf.d/sshd - rm $startdir/pkg/usr/man/man1/slogin.1 - ln -sf ssh.1.gz $startdir/pkg/usr/man/man1/slogin.1.gz + rm ${pkgdir}/usr/share/man/man1/slogin.1 + ln -sf ssh.1.gz ${pkgdir}/usr/share/man/man1/slogin.1.gz #additional contrib scripts that we like - install -D -m755 contrib/findssl.sh $startdir/pkg/usr/bin/findssl.sh - install -D -m755 contrib/ssh-copy-id $startdir/pkg/usr/bin/ssh-copy-id - install -D -m644 contrib/ssh-copy-id.1 $startdir/pkg/usr/man/man1/ssh-copy-id.1 + 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 - i# sshd_config + # sshd_config sed -i \ -e 's|^#ListenAddress 0.0.0.0|ListenAddress 0.0.0.0|g' \ -e 's|^#UsePAM no|UsePAM yes|g' \ -e 's|^#ChallengeResponseAuthentication yes|ChallengeResponseAuthentication no|g' \ - $startdir/pkg/etc/ssh/sshd_config - echo "HashKnownHosts yes" >> $startdir/pkg/etc/ssh/ssh_config - echo "StrictHostKeyChecking ask" >> $startdir/pkg/etc/ssh/ssh_config + ${pkgdir}/etc/ssh/sshd_config + echo "HashKnownHosts yes" >> ${pkgdir}/etc/ssh/ssh_config + echo "StrictHostKeyChecking ask" >> ${pkgdir}/etc/ssh/ssh_config #ssh_config sed -i \ -e 's|^# Host \*|Host *|g' \ - $startdir/pkg/etc/ssh/ssh_config + ${pkgdir}/etc/ssh/ssh_config } -md5sums=('88633408f4cb1eb11ec7e2ec58b519eb' - 'd9ee5e0a0d143689b3d6f11454a2a892' - 'e2cea70ac13af7e63d40eb04415eacd5' - '1c7c2ea8734ec7e3ca58d820634dc73a' - 'ea43aad77b405518aaadad172e0f91eb') diff --git a/abs/core-testing/openssh/sshd b/abs/core-testing/openssh/sshd index 875028a..bc0e453 100755 --- a/abs/core-testing/openssh/sshd +++ b/abs/core-testing/openssh/sshd @@ -4,13 +4,14 @@ . /etc/rc.d/functions . /etc/conf.d/sshd -PID=`cat /var/run/sshd.pid 2>/dev/null` +PID="$(cat /var/run/sshd.pid 2>/dev/null)" case "$1" in start) stat_busy "Starting Secure Shell Daemon" [ -f /etc/ssh/ssh_host_key ] || { /usr/bin/ssh-keygen -t rsa1 -N "" -f /etc/ssh/ssh_host_key >/dev/null; } [ -f /etc/ssh/ssh_host_rsa_key ] || { /usr/bin/ssh-keygen -t rsa -N "" -f /etc/ssh/ssh_host_rsa_key >/dev/null; } [ -f /etc/ssh/ssh_host_dsa_key ] || { /usr/bin/ssh-keygen -t dsa -N "" -f /etc/ssh/ssh_host_dsa_key >/dev/null; } + [ -d /var/empty ] || mkdir -p /var/empty [ -z "$PID" ] && /usr/sbin/sshd $SSHD_ARGS if [ $? -gt 0 ]; then stat_fail -- cgit v0.12