summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Kinard <kumba@gentoo.org>2012-03-12 06:56:41 +0000
committerJoshua Kinard <kumba@gentoo.org>2012-03-12 06:56:41 +0000
commiteab4bf26a478734edf0a9bb64bd921cc8050fcdd (patch)
treead6ecf3766705636b8f7b4420d9e2ea5a8330bbe /net-firewall/fwbuilder
parentmarked x86 per bug 403843 (diff)
downloadhistorical-eab4bf26a478734edf0a9bb64bd921cc8050fcdd.tar.gz
historical-eab4bf26a478734edf0a9bb64bd921cc8050fcdd.tar.bz2
historical-eab4bf26a478734edf0a9bb64bd921cc8050fcdd.zip
Bump 5.0.1's rev to include a patch that addresses a compile-time failure only affecting a limited number of x86_64 users. This has already been fixed upstream for the next release.
Package-Manager: portage-2.1.10.45/cvs/Linux x86_64
Diffstat (limited to 'net-firewall/fwbuilder')
-rw-r--r--net-firewall/fwbuilder/ChangeLog11
-rw-r--r--net-firewall/fwbuilder/Manifest25
-rw-r--r--net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-stdc-format-macros.patch51
-rw-r--r--net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild (renamed from net-firewall/fwbuilder/fwbuilder-5.0.1.3592.ebuild)7
4 files changed, 83 insertions, 11 deletions
diff --git a/net-firewall/fwbuilder/ChangeLog b/net-firewall/fwbuilder/ChangeLog
index 9d8558c9a014..7aa76cac6a3d 100644
--- a/net-firewall/fwbuilder/ChangeLog
+++ b/net-firewall/fwbuilder/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for net-firewall/fwbuilder
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.113 2012/01/30 22:46:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.114 2012/03/12 06:56:40 kumba Exp $
+
+*fwbuilder-5.0.1.3592-r1 (12 Mar 2012)
+
+ 12 Mar 2012; Joshua Kinard <kumba@gentoo.org> -fwbuilder-5.0.1.3592.ebuild,
+ +fwbuilder-5.0.1.3592-r1.ebuild,
+ +files/fwbuilder-5.0.1.3592-stdc-format-macros.patch:
+ Bump 5.0.1's rev to include a patch that addresses a compile-time failure
+ only affecting a limited number of x86_64 users. This has already been fixed
+ upstream for the next release.
30 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
fwbuilder-5.0.1.3592.ebuild:
diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index 9b29fab80b7c..6156b4845443 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -4,22 +4,29 @@ Hash: SHA1
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
+AUX fwbuilder-5.0.1.3592-stdc-format-macros.patch 1684 RMD160 bcba773067ca920309b6c1ccb1ead9f25ab0401c SHA1 e651b7582f8baed29784bee3f90b68360d74cee8 SHA256 6bb4ac02615247a7102021126eae788e67f9242c11e0b865a27ba2efd33f278f
DIST fwbuilder-4.2.2.3541.tar.gz 6830864 RMD160 8c79580460d7d6a93d7c0e620e39685ac9778c0d SHA1 d497564988d4ef78b7717dc06e2227486be498ba SHA256 90111e0d7fcad31a9eccdbbc4d9ca7ce5182c0d93e8f9dbd8c683c3c80980482
DIST fwbuilder-5.0.0.3568.tar.gz 6703816 RMD160 2248f1f01581ce16c861e041230151d367a182c6 SHA1 1cbc00daf06ec1df9eb39df06c958f1fee44ebed SHA256 dc42956bfa5a0c4f703353ace2a36ddfec985f4431ab00c00ae0ac9ca6f672c0
DIST fwbuilder-5.0.1.3592.tar.gz 6733502 RMD160 a8bef66df683822261597e4311801ed782fae26b SHA1 d9fa64ab4e844b6f8cfaa8949524e3464aac2ef7 SHA256 22120de712844b5d89a3f2924964c16cc86f96f2156ace7c3f551bd0d713c94b
EBUILD fwbuilder-4.2.2.3541.ebuild 1219 RMD160 0008ec9f79caadaf08049eeb0db451164a203fd9 SHA1 811d609daf9d9b993bf161f6d2c5a306d38d04ec SHA256 b28a676c7495237de6590def14c10f17aaf0b97f0d45601bce0dc288c487d315
EBUILD fwbuilder-5.0.0.3568.ebuild 972 RMD160 61e5fc61c4772f5026f8cb75b481c5dde99924c7 SHA1 b719e2c241213b3884816f64c078ead7812d80d7 SHA256 7c284a0bf8e19384a1030999f9f843c4c0f6f8ecd87cfa8af97541f05b16e8f6
-EBUILD fwbuilder-5.0.1.3592.ebuild 1053 RMD160 e0a8baf77b0aab170873018b8ffabc7f58cd45c6 SHA1 6dd8d9944e5999c9de0ba97ea919bd6ea086c2f1 SHA256 d46deea17cb66a051d92adf44733bcc2d2b816e1e08d222d01c05cbee03874f2
-MISC ChangeLog 18776 RMD160 7daf37aaa8438568709047a8751940772e9b02cf SHA1 52e2e22cff2f636702c0b1db9a8808554f3d4522 SHA256 83047e7be1dbe18a5676ae4ec2240c8a2ea2da40cb26c9c3d7da6a484216de72
+EBUILD fwbuilder-5.0.1.3592-r1.ebuild 1230 RMD160 14bc4a9b2e5c2b30792309bab03896fd60bec737 SHA1 5204bae4e0c1335ab089df0ebf8924736108a5a6 SHA256 2d80ca06391faafdd582f4c02aca22808cbac6f1a2980786b34ab77c0bfce7f9
+MISC ChangeLog 19170 RMD160 bb5cb684f3324d645094d766a23a16b8af203763 SHA1 e45ef72a30f2d33acc7bd4018c9d2d4b375571fa SHA256 44ca505d76466199f8193c9904ee3110131e24c22d821024548dac77408d7046
MISC metadata.xml 206 RMD160 b967edd506f5c81d39d3780a4aea6de552ed7dc6 SHA1 506856689ca68d1a2bea94731c288946ed1ec80a SHA256 65af0b215aead23b8b8599a0198e437c27ff219780e2629f3e825fe51941507b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQEcBAEBAgAGBQJPJx6KAAoJEEdUh39IaPFNL2AIAJtlp5p9gBLjmhZL5fMolFPr
-ABJ1wh+O5mp5W3TZvIPftK3ndZ+wE5qhEI+JsNMhWoku/ntSXms3Ve+MXsrmJE82
-HHb2f9LeRwVwRPb86kBcF13cRZKaDQfzkxytCJP9EfCJoKSFpM3WIjIlGpkFGmgY
-ab662I8yOZoslm1KE3aJeV2WxPpC1yWKxiGGsdEVLUJwxVUldVIOM6ZFneZlSOty
-396uDy/qoW8v3UOPsZTCenMDET0+tHrPBeP09vny02g2X/SeWRYZ12p19G4gz/77
-WGdG8byf14E/RawPTKFjcjXKrKB0JFMOYL1OCA41NTS3jmgQpFrvOY7nxwBAtsY=
-=5KOz
+iQIcBAEBAgAGBQJPXWYPAAoJENsjoH7SXZXjFtcP/iLovZXdPXGouoTIV49lHsrT
+Nw/xqZB0MSAwRF6bDEEA56JYIscIEL64F5OTCTo+AZb17HMkWOrqFNAQ0hDR4bn5
+C9SCTzYZJXRrHhhHt5cEqKU0QmHlt+/tPa2OsNYUZBuK979TXES0pxIXGgFOPyrV
+HWBZo+FavKDXaqv7cA41LMzh1F3CGi4wZpLCAGKruYc9RWJDL8JJAp+jArbIoH0p
+o8meQQlyS1sUZ5vG503tUvyTnyqdyQZ989rfQDq/SaZ0n2NFo/wBcWoQn68L1Ifc
+AaUuCFZLyohexm3UDVyQntH+/QQ39Cur1BOakmQvtUQHjbYaYz0dw4qjIZzQdnn6
+/opvn0+M6gDLngRsWXtn0yRNnuz1BXHTAjpJgubEvUYAOKJyeUKub/60i1BqsMsr
+Ebhwe91XDFyWhmKh61KDA+npRwT6ivdFet+cEGONfHPhQRYrD46V3oZPy+1twI/E
+b4kr6atA86OUtEhw5vDpw0k9PWPmnZ+nRuuZc3APlCzmSs1L+C3fNYSzLIdqAzi0
+QoEnT0Zdbeda+Bj1pYcuy5q0SNgj/XvSu6tXPzg9ggD+LcQkxaT6p9PhoubpLRsn
+Tmu8DTUL5B0L1is3WybtcXRZqcQgssfgVkd2O0Ugt5Vve+PUinoJ0Z/H2jRd3Y+a
+rsis88/scXbLgMj3r4Nr
+=mmto
-----END PGP SIGNATURE-----
diff --git a/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-stdc-format-macros.patch b/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-stdc-format-macros.patch
new file mode 100644
index 000000000000..3658c10a3eec
--- /dev/null
+++ b/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-stdc-format-macros.patch
@@ -0,0 +1,51 @@
+From: Vadim Kurland <vadim@slot.vk.crocodile.org>
+Date: Tue, 14 Feb 2012 04:59:26 +0000 (-0800)
+Subject: fix for SF bug #3468802. Define macro __STDC_FORMAT_MACROS. This still
+X-Git-Url: http://fwbuilder.git.sourceforge.net/git/gitweb.cgi?p=fwbuilder%2Ffwbuilder;a=commitdiff_plain;h=f97a1b50ba51be5fa31cc54dba829a9e77609160;hp=15565ade5dc843e5fefe83568a023c37256c3c3c
+
+fix for SF bug #3468802. Define macro __STDC_FORMAT_MACROS. This still
+needs to be tested on all build machines.
+---
+
+diff --git a/qmake.inc.in b/qmake.inc.in
+index 6bf27e0..3e31fd6 100644
+--- a/qmake.inc.in
++++ b/qmake.inc.in
+@@ -67,6 +67,9 @@ unix {
+
+ CONFIG += warn_on
+
++ QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS
++ QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS
++
+ }
+ }
+
+diff --git a/src/libfwbuilder/qmake.inc.in b/src/libfwbuilder/qmake.inc.in
+index b4f15bb..a8114cf 100644
+--- a/src/libfwbuilder/qmake.inc.in
++++ b/src/libfwbuilder/qmake.inc.in
+@@ -34,6 +34,9 @@ unix {
+ QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@
+ QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter @CXXFLAGS@
+
++ QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS
++ QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS
++
+ exec_prefix = @EXEC_PREFIX@
+ DESTDIR =
+
+diff --git a/src/libfwbuilder/src/fwbuilder/uint128.h b/src/libfwbuilder/src/fwbuilder/uint128.h
+index 0a2e7a4..b00ab47 100644
+--- a/src/libfwbuilder/src/fwbuilder/uint128.h
++++ b/src/libfwbuilder/src/fwbuilder/uint128.h
+@@ -36,7 +36,7 @@
+
+ #include <stdio.h>
+
+-#define __STDC_FORMAT_MACROS
++// #define __STDC_FORMAT_MACROS
+ #include <inttypes.h> // for sprintf formats for "long long"
+
+ // convinience macro
+
diff --git a/net-firewall/fwbuilder/fwbuilder-5.0.1.3592.ebuild b/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild
index b1262416c462..14ddd0f71574 100644
--- a/net-firewall/fwbuilder/fwbuilder-5.0.1.3592.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-5.0.1.3592.ebuild,v 1.4 2012/01/30 22:52:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild,v 1.1 2012/03/12 06:56:40 kumba Exp $
EAPI="4"
@@ -24,6 +24,11 @@ PATCHES=(
)
src_prepare() {
+ # Fix a compile bug that affects some x86_64 platforms.
+ # Addressed in the upcoming 5.0.2.3596 release.
+ # Closes #395151.
+ epatch "${FILESDIR}/${P}-stdc-format-macros.patch"
+
qt4-r2_src_prepare
sed -i -e '/dnl.*AM_INIT_AUTOMAKE/d' configure.in || die #398743
eautoreconf