diff options
| -rw-r--r-- | net-dns/dnsmasq/ChangeLog | 7 | ||||
| -rw-r--r-- | net-dns/dnsmasq/Manifest | 5 | ||||
| -rw-r--r-- | net-dns/dnsmasq/dnsmasq-2.16.ebuild | 5 | ||||
| -rw-r--r-- | net-dns/dnsmasq/files/dnsmasq-2.16-gcc34.diff | 38 |
4 files changed, 51 insertions, 4 deletions
diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog index 3860d2342e24..c4a59791feb0 100644 --- a/net-dns/dnsmasq/ChangeLog +++ b/net-dns/dnsmasq/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-dns/dnsmasq # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.55 2004/10/22 17:33:25 avenj Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.56 2004/11/06 21:47:25 avenj Exp $ + + 06 Nov 2004; Jon Portnoy <avenj@gentoo.org> dnsmasq-2.16.ebuild, + files/dnsmasq-2.16-gcc34.diff : + Patch to fix GCC 3.4 compilation errors. Written by upstream and + submitted by Holger Hoffstatte in bug #68598. *dnsmasq-2.16 (22 Oct 2004) diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest index bdbe21df69b0..5e98c97c9cee 100644 --- a/net-dns/dnsmasq/Manifest +++ b/net-dns/dnsmasq/Manifest @@ -1,4 +1,4 @@ -MD5 d8e0ebafa977178d33108d4ab2638f72 ChangeLog 6627 +MD5 770034bbaee20983b84793e4691c3536 ChangeLog 6844 MD5 17ced6f6c41f0105ab28e94b8a7bd4f5 dnsmasq-2.8-r1.ebuild 1024 MD5 26b4f1cdd80b7aee01db99e5ecf2ec0f dnsmasq-2.5-r1.ebuild 1018 MD5 cda4a1f79a0b97ab668d8bf1a7c9be7b dnsmasq-2.14.ebuild 923 @@ -6,7 +6,7 @@ MD5 51334b67d2cbed22e0efec4143bc6ff0 metadata.xml 245 MD5 559ce46912f31c1d022757db2228b0fe dnsmasq-2.15.ebuild 922 MD5 7a4b20cff20e1240e4ba113c04e6880b dnsmasq-2.13.ebuild 924 MD5 2afac01881b13d0907550170a81ccecc dnsmasq-2.9.ebuild 1048 -MD5 79b5a7e033cce70f9b1b2456d56833de dnsmasq-2.16.ebuild 923 +MD5 2745c43a45b869faa180967dbfeddb6d dnsmasq-2.16.ebuild 983 MD5 088c015866ccd21fcb147094476a89cb files/digest-dnsmasq-2.14 64 MD5 39075dfeab4bbded5f0e8680df29e414 files/digest-dnsmasq-2.8-r1 63 MD5 8aeaa6fcd017624c86ad1a090cd8598a files/digest-dnsmasq-2.15 64 @@ -16,3 +16,4 @@ MD5 fc1326c5ef78a5ba4a73f6261806579f files/dnsmasq.confd 339 MD5 6a1f2d0e8629951259975bc9f17ee8b3 files/digest-dnsmasq-2.13 64 MD5 d48a297550b42f81be10bd5fcf4e15a7 files/digest-dnsmasq-2.9 63 MD5 8a37300e75cd9eea55ab1ff9d8146fa5 files/digest-dnsmasq-2.16 64 +MD5 ddb2a3e0678cbf7c15d32a020c964b41 files/dnsmasq-2.16-gcc34.diff 928 diff --git a/net-dns/dnsmasq/dnsmasq-2.16.ebuild b/net-dns/dnsmasq/dnsmasq-2.16.ebuild index 42eeaaf40135..e05c81432199 100644 --- a/net-dns/dnsmasq/dnsmasq-2.16.ebuild +++ b/net-dns/dnsmasq/dnsmasq-2.16.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.16.ebuild,v 1.1 2004/10/22 17:33:25 avenj Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.16.ebuild,v 1.2 2004/11/06 21:47:25 avenj Exp $ + +inherit eutils MY_P="${P/_/}" MY_PV="${PV/_rc*/}" @@ -19,6 +21,7 @@ DEPEND="virtual/libc S="${WORKDIR}/${PN}-${MY_PV}" src_compile() { + epatch ${FILESDIR}/dnsmasq-2.16-gcc34.diff emake || die } diff --git a/net-dns/dnsmasq/files/dnsmasq-2.16-gcc34.diff b/net-dns/dnsmasq/files/dnsmasq-2.16-gcc34.diff new file mode 100644 index 000000000000..ef3dd144a05d --- /dev/null +++ b/net-dns/dnsmasq/files/dnsmasq-2.16-gcc34.diff @@ -0,0 +1,38 @@ +--- dnsmasq-2.16.orig/src/cache.c ++++ dnsmasq-2.16/src/cache.c +@@ -17,7 +17,7 @@ + static int cache_inserted, cache_live_freed, insert_error; + static union bigname *big_free; + static int bignames_left, log_queries, cache_size, hash_size; +-static int index; ++static int uid; + + static void cache_free(struct crec *crecp); + static void cache_unlink(struct crec *crecp); +@@ -36,7 +36,7 @@ + cache_size = size; + big_free = NULL; + bignames_left = size/10; +- index = 0; ++ uid = 0; + + cache_inserted = cache_live_freed = 0; + +@@ -48,7 +48,7 @@ + { + cache_link(crecp); + crecp->flags = 0; +- crecp->uid = index++; ++ crecp->uid = uid++; + } + } + +@@ -85,7 +85,7 @@ + { + crecp->flags &= ~F_FORWARD; + crecp->flags &= ~F_REVERSE; +- crecp->uid = index++; /* invalidate CNAMES pointing to this. */ ++ crecp->uid = uid++; /* invalidate CNAMES pointing to this. */ + + if (cache_tail) + cache_tail->next = crecp; |