Version bump, security fix for bug 86710

(Portage version: 2.0.51-r12)

5 files changed, 72 insertions, 8 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index e35651f477df..1a3edc66e24a 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.64 2005/02/07 02:53:16 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.65 2005/03/27 11:15:35 avenj Exp $
+
+*dnsmasq-2.21 (27 Mar 2005)
+
+  27 Mar 2005; Jon Portnoy <avenj@gentoo.org> dnsmasq-2.21.ebuild, 
+  files/dnsmasq221-netlink.diff :
+  Version bump for security bug 86710. Included is an upstream patch to
+  fix compile issues with netlink.c.
 
   06 Feb 2005; Joshua Kinard <kumba@gentoo.org> dnsmasq-2.15.ebuild:
   Marked stable on mips.
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 6a305306f807..94a0cb8f3c4d 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -1,20 +1,23 @@
+MD5 9a1c92ac3431661e0b7c47b980d104ab dnsmasq-2.21.ebuild 1029
 MD5 c25ea6b12c93ae5852f409f1e7d23e0b ChangeLog 7730
+MD5 4916f0d0bb6efa3c999a009a99c45e81 dnsmasq-2.5-r1.ebuild 1015
 MD5 24757d5e7ba1c0fd1705e59434bfe994 dnsmasq-2.18.ebuild 985
 MD5 91d3ec6ef54e14402be5dba829d3687e dnsmasq-2.19.ebuild 985
-MD5 48d634c6abc444cac5d45d17b2a7bdee dnsmasq-2.15.ebuild 936
-MD5 631b22b97b4bf5bb6f716c61a494b3c8 dnsmasq-2.20.ebuild 985
-MD5 4916f0d0bb6efa3c999a009a99c45e81 dnsmasq-2.5-r1.ebuild 1015
 MD5 66903e37cdb9d33fbc05e5d7f7901cd1 dnsmasq-2.8-r1.ebuild 1021
 MD5 808494889b8278715196a9ee62ab3bfc dnsmasq-2.9.ebuild 1048
 MD5 51334b67d2cbed22e0efec4143bc6ff0 metadata.xml 245
+MD5 48d634c6abc444cac5d45d17b2a7bdee dnsmasq-2.15.ebuild 936
+MD5 631b22b97b4bf5bb6f716c61a494b3c8 dnsmasq-2.20.ebuild 985
 MD5 91e1e478444aa0c1e3f5aee27037d747 dnsmasq-2.17.ebuild 960
 MD5 9740ffe29b6d012b66cd2e532b8915ce files/digest-dnsmasq-2.5-r1 62
+MD5 fd57ba5d6351e2f53becbeaa223b8a34 files/digest-dnsmasq-2.18 64
+MD5 d4699f33bca669027a10af5b4520911a files/digest-dnsmasq-2.19 64
+MD5 39075dfeab4bbded5f0e8680df29e414 files/digest-dnsmasq-2.8-r1 63
+MD5 d48a297550b42f81be10bd5fcf4e15a7 files/digest-dnsmasq-2.9 63
 MD5 51224c4bafcccf490d6de12440f681e5 files/dnsmasq-init 504
 MD5 fc1326c5ef78a5ba4a73f6261806579f files/dnsmasq.confd 339
-MD5 d48a297550b42f81be10bd5fcf4e15a7 files/digest-dnsmasq-2.9 63
-MD5 39075dfeab4bbded5f0e8680df29e414 files/digest-dnsmasq-2.8-r1 63
-MD5 fd57ba5d6351e2f53becbeaa223b8a34 files/digest-dnsmasq-2.18 64
 MD5 8aeaa6fcd017624c86ad1a090cd8598a files/digest-dnsmasq-2.15 64
-MD5 d4699f33bca669027a10af5b4520911a files/digest-dnsmasq-2.19 64
 MD5 0d0ee462e594bdd083a898470c87db6d files/digest-dnsmasq-2.20 64
 MD5 0003eb8af2f7b8f64e1472822d1ff2ff files/digest-dnsmasq-2.17 64
+MD5 d1c7a35f0fe7e1e17d98990eec175b06 files/dnsmasq221-netlink.diff 337
+MD5 eb645b7c57fc7e7eae70cbdb2d0d2686 files/digest-dnsmasq-2.21 64
diff --git a/net-dns/dnsmasq/dnsmasq-2.21.ebuild b/net-dns/dnsmasq/dnsmasq-2.21.ebuild
new file mode 100644
index 000000000000..31c41fda1cdf
--- /dev/null
+++ b/net-dns/dnsmasq/dnsmasq-2.21.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.21.ebuild,v 1.1 2005/03/27 11:15:35 avenj Exp $
+
+inherit eutils toolchain-funcs
+
+MY_P="${P/_/}"
+MY_PV="${PV/_rc*/}"
+DESCRIPTION="Small forwarding DNS server"
+HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/"
+SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	>=sys-apps/portage-2.0.51"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_compile() {
+	epatch ${FILESDIR}/dnsmasq221-netlink.diff
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	make \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		DESTDIR=${D} \
+		install || die
+	dodoc CHANGELOG FAQ
+	dohtml *.html
+
+	newinitd ${FILESDIR}/dnsmasq-init dnsmasq
+	newconfd ${FILESDIR}/dnsmasq.confd dnsmasq
+	insinto /etc
+	newins dnsmasq.conf.example dnsmasq.conf
+}
diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.21 b/net-dns/dnsmasq/files/digest-dnsmasq-2.21
new file mode 100644
index 000000000000..73ab78f9c63a
--- /dev/null
+++ b/net-dns/dnsmasq/files/digest-dnsmasq-2.21
@@ -0,0 +1 @@
+MD5 98e6258ba9f1d133c4af0052077181c1 dnsmasq-2.21.tar.gz 144831
diff --git a/net-dns/dnsmasq/files/dnsmasq221-netlink.diff b/net-dns/dnsmasq/files/dnsmasq221-netlink.diff
new file mode 100644
index 000000000000..221114765434
--- /dev/null
+++ b/net-dns/dnsmasq/files/dnsmasq221-netlink.diff
@@ -0,0 +1,10 @@
+diff -urN dnsmasq-2.21.orig/src/netlink.c dnsmasq-2.21/src/netlink.c
+--- dnsmasq-2.21.orig/src/netlink.c  2005-03-13 10:37:44.000000000 +0100
++++ dnsmasq-2.21/src/netlink.c  2005-03-24 12:31:52.000000000 +0100
+@@ -16,6 +16,7 @@
+
+ #ifdef HAVE_RTNETLINK
+
++#include <linux/types.h>
+ #include <linux/netlink.h>
+ #include <linux/rtnetlink.h>