Merge pull request #275 from doktornotor/patch-7

pfsense · Jan 31, 2017 · 7e1d65c · 7e1d65c
2 parents b9561b7 + 7643536
commit 7e1d65c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/security/pfSense-pkg-tinc/Makefile b/security/pfSense-pkg-tinc/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	pfSense-pkg-tinc
 PORTVERSION=	1.0.28
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	# empty
 DISTFILES=	# empty

diff --git a/security/pfSense-pkg-tinc/files/usr/local/pkg/tinc.inc b/security/pfSense-pkg-tinc/files/usr/local/pkg/tinc.inc
@@ -30,6 +30,7 @@ function tinc_save() {
 
 	conf_mount_rw();
 
+	rmdir_recursive("{$configpath}.old");
 	rename("{$configpath}", "{$configpath}.old");
 	safe_mkdir("{$configpath}");
 	safe_mkdir("{$configpath}/hosts");
@@ -99,7 +100,7 @@ function tinc_save() {
 		$_output = base64_decode($tincconf['tinc_up']) . "\n";
 	} else {
 		$_output = "ifconfig \$INTERFACE " . $tincconf['localip'] . " netmask " . $tincconf['vpnnetmask'] . "\n";
-		$_output .= "ifconfig \$INTERFACE group pkg-tinc\n";
+		$_output .= "ifconfig \$INTERFACE group pkg_tinc\n";
 	}
 	file_put_contents("{$configpath}/tinc-up", $_output);
 	chmod("{$configpath}/tinc-up", 0744);
@@ -138,7 +139,6 @@ function tinc_save() {
 		unlink_if_exists("/usr/local/etc/rc.d/tinc.sh");
 	}
 
-	rmdir_recursive("/usr/local/etc/tinc.old");
 	conf_mount_ro();
 }
 
@@ -166,7 +166,7 @@ function tinc_install() {
 	$ifgroupentry = array();
 	$ifgroupentry['members'] = '';
 	$ifgroupentry['descr'] = 'tinc mesh VPN interface group';
-	$ifgroupentry['ifname'] = 'pkg-tinc';
+	$ifgroupentry['ifname'] = 'pkg_tinc';
 	$a_ifgroups[] = $ifgroupentry;
 
 	/* XXX: Do not remove this. WTH?! */
@@ -188,7 +188,7 @@ function tinc_deinstall() {
 	$myid = -1;
 	$i = 0;
 	foreach ($a_ifgroups as $ifgroupentry) {
-		if ($ifgroupentry['ifname'] == 'pkg-tinc') {
+		if ($ifgroupentry['ifname'] == 'pkg_tinc') {
 			$myid = $i;
 			break;
 		}