/[smeserver]/rpms/e-smith-pptpd/sme10/e-smith-pptpd-2.6.0-bz11249.patch
ViewVC logotype

Contents of /rpms/e-smith-pptpd/sme10/e-smith-pptpd-2.6.0-bz11249.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (show annotations) (download)
Fri Dec 11 17:17:18 2020 UTC (3 years, 11 months ago) by jpp
Branch: MAIN
CVS Tags: HEAD
* Fri Dec 11 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-2.sme
- create -update event [SME: 11149]
- adapt to systemd [SME: 11112]
- remove pptpd support [SME: 11249]

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 +}

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed