Version bump (also fixes security bug #285861).

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 100 insertions, 12 deletions

diff --git a/net-firewall/fwbuilder/ChangeLog b/net-firewall/fwbuilder/ChangeLog
index fec6f6dba580..7b97cef4cf9d 100644
--- a/net-firewall/fwbuilder/ChangeLog
+++ b/net-firewall/fwbuilder/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/fwbuilder
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.88 2009/09/21 20:51:48 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.89 2009/11/12 09:33:32 dev-zero Exp $
+
+*fwbuilder-3.0.7 (12 Nov 2009)
+
+  12 Nov 2009; Tiziano Müller <dev-zero@gentoo.org>
+  +files/3.0.7-secure-mktemp.patch, +fwbuilder-3.0.7.ebuild:
+  Version bump (also fixes security bug #285861).
 
   21 Sep 2009; Alex Legler <a3li@gentoo.org> -fwbuilder-3.0.4.ebuild,
   -fwbuilder-3.0.5.ebuild:
diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index f34efe9934dd..fd29d56df1e0 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -1,20 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX 3.0.7-secure-mktemp.patch 987 RMD160 612e42ee68253b7d248afd8b039d97e25db0713d SHA1 cb68c5339e28fd13aa3f1b8ca11a2ca76ebf0162 SHA256 02c0811786b268d609b9ecac5b78135c53d32752c1846c63f23716b5de2617a8
 DIST fwbuilder-2.0.12.tar.gz 1389953 RMD160 7d3ae613ac015650333d2e9f980c8d688e320cd2 SHA1 5947236e365ef085ebebd4fec85935cb99b9b64c SHA256 a1132c207eb8296301b21e6025fe36435354ff9b3a90a6dc18145307b9c9162d
 DIST fwbuilder-2.1.18.tar.gz 1967764 RMD160 a2fc780dad2e130a359747cfb973342e1fbbc406 SHA1 0595146b81c296301702d71665cb853a4b0bec94 SHA256 2670e87ecc88ca5601e7faab1908605d200fdb2afb65cf474f996fb93c469b2b
 DIST fwbuilder-3.0.3.tar.gz 2342286 RMD160 aeca268daa0bc1d47a05add6590910ae3da15b0e SHA1 04df912936aecd5e6de8b2cde07077565191ab74 SHA256 95d31f53752b12530c29fc349a7dd827016337441769a799557406cc832cd5fc
 DIST fwbuilder-3.0.6.tar.gz 2477171 RMD160 685e1468deddaeb8ff2f0d5e02107f6c98a78eba SHA1 c1c4cf069ba35cbc1a377ba1b3572fab7e53ab97 SHA256 a01fce8c8bd46f8be8dfa7e66ecf8f2aa0795d9454c398ea271b93c4daa346d1
+DIST fwbuilder-3.0.7.tar.gz 2486382 RMD160 c57150a3de136add28a48fbc3b79aa1006b46963 SHA1 c08411bcf5b686ef86e1da6f0954d8685bf49d61 SHA256 bb827f54a77c0f8a9b471200eda3801c9ff3f2a576647ca6a576e546e20ac254
 EBUILD fwbuilder-2.0.12.ebuild 1250 RMD160 3720a41610dc2919e34d2b0dc7bb1bf482c6fb0c SHA1 9f797123486424b65ed4ab935d6b9c5304e37386 SHA256 68408d9eda61b0f88756e731e3e4770deedba8ad07ae6973a5715162445ac9e1
 EBUILD fwbuilder-2.1.18.ebuild 1949 RMD160 c925c1c5936b5d5bfd4a0785a6f9e3a3d33fa6c5 SHA1 28e7b7041bd3749cfa73d9f3964295a4d2a0f251 SHA256 b19078552fe5a5317ba03be43abba976af3c073c4b4f8baf06b367b0aafd1375
 EBUILD fwbuilder-3.0.3.ebuild 1810 RMD160 83755f5a50c24e489440ea4d767d850832e434cd SHA1 e5067e342979d5ef978c4037c6b0297b1dce0ac2 SHA256 8ee4841d160bede8f59f153b29f79b9cdce3e3111997861cb10b05e717806ba6
 EBUILD fwbuilder-3.0.6.ebuild 1832 RMD160 d73172910b12a6790ef813abc17bd9c7edc78143 SHA1 a3abbca236a10420f58b551121cbdcdf93c29875 SHA256 590fe364783820d2108b2ab68387ee3e6bc9767869f4acb7d54a072b3348781c
-MISC ChangeLog 14071 RMD160 1d5ca3c350e945ab1b9999abcf5d651738861513 SHA1 a67e7cac8461e75f0019c05c4810a149a272d52e SHA256 b6906bf4b7f1151473b3245b91f8053fbecd14167ab0a5f0b0cbb07e2200f26c
+EBUILD fwbuilder-3.0.7.ebuild 1889 RMD160 811899c2bf10b7efd9997b3e4b69299c2bce5d49 SHA1 8601658ae6608c828dcd9203ad51ee56073ae4fb SHA256 56d9ce39f093fb706a22ccbdeef6111ac8f7d45dff41105ca09ddb1f43a1606c
+MISC ChangeLog 14272 RMD160 5081aca3a95ac0d4464e579764bd8fee18b5e723 SHA1 94acddf27060090ffea2c4faef647a46a55f74e4 SHA256 b5c9a266b361945ec8f6034a822c5dffe3b37cd3fe03d67abbdba64c329ac48c
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkq3514ACgkQaGsKqSU7eCR4IgCcD7glNPqksD1fmOiHKgcudqhp
-O20AoIY13pzO91WjhZfn7OsPS+z2cbvb
-=760H
------END PGP SIGNATURE-----
diff --git a/net-firewall/fwbuilder/files/3.0.7-secure-mktemp.patch b/net-firewall/fwbuilder/files/3.0.7-secure-mktemp.patch
new file mode 100644
index 000000000000..1074e58f3b95
--- /dev/null
+++ b/net-firewall/fwbuilder/files/3.0.7-secure-mktemp.patch
@@ -0,0 +1,15 @@
+diff -Naur fwbuilder-3.0.7.orig/src/ipt/RoutingCompiler_ipt_writers.cpp fwbuilder-3.0.7/src/ipt/RoutingCompiler_ipt_writers.cpp
+--- fwbuilder-3.0.7.orig/src/ipt/RoutingCompiler_ipt_writers.cpp	2009-11-12 09:54:55.913414002 +0100
++++ fwbuilder-3.0.7/src/ipt/RoutingCompiler_ipt_writers.cpp	2009-11-12 10:06:38.086706330 +0100
+@@ -147,9 +147,9 @@
+             << "#\n#\n# ============== ROUTING RULES ============== \n#"
+             << endl;
+ 
+-        compiler->output << "TMPDIRNAME=\"/tmp/.fwbuilder.tempdir.$$\"" << endl;
++        compiler->output << "TMPDIRNAME=\"$(umask 077 && mktemp --tmpdir=/tmp -d .fwbuilder.tempdir.XXXXXXXXXX)\"" << endl;
++        compiler->output << "[ $? != 0 ] && exit 1" << endl;
+         compiler->output << "TMPFILENAME=\"$TMPDIRNAME/.fwbuilder.out\"" << endl;
+-        compiler->output << "(umask 077 && mkdir $TMPDIRNAME) || exit 1" << endl;
+         compiler->output << endl;
+ 
+         compiler->output << "# This function stops stdout redirection"
diff --git a/net-firewall/fwbuilder/fwbuilder-3.0.7.ebuild b/net-firewall/fwbuilder/fwbuilder-3.0.7.ebuild
new file mode 100644
index 000000000000..4dea575b2033
--- /dev/null
+++ b/net-firewall/fwbuilder/fwbuilder-3.0.7.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-3.0.7.ebuild,v 1.1 2009/11/12 09:33:32 dev-zero Exp $
+
+EAPI="2"
+
+inherit eutils qt4 multilib
+
+DESCRIPTION="A firewall GUI"
+HOMEPAGE="http://www.fwbuilder.org/"
+SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+pch"
+
+DEPEND="~net-libs/libfwbuilder-${PV}
+	>=dev-java/antlr-2.7.7:0[cxx]
+	x11-libs/qt-gui:4"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt4_src_prepare
+
+	epatch "${FILESDIR}/${PV}-secure-mktemp.patch"
+
+	# Remove bundled antlr
+	rm -rf src/antlr
+
+	sed -i \
+		-e '/COPYING/d' \
+		doc/doc.pro || die "sed doc.pro failed"
+
+	# we'll use our eqmake instead of bundled script to process qmake files
+	sed -i \
+		-e 's:^. ./runqmake.sh$:echo:' \
+		configure || die "sed configure failed"
+
+	# prevent install script from automatically stripping binaries - let portage do that
+	sed -i \
+		-e 's/s) stripcmd="$stripprog"$/s)/' \
+		install.sh || die "sed install.sh failed"
+
+	if ! use pch; then
+		sed -i \
+				-e '/^PRECOMPILED_HEADER =/,/[^\\]$/d' \
+				-e '/^CONFIG += precompile_header/d' \
+				src/gui/gui.pro || die "sed for gui.pro failed"
+	fi
+}
+
+src_configure() {
+	econf \
+		--with-docdir=/usr/share/doc/${PF}
+
+	for pro_file in $(find "${S}" -name "*.pro"); do
+		eqmake4 "${pro_file}" -o "$(dirname ${pro_file})/Makefile" "CONFIG+=nostrip" || die "eqmake4 for ${pro_file} failed"
+	done
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die "emake install failed"
+	cd doc
+	dodoc AUTHORS ChangeLog Credits README* \
+		FWBuilder-Routing-LICENSE.txt PatchAcceptancePolicy.txt
+	doman fwb*.1
+}
+
+pkg_postinst() {
+	validate_desktop_entries
+
+	elog "You need to emerge sys-apps/iproute2 on the machine"
+	elog "that will run the firewall script."
+}