Version bump to 1.10.1 in the stable series. This should close bug #50177 and #53089. Tidied the ebuilds a bit as part of bug #43039.

8 files changed, 136 insertions, 40 deletions

diff --git a/net-news/leafnode/ChangeLog b/net-news/leafnode/ChangeLog
index 87b2b2e18bb9..e8c621df2c9a 100644
--- a/net-news/leafnode/ChangeLog
+++ b/net-news/leafnode/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-news/leafnode
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/leafnode/ChangeLog,v 1.29 2004/06/25 00:25:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/leafnode/ChangeLog,v 1.30 2004/06/28 22:45:31 swegener Exp $
+
+*leafnode-1.10.1 (29 Jun 2004)
+
+  29 Jun 2004; Sven Wegener <swegener@gentoo.org> files/fetchnews.cron,
+  files/texpire.cron, +leafnode-1.10.1.ebuild, leafnode-1.9.49.ebuild,
+  leafnode-1.9.50.ebuild:
+  Version bump to 1.10.1 in the stable series. This should close bug #50177
+  (leafnode 1.9.19 to 1.9.52 doesn't recover from dupes in some groups) and
+  #53089 (Leafnode 1.9.54 ebuild, fixes memory leak). Thanks to Dirk-Lueder
+  Kreie <deelkar@gmx.de> for both reports. Tidied the ebuilds a bit as part of
+  bug #43039.
 
   19 Jun 2004; Sven Wegener <swegener@gentoo.org> +metadata.xml:
   Added metadata.xml
diff --git a/net-news/leafnode/Manifest b/net-news/leafnode/Manifest
index a4f37335f390..5a2b8d354557 100644
--- a/net-news/leafnode/Manifest
+++ b/net-news/leafnode/Manifest
@@ -1,11 +1,13 @@
-MD5 0d8cb30cb2eeae1bd1fde7dbe245bc8c leafnode-1.9.49.ebuild 1911
+MD5 9da72ab9d19b9c3cc28f391671eff3ca leafnode-1.9.49.ebuild 1986
+MD5 ad07bab1d4cc67965c2a7a8f4f9223d6 leafnode-1.9.50.ebuild 1994
 MD5 5fe7815d04d89408eec786d23ecc30c1 leafnode-2.0.0_alpha20040206.ebuild 2454
-MD5 b7b381ce06117bdbb5e7d9d8ee45ff74 leafnode-1.9.50.ebuild 1919
-MD5 73c53276e23b6b10118eb5e3f7ad6ee9 ChangeLog 5527
 MD5 d4764f5c17f5e0b416f7ddf271c77d71 metadata.xml 161
-MD5 510836c882c3365d0441ba7d8854ba6b files/leafnode.xinetd 230
-MD5 c9e3a9028be25e8e193bccd6a72179f0 files/fetchnews.cron 179
+MD5 79b5d2fdce4d9983f72699141d4b28a3 leafnode-1.10.1.ebuild 1935
+MD5 ea48f8c961c75b752d64d66bb09ac08a ChangeLog 6050
 MD5 55746f46949f232f8cc02f902f807b08 files/digest-leafnode-1.9.49 72
 MD5 b6867235b6efd8bf05a2734ee5432667 files/digest-leafnode-1.9.50 72
 MD5 9b1f84bee84104e123b7aea75bc282ab files/digest-leafnode-2.0.0_alpha20040206 82
-MD5 2f9497c399cca56885460b88ee53da0b files/texpire.cron 159
+MD5 5909cb0566e88e7694e85246c78fe4ff files/fetchnews.cron 177
+MD5 510836c882c3365d0441ba7d8854ba6b files/leafnode.xinetd 230
+MD5 72cc5e849b413ec0cf288a65980dd3b5 files/texpire.cron 158
+MD5 3821841ecf37466cd3630872cb7f0c7d files/digest-leafnode-1.10.1 72
diff --git a/net-news/leafnode/files/digest-leafnode-1.10.1 b/net-news/leafnode/files/digest-leafnode-1.10.1
new file mode 100644
index 000000000000..6c8cedf6287d
--- /dev/null
+++ b/net-news/leafnode/files/digest-leafnode-1.10.1
@@ -0,0 +1 @@
+MD5 7cf9a927888bb833375771af396a5d74 leafnode-1.10.1.rel.tar.bz2 384126
diff --git a/net-news/leafnode/files/fetchnews.cron b/net-news/leafnode/files/fetchnews.cron
index 44c196a56c5d..cd4569e6d656 100644
--- a/net-news/leafnode/files/fetchnews.cron
+++ b/net-news/leafnode/files/fetchnews.cron
@@ -7,6 +7,4 @@
 # This is part of the leafnode package.
 #
 
-
 #/usr/sbin/fetchnews 
-
diff --git a/net-news/leafnode/files/texpire.cron b/net-news/leafnode/files/texpire.cron
index 6b4540e5fd55..643da1ee9000 100644
--- a/net-news/leafnode/files/texpire.cron
+++ b/net-news/leafnode/files/texpire.cron
@@ -8,4 +8,3 @@
 #
 
 #/usr/sbin/texpire
-
diff --git a/net-news/leafnode/leafnode-1.10.1.ebuild b/net-news/leafnode/leafnode-1.10.1.ebuild
new file mode 100644
index 000000000000..97ba74ff2266
--- /dev/null
+++ b/net-news/leafnode/leafnode-1.10.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-news/leafnode/leafnode-1.10.1.ebuild,v 1.1 2004/06/28 22:45:31 swegener Exp $
+
+MY_P=${P}.rel
+
+DESCRIPTION="A USENET software package designed for small sites"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+RESTRICT="nomirror"
+HOMEPAGE="http://leafnode.sourceforge.net/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
+IUSE="ipv6"
+
+DEPEND=">=dev-libs/libpcre-3.9"
+RDEPEND="${DEPEND}
+	virtual/inetd"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	econf \
+		--sysconfdir=/etc/leafnode \
+		--localstatedir=/var \
+		--with-spooldir=/var/spool/news \
+		$(use_with ipv6) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+
+	# remove the spool dirs -- put them back in during pkg_postinst, so that
+	# they don't get removed during an unmerge or upgrade
+	rm -rf ${D}/var/spool
+
+	# add .keep file to /var/lock/news to avoid ebuild to ignore the empty dir
+	keepdir /var/lock/news
+
+	insinto /etc/xinetd.d
+	newins ${FILESDIR}/leafnode.xinetd leafnode-nntp
+
+	exeinto /etc/cron.hourly
+	doexe ${FILESDIR}/fetchnews.cron
+	exeinto /etc/cron.daily
+	doexe ${FILESDIR}/texpire.cron
+
+	dodoc \
+		COPYING* CREDITS ChangeLog FAQ.txt FAQ.pdf INSTALL NEWS \
+		TODO README.FIRST README-daemontools UNINSTALL-daemontools \
+		README README-MAINTAINER README-FQDN
+	dohtml FAQ.html FAQ.xml README-FQDN.html
+}
+
+pkg_postinst() {
+	mkdir -p ${ROOT}/var/spool/news/{leaf.node,failed.postings,interesting.groups,out.going}
+	mkdir -p ${ROOT}/var/spool/news/message.id/{0,1,2,3,4,5,6,7,8,9}{0,1,2,3,4,5,6,7,8,9}{0,1,2,3,4,5,6,7,8,9}
+	chown -R news:news ${ROOT}/var/spool/news
+
+	mkdir -p ${ROOT}/var/lib/news
+	chown -R news:news ${ROOT}/var/lib/news
+
+	zcat ${ROOT}/usr/share/doc/${PF}/README.FIRST.gz | while read line ;
+	do
+		einfo $line
+	done
+}
diff --git a/net-news/leafnode/leafnode-1.9.49.ebuild b/net-news/leafnode/leafnode-1.9.49.ebuild
index 69ca7c89eea9..9799bb80d28b 100644
--- a/net-news/leafnode/leafnode-1.9.49.ebuild
+++ b/net-news/leafnode/leafnode-1.9.49.ebuild
@@ -1,19 +1,24 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/leafnode/leafnode-1.9.49.ebuild,v 1.6 2004/06/25 00:25:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/leafnode/leafnode-1.9.49.ebuild,v 1.7 2004/06/28 22:45:31 swegener Exp $
+
+MY_P=${P}.rel
 
-S=${WORKDIR}/${P}.rel
 DESCRIPTION="A USENET software package designed for small sites"
-SRC_URI="mirror://sourceforge/leafnode/${P}.rel.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 RESTRICT="nomirror"
 HOMEPAGE="http://leafnode.sourceforge.net/"
-DEPEND=">=dev-libs/libpcre-3.9
-	virtual/inetd"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc"
 IUSE="ipv6"
 
+DEPEND=">=dev-libs/libpcre-3.9"
+RDEPEND="${DEPEND}
+	virtual/inetd"
+
+S=${WORKDIR}/${MY_P}
+
 src_compile() {
 	use ipv6 && myconf="--with-ipv6"
 
@@ -35,7 +40,7 @@ src_install() {
 	rm -rf ${D}/var/spool
 
 	# add .keep file to /var/lock/news to avoid ebuild to ignore the empty dir
-	keepdir /var/lock/news/
+	keepdir /var/lock/news
 
 	insinto /etc/xinetd.d
 	newins ${FILESDIR}/leafnode.xinetd leafnode-nntp
@@ -45,19 +50,22 @@ src_install() {
 	exeinto /etc/cron.daily
 	doexe ${FILESDIR}/texpire.cron
 
-	dodoc COPYING* CREDITS ChangeLog FAQ.txt FAQ.pdf INSTALL NEWS \
-	TODO README.FIRST README-daemontools UNINSTALL-daemontools \
-	README README-MAINTAINER README-FQDN PCRE_README
+	dodoc \
+		COPYING* CREDITS ChangeLog FAQ.txt FAQ.pdf INSTALL NEWS \
+		TODO README.FIRST README-daemontools UNINSTALL-daemontools \
+		README README-MAINTAINER README-FQDN PCRE_README
 	dohtml FAQ.html FAQ.xml README-FQDN.html
 }
 
 pkg_postinst() {
-	mkdir -p /var/spool/news/{leaf.node,failed.postings,interesting.groups,out.going}
-	mkdir -p /var/spool/news/message.id/{0,1,2,3,4,5,6,7,8,9}{0,1,2,3,4,5,6,7,8,9}{0,1,2,3,4,5,6,7,8,9}
-	chown -R news:news /var/spool/news
-	mkdir -p /var/lib/news
-	chown -R news:news /var/lib/news
-	zcat ${ROOT}/usr/share/doc/${P}/README_FIRST.gz | while read line ;
+	mkdir -p ${ROOT}/var/spool/news/{leaf.node,failed.postings,interesting.groups,out.going}
+	mkdir -p ${ROOT}/var/spool/news/message.id/{0,1,2,3,4,5,6,7,8,9}{0,1,2,3,4,5,6,7,8,9}{0,1,2,3,4,5,6,7,8,9}
+	chown -R news:news ${ROOT}/var/spool/news
+
+	mkdir -p ${ROOT}/var/lib/news
+	chown -R news:news ${ROOT}/var/lib/news
+
+	zcat ${ROOT}/usr/share/doc/${PF}/README.FIRST.gz | while read line ;
 	do
 		einfo $line
 	done
diff --git a/net-news/leafnode/leafnode-1.9.50.ebuild b/net-news/leafnode/leafnode-1.9.50.ebuild
index 046621867cd5..d135ac7dea8e 100644
--- a/net-news/leafnode/leafnode-1.9.50.ebuild
+++ b/net-news/leafnode/leafnode-1.9.50.ebuild
@@ -1,19 +1,24 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/leafnode/leafnode-1.9.50.ebuild,v 1.5 2004/06/25 00:25:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/leafnode/leafnode-1.9.50.ebuild,v 1.6 2004/06/28 22:45:31 swegener Exp $
+
+MY_P=${P}.rel
 
-S=${WORKDIR}/${P}.rel
 DESCRIPTION="A USENET software package designed for small sites"
-SRC_URI="mirror://sourceforge/leafnode/${P}.rel.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 RESTRICT="nomirror"
 HOMEPAGE="http://leafnode.sourceforge.net/"
-DEPEND=">=dev-libs/libpcre-3.9
-	virtual/inetd"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc"
 IUSE="ipv6"
 
+DEPEND=">=dev-libs/libpcre-3.9"
+RDEPEND="${DEPEND}
+	virtual/inetd"
+
+S=${WORKDIR}/${MY_P}
+
 src_compile() {
 	use ipv6 && myconf="--with-ipv6"
 
@@ -35,7 +40,7 @@ src_install() {
 	rm -rf ${D}/var/spool
 
 	# add .keep file to /var/lock/news to avoid ebuild to ignore the empty dir
-	keepdir /var/lock/news/
+	keepdir /var/lock/news
 
 	insinto /etc/xinetd.d
 	newins ${FILESDIR}/leafnode.xinetd leafnode-nntp
@@ -45,19 +50,22 @@ src_install() {
 	exeinto /etc/cron.daily
 	doexe ${FILESDIR}/texpire.cron
 
-	dodoc COPYING* CREDITS ChangeLog FAQ.txt FAQ.pdf INSTALL NEWS \
-	TODO README.FIRST README-daemontools UNINSTALL-daemontools \
-	README README-MAINTAINER README-FQDN PCRE_README
+	dodoc \
+		COPYING* CREDITS ChangeLog FAQ.txt FAQ.pdf INSTALL NEWS \
+		TODO README.FIRST README-daemontools UNINSTALL-daemontools \
+		README README-MAINTAINER README-FQDN PCRE_README
 	dohtml FAQ.html FAQ.xml README-FQDN.html
 }
 
 pkg_postinst() {
-	mkdir -p /var/spool/news/{leaf.node,failed.postings,interesting.groups,out.going}
-	mkdir -p /var/spool/news/message.id/{0,1,2,3,4,5,6,7,8,9}{0,1,2,3,4,5,6,7,8,9}{0,1,2,3,4,5,6,7,8,9}
-	chown -R news:news /var/spool/news
-	mkdir -p /var/lib/news
-	chown -R news:news /var/lib/news
-	zcat ${ROOT}/usr/share/doc/${P}/README_FIRST.gz | while read line ;
+	mkdir -p ${ROOT}/var/spool/news/{leaf.node,failed.postings,interesting.groups,out.going}
+	mkdir -p ${ROOT}/var/spool/news/message.id/{0,1,2,3,4,5,6,7,8,9}{0,1,2,3,4,5,6,7,8,9}{0,1,2,3,4,5,6,7,8,9}
+	chown -R news:news ${ROOT}/var/spool/news
+
+	mkdir -p ${ROOT}/var/lib/news
+	chown -R news:news ${ROOT}/var/lib/news
+
+	zcat ${ROOT}/usr/share/doc/${PF}/README.FIRST.gz | while read line ;
 	do
 		einfo $line
 	done