Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 16 Dec 2003 12:47:32 +0100
From:      "Clement LAFORET" <sheepkiller@cultdeadsheep.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        Clement Laforet <sheepkiller@cultdeadsheep.org>
Subject:   ports/60296: [maintainer update] security/dropbear: update to 0.39
Message-ID:  <20031216114714.DA7E143D33@mx1.FreeBSD.org>
Resent-Message-ID: <200312161150.hBGBoHEq062631@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         60296
>Category:       ports
>Synopsis:       [maintainer update] security/dropbear: update to 0.39
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 16 03:50:17 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Clement Laforet
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
cotds.org
>Environment:
System: FreeBSD lucifer.cultdeadsheep.org 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Sun Dec 7 15:41:23 GMT 2003 root@lucifer.cultdeadsheep.org:/usr/obj/usr/src/sys/LUCIFER i386


	
>Description:
	- Update dropbear to 0.39
	- cleanups

>How-To-Repeat:
	N/A.
>Fix:

	

--- dropbear.diff begins here ---
Index: dropbear/Makefile
===================================================================
RCS file: /SERVICES/cvs/FreeBSD/ports/security/dropbear/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- dropbear/Makefile	11 Oct 2003 18:05:09 -0000	1.4
+++ dropbear/Makefile	16 Dec 2003 11:44:43 -0000
@@ -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 @@
 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>
Index: dropbear/distinfo
===================================================================
RCS file: /SERVICES/cvs/FreeBSD/ports/security/dropbear/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- dropbear/distinfo	11 Oct 2003 18:05:09 -0000	1.3
+++ dropbear/distinfo	16 Dec 2003 11:44:43 -0000
@@ -1 +1 @@
-MD5 (dropbear-0.38.tar.gz) = 8e6d4d12db54d2f9dde3aa8365b41e27
+MD5 (dropbear-0.39.tar.gz) = d3e9d34fc64905010d142f91b6a4386a
Index: dropbear/pkg-plist
===================================================================
RCS file: /SERVICES/cvs/FreeBSD/ports/security/dropbear/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- dropbear/pkg-plist	11 Oct 2003 18:05:09 -0000	1.2
+++ dropbear/pkg-plist	16 Dec 2003 11:44:43 -0000
@@ -2,6 +2,4 @@
 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."
Index: dropbear/files/patch-Makefile.in
===================================================================
RCS file: /SERVICES/cvs/FreeBSD/ports/security/dropbear/files/patch-Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-Makefile.in
--- dropbear/files/patch-Makefile.in	11 Oct 2003 18:05:09 -0000	1.1
+++ dropbear/files/patch-Makefile.in	16 Dec 2003 11:44:43 -0000
@@ -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
Index: dropbear/files/patch-includes.h
===================================================================
RCS file: dropbear/files/patch-includes.h
diff -N dropbear/files/patch-includes.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ dropbear/files/patch-includes.h	16 Dec 2003 11:44:43 -0000
@@ -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>
--- dropbear.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031216114714.DA7E143D33>