summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Kinard <kumba@gentoo.org>2011-12-16 16:28:12 +0000
committerJoshua Kinard <kumba@gentoo.org>2011-12-16 16:28:12 +0000
commitb00f709873d77a5c0c095190b13276c322f99fac (patch)
tree96e473de873feffa644dcfa9a50d3f39245b493b /net-firewall/fwbuilder
parentStable for AMD64, wrt bug #393873 (diff)
downloadhistorical-b00f709873d77a5c0c095190b13276c322f99fac.tar.gz
historical-b00f709873d77a5c0c095190b13276c322f99fac.tar.bz2
historical-b00f709873d77a5c0c095190b13276c322f99fac.zip
Add 5.0.0.3568, remove old files no longer used, and remove uneeded dep on libfwbuilder, which no longer exists. Closes #387759.
Package-Manager: portage-2.1.10.41/cvs/Linux x86_64
Diffstat (limited to 'net-firewall/fwbuilder')
-rw-r--r--net-firewall/fwbuilder/ChangeLog11
-rw-r--r--net-firewall/fwbuilder/Manifest39
-rw-r--r--net-firewall/fwbuilder/files/3.0.7-secure-mktemp.patch15
-rw-r--r--net-firewall/fwbuilder/files/4.x-qmake-use-LDFLAGS.patch11
-rw-r--r--net-firewall/fwbuilder/files/fwbuilder-5.0.0.3568-ldflags.patch11
-rw-r--r--net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild5
-rw-r--r--net-firewall/fwbuilder/fwbuilder-5.0.0.3568.ebuild51
7 files changed, 94 insertions, 49 deletions
diff --git a/net-firewall/fwbuilder/ChangeLog b/net-firewall/fwbuilder/ChangeLog
index 3471dae00a3c..29fe155e28a0 100644
--- a/net-firewall/fwbuilder/ChangeLog
+++ b/net-firewall/fwbuilder/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for net-firewall/fwbuilder
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.109 2011/11/20 19:30:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.110 2011/12/16 16:28:12 kumba Exp $
+
+*fwbuilder-5.0.0.3568 (16 Dec 2011)
+
+ 16 Dec 2011; Joshua Kinard <kumba@gentoo.org>
+ -files/3.0.7-secure-mktemp.patch, fwbuilder-4.2.2.3541.ebuild,
+ +fwbuilder-5.0.0.3568.ebuild, +files/fwbuilder-5.0.0.3568-ldflags.patch,
+ -files/4.x-qmake-use-LDFLAGS.patch:
+ Add 5.0.0.3568, remove old files no longer used, and remove uneeded dep on
+ libfwbuilder, which no longer exists. Closes #387759.
20 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org>
-fwbuilder-3.0.7.ebuild:
diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index 78ce35ff7eb3..a70b0f597964 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -1,28 +1,29 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
-AUX 3.0.7-secure-mktemp.patch 987 RMD160 612e42ee68253b7d248afd8b039d97e25db0713d SHA1 cb68c5339e28fd13aa3f1b8ca11a2ca76ebf0162 SHA256 02c0811786b268d609b9ecac5b78135c53d32752c1846c63f23716b5de2617a8
-AUX 4.x-qmake-use-LDFLAGS.patch 460 RMD160 e2ca41d40105ff63611019af3e9b15b5468fe5e6 SHA1 7b8d2482a00c5d109249815a3ae9f068cd27ece5 SHA256 56c62f025b01f6ecf6c298909c4f64f5890524f8688199187139e354e801ce30
AUX fwbuilder-4.2.2.3541-ccache.patch 930 RMD160 c0dcb60e659c3dc055dc45cb57d8091979654d1e SHA1 c9ae9432a59d56162009374e15d2defd86bf186b SHA256 869dc70d8a63b819e275d93be615f88df5d1bd7b0427ecfb29d766738f55bc4e
AUX fwbuilder-4.2.2.3541-flags.patch 845 RMD160 11cf1b9b7ba867762170a8ee346f1256c6683a0c SHA1 d9acaf1cc3d5a9a3523d0923fb013317b68ab796 SHA256 6eb882ae30cebfbd7b735aae0f357db4067930b52e33b134cea6bb07628ed5d6
+AUX fwbuilder-5.0.0.3568-ldflags.patch 469 RMD160 62e73f3737687a6cb76c4294df2d981dfd3c16ad SHA1 874c2d805a9e77c72b70d570300b09caf554435f SHA256 65f549a65b7b7c605c5a2872baac20ba80c90a2e01c8525fd2e88884798f80cc
DIST fwbuilder-4.2.2.3541.tar.gz 6830864 RMD160 8c79580460d7d6a93d7c0e620e39685ac9778c0d SHA1 d497564988d4ef78b7717dc06e2227486be498ba SHA256 90111e0d7fcad31a9eccdbbc4d9ca7ce5182c0d93e8f9dbd8c683c3c80980482
-EBUILD fwbuilder-4.2.2.3541.ebuild 1247 RMD160 0b70fd4dea811f59aa603cd44593f7aedc333fa6 SHA1 0f94e0f9c3841eb32d2f50d2e6594be572f59bf0 SHA256 fda82e7a06da2238ee5683821a573300622ef3bf68077f4255dd7ad76ece162d
-MISC ChangeLog 17777 RMD160 2b00f9bbffb15447faf58a0a34b4db06b9cb5634 SHA1 4d61411ff28881d58257dd4eb8f8913a3948a524 SHA256 2b00328af6e2d0eb440b9430dbecbad71f2babc3fbc88ad909c2c67e57e4ecf1
+DIST fwbuilder-5.0.0.3568.tar.gz 6703816 RMD160 2248f1f01581ce16c861e041230151d367a182c6 SHA1 1cbc00daf06ec1df9eb39df06c958f1fee44ebed SHA256 dc42956bfa5a0c4f703353ace2a36ddfec985f4431ab00c00ae0ac9ca6f672c0
+EBUILD fwbuilder-4.2.2.3541.ebuild 1219 RMD160 0008ec9f79caadaf08049eeb0db451164a203fd9 SHA1 811d609daf9d9b993bf161f6d2c5a306d38d04ec SHA256 b28a676c7495237de6590def14c10f17aaf0b97f0d45601bce0dc288c487d315
+EBUILD fwbuilder-5.0.0.3568.ebuild 1167 RMD160 cab3e615fb6877c808e267878a3a465f95fd77fc SHA1 125fb04943292f8014c857c3fc3da3f66bd67a32 SHA256 e87277c5e1946bdb1af46b6fe90624e39c21df430ef32e1e9afbf86becdefcbd
+MISC ChangeLog 18170 RMD160 8052002799b06feb341ab482ca5c39eca33237bf SHA1 c7f7a6ffa594910bd200cdcd6f6b245c3b753ece SHA256 8f527c41f12f518d5192155f3d8308dceb1cfabd03dc863f406988ebe99905a1
MISC metadata.xml 206 RMD160 b967edd506f5c81d39d3780a4aea6de552ed7dc6 SHA1 506856689ca68d1a2bea94731c288946ed1ec80a SHA256 65af0b215aead23b8b8599a0198e437c27ff219780e2629f3e825fe51941507b
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
-iQIcBAEBCgAGBQJOyWOOAAoJENwGBM22xffe5SEP/1h1xv34zqduhEoCRblRvyWq
-2/j165ex5t+NdIkppbrBFcUndiMABxxy+1a6BKq7d/eaY3rnmuCoysOU8iX0mMGl
-wFP1+LtsnpgES1PnRRp22NrNWnYPt7nUsXVL/aZolwhCt9ay7kDnP2su+M+TX73S
-xvdaEUo/lxGUKQfxT79BIqOnSlX5RrXwyeCQv7URxieYhhkTnCqO/sgQg254s0Sd
-C/58RjsCGXTtfw0kOGqRio9kmWhVXAJWWyva7NW6SFnpzSh6e9v3UfGIv4GOk413
-TcloFRV8Fd6NkO6Yl0llOmI9gmPxVwqwwcb2S9DeEes6645O+bO2ivZKUXbrxtVk
-YY9IFgQ+wUmtb2/vABQHncIeODUGDvkCxGvNOJbalVzPtA7MhNE/qUxX9tMiT1DY
-/3x3Bd0Gp5OtIK0fYS+8OV4jnc86M9BmS7eu4+f7ZHhlMWBMMgq2/ZVkYKjd0/1G
-gCkpbdgKTdD1qHMUNU7G7vj7mn1WfTz+dk8awQd9eoXVgK+2k/cUn6wfHt4dBfqE
-mXNklOX7d3kEQ2cNHKZDgDRrMEFVfFs0FCIFwpPE0cbsKZU5PcejnIw7PwxMVa8l
-mjR5ftYghhiZWXWeM/AQDpgKUTB4HFi/+VcnWowmFt2jRVlmscMAtZ7altkUZ57j
-toveLCM7d2wzcOvGvhKD
-=Amon
+iQIcBAEBAgAGBQJO63GAAAoJENsjoH7SXZXjew4P/A49BhsTdX2E5/rqY7fQJqK7
+8eKz5J7jSe/MHSjAvpta2rO8Gbu1Iy5BVNMmuNqcHKNTWZ5FpTOD2qV09mDXpVMB
+S8a3h18lxTe8ehhmbMFsylVLocrZQdg+LLCpJcbkO7rs0fid+qJI5yqwIRW6LTte
+N8KJRd8fC1pyWyyXoFf4jZ9uoRSvoz4fbCl2KoVnuvepLRVyoz8Kcyq5FIIY7I3M
+Cge47wPnSggumlmL8fDAxgkOOPU8anSi2wOHk3D80URKSAh4v4dd7CuBhtLxbXGs
+5mcsXzl1KIuEa0QdmX9o9771a1kQtmcj5xVmw0QeIM1sVDpr4X/6Iyr61506XQNM
+irA7qoY6jcxlvSxgVr3GpsrDpYwZ+X9ACIR6CZ8ooprv9GnK1RWZpOlLH5VSkYkv
+D7/RIU80B4rxtMyUqwhQRvdSfZ73XpaD63kLXWp2DY17n4GjtzI9wEdzfAWe3YIO
+Hb3v2gbP5SLdN3z6wwdWJIMth1Fp25RBwko4NE8W3Ov7R3Vb6HNkpTVqzSMYn/aZ
+yPW7lmsHF/j2YJBPnievyD/gAuJxma5r3ehAejzooU45wZerS+nj57/7pSDrDwJR
+9QZMZGZ6IKCcYKBMQSDCXUD5KmacuyPEJJiCFa0oliuAj4yyE52maiWl2DsucMj+
+i5Mm/zeD7UnXFG+j3iS3
+=RiOz
-----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
deleted file mode 100644
index 1074e58f3b95..000000000000
--- a/net-firewall/fwbuilder/files/3.0.7-secure-mktemp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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/files/4.x-qmake-use-LDFLAGS.patch b/net-firewall/fwbuilder/files/4.x-qmake-use-LDFLAGS.patch
deleted file mode 100644
index c585890f2af2..000000000000
--- a/net-firewall/fwbuilder/files/4.x-qmake-use-LDFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naurp fwbuilder-4.1.1.orig//qmake.inc.in fwbuilder-4.1.1//qmake.inc.in
---- fwbuilder-4.1.1.orig//qmake.inc.in 2010-07-21 00:42:00.000000000 -0400
-+++ fwbuilder-4.1.1//qmake.inc.in 2010-09-12 15:47:10.189648845 -0400
-@@ -67,6 +67,7 @@ unix {
- QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
- QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter
- QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
-+ QMAKE_LFLAGS = @LDFLAGS@
-
- }
- }
diff --git a/net-firewall/fwbuilder/files/fwbuilder-5.0.0.3568-ldflags.patch b/net-firewall/fwbuilder/files/fwbuilder-5.0.0.3568-ldflags.patch
new file mode 100644
index 000000000000..d9df8429d390
--- /dev/null
+++ b/net-firewall/fwbuilder/files/fwbuilder-5.0.0.3568-ldflags.patch
@@ -0,0 +1,11 @@
+diff -Naurp fwbuilder-5.0.0.3568.orig//qmake.inc.in fwbuilder-5.0.0.3568//qmake.inc.in
+--- fwbuilder-5.0.0.3568.orig//qmake.inc.in 2011-07-25 19:27:44.000000000 -0400
++++ fwbuilder-5.0.0.3568//qmake.inc.in 2011-08-19 17:00:41.259985388 -0400
+@@ -39,6 +39,7 @@ unix {
+ QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
+ QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter
+ QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
++ QMAKE_LFLAGS = @LDFLAGS@
+
+ !macx {
+
diff --git a/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild b/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild
index 1635c8e063db..9910f2c76497 100644
--- a/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild,v 1.6 2011/08/21 09:45:32 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild,v 1.7 2011/12/16 16:28:12 kumba Exp $
EAPI=4
@@ -17,8 +17,7 @@ IUSE=""
DEPEND=">=x11-libs/qt-gui-4.3
dev-libs/openssl
dev-libs/elfutils
- sys-devel/gnuconfig
- !net-libs/libfwbuilder"
+ sys-devel/gnuconfig"
RDEPEND="${DEPEND}"
PATCHES=(
diff --git a/net-firewall/fwbuilder/fwbuilder-5.0.0.3568.ebuild b/net-firewall/fwbuilder/fwbuilder-5.0.0.3568.ebuild
new file mode 100644
index 000000000000..6a589087ba88
--- /dev/null
+++ b/net-firewall/fwbuilder/fwbuilder-5.0.0.3568.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-5.0.0.3568.ebuild,v 1.1 2011/12/16 16:28:12 kumba Exp $
+
+EAPI=4
+
+inherit eutils base qt4-r2 multilib autotools
+
+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=""
+
+DEPEND=">=x11-libs/qt-gui-4.3
+ dev-libs/openssl
+ dev-libs/elfutils
+ sys-devel/gnuconfig"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-ldflags.patch"
+)
+
+src_prepare() {
+ qt4-r2_src_prepare
+ eautoreconf
+
+ # This package fundamentally changed its build system. We have to
+ # manually copy config.{sub,guess} from /usr/share/gnuconfig/.
+ cp /usr/share/gnuconfig/config.{sub,guess} "${WORKDIR}/${P}/" \
+ || die "failed to copy config.{sub,guess}"
+}
+
+src_configure() {
+ eqmake4
+ econf
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+}
+
+pkg_postinst() {
+ validate_desktop_entries
+
+ elog "You need to emerge sys-apps/iproute2 on the machine"
+ elog "that will run the firewall script."
+}