Attachment #155609 for bug #199442

Lines 3-8 Link Here

(-)security/strongswan/Makefile (+1 lines)
3		3
4	PORTNAME= strongswan	4	PORTNAME= strongswan
5	PORTVERSION= 5.3.0	5	PORTVERSION= 5.3.0
		6	PORTREVISION= 1
6	CATEGORIES= security	7	CATEGORIES= security
7	MASTER_SITES= http://download.strongswan.org/ \	8	MASTER_SITES= http://download.strongswan.org/ \
8	http://download2.strongswan.org/	9	http://download2.strongswan.org/




--- conf/Makefile.in.orig	2015-03-27 20:02:47 UTC
+++ conf/Makefile.in
@@ -860,15 +860,15 @@ install-data-local: $(plugins_install_sr
 	test -e "$(DESTDIR)${strongswanconfdir}" || $(INSTALL) -d "$(DESTDIR)$(strongswanconfdir)" || true
 	test -e "$(DESTDIR)${strongswanddir}" || $(INSTALL) -d "$(DESTDIR)$(strongswanddir)" || true
 	test -e "$(DESTDIR)${charonconfdir}" || $(INSTALL) -d "$(DESTDIR)$(charonconfdir)" || true
-	test -e "$(DESTDIR)$(strongswanconfdir)/strongswan.conf" || $(INSTALL) -m 644 $(srcdir)/strongswan.conf $(DESTDIR)$(strongswanconfdir)/strongswan.conf || true
+	test -e "$(DESTDIR)$(strongswanconfdir)/strongswan.conf" || $(INSTALL) -m 644 $(srcdir)/strongswan.conf $(DESTDIR)$(strongswanconfdir)/strongswan.conf.sample || true
 	for f in $(options_install_src); do \
 		name=`basename $$f`; \
-		test -f "$(DESTDIR)$(strongswanddir)/$$name" || $(INSTALL) -m 644 "$(srcdir)/$$f" "$(DESTDIR)$(strongswanddir)/$$name" || true; \
+		test -f "$(DESTDIR)$(strongswanddir)/$$name" || $(INSTALL) -m 644 "$(srcdir)/$$f" "$(DESTDIR)$(strongswanddir)/$$name.sample" || true; \
 	done
 	for f in $(plugins_install_src); do \
 		name=`basename $$f`; \
 		if test -f "$$f"; then dir=; else dir="$(srcdir)/"; fi; \
-		test -f "$(DESTDIR)$(charonconfdir)/$$name" || $(INSTALL) -m 644 "$$dir$$f" "$(DESTDIR)$(charonconfdir)/$$name" || true; \
+		test -f "$(DESTDIR)$(charonconfdir)/$$name" || $(INSTALL) -m 644 "$$dir$$f" "$(DESTDIR)$(charonconfdir)/$$name.sample" || true; \
 	done
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.




--- src/libcharon/plugins/smp/smp.c.orig	2013-11-01 10:40:35 UTC
+++ src/libcharon/plugins/smp/smp.c
@@ -737,7 +737,7 @@ METHOD(plugin_t, destroy, void,
  */
 plugin_t *smp_plugin_create()
 {
-	struct sockaddr_un unix_addr = { AF_UNIX, IPSEC_PIDDIR "/charon.xml"};
+	struct sockaddr_un unix_addr;
 	private_smp_t *this;
 	mode_t old;
 
@@ -766,6 +766,11 @@ plugin_t *smp_plugin_create()
 		return NULL;
 	}
 
+	strlcpy(unix_addr.sun_path, IPSEC_PIDDIR "/charon.xml",
+	    sizeof(unix_addr.sun_path));
+	unix_addr.sun_len = sizeof(unix_addr);
+	unix_addr.sun_family = PF_LOCAL;
+
 	unlink(unix_addr.sun_path);
 	old = umask(S_IRWXO);
 	if (bind(this->socket, (struct sockaddr *)&unix_addr, sizeof(unix_addr)) < 0)

Line 0 Link Here

(-)security/strongswan/files/patch-src_starter_Makefile.in (+11 lines)
	1	--- src/starter/Makefile.in.orig 2015-03-27 20:03:00 UTC
	2	+++ src/starter/Makefile.in
	3	@@ -985,7 +985,7 @@ install-exec-local :
	4	test -e "$(DESTDIR)${sysconfdir}/ipsec.d/crls" \|\| $(INSTALL) -d "$(DESTDIR)$(sysconfdir)/ipsec.d/crls" \|\| true
	5	test -e "$(DESTDIR)${sysconfdir}/ipsec.d/reqs" \|\| $(INSTALL) -d "$(DESTDIR)$(sysconfdir)/ipsec.d/reqs" \|\| true
	6	test -e "$(DESTDIR)${sysconfdir}/ipsec.d/private" \|\| $(INSTALL) -d -m 750 "$(DESTDIR)$(sysconfdir)/ipsec.d/private" \|\| true
	7	- test -e "$(DESTDIR)$(sysconfdir)/ipsec.conf" \|\| $(INSTALL) -m 644 $(srcdir)/ipsec.conf $(DESTDIR)$(sysconfdir)/ipsec.conf \|\| true
	8	+ test -e "$(DESTDIR)$(sysconfdir)/ipsec.conf" \|\| $(INSTALL) -m 644 $(srcdir)/ipsec.conf $(DESTDIR)$(sysconfdir)/ipsec.conf.sample \|\| true
	9
	10	# Tell versions [3.59,3.63) of GNU make to not export all variables.
	11	# Otherwise a system limit (for SysV at least) may be exceeded.

Return to bug 199442

Line 0 Link Here

(-)security/strongswan/files/patch-conf_Makefile.in (+21 lines)
	1	--- conf/Makefile.in.orig 2015-03-27 20:02:47 UTC
	2	+++ conf/Makefile.in
	3	@@ -860,15 +860,15 @@ install-data-local: $(plugins_install_sr
	4	test -e "$(DESTDIR)${strongswanconfdir}" \|\| $(INSTALL) -d "$(DESTDIR)$(strongswanconfdir)" \|\| true
	5	test -e "$(DESTDIR)${strongswanddir}" \|\| $(INSTALL) -d "$(DESTDIR)$(strongswanddir)" \|\| true
	6	test -e "$(DESTDIR)${charonconfdir}" \|\| $(INSTALL) -d "$(DESTDIR)$(charonconfdir)" \|\| true
	7	- test -e "$(DESTDIR)$(strongswanconfdir)/strongswan.conf" \|\| $(INSTALL) -m 644 $(srcdir)/strongswan.conf $(DESTDIR)$(strongswanconfdir)/strongswan.conf \|\| true
	8	+ test -e "$(DESTDIR)$(strongswanconfdir)/strongswan.conf" \|\| $(INSTALL) -m 644 $(srcdir)/strongswan.conf $(DESTDIR)$(strongswanconfdir)/strongswan.conf.sample \|\| true
	9	for f in $(options_install_src); do \
	10	name=`basename $$f`; \
	11	- test -f "$(DESTDIR)$(strongswanddir)/$$name" \|\| $(INSTALL) -m 644 "$(srcdir)/$$f" "$(DESTDIR)$(strongswanddir)/$$name" \|\| true; \
	12	+ test -f "$(DESTDIR)$(strongswanddir)/$$name" \|\| $(INSTALL) -m 644 "$(srcdir)/$$f" "$(DESTDIR)$(strongswanddir)/$$name.sample" \|\| true; \
	13	done
	14	for f in $(plugins_install_src); do \
	15	name=`basename $$f`; \
	16	if test -f "$$f"; then dir=; else dir="$(srcdir)/"; fi; \
	17	- test -f "$(DESTDIR)$(charonconfdir)/$$name" \|\| $(INSTALL) -m 644 "$$dir$$f" "$(DESTDIR)$(charonconfdir)/$$name" \|\| true; \
	18	+ test -f "$(DESTDIR)$(charonconfdir)/$$name" \|\| $(INSTALL) -m 644 "$$dir$$f" "$(DESTDIR)$(charonconfdir)/$$name.sample" \|\| true; \
	19	done
	20
	21	# Tell versions [3.59,3.63) of GNU make to not export all variables.

Line 0 Link Here

(-)security/strongswan/files/patch-src_libcharon_plugins_smp_smp.c (+23 lines)
	1	--- src/libcharon/plugins/smp/smp.c.orig 2013-11-01 10:40:35 UTC
	2	+++ src/libcharon/plugins/smp/smp.c
	3	@@ -737,7 +737,7 @@ METHOD(plugin_t, destroy, void,
	4	*/
	5	plugin_t *smp_plugin_create()
	6	{
	7	- struct sockaddr_un unix_addr = { AF_UNIX, IPSEC_PIDDIR "/charon.xml"};
	8	+ struct sockaddr_un unix_addr;
	9	private_smp_t *this;
	10	mode_t old;
	11
	12	@@ -766,6 +766,11 @@ plugin_t *smp_plugin_create()
	13	return NULL;
	14	}
	15
	16	+ strlcpy(unix_addr.sun_path, IPSEC_PIDDIR "/charon.xml",
	17	+ sizeof(unix_addr.sun_path));
	18	+ unix_addr.sun_len = sizeof(unix_addr);
	19	+ unix_addr.sun_family = PF_LOCAL;
	20	+
	21	unlink(unix_addr.sun_path);
	22	old = umask(S_IRWXO);
	23	if (bind(this->socket, (struct sockaddr *)&unix_addr, sizeof(unix_addr)) < 0)