From d711fb42bf55f44aee0f1f5484a0e0b3c61fc38f Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Wed, 7 Apr 2004 08:13:03 +0000 Subject: Fix bug #47020. --- app-admin/webmin/ChangeLog | 8 ++- app-admin/webmin/Manifest | 11 +-- app-admin/webmin/files/digest-webmin-1.130-r1 | 1 + .../webmin/files/webmin-1.130-webalizer.patch | 18 +++++ app-admin/webmin/webmin-1.130-r1.ebuild | 82 ++++++++++++++++++++++ 5 files changed, 115 insertions(+), 5 deletions(-) create mode 100644 app-admin/webmin/files/digest-webmin-1.130-r1 create mode 100644 app-admin/webmin/files/webmin-1.130-webalizer.patch create mode 100644 app-admin/webmin/webmin-1.130-r1.ebuild (limited to 'app-admin/webmin') diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog index c52786228d7e..8cc34f648336 100644 --- a/app-admin/webmin/ChangeLog +++ b/app-admin/webmin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-admin/webmin # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.36 2004/03/13 14:44:08 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.37 2004/04/07 08:13:03 eradicator Exp $ + +*webmin-1.130-r1 (07 Apr 2004) + + 07 Apr 2004; Jeremy Huddleston + webmin-1.130-r1.ebuild, files/webmin-1.130-webalizer.patch: + Fix bug #47020. 13 Mar 2004; Jason Wever webmin-1.130.ebuild: Stable on sparc. diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest index c78c22ff4a89..84b18a818286 100644 --- a/app-admin/webmin/Manifest +++ b/app-admin/webmin/Manifest @@ -1,12 +1,15 @@ -MD5 ec06d58231f662a83583ea8575d38175 ChangeLog 5552 MD5 e1448effc29a46897c48b774ec52a127 webmin-1.080.ebuild 1760 +MD5 1d1a12d52f42a6aa85ceb13b2f6c4025 webmin-1.130-r1.ebuild 1972 MD5 871a442fb0428ebaeb78601de262b8b5 webmin-1.110.ebuild 1869 -MD5 af601eed3dc42194923e0d07548894e3 webmin-1.121.ebuild 1858 MD5 eaa66f87a2a2419029881e1951292abc webmin-1.130.ebuild 1853 +MD5 af601eed3dc42194923e0d07548894e3 webmin-1.121.ebuild 1858 +MD5 a3860fe481ab756794d84f6bb9460e7e ChangeLog 5722 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226 +MD5 1071b40773837a19b08616b12ce1c932 files/webmin-gentoo-init 413 +MD5 bc8eb1c9de103599fc00b140b0ed1f9f files/uninstall.sh 260 MD5 c2e70e10958f50cd84c377b5963a8ced files/digest-webmin-1.080 65 MD5 7f0f3de1fc4601b588dc143645df86b7 files/digest-webmin-1.110 65 MD5 e6cc2ef57317e815592875f7d6d3e386 files/digest-webmin-1.121 65 -MD5 bc8eb1c9de103599fc00b140b0ed1f9f files/uninstall.sh 260 -MD5 1071b40773837a19b08616b12ce1c932 files/webmin-gentoo-init 413 MD5 45eacf952391438a2db6170312783f32 files/digest-webmin-1.130 65 +MD5 cadb87585ab39215aea085411ba590af files/webmin-1.130-webalizer.patch 595 +MD5 45eacf952391438a2db6170312783f32 files/digest-webmin-1.130-r1 65 diff --git a/app-admin/webmin/files/digest-webmin-1.130-r1 b/app-admin/webmin/files/digest-webmin-1.130-r1 new file mode 100644 index 000000000000..7eea20c4956b --- /dev/null +++ b/app-admin/webmin/files/digest-webmin-1.130-r1 @@ -0,0 +1 @@ +MD5 32942590125673df578e032e2a4dbcfb webmin-1.130.tar.gz 6888140 diff --git a/app-admin/webmin/files/webmin-1.130-webalizer.patch b/app-admin/webmin/files/webmin-1.130-webalizer.patch new file mode 100644 index 000000000000..55d3e3627cb9 --- /dev/null +++ b/app-admin/webmin/files/webmin-1.130-webalizer.patch @@ -0,0 +1,18 @@ +--- webalizer-lib.pl.orig 2004-04-07 01:08:50.000000000 -0700 ++++ webalizer-lib.pl 2004-04-07 01:08:15.000000000 -0700 +@@ -176,10 +176,11 @@ + local $cmd = "$config{'webalizer'} $conf -o '$lconf->{'dir'}' $type -p '$a'"; + if ($user ne "root") { + local $shell; +- if ($config{'su_shell'}) { +- $shell = " -s /bin/sh"; +- } +- $cmd = "su ".quotemeta($user)." $shell -c ".quotemeta($cmd); ++# Gentoo borkage ++# if ($config{'su_shell'}) { ++# $shell = " -s /bin/sh"; ++# } ++ $cmd = "/bin/su ".quotemeta($user)." $shell -c ".quotemeta($cmd); + } + open(OUT, "$cmd 2>&1 |"); + while() { diff --git a/app-admin/webmin/webmin-1.130-r1.ebuild b/app-admin/webmin/webmin-1.130-r1.ebuild new file mode 100644 index 000000000000..43d8d8c7eea2 --- /dev/null +++ b/app-admin/webmin/webmin-1.130-r1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.130-r1.ebuild,v 1.1 2004/04/07 08:13:03 eradicator Exp $ + +inherit eutils + +IUSE="ssl" + +DESCRIPTION="Webmin, a web-based system administration interface" +SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz" +RESTRICT="nomirror" +HOMEPAGE="http://www.webmin.com/" + +SLOT="0" +LICENSE="BSD" +KEYWORDS="x86 ~ppc sparc ~amd64" + +DEPEND="dev-lang/perl + ssl? ( dev-perl/Net-SSLeay )" + +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 + mv ${D}/usr/libexec/webmin/openslp/config \ + ${D}/usr/libexec/webmin/openslp/config-gentoo-linux + + # Bug #47020 + pushd ${D}/usr/libexec/webmin/webalizer + epatch ${FILESDIR}/${P}-webalizer.patch + popd + + exeinto /etc/init.d + newexe webmin-gentoo-init webmin + + insinto /etc/pam.d/ + newins webmin-pam webmin + echo gentoo > ${D}/usr/libexec/webmin/install-type + + exeinto /etc/webmin + doexe ${FILESDIR}/uninstall.sh + use ssl && sed -i 's:ssl=$ssl:ssl=1:' setup.sh +} + +pkg_postinst() { + /etc/init.d/webmin stop >/dev/null 2>&1 + stopstatus=$? + cd /usr/libexec/webmin + config_dir=/etc/webmin + var_dir=/var/webmin + perl=/usr/bin/perl + autoos=1 + port=10000 + login=root + crypt=`grep "^root:" /etc/shadow | cut -f 2 -d :` + host=`hostname` + 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 +} + +pkg_prerm() { + webmin stop +} -- cgit v1.2.3-65-gdbad