Drop several patches patches, DJBDNS_PATCH_DIR can be used instead. General cleanup.

Package-Manager: portage-2.1.2

diff --git a/net-dns/djbdns/ChangeLog b/net-dns/djbdns/ChangeLog
index 4ef79d624be9e3a01199898d3e12845546e9e984..91739119c4f69143bb15930d14f170039ea597b7 100644 (file)
--- a/net-dns/djbdns/ChangeLog
+++ b/net-dns/djbdns/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/djbdns
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.86 2006/12/03 19:58:25 corsair Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.87 2007/01/16 19:53:49 hansmi Exp $
+
+*djbdns-1.05-r20 (16 Jan 2007)
+
+  16 Jan 2007; Michael Hanselmann <hansmi@gentoo.org>
+  +djbdns-1.05-r20.ebuild:
+  Drop several patches patches, DJBDNS_PATCH_DIR can be used instead. General
+  cleanup.
 
   03 Dec 2006; Markus Rothe <corsair@gentoo.org> djbdns-1.05-r19.ebuild:
   Stable on ppc64

diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index b7822f1cd8ef893a103aa115f63cff13b6ecd0e6..aaa2b49532f76a494607b145060dc1afa54baf5e 100644 (file)
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -54,10 +54,14 @@ EBUILD djbdns-1.05-r19.ebuild 5594 RMD160 443c4b38f34fa83aa304d179b0b5fd91432ff5
 MD5 416d48337725c727222e062b61ebab10 djbdns-1.05-r19.ebuild 5594
 RMD160 443c4b38f34fa83aa304d179b0b5fd91432ff517 djbdns-1.05-r19.ebuild 5594
 SHA256 76ee67fe191cca9b483ce910d2714fa6271e3863b4791b14b1130cb4ea3e7669 djbdns-1.05-r19.ebuild 5594
-MISC ChangeLog 14599 RMD160 677eb7851661d2b73a47b974acc46762cbe96985 SHA1 5179bb31a004a5d39f0fb6cd4a2b911ce91422fe SHA256 f8ff75b8b30cadf49cb17235a9bcbdb0ca47cc278341138d03cbac2895706094
-MD5 f2c2015ad290c5c3f4e2a7f9f43c8d23 ChangeLog 14599
-RMD160 677eb7851661d2b73a47b974acc46762cbe96985 ChangeLog 14599
-SHA256 f8ff75b8b30cadf49cb17235a9bcbdb0ca47cc278341138d03cbac2895706094 ChangeLog 14599
+EBUILD djbdns-1.05-r20.ebuild 3310 RMD160 b59327367080d39d0399d415ab5d1aeb2b664507 SHA1 a87d3865c876ac7450de7d0c79e80e8b76a26ea2 SHA256 3fc44c5aecfe8d7835bf8f3ecf870e5ff3f3fdf9b214456349d0770894c29e90
+MD5 0dc616d9dd5c4e64330c0e639bc90454 djbdns-1.05-r20.ebuild 3310
+RMD160 b59327367080d39d0399d415ab5d1aeb2b664507 djbdns-1.05-r20.ebuild 3310
+SHA256 3fc44c5aecfe8d7835bf8f3ecf870e5ff3f3fdf9b214456349d0770894c29e90 djbdns-1.05-r20.ebuild 3310
+MISC ChangeLog 14801 RMD160 f3dc9b715c4b01c00b090313fcd6156f7d8f4515 SHA1 d1e5e0d0110423c984fdacb3e6257662924236d5 SHA256 7f3722df418f12e5de69eaed592ce90310fa435f787c2e2ac7c2321c6b40e2ce
+MD5 b41112798e25b0d2c2ce8669bc3a5ea9 ChangeLog 14801
+RMD160 f3dc9b715c4b01c00b090313fcd6156f7d8f4515 ChangeLog 14801
+SHA256 7f3722df418f12e5de69eaed592ce90310fa435f787c2e2ac7c2321c6b40e2ce ChangeLog 14801
 MISC metadata.xml 254 RMD160 e81ca3ce54d13af0e64f9667b84832764b9d6cb7 SHA1 2e282dc077a0668723c3985a957325baaab313dd SHA256 9fed9bb1854d7d47ee1f1d7719bd888fefc543ab0549b05a81f7b9edd28840b5
 MD5 126c0768ab916bb5855092f1b55413ab metadata.xml 254
 RMD160 e81ca3ce54d13af0e64f9667b84832764b9d6cb7 metadata.xml 254
@@ -68,3 +72,6 @@ SHA256 483bd5f138de646c5a78c0141866a67ca3ab4148c1e1771184c4cd213f3888b5 files/di
 MD5 691159b56c8f6f70d375d573f660d6a5 files/digest-djbdns-1.05-r19 3096
 RMD160 8be66e99bc0f2433f3ab2f48fe8fa31845b3cc8e files/digest-djbdns-1.05-r19 3096
 SHA256 bcc41e62176433742c77cce88684f3f0ab81a3a44d33b623a57bfab2cb74108c files/digest-djbdns-1.05-r19 3096
+MD5 1b40ae55380076100a39bf70b4a6d9d3 files/digest-djbdns-1.05-r20 491
+RMD160 513cba78a22f9bd7adf69f8f2973250c5dd7cfc5 files/digest-djbdns-1.05-r20 491
+SHA256 6ba2d8757c899a53ec59ecc5be806ea5e8d1959b1d6ed55716ebaf9f28528df4 files/digest-djbdns-1.05-r20 491

diff --git a/net-dns/djbdns/djbdns-1.05-r20.ebuild b/net-dns/djbdns/djbdns-1.05-r20.ebuild
new file mode 100644 (file)
index 0000000..52cebd0
--- /dev/null
+++ b/net-dns/djbdns/djbdns-1.05-r20.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r20.ebuild,v 1.1 2007/01/16 19:53:49 hansmi Exp $
+
+IUSE="doc ipv6 selinux static"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Excellent high-performance DNS services"
+HOMEPAGE="http://cr.yp.to/djbdns.html"
+IPV6_PATCH="test23"
+
+SRC_URI="
+       http://cr.yp.to/djbdns/${P}.tar.gz
+       ipv6? ( http://www.fefe.de/dns/${P}-${IPV6_PATCH}.diff.bz2 )
+"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+       >=sys-process/daemontools-0.70
+       sys-apps/ucspi-tcp
+       doc? ( app-doc/djbdns-man )
+       selinux? ( sec-policy/selinux-djbdns )
+"
+
+src_unpack() {
+       unpack "${P}.tar.gz"
+       cd "${S}"
+
+       echo
+       einfo 'Several patches have been dropped from this djbdns ebuild revision.'
+       einfo 'Please use the DJBDNS_PATCH_DIR variable to specify a directory'
+       einfo 'of custom patches.'
+       echo
+       einfo 'Some of them can be found at http://tinydns.org/ or'
+       einfo 'http://homepages.tesco.net/J.deBoynePollard/Softwares/djbdns/'
+       echo
+
+       epatch \
+               "${FILESDIR}/headtail.patch" \
+               "${FILESDIR}/dnsroots.patch" \
+               "${FILESDIR}/dnstracesort.patch"
+
+       if use ipv6; then
+               einfo "At present dnstrace does NOT support IPv6. It will"\
+                     "be compiled without IPv6 support."
+               cp -pR "${S}" "${S}-noipv6"
+               # Careful -- >=test21 of the IPv6 patch includes the errno patch
+               epatch "${DISTDIR}/${P}-${IPV6_PATCH}.diff.bz2"
+               cd "${S}-noipv6"
+       fi
+
+       epatch "${FILESDIR}/${PV}-errno.patch"
+
+       if [[ -n "${DJBDNS_PATCH_DIR}" && -d "${DJBDNS_PATCH_DIR}" ]]
+       then
+               echo
+               ewarn "You enabled custom patches from ${DJBDNS_PATCH_DIR}."
+               ewarn "Be warned that you won't get any support when using "
+               ewarn "this feature. You're on your own from now!"
+               echo
+               ebeep
+               epatch "${DJBDNS_PATCH_DIR}/"*
+       fi
+}
+
+src_compile() {
+       use static && append-ldflags -static
+       echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+       echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+       echo "/usr" > conf-home
+       emake -j1 || die "emake failed"
+
+       # If djbdns is compiled with IPv6 support, it breaks dnstrace.
+       # Therefore we must compile dnstrace separately without IPv6
+       # support.
+       if use ipv6; then
+               einfo "Compiling dnstrace without ipv6 support"
+               cd ${S}-noipv6
+               echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+               echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+               echo "/usr" > conf-home
+               emake -j1 dnstrace || die "emake failed"
+       fi
+}
+
+src_install() {
+       insinto /etc
+       doins dnsroots.global
+
+       into /usr
+       dobin *-conf dnscache tinydns walldns rbldns pickdns axfrdns \
+               *-get *-data *-edit dnsip dnsipq dnsname dnstxt dnsmx \
+               dnsfilter random-ip dnsqr dnsq dnstrace dnstracesort
+
+       use ipv6 && dobin dnsip6 dnsip6q "${S}-noipv6/dnstrace"
+
+       dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
+
+       dobin "${FILESDIR}/dnscache-setup"
+       use fwdzone && cd "${D}${DESTTREE}/bin" && \
+               epatch "${FILESDIR}/fwdzone-fix.patch"
+       dobin "${FILESDIR}/tinydns-setup"
+       newbin "${FILESDIR}/djbdns-setup-${PR}" djbdns-setup
+}
+
+pkg_setup() {
+       # The nofiles group is provided by baselayout
+       enewuser dnscache -1 -1 -1 nofiles
+       enewuser dnslog -1 -1 -1 nofiles
+       enewuser tinydns -1 -1 -1 nofiles
+}
+
+pkg_postinst() {
+       einfo "Use dnscache-setup & tinydns-setup or djbdns-setup"\
+             "to configure djbdns."
+}

diff --git a/net-dns/djbdns/files/digest-djbdns-1.05-r20 b/net-dns/djbdns/files/digest-djbdns-1.05-r20
new file mode 100644 (file)
index 0000000..eab66fd
--- /dev/null
+++ b/net-dns/djbdns/files/digest-djbdns-1.05-r20
@@ -0,0 +1,6 @@
+MD5 dc35e88e20ffe2670cef5bb4d8a2c183 djbdns-1.05-test23.diff.bz2 18480
+RMD160 33037f2a41abb49c305f3efec4402c6965c8b8b8 djbdns-1.05-test23.diff.bz2 18480
+SHA256 e702f47b4a4c77fe5cec474a8219a072cfaaee07282650b7e0dd322ed82e8f33 djbdns-1.05-test23.diff.bz2 18480
+MD5 3147c5cd56832aa3b41955c7a51cbeb2 djbdns-1.05.tar.gz 85648
+RMD160 a832cbfd93e4ccec6a565492a4ee0b3c1b4b68ed djbdns-1.05.tar.gz 85648
+SHA256 3ccd826a02f3cde39be088e1fc6aed9fd57756b8f970de5dc99fcd2d92536b48 djbdns-1.05.tar.gz 85648