summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-dns/dnsmasq')
-rw-r--r--net-dns/dnsmasq/ChangeLog8
-rw-r--r--net-dns/dnsmasq/dnsmasq-2.38.ebuild (renamed from net-dns/dnsmasq/dnsmasq-2.37.ebuild)5
-rw-r--r--net-dns/dnsmasq/files/digest-dnsmasq-2.373
-rw-r--r--net-dns/dnsmasq/files/digest-dnsmasq-2.383
-rw-r--r--net-dns/dnsmasq/files/dnsmasq-2.37-bsd.patch29
5 files changed, 11 insertions, 37 deletions
diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index ea3e999fddc0..a991839606dc 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-dns/dnsmasq
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.111 2007/02/08 15:28:18 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.112 2007/02/13 20:43:50 chutzpah Exp $
+
+*dnsmasq-2.38 (13 Feb 2007)
+
+ 13 Feb 2007; Patrick McLean <chutzpah@gentoo.org>
+ -files/dnsmasq-2.37-bsd.patch, -dnsmasq-2.37.ebuild, +dnsmasq-2.38.ebuild:
+ Version bump, remove 2.37 since it has a nasty potential lockup bug.
08 Feb 2007; Patrick McLean <chutzpah@gentoo.org>
-files/dnsmasq232-ldflags.diff, +files/dnsmasq-2.37-bsd.patch,
diff --git a/net-dns/dnsmasq/dnsmasq-2.37.ebuild b/net-dns/dnsmasq/dnsmasq-2.38.ebuild
index e0d5b441cf67..8e421d6ec3c9 100644
--- a/net-dns/dnsmasq/dnsmasq-2.37.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.38.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.37.ebuild,v 1.2 2007/02/08 15:28:18 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.38.ebuild,v 1.1 2007/02/13 20:43:50 chutzpah Exp $
inherit eutils toolchain-funcs flag-o-matic
@@ -29,9 +29,6 @@ src_unpack() {
# dnsmasq on FreeBSD wants the config file in a silly location, this fixes
epatch "${FILESDIR}/${PN}-fbsd-config.patch"
-
- # fix compiliationn on bsd
- epatch "${FILESDIR}/${P}-bsd.patch"
}
src_compile() {
diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.37 b/net-dns/dnsmasq/files/digest-dnsmasq-2.37
deleted file mode 100644
index 4458920232fd..000000000000
--- a/net-dns/dnsmasq/files/digest-dnsmasq-2.37
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e105a41cdf5adb8b615f0a06eb17ecb9 dnsmasq-2.37.tar.gz 271316
-RMD160 0561e4876c397ac80587a5f20a821ff0776c23cb dnsmasq-2.37.tar.gz 271316
-SHA256 6ddf6be81d5974a2cbe4c9c3b130e5b746c6415165b1d82ad390150ecd614385 dnsmasq-2.37.tar.gz 271316
diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.38 b/net-dns/dnsmasq/files/digest-dnsmasq-2.38
new file mode 100644
index 000000000000..a7cfe1f59890
--- /dev/null
+++ b/net-dns/dnsmasq/files/digest-dnsmasq-2.38
@@ -0,0 +1,3 @@
+MD5 ab066a97c226066485ad20e5ad5ce424 dnsmasq-2.38.tar.gz 272953
+RMD160 bfa7ca4a5ededa2aedd708991b8177274b1db8b7 dnsmasq-2.38.tar.gz 272953
+SHA256 54f3e9ac2bd9f622b28ab0d5149e9bc13d62d8826be085c32abc929bc30dda6a dnsmasq-2.38.tar.gz 272953
diff --git a/net-dns/dnsmasq/files/dnsmasq-2.37-bsd.patch b/net-dns/dnsmasq/files/dnsmasq-2.37-bsd.patch
deleted file mode 100644
index dd7e42c549d5..000000000000
--- a/net-dns/dnsmasq/files/dnsmasq-2.37-bsd.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/rfc2131.c.orig 2007-02-07 20:52:07.000000000 +0000
-+++ src/rfc2131.c 2007-02-06 22:13:02.000000000 +0000
-@@ -101,16 +101,22 @@
- {
- if (hwlen == 0 && clid && clid_len > 3)
- {
-- if ((clid[0] == ARPHRD_EUI64 && hwtype == ARPHRD_IEEE1394) || clid[0] == hwtype)
-+ if (clid[0] == hwtype)
- {
- *len_out = clid_len - 1 ;
- return clid + 1;
- }
-- else
-+
-+#if defined(ARPHRD_EUI64) && defined(ARPHRD_IEEE1394)
-+ if (clid[0] == ARPHRD_EUI64 && hwtype == ARPHRD_IEEE1394)
- {
-- *len_out = clid_len;
-- return clid;
-+ *len_out = clid_len - 1 ;
-+ return clid + 1;
- }
-+#endif
-+
-+ *len_out = clid_len;
-+ return clid;
- }
-
- *len_out = hwlen;