[Midnightbsd-cvs] mports [19628] trunk/security: update ipsec
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Jul 31 19:46:06 EDT 2015
Revision: 19628
http://svnweb.midnightbsd.org/mports/?rev=19628
Author: laffer1
Date: 2015-07-31 19:46:05 -0400 (Fri, 31 Jul 2015)
Log Message:
-----------
update ipsec
Modified Paths:
--------------
trunk/security/gcr/Makefile
trunk/security/ipsec-tools/Makefile
trunk/security/ipsec-tools/distinfo
trunk/security/ipsec-tools/pkg-plist
trunk/security/p5-Authen-SASL/Makefile
trunk/security/p5-Authen-SASL/pkg-plist
Added Paths:
-----------
trunk/security/ipsec-tools/files/patch-src-racoon-isakmp_cfg.c
trunk/security/ipsec-tools/files/patch-src_racoon_gssapi.c
trunk/security/ipsec-tools/files/wildcard-psk.diff
trunk/security/krb5/files/patch-lib__krb5__ccache__cc_file.c
trunk/security/krb5/files/patch-lib__krb5__ccache__kcm.c
Modified: trunk/security/gcr/Makefile
===================================================================
--- trunk/security/gcr/Makefile 2015-07-31 23:45:48 UTC (rev 19627)
+++ trunk/security/gcr/Makefile 2015-07-31 23:46:05 UTC (rev 19628)
@@ -2,6 +2,7 @@
PORTNAME= gcr
PORTVERSION= 3.14.0
+PORTREVISION= 1
CATEGORIES= security gnome
MASTER_SITES= GNOME
Modified: trunk/security/ipsec-tools/Makefile
===================================================================
--- trunk/security/ipsec-tools/Makefile 2015-07-31 23:45:48 UTC (rev 19627)
+++ trunk/security/ipsec-tools/Makefile 2015-07-31 23:46:05 UTC (rev 19628)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= ipsec-tools
-PORTVERSION= 0.8.1
+PORTVERSION= 0.8.2
PORTREVISION= 0
CATEGORIES= security
MASTER_SITES= SF
@@ -30,7 +30,7 @@
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
@@ -46,8 +46,10 @@
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 <bsd.port.pre.mk>
@@ -153,6 +155,10 @@
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
Modified: trunk/security/ipsec-tools/distinfo
===================================================================
--- trunk/security/ipsec-tools/distinfo 2015-07-31 23:45:48 UTC (rev 19627)
+++ trunk/security/ipsec-tools/distinfo 2015-07-31 23:46:05 UTC (rev 19628)
@@ -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
Added: trunk/security/ipsec-tools/files/patch-src-racoon-isakmp_cfg.c
===================================================================
--- trunk/security/ipsec-tools/files/patch-src-racoon-isakmp_cfg.c (rev 0)
+++ trunk/security/ipsec-tools/files/patch-src-racoon-isakmp_cfg.c 2015-07-31 23:46:05 UTC (rev 19628)
@@ -0,0 +1,28 @@
+--- src/racoon/isakmp_cfg.c
++++ src/racoon/isakmp_cfg.c
+@@ -38,7 +38,9 @@
+ #include <sys/socket.h>
+ #include <sys/queue.h>
+
++#if __FreeBSD_version >= 900007
+ #include <utmpx.h>
++#endif
+ #if defined(__APPLE__) && defined(__MACH__)
+ #include <util.h>
+ #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: trunk/security/ipsec-tools/files/patch-src-racoon-isakmp_cfg.c
___________________________________________________________________
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
Added: trunk/security/ipsec-tools/files/patch-src_racoon_gssapi.c
===================================================================
--- trunk/security/ipsec-tools/files/patch-src_racoon_gssapi.c (rev 0)
+++ trunk/security/ipsec-tools/files/patch-src_racoon_gssapi.c 2015-07-31 23:46:05 UTC (rev 19628)
@@ -0,0 +1,14 @@
+--- src/racoon/gssapi.c.orig 2015-05-19 16:38:06 UTC
++++ src/racoon/gssapi.c
+@@ -192,6 +192,11 @@ gssapi_init(struct ph1handle *iph1)
+ gss_name_t princ, canon_princ;
+ OM_uint32 maj_stat, min_stat;
+
++ if (iph1->rmconf == NULL) {
++ plog(LLV_ERROR, LOCATION, NULL, "no remote config\n");
++ return -1;
++ }
++
+ gps = racoon_calloc(1, sizeof (struct gssapi_ph1_state));
+ if (gps == NULL) {
+ plog(LLV_ERROR, LOCATION, NULL, "racoon_calloc failed\n");
Property changes on: trunk/security/ipsec-tools/files/patch-src_racoon_gssapi.c
___________________________________________________________________
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
Added: trunk/security/ipsec-tools/files/wildcard-psk.diff
===================================================================
--- trunk/security/ipsec-tools/files/wildcard-psk.diff (rev 0)
+++ trunk/security/ipsec-tools/files/wildcard-psk.diff 2015-07-31 23:46:05 UTC (rev 19628)
@@ -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: trunk/security/ipsec-tools/files/wildcard-psk.diff
___________________________________________________________________
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
Modified: trunk/security/ipsec-tools/pkg-plist
===================================================================
--- trunk/security/ipsec-tools/pkg-plist 2015-07-31 23:45:48 UTC (rev 19627)
+++ trunk/security/ipsec-tools/pkg-plist 2015-07-31 23:46:05 UTC (rev 19628)
@@ -21,9 +21,11 @@
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
@@ -31,28 +33,5 @@
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
- at exec mkdir -p %D/etc/racoon
- at dirrmtry etc/racoon
- at dirrm include/racoon
- at dirrm include/libipsec
- at dirrm %%EXAMPLESDIR%%/roadwarrior/server
- at dirrm %%EXAMPLESDIR%%/roadwarrior/client
- at dirrm %%EXAMPLESDIR%%/roadwarrior
- at dirrm %%EXAMPLESDIR%%
- at cwd /
- at exec mkdir -p %%STATEDIR%%
- at dirrmtry %%STATEDIR%%
+ at dir etc/racoon
+ at dir %%STATEDIR%%
Added: trunk/security/krb5/files/patch-lib__krb5__ccache__cc_file.c
===================================================================
--- trunk/security/krb5/files/patch-lib__krb5__ccache__cc_file.c (rev 0)
+++ trunk/security/krb5/files/patch-lib__krb5__ccache__cc_file.c 2015-07-31 23:46:05 UTC (rev 19628)
@@ -0,0 +1,10 @@
+--- lib/krb5/ccache/cc_file.c.orig 2014-10-15 16:55:10.000000000 -0700
++++ lib/krb5/ccache/cc_file.c 2015-02-12 13:00:31.967166267 -0800
+@@ -136,6 +136,7 @@
+ fcc_data *data = id->data;
+ struct stat sb;
+
++ *size_out = 0;
+ k5_cc_mutex_assert_locked(context, &data->lock);
+ if (fstat(data->fd, &sb) == -1)
+ return interpret_errno(context, errno);
Property changes on: trunk/security/krb5/files/patch-lib__krb5__ccache__cc_file.c
___________________________________________________________________
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
Added: trunk/security/krb5/files/patch-lib__krb5__ccache__kcm.c
===================================================================
--- trunk/security/krb5/files/patch-lib__krb5__ccache__kcm.c (rev 0)
+++ trunk/security/krb5/files/patch-lib__krb5__ccache__kcm.c 2015-07-31 23:46:05 UTC (rev 19628)
@@ -0,0 +1,11 @@
+--- lib/krb5/ccache/cc_kcm.c.orig 2014-10-15 16:55:10.000000000 -0700
++++ lib/krb5/ccache/cc_kcm.c 2014-10-16 00:04:30.312921884 -0700
+@@ -377,7 +377,7 @@
+ kcmio_call(krb5_context context, struct kcmio *io, struct kcmreq *req)
+ {
+ krb5_error_code ret;
+- size_t reply_len;
++ size_t reply_len = 0; /* XXX Make clang happy */
+
+ if (k5_buf_status(&req->reqbuf) != 0)
+ return ENOMEM;
Property changes on: trunk/security/krb5/files/patch-lib__krb5__ccache__kcm.c
___________________________________________________________________
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
Modified: trunk/security/p5-Authen-SASL/Makefile
===================================================================
--- trunk/security/p5-Authen-SASL/Makefile 2015-07-31 23:45:48 UTC (rev 19627)
+++ trunk/security/p5-Authen-SASL/Makefile 2015-07-31 23:46:05 UTC (rev 19628)
@@ -2,6 +2,7 @@
PORTNAME= Authen-SASL
PORTVERSION= 2.16
+PORTREVISION= 1
CATEGORIES= security perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@@ -8,8 +9,10 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= Perl5 module for SASL authentication
-LICENSE= perl
+LICENSE= artistic gpl
+LICENSE_COMB= dual
+
BUILD_DEPENDS= \
p5-Digest-MD5>0:${PORTSDIR}/security/p5-Digest-MD5 \
p5-Digest-HMAC>0:${PORTSDIR}/security/p5-Digest-HMAC
@@ -19,16 +22,6 @@
PERL_CONFIGURE= yes
CONFIGURE_ENV+= AUTOMATED_TESTING=yes
-MAN3+= Authen::SASL.3
-MAN3+= Authen::SASL::Perl.3
-MAN3+= Authen::SASL::Perl::ANONYMOUS.3
-MAN3+= Authen::SASL::Perl::CRAM_MD5.3
-MAN3+= Authen::SASL::Perl::DIGEST_MD5.3
-MAN3+= Authen::SASL::Perl::EXTERNAL.3
-MAN3+= Authen::SASL::Perl::GSSAPI.3
-MAN3+= Authen::SASL::Perl::LOGIN.3
-MAN3+= Authen::SASL::Perl::PLAIN.3
-
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_KERBEROS)
Modified: trunk/security/p5-Authen-SASL/pkg-plist
===================================================================
--- trunk/security/p5-Authen-SASL/pkg-plist 2015-07-31 23:45:48 UTC (rev 19627)
+++ trunk/security/p5-Authen-SASL/pkg-plist 2015-07-31 23:46:05 UTC (rev 19628)
@@ -1,3 +1,12 @@
+%%PERL5_MAN3%%/Authen::SASL.3.gz
+%%PERL5_MAN3%%/Authen::SASL::Perl.3.gz
+%%PERL5_MAN3%%/Authen::SASL::Perl::ANONYMOUS.3.gz
+%%PERL5_MAN3%%/Authen::SASL::Perl::CRAM_MD5.3.gz
+%%PERL5_MAN3%%/Authen::SASL::Perl::DIGEST_MD5.3.gz
+%%PERL5_MAN3%%/Authen::SASL::Perl::EXTERNAL.3.gz
+%%PERL5_MAN3%%/Authen::SASL::Perl::GSSAPI.3.gz
+%%PERL5_MAN3%%/Authen::SASL::Perl::LOGIN.3.gz
+%%PERL5_MAN3%%/Authen::SASL::Perl::PLAIN.3.gz
%%SITE_PERL%%/Authen/SASL.pm
%%SITE_PERL%%/Authen/SASL.pod
%%SITE_PERL%%/Authen/SASL/CRAM_MD5.pm
@@ -11,8 +20,3 @@
%%SITE_PERL%%/Authen/SASL/Perl/GSSAPI.pm
%%SITE_PERL%%/Authen/SASL/Perl/LOGIN.pm
%%SITE_PERL%%/Authen/SASL/Perl/PLAIN.pm
- at dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/SASL
- at dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
- at dirrm %%SITE_PERL%%/Authen/SASL/Perl
- at dirrm %%SITE_PERL%%/Authen/SASL
- at dirrmtry %%SITE_PERL%%/Authen
More information about the Midnightbsd-cvs
mailing list