Update to 0.38

PR:		57866
Submitted by:	maintainer

5 files changed, 60 insertions, 9 deletions

diff --git a/security/dropbear/Makefile b/security/dropbear/Makefile
index 42173db3a487..1e43ee26427b 100644
--- a/security/dropbear/Makefile
+++ b/security/dropbear/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dropbear
-PORTVERSION=	0.37
+PORTVERSION=	0.38
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://matt.ucc.asn.au/dropbear/releases/
 
@@ -21,21 +21,21 @@ USE_REINPLACE=	YES
 CONFIGURE_ENV=	LDFLAGS=-static
 .endif
 
-BIN=		dropbear dropbearkey dropbearconvert
-
+MAKE_ENV+=	INSTALL="${INSTALL}" INSTALL_PROGRAM="${INSTALL_PROGRAM}"
 post-configure:
 	@${REINPLACE_CMD} -e "s,/etc/,${PREFIX}/etc/,g" ${WRKSRC}/options.h
 	@${REINPLACE_CMD} -e "s,/usr/bin/X11/,${X11BASE}/,g" ${WRKSRC}/options.h
 	@${REINPLACE_CMD} -e "s,^typedef int socklen_t,//typedef int socklen_t," \
 		${WRKSRC}/includes.h
+	${SED} -e 's:__PREFIX__:${PREFIX}:g' \
+		${FILESDIR}/dropbear.sh > ${WRKSRC}/dropbear.sh
 
-do-install:
-.for bin in ${BIN}
-	@${INSTALL_PROGRAM} ${WRKSRC}/${bin} ${PREFIX}/bin
-.endfor
+post-install:
+	@${MKDIR} ${PREFIX}/etc/dropbear
 .if !defined(NOPORTDOC)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
+	@${INSTALL_SCRIPT} ${WRKSRC}/dropbear.sh ${PREFIX}/etc/rc.d/dropbear.sh.sample
 
 .include <bsd.port.mk>
diff --git a/security/dropbear/distinfo b/security/dropbear/distinfo
index d453fbdd03ea..23600d168d4d 100644
--- a/security/dropbear/distinfo
+++ b/security/dropbear/distinfo
@@ -1 +1 @@
-MD5 (dropbear-0.37.tar.gz) = d71da88922b23fa41e5baac582cf74dc
+MD5 (dropbear-0.38.tar.gz) = 8e6d4d12db54d2f9dde3aa8365b41e27
diff --git a/security/dropbear/files/dropbear.sh b/security/dropbear/files/dropbear.sh
new file mode 100644
index 000000000000..bc6fbbd0dd75
--- /dev/null
+++ b/security/dropbear/files/dropbear.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+PREFIX=__PREFIX__
+ETCDIR=${PREFIX}/etc/dropbear
+SBINDIR=${PREFIX}/sbin
+BINDIR=${PREFIX}/bin
+case "$1" in
+start)
+	[ -f ${ETCDIR}/dropbear_rsa_host_key ] || \
+			${BINDIR}/dropbearkey -t rsa -f ${ETCDIR}/dropbear_rsa_host_key
+	[ -f __PREFIX__/dropbear_dss_host_key ] || \
+			${BINDIR}/dropbearkey -t dss -f ${ETCDIR}/dropbear_dss_host_key
+	${SBINDIR}/dropbear
+	echo $! > /var/run/dropbear.pid
+	echo -n ' dropbear'
+	;;
+stop)
+	if [ -f /var/run/dropbear.pid ]; then
+		kill -TERM `cat /var/run/dropbear.pid`
+		rm -f /var/run/dropbear.pid
+		echo -n ' dropbear'
+	fi
+	;;
+*)
+	echo "Usage: ${0##*/}: { start | stop }" 2>&1
+	exit 65
+	;;
+esac
diff --git a/security/dropbear/files/patch-Makefile.in b/security/dropbear/files/patch-Makefile.in
new file mode 100644
index 000000000000..e7cfffaf5dc1
--- /dev/null
+++ b/security/dropbear/files/patch-Makefile.in
@@ -0,0 +1,22 @@
+--- Makefile.in.orig	Sat Oct 11 10:08:19 2003
++++ Makefile.in	Sat Oct 11 14:58:58 2003
+@@ -46,14 +46,11 @@
+ 	-strip dropbearconvert
+ 
+ install: all
+-	install -d -m 755 $(DESTDIR)$(sbindir)
+-	install -d -m 755 $(DESTDIR)$(bindir)
+-	install -m 755 dropbear $(DESTDIR)$(sbindir)
+-	install -m 755 dropbearkey $(DESTDIR)$(bindir)
+-	install -m 755 dropbearconvert $(DESTDIR)$(bindir)
+-	-chown root:root $(DESTDIR)$(sbindir)/dropbear
+-	-chown root:root $(DESTDIR)$(bindir)/dropbearkey
+-	-chown root:root $(DESTDIR)$(bindir)/dropbearconvert
++	${INSTALL} -d -m 755 $(DESTDIR)$(sbindir)
++	${INSTALL} -d -m 755 $(DESTDIR)$(bindir)
++	${INSTALL_PROGRAM} dropbear $(DESTDIR)$(sbindir)
++	${INSTALL_PROGRAM} dropbearkey $(DESTDIR)$(bindir)
++	${INSTALL_PROGRAM} dropbearconvert $(DESTDIR)$(bindir)
+ 
+ 
+ static: dropbear-static dropbearkey-static dropbearconvert-static
diff --git a/security/dropbear/pkg-plist b/security/dropbear/pkg-plist
index fa82866934c6..6588156bdfff 100644
--- a/security/dropbear/pkg-plist
+++ b/security/dropbear/pkg-plist
@@ -1,5 +1,7 @@
-bin/dropbear
 bin/dropbearkey
 bin/dropbearconvert
+etc/rc.d/dropbear.sh.sample
+sbin/dropbear
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@unexec rmdir %D/etc/dropbear 2>/dev/null || echo "===> You can safely remove %D/etc/dropbear directory, if you don't want to use dropbear anymore."