Old version cleanup and rev bump to fix bug #93170.

Package-Manager: portage-2.0.51.22-r1

10 files changed, 39 insertions, 174 deletions

diff --git a/app-admin/conserver/ChangeLog b/app-admin/conserver/ChangeLog
index 8e80beb0a592..b17abc054c8e 100644
--- a/app-admin/conserver/ChangeLog
+++ b/app-admin/conserver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/conserver
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/ChangeLog,v 1.35 2005/05/21 23:21:58 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/ChangeLog,v 1.36 2005/05/21 23:27:38 weeve Exp $
+
+*conserver-8.1.11-r1 (21 May 2005)
+
+  21 May 2005; Jason Wever <weeve@gentoo.org> +files/conserver.pam-include,
+  -conserver-8.1.1.ebuild, -conserver-8.1.8.ebuild,
+  -conserver-8.1.10.ebuild, +conserver-8.1.11-r1.ebuild:
+  Old version cleanup and rev bump to fix bug #93170.
 
   21 May 2005; Bryan Østergaard <kloeri@gentoo.org> ChangeLog:
   Stable on ia64.
diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index da0be83cfa6d..97fcb3652d13 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -1,15 +1,12 @@
-MD5 fc114419c1f95d55ed3af28e929dfb37 conserver-8.1.10.ebuild 2150
+MD5 7f6d03fef5412263d70b054daf7a6a8d ChangeLog 5501
 MD5 e4fbbf5cdcde8513f588bd52c6e7b184 conserver-8.1.5.ebuild 1975
 MD5 d4a8757dd8fd8e596cc1e76d38ce8181 conserver-8.1.11.ebuild 2150
-MD5 46210750178f717e7314f2f927c44588 ChangeLog 5226
-MD5 dc37eac9bbee69a9a6f92f35872351cb conserver-8.1.1.ebuild 1971
 MD5 db109ae3e620120b654118ff198a9d0a metadata.xml 1062
-MD5 36c6ed72379e41a9ec873993569b9d63 conserver-8.1.8.ebuild 2108
-MD5 9350f4c960a6d72a525857cd3ad5b1a6 files/digest-conserver-8.1.11 68
-MD5 611485ef78db44224bff6e885197badd files/digest-conserver-8.1.1 67
-MD5 f5a67a54ac210a8747b3790d28589f1d files/digest-conserver-8.1.5 67
-MD5 e6536a2c28149055c5977fe40584ff32 files/digest-conserver-8.1.10 68
+MD5 a27ffb50fc4742df4463681cb5708fc6 conserver-8.1.11-r1.ebuild 2115
 MD5 a42dde46eb6704092cf513ff732d8b43 files/conserver.confd 288
-MD5 b61fccef29d9e2e5b35082791aef3fd5 files/digest-conserver-8.1.8 67
-MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/conserver.pam 431
 MD5 bc6ee1aa7fdefaa6d2f54494deb7f920 files/conserver.initd 1172
+MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/conserver.pam 431
+MD5 f5a67a54ac210a8747b3790d28589f1d files/digest-conserver-8.1.5 67
+MD5 9350f4c960a6d72a525857cd3ad5b1a6 files/digest-conserver-8.1.11 68
+MD5 4b7d75b12f1bea9f349dff4c48c18b8b files/conserver.pam-include 245
+MD5 9350f4c960a6d72a525857cd3ad5b1a6 files/digest-conserver-8.1.11-r1 68
diff --git a/app-admin/conserver/conserver-8.1.1.ebuild b/app-admin/conserver/conserver-8.1.1.ebuild
deleted file mode 100644
index b31f42ddc941..000000000000
--- a/app-admin/conserver/conserver-8.1.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/conserver-8.1.1.ebuild,v 1.6 2005/01/01 10:57:12 eradicator 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.10.ebuild b/app-admin/conserver/conserver-8.1.11-r1.ebuild
index 1521e4032010..8cb7b1a2ace1 100644
--- a/app-admin/conserver/conserver-8.1.10.ebuild
+++ b/app-admin/conserver/conserver-8.1.11-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/conserver-8.1.10.ebuild,v 1.4 2005/03/27 00:26:07 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/conserver-8.1.11-r1.ebuild,v 1.1 2005/05/21 23:27:38 weeve Exp $
 
-inherit ssl-cert
+inherit ssl-cert eutils
 
 DESCRIPTION="Serial Console Manager"
 HOMEPAGE="http://www.conserver.com/"
@@ -10,20 +10,20 @@ SRC_URI="ftp://ftp.conserver.com/conserver/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86 sparc ~alpha -ia64 ppc"
+KEYWORDS="~alpha -ia64 ~ppc ~sparc ~x86"
 IUSE="pam ssl tcpd debug"
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
-	pam? ( sys-libs/pam )
+	pam? ( virtual/pam )
 	tcpd? ( sys-apps/tcp-wrappers )
 	debug? ( dev-libs/dmalloc )"
 
 src_compile() {
 	econf \
-		`use_with ssl openssl` \
-		`use_with pam` \
-		`use_with tcpd libwrap` \
-		`use_with debug dmalloc` \
+		$(use_with ssl openssl) \
+		$(use_with pam) \
+		$(use_with tcpd libwrap) \
+		$(use_with debug dmalloc) \
 		--with-logfile=/var/log/conserver.log \
 		--with-pidfile=/var/run/conserver.pid \
 		--with-cffile=conserver/conserver.cf \
@@ -44,10 +44,8 @@ src_install() {
 	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
+	newinitd ${FILESDIR}/conserver.initd conserver
+	newconfd ${FILESDIR}/conserver.confd conserver
 
 	dodir /etc/conserver
 	fperms 700 /etc/conserver
@@ -63,7 +61,7 @@ src_install() {
 	newdoc conserver.cf/conserver.cf conserver.cf.sample
 
 	# Add pam config
-	insinto /etc/pam.d ; newins ${FILESDIR}/conserver.pam conserver
+	newpamd ${FILESDIR}/conserver.pam-include conserver
 
 	# Add certs if SSL use flag is enabled
 	if use ssl && [ ! -f /etc/ssl/conserver/conserver.key ]; then
diff --git a/app-admin/conserver/conserver-8.1.8.ebuild b/app-admin/conserver/conserver-8.1.8.ebuild
deleted file mode 100644
index a8378fbf52a8..000000000000
--- a/app-admin/conserver/conserver-8.1.8.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/conserver-8.1.8.ebuild,v 1.5 2005/01/01 10:57:12 eradicator Exp $
-
-inherit ssl-cert
-
-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 debug"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
-	pam? ( sys-libs/pam )
-	tcpd? ( sys-apps/tcp-wrappers )
-	debug? ( dev-libs/dmalloc )"
-
-src_compile() {
-	econf \
-		`use_with ssl openssl` \
-		`use_with pam` \
-		`use_with tcpd libwrap` \
-		`use_with debug dmalloc` \
-		--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
-
-	# Add certs if SSL use flag is enabled
-	if use ssl; then
-		dodir /etc/ssl/conserver
-		insinto /etc/ssl/conserver
-		docert conserver
-	fi
-}
-
-pkg_postinst() {
-	einfo "Config-file formats _changed_ with version 8.0 !"
-}
diff --git a/app-admin/conserver/files/conserver.pam-include b/app-admin/conserver/files/conserver.pam-include
new file mode 100644
index 000000000000..9d2167793cc5
--- /dev/null
+++ b/app-admin/conserver/files/conserver.pam-include
@@ -0,0 +1,12 @@
+#%PAM-1.0
+
+auth       required	pam_securetty.so
+auth       include	system-auth
+auth       required	pam_nologin.so
+
+account    include	system-auth
+
+password   include	system-auth
+
+session    include	system-auth
+session    optional	pam_console.so
diff --git a/app-admin/conserver/files/digest-conserver-8.1.1 b/app-admin/conserver/files/digest-conserver-8.1.1
deleted file mode 100644
index 472bf5b3f12f..000000000000
--- a/app-admin/conserver/files/digest-conserver-8.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d2641597713768cb62f09f1d94f95ef1 conserver-8.1.1.tar.gz 272982
diff --git a/app-admin/conserver/files/digest-conserver-8.1.10 b/app-admin/conserver/files/digest-conserver-8.1.10
deleted file mode 100644
index ae9840a84a9c..000000000000
--- a/app-admin/conserver/files/digest-conserver-8.1.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3edd13e377c0a7c760f97485a6f1f6f2 conserver-8.1.10.tar.gz 298416
diff --git a/app-admin/conserver/files/digest-conserver-8.1.11-r1 b/app-admin/conserver/files/digest-conserver-8.1.11-r1
new file mode 100644
index 000000000000..4373e52b7ef1
--- /dev/null
+++ b/app-admin/conserver/files/digest-conserver-8.1.11-r1
@@ -0,0 +1 @@
+MD5 94259cd71f38e94b3f247768e3bc731f conserver-8.1.11.tar.gz 299281
diff --git a/app-admin/conserver/files/digest-conserver-8.1.8 b/app-admin/conserver/files/digest-conserver-8.1.8
deleted file mode 100644
index d7a9e2296e28..000000000000
--- a/app-admin/conserver/files/digest-conserver-8.1.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d4aa64ead57415eea0a9a63287b8f4fa conserver-8.1.8.tar.gz 297970