Attachment #38023 for bug #60296

View | Details | Raw Unified | Return to bug 60296
Collapse All | Expand All




#

PORTNAME=	dropbear
PORTVERSION=	0.39
CATEGORIES=	security ipv6
MASTER_SITES=	http://matt.ucc.asn.au/dropbear/releases/


USE_GMAKE=	YES
USE_REINPLACE=	YES

.if defined(WANT_STATIC)
CONFIGURE_ENV=	LDFLAGS=-static
.endif

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' \
	@${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

post-install:
	@${MKDIR} ${PREFIX}/etc/dropbear
	@${ECHO_MSG} ""
	@${MKDIR} ${DOCSDIR}
	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
.endif
	@${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>

Line 1 Link Here

(-)dropbear/distinfo (-1 / +1 lines)
1	MD5 (dropbear-0.38.tar.gz) = 8e6d4d12db54d2f9dde3aa8365b41e27	1	MD5 (dropbear-0.39.tar.gz) = d3e9d34fc64905010d142f91b6a4386a

Lines 2-7 Link Here

(-)dropbear/pkg-plist (-2 lines)
2	bin/dropbearconvert	2	bin/dropbearconvert
3	etc/rc.d/dropbear.sh.sample	3	etc/rc.d/dropbear.sh.sample
4	sbin/dropbear	4	sbin/dropbear
5	%%PORTDOCS%%%%DOCSDIR%%/README
6	%%PORTDOCS%%@dirrm %%DOCSDIR%%
7	@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."	5	@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."




--- 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)
-	# 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
+	$(BSD_INSTALL_PROGRAM) -m 755 dropbear $(DESTDIR)$(sbindir)
+	$(BSD_INSTALL_PROGRAM) -m 755 dropbearkey $(DESTDIR)$(bindir)
+	$(BSD_INSTALL_PROGRAM) -m 755 dropbearconvert $(DESTDIR)$(bindir)
+	${INSTALL_PROGRAM} dropbearkey $(DESTDIR)$(bindir)
+	${INSTALL_PROGRAM} dropbearconvert $(DESTDIR)$(bindir)
 
 
 static: dropbear-static dropbearkey-static dropbearconvert-static

Added Link Here

(-)dropbear/files/patch-includes.h (+11 lines)
1	--- includes.h.orig Tue Dec 16 11:02:22 2003
2	+++ includes.h Tue Dec 16 11:02:43 2003
3	@@ -38,7 +38,7 @@
4	#include <sys/time.h>
5	#include <sys/un.h>
6	#include <sys/wait.h>
7	-#include <sys/dir.h>
8	+#include <sys/dirent.h>
9
10	#include <stdio.h>
11	#include <errno.h>

Return to bug 60296

Lines 6-12 Link Here

(-)dropbear/Makefile (-13 / +14 lines)
6	#	6	#
7		7
8	PORTNAME= dropbear	8	PORTNAME= dropbear
9	PORTVERSION= 0.38	9	PORTVERSION= 0.39
10	CATEGORIES= security ipv6	10	CATEGORIES= security ipv6
11	MASTER_SITES= http://matt.ucc.asn.au/dropbear/releases/	11	MASTER_SITES= http://matt.ucc.asn.au/dropbear/releases/
12		12
Lines 17-41 Link Here
17	USE_GMAKE= YES	17	USE_GMAKE= YES
18	USE_REINPLACE= YES	18	USE_REINPLACE= YES
19		19
20	.if defined(IS_STATIC)	20	.if defined(WANT_STATIC)
21	CONFIGURE_ENV= LDFLAGS=-static	21	CONFIGURE_ENV= LDFLAGS=-static
22	.endif	22	.endif
23		23
24	MAKE_ENV+= INSTALL="${INSTALL}" INSTALL_PROGRAM="${INSTALL_PROGRAM}"	24	post-patch:
25	post-configure:	25	@${REINPLACE_CMD} -e "s,_PRIV_FILENAME \"/etc/,_PRIV_FILENAME \"${PREFIX}/etc/,g; \
26	@${REINPLACE_CMD} -e "s,/etc/,${PREFIX}/etc/,g" ${WRKSRC}/options.h	26	s,/usr/bin/X11/,${X11BASE}/,g" ${WRKSRC}/options.h
27	@${REINPLACE_CMD} -e "s,/usr/bin/X11/,${X11BASE}/,g" ${WRKSRC}/options.h	27	@${SED} -e 's:__PREFIX__:${PREFIX}:g' \
28	@${REINPLACE_CMD} -e "s,^typedef int socklen_t,//typedef int socklen_t," \
29	${WRKSRC}/includes.h
30	${SED} -e 's:__PREFIX__:${PREFIX}:g' \
31	${FILESDIR}/dropbear.sh > ${WRKSRC}/dropbear.sh	28	${FILESDIR}/dropbear.sh > ${WRKSRC}/dropbear.sh
32		29
33	post-install:	30	post-install:
34	@${MKDIR} ${PREFIX}/etc/dropbear	31	@${MKDIR} ${PREFIX}/etc/dropbear
35	.if !defined(NOPORTDOC)	32	@${ECHO_MSG} ""
36	@${MKDIR} ${DOCSDIR}
37	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
38	.endif
39	@${INSTALL_SCRIPT} ${WRKSRC}/dropbear.sh ${PREFIX}/etc/rc.d/dropbear.sh.sample	33	@${INSTALL_SCRIPT} ${WRKSRC}/dropbear.sh ${PREFIX}/etc/rc.d/dropbear.sh.sample
		34	@${ECHO_MSG} " Now you have to create your SSH host key."
		35	@${ECHO_MSG} ""
		36	@${ECHO_MSG} " To create RSA key:"
		37	@${ECHO_MSG} " ${PREFIX}/sbin/dropbearkey -t rsa -f ${PREFIX}/etc/dropbear/dropbear_rsa_host_key"
		38	@${ECHO_MSG} ""
		39	@${ECHO_MSG} " For more details, run ${PREFIX}/sbin/dropbearkey -h"
		40	@${ECHO_MSG} ""
40		41
41	.include <bsd.port.mk>	42	.include <bsd.port.mk>

Lines 1-22 Link Here

(-)dropbear/files/patch-Makefile.in (-14 / +13 lines)
1	--- Makefile.in.orig Sat Oct 11 10:08:19 2003	1	--- Makefile.in.orig Tue Dec 16 06:14:06 2003
2	+++ Makefile.in Sat Oct 11 14:58:58 2003	2	+++ Makefile.in Tue Dec 16 10:57:36 2003
3	@@ -46,14 +46,11 @@	3	@@ -53,15 +53,9 @@
4	-strip dropbearconvert	4	-$(STRIP) dropbearconvert
5		5
6	install: all	6	install: all
7	- install -d -m 755 $(DESTDIR)$(sbindir)	7	- $(INSTALL) -d -m 755 $(DESTDIR)$(sbindir)
8	- install -d -m 755 $(DESTDIR)$(bindir)	8	- $(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
9	- install -m 755 dropbear $(DESTDIR)$(sbindir)	9	- $(INSTALL) -m 755 dropbear $(DESTDIR)$(sbindir)
10	- install -m 755 dropbearkey $(DESTDIR)$(bindir)	10	- $(INSTALL) -m 755 dropbearkey $(DESTDIR)$(bindir)
11	- install -m 755 dropbearconvert $(DESTDIR)$(bindir)	11	- $(INSTALL) -m 755 dropbearconvert $(DESTDIR)$(bindir)
		12	- # chown might fail, so do it separately to the install
12	- -chown root:root $(DESTDIR)$(sbindir)/dropbear	13	- -chown root:root $(DESTDIR)$(sbindir)/dropbear
13	- -chown root:root $(DESTDIR)$(bindir)/dropbearkey	14	- -chown root:root $(DESTDIR)$(bindir)/dropbearkey
14	- -chown root:root $(DESTDIR)$(bindir)/dropbearconvert	15	- -chown root:root $(DESTDIR)$(bindir)/dropbearconvert
15	+ ${INSTALL} -d -m 755 $(DESTDIR)$(sbindir)	16	+ $(BSD_INSTALL_PROGRAM) -m 755 dropbear $(DESTDIR)$(sbindir)
16	+ ${INSTALL} -d -m 755 $(DESTDIR)$(bindir)	17	+ $(BSD_INSTALL_PROGRAM) -m 755 dropbearkey $(DESTDIR)$(bindir)
17	+ ${INSTALL_PROGRAM} dropbear $(DESTDIR)$(sbindir)	18	+ $(BSD_INSTALL_PROGRAM) -m 755 dropbearconvert $(DESTDIR)$(bindir)
18	+ ${INSTALL_PROGRAM} dropbearkey $(DESTDIR)$(bindir)
19	+ ${INSTALL_PROGRAM} dropbearconvert $(DESTDIR)$(bindir)
20		19
21		20
22	static: dropbear-static dropbearkey-static dropbearconvert-static	21	static: dropbear-static dropbearkey-static dropbearconvert-static