Marked 8.1.9 stable on x86 and sparc, version bump for 8.1.10, and old version cleanups.

12 files changed, 22 insertions, 230 deletions

diff --git a/app-admin/conserver/ChangeLog b/app-admin/conserver/ChangeLog
index 5dc4df14e22d..0e3e877f1c09 100644
--- a/app-admin/conserver/ChangeLog
+++ b/app-admin/conserver/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/conserver
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/ChangeLog,v 1.25 2004/10/05 02:58:10 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/ChangeLog,v 1.26 2004/10/14 03:52:06 weeve Exp $
+
+*conserver-8.1.10 (13 Oct 2004)
+
+  13 Oct 2004; Jason Wever <weeve@gentoo.org> +conserver-8.1.10.ebuild,
+  -conserver-8.1.2.ebuild, -conserver-8.1.3.ebuild, -conserver-8.1.4.ebuild,
+  -conserver-8.1.7.ebuild, conserver-8.1.9.ebuild:
+  Marked 8.1.9 stable on x86 and sparc, version bump for 8.1.10, and old
+  version cleanups.
 
   05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   conserver-8.1.4.ebuild, conserver-8.1.7.ebuild, conserver-8.1.8.ebuild:
diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index dfc1a85272fd..775b272541d3 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -1,21 +1,15 @@
-MD5 e2b7b19d31bbd94785c7eccfecd737e5 ChangeLog 4007
-MD5 ad35fe1b8bc46d567199fb6aeac934a7 conserver-8.1.1.ebuild 1969
-MD5 83ed44d3f037ece42bfd1523f460af11 conserver-8.1.2.ebuild 1973
-MD5 297be44876ffa3decf0d1923842b3d34 conserver-8.1.3.ebuild 1971
-MD5 fd989e358366ff04a5354790e6dcf40f conserver-8.1.4.ebuild 1975
+MD5 af226c90957efd0e3c8236414dcc2587 ChangeLog 4331
 MD5 6756a35b0b7d00d5285cd2cb4315c27c conserver-8.1.5.ebuild 1978
-MD5 0ee525db3922bf3bfb58412aeec8e5a3 conserver-8.1.7.ebuild 2106
-MD5 c896b2acad5c9ee9e25b482628f943ae conserver-8.1.8.ebuild 2106
-MD5 abbcc70d6c3035f3a7e2140fd5385fad conserver-8.1.9.ebuild 2152
+MD5 ad35fe1b8bc46d567199fb6aeac934a7 conserver-8.1.1.ebuild 1969
 MD5 db109ae3e620120b654118ff198a9d0a metadata.xml 1062
+MD5 c896b2acad5c9ee9e25b482628f943ae conserver-8.1.8.ebuild 2106
+MD5 a1b1799c7bd74af3539d02fb961b56da conserver-8.1.9.ebuild 2149
+MD5 163f42c47362d9113fefccb2e48db4ce conserver-8.1.10.ebuild 2152
 MD5 a42dde46eb6704092cf513ff732d8b43 files/conserver.confd 288
 MD5 bc6ee1aa7fdefaa6d2f54494deb7f920 files/conserver.initd 1172
 MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/conserver.pam 431
-MD5 611485ef78db44224bff6e885197badd files/digest-conserver-8.1.1 67
-MD5 2b146020cc84cfd64a611c79f34dd35a files/digest-conserver-8.1.2 67
-MD5 464a41b88503ead0404e80b6e94fab39 files/digest-conserver-8.1.3 67
-MD5 54b542817eb15a2e19b0bc479d0fcd44 files/digest-conserver-8.1.4 67
 MD5 f5a67a54ac210a8747b3790d28589f1d files/digest-conserver-8.1.5 67
-MD5 9531bd9f4a07b6be098ee3f90b7134c5 files/digest-conserver-8.1.7 67
+MD5 611485ef78db44224bff6e885197badd files/digest-conserver-8.1.1 67
 MD5 b61fccef29d9e2e5b35082791aef3fd5 files/digest-conserver-8.1.8 67
 MD5 7ff086eca4f111c2a4962dd791270995 files/digest-conserver-8.1.9 67
+MD5 e6536a2c28149055c5977fe40584ff32 files/digest-conserver-8.1.10 68
diff --git a/app-admin/conserver/conserver-8.1.7.ebuild b/app-admin/conserver/conserver-8.1.10.ebuild
index 5d5b10b94710..9cf84afce5ac 100644
--- a/app-admin/conserver/conserver-8.1.7.ebuild
+++ b/app-admin/conserver/conserver-8.1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/conserver-8.1.7.ebuild,v 1.5 2004/10/05 02:58:10 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/conserver-8.1.10.ebuild,v 1.1 2004/10/14 03:52:06 weeve Exp $
 
 inherit ssl-cert
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.conserver.com/conserver/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86 sparc -alpha -ia64 ppc"
+KEYWORDS="~x86 ~sparc ~alpha -ia64 ~ppc"
 IUSE="pam ssl tcpd debug"
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
@@ -66,7 +66,7 @@ src_install() {
 	insinto /etc/pam.d ; newins ${FILESDIR}/conserver.pam conserver
 
 	# Add certs if SSL use flag is enabled
-	if use ssl; then
+	if use ssl && [ ! -f /etc/ssl/conserver/conserver.key ]; then
 		dodir /etc/ssl/conserver
 		insinto /etc/ssl/conserver
 		docert conserver
diff --git a/app-admin/conserver/conserver-8.1.2.ebuild b/app-admin/conserver/conserver-8.1.2.ebuild
deleted file mode 100644
index baae14448e78..000000000000
--- a/app-admin/conserver/conserver-8.1.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/conserver-8.1.2.ebuild,v 1.2 2004/06/24 21:24:24 agriffis Exp $
-
-DESCRIPTION="Serial Console Manager"
-HOMEPAGE="http://www.conserver.com/"
-SRC_URI="ftp://ftp.conserver.com/conserver/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha ~ia64"
-IUSE="pam ssl tcpd"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
-	pam? ( sys-libs/pam )
-	tcpd? ( sys-apps/tcp-wrappers )"
-
-src_compile() {
-	econf \
-		`use_with ssl openssl` \
-		`use_with pam` \
-		`use_with tcpd libwrap` \
-		--with-logfile=/var/log/conserver.log \
-		--with-pidfile=/var/run/conserver.pid \
-		--with-cffile=conserver/conserver.cf \
-		--with-pwdfile=conserver/conserver.passwd \
-		--with-master=localhost \
-		--with-port=7782 || die "./configure failed"
-
-	emake || die "compile failed"
-}
-
-src_install() {
-	einstall exampledir=${D}/usr/share/doc/${PF}/examples || die "problem with install"
-
-	## create data directory
-	dodir /var/consoles
-	fowners daemon:daemon /var/consoles
-	fperms 700 /var/consoles
-
-	## add startup and sample config
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/conserver.initd conserver
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conserver.confd conserver
-
-	dodir /etc/conserver
-	fperms 700 /etc/conserver
-	insinto /etc/conserver
-	newins ${S}/conserver.cf/conserver.cf conserver.cf.sample
-	newins ${S}/conserver.cf/conserver.passwd conserver.passwd.sample
-
-	## add docs
-	dohtml conserver.html
-	dodoc CHANGES FAQ INSTALL LICENSE README TODO
-	dodoc conserver/Sun-serial conserver.cf/INSTALL
-	dodoc contrib/maketestcerts
-	newdoc conserver.cf/conserver.cf conserver.cf.sample
-
-	# Add pam config
-	insinto /etc/pam.d ; newins ${FILESDIR}/conserver.pam conserver
-}
-
-pkg_postinst() {
-	einfo "Config-file formats _changed_ with version 8.0 !"
-	if use ssl; then
-		einfo "You will need to create certificates to use the ssl-feature."
-	fi
-}
diff --git a/app-admin/conserver/conserver-8.1.3.ebuild b/app-admin/conserver/conserver-8.1.3.ebuild
deleted file mode 100644
index 012ab2917509..000000000000
--- a/app-admin/conserver/conserver-8.1.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/conserver-8.1.3.ebuild,v 1.3 2004/06/24 21:24:24 agriffis Exp $
-
-DESCRIPTION="Serial Console Manager"
-HOMEPAGE="http://www.conserver.com/"
-SRC_URI="ftp://ftp.conserver.com/conserver/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 sparc ~alpha ~ia64"
-IUSE="pam ssl tcpd"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
-	pam? ( sys-libs/pam )
-	tcpd? ( sys-apps/tcp-wrappers )"
-
-src_compile() {
-	econf \
-		`use_with ssl openssl` \
-		`use_with pam` \
-		`use_with tcpd libwrap` \
-		--with-logfile=/var/log/conserver.log \
-		--with-pidfile=/var/run/conserver.pid \
-		--with-cffile=conserver/conserver.cf \
-		--with-pwdfile=conserver/conserver.passwd \
-		--with-master=localhost \
-		--with-port=7782 || die "./configure failed"
-
-	emake || die "compile failed"
-}
-
-src_install() {
-	einstall exampledir=${D}/usr/share/doc/${PF}/examples || die "problem with install"
-
-	## create data directory
-	dodir /var/consoles
-	fowners daemon:daemon /var/consoles
-	fperms 700 /var/consoles
-
-	## add startup and sample config
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/conserver.initd conserver
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conserver.confd conserver
-
-	dodir /etc/conserver
-	fperms 700 /etc/conserver
-	insinto /etc/conserver
-	newins ${S}/conserver.cf/conserver.cf conserver.cf.sample
-	newins ${S}/conserver.cf/conserver.passwd conserver.passwd.sample
-
-	## add docs
-	dohtml conserver.html
-	dodoc CHANGES FAQ INSTALL LICENSE README TODO
-	dodoc conserver/Sun-serial conserver.cf/INSTALL
-	dodoc contrib/maketestcerts
-	newdoc conserver.cf/conserver.cf conserver.cf.sample
-
-	# Add pam config
-	insinto /etc/pam.d ; newins ${FILESDIR}/conserver.pam conserver
-}
-
-pkg_postinst() {
-	einfo "Config-file formats _changed_ with version 8.0 !"
-	if use ssl; then
-		einfo "You will need to create certificates to use the ssl-feature."
-	fi
-}
diff --git a/app-admin/conserver/conserver-8.1.4.ebuild b/app-admin/conserver/conserver-8.1.4.ebuild
deleted file mode 100644
index 6b24ebb039fc..000000000000
--- a/app-admin/conserver/conserver-8.1.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/conserver-8.1.4.ebuild,v 1.5 2004/10/05 02:58:10 pvdabeel Exp $
-
-DESCRIPTION="Serial Console Manager"
-HOMEPAGE="http://www.conserver.com/"
-SRC_URI="ftp://ftp.conserver.com/conserver/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 sparc ~alpha ~ia64 ppc"
-IUSE="pam ssl tcpd"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
-	pam? ( sys-libs/pam )
-	tcpd? ( sys-apps/tcp-wrappers )"
-
-src_compile() {
-	econf \
-		`use_with ssl openssl` \
-		`use_with pam` \
-		`use_with tcpd libwrap` \
-		--with-logfile=/var/log/conserver.log \
-		--with-pidfile=/var/run/conserver.pid \
-		--with-cffile=conserver/conserver.cf \
-		--with-pwdfile=conserver/conserver.passwd \
-		--with-master=localhost \
-		--with-port=7782 || die "./configure failed"
-
-	emake || die "compile failed"
-}
-
-src_install() {
-	einstall exampledir=${D}/usr/share/doc/${PF}/examples || die "problem with install"
-
-	## create data directory
-	dodir /var/consoles
-	fowners daemon:daemon /var/consoles
-	fperms 700 /var/consoles
-
-	## add startup and sample config
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/conserver.initd conserver
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conserver.confd conserver
-
-	dodir /etc/conserver
-	fperms 700 /etc/conserver
-	insinto /etc/conserver
-	newins ${S}/conserver.cf/conserver.cf conserver.cf.sample
-	newins ${S}/conserver.cf/conserver.passwd conserver.passwd.sample
-
-	## add docs
-	dohtml conserver.html
-	dodoc CHANGES FAQ INSTALL LICENSE README TODO
-	dodoc conserver/Sun-serial conserver.cf/INSTALL
-	dodoc contrib/maketestcerts
-	newdoc conserver.cf/conserver.cf conserver.cf.sample
-
-	# Add pam config
-	insinto /etc/pam.d ; newins ${FILESDIR}/conserver.pam conserver
-}
-
-pkg_postinst() {
-	einfo "Config-file formats _changed_ with version 8.0 !"
-	if use ssl; then
-		einfo "You will need to create certificates to use the ssl-feature."
-	fi
-}
diff --git a/app-admin/conserver/conserver-8.1.9.ebuild b/app-admin/conserver/conserver-8.1.9.ebuild
index 7af4dbe9fc03..2943a6e06de3 100644
--- a/app-admin/conserver/conserver-8.1.9.ebuild
+++ b/app-admin/conserver/conserver-8.1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/conserver-8.1.9.ebuild,v 1.2 2004/09/13 00:11:21 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/conserver-8.1.9.ebuild,v 1.3 2004/10/14 03:52:06 weeve Exp $
 
 inherit ssl-cert
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.conserver.com/conserver/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha -ia64 ~ppc"
+KEYWORDS="x86 sparc ~alpha -ia64 ~ppc"
 IUSE="pam ssl tcpd debug"
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
diff --git a/app-admin/conserver/files/digest-conserver-8.1.10 b/app-admin/conserver/files/digest-conserver-8.1.10
new file mode 100644
index 000000000000..ae9840a84a9c
--- /dev/null
+++ b/app-admin/conserver/files/digest-conserver-8.1.10
@@ -0,0 +1 @@
+MD5 3edd13e377c0a7c760f97485a6f1f6f2 conserver-8.1.10.tar.gz 298416
diff --git a/app-admin/conserver/files/digest-conserver-8.1.2 b/app-admin/conserver/files/digest-conserver-8.1.2
deleted file mode 100644
index 8c25ec4ba02a..000000000000
--- a/app-admin/conserver/files/digest-conserver-8.1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7f53d7a0bb05ad16116fb99f17bf06f0 conserver-8.1.2.tar.gz 278449
diff --git a/app-admin/conserver/files/digest-conserver-8.1.3 b/app-admin/conserver/files/digest-conserver-8.1.3
deleted file mode 100644
index d2424868beb5..000000000000
--- a/app-admin/conserver/files/digest-conserver-8.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0283ba52fd7ff8825a5d48d66431de30 conserver-8.1.3.tar.gz 278992
diff --git a/app-admin/conserver/files/digest-conserver-8.1.4 b/app-admin/conserver/files/digest-conserver-8.1.4
deleted file mode 100644
index 29d3781fc38b..000000000000
--- a/app-admin/conserver/files/digest-conserver-8.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c8f3ff533ef22e2860afbee8228d04f7 conserver-8.1.4.tar.gz 281929
diff --git a/app-admin/conserver/files/digest-conserver-8.1.7 b/app-admin/conserver/files/digest-conserver-8.1.7
deleted file mode 100644
index 5b942e535403..000000000000
--- a/app-admin/conserver/files/digest-conserver-8.1.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9796099c4fca9f751a0ff4765288f8e4 conserver-8.1.7.tar.gz 296772