diff options
author | jlam <jlam> | 2007-09-06 19:15:10 +0000 |
---|---|---|
committer | jlam <jlam> | 2007-09-06 19:15:10 +0000 |
commit | 37c160c7d7f188e3b85c8a58d2c43be42fda9c31 (patch) | |
tree | fdbbf428276571bf29673fbd4c214d6490c79b65 /security | |
parent | a79702feeb920241733f33a8520519817ec672e2 (diff) | |
download | pkgsrc-37c160c7d7f188e3b85c8a58d2c43be42fda9c31.tar.gz |
Honor PKG_SYSCONFDIR. The default host keys for dropbear are now found in
${PKG_SYSCONFDIR}/dropbear. Bump the PKGREVISION to 2.
Diffstat (limited to 'security')
-rw-r--r-- | security/dropbear/Makefile | 12 | ||||
-rw-r--r-- | security/dropbear/distinfo | 4 | ||||
-rw-r--r-- | security/dropbear/patches/patch-aa | 25 |
3 files changed, 33 insertions, 8 deletions
diff --git a/security/dropbear/Makefile b/security/dropbear/Makefile index 8916a7d8d2b..7a2c35eddeb 100644 --- a/security/dropbear/Makefile +++ b/security/dropbear/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.22 2007/09/06 16:31:55 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2007/09/06 19:15:10 jlam Exp $ DISTNAME= dropbear-0.50 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= security MASTER_SITES= http://matt.ucc.asn.au/dropbear/releases/ @@ -12,6 +12,8 @@ COMMENT= SSH2 server, aimed at embedded market GNU_CONFIGURE= yes USE_TOOLS+= gmake +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} + PKG_OPTIONS_VAR= PKG_OPTIONS.dropbear PKG_SUPPORTED_OPTIONS= pam .include "../../mk/bsd.options.mk" @@ -23,6 +25,12 @@ CONFIGURE_ARGS+= --enable-pam MAKEFLAGS+= ROOT_USER=${ROOT_USER:Q} ROOT_GROUP=${ROOT_GROUP:Q} +SUBST_CLASSES+= config +SUBST_MESSAGE.config= Fixing path to config directory. +SUBST_STAGE.config= post-build +SUBST_FILES.config= dropbear.8 dropbearkey.8 +SUBST_SED.config= -e "s,/etc/dropbear/,"${PKG_SYSCONFDIR:Q}"/dropbear/,g" + INSTALLATION_DIRS= ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 post-install: diff --git a/security/dropbear/distinfo b/security/dropbear/distinfo index 4ef162a2d68..f6bcda46743 100644 --- a/security/dropbear/distinfo +++ b/security/dropbear/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.15 2007/09/06 16:07:51 jlam Exp $ +$NetBSD: distinfo,v 1.16 2007/09/06 19:15:10 jlam Exp $ SHA1 (dropbear-0.50.tar.gz) = 6f56bc88bc29a99c58fe85c98a60249b9782ef36 RMD160 (dropbear-0.50.tar.gz) = c5e643cf068d6cdc19f5da8318ec90e0a0dfb0c3 Size (dropbear-0.50.tar.gz) = 1790358 bytes -SHA1 (patch-aa) = 3246fce39551e97f0b9ecd3397479ea2f3e22abd +SHA1 (patch-aa) = 01bf4d80c4e76f9a60341b448cd7e77b2a03c286 SHA1 (patch-ab) = 2eb7675e013edbe80b0e456dbaac310f1bb6cbbc SHA1 (patch-ac) = 69b1349bb47ad6a6ae02096f1ebde87a1461dd9b SHA1 (patch-af) = 356a8ac535d2d08ff9fd9fe7e84ae58181ce32a0 diff --git a/security/dropbear/patches/patch-aa b/security/dropbear/patches/patch-aa index fa383fc49ca..ef78ebe8c74 100644 --- a/security/dropbear/patches/patch-aa +++ b/security/dropbear/patches/patch-aa @@ -1,8 +1,25 @@ -$NetBSD: patch-aa,v 1.7 2005/07/19 18:07:59 drochner Exp $ +$NetBSD: patch-aa,v 1.8 2007/09/06 19:15:10 jlam Exp $ ---- Makefile.in.orig 2005-07-08 21:20:57.000000000 +0200 +--- Makefile.in.orig 2007-08-08 11:39:35.000000000 -0400 +++ Makefile.in -@@ -137,14 +137,14 @@ insmulti%: dropbearmulti +@@ -62,6 +62,7 @@ prefix=@prefix@ + exec_prefix=${prefix} + bindir=${exec_prefix}/bin + sbindir=${exec_prefix}/sbin ++sysconfdir=@sysconfdir@ + + CC=@CC@ + AR=@AR@ +@@ -85,6 +86,8 @@ ifneq (,$(strip $(foreach prog, $(PROGRA + CFLAGS+= -DDROPBEAR_CLIENT + endif + ++CFLAGS+=-DDSS_PRIV_FILENAME=\"$(sysconfdir)/dropbear/dropbear_dss_host_key\" ++CFLAGS+=-DRSA_PRIV_FILENAME=\"$(sysconfdir)/dropbear/dropbear_rsa_host_key\" + + # these are exported so that libtomcrypt's makefile will use them + export CC +@@ -137,14 +140,14 @@ insmulti%: dropbearmulti inst_dropbear: dropbear $(INSTALL) -d -m 755 $(DESTDIR)$(sbindir) $(INSTALL) -m 755 dropbear$(EXEEXT) $(DESTDIR)$(sbindir) @@ -21,7 +38,7 @@ $NetBSD: patch-aa,v 1.7 2005/07/19 18:07:59 drochner Exp $ # for some reason the rule further down doesn't like $($@objs) as a prereq. -@@ -181,7 +181,7 @@ link%: +@@ -181,7 +184,7 @@ link%: -ln -s dropbearmulti$(EXEEXT) $*$(EXEEXT) $(LTC): options.h |