diff options
author | drochner <drochner@pkgsrc.org> | 2014-01-27 19:53:06 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2014-01-27 19:53:06 +0000 |
commit | a00a86ee5b67de613bd2b3a07ea200ba64e0042c (patch) | |
tree | d200f15b5b3d4fb3155a9ca253ca995a924f6626 /security/dropbear | |
parent | 54f38f8032986944bf1316bc822f874d9458a9e8 (diff) | |
download | pkgsrc-a00a86ee5b67de613bd2b3a07ea200ba64e0042c.tar.gz |
update to 2013.62
changes:
-ECC (elliptic curve) support
-curve25519-sha256@libssh.org support
-misc fixes and improvements
approved by The Maintainer
Diffstat (limited to 'security/dropbear')
-rw-r--r-- | security/dropbear/Makefile | 15 | ||||
-rw-r--r-- | security/dropbear/PLIST | 6 | ||||
-rw-r--r-- | security/dropbear/distinfo | 10 | ||||
-rw-r--r-- | security/dropbear/patches/patch-aa | 41 |
4 files changed, 32 insertions, 40 deletions
diff --git a/security/dropbear/Makefile b/security/dropbear/Makefile index a6b51599c05..320e2e040f4 100644 --- a/security/dropbear/Makefile +++ b/security/dropbear/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.28 2013/09/14 03:40:01 mspo Exp $ +# $NetBSD: Makefile,v 1.29 2014/01/27 19:53:06 drochner Exp $ -DISTNAME= dropbear-2013.58 +DISTNAME= dropbear-2013.62 CATEGORIES= security MASTER_SITES= http://matt.ucc.asn.au/dropbear/releases/ @@ -35,7 +35,7 @@ OWN_DIRS+= ${PKG_SYSCONFDIR}/dropbear SUBST_CLASSES+= config SUBST_MESSAGE.config= Fixing path to config directory. SUBST_STAGE.config= post-build -SUBST_FILES.config= dropbear.8 dropbearkey.8 +SUBST_FILES.config= dropbear.8 dropbearkey.1 SUBST_SED.config= -e "s,/etc/dropbear/,"${PKG_SYSCONFDIR:Q}"/dropbear/,g" # used by dbscp @@ -57,17 +57,10 @@ INSTALLATION_DIRS= share/doc/dropbear ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 BUILD_TARGET= all scp post-install: - ${INSTALL_MAN} ${WRKSRC}/dbclient.1 \ - ${DESTDIR}/${PREFIX}/${PKGMANDIR}/man1 - ${INSTALL_MAN} ${WRKSRC}/dropbear.8 \ - ${DESTDIR}/${PREFIX}/${PKGMANDIR}/man8 - ${INSTALL_MAN} ${WRKSRC}/dropbearkey.8 \ - ${DESTDIR}/${PREFIX}/${PKGMANDIR}/man8 - ${INSTALL_DATA} ${WRKSRC}/README \ - ${DESTDIR}/${PREFIX}/share/doc/dropbear ${INSTALL_PROGRAM} ${WRKSRC}/scp ${DESTDIR}/${PREFIX}/bin/dbscp .include "../../devel/zlib/buildlink3.mk" .include "../../math/ltm/buildlink3.mk" +BUILDLINK_API_DEPENDS.libtomcrypt+= libtomcrypt>=1.17nb2 .include "../../security/libtomcrypt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/dropbear/PLIST b/security/dropbear/PLIST index 1759e0be19b..8d60007720a 100644 --- a/security/dropbear/PLIST +++ b/security/dropbear/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.5 2009/08/26 21:10:11 snj Exp $ +@comment $NetBSD: PLIST,v 1.6 2014/01/27 19:53:06 drochner Exp $ bin/dbclient bin/dbscp bin/dropbearconvert bin/dropbearkey man/man1/dbclient.1 +man/man1/dropbearconvert.1 +man/man1/dropbearkey.1 man/man8/dropbear.8 -man/man8/dropbearkey.8 sbin/dropbear -share/doc/dropbear/README diff --git a/security/dropbear/distinfo b/security/dropbear/distinfo index 6df5d14ce26..b904e7bf066 100644 --- a/security/dropbear/distinfo +++ b/security/dropbear/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.20 2013/09/14 03:40:01 mspo Exp $ +$NetBSD: distinfo,v 1.21 2014/01/27 19:53:06 drochner Exp $ -SHA1 (dropbear-2013.58.tar.bz2) = fdbc0ed332b17fc7579dbce6d95d585cf5d653d7 -RMD160 (dropbear-2013.58.tar.bz2) = 4eac17f92d90d06556034432e9a2f7bbd51e3eaa -Size (dropbear-2013.58.tar.bz2) = 1580584 bytes -SHA1 (patch-aa) = 01bf4d80c4e76f9a60341b448cd7e77b2a03c286 +SHA1 (dropbear-2013.62.tar.bz2) = 1d0abb6c46206a2c95b26a6f454844855f585403 +RMD160 (dropbear-2013.62.tar.bz2) = 0eff5a4caf353898d3f5d4518786b2ec2473554a +Size (dropbear-2013.62.tar.bz2) = 1598084 bytes +SHA1 (patch-aa) = d0ba545503307ff39745823fe3382cd7899aed1d SHA1 (patch-ab) = 911a0525f309386901d32c23404d13ae67c2e2d1 diff --git a/security/dropbear/patches/patch-aa b/security/dropbear/patches/patch-aa index ef78ebe8c74..9f6f6ac4b85 100644 --- a/security/dropbear/patches/patch-aa +++ b/security/dropbear/patches/patch-aa @@ -1,49 +1,48 @@ -$NetBSD: patch-aa,v 1.8 2007/09/06 19:15:10 jlam Exp $ +$NetBSD: patch-aa,v 1.9 2014/01/27 19:53:06 drochner Exp $ ---- Makefile.in.orig 2007-08-08 11:39:35.000000000 -0400 +--- Makefile.in.orig 2013-12-03 13:39:15.000000000 +0000 +++ Makefile.in -@@ -62,6 +62,7 @@ prefix=@prefix@ - exec_prefix=${prefix} - bindir=${exec_prefix}/bin - sbindir=${exec_prefix}/sbin +@@ -73,6 +73,7 @@ datarootdir = @datarootdir@ + bindir=@bindir@ + sbindir=@sbindir@ + mandir=@mandir@ +sysconfdir=@sysconfdir@ CC=@CC@ AR=@AR@ -@@ -85,6 +86,8 @@ ifneq (,$(strip $(foreach prog, $(PROGRA +@@ -96,6 +97,9 @@ 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\" ++CFLAGS+=-DECDSA_PRIV_FILENAME=\"$(sysconfdir)/dropbear/dropbear_ecdsa_host_key\" # these are exported so that libtomcrypt's makefile will use them export CC -@@ -137,14 +140,14 @@ insmulti%: dropbearmulti +@@ -142,12 +146,16 @@ insmulti%: dropbearmulti inst_dropbear: dropbear - $(INSTALL) -d -m 755 $(DESTDIR)$(sbindir) - $(INSTALL) -m 755 dropbear$(EXEEXT) $(DESTDIR)$(sbindir) -- -chown root $(DESTDIR)$(sbindir)/dropbear$(EXEEXT) -- -chgrp 0 $(DESTDIR)$(sbindir)/dropbear$(EXEEXT) + $(INSTALL) -d $(DESTDIR)$(sbindir) + $(INSTALL) dropbear$(EXEEXT) $(DESTDIR)$(sbindir) + -chown ${ROOT_USER} $(DESTDIR)$(sbindir)/dropbear$(EXEEXT) + -chgrp ${ROOT_GROUP} $(DESTDIR)$(sbindir)/dropbear$(EXEEXT) + $(INSTALL) -d $(DESTDIR)$(mandir)/man8 + $(INSTALL) -m 644 dropbear.8 $(DESTDIR)$(mandir)/man8/dropbear.8 inst_%: $* - $(INSTALL) -d -m 755 $(DESTDIR)$(bindir) - $(INSTALL) -m 755 $*$(EXEEXT) $(DESTDIR)$(bindir) -- -chown root $(DESTDIR)$(bindir)/$*$(EXEEXT) -- -chgrp 0 $(DESTDIR)$(bindir)/$*$(EXEEXT) + $(INSTALL) -d $(DESTDIR)$(bindir) + $(INSTALL) $*$(EXEEXT) $(DESTDIR)$(bindir) + -chown ${ROOT_USER} $(DESTDIR)$(bindir)/$*$(EXEEXT) + -chgrp ${ROOT_GROUP} $(DESTDIR)$(bindir)/$*$(EXEEXT) + $(INSTALL) -d $(DESTDIR)$(mandir)/man1 + if test -e $*.1; then $(INSTALL) -m 644 $*.1 $(DESTDIR)$(mandir)/man1/$*.1; fi - - # for some reason the rule further down doesn't like $($@objs) as a prereq. -@@ -181,7 +184,7 @@ link%: +@@ -187,7 +195,7 @@ link%: -ln -s dropbearmulti$(EXEEXT) $*$(EXEEXT) $(LTC): options.h -- cd libtomcrypt && $(MAKE) clean && $(MAKE) -+ cd libtomcrypt && $(MAKE) +- cd libtomcrypt && $(MAKE) ++ cd libtomcrypt && $(MAKE) clean && $(MAKE) $(LTM): options.h cd libtommath && $(MAKE) |