# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1326451294 -3600
# Node ID 890a8d86a257139c445040c10da860f89ab0c733
# Parent  3b8e288fd269ee192f7c40e459b2dd00db265496
dropbear-pam: wanted dropbear

diff -r 3b8e288fd269 -r 890a8d86a257 dropbear-pam/receipt
--- a/dropbear-pam/receipt	Fri Jan 13 10:58:50 2012 +0100
+++ b/dropbear-pam/receipt	Fri Jan 13 11:41:34 2012 +0100
@@ -5,76 +5,19 @@
 CATEGORY="security"
 SHORT_DESC="Light SSH client and server using PAM."
 MAINTAINER="pascal.bellard@slitaz.org"
-SOURCE="dropbear"
-TARBALL="$SOURCE-$VERSION.tar.gz"
-DEPENDS="zlib pam"
-BUILD_DEPENDS="zlib zlib-dev pam pam-dev"
-SUGGESTED="sftp-server"
+WANTED="dropbear"
+DEPENDS="dropbear pam"
 WEB_SITE="http://matt.ucc.asn.au/dropbear/dropbear.html"
-WGET_URL="http://matt.ucc.asn.au/dropbear/releases/$TARBALL"
-CONFIG_FILES="/etc/dropbear"
 PROVIDE="dropbear:pam ssh:pam"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	local i
-	local DROPBEARS
-	DROPBEARS="dropbearkey dropbearconvert dbclient scp"
-	cd $src
-	rm -rf _pkg
-	sed -i  -e 's|/usr/X11R6/bin/xauth|/usr/bin/xauth|' \
-		-e 's|/usr/libexec/sftp-server|/usr/sbin/sftp-server|' \
- 		-e 's|ENABLE_SVR_PASSWORD_AUTH|ENABLE_SVR_PAM_AUTH|' \
-		options.h
-	./configure --prefix=/usr --enable-pam $CONFIGURE_ARGS &&
-	make PROGRAMS="dropbear $DROPBEARS" MULTI=1 &&
-	install -d -m 755 $DESTDIR/usr/sbin &&
-	install -m 755 dropbearmulti $DESTDIR/usr/sbin/dropbear &&
-	chown root $DESTDIR/usr/sbin/dropbear &&
-	chgrp 0 $DESTDIR/usr/sbin/dropbear &&
-	install -d -m 755 $DESTDIR/usr/bin &&
-	for i in $DROPBEARS ssh; do
-		ln -s ../sbin/dropbear $DESTDIR/usr/bin/$i
-	done
-}
-
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr
-	cp -a $_pkg/usr/bin $fs/usr
-	cp -a $_pkg/usr/sbin $fs/usr
-	# Config file and init script.
-	mkdir -p $fs/etc
-	cp -a ../$SOURCE/stuff/dropbear $fs/etc
-	cp -a ../$SOURCE/stuff/init.d $fs/etc
-	cp -a ../$SOURCE/stuff/sshx $fs/usr/bin
-	cp -a $stuff/pam.d $fs/etc
-	touch   $fs/etc/dropbear/dropbear_dss_host_key \
-		$fs/etc/dropbear/dropbear_rsa_host_key
-	
-	# Fix dropbear initscript perms
-	chown -R root.root $fs
+	mkdir -p $fs/usr/sbin
+	cp -a $_pkg/usr/sbin/dropbear-pam $fs/usr/sbin/dropbear
 }
 
-# Post message when installing.
-post_install()
+post_remove()
 {
-	while read dropbear openssh ; do
-		[ -s $openssh ] || continue
-		dropbearconvert openssh dropbear $1$openssh $1$dropbear
-		dropbearkey -y -f $1$dropbear | grep Fingerprint
-	done <<EOT
-/etc/dropbear/dropbear_rsa_host_key	/etc/ssh/ssh_host_rsa_key
-/etc/dropbear/dropbear_dss_host_key	/etc/ssh/ssh_host_dsa_key
-EOT
-	echo -e "\nTo starts $SOURCE server you can run :\n"
-	echo "/etc/init.d/$SOURCE start"
-	echo -e "Or add $SOURCE to RUN_DAEMONS in /etc/rcS.conf\n"
+	tazpkg get-install ${PACKAGE%-pam} --forced
 }
-
-pre_remove()
-{
-    tazpkg get-install  ${PACKAGE%-pam}
-}
diff -r 3b8e288fd269 -r 890a8d86a257 dropbear/receipt
--- a/dropbear/receipt	Fri Jan 13 10:58:50 2012 +0100
+++ b/dropbear/receipt	Fri Jan 13 11:41:34 2012 +0100
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 DEPENDS="zlib"
-BUILD_DEPENDS="zlib-dev"
+BUILD_DEPENDS="zlib zlib-dev pam pam-dev"
 SUGGESTED="sftp-server"
 WEB_SITE="http://matt.ucc.asn.au/dropbear/dropbear.html"
 WGET_URL="http://matt.ucc.asn.au/dropbear/releases/$TARBALL"
@@ -24,6 +24,7 @@
 	cd $src
 	sed -i  -e 's|/usr/.*/xauth|/usr/bin/xauth|' \
 		-e 's|/usr/.*/sftp-server|/usr/sbin/sftp-server|' \
+ 		-e 's|ENABLE_SVR_PAM_AUTH|ENABLE_SVR_PASSWORD_AUTH|' \
 		options.h
 	./configure --prefix=/usr --without-pam $CONFIGURE_ARGS &&
 	make PROGRAMS="dropbear $DROPBEARS" MULTI=1 &&
@@ -31,6 +32,13 @@
 	install -m 755 dropbearmulti $DESTDIR/usr/sbin/dropbear &&
 	chown root $DESTDIR/usr/sbin/dropbear &&
 	chgrp 0 $DESTDIR/usr/sbin/dropbear &&
+	sed -i 's|ENABLE_SVR_PASSWORD_AUTH|ENABLE_SVR_PAM_AUTH|' \
+		options.h
+	./configure --prefix=/usr --enable-pam $CONFIGURE_ARGS &&
+	make PROGRAMS="dropbear $DROPBEARS" MULTI=1 &&
+	install -m 755 dropbearmulti $DESTDIR/usr/sbin/dropbear-pam &&
+	chown root $DESTDIR/usr/sbin/dropbear-pam &&
+	chgrp 0 $DESTDIR/usr/sbin/dropbear-pam &&
 	install -d -m 755 $DESTDIR/usr/bin &&
 	for i in $DROPBEARS ssh; do
 		ln -s ../sbin/dropbear $DESTDIR/usr/bin/$i
@@ -43,6 +51,7 @@
 	mkdir -p $fs/usr
 	cp -a $_pkg/usr/bin $fs/usr
 	cp -a $_pkg/usr/sbin $fs/usr
+	rm -f $fs/usr/sbin/dropbear-pam
 	# Config file and init script.
 	mkdir -p $fs/etc
 	cp -a $stuff/dropbear $fs/etc