configroot: Drop config file for p2protocols.

The support for creating P2P based rules has been removed from the
firewall. So this file is not longer needed.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
Acked-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/firewall/p2protocols b/config/firewall/p2protocols
deleted file mode 100644 (file)
index d899809..0000000
--- a/config/firewall/p2protocols
+++ /dev/null
@@ -1,9 +0,0 @@
-Applejuice;apple;on;
-Ares;ares;on;
-Bittorrent;bit;on;
-DirectConnect;dc;on;
-Edonkey;edk;on;
-Gnutella;gnu;on;
-KaZaA;kazaa;on;
-SoulSeek;soul;on;
-WinMX;winmx;on;

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 904c718c33efe037712b7b62b07c46f4e61f5621..fef5ffbcfcea4355e570273d611cedba9e036ac2 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -63,7 +63,6 @@ var/ipfire/firewall
 #var/ipfire/firewall/input
 #var/ipfire/firewall/locationblock
 #var/ipfire/firewall/outgoing
-#var/ipfire/firewall/p2protocols
 #var/ipfire/firewall/settings
 var/ipfire/fwhosts
 #var/ipfire/fwhosts/customgroups

diff --git a/lfs/configroot b/lfs/configroot
index 9f3188aab9e28b29c134eca51a56dc1d9f37ac2f..b836767c135db5e9db3413a78138e8ea9e125b45 100644 (file)
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -105,7 +105,6 @@ $(TARGET) :
        cp $(DIR_SRC)/config/firewall/convert-outgoingfw        /usr/sbin/convert-outgoingfw
        cp $(DIR_SRC)/config/firewall/convert-dmz       /usr/sbin/convert-dmz
        cp $(DIR_SRC)/config/firewall/convert-portfw    /usr/sbin/convert-portfw
-       cp $(DIR_SRC)/config/firewall/p2protocols               $(CONFIG_ROOT)/firewall/p2protocols
        cp $(DIR_SRC)/config/firewall/firewall-policy   /usr/sbin/firewall-policy
        cp $(DIR_SRC)/config/fwhosts/icmp-types                 $(CONFIG_ROOT)/fwhosts/icmp-types
        cp $(DIR_SRC)/config/fwhosts/customservices             $(CONFIG_ROOT)/fwhosts/customservices