diff options
author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
---|---|---|
committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/shorewall/files | |
parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/shorewall/files')
-rw-r--r-- | packages/shorewall/files/install-no-chown.diff | 283 | ||||
-rw-r--r-- | packages/shorewall/files/shorewall-conf-nylon.diff | 175 |
2 files changed, 0 insertions, 458 deletions
diff --git a/packages/shorewall/files/install-no-chown.diff b/packages/shorewall/files/install-no-chown.diff deleted file mode 100644 index ea58bc1b85..0000000000 --- a/packages/shorewall/files/install-no-chown.diff +++ /dev/null @@ -1,283 +0,0 @@ ---- install.sh.o 2004-10-16 23:26:17.400735392 +0200 -+++ install.sh 2004-10-16 23:29:59.284004008 +0200 -@@ -76,7 +76,7 @@ - install_file_with_backup() # $1 = source $2 = target $3 = mode - { - backup_file $2 -- run_install -o $OWNER -g $GROUP -m $3 $1 ${2} -+ run_install -m $3 $1 ${2} - } - - # -@@ -134,8 +134,8 @@ - DEBIAN= - - if [ -n "$PREFIX" ]; then -- install -d -o $OWNER -g $GROUP -m 755 ${PREFIX}/sbin -- install -d -o $OWNER -g $GROUP -m 755 ${PREFIX}${DEST} -+ install -d -m 755 ${PREFIX}/sbin -+ install -d -m 755 ${PREFIX}${DEST} - elif [ -d /etc/apt -a -e /usr/bin/dpkg ]; then - DEBIAN=yes - fi -@@ -185,7 +185,7 @@ - if [ -f ${PREFIX}/etc/shorewall/shorewall.conf ]; then - backup_file /etc/shorewall/shorewall.conf - else -- run_install -o $OWNER -g $GROUP -m 0600 shorewall.conf ${PREFIX}/etc/shorewall/shorewall.conf -+ run_install -m 0600 shorewall.conf ${PREFIX}/etc/shorewall/shorewall.conf - echo - echo "Config file installed as ${PREFIX}/etc/shorewall/shorewall.conf" - fi -@@ -195,7 +195,7 @@ - if [ -f ${PREFIX}/etc/shorewall/zones ]; then - backup_file /etc/shorewall/zones - else -- run_install -o $OWNER -g $GROUP -m 0600 zones ${PREFIX}/etc/shorewall/zones -+ run_install -m 0600 zones ${PREFIX}/etc/shorewall/zones - echo - echo "Zones file installed as ${PREFIX}/etc/shorewall/zones" - fi -@@ -232,7 +232,7 @@ - if [ -f ${PREFIX}/etc/shorewall/policy ]; then - backup_file /etc/shorewall/policy - else -- run_install -o $OWNER -g $GROUP -m 0600 policy ${PREFIX}/etc/shorewall/policy -+ run_install -m 0600 policy ${PREFIX}/etc/shorewall/policy - echo - echo "Policy file installed as ${PREFIX}/etc/shorewall/policy" - fi -@@ -242,7 +242,7 @@ - if [ -f ${PREFIX}/etc/shorewall/interfaces ]; then - backup_file /etc/shorewall/interfaces - else -- run_install -o $OWNER -g $GROUP -m 0600 interfaces ${PREFIX}/etc/shorewall/interfaces -+ run_install -m 0600 interfaces ${PREFIX}/etc/shorewall/interfaces - echo - echo "Interfaces file installed as ${PREFIX}/etc/shorewall/interfaces" - fi -@@ -252,7 +252,7 @@ - if [ -f ${PREFIX}/etc/shorewall/hosts ]; then - backup_file /etc/shorewall/hosts - else -- run_install -o $OWNER -g $GROUP -m 0600 hosts ${PREFIX}/etc/shorewall/hosts -+ run_install -m 0600 hosts ${PREFIX}/etc/shorewall/hosts - echo - echo "Hosts file installed as ${PREFIX}/etc/shorewall/hosts" - fi -@@ -262,7 +262,7 @@ - if [ -f ${PREFIX}/etc/shorewall/rules ]; then - backup_file /etc/shorewall/rules - else -- run_install -o $OWNER -g $GROUP -m 0600 rules ${PREFIX}/etc/shorewall/rules -+ run_install -m 0600 rules ${PREFIX}/etc/shorewall/rules - echo - echo "Rules file installed as ${PREFIX}/etc/shorewall/rules" - fi -@@ -272,7 +272,7 @@ - if [ -f ${PREFIX}/etc/shorewall/nat ]; then - backup_file /etc/shorewall/nat - else -- run_install -o $OWNER -g $GROUP -m 0600 nat ${PREFIX}/etc/shorewall/nat -+ run_install -m 0600 nat ${PREFIX}/etc/shorewall/nat - echo - echo "NAT file installed as ${PREFIX}/etc/shorewall/nat" - fi -@@ -282,7 +282,7 @@ - if [ -f ${PREFIX}/etc/shorewall/netmap ]; then - backup_file /etc/shorewall/netmap - else -- run_install -o $OWNER -g $GROUP -m 0600 netmap ${PREFIX}/etc/shorewall/netmap -+ run_install -m 0600 netmap ${PREFIX}/etc/shorewall/netmap - echo - echo "NETMAP file installed as ${PREFIX}/etc/shorewall/netmap" - fi -@@ -292,7 +292,7 @@ - if [ -f ${PREFIX}/etc/shorewall/params ]; then - backup_file /etc/shorewall/params - else -- run_install -o $OWNER -g $GROUP -m 0600 params ${PREFIX}/etc/shorewall/params -+ run_install -m 0600 params ${PREFIX}/etc/shorewall/params - echo - echo "Parameter file installed as ${PREFIX}/etc/shorewall/params" - fi -@@ -302,7 +302,7 @@ - if [ -f ${PREFIX}/etc/shorewall/proxyarp ]; then - backup_file /etc/shorewall/proxyarp - else -- run_install -o $OWNER -g $GROUP -m 0600 proxyarp ${PREFIX}/etc/shorewall/proxyarp -+ run_install -m 0600 proxyarp ${PREFIX}/etc/shorewall/proxyarp - echo - echo "Proxy ARP file installed as ${PREFIX}/etc/shorewall/proxyarp" - fi -@@ -312,7 +312,7 @@ - if [ -f ${PREFIX}/etc/shorewall/routestopped ]; then - backup_file /etc/shorewall/routestopped - else -- run_install -o $OWNER -g $GROUP -m 0600 routestopped ${PREFIX}/etc/shorewall/routestopped -+ run_install -m 0600 routestopped ${PREFIX}/etc/shorewall/routestopped - echo - echo "Stopped Routing file installed as ${PREFIX}/etc/shorewall/routestopped" - fi -@@ -322,7 +322,7 @@ - if [ -f ${PREFIX}/etc/shorewall/maclist ]; then - backup_file /etc/shorewall/maclist - else -- run_install -o $OWNER -g $GROUP -m 0600 maclist ${PREFIX}/etc/shorewall/maclist -+ run_install -m 0600 maclist ${PREFIX}/etc/shorewall/maclist - echo - echo "MAC list file installed as ${PREFIX}/etc/shorewall/maclist" - fi -@@ -332,7 +332,7 @@ - if [ -f ${PREFIX}/etc/shorewall/masq ]; then - backup_file /etc/shorewall/masq - else -- run_install -o $OWNER -g $GROUP -m 0600 masq ${PREFIX}/etc/shorewall/masq -+ run_install -m 0600 masq ${PREFIX}/etc/shorewall/masq - echo - echo "Masquerade file installed as ${PREFIX}/etc/shorewall/masq" - fi -@@ -342,7 +342,7 @@ - if [ -f ${PREFIX}/etc/shorewall/modules ]; then - backup_file /etc/shorewall/modules - else -- run_install -o $OWNER -g $GROUP -m 0600 modules ${PREFIX}/etc/shorewall/modules -+ run_install -m 0600 modules ${PREFIX}/etc/shorewall/modules - echo - echo "Modules file installed as ${PREFIX}/etc/shorewall/modules" - fi -@@ -352,7 +352,7 @@ - if [ -f ${PREFIX}/etc/shorewall/tcrules ]; then - backup_file /etc/shorewall/tcrules - else -- run_install -o $OWNER -g $GROUP -m 0600 tcrules ${PREFIX}/etc/shorewall/tcrules -+ run_install -m 0600 tcrules ${PREFIX}/etc/shorewall/tcrules - echo - echo "TC Rules file installed as ${PREFIX}/etc/shorewall/tcrules" - fi -@@ -363,7 +363,7 @@ - if [ -f ${PREFIX}/etc/shorewall/tos ]; then - backup_file /etc/shorewall/tos - else -- run_install -o $OWNER -g $GROUP -m 0600 tos ${PREFIX}/etc/shorewall/tos -+ run_install -m 0600 tos ${PREFIX}/etc/shorewall/tos - echo - echo "TOS file installed as ${PREFIX}/etc/shorewall/tos" - fi -@@ -373,7 +373,7 @@ - if [ -f ${PREFIX}/etc/shorewall/tunnels ]; then - backup_file /etc/shorewall/tunnels - else -- run_install -o $OWNER -g $GROUP -m 0600 tunnels ${PREFIX}/etc/shorewall/tunnels -+ run_install -m 0600 tunnels ${PREFIX}/etc/shorewall/tunnels - echo - echo "Tunnels file installed as ${PREFIX}/etc/shorewall/tunnels" - fi -@@ -383,7 +383,7 @@ - if [ -f ${PREFIX}/etc/shorewall/blacklist ]; then - backup_file /etc/shorewall/blacklist - else -- run_install -o $OWNER -g $GROUP -m 0600 blacklist ${PREFIX}/etc/shorewall/blacklist -+ run_install -m 0600 blacklist ${PREFIX}/etc/shorewall/blacklist - echo - echo "Blacklist file installed as ${PREFIX}/etc/shorewall/blacklist" - fi -@@ -418,7 +418,7 @@ - if [ -f ${PREFIX}/etc/shorewall/init ]; then - backup_file /etc/shorewall/init - else -- run_install -o $OWNER -g $GROUP -m 0600 init ${PREFIX}/etc/shorewall/init -+ run_install -m 0600 init ${PREFIX}/etc/shorewall/init - echo - echo "Init file installed as ${PREFIX}/etc/shorewall/init" - fi -@@ -428,7 +428,7 @@ - if [ -f ${PREFIX}/etc/shorewall/initdone ]; then - backup_file /etc/shorewall/initdone - else -- run_install -o $OWNER -g $GROUP -m 0600 initdone ${PREFIX}/etc/shorewall/initdone -+ run_install -m 0600 initdone ${PREFIX}/etc/shorewall/initdone - echo - echo "Initdone file installed as ${PREFIX}/etc/shorewall/initdone" - fi -@@ -438,7 +438,7 @@ - if [ -f ${PREFIX}/etc/shorewall/start ]; then - backup_file /etc/shorewall/start - else -- run_install -o $OWNER -g $GROUP -m 0600 start ${PREFIX}/etc/shorewall/start -+ run_install -m 0600 start ${PREFIX}/etc/shorewall/start - echo - echo "Start file installed as ${PREFIX}/etc/shorewall/start" - fi -@@ -448,7 +448,7 @@ - if [ -f ${PREFIX}/etc/shorewall/stop ]; then - backup_file /etc/shorewall/stop - else -- run_install -o $OWNER -g $GROUP -m 0600 stop ${PREFIX}/etc/shorewall/stop -+ run_install -m 0600 stop ${PREFIX}/etc/shorewall/stop - echo - echo "Stop file installed as ${PREFIX}/etc/shorewall/stop" - fi -@@ -458,7 +458,7 @@ - if [ -f ${PREFIX}/etc/shorewall/stopped ]; then - backup_file /etc/shorewall/stopped - else -- run_install -o $OWNER -g $GROUP -m 0600 stopped ${PREFIX}/etc/shorewall/stopped -+ run_install -m 0600 stopped ${PREFIX}/etc/shorewall/stopped - echo - echo "Stopped file installed as ${PREFIX}/etc/shorewall/stopped" - fi -@@ -468,7 +468,7 @@ - if [ -f ${PREFIX}/etc/shorewall/ecn ]; then - backup_file /etc/shorewall/ecn - else -- run_install -o $OWNER -g $GROUP -m 0600 ecn ${PREFIX}/etc/shorewall/ecn -+ run_install -m 0600 ecn ${PREFIX}/etc/shorewall/ecn - echo - echo "ECN file installed as ${PREFIX}/etc/shorewall/ecn" - fi -@@ -478,7 +478,7 @@ - if [ -f ${PREFIX}/etc/shorewall/accounting ]; then - backup_file /etc/shorewall/accounting - else -- run_install -o $OWNER -g $GROUP -m 0600 accounting ${PREFIX}/etc/shorewall/accounting -+ run_install -m 0600 accounting ${PREFIX}/etc/shorewall/accounting - echo - echo "Accounting file installed as ${PREFIX}/etc/shorewall/accounting" - fi -@@ -496,7 +496,7 @@ - if [ -f ${PREFIX}/etc/shorewall/actions ]; then - backup_file /etc/shorewall/actions - else -- run_install -o $OWNER -g $GROUP -m 0600 actions ${PREFIX}/etc/shorewall/actions -+ run_install -m 0600 actions ${PREFIX}/etc/shorewall/actions - echo - echo "Actions file installed as ${PREFIX}/etc/shorewall/actions" - fi -@@ -507,7 +507,7 @@ - if [ -f ${PREFIX}/usr/share/shorewall/$f ]; then - backup_file /usr/share/shorewall/$f - else -- run_install -o $OWNER -g $GROUP -m 0600 $f ${PREFIX}/usr/share/shorewall/$f -+ run_install -m 0600 $f ${PREFIX}/usr/share/shorewall/$f - echo - echo "Action ${f#*.} file installed as ${PREFIX}/usr/share/shorewall/$f" - fi -@@ -542,7 +542,7 @@ - if [ -z "$PREFIX" ]; then - if -n "$first_install" ]; then - if [ -n "$DEBIAN" ]; then -- run_install -o $OWNER -g $GROUP -m 0644 default.debian /etc/default/shorewall -+ run_install -m 0644 default.debian /etc/default/shorewall - ln -s ../init.d/shorewall /etc/rcS.d/S40shorewall - echo - echo "shorewall will start automatically at boot" -@@ -583,7 +583,7 @@ - ########################################################################" > /etc/shorewall/startup_disabled - fi - elif [ -n "$DEBIAN" -a ! -f /etc/default/shorewall ]; then -- run_install -o $OWNER -g $GROUP -m 0644 default.debian /etc/default/shorewall -+ run_install -m 0644 default.debian /etc/default/shorewall - fi - fi - # diff --git a/packages/shorewall/files/shorewall-conf-nylon.diff b/packages/shorewall/files/shorewall-conf-nylon.diff deleted file mode 100644 index 43b2abd745..0000000000 --- a/packages/shorewall/files/shorewall-conf-nylon.diff +++ /dev/null @@ -1,175 +0,0 @@ -diff -Nurb shorewall/action.AllowMM shorewall.confed/action.AllowMM ---- shorewall/action.AllowMM 1970-01-01 01:00:00.000000000 +0100 -+++ shorewall.confed/action.AllowMM 2004-10-14 16:50:21.200725304 +0200 -@@ -0,0 +1,15 @@ -+# -+# Shorewall 2.0 /etc/shorewall/action.AllowMM -+# -+# This action accepts MobileMesh routing protocol traffic. -+# -+# Note: This action allows traffic for the MobileMesh routing protocol -+# -+###################################################################################### -+#TARGET SOURCE DEST PROTO DEST SOURCE RATE USER/ -+# PORT PORT(S) LIMIT GROUP -+ACCEPT - - udp 20470 -+ACCEPT - - udp 20471 -+ACCEPT - - tcp 20473 -+ACCEPT - 224.1.2.3 -+#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE -diff -Nurb shorewall/action.AllowNetperf shorewall.confed/action.AllowNetperf ---- shorewall/action.AllowNetperf 1970-01-01 01:00:00.000000000 +0100 -+++ shorewall.confed/action.AllowNetperf 2004-10-14 15:46:36.000000000 +0200 -@@ -0,0 +1,17 @@ -+# -+# Shorewall 2.0 /etc/shorewall/action.AllowSMTP -+# -+# This action accepts SMTP (email) traffic. -+# -+# Note: This action allows traffic between an MUA (Email client) -+# and an MTA (mail server) or between MTAs. It does not enable -+# reading of email via POP3 or IMAP. For those you need to use -+# the AllowPOP3 or AllowIMAP actions. -+# -+###################################################################################### -+#TARGET SOURCE DEST PROTO DEST SOURCE RATE USER/ -+# PORT PORT(S) LIMIT GROUP -+ACCEPT - - tcp 12865 -+ACCEPT - - tcp 1024: -+ACCEPT - - udp 1024: -+#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE -diff -Nurb shorewall/action.AllowOLSR shorewall.confed/action.AllowOLSR ---- shorewall/action.AllowOLSR 1970-01-01 01:00:00.000000000 +0100 -+++ shorewall.confed/action.AllowOLSR 2004-10-14 15:45:29.000000000 +0200 -@@ -0,0 +1,12 @@ -+# -+# Shorewall 2.0 /etc/shorewall/action.AllowOLSR -+# -+# This action accepts OLSR routing protocol traffic. -+# -+# Note: This action allows traffic from the OLSR routing protocol. -+# -+###################################################################################### -+#TARGET SOURCE DEST PROTO DEST SOURCE RATE USER/ -+# PORT PORT(S) LIMIT GROUP -+ACCEPT - - udp 698 -+#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE -diff -Nurb shorewall/action.AllowTinc shorewall.confed/action.AllowTinc ---- shorewall/action.AllowTinc 1970-01-01 01:00:00.000000000 +0100 -+++ shorewall.confed/action.AllowTinc 2004-10-14 15:48:13.000000000 +0200 -@@ -0,0 +1,13 @@ -+# -+# Shorewall 2.0 /etc/shorewall/action.AllowOLSR -+# -+# This action accepts OLSR routing protocol traffic. -+# -+# Note: This action allows traffic from the OLSR routing protocol. -+# -+###################################################################################### -+#TARGET SOURCE DEST PROTO DEST SOURCE RATE USER/ -+# PORT PORT(S) LIMIT GROUP -+ACCEPT - - tcp 655 655 -+ACCEPT - - udp 655 655 -+#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE -diff -Nurb shorewall/action.AllowIPSEC shorewall.confed/action.AllowIPSEC ---- shorewall/action.AllowIPSEC 1970-01-01 01:00:00.000000000 +0100 -+++ shorewall.confed/action.AllowIPSEC 2004-10-14 15:48:13.000000000 +0200 -@@ -0,0 +1,15 @@ -+# -+# Shorewall 2.0 /etc/shorewall/action.AllowIPSEC -+# -+# This action accepts IPSEC traffic. -+# -+# Note: This action allows IPSEC encrypted traffic (ESP and AH) -+# and IPSEC key negotioation (IKE). -+# -+###################################################################################### -+#TARGET SOURCE DEST PROTO DEST SOURCE RATE USER/ -+# PORT PORT(S) LIMIT GROUP -+ACCEPT - - 50 -+ACCEPT - - 51 -+ACCEPT - - udp 500 500 -+#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE -diff -Nurb shorewall/actions shorewall.confed/actions ---- shorewall/actions 2004-10-14 17:04:41.547932648 +0200 -+++ shorewall.confed/actions 2004-10-14 15:52:38.000000000 +0200 -@@ -25,5 +25,9 @@ - # itself, the associated policy will have no common action. - # - #ACTION -- -+AllowMM -+AllowNetperf -+AllowOLSR -+AllowTinc -+AllowIPSEC - #LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE -diff -Nurb shorewall/interfaces shorewall.confed/interfaces ---- shorewall/interfaces 2004-10-14 17:04:41.546932800 +0200 -+++ shorewall.confed/interfaces 2004-10-14 16:04:41.000000000 +0200 -@@ -190,5 +190,10 @@ - # net ppp0 - - ############################################################################## - #ZONE INTERFACE BROADCAST OPTIONS -+net ppp0 detect norfc1918 -+net eth0 detect dhcp -+loc wlan0 detect dhcp -+loc ipsec0 detect -+mesh wlan1 detect routeback - # - #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE -diff -Nurb shorewall/masq shorewall.confed/masq ---- shorewall/masq 2004-10-14 17:04:41.547932648 +0200 -+++ shorewall.confed/masq 2004-10-14 15:27:24.000000000 +0200 -@@ -137,4 +137,6 @@ - # - ############################################################################### - #INTERFACE SUBNET ADDRESS PROTO PORT(S) -+eth0 0.0.0.0/0 -+ppp0 0.0.0.0/0 - #LAST LINE -- ADD YOUR ENTRIES ABOVE THIS LINE -- DO NOT REMOVE -diff -Nurb shorewall/policy shorewall.confed/policy ---- shorewall/policy 2004-10-14 17:04:41.546932800 +0200 -+++ shorewall.confed/policy 2004-10-14 16:06:33.000000000 +0200 -@@ -77,6 +77,9 @@ - #SOURCE DEST POLICY LOG LIMIT:BURST - # LEVEL - loc net ACCEPT -+mesh net ACCEPT -+loc mesh ACCEPT -+fw all ACCEPT - net all DROP info - # - # THE FOLLOWING POLICY MUST BE LAST -diff -Nurb shorewall/rules shorewall.confed/rules ---- shorewall/rules 2004-10-14 17:04:41.547932648 +0200 -+++ shorewall.confed/rules 2004-10-14 16:56:41.874854040 +0200 -@@ -310,4 +310,18 @@ - #################################################################################################### - #ACTION SOURCE DEST PROTO DEST SOURCE ORIGINAL RATE USER/ - # PORT PORT(S) DEST LIMIT GROUP -+AllowPing all all -+AllowTrcrt all all -+AllowDNS loc fw -+AllowDNS mesh fw -+AllowSSH all fw -+AllowWeb loc fw -+AllowSNMP loc fw -+AllowOLSR mesh fw -+AllowOLSR fw mesh -+AllowMM mesh fw -+AllowMM fw mesh -+AllowNetperf loc fw -+AllowNetperf mesh fw -+AllowIPSEC all fw - #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE -diff -Nurb shorewall/zones shorewall.confed/zones ---- shorewall/zones 2004-10-14 17:04:41.546932800 +0200 -+++ shorewall.confed/zones 2004-10-14 15:04:59.000000000 +0200 -@@ -15,5 +15,5 @@ - #ZONE DISPLAY COMMENTS - net Net Internet - loc Local Local networks --dmz DMZ Demilitarized zone -+mesh Mesh The Mesh Netwok - #LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE |