From 26fca41e272673b57fccbb2806720b97a745d156 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Thu, 20 Aug 2015 15:17:48 -0700 Subject: [PATCH] Eliminate discontinued files and manpages Signed-off-by: Tom Eastep --- Shorewall/configfiles/tos | 8 -- Shorewall/install.sh | 70 +++++----- Shorewall/manpages/shorewall-tos.xml | 185 --------------------------- Shorewall6/configfiles/tos | 8 -- 4 files changed, 38 insertions(+), 233 deletions(-) delete mode 100644 Shorewall/configfiles/tos delete mode 100644 Shorewall/manpages/shorewall-tos.xml delete mode 100644 Shorewall6/configfiles/tos diff --git a/Shorewall/configfiles/tos b/Shorewall/configfiles/tos deleted file mode 100644 index bba4cba5e..000000000 --- a/Shorewall/configfiles/tos +++ /dev/null @@ -1,8 +0,0 @@ -# -# Shorewall version 5 - Tos File -# -# For information about entries in this file, type "man shorewall-tos" -# -############################################################################### -#SOURCE DEST PROTOCOL DEST SOURCE TOS MARK -# PORTS PORTS diff --git a/Shorewall/install.sh b/Shorewall/install.sh index da5461fd9..4b4253dba 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -439,31 +439,47 @@ if [ -n "$SERVICEDIR" ]; then echo "Service file $SERVICEFILE installed as ${DESTDIR}${SERVICEDIR}/$PRODUCT.service" fi -# -# These use absolute path names since the files that they are removing existed -# prior to the use of directory variables -# -delete_file ${DESTDIR}/usr/share/$PRODUCT/compiler -delete_file ${DESTDIR}/usr/share/$PRODUCT/lib.accounting -delete_file ${DESTDIR}/usr/share/$PRODUCT/lib.actions -delete_file ${DESTDIR}/usr/share/$PRODUCT/lib.dynamiczones -delete_file ${DESTDIR}/usr/share/$PRODUCT/lib.maclist -delete_file ${DESTDIR}/usr/share/$PRODUCT/lib.nat -delete_file ${DESTDIR}/usr/share/$PRODUCT/lib.providers -delete_file ${DESTDIR}/usr/share/$PRODUCT/lib.proxyarp -delete_file ${DESTDIR}/usr/share/$PRODUCT/lib.tc -delete_file ${DESTDIR}/usr/share/$PRODUCT/lib.tcrules -delete_file ${DESTDIR}/usr/share/$PRODUCT/lib.tunnels +if [ -z "$first_install" ]; then + # + # These use absolute path names since the files that they are removing existed + # prior to the use of directory variables + # + delete_file ${DESTDIR}/usr/share/$PRODUCT/compiler + delete_file ${DESTDIR}/usr/share/$PRODUCT/lib.accounting + delete_file ${DESTDIR}/usr/share/$PRODUCT/lib.actions + delete_file ${DESTDIR}/usr/share/$PRODUCT/lib.dynamiczones + delete_file ${DESTDIR}/usr/share/$PRODUCT/lib.maclist + delete_file ${DESTDIR}/usr/share/$PRODUCT/lib.nat + delete_file ${DESTDIR}/usr/share/$PRODUCT/lib.providers + delete_file ${DESTDIR}/usr/share/$PRODUCT/lib.proxyarp + delete_file ${DESTDIR}/usr/share/$PRODUCT/lib.tc + delete_file ${DESTDIR}/usr/share/$PRODUCT/lib.tcrules + delete_file ${DESTDIR}/usr/share/$PRODUCT/lib.tunnels -if [ $PRODUCT = shorewall6 ]; then - delete_file ${DESTDIR}/usr/share/shorewall6/lib.cli - delete_file ${DESTDIR}/usr/share/shorewall6/lib.common - delete_file ${DESTDIR}/usr/share/shorewall6/wait4ifup + if [ $PRODUCT = shorewall6 ]; then + delete_file ${DESTDIR}/usr/share/shorewall6/lib.cli + delete_file ${DESTDIR}/usr/share/shorewall6/lib.common + delete_file ${DESTDIR}/usr/share/shorewall6/wait4ifup + fi + + delete_file ${DESTDIR}/usr/share/$PRODUCT/prog.header6 + delete_file ${DESTDIR}/usr/share/$PRODUCT/prog.footer6 + + # + # Delete obsolete config files and manpages + # + delete_file ${DESTDIR}/${SHAREDIR}/$PRODUCT/configfiles/tos + delete_file ${DESTDIR}/${SHAREDIR}/$PRODUCT/configfiles/tcrules + delete_file ${DESTDIR}/${SHAREDIR}/$PRODUCT/configfiles/stoppedrules + delete_file ${DESTDIR}/${SHAREDIR}/$PRODUCT/configfiles/notrack + delete_file ${DESTDIR}/${SHAREDIR}/$PRODUCT/configfiles/blacklist + delete_file ${DESTDIR}/${MANDIR}/man5/$PRODUCT/${PRODUCT}-tos + delete_file ${DESTDIR}/${MANDIR}/man5/$PRODUCT/${PRODUCT}-tcrules + delete_file ${DESTDIR}/${MANDIR}/man5/$PRODUCT/${PRODUCT}-stoppedrules + delete_file ${DESTDIR}/${MANDIR}/man5/$PRODUCT/${PRODUCT}-notrack + delete_file ${DESTDIR}/${MANDIR}/man5/$PRODUCT/${PRODUCT}-blacklist fi -delete_file ${DESTDIR}/usr/share/$PRODUCT/prog.header6 -delete_file ${DESTDIR}/usr/share/$PRODUCT/prog.footer6 - # # Install the Modules file # @@ -741,16 +757,6 @@ if [ -z "$SPARSE" -a ! -f ${DESTDIR}${CONFDIR}/$PRODUCT/tcpri ]; then echo "TC Priority file installed as ${DESTDIR}${CONFDIR}/$PRODUCT/tcpri" fi -# -# Install the TOS file -# -run_install $OWNERSHIP -m 0644 tos ${DESTDIR}${SHAREDIR}/$PRODUCT/configfiles/ -run_install $OWNERSHIP -m 0644 tos.annotated ${DESTDIR}${SHAREDIR}/$PRODUCT/configfiles/ - -if [ -z "$SPARSE" -a ! -f ${DESTDIR}${CONFDIR}/$PRODUCT/tos ]; then - run_install $OWNERSHIP -m 0600 tos${suffix} ${DESTDIR}${CONFDIR}/$PRODUCT/tos - echo "TOS file installed as ${DESTDIR}${CONFDIR}/$PRODUCT/tos" -fi # # Install the Tunnels file # diff --git a/Shorewall/manpages/shorewall-tos.xml b/Shorewall/manpages/shorewall-tos.xml deleted file mode 100644 index f54f805d5..000000000 --- a/Shorewall/manpages/shorewall-tos.xml +++ /dev/null @@ -1,185 +0,0 @@ - - - - - shorewall-tos - - 5 - - Configuration Files - - - - tos - - Shorewall Type of Service rules file - - - - - /etc/shorewall/tos - - - - - Description - - This file defines rules for setting Type Of Service (TOS). Its use - is deprecated, beginning in Shorewall 4.5.1, in favor of the TOS target in - shorewall-mangle - (5). - - 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 - the alternate specification syntax). - - - - SOURCE - {all|address]|all:address|$FW} - - - If all, may optionally be - followed by ":" and an IP address, a MAC address, a subnet - specification or the name of an interface. - - Example: all:192.168.2.3 - - MAC addresses must be prefixed with "~" and use "-" as a - separator. - - Example: ~00-A0-C9-15-39-78 - - - - - DEST - {all|address]|all:address} - - - Example: 192.168.2.3 - - - - - PROTOCOL (proto) - - proto-name-or-number - - - Protocol name or number. - - - - - SOURCE PORT(S) (sport) - - {-|port|lowport:highport} - - - Source port or port range. If all ports, use "-". - - - - - DEST PORT(S) (dport) - - {-|port|lowport:highport} - - - Destination port or port range. If all ports, use "-" - - - - - TOS - - tos - - - Must may one of the following; - - tos-minimize-delay (16) - tos-maximize-throughput (8) - tos-maximize-reliability (4) - tos-minimize-cost (2) - tos-normal-service (0) - - To specify more than one flag, add their values together and - specify the numeric result. - - - - - MARK - [!]value[/mask][:C] - - - If you don't want to define a test but need to specify - anything in the following columns, place a "-" in this field. - - - - ! - - - Inverts the test (not equal) - - - - - value - - - Value of the packet or connection mark. - - - - - mask - - - A mask to be applied to the mark before testing. - - - - - :C - - - Designates a connection mark. If omitted, the packet - mark's value is tested. - - - - - - - - - - FILES - - /etc/shorewall/tos - - - - See ALSO - - http://www.shorewall.net/configuration_file_basics.htm#Pairs - - shorewall(8), shorewall-accounting(5), shorewall-actions(5), - shorewall-blacklist(5), shorewall-hosts(5), shorewall_interfaces(5), - shorewall-ipsets(5), shorewall-maclist(5), shorewall-masq(5), - shorewall-nat(5), shorewall-netmap(5), shorewall-params(5), - shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5), - shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5), - shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5), - shorewall-tcdevices(5), shorewall-mangle(5), shorewall-tunnels(5), - shorewall-zones(5) - - diff --git a/Shorewall6/configfiles/tos b/Shorewall6/configfiles/tos deleted file mode 100644 index 8b203cb18..000000000 --- a/Shorewall6/configfiles/tos +++ /dev/null @@ -1,8 +0,0 @@ -# -# Shorewall6 version 5 - Tos File -# -# For information about entries in this file, type "man shorewall6-tos" -# -############################################################################### -#SOURCE DEST PROTOCOL DEST SOURCE TOS MARK -# PORTS PORTS