Import of pkgsrc-2013Q2

This commit is contained in:
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions

6
security/racoon2/DESCR Normal file
View File

@@ -0,0 +1,6 @@
The Racoon2 project is a joint effort which provides an implementation
of key management system for IPsec. The implementation is called
Racoon2, a successor of Racoon, which was developed by the KAME
project. It supports IKEv1, IKEv2, and KINK protocols. It works on
FreeBSD, NetBSD, Linux, and Mac OS X. Racoon2 is provided under a
BSD-style license.

111
security/racoon2/Makefile Normal file
View File

@@ -0,0 +1,111 @@
# $NetBSD: Makefile,v 1.5 2013/05/31 12:41:58 wiz Exp $
#
DISTNAME= racoon2-20100526a
PKGREVISION= 3
CATEGORIES= security net
MASTER_SITES= ftp://ftp.racoon2.wide.ad.jp/pub/racoon2/
EXTRACT_SUFX= .tgz
MAINTAINER= kamada@nanohz.org
HOMEPAGE= http://www.racoon2.wide.ad.jp/
COMMENT= IPsec key management system (IKEv2, IKEv1, and KINK)
GNU_CONFIGURE= yes
INSTALL_UNSTRIPPED= yes
USE_TOOLS+= grep sed flex yacc
USE_TOOLS+= gzip:run perl:run # used by pskgen
# @perl_bindir@ will be /usr/pkgsrc/security/racoon2/work/.tools/bin/perl.
# REPLACE_PERL cannot be used, since @perl_bindir@ does not match its pattern.
REPLACE_INTERPRETER+= perl
REPLACE.perl.old= @perl_bindir@
REPLACE.perl.new= ${PERL5}
REPLACE_FILES.perl= pskgen/pskgen.in
SUBST_CLASSES+= cf-path
SUBST_STAGE.cf-path= pre-configure
SUBST_MESSAGE.cf-path= Fixing config file paths.
SUBST_FILES.cf-path= samples/racoon2.conf.in samples/vals.conf.in
SUBST_SED.cf-path= -e 's,"@prefix@/etc/racoon2/,"${PKG_SYSCONFDIR}/,g'
SUBST_CLASSES+= hk-path
SUBST_STAGE.hk-path= pre-configure
SUBST_MESSAGE.hk-path= Fixing hook script paths.
SUBST_FILES.hk-path= samples/child-up.in samples/child-down.in \
samples/child-rekey.in \
samples/ikesa-up.in samples/ikesa-down.in \
samples/ikesa-rekey.in \
samples/migration.in \
samples/ph1-up.in samples/ph1-down.in
SUBST_SED.hk-path= -e 's,cd @prefix@/etc/racoon2/,cd ${PKG_SYSCONFDIR}/,g'
PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
DOCDIR= ${PREFIX}/share/doc/${PKGBASE}
BUILD_DEFS+= PKG_SYSCONFBASE
BUILD_DEFS+= VARBASE
PKG_SYSCONFSUBDIR= racoon2
CONF_FILES_PERMS= ${EGDIR}/default.conf ${PKG_SYSCONFDIR}/default.conf \
${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 600
CONF_FILES_PERMS+= ${EGDIR}/racoon2.conf ${PKG_SYSCONFDIR}/racoon2.conf \
${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 600
CONF_FILES_PERMS+= ${EGDIR}/vals.conf ${PKG_SYSCONFDIR}/vals.conf \
${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 600
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
MAKE_DIRS_PERMS+= ${VARBASE}/run/racoon2 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
RCD_SCRIPTS= iked kinkd spmd racoon2
RCD_SCRIPT_SRC.iked= ${WRKSRC}/samples/rc.d-iked
RCD_SCRIPT_SRC.kinkd= ${WRKSRC}/samples/rc.d-kinkd
RCD_SCRIPT_SRC.spmd= ${WRKSRC}/samples/rc.d-spmd
RCD_SCRIPT_SRC.racoon2= ${WRKSRC}/samples/rc.d-racoon2
CONFIGURE_ARGS+= --disable-startup-scripts
SAMPLE_CONFS= default.conf racoon2.conf vals.conf \
transport_ike.conf tunnel_ike.conf \
tunnel_ike_natt.conf \
transport_kink.conf tunnel_kink.conf \
local-test.conf
SAMPLE_HOOKS= child-up child-down child-rekey \
ikesa-up ikesa-down ikesa-rekey \
migration \
ph1-up ph1-down
DOCS= COPYRIGHT README NEWS \
doc/INSTALL doc/USAGE doc/cfg-usage.txt \
doc/config-usage.txt
.include "options.mk"
post-install:
${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
for file in ${SAMPLE_CONFS}; do \
${INSTALL_DATA} ${WRKSRC}/samples/$$file ${DESTDIR}${EGDIR}; \
done
${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}/hook
${INSTALL_SCRIPT} ${WRKSRC}/samples/functions ${DESTDIR}${EGDIR}/hook
for file in ${SAMPLE_HOOKS}; do \
${INSTALL_SCRIPT} ${WRKSRC}/samples/$$file ${DESTDIR}${EGDIR}/hook; \
${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}/hook/$$file.d; \
done
${INSTALL_SCRIPT} ${WRKSRC}/samples/00ikesaup_sample ${DESTDIR}${EGDIR}/hook/ikesa-up.d
${INSTALL_SCRIPT} ${WRKSRC}/samples/00childup_sample ${DESTDIR}${EGDIR}/hook/child-up.d
${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
for file in ${DOCS}; do \
${INSTALL_DATA} ${WRKSRC}/$$file ${DESTDIR}${DOCDIR}; \
done
.if !empty(PKG_OPTIONS:Mkinkd)
KRB5_ACCEPTED= heimdal mit-krb5
BUILDLINK_API_DEPENDS.heimdal+= heimdal>=0.6.0
BUILDLINK_API_DEPENDS.mit-krb5+= mit-krb5>=1.4.0
. include "../../mk/krb5.buildlink3.mk"
.endif
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

66
security/racoon2/PLIST Normal file
View File

@@ -0,0 +1,66 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2012/01/11 20:08:39 drochner Exp $
${IKED}man/man8/iked.8
${KINKD}man/man8/kinkd.8
man/man8/pskgen.8
man/man8/spmd.8
man/man8/spmdctl.8
${IKED}sbin/iked
${KINKD}sbin/kinkd
sbin/pskgen
sbin/spmd
sbin/spmdctl
share/doc/racoon2/COPYRIGHT
share/doc/racoon2/README
share/doc/racoon2/NEWS
share/doc/racoon2/INSTALL
share/doc/racoon2/USAGE
share/doc/racoon2/cfg-usage.txt
share/doc/racoon2/config-usage.txt
share/examples/racoon2/default.conf
share/examples/racoon2/racoon2.conf
share/examples/racoon2/vals.conf
share/examples/racoon2/transport_ike.conf
share/examples/racoon2/tunnel_ike.conf
share/examples/racoon2/tunnel_ike_natt.conf
share/examples/racoon2/transport_kink.conf
share/examples/racoon2/tunnel_kink.conf
share/examples/racoon2/local-test.conf
share/examples/racoon2/hook/functions
share/examples/racoon2/hook/child-up
share/examples/racoon2/hook/child-up.d/00childup_sample
share/examples/racoon2/hook/child-down
share/examples/racoon2/hook/child-rekey
share/examples/racoon2/hook/ikesa-up
share/examples/racoon2/hook/ikesa-up.d/00ikesaup_sample
share/examples/racoon2/hook/ikesa-down
share/examples/racoon2/hook/ikesa-rekey
share/examples/racoon2/hook/migration
share/examples/racoon2/hook/ph1-up
share/examples/racoon2/hook/ph1-down
share/examples/rc.d/iked
share/examples/rc.d/kinkd
share/examples/rc.d/racoon2
share/examples/rc.d/spmd
@dirrm share/doc/racoon2
@exec ${MKDIR} %D/share/examples/racoon2/hook/child-up.d
@exec ${MKDIR} %D/share/examples/racoon2/hook/child-down.d
@exec ${MKDIR} %D/share/examples/racoon2/hook/child-rekey.d
@exec ${MKDIR} %D/share/examples/racoon2/hook/ikesa-up.d
@exec ${MKDIR} %D/share/examples/racoon2/hook/ikesa-down.d
@exec ${MKDIR} %D/share/examples/racoon2/hook/ikesa-rekey.d
@exec ${MKDIR} %D/share/examples/racoon2/hook/migration.d
@exec ${MKDIR} %D/share/examples/racoon2/hook/ph1-up.d
@exec ${MKDIR} %D/share/examples/racoon2/hook/ph1-down.d
@dirrm share/examples/racoon2/hook/child-up.d
@dirrm share/examples/racoon2/hook/child-down.d
@dirrm share/examples/racoon2/hook/child-rekey.d
@dirrm share/examples/racoon2/hook/ikesa-up.d
@dirrm share/examples/racoon2/hook/ikesa-down.d
@dirrm share/examples/racoon2/hook/ikesa-rekey.d
@dirrm share/examples/racoon2/hook/migration.d
@dirrm share/examples/racoon2/hook/ph1-up.d
@dirrm share/examples/racoon2/hook/ph1-down.d
@dirrm share/examples/racoon2/hook
@dirrm share/examples/racoon2
@exec %D/sbin/pskgen -r -o ${PKG_SYSCONFDIR}/spmd.pwd
@unexec ${RM} ${PKG_SYSCONFDIR}/spmd.pwd

13
security/racoon2/distinfo Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: distinfo,v 1.3 2013/03/29 13:52:45 joerg Exp $
SHA1 (racoon2-20100526a.tgz) = 268429af8a031dbbc279580cf98ea18331f0e2d9
RMD160 (racoon2-20100526a.tgz) = 014cdcf78cc82ab21235a21491850cdcd1f883bf
Size (racoon2-20100526a.tgz) = 1017077 bytes
SHA1 (patch-aa) = e3bc810f72dac266bec992f0430572b00768cc22
SHA1 (patch-ab) = eb6d901108ebcca90571851817137b4b3f3c594b
SHA1 (patch-ac) = 081a2d3d694d4c20cf1fa2d9718577577280288e
SHA1 (patch-ad) = 0d04dc7027c100de6bc04db00eddb30a12fd8715
SHA1 (patch-ae) = 937cf84a2b6f1e8f8d288703a0556faf500bab95
SHA1 (patch-lib_cfparse.y) = 9e0b8ec9c09c315edde171103b97a8c403ba748e
SHA1 (patch-lib_cfsetup.c) = 70c2409bc69ff85cef6d2e2b4e222e12537c323e
SHA1 (patch-lib_if__pfkeyv2.c) = 9eb969ff0f289bc7c4aa1fa234c221b4d70d1da7

View File

@@ -0,0 +1,33 @@
# $NetBSD: options.mk,v 1.1.1.1 2012/01/11 20:08:39 drochner Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.racoon2
PKG_SUPPORTED_OPTIONS= iked kinkd
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "Darwin"
PKG_SUPPORTED_OPTIONS:= ${PKG_SUPPORTED_OPTIONS:Nkinkd}
PKG_SUGGESTED_OPTIONS:= ${PKG_SUGGESTED_OPTIONS:Nkinkd}
.else
PKG_SUGGESTED_OPTIONS= iked kinkd
.endif
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Miked)
PLIST_SUBST+= IKED=""
.else
CONFIGURE_ARGS+= --disable-iked
PLIST_SUBST+= IKED="@comment "
.endif
.if !empty(PKG_OPTIONS:Mkinkd)
PLIST_SUBST+= KINKD=""
.else
CONFIGURE_ARGS+= --disable-kinkd
PLIST_SUBST+= KINKD="@comment "
.endif
.if ${OPSYS} == "Darwin"
CONFIGURE_ARGS+= --disable-natt
.endif

View File

@@ -0,0 +1,16 @@
$NetBSD: patch-aa,v 1.1.1.1 2012/01/11 20:08:39 drochner Exp $
Don't mess up user's configuration files.
--- samples/Makefile.in.orig 2007-12-27 10:08:52.000000000 +0900
+++ samples/Makefile.in 2007-12-27 10:08:52.000000000 +0900
@@ -11,8 +11,7 @@
# empty
all:
-install: all install-startup-@startup_scripts@ install-samples install-hook
- $(INSTALL) -d -o 0 -g 0 -m 700 /var/run/racoon2
+install: all install-startup-@startup_scripts@
install-samples:
$(INSTALL) -d $(sysconfdir)

View File

@@ -0,0 +1,22 @@
$NetBSD: patch-ab,v 1.1.1.1 2012/01/11 20:08:39 drochner Exp $
This should be done when installing the package (Makefile when
"make install" or PLIST when "pkg_add").
--- pskgen/Makefile.in.orig 2007-12-12 07:12:22.000000000 +0000
+++ pskgen/Makefile.in
@@ -17,11 +17,9 @@ PROG=pskgen
all:
install: all
- $(INSTALL) -d $(sbindir)
- $(INSTALL_SCRIPT) $(PROG) $(sbindir)
- $(INSTALL_DATA) $(PROG).8 $(mandir)/man8
- $(INSTALL) -d $(prefix)/etc/racoon2
- sh ./autogen.spmd.pwd
+ $(INSTALL) -d $(DESTDIR)$(sbindir)
+ $(INSTALL_SCRIPT) $(PROG) $(DESTDIR)$(sbindir)
+ $(INSTALL_DATA) $(PROG).8 $(DESTDIR)$(mandir)/man8
depend:

View File

@@ -0,0 +1,21 @@
$NetBSD: patch-ac,v 1.1.1.1 2012/01/11 20:08:39 drochner Exp $
--- spmd/Makefile.in.orig 2006-06-23 10:21:59.000000000 +0000
+++ spmd/Makefile.in
@@ -38,11 +38,11 @@ spmdctl: spmdctl.o ../lib/libracoon.a
spmdctl.o: spmd_internal.h
install: all
- $(INSTALL_DIR) $(sbindir)
- $(INSTALL_PROGRAM) $(DAEMON) $(sbindir)
- $(INSTALL_PROGRAM) $(COMMAND) $(sbindir)
- $(INSTALL_DIR) $(man8dir)
- $(INSTALL_DATA) $(MANFILES) $(man8dir)
+ $(INSTALL_DIR) $(DESTDIR)$(sbindir)
+ $(INSTALL_PROGRAM) $(DAEMON) $(DESTDIR)$(sbindir)
+ $(INSTALL_PROGRAM) $(COMMAND) $(DESTDIR)$(sbindir)
+ $(INSTALL_DIR) $(DESTDIR)$(man8dir)
+ $(INSTALL_DATA) $(MANFILES) $(DESTDIR)$(man8dir)
clean:
-rm -f $(TARGET) *.o $(COMMAND)

View File

@@ -0,0 +1,25 @@
$NetBSD: patch-ad,v 1.1.1.1 2012/01/11 20:08:39 drochner Exp $
--- iked/Makefile.in.orig 2009-03-27 07:24:26.000000000 +0000
+++ iked/Makefile.in
@@ -66,16 +66,16 @@ all: $(PROG) $(TESTPROG)
install: install-prog install-doc
install-prog: $(PROG)
- $(INSTALL) -d $(sbindir)
- $(INSTALL_PROGRAM) $(PROG) $(sbindir)
+ $(INSTALL) -d $(DESTDIR)$(sbindir)
+ $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)
install-doc:
- $(INSTALL) -d $(mandir)/man8
+ $(INSTALL) -d $(DESTDIR)$(mandir)/man8
# not friendly with -n :-(
sysconfdir="$$(echo '$(sysconfdir)' | sed 's/%/\\\%/g')"; \
for f in $(MAN); do \
sed -e s%\@sysconfdir\@%"$$sysconfdir"%g < $$f > $${f}.tmp; \
- $(INSTALL_DATA) $${f}.tmp $(mandir)/man$${f##*.}/$$f; \
+ $(INSTALL_DATA) $${f}.tmp $(DESTDIR)$(mandir)/man$${f##*.}/$$f; \
rm $${f}.tmp; \
done

View File

@@ -0,0 +1,23 @@
$NetBSD: patch-ae,v 1.1.1.1 2012/01/11 20:08:39 drochner Exp $
--- kinkd/Makefile.in.orig 2010-05-07 18:42:30.000000000 +0000
+++ kinkd/Makefile.in
@@ -49,14 +49,14 @@ $(PROG): ../lib/libracoon.a
../lib/libracoon.a: # check its timestamp only when there is.
install: all
- $(INSTALL) -d $(sbindir)
- $(INSTALL_PROGRAM) $(PROG) $(sbindir)
- $(INSTALL) -d $(mandir)/man8
+ $(INSTALL) -d $(DESTDIR)$(sbindir)
+ $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)
+ $(INSTALL) -d $(DESTDIR)$(mandir)/man8
# not friendly with -n :-(
sysconfdir="$$(echo '$(sysconfdir)' | sed 's/%/\\\%/g')"; \
for f in $(MAN); do \
sed -e s%\@sysconfdir\@%"$$sysconfdir"%g < $$f > $${f}.tmp; \
- $(INSTALL_DATA) $${f}.tmp $(mandir)/man$${f##*.}/$$f; \
+ $(INSTALL_DATA) $${f}.tmp $(DESTDIR)$(mandir)/man$${f##*.}/$$f; \
rm $${f}.tmp; \
done

View File

@@ -0,0 +1,15 @@
$NetBSD: patch-lib_cfparse.y,v 1.1 2013/03/29 13:52:45 joerg Exp $
Fix type mismatch to avoid compilation error.
--- lib/cfparse.y.orig 2009-02-02 17:49:18.000000000 +0900
+++ lib/cfparse.y 2013-03-29 21:31:04.000000000 +0900
@@ -1712,7 +1712,7 @@
int n;
char *bp;
struct cf_list *new;
- rcf_t type;
+ rc_type type;
n = strtoll(str, &bp, 10);

View File

@@ -0,0 +1,23 @@
$NetBSD: patch-lib_cfsetup.c,v 1.1 2012/12/15 08:10:59 marino Exp $
Fix "error: variable 'va' set but not used" errors on gcc4.6+
--- lib/cfsetup.c.orig 2008-11-13 05:59:53.000000000 +0000
+++ lib/cfsetup.c
@@ -3026,7 +3026,6 @@ rcf_fix_addrlist(struct cf_list *head, s
{
struct rc_addrlist *new_head = 0, *new = 0, **lastap;
struct cf_list *n, *m;
- rc_vchar_t va;
struct rc_addrlist *al = 0;
char port[10];
int nport;
@@ -3060,8 +3059,6 @@ rcf_fix_addrlist(struct cf_list *head, s
"at %d in %s\n", m->lineno, m->file);
goto err;
}
- va.l = strlen(n->d.str);
- va.v = n->d.str;
error = rcs_getaddrlist(n->d.str, port, RCT_ADDR_FQDN, &al);
if (error) {
plog(PLOG_INTERR, PLOGLOC, NULL,

View File

@@ -0,0 +1,26 @@
$NetBSD: patch-lib_if__pfkeyv2.c,v 1.1 2012/12/15 08:10:59 marino Exp $
Fix "error: variable 'keytype' set but not used" errors on gcc4.6+
--- lib/if_pfkeyv2.c.orig 2008-04-25 06:02:56.000000000 +0000
+++ lib/if_pfkeyv2.c
@@ -1139,19 +1139,16 @@ rcpfk_set_sadbkey(rc_vchar_t **msg, stru
{
rc_vchar_t *buf;
struct sadb_key *p;
- int keytype;
size_t keylen;
caddr_t key;
int len, prevlen, extlen;
switch (type) {
case SADB_EXT_KEY_AUTH:
- keytype = rct2pfk_authtype(rc->authtype);
key = rc->authkey;
keylen = rc->authkeylen;
break;
case SADB_EXT_KEY_ENCRYPT:
- keytype = rct2pfk_enctype(rc->enctype);
key = rc->enckey;
keylen = rc->enckeylen;
break;