Version bump.

(Portage version: 2.0.51-r15)

8 files changed, 251 insertions, 3 deletions

diff --git a/app-admin/usermin/ChangeLog b/app-admin/usermin/ChangeLog
index 7547c205696f..e73350dc80d2 100644
--- a/app-admin/usermin/ChangeLog
+++ b/app-admin/usermin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/usermin
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.48 2005/01/16 14:11:28 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.49 2005/01/27 10:35:29 eradicator Exp $
+
+*usermin-1.110 (27 Jan 2005)
+
+  27 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +usermin-1.110.ebuild:
+  Version bump.
 
   16 Jan 2005; Guy Martin <gmsoft@gentoo.org> usermin-1.100-r1.ebuild:
   Stable on hppa.
diff --git a/app-admin/usermin/Manifest b/app-admin/usermin/Manifest
index 16b6cd34d95c..cc1d552e55ee 100644
--- a/app-admin/usermin/Manifest
+++ b/app-admin/usermin/Manifest
@@ -3,6 +3,7 @@ MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
 MD5 6ec8ad8e6b2690a219e62d9b52ee8577 usermin-1.090.ebuild 2224
 MD5 ad15e1b450f84c0a29fd65edb0c7c6f7 usermin-1.100-r1.ebuild 2520
 MD5 ed352920c6cae2b2f75de6313fbdbca5 usermin-1.100.ebuild 2292
+MD5 ad15e1b450f84c0a29fd65edb0c7c6f7 usermin-1.110.ebuild 2520
 MD5 4a8c93084becc5ae5beb4488282df537 files/digest-usermin-1.090 66
 MD5 b3ae782d361d5f450212191c25bf4623 files/digest-usermin-1.100 66
 MD5 b3ae782d361d5f450212191c25bf4623 files/digest-usermin-1.100-r1 66
@@ -10,3 +11,4 @@ MD5 1a376ef687089bf1d727a6b403a17627 files/init.d.usermin 822
 MD5 bd4b2cc177b4fb7b0f96edc60008a6b5 files/usermin-1.080-safestop.patch 620
 MD5 e93705fc1a8b2d9410a920a777890624 files/usermin-1.100-setup-nocheck.patch 951
 MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/usermin.pam 431
+MD5 397fe538ed67636d61c7e6fd286d0da1 files/digest-usermin-1.110 66
diff --git a/app-admin/usermin/files/digest-usermin-1.110 b/app-admin/usermin/files/digest-usermin-1.110
new file mode 100644
index 000000000000..11c5eee3efc0
--- /dev/null
+++ b/app-admin/usermin/files/digest-usermin-1.110
@@ -0,0 +1 @@
+MD5 2b00902ef3376739fad99de29092010b usermin-1.110.tar.gz 2251310
diff --git a/app-admin/usermin/usermin-1.110.ebuild b/app-admin/usermin/usermin-1.110.ebuild
new file mode 100644
index 000000000000..a27bd19e0557
--- /dev/null
+++ b/app-admin/usermin/usermin-1.110.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.110.ebuild,v 1.1 2005/01/27 10:35:29 eradicator Exp $
+
+IUSE="ssl"
+
+inherit eutils
+
+DESCRIPTION="a web-based user administration interface"
+HOMEPAGE="http://www.webmin.com/index6.html"
+SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="dev-lang/perl"
+
+RDEPEND="${DEPEND}
+	 sys-apps/lsof
+	 >=sys-apps/sed-4
+	 dev-perl/Authen-PAM
+	 ssl? ( dev-perl/Net-SSLeay )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# Point to the correct mysql location
+	sed -i "s:/usr/local/mysql:/usr:g" mysql/config
+
+	# Bug #46273... missing config for gentoo
+	cp quota/generic-linux-lib.pl quota/gentoo-linux-lib.p
+
+	epatch ${FILESDIR}/${PN}-1.080-safestop.patch
+	epatch ${FILESDIR}/${PN}-1.100-setup-nocheck.patch
+}
+
+src_install() {
+	# Change /usr/local/bin/perl references
+	find . -type f | xargs sed -i 's:^#!.*/usr/local/bin/perl:#!/usr/bin/perl:'
+
+	dodir /usr/libexec/usermin
+	cp -a * ${D}/usr/libexec/usermin
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/init.d.usermin usermin
+
+	insinto /etc/pam.d
+	newins ${FILESDIR}/${PN}.pam ${PN}
+
+	# Fix ownership
+	chown -R root:root ${D}
+
+	dodir /etc/usermin
+	dodir /var/log/usermin
+
+	config_dir=${D}/etc/usermin
+	var_dir=${D}/var/log/usermin
+	perl=${ROOT}/usr/bin/perl
+	autoos=1
+	port=20000
+	login=root
+	crypt="XXX"
+	host=`hostname`
+	use ssl && ssl=1 || ssl=0
+	atboot=0
+	nostart=1
+	nochown=1
+	autothird=1
+	nouninstall=1
+	noperlpath=1
+	tempdir="${T}"
+	export config_dir var_dir perl autoos port login crypt host ssl nochown autothird nouninstall nostart noperlpath tempdir
+	${D}/usr/libexec/usermin/setup.sh > ${T}/usermin-setup.out 2>&1 || die "Failed to create initial usermin configuration."
+
+	# Fixup the config files to use their real locations
+	sed -i 's:^pidfile=.*$:pidfile=${ROOT}/var/run/usermin.pid:' ${D}/etc/usermin/miniserv.conf
+	find ${D}/etc/usermin -type f -exec sed -i "s:${D}:${ROOT}:g" {} \;
+
+	# Cleanup from the config script
+	rm -rf ${D}/var/log/usermin
+	keepdir /var/log/usermin/
+}
+
+pkg_postinst() {
+	local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
+	dosed "s/root:XXX/root:${crypt}/" /etc/usermin/miniserv.users
+	einfo "To make usermin start at boot time, run: 'rc-update add usermin default'."
+	einfo "Point your web browser to http://localhost:20000 to use usermin."
+}
+
+pkg_prerm() {
+	${ROOT}/etc/init.d/usermin stop >& /dev/null
+}
diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index ead555420547..74c502c7582a 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/webmin
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.73 2005/01/16 14:12:35 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.74 2005/01/27 10:34:48 eradicator Exp $
+
+*webmin-1.180 (27 Jan 2005)
+
+  27 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +webmin-1.180.ebuild:
+  Version bump.
 
   16 Jan 2005; Guy Martin <gmsoft@gentoo.org> webmin-1.170-r3.ebuild:
   Stable on hppa.
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index 49305ce3ecca..01590d58cedd 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,8 +1,9 @@
 MD5 dcc7277c3abf66d7a1ed09a6c4c1baab ChangeLog 10605
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
 MD5 e626ba52c08958842e196639ca78255e webmin-1.160.ebuild 2689
-MD5 71f6129acd61d2e8309c7d4c3e962659 webmin-1.170.ebuild 2697
 MD5 7ac441337fea4ce9393f6a524237f712 webmin-1.170-r3.ebuild 3716
+MD5 71f6129acd61d2e8309c7d4c3e962659 webmin-1.170.ebuild 2697
+MD5 3588c66d16536fec94aefc211f4091d5 webmin-1.180.ebuild 3716
 MD5 17e9cccc95647ba080bd69785db85ac1 files/digest-webmin-1.160 137
 MD5 58f9530c780e652271313555858ad909 files/digest-webmin-1.170 138
 MD5 6d9dfc76f788500ff3c85cbb42667487 files/digest-webmin-1.170-r3 209
@@ -18,3 +19,4 @@ MD5 0ebd73f1cd5948ec1c3532a2f59f2c53 files/webmin-1.170-postfix.patch 868
 MD5 512204473654b6eb41308d3319ba6144 files/webmin-1.170-setup-nocheck.patch 943
 MD5 e7e3780c0bf03968b380535064c54213 files/webmin-gentoo-init 859
 MD5 7d80c86adbd36eeb8f220b9efdd30819 files/webmin-pam 101
+MD5 9db341f830f20e20fbe9d74781fbdff6 files/digest-webmin-1.180 209
diff --git a/app-admin/webmin/files/digest-webmin-1.180 b/app-admin/webmin/files/digest-webmin-1.180
new file mode 100644
index 000000000000..35c2caedace8
--- /dev/null
+++ b/app-admin/webmin/files/digest-webmin-1.180
@@ -0,0 +1,3 @@
+MD5 0ea145ee971cb387148d270f77ba5ef0 webmin-1.180-minimal.tar.gz 1056636
+MD5 bce184bd1f22841c69e1773b18a72b3b webmin-1.180.tar.gz 7461621
+MD5 37f5f19f125d9115183f70d9804b53ee virtual-server-2.40.wbm.gz 205384
diff --git a/app-admin/webmin/webmin-1.180.ebuild b/app-admin/webmin/webmin-1.180.ebuild
new file mode 100644
index 000000000000..1260e8c839ff
--- /dev/null
+++ b/app-admin/webmin/webmin-1.180.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.180.ebuild,v 1.1 2005/01/27 10:34:48 eradicator Exp $
+
+IUSE="ssl apache2 webmin-minimal"
+
+inherit eutils
+
+VM_V="2.40"
+
+DESCRIPTION="Webmin, a web-based system administration interface"
+HOMEPAGE="http://www.webmin.com/"
+SRC_URI="webmin-minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
+	 !webmin-minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz
+	                   http://www.webmin.com/download/virtualmin/virtual-server-${VM_V}.wbm.gz )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~mips"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	 ssl? ( dev-perl/Net-SSLeay )
+	 dev-perl/XML-Generator"
+
+src_unpack() {
+	unpack ${A}
+
+	# in webmin-minimal webalizer and apache2 are not present
+	if ! use webmin-minimal ; then
+		cd ${S}
+		# Bug #47020
+		epatch ${FILESDIR}/${PN}-1.130-webalizer.patch
+
+		# Bug #50810, #51943
+		if use apache2; then
+			epatch ${FILESDIR}/${PN}-1.140-apache2.patch
+		fi
+
+		# Postfix should modify the last entry of the maps file
+		epatch ${FILESDIR}/${PN}-1.170-postfix.patch
+
+		mv ${WORKDIR}/virtual-server-${VM_V}.wbm ${T}/vs.tar
+		tar -xf ${T}/vs.tar
+
+		# Don't create ${HOME}/cgi-bin on new accounts
+		epatch ${FILESDIR}/virtual-server-2.31-nocgibin.patch
+
+		# Check if a newly added IP is already active
+		epatch ${FILESDIR}/virtual-server-2.31-checkip.patch
+
+		# Verify Postgres usernames
+		epatch ${FILESDIR}/virtual-server-2.31-pgsql.patch
+
+		# Fix some all name virtual items
+		epatch ${FILESDIR}/virtual-server-2.31-namevirtual.patch
+	fi
+
+	epatch ${FILESDIR}/${PN}-1.170-setup-nocheck.patch
+}
+
+src_install() {
+	rm -f mount/freebsd-mounts*
+	rm -f mount/openbsd-mounts*
+	rm -f mount/macos-mounts*
+	(find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
+	dodir /usr/libexec/webmin
+	dodir /etc/init.d
+	dodir /var
+	dodir /etc/pam.d
+	cp -rp * ${D}/usr/libexec/webmin
+
+	# in webmin-minimal openslp is not present
+	if [ ! -f "${D}/usr/libexec/webmin/openslp/config-gentoo-linux" ] ; then
+		cp ${D}/usr/libexec/webmin/openslp/config \
+			${D}/usr/libexec/webmin/openslp/config-gentoo-linux
+	fi
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/init.d.webmin webmin
+
+	insinto /etc/pam.d/
+	newins ${FILESDIR}/webmin-pam webmin
+	echo gentoo > ${D}/usr/libexec/webmin/install-type
+
+	# Fix ownership
+	chown -R root:root ${D}
+
+	dodir /etc/webmin
+	dodir /var/log/webmin
+
+	config_dir=${D}/etc/webmin
+	var_dir=${D}/var/log/webmin
+	perl=${ROOT}/usr/bin/perl
+	autoos=1
+	port=10000
+	login=root
+	crypt="XXX"
+	host=`hostname`
+	use ssl && ssl=1 || ssl=0
+	atboot=0
+	nostart=1
+	nochown=1
+	autothird=1
+	nouninstall=1
+	noperlpath=1
+	tempdir="${T}"
+	export config_dir var_dir perl autoos port login crypt host ssl nochown autothird nouninstall nostart noperlpath tempdir
+	${D}/usr/libexec/webmin/setup.sh > ${T}/webmin-setup.out 2>&1 || die "Failed to create initial webmin configuration."
+
+	# Fixup the config files to use their real locations
+	sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' ${D}/etc/webmin/miniserv.conf
+	find ${D}/etc/webmin -type f -exec sed -i "s:${D}:${ROOT}:g" {} \;
+
+	# Cleanup from the config script
+	rm -rf ${D}/var/log/webmin
+	keepdir /var/log/webmin/
+}
+
+pkg_postinst() {
+	local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
+	crypt=${crypt//\\/\\\\}
+	crypt=${crypt//\//\\\/}
+	sed -i "s/root:XXX/root:${crypt}/" /etc/webmin/miniserv.users
+
+	einfo "To make webmin start at boot time, run: 'rc-update add webmin default'."
+	einfo "Point your web browser to http://localhost:10000 to use webmin."
+}
+
+pkg_prerm() {
+	${ROOT}/etc/init.d/webmin stop >& /dev/null
+}