- Update to version 0.39

PR:		60296
Submitted by:	maintainer

5 files changed, 39 insertions, 30 deletions

diff --git a/security/dropbear/Makefile b/security/dropbear/Makefile
index 1e43ee26427b..2ee30ef17ebd 100644
--- a/security/dropbear/Makefile
+++ b/security/dropbear/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dropbear
-PORTVERSION=	0.38
+PORTVERSION=	0.39
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://matt.ucc.asn.au/dropbear/releases/
 
@@ -17,25 +17,26 @@ GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 USE_REINPLACE=	YES
 
-.if defined(IS_STATIC)
+.if defined(WANT_STATIC)
 CONFIGURE_ENV=	LDFLAGS=-static
 .endif
 
-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' \
+post-patch:
+	@${REINPLACE_CMD} -e "s,_PRIV_FILENAME \"/etc/,_PRIV_FILENAME \"${PREFIX}/etc/,g; \
+		s,/usr/bin/X11/,${X11BASE}/,g" ${WRKSRC}/options.h
+	@${SED} -e 's:__PREFIX__:${PREFIX}:g' \
 		${FILESDIR}/dropbear.sh > ${WRKSRC}/dropbear.sh
 
 post-install:
 	@${MKDIR} ${PREFIX}/etc/dropbear
-.if !defined(NOPORTDOC)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
+	@${ECHO_MSG} ""
 	@${INSTALL_SCRIPT} ${WRKSRC}/dropbear.sh ${PREFIX}/etc/rc.d/dropbear.sh.sample
+	@${ECHO_MSG} " Now you have to create your SSH host key."
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} " To create RSA key:"
+	@${ECHO_MSG} " ${PREFIX}/sbin/dropbearkey -t rsa -f ${PREFIX}/etc/dropbear/dropbear_rsa_host_key"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} " For more details, run ${PREFIX}/sbin/dropbearkey -h"
+	@${ECHO_MSG} ""
 
 .include <bsd.port.mk>
diff --git a/security/dropbear/distinfo b/security/dropbear/distinfo
index 23600d168d4d..ea83850df155 100644
--- a/security/dropbear/distinfo
+++ b/security/dropbear/distinfo
@@ -1 +1 @@
-MD5 (dropbear-0.38.tar.gz) = 8e6d4d12db54d2f9dde3aa8365b41e27
+MD5 (dropbear-0.39.tar.gz) = d3e9d34fc64905010d142f91b6a4386a
diff --git a/security/dropbear/files/patch-Makefile.in b/security/dropbear/files/patch-Makefile.in
index e7cfffaf5dc1..ff9936e921dd 100644
--- a/security/dropbear/files/patch-Makefile.in
+++ b/security/dropbear/files/patch-Makefile.in
@@ -1,22 +1,21 @@
---- 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
+--- Makefile.in.orig	Tue Dec 16 06:14:06 2003
++++ Makefile.in	Tue Dec 16 10:57:36 2003
+@@ -53,15 +53,9 @@
+ 	-$(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)
+-	$(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 might fail, so do it separately to the install
 -	-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)
++	$(BSD_INSTALL_PROGRAM) -m 755 dropbear $(DESTDIR)$(sbindir)
++	$(BSD_INSTALL_PROGRAM) -m 755 dropbearkey $(DESTDIR)$(bindir)
++	$(BSD_INSTALL_PROGRAM) -m 755 dropbearconvert $(DESTDIR)$(bindir)
  
  
  static: dropbear-static dropbearkey-static dropbearconvert-static
diff --git a/security/dropbear/files/patch-includes.h b/security/dropbear/files/patch-includes.h
new file mode 100644
index 000000000000..e456342b6503
--- /dev/null
+++ b/security/dropbear/files/patch-includes.h
@@ -0,0 +1,11 @@
+--- includes.h.orig	Tue Dec 16 11:02:22 2003
++++ includes.h	Tue Dec 16 11:02:43 2003
+@@ -38,7 +38,7 @@
+ #include <sys/time.h>
+ #include <sys/un.h>
+ #include <sys/wait.h>
+-#include <sys/dir.h>
++#include <sys/dirent.h>
+ 
+ #include <stdio.h>
+ #include <errno.h>
diff --git a/security/dropbear/pkg-plist b/security/dropbear/pkg-plist
index 6588156bdfff..cabade242953 100644
--- a/security/dropbear/pkg-plist
+++ b/security/dropbear/pkg-plist
@@ -2,6 +2,4 @@ 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."