Attachment #204652 for bug #238173

View | Details | Raw Unified | Return to bug 238173
Collapse All | Expand All

Lines 2-9 Link Here

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

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1545909109	1	TIMESTAMP = 1558966248
2	SHA256 (strongswan-5.7.2.tar.bz2) = 308e3ba76e2ce2da070e48fcebbe1fa923a27cc71e43bf63917e6f2a889ecc70	2	SHA256 (strongswan-5.8.0.tar.bz2) = 15b1e10c7dd6253ab5d791fe9b9cb84624e24c118aecd9b90251b4e60daa0933
3	SIZE (strongswan-5.7.2.tar.bz2) = 4997818	3	SIZE (strongswan-5.8.0.tar.bz2) = 4516950




--- conf/Makefile.in.orig	2019-03-29 18:18:48 UTC
+++ conf/Makefile.in
@@ -899,15 +899,15 @@ install-data-local: $(plugins_install_src)
 	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)$(strongswan_conf)" || $(INSTALL) -m 644 $(srcdir)/strongswan.conf $(DESTDIR)$(strongswan_conf) || true
+	test -e "$(DESTDIR)$(strongswan_conf)" || $(INSTALL) -m 644 $(srcdir)/strongswan.conf $(DESTDIR)$(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.

Return to bug 238173

Lines 1-21 Link Here

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