Upgrade to 20051102a.

5 files changed, 18 insertions, 48 deletions

diff --git a/security/racoon2/Makefile b/security/racoon2/Makefile
index 43e0ff3f5b5c..4cec85eb4fef 100644
--- a/security/racoon2/Makefile
+++ b/security/racoon2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	racoon2
-PORTVERSION=	20050625b
-PORTREVISION=	1
+PORTVERSION=	20051102a
 CATEGORIES=	security net ipv6
 MASTER_SITES=	ftp://ftp.kame.net/pub/racoon2/
 EXTRACT_SUFX=	.tgz
@@ -29,12 +28,11 @@ CONFIGURE_ARGS+=--sysconfdir=${LOCALBASE}/etc
 USE_REINPLACE=	yes
 
 .if !defined(NOPORTDOCS)
-PORTDOCS=	INSTALL USAGE.iked USAGE.kinkd USAGE.spmd config-usage.ja.txt
-PORTDOCS+=	draft-ietf-ipsec-ikev2-17.txt draft-ietf-kink-kink-06.txt
-PORTDOCS+=	iked-memo.ja.txt kink-spec-supplement.ja.txt
-PORTDOCS+=	kinkd-data-struct.obj kinkd-impl.ja.txt kinkd-install.ja.txt
-PORTDOCS+=	kinkd-state-txn.obj libracoon.ja.txt racoon2.conf.ikev2
-PORTDOCS+=	racoon2.conf.kink specification.ja.txt spmif.txt system-message.ja.txt
+PORTDOCS=	INSTALL USAGE USAGE.iked USAGE.kinkd USAGE.spmd
+PORTDOCS+=	config-usage.ja.txt config-usage.txt
+PORTDOCS+=	iked-memo.ja.txt kinkd-data-struct.obj kinkd-impl.ja.txt
+PORTDOCS+=	kinkd-install.ja.txt kinkd-state-txn.obj libracoon.ja.txt
+PORTDOCS+=	specification.ja.txt spmif.txt style.txt system-message.ja.txt
 .endif
 
 MAN8=		spmd.8 spmdctl.8 kinkd.8
diff --git a/security/racoon2/distinfo b/security/racoon2/distinfo
index 9113f194cc69..250b9808627f 100644
--- a/security/racoon2/distinfo
+++ b/security/racoon2/distinfo
@@ -1,2 +1,2 @@
-MD5 (racoon2-20050625b.tgz) = 8ece7e9e2f2d908d7393ab557b9b76e6
-SIZE (racoon2-20050625b.tgz) = 750996
+MD5 (racoon2-20051102a.tgz) = 6e02a7992e8f0163dcc3ac9e0df4d603
+SIZE (racoon2-20051102a.tgz) = 691310
diff --git a/security/racoon2/files/patch-lib-rc_str.c b/security/racoon2/files/patch-lib-rc_str.c
deleted file mode 100644
index cc6bfa8a30df..000000000000
--- a/security/racoon2/files/patch-lib-rc_str.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/rc_str.c-	Mon Jul 11 11:59:42 2005
-+++ lib/rc_str.c	Mon Jul 11 11:59:45 2005
-@@ -63,7 +63,7 @@
- 	extern struct rcf_setval *rcf_setval_head;
- 	struct rcf_setval *n;
- 	char *buf;
--	int buflen = 0;
-+	size_t buflen = 0;
- 
- 	for (n = rcf_setval_head; n; n = n->next) {
- 		if (strncmp(n->sym->v, str, len) == 0 && n->sym->l == len) {
-@@ -81,7 +81,7 @@
- {
- 	char *res;
- 	char *buf;
--	int buflen = 0;
-+	size_t buflen = 0;
- 
- 	if (rc_strzcat(&buf, &buflen, str, len))
- 		return NULL;
diff --git a/security/racoon2/files/patch-pskgen-Makefile.in b/security/racoon2/files/patch-pskgen-Makefile.in
index 9dfb047d3234..b24cb2f81908 100644
--- a/security/racoon2/files/patch-pskgen-Makefile.in
+++ b/security/racoon2/files/patch-pskgen-Makefile.in
@@ -1,21 +1,11 @@
---- pskgen/Makefile.in-	Tue Jul  5 01:19:59 2005
-+++ pskgen/Makefile.in	Tue Jul  5 01:23:07 2005
-@@ -7,8 +7,7 @@
- sysconfdir=@sysconfdir@
- 
- INSTALL =@INSTALL@
--INSTALL_PROG=@INSTALL_PROGRAM@
--INSTALL_OPTS=@INSTALL_OPTS@
-+INSTALL_SCRIPT=@INSTALL_SCRIPT@
- 
- PROG=pskgen
- 
-@@ -16,7 +15,7 @@
+--- pskgen/Makefile.in~	Thu Jul 14 17:30:23 2005
++++ pskgen/Makefile.in	Tue Nov  1 21:46:08 2005
+@@ -16,7 +16,7 @@
  
  install: all
  	$(INSTALL) -d $(sbindir)
--	$(INSTALL_PROG) -m 555 $(PROG) $(sbindir)
+-	$(INSTALL) -m 555 $(PROG) $(sbindir)
 +	$(INSTALL_SCRIPT) -m 555 $(PROG) $(sbindir)
+ 	$(INSTALL) -m 444 $(PROG).8 $(mandir)/man8
  
  depend:
- 
diff --git a/security/racoon2/files/patch-samples-Makefile.in b/security/racoon2/files/patch-samples-Makefile.in
index 2b2f2e9ee175..ab9705f9d7f5 100644
--- a/security/racoon2/files/patch-samples-Makefile.in
+++ b/security/racoon2/files/patch-samples-Makefile.in
@@ -1,15 +1,17 @@
---- samples/Makefile.in-	Tue Jul  5 01:33:44 2005
-+++ samples/Makefile.in	Tue Jul  5 01:33:57 2005
-@@ -17,9 +17,9 @@
+--- samples/Makefile.in.orig	Fri Oct 28 12:49:37 2005
++++ samples/Makefile.in	Tue Nov  1 21:48:15 2005
+@@ -17,10 +17,10 @@
  
  install-startup-rc-d:
  	$(INSTALL) -d $(sysconfdir)/rc.d
 -	$(INSTALL) rc.d-iked $(sysconfdir)/rc.d/iked
 -	$(INSTALL) rc.d-kinkd $(sysconfdir)/rc.d/kinkd
 -	$(INSTALL) rc.d-spmd $(sysconfdir)/rc.d/spmd
+-	$(INSTALL) rc.d-racoon2 $(sysconfdir)/rc.d/racoon2
 +	$(INSTALL) rc.d-iked $(sysconfdir)/rc.d/iked.sh
 +	$(INSTALL) rc.d-kinkd $(sysconfdir)/rc.d/kinkd.sh
 +	$(INSTALL) rc.d-spmd $(sysconfdir)/rc.d/spmd.sh
++	$(INSTALL) rc.d-racoon2 $(sysconfdir)/rc.d/racoon2.sh
  
  install-startup-init-d:
  	$(INSTALL) -d $(sysconfdir)/init.d