commit: 270e6c83301d3be2e89d95c2fcc390b9344a5d7f
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 14 19:11:49 2015 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 19:11:49 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=270e6c83
net-firewall/firehol: cleanup
Package-Manager: portage-2.2.20.1
net-firewall/firehol/files/RESERVED_IPS | 19 -------
.../files/firehol-1.273-CVE-2008-4953.patch | 58 ----------------------
.../firehol/files/firehol-1.273-log-output.patch | 11 ----
.../files/{firehol.initrd.1 => firehol.initrd} | 0
net-firewall/firehol/firehol-2.0.3-r1.ebuild | 2 +-
5 files changed, 1 insertion(+), 89 deletions(-)
diff --git a/net-firewall/firehol/files/RESERVED_IPS
b/net-firewall/firehol/files/RESERVED_IPS
deleted file mode 100644
index 2cfd261..0000000
--- a/net-firewall/firehol/files/RESERVED_IPS
+++ /dev/null
@@ -1,19 +0,0 @@
-0.0.0.0/8
-10.0.0.0/8
-127.0.0.0/8
-240.0.0.0/8
-241.0.0.0/8
-242.0.0.0/8
-243.0.0.0/8
-244.0.0.0/8
-245.0.0.0/8
-246.0.0.0/8
-247.0.0.0/8
-248.0.0.0/8
-249.0.0.0/8
-250.0.0.0/8
-251.0.0.0/8
-252.0.0.0/8
-253.0.0.0/8
-254.0.0.0/8
-255.0.0.0/8
diff --git a/net-firewall/firehol/files/firehol-1.273-CVE-2008-4953.patch
b/net-firewall/firehol/files/firehol-1.273-CVE-2008-4953.patch
deleted file mode 100644
index 99a958a..0000000
--- a/net-firewall/firehol/files/firehol-1.273-CVE-2008-4953.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 545db8cd292957158bf3fa1c1c370e4be83c6688 Mon Sep 17 00:00:00 2001
-From: Robert Buchholz <r...@goodpoint.de>
-Date: Tue, 6 Jan 2009 23:26:00 +0100
-Subject: [PATCH] Use mktemp instead of relying that $$-$RANDOM-$RANDOM does
not exist.
-
-References:
-* CVE-2008-4953
-* https://bugs.gentoo.org/246013
----
- firehol.sh | 25 +++++++++----------------
- 1 files changed, 9 insertions(+), 16 deletions(-)
-
-diff --git a/firehol.sh b/firehol.sh
-index 6acb497..f5dba16 100755
---- a/firehol.sh
-+++ b/firehol.sh
-@@ -238,8 +238,15 @@ ${IPTABLES_CMD} -nxvL >/dev/null 2>&1
- # ----------------------------------------------------------------------
- # Directories and files
-
--# These files will be created and deleted during our run.
--FIREHOL_DIR="/tmp/.firehol-tmp-$$-${RANDOM}-${RANDOM}"
-+# Create an empty temporary directory we need for this run.
-+if ! FIREHOL_DIR="`mktemp -d -t .firehol-tmp-XXXXXX`"
-+then
-+ echo >&2
-+ echo >&2
-+ echo >&2 "Cannot create temporary directory."
-+ echo >&2
-+ exit 1
-+fi
- FIREHOL_CHAINS_DIR="${FIREHOL_DIR}/chains"
- FIREHOL_OUTPUT="${FIREHOL_DIR}/firehol-out.sh"
- FIREHOL_SAVED="${FIREHOL_DIR}/firehol-save.sh"
-@@ -329,20 +336,6 @@ then
- "${CHMOD_CMD}" 700 "${FIREHOL_CONFIG_DIR}/services"
- fi
-
--# Remove any old directories that might be there.
--if [ -d "${FIREHOL_DIR}" ]
--then
-- "${RM_CMD}" -rf "${FIREHOL_DIR}"
-- if [ $? -ne 0 -o -e "${FIREHOL_DIR}" ]
-- then
-- echo >&2
-- echo >&2
-- echo >&2 "Cannot clean temporary directory '${FIREHOL_DIR}'."
-- echo >&2
-- exit 1
-- fi
--fi
--"${MKDIR_CMD}" "${FIREHOL_DIR}" || exit 1
- "${MKDIR_CMD}" "${FIREHOL_CHAINS_DIR}" || exit 1
-
- # prepare the file that will hold all modules to be loaded.
---
-1.6.0.4
-
diff --git a/net-firewall/firehol/files/firehol-1.273-log-output.patch
b/net-firewall/firehol/files/firehol-1.273-log-output.patch
deleted file mode 100644
index 66f0fd4..0000000
--- a/net-firewall/firehol/files/firehol-1.273-log-output.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- firehol.sh-old 2010-08-11 09:01:29.000000000 -0600
-+++ firehol.sh 2010-08-12 09:22:07.000000000 -0600
-@@ -5212,7 +5212,7 @@
- printf >&2 "\n"
- echo >&2 "OUTPUT : "
- echo >&2
-- ${CAT_CMD} ${FIREHOL_OUTPUT}.log
-+ ${CAT_CMD} ${FIREHOL_OUTPUT}.log >&2
- echo >&2
-
- return 0
diff --git a/net-firewall/firehol/files/firehol.initrd.1
b/net-firewall/firehol/files/firehol.initrd
similarity index 100%
rename from net-firewall/firehol/files/firehol.initrd.1
rename to net-firewall/firehol/files/firehol.initrd
diff --git a/net-firewall/firehol/firehol-2.0.3-r1.ebuild
b/net-firewall/firehol/firehol-2.0.3-r1.ebuild
index 0cb0c65..464cb40 100644
--- a/net-firewall/firehol/firehol-2.0.3-r1.ebuild
+++ b/net-firewall/firehol/firehol-2.0.3-r1.ebuild
@@ -56,7 +56,7 @@ src_install() {
default
newconfd "${FILESDIR}"/firehol.conf.d firehol
- newinitd "${FILESDIR}"/firehol.initrd.1 firehol
+ newinitd "${FILESDIR}"/firehol.initrd firehol
newconfd "${FILESDIR}"/fireqos.conf.d fireqos
newinitd "${FILESDIR}"/fireqos.initrd fireqos
}
