e-smith-pptpd/sme10/e-smith-pptpd-2.6.0-bz11249.patch

diff -Nur e-smith-pptpd-2.6.0.old/root/etc/e-smith/templates/etc/ppp/ip-up.local/30ipparam20pptpd e-smith-pptpd-2.6.0/root/etc/e-smith/templates/etc/ppp/ip-up.local/30ipparam20pptpd
--- e-smith-pptpd-2.6.0.old/root/etc/e-smith/templates/etc/ppp/ip-up.local/30ipparam20pptpd     1969-12-31 19:00:00.000000000 -0500
+++ e-smith-pptpd-2.6.0/root/etc/e-smith/templates/etc/ppp/ip-up.local/30ipparam20pptpd 2020-12-11 12:11:52.885000000 -0500
@@ -0,0 +1,3 @@
+    pptpd)
+       /sbin/e-smith/signal-event ip-up.pptpd "$@"
+                       ;;
diff -Nur e-smith-pptpd-2.6.0.old/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90PPPconnAdjust00Start e-smith-pptpd-2.6.0/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90PPPconnAdjust00Start
--- e-smith-pptpd-2.6.0.old/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90PPPconnAdjust00Start      1969-12-31 19:00:00.000000000 -0500
+++ e-smith-pptpd-2.6.0/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90PPPconnAdjust00Start  2020-12-11 12:09:17.391000000 -0500
@@ -0,0 +1,11 @@
+{
+    $OUT = "";
+    if ((%pptpd) and (exists $pptpd{Interfaces}))
+    {
+       $OUT .=<<'EOF';
+    OLD_PPPconn=$(get_safe_id PPPconn filter find)
+    NEW_PPPconn=$(get_safe_id PPPconn filter new)
+    /sbin/iptables --new-chain $NEW_PPPconn
+EOF
+    }
+}
diff -Nur e-smith-pptpd-2.6.0.old/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90PPPconnAdjust50adjust_conns e-smith-pptpd-2.6.0/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90PPPconnAdjust50adjust_conns
--- e-smith-pptpd-2.6.0.old/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90PPPconnAdjust50adjust_conns       1969-12-31 19:00:00.000000000 -0500
+++ e-smith-pptpd-2.6.0/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90PPPconnAdjust50adjust_conns   2020-12-11 12:09:30.456000000 -0500
@@ -0,0 +1,14 @@
+{
+    $OUT = "";
+    if ((%pptpd) and (exists $pptpd{Interfaces}))
+    {
+       my @interfaces = split /,/, $pptpd{Interfaces};
+       foreach my $interface (sort @interfaces)
+       {
+           $OUT .=<<"EOF";
+    /sbin/iptables --insert \$NEW_PPPconn --in-interface $interface -j ACCEPT
+    /sbin/iptables --insert \$NEW_PPPconn --out-interface $interface -j ACCEPT
+EOF
+       }
+    }
+}
diff -Nur e-smith-pptpd-2.6.0.old/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90PPPconnAdjust99Finish e-smith-pptpd-2.6.0/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90PPPconnAdjust99Finish
--- e-smith-pptpd-2.6.0.old/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90PPPconnAdjust99Finish     1969-12-31 19:00:00.000000000 -0500
+++ e-smith-pptpd-2.6.0/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90PPPconnAdjust99Finish 2020-12-11 12:09:42.065000000 -0500
@@ -0,0 +1,13 @@
+{
+    $OUT = "";
+    if ((%pptpd) and (exists $pptpd{Interfaces}))
+    {
+       $OUT .=<<'EOF';
+    # Destroy the old chain and put in the new one.
+    /sbin/iptables --replace PPPconn 1 \
+       --jump $NEW_PPPconn
+    /sbin/iptables --flush $OLD_PPPconn
+    /sbin/iptables --delete-chain $OLD_PPPconn
+EOF
+    }
+}
1	diff -Nur e-smith-pptpd-2.6.0.old/root/etc/e-smith/templates/etc/ppp/ip-up.local/30ipparam20pptpd e-smith-pptpd-2.6.0/root/etc/e-smith/templates/etc/ppp/ip-up.local/30ipparam20pptpd
2	--- e-smith-pptpd-2.6.0.old/root/etc/e-smith/templates/etc/ppp/ip-up.local/30ipparam20pptpd 1969-12-31 19:00:00.000000000 -0500
3	+++ e-smith-pptpd-2.6.0/root/etc/e-smith/templates/etc/ppp/ip-up.local/30ipparam20pptpd 2020-12-11 12:11:52.885000000 -0500
4	@@ -0,0 +1,3 @@
5	+ pptpd)
6	+ /sbin/e-smith/signal-event ip-up.pptpd "$@"
7	+ ;;
8	diff -Nur e-smith-pptpd-2.6.0.old/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90PPPconnAdjust00Start e-smith-pptpd-2.6.0/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90PPPconnAdjust00Start
9	--- e-smith-pptpd-2.6.0.old/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90PPPconnAdjust00Start 1969-12-31 19:00:00.000000000 -0500
10	+++ e-smith-pptpd-2.6.0/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90PPPconnAdjust00Start 2020-12-11 12:09:17.391000000 -0500
11	@@ -0,0 +1,11 @@
12	+{
13	+ $OUT = "";
14	+ if ((%pptpd) and (exists $pptpd{Interfaces}))
15	+ {
16	+ $OUT .=<<'EOF';
17	+ OLD_PPPconn=$(get_safe_id PPPconn filter find)
18	+ NEW_PPPconn=$(get_safe_id PPPconn filter new)
19	+ /sbin/iptables --new-chain $NEW_PPPconn
20	+EOF
21	+ }
22	+}
23	diff -Nur e-smith-pptpd-2.6.0.old/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90PPPconnAdjust50adjust_conns e-smith-pptpd-2.6.0/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90PPPconnAdjust50adjust_conns
24	--- e-smith-pptpd-2.6.0.old/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90PPPconnAdjust50adjust_conns 1969-12-31 19:00:00.000000000 -0500
25	+++ e-smith-pptpd-2.6.0/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90PPPconnAdjust50adjust_conns 2020-12-11 12:09:30.456000000 -0500
26	@@ -0,0 +1,14 @@
27	+{
28	+ $OUT = "";
29	+ if ((%pptpd) and (exists $pptpd{Interfaces}))
30	+ {
31	+ my @interfaces = split /,/, $pptpd{Interfaces};
32	+ foreach my $interface (sort @interfaces)
33	+ {
34	+ $OUT .=<<"EOF";
35	+ /sbin/iptables --insert \$NEW_PPPconn --in-interface $interface -j ACCEPT
36	+ /sbin/iptables --insert \$NEW_PPPconn --out-interface $interface -j ACCEPT
37	+EOF
38	+ }
39	+ }
40	+}
41	diff -Nur e-smith-pptpd-2.6.0.old/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90PPPconnAdjust99Finish e-smith-pptpd-2.6.0/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90PPPconnAdjust99Finish
42	--- e-smith-pptpd-2.6.0.old/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90PPPconnAdjust99Finish 1969-12-31 19:00:00.000000000 -0500
43	+++ e-smith-pptpd-2.6.0/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90PPPconnAdjust99Finish 2020-12-11 12:09:42.065000000 -0500
44	@@ -0,0 +1,13 @@
45	+{
46	+ $OUT = "";
47	+ if ((%pptpd) and (exists $pptpd{Interfaces}))
48	+ {
49	+ $OUT .=<<'EOF';
50	+ # Destroy the old chain and put in the new one.
51	+ /sbin/iptables --replace PPPconn 1 \
52	+ --jump $NEW_PPPconn
53	+ /sbin/iptables --flush $OLD_PPPconn
54	+ /sbin/iptables --delete-chain $OLD_PPPconn
55	+EOF
56	+ }
57	+}