diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2009-07-02 15:49:21 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2009-07-02 15:49:21 +0000 |
| commit | 7bb4f80f9cae44a1d183e16211be7295fd861d80 (patch) | |
| tree | 77a54f2a1b41341011341b9a23b12a009f73582c /net-libs/libnids | |
| parent | Backported patch. That fixes Gentoo bug #274990 (diff) | |
| download | historical-7bb4f80f9cae44a1d183e16211be7295fd861d80.tar.gz historical-7bb4f80f9cae44a1d183e16211be7295fd861d80.tar.bz2 historical-7bb4f80f9cae44a1d183e16211be7295fd861d80.zip | |
Fix compiling with gcc 4.4 (bug #276239).
Package-Manager: portage-2.2_rc33/cvs/Linux i686
Diffstat (limited to 'net-libs/libnids')
| -rw-r--r-- | net-libs/libnids/ChangeLog | 6 | ||||
| -rw-r--r-- | net-libs/libnids/Manifest | 5 | ||||
| -rw-r--r-- | net-libs/libnids/files/libnids-1.23-elif.patch | 10 | ||||
| -rw-r--r-- | net-libs/libnids/libnids-1.23-r1.ebuild | 5 |
4 files changed, 21 insertions, 5 deletions
diff --git a/net-libs/libnids/ChangeLog b/net-libs/libnids/ChangeLog index 88277a813997..d492a1540bee 100644 --- a/net-libs/libnids/ChangeLog +++ b/net-libs/libnids/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-libs/libnids # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/ChangeLog,v 1.32 2009/05/29 17:06:54 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/ChangeLog,v 1.33 2009/07/02 15:49:21 jer Exp $ + + 02 Jul 2009; Jeroen Roovers <jer@gentoo.org> libnids-1.23-r1.ebuild, + +files/libnids-1.23-elif.patch: + Fix compiling with gcc 4.4 (bug #276239). 29 May 2009; Steve Dibb <beandog@gentoo.org> libnids-1.18.ebuild: amd64 stable diff --git a/net-libs/libnids/Manifest b/net-libs/libnids/Manifest index 5b0172619522..bf463290754a 100644 --- a/net-libs/libnids/Manifest +++ b/net-libs/libnids/Manifest @@ -1,8 +1,9 @@ AUX libnids-1.18-chksum.c-ebx.patch 615 RMD160 53ba9fe99c2175ff64277f485887d68a4695d1c2 SHA1 5dbf69478187792dc824366cf29ae74846c95a78 SHA256 7d092dfa010001e5935c1f1104a34cec061f813664501566a504b942d2232c78 AUX libnids-1.20-chksum.c-ebx.patch 718 RMD160 1b56bb762262de9162f335a9a7db94affa0c5fbe SHA1 4ab5207a3db17d757f3adfb27d5e1ee71ef14f1a SHA256 2c7dad4f142a007d55ac40cf04cf3fe724a346f435ddbbbb21300c9f950756c6 +AUX libnids-1.23-elif.patch 257 RMD160 2fdf726d721f343b224a5f35309653bb7837520e SHA1 4ea5d041b5a77b30f988cddab18a6ec6a0da02d9 SHA256 a33a50486dc6e838afd40d307e405bdb43fe91251be4e097169c99b6afd13af5 DIST libnids-1.18.tar.gz 114013 RMD160 b33ba8237ba0bb31d2515bd5b7552449cfcca8f3 SHA1 3494e614e5e5d2f60f2ffe738307e60e77e04a81 SHA256 b0275c914197a53c6ccf631eac756fd37ec6f2d8f09f15757061495cf9be0fcd DIST libnids-1.23.tar.gz 140975 RMD160 38994ad04f688291315bfcde38d8795e7a4c4226 SHA1 105bff0d0d35ab95ec90cce98cfb409f64ed44b4 SHA256 755cd72483c2cdccbc6634c00de9e2d8666419fd80da36a2bdb3f81657130643 EBUILD libnids-1.18.ebuild 935 RMD160 52ee730875e61ef35b10b0b44d585e4244a6681f SHA1 3b432eff0b8cbb1bebefa57ac6074849ac71ba12 SHA256 7d0f5d7f69941cbc7f24d72f2e3202ea6f6f9d7bba52c852ebef78f0c265b059 -EBUILD libnids-1.23-r1.ebuild 915 RMD160 c203149bf5799e212f7be75206c1216a46979154 SHA1 dbca32e4f7fb5556a9f288b4a9272b0bd3179501 SHA256 68311b333a1492fb81b5caf4cba516de47af0c61cf77b5be7a7c341f5d55b82a -MISC ChangeLog 4774 RMD160 40339ceb1a8e15a9f7ebffba092c5143bdba9401 SHA1 5923960f799162cd41be71b7234d230abe08b0bb SHA256 2bf0c7fcd11937d6dde31113a457a5b43b8793493b4e7bc66fe3ec5bb8a5d05b +EBUILD libnids-1.23-r1.ebuild 953 RMD160 1e0c8c2ac9ba71a22b3f1ccbc28613e8b374cf78 SHA1 b174600e6e5c170e05c3351222d312a4987edc0c SHA256 da80ad42d147c8a45357cb403b2b5dfdc457f64ef383b14dcb36978f33b20fb2 +MISC ChangeLog 4920 RMD160 1935450d7dd0a5721459ae7662d2c2aad415c1b5 SHA1 38c91561223a3575c833152a092c0566d1e521f8 SHA256 a01eea880b3b1a61e31d648cfa8d9f8a3bbcd7fe899f006c5e2b04e65341938f MISC metadata.xml 311 RMD160 ae9b46487554338fb7a8aa378cc4cd4abb4221dc SHA1 b84c84c470b3951b91ec4eafaa86fd6d7021a715 SHA256 4c7b843b6b1f2f54738ce21e5ade6da1da64af15a2f9f82f5fd810f744c36b32 diff --git a/net-libs/libnids/files/libnids-1.23-elif.patch b/net-libs/libnids/files/libnids-1.23-elif.patch new file mode 100644 index 000000000000..30408dca0f27 --- /dev/null +++ b/net-libs/libnids/files/libnids-1.23-elif.patch @@ -0,0 +1,10 @@ +--- libnids-1.23/src/killtcp.c.orig 2006-05-08 22:05:51.000000000 +0200 ++++ libnids-1.23/src/killtcp.c 2009-07-02 17:42:29.000000000 +0200 +@@ -118,6 +118,6 @@ + if (initialized) + abort(); + } +-#elif ++#else + #error Something wrong with LIBNET_VER + #endif diff --git a/net-libs/libnids/libnids-1.23-r1.ebuild b/net-libs/libnids/libnids-1.23-r1.ebuild index ab7c9719802d..89ee76c4dfa6 100644 --- a/net-libs/libnids/libnids-1.23-r1.ebuild +++ b/net-libs/libnids/libnids-1.23-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.23-r1.ebuild,v 1.1 2009/03/23 19:47:12 rbu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.23-r1.ebuild,v 1.2 2009/07/02 15:49:21 jer Exp $ EAPI=2 inherit eutils @@ -20,7 +20,8 @@ RDEPEND="${DEPEND} !net-libs/libnids:1.1" src_prepare() { - epatch "${FILESDIR}"/${PN}-1.20-chksum.c-ebx.patch + epatch "${FILESDIR}/${PN}-1.20-chksum.c-ebx.patch" + epatch "${FILESDIR}/${P}-elif.patch" } src_configure() { |