Version bump for security bug #63167.

4 files changed, 115 insertions, 4 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 89558534ec2a..957781e13bc8 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/webmin
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.58 2004/08/28 22:05:33 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.59 2004/09/09 17:28:58 eradicator Exp $
+
+*webmin-1.160 (09 Sep 2004)
+
+  09 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> +webmin-1.160.ebuild:
+  Version bump for security bug #63167.
 
   28 Aug 2004; Tom Gall <tgall@gentoo.org> webmin-1.150-r2.ebuild:
   stable on ppc64, bug #60196
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index 3515f6b35b0b..20d89b9ec397 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,13 +1,15 @@
-MD5 3709556737859e7157057637f53dda0f ChangeLog 8486
+MD5 de09f22abc321dd237521836ca2d18e8 ChangeLog 8635
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
 MD5 75a2ff756dc8f861ce298cb35c8ea9e1 webmin-1.150-r1.ebuild 2369
 MD5 7b3b67769e6852868948e4b380ede13e webmin-1.150-r2.ebuild 2689
+MD5 98bc07e4984233831b57d54f6069c59b webmin-1.160.ebuild 2687
 MD5 f19f7b11073df55b1c3db965dd6936ae webmin-1.150.ebuild 2265
-MD5 03f188f36a9989ff035a883155a82e0b files/digest-webmin-1.150 65
+MD5 0d82309f5658287f6641399d0a29db7e files/init.d.webmin 859
 MD5 03f188f36a9989ff035a883155a82e0b files/digest-webmin-1.150-r1 65
 MD5 a947adc3399bbf729d969eb087a8d63c files/digest-webmin-1.150-r2 137
-MD5 0d82309f5658287f6641399d0a29db7e files/init.d.webmin 859
+MD5 17e9cccc95647ba080bd69785db85ac1 files/digest-webmin-1.160 137
 MD5 bc8eb1c9de103599fc00b140b0ed1f9f files/uninstall.sh 260
 MD5 bb2acab90ada721c723d91a5a97c193c files/webmin-1.130-webalizer.patch 615
 MD5 a01d77a867d5469c7211685bfd04f6f6 files/webmin-1.140-apache2.patch 1227
 MD5 e7e3780c0bf03968b380535064c54213 files/webmin-gentoo-init 859
+MD5 03f188f36a9989ff035a883155a82e0b files/digest-webmin-1.150 65
diff --git a/app-admin/webmin/files/digest-webmin-1.160 b/app-admin/webmin/files/digest-webmin-1.160
new file mode 100644
index 000000000000..1edf66889cc9
--- /dev/null
+++ b/app-admin/webmin/files/digest-webmin-1.160
@@ -0,0 +1,2 @@
+MD5 bbb7a52add4b049025a2114f071d230c webmin-1.160-minimal.tar.gz 981917
+MD5 9331501abdb0c0e582be97515aa252a8 webmin-1.160.tar.gz 7518886
diff --git a/app-admin/webmin/webmin-1.160.ebuild b/app-admin/webmin/webmin-1.160.ebuild
new file mode 100644
index 000000000000..ac2b15b77337
--- /dev/null
+++ b/app-admin/webmin/webmin-1.160.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.160.ebuild,v 1.1 2004/09/09 17:28:58 eradicator Exp $
+
+inherit eutils
+
+IUSE="ssl apache2 webmin-minimal"
+
+DESCRIPTION="Webmin, a web-based system administration interface"
+SRC_URI="webmin-minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
+	 !webmin-minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )"
+HOMEPAGE="http://www.webmin.com/"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="x86 ~ppc sparc amd64 ~s390 ~hppa ~ppc64"
+
+DEPEND="dev-lang/perl"
+RDEPEND="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
+	fi
+}
+
+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
+
+	exeinto /etc/webmin
+	doexe ${FILESDIR}/uninstall.sh
+}
+
+pkg_postinst() {
+	/etc/init.d/webmin stop >/dev/null 2>&1
+	stopstatus=$?
+	cd /usr/libexec/webmin
+	config_dir=/etc/webmin
+	var_dir=/var/log/webmin
+	perl=/usr/bin/perl
+	autoos=1
+	port=10000
+	login=root
+	crypt=`grep "^root:" /etc/shadow | cut -f 2 -d :`
+	host=`hostname`
+	use ssl && ssl=1 || ssl=0
+	atboot=0
+	nostart=1
+	nochown=1
+	autothird=1
+	nouninstall=1
+	noperlpath=1
+	export config_dir var_dir perl autoos port login crypt host ssl nochown autothird nouninstall nostart noperlpath
+	perl /usr/libexec/webmin/maketemp.pl
+	./setup.sh >/tmp/.webmin/webmin-setup.out 2>&1
+
+	if [ "$stopstatus" = "0" ]; then
+		# Start if it was running before
+		/etc/init.d/webmin start
+	fi
+
+	sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' /etc/webmin/miniserv.conf
+
+	einfo "Add webmin to your boot-time services with 'rc-update add webmin'."
+	einfo "Point your web browser to http://localhost:10000 to use webmin."
+}
+
+pkg_prerm() {
+	/etc/init.d/webmin stop >& /dev/null
+}