From: Roy Marples Date: Fri, 23 Mar 2007 10:44:02 +0000 (+0000) Subject: Fix init script I broke - sorry X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0ab568e05ff48b1af07b743b2cef6affed0fc1c1;p=gentoo.git Fix init script I broke - sorry Install a dbus config file in /etc/dbus-1/system.d Package-Manager: portage-2.1.2.2 --- diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog index 20f863b24a84..9b49d18a3002 100644 --- a/net-dns/dnsmasq/ChangeLog +++ b/net-dns/dnsmasq/ChangeLog @@ -1,6 +1,13 @@ # 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.116 2007/03/22 15:08:11 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.117 2007/03/23 10:44:02 uberlord Exp $ + +*dnsmasq-2.38-r1 (23 Mar 2007) + + 23 Mar 2007; Roy Marples files/dnsmasq-init, + +dnsmasq-2.38-r1.ebuild: + Fix init script I broke - sorry + Install a dbus config file in /etc/dbus-1/system.d 22 Mar 2007; Gustavo Zacarias dnsmasq-2.38.ebuild: Stable on sparc diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest index 33f4b98c7b86..e7889f06a589 100644 --- a/net-dns/dnsmasq/Manifest +++ b/net-dns/dnsmasq/Manifest @@ -1,14 +1,11 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX dnsmasq-fbsd-config.patch 451 RMD160 c9103d329ff429cdadea346db59678815fe3317d SHA1 28f48fc050c3cc964e717a1c09edb47b4438597a SHA256 8973971c4a161f48815c41045cb350394f330276085e9b8f3c578077abc0f359 MD5 76c037c6372d10106bfaddc92bc6f898 files/dnsmasq-fbsd-config.patch 451 RMD160 c9103d329ff429cdadea346db59678815fe3317d files/dnsmasq-fbsd-config.patch 451 SHA256 8973971c4a161f48815c41045cb350394f330276085e9b8f3c578077abc0f359 files/dnsmasq-fbsd-config.patch 451 -AUX dnsmasq-init 787 RMD160 bc12d2021610f6fe4ab45d7541859b547c26f9e1 SHA1 2d6b681430b99f2d9892e88100feba8dcd2449a7 SHA256 a96729cbee18797fa40549764b38556d9ffb3f6b7d75ea28fcc804be685b9788 -MD5 e3597915d833379350da1feb1229ce36 files/dnsmasq-init 787 -RMD160 bc12d2021610f6fe4ab45d7541859b547c26f9e1 files/dnsmasq-init 787 -SHA256 a96729cbee18797fa40549764b38556d9ffb3f6b7d75ea28fcc804be685b9788 files/dnsmasq-init 787 +AUX dnsmasq-init 797 RMD160 fd243bc35e35eb8f3d7b56195903da3c3653c8b8 SHA1 ce200b3e13df0193be9e164552261371790089fe SHA256 23f666b476778782247226324843db1671e5ba1b13e465f24d1e0a68d494fa2b +MD5 6c19a84b3d8f5617c95b788a148dd543 files/dnsmasq-init 797 +RMD160 fd243bc35e35eb8f3d7b56195903da3c3653c8b8 files/dnsmasq-init 797 +SHA256 23f666b476778782247226324843db1671e5ba1b13e465f24d1e0a68d494fa2b files/dnsmasq-init 797 AUX dnsmasq.confd 140 RMD160 33f6370377b38bf33acab72d8de86cba5e197d79 SHA1 83461d2964dc3f0db777fc26141b07f6f3f5a762 SHA256 8bbc2634ab537ed3a17ee98be9c2667013a2b048f6981138017414e54fe90746 MD5 5990c2d2cb92209feacf8f3a5a7d0831 files/dnsmasq.confd 140 RMD160 33f6370377b38bf33acab72d8de86cba5e197d79 files/dnsmasq.confd 140 @@ -28,14 +25,18 @@ EBUILD dnsmasq-2.34.ebuild 1316 RMD160 ad1caaf3511bb9c4fa8f9c397b07b2b101cb4e53 MD5 20dba6ebf27704cebebd05ced92ff971 dnsmasq-2.34.ebuild 1316 RMD160 ad1caaf3511bb9c4fa8f9c397b07b2b101cb4e53 dnsmasq-2.34.ebuild 1316 SHA256 2ae07914c56fc19668b4fccf0a00ebe06e319fae8f02934f75d607df93a920a9 dnsmasq-2.34.ebuild 1316 +EBUILD dnsmasq-2.38-r1.ebuild 1613 RMD160 fa38f4fc1217c9f95abd023a4fad403a3bc6b3ba SHA1 077352801f400c78e777688678f378b9681afb4a SHA256 eb34e91f4d0afa8579c5c3cbb41a1375cb83bed65abd38874d61b82367b2e68b +MD5 0c25b2398568a76298a2f354fb95edc0 dnsmasq-2.38-r1.ebuild 1613 +RMD160 fa38f4fc1217c9f95abd023a4fad403a3bc6b3ba dnsmasq-2.38-r1.ebuild 1613 +SHA256 eb34e91f4d0afa8579c5c3cbb41a1375cb83bed65abd38874d61b82367b2e68b dnsmasq-2.38-r1.ebuild 1613 EBUILD dnsmasq-2.38.ebuild 1528 RMD160 656a6f1ba6afab16ba8a06db77236cc24891dd5d SHA1 f603c3a5100963bf33057267d5c71222fb0eb353 SHA256 856a11861ffcc8eedcc3a67f50c0d6e0b074742358bb46d9be3b91f2f5693d23 MD5 226aebab891bd92342b2eb1cdd52ac79 dnsmasq-2.38.ebuild 1528 RMD160 656a6f1ba6afab16ba8a06db77236cc24891dd5d dnsmasq-2.38.ebuild 1528 SHA256 856a11861ffcc8eedcc3a67f50c0d6e0b074742358bb46d9be3b91f2f5693d23 dnsmasq-2.38.ebuild 1528 -MISC ChangeLog 14279 RMD160 6659d3b3053baf5721baeac44ffdd6c23e82192c SHA1 307864a2fef88e7c55ca69e30b4308a3fbccd5d0 SHA256 32f1098adb8fe31c62b2f15a138621808e85f17511cdf1e4332f9d4ed2bd7250 -MD5 17686d4261a7796d27a8b2c978dfd1f5 ChangeLog 14279 -RMD160 6659d3b3053baf5721baeac44ffdd6c23e82192c ChangeLog 14279 -SHA256 32f1098adb8fe31c62b2f15a138621808e85f17511cdf1e4332f9d4ed2bd7250 ChangeLog 14279 +MISC ChangeLog 14495 RMD160 a9bd8b961db1c3462b5b29dfe5c95215c41e643a SHA1 62bd069fb951c6cfb08b3ff4e3a5260cecf3acb6 SHA256 221452ac93411a8aaff0038a3d052086da308ea56954e604ffe594f8eee04e0e +MD5 5a7b018f044c26b8ae260056b3cf2fd5 ChangeLog 14495 +RMD160 a9bd8b961db1c3462b5b29dfe5c95215c41e643a ChangeLog 14495 +SHA256 221452ac93411a8aaff0038a3d052086da308ea56954e604ffe594f8eee04e0e ChangeLog 14495 MISC metadata.xml 251 RMD160 9f6c5022895c245c7b1fdbaa24ae19cab04502c8 SHA1 4f7b27e3a8043f87fea8d4bc308e4b947f0e8675 SHA256 fd85d2faaf1d0c0eab6a4d2ab9eaa493e087a6108aafd0a5db6436bfc181783b MD5 f115572f9475ea98b22ceeb627ba07f0 metadata.xml 251 RMD160 9f6c5022895c245c7b1fdbaa24ae19cab04502c8 metadata.xml 251 @@ -49,10 +50,6 @@ SHA256 b7556692de6def5af09946319cfd19d19de3348a1223875671b0bfeeacfe76ef files/di MD5 835414295b0bed7fcba1fc1d43d90007 files/digest-dnsmasq-2.38 238 RMD160 df759b67748d7149a7aae7f23e3157dc1a4e4e61 files/digest-dnsmasq-2.38 238 SHA256 a43f4ec7f3aae182582955b664e8bbf1b567ac8a79dd643573fcd50b7df408a2 files/digest-dnsmasq-2.38 238 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux) - -iD8DBQFGApviKRy60XGEcJIRAugzAKCTBUZc9XlClnhvgmqXhMSNp9GobwCgniaQ -DAttNBoDNOUWkQghLNd2bF8= -=3/uY ------END PGP SIGNATURE----- +MD5 835414295b0bed7fcba1fc1d43d90007 files/digest-dnsmasq-2.38-r1 238 +RMD160 df759b67748d7149a7aae7f23e3157dc1a4e4e61 files/digest-dnsmasq-2.38-r1 238 +SHA256 a43f4ec7f3aae182582955b664e8bbf1b567ac8a79dd643573fcd50b7df408a2 files/digest-dnsmasq-2.38-r1 238 diff --git a/net-dns/dnsmasq/dnsmasq-2.38-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.38-r1.ebuild new file mode 100644 index 000000000000..c245c71582d9 --- /dev/null +++ b/net-dns/dnsmasq/dnsmasq-2.38-r1.ebuild @@ -0,0 +1,64 @@ +# 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.38-r1.ebuild,v 1.1 2007/03/23 10:44:02 uberlord Exp $ + +inherit eutils toolchain-funcs flag-o-matic + +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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" +IUSE="dbus isc resolvconf tftp" + +RDEPEND="" +DEPEND="${RDEPEND} + >=sys-apps/portage-2.0.51 + dbus? ( sys-apps/dbus ) + resolvconf? ( net-dns/resolvconf-gentoo )" + +S=${WORKDIR}/${PN}-${MY_PV} + +src_unpack() { + unpack ${A} + cd ${S} + + # dnsmasq on FreeBSD wants the config file in a silly location, this fixes + epatch "${FILESDIR}/${PN}-fbsd-config.patch" +} + +src_compile() { + use tftp || append-flags -DNO_TFTP + use dbus && sed -i '$ a #define HAVE_DBUS' src/config.h + use isc && sed -i '$ a #define HAVE_ISC_READER' src/config.h + 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 + + if use dbus ; then + insinto /etc/dbus-1/system.d + doins dbus/dnsmasq.conf + fi + + if use resolvconf ; then + exeinto /etc/resolvconf/update.d + newexe ${FILESDIR}/resolvconf.dnsmasq dnsmasq + fi +} diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.38-r1 b/net-dns/dnsmasq/files/digest-dnsmasq-2.38-r1 new file mode 100644 index 000000000000..a7cfe1f59890 --- /dev/null +++ b/net-dns/dnsmasq/files/digest-dnsmasq-2.38-r1 @@ -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-init b/net-dns/dnsmasq/files/dnsmasq-init index e25d45fe21ab..1343973ddf54 100644 --- a/net-dns/dnsmasq/files/dnsmasq-init +++ b/net-dns/dnsmasq/files/dnsmasq-init @@ -1,19 +1,20 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/files/dnsmasq-init,v 1.9 2007/02/23 11:09:41 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/files/dnsmasq-init,v 1.10 2007/03/23 10:44:02 uberlord Exp $ opts="reload" depend() { provide dns need net + use dbus } start() { ebegin "Starting dnsmasq" start-stop-daemon --start --exec /usr/sbin/dnsmasq \ - -- pidfile /var/run/dnsmasq.pid \ + --pidfile /var/run/dnsmasq.pid \ -- -x /var/run/dnsmasq.pid ${DNSMASQ_OPTS} eend $? }