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/patches | |
| 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/patches')
| -rw-r--r-- | security/dropbear/patches/patch-aa | 41 |
1 files changed, 20 insertions, 21 deletions
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) |