Index: head/security/ipsec-tools/Makefile =================================================================== --- head/security/ipsec-tools/Makefile (revision 378553) +++ head/security/ipsec-tools/Makefile (revision 378554) @@ -1,175 +1,180 @@ # Created by: vanhu # $FreeBSD$ # TODO: - libipsec issue ? # - cleanup... # - SYSCONFDIR # - $LOCALBASE/sbin/setkey Vs /usr/sbin/setkey PORTNAME= ipsec-tools -PORTVERSION= 0.8.1 -PORTREVISION= 7 +PORTVERSION= 0.8.2 CATEGORIES= security MASTER_SITES= SF MAINTAINER= vanhu@FreeBSD.org COMMENT= KAME racoon IKE daemon, ipsec-tools version CONFLICTS= racoon-[0-9]* USE_RC_SUBR= racoon USE_OPENSSL= yes INSTALL_TARGET= install-strip USES= libtool tar:bzip2 GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-shared --sysconfdir=${PREFIX}/etc/racoon \ --localstatedir=${STATEDIR:S/\/racoon//} \ --with-pkgversion=freebsd-${PORTVERSION} STATEDIR= /var/db/racoon SUB_LIST+= STATEDIR=${STATEDIR} PLIST_SUB+= STATEDIR=${STATEDIR} OPTIONS_DEFINE= DEBUG IPV6 ADMINPORT STATS DPD NATT NATTF FRAG HYBRID PAM \ - RADIUS LDAP GSSAPI SAUNSPEC RC5 IDEA DOCS + RADIUS LDAP GSSAPI SAUNSPEC RC5 IDEA DOCS EXAMPLES WCPSKEY OPTIONS_DEFAULT= DEBUG DPD NATT FRAG HYBRID ADMINPORT_DESC= Enable Admin port STATS_DESC= Statistics logging function DPD_DESC= Dead Peer Detection NATT_DESC= NAT-Traversal (kernel-patch required) NATTF_DESC= require NAT-Traversal (fail without kernel-patch) FRAG_DESC= IKE fragmentation payload support HYBRID_DESC= Hybrid, Xauth and Mode-cfg support SAUNSPEC_DESC= Unspecified SA mode RC5_DESC= RC5 encryption (patented) IDEA_DESC= IDEA encryption (patented) PAM_DESC= PAM authentication (Xauth server) RADIUS_DESC= Radius authentication (Xauth server) LDAP_DESC= LDAP authentication (Xauth server) +WCPSKEY_DESC= Allow wildcard matching for pre-shared keys PORTDOCS= * +PORTEXAMPLES= * .include .if ${OSVERSION} < 900007 EXTRA_PATCHES= ${FILESDIR}/patch8-utmp.diff .endif .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-debug .else CONFIGURE_ARGS+= --disable-debug .endif .if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 .endif .if ${PORT_OPTIONS:MADMINPORT} CONFIGURE_ARGS+= --enable-adminport .else CONFIGURE_ARGS+= --disable-adminport .endif .if ${PORT_OPTIONS:MSTATS} CONFIGURE_ARGS+= --enable-stats .else CONFIGURE_ARGS+= --disable-stats .endif .if ${PORT_OPTIONS:MDPD} CONFIGURE_ARGS+= --enable-dpd .else CONFIGURE_ARGS+= --disable-dpd .endif .if ${PORT_OPTIONS:MNATT} . if ${PORT_OPTIONS:MNATTF} CONFIGURE_ARGS+= --enable-natt=yes . else CONFIGURE_ARGS+= --enable-natt=kernel . endif .else CONFIGURE_ARGS+= --disable-natt .endif .if ${PORT_OPTIONS:MFRAG} CONFIGURE_ARGS+= --enable-frag .else CONFIGURE_ARGS+= --disable-frag .endif .if ${PORT_OPTIONS:MHYBRID} CONFIGURE_ARGS+= --enable-hybrid .else CONFIGURE_ARGS+= --disable-hybrid .endif .if ${PORT_OPTIONS:MPAM} CONFIGURE_ARGS+= --with-libpam .else CONFIGURE_ARGS+= --without-libpam .endif .if ${PORT_OPTIONS:MGSSAPI} USES+= iconv CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --enable-gssapi .else CONFIGURE_ARGS+= --disable-gssapi .endif .if ${PORT_OPTIONS:MRADIUS} CONFIGURE_ARGS+= --with-libradius .else CONFIGURE_ARGS+= --without-libradius .endif .if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= YES CONFIGURE_ARGS+= --with-libldap=${LOCALBASE} .else CONFIGURE_ARGS+= --without-libldap .endif .if ${PORT_OPTIONS:MSAUNSPEC} CONFIGURE_ARGS+= --enable-samode-unspec .else CONFIGURE_ARGS+= --disable-samode-unspec .endif .if ${PORT_OPTIONS:MRC5} CONFIGURE_ARGS+= --enable-rc5 .else CONFIGURE_ARGS+= --disable-rc5 .endif .if ${PORT_OPTIONS:MIDEA} CONFIGURE_ARGS+= --enable-idea .else CONFIGURE_ARGS+= --disable-idea +.endif + +.if ${PORT_OPTIONS:MWCPSKEY} +EXTRA_PATCHES= ${FILESDIR}/wildcard-psk.diff .endif post-patch: @${REINPLACE_CMD} -e "s/-Werror//g ; s/-R$$libdir/-Wl,-rpath=$$libdir/g" ${WRKSRC}/configure post-install: @${MKDIR} ${STAGEDIR}/${PREFIX}/etc/racoon @if [ -z `/sbin/sysctl -a | ${GREP} -q ipsec && ${ECHO_CMD} ipsec` ]; then \ ${ECHO_MSG} "WARNING: IPsec feature is disabled on this host"; \ ${ECHO_MSG} " You must build the kernel if you want to run racoon on the host"; \ fi ; @${MKDIR} ${STAGEDIR}/${EXAMPLESDIR} @${RM} -f ${WRKSRC}/src/racoon/samples/*.in @${CP} -r ${WRKSRC}/src/racoon/samples/* ${STAGEDIR}/${EXAMPLESDIR} @${MKDIR} ${STAGEDIR}/${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/src/racoon/doc/* ${STAGEDIR}/${DOCSDIR} .include Index: head/security/ipsec-tools/distinfo =================================================================== --- head/security/ipsec-tools/distinfo (revision 378553) +++ head/security/ipsec-tools/distinfo (revision 378554) @@ -1,2 +1,2 @@ -SHA256 (ipsec-tools-0.8.1.tar.bz2) = fa4a95bb36842f001b84c4e7a1bb727e3ee06147edbc830a881d63abe8153dd4 -SIZE (ipsec-tools-0.8.1.tar.bz2) = 860717 +SHA256 (ipsec-tools-0.8.2.tar.bz2) = 8eb6b38716e2f3a8a72f1f549c9444c2bc28d52c9536792690564c74fe722f2d +SIZE (ipsec-tools-0.8.2.tar.bz2) = 866465 Index: head/security/ipsec-tools/files/patch-src-racoon-isakmp_cfg.c =================================================================== --- head/security/ipsec-tools/files/patch-src-racoon-isakmp_cfg.c (nonexistent) +++ head/security/ipsec-tools/files/patch-src-racoon-isakmp_cfg.c (revision 378554) @@ -0,0 +1,28 @@ +--- src/racoon/isakmp_cfg.c ++++ src/racoon/isakmp_cfg.c +@@ -38,7 +38,9 @@ + #include + #include + ++#if __FreeBSD_version >= 900007 + #include ++#endif + #if defined(__APPLE__) && defined(__MACH__) + #include + #endif +@@ -1663,6 +1665,7 @@ + char *usr; + int inout; + { ++#if __FreeBSD_version >= 900007 + int error = 0; + struct utmpx ut; + char addr[NI_MAXHOST]; +@@ -1706,6 +1709,7 @@ + plog(LLV_ERROR, LOCATION, NULL, "Unepected inout\n"); + break; + } ++#endif + + return 0; + } Property changes on: head/security/ipsec-tools/files/patch-src-racoon-isakmp_cfg.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/ipsec-tools/files/wildcard-psk.diff =================================================================== --- head/security/ipsec-tools/files/wildcard-psk.diff (nonexistent) +++ head/security/ipsec-tools/files/wildcard-psk.diff (revision 378554) @@ -0,0 +1,12 @@ +--- src/racoon/localconf.c 9 Sep 2006 16:22:09 -0000 1.4 ++++ src/racoon/localconf.c 11 Jul 2008 20:58:55 -0000 +@@ -211,7 +211,8 @@ getpsk(str, len) + if (*p == '\0') + continue; /* no 2nd parameter */ + p--; +- if (strncmp(buf, str, len) == 0 && buf[len] == '\0') { ++ if (strcmp(buf, "*") == 0 ++ || (strncmp(buf, str, len) == 0 && buf[len] == '\0')) { + p++; + keylen = 0; + for (q = p; *q != '\0' && *q != '\n'; q++) Property changes on: head/security/ipsec-tools/files/wildcard-psk.diff ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +ON \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/ipsec-tools/pkg-plist =================================================================== --- head/security/ipsec-tools/pkg-plist (revision 378553) +++ head/security/ipsec-tools/pkg-plist (revision 378554) @@ -1,51 +1,37 @@ sbin/plainrsa-gen sbin/racoon sbin/racoonctl sbin/setkey include/libipsec/libpfkey.h include/racoon/admin.h include/racoon/evt.h include/racoon/gcmalloc.h include/racoon/ipsec_doi.h include/racoon/isakmp.h include/racoon/isakmp_cfg.h include/racoon/isakmp_unity.h include/racoon/isakmp_var.h include/racoon/isakmp_xauth.h include/racoon/misc.h include/racoon/racoonctl.h include/racoon/schedule.h include/racoon/sockmisc.h include/racoon/var.h include/racoon/vmbuf.h lib/libipsec.a lib/libipsec.so lib/libipsec.so.0 lib/libipsec.so.0.0.1 lib/libracoon.a lib/libracoon.so lib/libracoon.so.0 lib/libracoon.so.0.0.0 man/man3/ipsec_set_policy.3.gz man/man3/ipsec_strerror.3.gz man/man5/racoon.conf.5.gz man/man8/plainrsa-gen.8.gz man/man8/racoon.8.gz man/man8/racoonctl.8.gz man/man8/setkey.8.gz -%%EXAMPLESDIR%%/psk.txt -%%EXAMPLESDIR%%/psk.txt.sample -%%EXAMPLESDIR%%/racoon.conf -%%EXAMPLESDIR%%/racoon.conf.sample -%%EXAMPLESDIR%%/racoon.conf.sample-gssapi -%%EXAMPLESDIR%%/racoon.conf.sample-inherit -%%EXAMPLESDIR%%/racoon.conf.sample-natt -%%EXAMPLESDIR%%/racoon.conf.sample-plainrsa -%%EXAMPLESDIR%%/roadwarrior/README -%%EXAMPLESDIR%%/roadwarrior/client/phase1-down.sh -%%EXAMPLESDIR%%/roadwarrior/client/phase1-up.sh -%%EXAMPLESDIR%%/roadwarrior/client/racoon.conf -%%EXAMPLESDIR%%/roadwarrior/server/racoon.conf -%%EXAMPLESDIR%%/roadwarrior/server/racoon.conf-radius @dir etc/racoon @dir %%STATEDIR%%