Version bump (bug #259224).

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

4 files changed, 105 insertions, 3 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index 674bdbb302ae..75950a27270f 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/dnsmasq
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.175 2008/12/23 16:00:58 chutzpah Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.176 2009/03/30 04:14:34 chutzpah Exp $
+
+*dnsmasq-2.47 (30 Mar 2009)
+
+  30 Mar 2009; Patrick McLean <chutzpah@gentoo.org>
+  +files/dnsmasq-2.47-fbsd-config.patch, +dnsmasq-2.47.ebuild:
+  Version bump (bug #259224).
 
 *dnsmasq-2.46 (23 Dec 2008)
 
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index c54735bbdc94..8cd2b509d0ef 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -1,10 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX dnsmasq-2.47-fbsd-config.patch 505 RMD160 a19a17e94d924a21f79d50420faa4c2ed3ec40d0 SHA1 723580b460c93e2f7829627dee15bb758730b848 SHA256 4e05e46b59254e718550cda505986b9b572a0716636fb6a5405a54df25cfa84a
 AUX dnsmasq-fbsd-config.patch 451 RMD160 c9103d329ff429cdadea346db59678815fe3317d SHA1 28f48fc050c3cc964e717a1c09edb47b4438597a SHA256 8973971c4a161f48815c41045cb350394f330276085e9b8f3c578077abc0f359
 AUX dnsmasq-init 924 RMD160 feb28b270b5656834550e4dcfc1c87eeef88ab77 SHA1 119f112555a19236622637666758ef42d90ad74b SHA256 3803f1b7cb4c9f1c738537d5b5d91b37727572c81056e2fe6546a517ba992f55
 AUX dnsmasq.confd 140 RMD160 33f6370377b38bf33acab72d8de86cba5e197d79 SHA1 83461d2964dc3f0db777fc26141b07f6f3f5a762 SHA256 8bbc2634ab537ed3a17ee98be9c2667013a2b048f6981138017414e54fe90746
 AUX resolvconf.dnsmasq 4078 RMD160 8a290b908cf975e0cbb2b845c5c492d8a3f6e2aa SHA1 70f4ca6e6cbd91b700e7e82696d5508f3c1686dd SHA256 c3cf0b2249267aaf921f335ec10cf140db570b2aa4009be789a215c47323a1d5
 DIST dnsmasq-2.45.tar.lzma 275407 RMD160 991d5c44a1bb3baad9173d28255a42c8d88fbc02 SHA1 9c613108c3e41ceaa48c176f228439fec241049d SHA256 969ee94223879c4be469b6aba74186ba897fb06eb9872f5996b6b20419b9f31c
 DIST dnsmasq-2.46.tar.lzma 279718 RMD160 74bd9a1fc4e1e3fd4f3efbf3d9875696fcbf13d2 SHA1 8b41cf957ad9b7c9bec71933db57f0c1e525d90c SHA256 ed3483d6b2d6939d8d0dfe32e473ccbe8a3c7cfb3869f0378e50d814c00f370c
+DIST dnsmasq-2.47.tar.lzma 286597 RMD160 54042262cf559a97837e0099d8dd2a312312fbbb SHA1 796be70a5c4f1cdff383594d0d170d5d1bab63f7 SHA256 23f977f55da5c1bbfdcf5db9ada641cfd94819f7452113c3be40fd7dfe200a46
 EBUILD dnsmasq-2.45.ebuild 1729 RMD160 d57a6d872d6cf2aeb72e16702779ee94229df383 SHA1 e32c3722e2c58de9ef7bcc4c708dda0775a0b985 SHA256 cee382efd302a4d32fec76c9fcb059d25799348972ad672c8b71a92cf4dd9060
 EBUILD dnsmasq-2.46.ebuild 1695 RMD160 a05f16ed465792ad16e5847b51f407e17e24f545 SHA1 fbbabfde3982acbec5157eca8eafb329fcc35bcb SHA256 a063a85d722767501fd3a8c2868625e8cad64a80183da26be877556ca79cae78
-MISC ChangeLog 22384 RMD160 660ab21a029ae3e4ec7839df476b9256a132615a SHA1 b960b691aa744a773b34142478684b440e6f2799 SHA256 e5573a5af727f16327ee506ecd2a3b2c42ff5b3fae477586d3a218a43598b819
+EBUILD dnsmasq-2.47.ebuild 1694 RMD160 de9f4a3e84f604f34694730c4f4693469c71da46 SHA1 9b10900fadb64204019922d18bce5dc5c93b1d2a SHA256 6dd44d3473711e0dd6f9aab37d206d758cb1ee72e4d1bd39ac60dd1b5bd3ff93
+MISC ChangeLog 22559 RMD160 e55158783ad002662caf7f3d2148b5ebb2256544 SHA1 138bd8ad656f8265b53572cf54f19c144bd85754 SHA256 b4bbe16a724a8f210198d27362795f1ceed22e6a8e61e5f3246cbadc26cfa0bd
 MISC metadata.xml 408 RMD160 c75b690031bb68347071ca314ca6495b0e312e72 SHA1 75fda60866e74fd8eb0b311b3537a069103ead61 SHA256 771c336677378f809c748a08400a870c401aae5ecbe39aa3e0e60df99272766c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAknQRzYACgkQWt/XSf2CZdlbcgCgiKvn4GDZ1Yc3yiry0aEjEQu7
+l+sAoJkwbSMocZ5RPmkzEWJ/Ed/qkd04
+=v597
+-----END PGP SIGNATURE-----
diff --git a/net-dns/dnsmasq/dnsmasq-2.47.ebuild b/net-dns/dnsmasq/dnsmasq-2.47.ebuild
new file mode 100644
index 000000000000..1140d2ca4353
--- /dev/null
+++ b/net-dns/dnsmasq/dnsmasq-2.47.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.47.ebuild,v 1.1 2009/03/30 04:14:34 chutzpah Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+MY_P="${P/_/}"
+MY_PV="${PV/_/}"
+DESCRIPTION="Small forwarding DNS server"
+HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/"
+SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${MY_P}.tar.lzma"
+#SRC_URI="http://www.thekelleys.org.uk/dnsmasq/release-candidates/${MY_P}.tar.lzma"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="dbus ipv6 nls tftp"
+
+RDEPEND="dbus? ( sys-apps/dbus )
+	nls? ( sys-devel/gettext )"
+
+DEPEND="${RDEPEND}
+	app-arch/lzma-utils"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i '/^AWK/s:nawk:gawk:' Makefile #214865
+	# dnsmasq on FreeBSD wants the config file in a silly location, this fixes
+	epatch "${FILESDIR}/${P}-fbsd-config.patch"
+}
+
+src_compile() {
+	use tftp || append-flags -DNO_TFTP
+	use ipv6 || append-flags -DNO_IPV6
+	use dbus && sed -i '$ a #define HAVE_DBUS' src/config.h
+
+	emake \
+		PREFIX=/usr \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		all$(use nls && echo "-i18n") || die
+}
+
+src_install() {
+	emake \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		DESTDIR="${D}" \
+		install$(use nls && echo "-i18n") || die
+
+	dodoc CHANGELOG FAQ
+	dohtml *.html
+
+	newinitd "${FILESDIR}"/dnsmasq-init dnsmasq
+	newconfd "${FILESDIR}"/dnsmasq.confd dnsmasq
+	insinto /etc
+	newins dnsmasq.conf.example dnsmasq.conf
+
+	if use dbus ; then
+		insinto /etc/dbus-1/system.d
+		doins dbus/dnsmasq.conf
+	fi
+}
diff --git a/net-dns/dnsmasq/files/dnsmasq-2.47-fbsd-config.patch b/net-dns/dnsmasq/files/dnsmasq-2.47-fbsd-config.patch
new file mode 100644
index 000000000000..38a3679bd240
--- /dev/null
+++ b/net-dns/dnsmasq/files/dnsmasq-2.47-fbsd-config.patch
@@ -0,0 +1,16 @@
+diff -ur dnsmasq-2.47.orig/src/config.h dnsmasq-2.47/src/config.h
+--- dnsmasq-2.47.orig/src/config.h	2009-02-05 07:14:24.000000000 -0500
++++ dnsmasq-2.47/src/config.h	2009-03-30 00:04:52.000000000 -0400
+@@ -50,11 +50,7 @@
+ #endif
+ 
+ #ifndef CONFFILE
+-#   if defined(__FreeBSD__)
+-#      define CONFFILE "/usr/local/etc/dnsmasq.conf"
+-#   else
+-#      define CONFFILE "/etc/dnsmasq.conf"
+-#   endif
++#   define CONFFILE "/etc/dnsmasq.conf"
+ #endif
+ 
+ #define DEFLEASE 3600 /* default lease time, 1 hour */