diff options
author | Michael Hanselmann <hansmi@gentoo.org> | 2006-09-29 23:57:19 +0000 |
---|---|---|
committer | Michael Hanselmann <hansmi@gentoo.org> | 2006-09-29 23:57:19 +0000 |
commit | 9f134c5bc550944d84fee391e64a2f855e8cb9fc (patch) | |
tree | ede1fc7d9433bd04b6098c8826028dcff57a2886 /net-dns | |
parent | Stable on x86, bug #148885. (diff) | |
download | gentoo-2-9f134c5bc550944d84fee391e64a2f855e8cb9fc.tar.gz gentoo-2-9f134c5bc550944d84fee391e64a2f855e8cb9fc.tar.bz2 gentoo-2-9f134c5bc550944d84fee391e64a2f855e8cb9fc.zip |
Add fwdonly patch (bug 148326) and fix user creation (bug 148225).
(Portage version: 2.1.2_pre1-r4)
Diffstat (limited to 'net-dns')
-rw-r--r-- | net-dns/djbdns/ChangeLog | 8 | ||||
-rw-r--r-- | net-dns/djbdns/djbdns-1.05-r19.ebuild | 174 | ||||
-rw-r--r-- | net-dns/djbdns/files/digest-djbdns-1.05-r19 | 36 |
3 files changed, 217 insertions, 1 deletions
diff --git a/net-dns/djbdns/ChangeLog b/net-dns/djbdns/ChangeLog index 5e0246082030..f1ae8921233b 100644 --- a/net-dns/djbdns/ChangeLog +++ b/net-dns/djbdns/ChangeLog @@ -1,6 +1,12 @@ # 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.82 2006/08/30 19:09:54 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.83 2006/09/29 23:57:19 hansmi Exp $ + +*djbdns-1.05-r19 (30 Sep 2006) + + 29 Sep 2006; Michael Hanselmann <hansmi@gentoo.org> + +djbdns-1.05-r19.ebuild: + Add fwdonly patch (bug 148326) and fix user creation (bug 148225). *djbdns-1.05-r18 (30 Aug 2006) diff --git a/net-dns/djbdns/djbdns-1.05-r19.ebuild b/net-dns/djbdns/djbdns-1.05-r19.ebuild new file mode 100644 index 000000000000..58deefdc84bb --- /dev/null +++ b/net-dns/djbdns/djbdns-1.05-r19.ebuild @@ -0,0 +1,174 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r19.ebuild,v 1.1 2006/09/29 23:57:19 hansmi Exp $ + +IUSE="aliaschain cnamefix doc fwdonly fwdzone ipv6 \ + multipleip roundrobin semanticfix static selinux \ + multidata datadir" + +inherit eutils flag-o-matic toolchain-funcs + +DESCRIPTION="Excellent high-performance DNS services" +HOMEPAGE="http://cr.yp.to/djbdns.html" +IPV6_PATCH="test23" + +JBP_PATCHES="http://homepages.tesco.net/~J.deBoynePollard/Softwares/djbdns" +SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz + fwdzone? ( + http://www.skarnet.org/software/djbdns-fwdzone/djbdns-1.04-fwdzone.patch + ) + fwdonly? ( ${JBP_PATCHES}/dnscache-strict-forwardonly.patch ) + roundrobin? ( http://www.legend.co.uk/djb/dns/round-robin.patch ) + multipleip? ( + http://danp.net/djbdns/dnscache-multiple-ip.patch + http://www.ohse.de/uwe/patches/djbdns-1.05-multiip.diff + ) + aliaschain? ( ${JBP_PATCHES}/tinydns-alias-chain-truncation.patch ) + semanticfix? ( ${JBP_PATCHES}/tinydns-data-semantic-error.patch ) + cnamefix? ( ${JBP_PATCHES}/dnscache-cname-handling.patch ) + ipv6? ( http://www.fefe.de/dns/${P}-${IPV6_PATCH}.diff.bz2 ) + datadir? ( + http://dustman.net/andy/djbware/tinydns-datadir/0.0.0/djbdns-1.0.5-datadir.patch + ) + multidata? ( + http://js.hu/package/djbdns-conf/djbdns-1.05-multi_tinydns_data.patch + )" + +SLOT="0" +LICENSE="as-is" +KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" + +RDEPEND=">=sys-process/daemontools-0.70 + doc? ( app-doc/djbdns-man ) + sys-apps/ucspi-tcp + selinux? ( sec-policy/selinux-djbdns )" + +src_unpack() { + unpack "${P}.tar.gz" + cd "${S}" + + use ipv6 && use cnamefix && \ + die "ipv6 cannot currently be used with the cnamefix patch" + + use ipv6 && use multipleip && \ + die "ipv6 cannot currently be used with the multipleip patch" + + if use ipv6 && ( use fwdzone || use roundrobin ); then + eerror "ipv6 cannot currently be used with the fwdzone or " + eerror "roundrobin patch." + echo + eerror "If you would like to see ipv6 support along with one of " + eerror "those other patches, please submit a working patch that " + eerror "combines ipv6 with either fwdzone or roundrobin but not " + eerror "both at the same time, since the latter 2 patches are " + eerror "mutually exclusive according to bug #31238." + die + fi + + use fwdzone && use roundrobin && \ + die "fwdzone and roundrobin do not work together according to bug #31238" + + use datadir && use multidata && \ + die "The datadir and multidata patches are not compatible with each other" + + use cnamefix && \ + sed 's:\r::g' < "${DISTDIR}/dnscache-cname-handling.patch" \ + > "${WORKDIR}/dnscache-cname-handling.patch" && \ + epatch "${WORKDIR}/dnscache-cname-handling.patch" + use aliaschain && \ + epatch "${DISTDIR}/tinydns-alias-chain-truncation.patch" + use semanticfix && \ + epatch "${DISTDIR}/tinydns-data-semantic-error.patch" + use fwdzone && \ + epatch "${DISTDIR}/djbdns-1.04-fwdzone.patch" + use roundrobin && \ + epatch "${DISTDIR}/round-robin.patch" + use multipleip && \ + epatch "${DISTDIR}/dnscache-multiple-ip.patch" && \ + epatch "${DISTDIR}/djbdns-1.05-multiip.diff" + use datadir && \ + epatch "${DISTDIR}/djbdns-1.0.5-datadir.patch" + use multidata && \ + epatch "${DISTDIR}/djbdns-1.05-multi_tinydns_data.patch" + use fwdonly && \ + epatch "${DISTDIR}/dnscache-strict-forwardonly.patch" + + 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!" + ebeep + epatch "${DJBDNS_PATCH_DIR}/"* + echo + 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-r19 b/net-dns/djbdns/files/digest-djbdns-1.05-r19 new file mode 100644 index 000000000000..4d5a85881af0 --- /dev/null +++ b/net-dns/djbdns/files/digest-djbdns-1.05-r19 @@ -0,0 +1,36 @@ +MD5 bbe7245413c83a31f08a678588ae5a09 djbdns-1.0.5-datadir.patch 2918 +RMD160 95ca3f4dc00d2a3f86948b1582d2cd0c92f35a5d djbdns-1.0.5-datadir.patch 2918 +SHA256 b6913a52720a60d87956bb5f798ef42cffa754e3e6b9c7e0fb9e0f00dd3ce18f djbdns-1.0.5-datadir.patch 2918 +MD5 ac799440bacc9d283e1c228f84cf99d4 djbdns-1.04-fwdzone.patch 6479 +RMD160 99dc685d2f8ec7d7fccafc003cd406e6ec59419d djbdns-1.04-fwdzone.patch 6479 +SHA256 6a77f613e2df6fe51d99bce8a5c092ddedf6eb4205b5e8222a998951448562c9 djbdns-1.04-fwdzone.patch 6479 +MD5 3b59e08b6e9d2c5538762ee60c286867 djbdns-1.05-multi_tinydns_data.patch 1616 +RMD160 805af99dab036084489c066747f2b42de2e747ce djbdns-1.05-multi_tinydns_data.patch 1616 +SHA256 6137e58853e3686576095c26498db3a23b03c59edf9791a97d1aaea0844d0093 djbdns-1.05-multi_tinydns_data.patch 1616 +MD5 d5c05ae75add84094d45a78a67ab925d djbdns-1.05-multiip.diff 5522 +RMD160 2c60f2fbed9410106ead6b007897c34690a5072f djbdns-1.05-multiip.diff 5522 +SHA256 115a66dcfd8d5e7daa095eb2643f33628d495d3da798ffd0ab1a96f001c3f294 djbdns-1.05-multiip.diff 5522 +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 +MD5 847766cb1b2fd57eb0cd97ac44b763c7 dnscache-cname-handling.patch 7569 +RMD160 481243ff63c79488cc971128d7cf1d40c9b8ebc8 dnscache-cname-handling.patch 7569 +SHA256 41899b9991e457681adb1ef03675ad8a56e8c8d5d755bb8995e6448f793f2b43 dnscache-cname-handling.patch 7569 +MD5 9ff9c640a746331bcb0901d21a0c0e4f dnscache-multiple-ip.patch 7601 +RMD160 5061d1c545f66efe9cf2158e6edda613dce79f8e dnscache-multiple-ip.patch 7601 +SHA256 793847ed60043407e5dd60e2db0a078d9b444b8a6ac24bb0cf4a56177dcc78a3 dnscache-multiple-ip.patch 7601 +MD5 19ad277c5df34c0d2190fefefc1a98f3 dnscache-strict-forwardonly.patch 1768 +RMD160 92c09aae2d5d8ec96a446620afb0e5fbb3fae4c6 dnscache-strict-forwardonly.patch 1768 +SHA256 42a01e292523e82a0443ac14de9d46f824221cec0859dfd710ced4145bdfee1a dnscache-strict-forwardonly.patch 1768 +MD5 4c8558be4c763b039de9211368c01b06 round-robin.patch 3239 +RMD160 e3a4e5b9965cf10adf91e2be931372f19ecc0bd6 round-robin.patch 3239 +SHA256 fbc1473e54df406105aa8f2a47e794abed6d2810402415a8b9ca0f7dde278f5f round-robin.patch 3239 +MD5 ef1b5cfe7a6f90e4ed8b342e4f4f1ded tinydns-alias-chain-truncation.patch 1994 +RMD160 dc3f6da0ed12f7eed39e776a61b2ea8ee6b78556 tinydns-alias-chain-truncation.patch 1994 +SHA256 d05af61040451fda1cb2110166c8fdf6244452fe6a2ff38c648a9d695d40f3cb tinydns-alias-chain-truncation.patch 1994 +MD5 219cb6b75878d7a7b9500a6e3ded154f tinydns-data-semantic-error.patch 5096 +RMD160 a57c1a3262f5b71ca7b0fdfdb644cbb9a92abb8a tinydns-data-semantic-error.patch 5096 +SHA256 7df84f315df230c8951ce0b577c90a8f5d2cd98cc7e6ef820b4e48ff30c12d40 tinydns-data-semantic-error.patch 5096 |