maj openssh#5.5p1-2, séparation client et service

3 files changed, 16 insertions, 57 deletions

diff --git a/base/openssh/.footprint b/base/openssh/.footprint
index 712055917..0212ec8d2 100644
--- a/base/openssh/.footprint
+++ b/base/openssh/.footprint
@@ -1,27 +1,7 @@
 drwxr-xr-x	root/root	etc/
-drwxr-xr-x	root/root	etc/rc.d/
-drwxr-xr-x	root/root	etc/rc.d/init.d/
--rwxr-xr-x	root/root	etc/rc.d/init.d/sshd
-drwxr-xr-x	root/root	etc/rc.d/rc0.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K30sshd -> ../init.d/sshd
-drwxr-xr-x	root/root	etc/rc.d/rc1.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K30sshd -> ../init.d/sshd
-drwxr-xr-x	root/root	etc/rc.d/rc2.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc2.d/K30sshd -> ../init.d/sshd
-drwxr-xr-x	root/root	etc/rc.d/rc3.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S30sshd -> ../init.d/sshd
-drwxr-xr-x	root/root	etc/rc.d/rc4.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc4.d/S30sshd -> ../init.d/sshd
-drwxr-xr-x	root/root	etc/rc.d/rc5.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S30sshd -> ../init.d/sshd
-drwxr-xr-x	root/root	etc/rc.d/rc6.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K30sshd -> ../init.d/sshd
-drwxr-xr-x	root/root	etc/rc.d/rcsysinit.d/
 drwxr-xr-x	root/root	etc/ssh/
 -rw-r--r--	root/root	etc/ssh/moduli
 -rw-r--r--	root/root	etc/ssh/ssh_config
--rw-r--r--	root/root	etc/ssh/sshd_config
-drwxr-xr-x	root/root	etc/sysconfig/
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/scp
@@ -32,13 +12,6 @@ lrwxrwxrwx	root/root	usr/bin/slogin -> ./ssh
 -rwxr-xr-x	root/root	usr/bin/ssh-agent
 -rwxr-xr-x	root/root	usr/bin/ssh-keygen
 -rwxr-xr-x	root/root	usr/bin/ssh-keyscan
-drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/openssh/
--rwxr-xr-x	root/root	usr/lib/openssh/sftp-server
--rws--x--x	root/root	usr/lib/openssh/ssh-keysign
--rwxr-xr-x	root/root	usr/lib/openssh/ssh-pkcs11-helper
-drwxr-xr-x	root/root	usr/sbin/
--rwxr-xr-x	root/root	usr/sbin/sshd
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
@@ -54,11 +27,3 @@ drwxr-xr-x	root/root	usr/share/man/man5/
 -rw-r--r--	root/root	usr/share/man/man5/moduli.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/ssh_config.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/sshd_config.5.gz
-drwxr-xr-x	root/root	usr/share/man/man8/
--rw-r--r--	root/root	usr/share/man/man8/sftp-server.8.gz
--rw-r--r--	root/root	usr/share/man/man8/ssh-keysign.8.gz
--rw-r--r--	root/root	usr/share/man/man8/ssh-pkcs11-helper.8.gz
--rw-r--r--	root/root	usr/share/man/man8/sshd.8.gz
-drwxr-xr-x	root/root	var/
-drwxr-xr-x	root/root	var/lib/
-drwx------	root/sys	var/lib/sshd/
diff --git a/base/openssh/.md5sum b/base/openssh/.md5sum
index 4e8c8ccc3..cf66ae23b 100644
--- a/base/openssh/.md5sum
+++ b/base/openssh/.md5sum
@@ -1,2 +1 @@
 88633408f4cb1eb11ec7e2ec58b519eb  openssh-5.5p1.tar.gz
-3dc8a0c96046ec3f058c0c2f226512f6  sshd
diff --git a/base/openssh/Pkgfile b/base/openssh/Pkgfile
index 14c65cfbe..10e1a6125 100755
--- a/base/openssh/Pkgfile
+++ b/base/openssh/Pkgfile
@@ -5,32 +5,27 @@
 
 name=openssh
 version=5.5p1
-release=1
-source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$name-$version.tar.gz\
-         sshd\
-)
+release=2
+source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$name-$version.tar.gz)
 
 build() {
-	source /etc/blfs-bootscripts
-        wget http://www.linuxfromscratch.org/blfs/downloads/svn/$scripts-$scriptsversion.tar.bz2
-        tar xvf $scripts-$scriptsversion.tar.bz2
 	cd $name-$version
         sed -i "s:-lcrypto:/usr/lib/libcrypto.a -ldl:g" configure
         sed -i "s/lkrb5 -ldes/lkrb5/" configure
-        install -v -m700 -d $PKG/var/lib/sshd
-        chown -v 0:2 $PKG/var/lib/sshd
 	./configure --prefix=/usr \
-                    --sysconfdir=/etc/ssh \
-                    --libexecdir=/usr/lib/openssh \
-                    --with-tcp-wrappers --with-md5-passwords \
-                    --with-privsep-path=/var/lib/sshd \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-                --disable-debug
+	--sysconfdir=/etc/ssh \
+	--libexecdir=/usr/lib/openssh \
+	--with-tcp-wrappers --with-md5-passwords \
+	--with-privsep-path=/var/lib/sshd \
+	--mandir=/usr/share/man \
+	--infodir=/usr/share/info \
+	--without-sshd \
+	--disable-debug
 	make DESTDIR=$PKG install
-        cd ../$scripts-$scriptsversion
-        make DESTDIR=$PKG install-sshd
-        rm $PKG/etc/rc.d/init.d/sshd
-        install -m755 ../sshd $PKG/etc/rc.d/init.d/
-	echo "PermitRootLogin no" >> $PKG/etc/ssh/sshd_config
+	rm -r $PKG/var
+	# Suppression des services et leurs man
+	rm $PKG/etc/ssh/sshd_config
+	rm -r $PKG/usr/sbin
+	rm -r $PKG/usr/share/man/man8
+	rm -r $PKG/usr/lib
 }