From 8ed9055afb834e762117e5184991189e1fd894da Mon Sep 17 00:00:00 2001 From: Maik Schreiber Date: Sat, 19 Oct 2002 23:07:28 +0000 Subject: [PATCH] cleanup; removed removal of users --- net-dns/djbdns/ChangeLog | 19 +++++++------ net-dns/djbdns/djbdns-1.05-r3.ebuild | 41 +++++++++++++-------------- net-dns/djbdns/djbdns-1.05-r4.ebuild | 42 +++++++++++++--------------- 3 files changed, 50 insertions(+), 52 deletions(-) diff --git a/net-dns/djbdns/ChangeLog b/net-dns/djbdns/ChangeLog index 1629fe036158..9fee754d8367 100644 --- a/net-dns/djbdns/ChangeLog +++ b/net-dns/djbdns/ChangeLog @@ -1,17 +1,20 @@ # ChangeLog for net-dns/djbdns # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.5 2002/10/19 19:38:39 jhhudso Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.6 2002/10/19 23:07:28 blizzy Exp $ - 19 Oct 2002: Jared Hudson .ebuild: changed KEYWORDS to - use ~arch for all supported architectures. This is to last until after the - freeze. + 20 Oct 2002; Maik Schreiber djbdns-1.05-r3.ebuild, + djbdns-1.05-r4.ebuild: Cleaned up ebuilds. Also removed removal of + djbdns users, since this can break your djbdns setup when updating. + + 19 Oct 2002; Jared Hudson djbdns-1.05-r4.ebuild: + changed KEYWORDS to use ~arch for all supported architectures. This is to + last until after the freeze. *djbdns-1.05-r4 (18 Oct 2002) - 18 Oct 2002; Jared Hudson .ebuild: Added a patch to - enable using dnscache to perform resolution or forwarding according to the - query zone. This was in response to bug #9154. Credit goes to Stefano - Scipioni. + 18 Oct 2002; Jared Hudson : Added a patch to enable + using dnscache to perform resolution or forwarding according to the query + zone. This was in response to bug #9154. Credit goes to Stefano Scipioni. 10 Sep 2002; Daniel Robbins : djbdns-1.05-r3: fixed unpack() and made the ipv6 patch dependent upon the setting of the ipv6 USE variable. No diff --git a/net-dns/djbdns/djbdns-1.05-r3.ebuild b/net-dns/djbdns/djbdns-1.05-r3.ebuild index f19d4b70595c..a61342edcd68 100644 --- a/net-dns/djbdns/djbdns-1.05-r3.ebuild +++ b/net-dns/djbdns/djbdns-1.05-r3.ebuild @@ -1,25 +1,29 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r3.ebuild,v 1.7 2002/10/05 05:39:18 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r3.ebuild,v 1.8 2002/10/19 23:07:28 blizzy Exp $ -IUSE="ipv6" - -S=${WORKDIR}/${P} DESCRIPTION="Excellent high-performance DNS services" -SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz ipv6? http://www.fefe.de/dns/djbdns-1.05-test17.diff.bz2" +SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz + ipv6? http://www.fefe.de/dns/djbdns-1.05-test17.diff.bz2" HOMEPAGE="http://cr.yp.to/djbdns.html" - LICENSE="as-is" KEYWORDS="x86 sparc sparc64" SLOT="0" +IUSE="ipv6" DEPEND="virtual/glibc" -RDEPEND=">=sys-apps/daemontools-0.70 +RDEPEND="${DEPEND} + >=sys-apps/daemontools-0.70 sys-apps/ucspi-tcp" +S="${WORKDIR}/${P}" + src_unpack() { unpack ${P}.tar.gz - use ipv6 && { bzcat ${DISTDIR}/djbdns-1.05-test17.diff.bz2 | patch -d ${S} -p1 || die "Failed to apply the ipv6 patch"; } + if [ `use ipv6` ] ; then + bzcat ${DISTDIR}/djbdns-1.05-test17.diff.bz2 | \ + patch -d ${S} -p1 || die "Failed to apply the ipv6 patch" + fi } src_compile() { @@ -41,23 +45,16 @@ src_install() { dobin ${FILESDIR}/dnscache-setup dobin ${FILESDIR}/tinydns-setup - } pkg_postinst() { - groupadd nofiles - id dnscache || useradd -g nofiles -d /nonexistent -s /bin/false dnscache - id dnslog || useradd -g nofiles -d /nonexistent -s /bin/false dnslog - id tinydns || useradd -g nofiles -d /nonexistent -s /bin/false tinydns + groupadd &>/dev/null nofiles + id &>/dev/null dnscache || \ + useradd -g nofiles -d /nonexistent -s /bin/false dnscache + id &>/dev/null dnslog || \ + useradd -g nofiles -d /nonexistent -s /bin/false dnslog + id &>/dev/null tinydns || \ + useradd -g nofiles -d /nonexistent -s /bin/false tinydns - echo einfo "Use dnscache-setup and tinydns-setup to help you configure your nameservers!" - echo -} - -pkg_postrm() { - userdel dnscache - userdel dnslog - userdel tinydns } - diff --git a/net-dns/djbdns/djbdns-1.05-r4.ebuild b/net-dns/djbdns/djbdns-1.05-r4.ebuild index e95ae0c96abc..939eae9aa34a 100644 --- a/net-dns/djbdns/djbdns-1.05-r4.ebuild +++ b/net-dns/djbdns/djbdns-1.05-r4.ebuild @@ -1,25 +1,30 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r4.ebuild,v 1.2 2002/10/19 19:38:39 jhhudso Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r4.ebuild,v 1.3 2002/10/19 23:07:28 blizzy Exp $ -IUSE="ipv6" - -S=${WORKDIR}/${P} DESCRIPTION="Excellent high-performance DNS services" -SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz ipv6? http://www.fefe.de/dns/djbdns-1.05-test17.diff.bz2 http://www.skarnet.org/software/djbdns-fwdzone/djbdns-1.04-fwdzone.patch" +SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz + ipv6? http://www.fefe.de/dns/djbdns-1.05-test17.diff.bz2 + http://www.skarnet.org/software/djbdns-fwdzone/djbdns-1.04-fwdzone.patch" HOMEPAGE="http://cr.yp.to/djbdns.html" - LICENSE="as-is" KEYWORDS="~x86 ~sparc ~sparc64" SLOT="0" +IUSE="ipv6" DEPEND="virtual/glibc" -RDEPEND=">=sys-apps/daemontools-0.70 +RDEPEND="${DEPEND} + >=sys-apps/daemontools-0.70 sys-apps/ucspi-tcp" +S="${WORKDIR}/${P}" + src_unpack() { unpack ${P}.tar.gz - use ipv6 && { bzcat ${DISTDIR}/djbdns-1.05-test17.diff.bz2 | patch -d ${S} -p1 || die "Failed to apply the ipv6 patch"; } + if [ `use ipv6` ] ; then + bzcat ${DISTDIR}/djbdns-1.05-test17.diff.bz2 | \ + patch -d ${S} -p1 || die "Failed to apply the ipv6 patch" + fi patch -d ${S} -p1 < ${DISTDIR}/djbdns-1.04-fwdzone.patch } @@ -42,23 +47,16 @@ src_install() { dobin ${FILESDIR}/dnscache-setup dobin ${FILESDIR}/tinydns-setup - } pkg_postinst() { - groupadd nofiles - id dnscache || useradd -g nofiles -d /nonexistent -s /bin/false dnscache - id dnslog || useradd -g nofiles -d /nonexistent -s /bin/false dnslog - id tinydns || useradd -g nofiles -d /nonexistent -s /bin/false tinydns + groupadd &>/dev/null nofiles + id &>/dev/null dnscache || \ + useradd -g nofiles -d /nonexistent -s /bin/false dnscache + id &>/dev/null dnslog || \ + useradd -g nofiles -d /nonexistent -s /bin/false dnslog + id &>/dev/null tinydns || \ + useradd -g nofiles -d /nonexistent -s /bin/false tinydns - echo einfo "Use dnscache-setup and tinydns-setup to help you configure your nameservers!" - echo -} - -pkg_postrm() { - userdel dnscache - userdel dnslog - userdel tinydns } - -- 2.26.2