Import of pkgsrc-2014Q1
This commit is contained in:
@@ -1,20 +1,23 @@
|
||||
# $NetBSD: Makefile,v 1.27 2012/10/23 18:16:26 asau Exp $
|
||||
# $NetBSD: Makefile,v 1.31 2014/03/14 22:40:17 agc Exp $
|
||||
|
||||
DISTNAME= dropbear-2012.55
|
||||
DISTNAME= dropbear-2013.62
|
||||
CATEGORIES= security
|
||||
MASTER_SITES= http://matt.ucc.asn.au/dropbear/releases/
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
MAINTAINER= snj@NetBSD.org
|
||||
HOMEPAGE= http://matt.ucc.asn.au/dropbear/dropbear.html
|
||||
COMMENT= Small SSH2 server and client, aimed at embedded market
|
||||
LICENSE= modified-bsd
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_TOOLS+= gmake
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
|
||||
USE_TOOLS+= gmake
|
||||
|
||||
PKG_OPTIONS_VAR= PKG_OPTIONS.dropbear
|
||||
PKG_SUPPORTED_OPTIONS= pam
|
||||
|
||||
.include "../../mk/bsd.prefs.mk"
|
||||
.include "../../mk/bsd.options.mk"
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mpam)
|
||||
@@ -27,39 +30,28 @@ SUBST_FILES.pam= options.h
|
||||
SUBST_SED.pam= -e "s/ENABLE_SVR_PASSWORD_AUTH/ENABLE_SVR_PAM_AUTH/"
|
||||
.endif
|
||||
|
||||
MAKEFLAGS+= ROOT_USER=${ROOT_USER:Q} ROOT_GROUP=${ROOT_GROUP:Q}
|
||||
|
||||
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
|
||||
CPPFLAGS+= -D_PATH_SSH_PROGRAM="\"${PREFIX}/bin/dbclient\""
|
||||
|
||||
# XXX use base xauth if present, otherwise _ass_ume pkgsrc. better than nothing
|
||||
.if exists(${X11BASE}/bin/xauth)
|
||||
CPPFLAGS+=-DXAUTH_COMMAND="\"${X11BASE}/bin/xauth\""
|
||||
.else
|
||||
CPPFLAGS+=-DXAUTH_COMMAND="\"${X11PREFIX}/bin/xauth\""
|
||||
.endif
|
||||
.include "../../x11/xauth/builtin.mk"
|
||||
|
||||
CPPFLAGS+= -DXAUTH_COMMAND="\"${XAUTHBASE}/bin/xauth\""
|
||||
|
||||
CFLAGS.NetBSD+= -DHAVE_NETINET_IN_SYSTM_H
|
||||
|
||||
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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
$NetBSD: distinfo,v 1.19 2012/08/13 17:47:26 drochner Exp $
|
||||
$NetBSD: distinfo,v 1.22 2014/01/31 17:32:19 agc Exp $
|
||||
|
||||
SHA1 (dropbear-2012.55.tar.gz) = 2c65dd1f423884a38079f5e4386c698015222279
|
||||
RMD160 (dropbear-2012.55.tar.gz) = 1eff6fa5260e938a4b34cf426a6d29fe1e9e4a34
|
||||
Size (dropbear-2012.55.tar.gz) = 1774927 bytes
|
||||
SHA1 (patch-aa) = 01bf4d80c4e76f9a60341b448cd7e77b2a03c286
|
||||
SHA1 (patch-ab) = 911a0525f309386901d32c23404d13ae67c2e2d1
|
||||
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) = d5cc422972ad8bf0dc016cd568d55f258f052ed0
|
||||
SHA1 (patch-ab) = 35d96409e8763b6e79533c1f05dce02924092c55
|
||||
|
||||
@@ -1,49 +1,80 @@
|
||||
$NetBSD: patch-aa,v 1.8 2007/09/06 19:15:10 jlam Exp $
|
||||
$NetBSD: patch-aa,v 1.10 2014/01/31 17:32:19 agc Exp $
|
||||
|
||||
--- Makefile.in.orig 2007-08-08 11:39:35.000000000 -0400
|
||||
+++ Makefile.in
|
||||
@@ -62,6 +62,7 @@ prefix=@prefix@
|
||||
exec_prefix=${prefix}
|
||||
bindir=${exec_prefix}/bin
|
||||
sbindir=${exec_prefix}/sbin
|
||||
use pkgsrc macros to install programs and man pages
|
||||
set up dropbear default key locations correctly
|
||||
|
||||
--- Makefile.in.orig 2013-12-03 05:39:15.000000000 -0800
|
||||
+++ Makefile.in 2014-01-29 16:14:08.000000000 -0800
|
||||
@@ -73,6 +73,7 @@
|
||||
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 @@
|
||||
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
|
||||
@@ -125,31 +129,30 @@
|
||||
install: $(addprefix inst_, $(TARGETS))
|
||||
|
||||
insmultidropbear: dropbearmulti
|
||||
- $(INSTALL) -d $(DESTDIR)$(sbindir)
|
||||
+ $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(sbindir)
|
||||
-rm -f $(DESTDIR)$(sbindir)/dropbear$(EXEEXT)
|
||||
-ln -s $(bindir)/dropbearmulti$(EXEEXT) $(DESTDIR)$(sbindir)/dropbear$(EXEEXT)
|
||||
- $(INSTALL) -d $(DESTDIR)$(mandir)/man8
|
||||
- $(INSTALL) -m 644 dropbear.8 $(DESTDIR)$(mandir)/man8/dropbear.8
|
||||
+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man8
|
||||
+ $(BSD_INSTALL_MAN) dropbear.8 $(DESTDIR)$(mandir)/man8/dropbear.8
|
||||
|
||||
insmulti%: dropbearmulti
|
||||
- $(INSTALL) -d $(DESTDIR)$(bindir)
|
||||
- -rm -f $(DESTDIR)$(bindir)/$*$(EXEEXT)
|
||||
+ $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir)
|
||||
-ln -s $(bindir)/dropbearmulti$(EXEEXT) $(DESTDIR)$(bindir)/$*$(EXEEXT)
|
||||
- $(INSTALL) -d $(DESTDIR)$(mandir)/man1
|
||||
- $(INSTALL) -m 644 $*.1 $(DESTDIR)$(mandir)/man1/$*.1
|
||||
+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1
|
||||
+ $(BSD_INSTALL_MAN) $*.1 $(DESTDIR)$(mandir)/man1/$*.1
|
||||
|
||||
# dropbear should go in sbin, so it needs a seperate rule
|
||||
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)
|
||||
+ -chown ${ROOT_USER} $(DESTDIR)$(sbindir)/dropbear$(EXEEXT)
|
||||
+ -chgrp ${ROOT_GROUP} $(DESTDIR)$(sbindir)/dropbear$(EXEEXT)
|
||||
- $(INSTALL) -d $(DESTDIR)$(sbindir)
|
||||
- $(INSTALL) dropbear$(EXEEXT) $(DESTDIR)$(sbindir)
|
||||
- $(INSTALL) -d $(DESTDIR)$(mandir)/man8
|
||||
- $(INSTALL) -m 644 dropbear.8 $(DESTDIR)$(mandir)/man8/dropbear.8
|
||||
+ $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(sbindir)
|
||||
+ $(BSD_INSTALL_PROGRAM) dropbear$(EXEEXT) $(DESTDIR)$(sbindir)
|
||||
+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man8
|
||||
+ $(BSD_INSTALL_MAN) 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)
|
||||
+ -chown ${ROOT_USER} $(DESTDIR)$(bindir)/$*$(EXEEXT)
|
||||
+ -chgrp ${ROOT_GROUP} $(DESTDIR)$(bindir)/$*$(EXEEXT)
|
||||
- $(INSTALL) -d $(DESTDIR)$(bindir)
|
||||
- $(INSTALL) $*$(EXEEXT) $(DESTDIR)$(bindir)
|
||||
- $(INSTALL) -d $(DESTDIR)$(mandir)/man1
|
||||
- if test -e $*.1; then $(INSTALL) -m 644 $*.1 $(DESTDIR)$(mandir)/man1/$*.1; fi
|
||||
+ $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir)
|
||||
+ $(BSD_INSTALL_PROGRAM) $*$(EXEEXT) $(DESTDIR)$(bindir)
|
||||
+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1
|
||||
+ if test -e $*.1; then $(BSD_INSTALL_MAN) $*.1 $(DESTDIR)$(mandir)/man1/$*.1; fi
|
||||
|
||||
inst_dropbearmulti: $(addprefix insmulti, $(PROGRAMS))
|
||||
|
||||
# for some reason the rule further down doesn't like $($@objs) as a prereq.
|
||||
@@ -181,7 +184,7 @@ link%:
|
||||
@@ -187,7 +190,7 @@
|
||||
-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)
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
$NetBSD: patch-ab,v 1.7 2009/08/26 21:10:11 snj Exp $
|
||||
$NetBSD: patch-ab,v 1.8 2014/01/31 17:32:19 agc Exp $
|
||||
|
||||
comment out the path to the dropbear ssh client
|
||||
- this is passed through CFLAGS
|
||||
|
||||
--- options.h.orig 2009-08-26 13:15:07.000000000 -0700
|
||||
+++ options.h 2009-08-26 13:15:14.000000000 -0700
|
||||
|
||||
Reference in New Issue
Block a user