[svn-upgrade] Integrating new upstream version, strongswan (4.1.10)

5 files changed, 12 insertions, 31 deletions

diff --git a/src/pluto/Makefile.am b/src/pluto/Makefile.am
index 4519ef7bb..69902ad8f 100644
--- a/src/pluto/Makefile.am
+++ b/src/pluto/Makefile.am
@@ -132,15 +132,3 @@ if USE_LIBLDAP
   pluto_LDADD += -lldap -llber
 endif
 
-install-exec-local :
-	mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d
-	mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/cacerts
-	mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/ocspcerts
-	mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/certs
-	mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/acerts
-	mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/aacerts
-	mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/crls
-	mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/reqs
-	mkdir -p -m 700 $(DESTDIR)$(confdir)/ipsec.d/private
-	chown -R $(ipsecuid):$(ipsecgid) $(DESTDIR)$(confdir)/ipsec.d
-
diff --git a/src/pluto/Makefile.in b/src/pluto/Makefile.in
index 8f7a7f31b..77a0a7548 100644
--- a/src/pluto/Makefile.in
+++ b/src/pluto/Makefile.in
@@ -804,7 +804,7 @@ install-data-am: install-ipsecPROGRAMS install-man
 
 install-dvi: install-dvi-am
 
-install-exec-am: install-exec-local
+install-exec-am:
 
 install-html: install-html-am
 
@@ -847,8 +847,8 @@ uninstall-man: uninstall-man5 uninstall-man8
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-exec-local \
-	install-html install-html-am install-info install-info-am \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
 	install-ipsecPROGRAMS install-man install-man5 install-man8 \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
@@ -861,18 +861,6 @@ uninstall-man: uninstall-man5 uninstall-man8
 
 oid.o :	$(LIBSTRONGSWANDIR)/asn1/oid.c $(LIBSTRONGSWANDIR)/asn1/oid.h
 		$(COMPILE) -c -o $@ $<
-
-install-exec-local :
-	mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d
-	mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/cacerts
-	mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/ocspcerts
-	mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/certs
-	mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/acerts
-	mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/aacerts
-	mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/crls
-	mkdir -p -m 755 $(DESTDIR)$(confdir)/ipsec.d/reqs
-	mkdir -p -m 700 $(DESTDIR)$(confdir)/ipsec.d/private
-	chown -R $(ipsecuid):$(ipsecgid) $(DESTDIR)$(confdir)/ipsec.d
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/src/pluto/connections.c b/src/pluto/connections.c
index 952e722d2..8fbf969b6 100644
--- a/src/pluto/connections.c
+++ b/src/pluto/connections.c
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: connections.c 3252 2007-10-06 21:24:50Z andreas $
+ * RCSID $Id: connections.c 3361 2007-11-21 23:42:27Z andreas $
  */
 
 #include <string.h>
@@ -955,6 +955,7 @@ gen_reqid(void)
     } while (reqid != start);
 
     exit_log("unable to allocate reqid");
+    return 0; /* never reached ... */
 }
 
 void
diff --git a/src/pluto/vendor.c b/src/pluto/vendor.c
index b54f574f2..0e6e3d9b7 100644
--- a/src/pluto/vendor.c
+++ b/src/pluto/vendor.c
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: vendor.c 3252 2007-10-06 21:24:50Z andreas $
+ * RCSID $Id: vendor.c 3380 2007-12-04 23:54:32Z andreas $
  */
 
 #include <stdlib.h>
@@ -206,7 +206,9 @@ static struct vid_struct _vid_tab[] = {
 	/*
 	 * strongSwan
 	 */
-	DEC_MD5_VID(STRONGSWAN,       "strongSwan 4.1.8")
+	DEC_MD5_VID(STRONGSWAN,       "strongSwan 4.1.10")
+	DEC_MD5_VID(STRONGSWAN_4_1_9, "strongSwan 4.1.9")
+	DEC_MD5_VID(STRONGSWAN_4_1_8, "strongSwan 4.1.8")
 	DEC_MD5_VID(STRONGSWAN_4_1_7, "strongSwan 4.1.7")
 	DEC_MD5_VID(STRONGSWAN_4_1_6, "strongSwan 4.1.6")
 	DEC_MD5_VID(STRONGSWAN_4_1_5, "strongSwan 4.1.5")
diff --git a/src/pluto/vendor.h b/src/pluto/vendor.h
index 4f480df30..d0853b08c 100644
--- a/src/pluto/vendor.h
+++ b/src/pluto/vendor.h
@@ -11,7 +11,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: vendor.h 3252 2007-10-06 21:24:50Z andreas $
+ * RCSID $Id: vendor.h 3380 2007-12-04 23:54:32Z andreas $
  */
 
 #ifndef _VENDOR_H_
@@ -111,6 +111,8 @@ enum known_vendorid {
   VID_STRONGSWAN_4_1_5		= 93,
   VID_STRONGSWAN_4_1_6		= 94,
   VID_STRONGSWAN_4_1_7		= 95,
+  VID_STRONGSWAN_4_1_8		= 96,
+  VID_STRONGSWAN_4_1_9		= 97,
 
   /* 101 - 200 : NAT-Traversal */
   VID_NATT_STENBERG_01		=101,