diff --git a/Shorewall/configfiles/blacklist b/Shorewall/configfiles/blacklist deleted file mode 100644 index 172a93e5f..000000000 --- a/Shorewall/configfiles/blacklist +++ /dev/null @@ -1,11 +0,0 @@ -# -# Shorewall version 4 - Blacklist File -# -# For information about entries in this file, type "man shorewall-blacklist" -# -# Please see http://shorewall.net/blacklisting_support.htm for additional -# information. -# -############################################################################### -#ADDRESS/SUBNET PROTOCOL PORT OPTIONS - diff --git a/Shorewall/install.sh b/Shorewall/install.sh index b7120276a..c60e305e7 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -698,10 +698,6 @@ if [ -z "$SPARSE" -a ! -f ${DESTDIR}${CONFDIR}/$PRODUCT/tunnels ]; then echo "Tunnels file installed as ${DESTDIR}${CONFDIR}/$PRODUCT/tunnels" fi -if [ -z "$SPARSE" -a ! -f ${DESTDIR}${CONFDIR}/$PRODUCT/blacklist ]; then - run_install $OWNERSHIP -m 0600 blacklist${suffix} ${DESTDIR}${CONFDIR}/$PRODUCT/blacklist - echo "Blacklist file installed as ${DESTDIR}${CONFDIR}/$PRODUCT/blacklist" -fi # # Install the blacklist rules file # diff --git a/Shorewall/manpages/shorewall-blacklist.xml b/Shorewall/manpages/shorewall-blacklist.xml index 5718fcca1..6b24c4475 100644 --- a/Shorewall/manpages/shorewall-blacklist.xml +++ b/Shorewall/manpages/shorewall-blacklist.xml @@ -23,8 +23,10 @@ Description - The blacklist file is used to perform static blacklisting. You can - blacklist by source address (IP or MAC), or by application. + The blacklist file is used to perform static blacklisting by source + address (IP or MAC), or by application. The use of this file is deprecated + and beginning with Shorewall 4.5.7, the file is no longer + installed. The columns in the file are as follows (where the column name is followed by a different name in parentheses, the different name is used in diff --git a/Shorewall6/configfiles/blacklist b/Shorewall6/configfiles/blacklist deleted file mode 100755 index df071bedb..000000000 --- a/Shorewall6/configfiles/blacklist +++ /dev/null @@ -1,10 +0,0 @@ -# -# Shorewall6 version 4 - Blacklist File -# -# For information about entries in this file, type "man shorewall6-blacklist" -# -# Please see http://shorewall.net/blacklisting_support.htm for additional -# information. -# -############################################################################### -#ADDRESS/SUBNET PROTOCOL PORT OPTIONS diff --git a/Shorewall6/manpages/shorewall6-blacklist.xml b/Shorewall6/manpages/shorewall6-blacklist.xml index b0389999a..1eb9144a7 100644 --- a/Shorewall6/manpages/shorewall6-blacklist.xml +++ b/Shorewall6/manpages/shorewall6-blacklist.xml @@ -23,8 +23,13 @@ Description - The blacklist file is used to perform static blacklisting. You can - blacklist by source address (IP or MAC), or by application. + The blacklist file is used to perform static blacklisting by source + address (IP or MAC), or by application. The use of this file is deprecated + in favor of shorewall6-blrules(5), and beginning + with Shorewall 4.5.7, the blacklist file is no longer installed. Existing + blacklist files can be converted to a corresponding blrules file using the + shorewall6 update -b command. The columns in the file are as follows (where the column name is followed by a different name in parentheses, the different name is used in