Bumbed version of virtualmin to 2.611.

Package-Manager: portage-2.1_rc4-r1

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 075452dd996b8090374c749f70f389aca62f0822..19a854dcd72f4fcc8dae7d705be9547d039526be 100644 (file)
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/webmin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.113 2006/06/05 08:17:44 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.114 2006/06/05 08:23:25 eradicator Exp $
+
+*webmin-1.270-r1 (05 Jun 2006)
+
+  05 Jun 2006; Jeremy Huddleston <eradicator@gentoo.org>
+  +webmin-1.270-r1.ebuild:
+  Bumbed version of virtualmin to 2.611.
 
   05 Jun 2006; Jeremy Huddleston <eradicator@gentoo.org>
   -webmin-1.260.ebuild, webmin-1.270.ebuild:

diff --git a/app-admin/webmin/files/digest-webmin-1.270-r1 b/app-admin/webmin/files/digest-webmin-1.270-r1
new file mode 100644 (file)
index 0000000..2ca4116
--- /dev/null
+++ b/app-admin/webmin/files/digest-webmin-1.270-r1
@@ -0,0 +1,9 @@
+MD5 aa7274ebecc8d0df6704546ed13709d6 virtual-server-2.611.wbm.gz 283217
+RMD160 bbcee33f9398a78d7e8a68168316f011d2cf391d virtual-server-2.611.wbm.gz 283217
+SHA256 f7579da94a6b356ce4548a0ed8fcc366e1d8e7e7199e5337e8d703bf4f92090a virtual-server-2.611.wbm.gz 283217
+MD5 65b48e116fbd5a2aa5c8fce4f776d86b webmin-1.270-minimal.tar.gz 1301974
+RMD160 94847d56eb9aebefc234178656dc53daa3af91c6 webmin-1.270-minimal.tar.gz 1301974
+SHA256 ee55df6476812289a42d75d5b7833bb666500d0321a80056fa4ba006032083dc webmin-1.270-minimal.tar.gz 1301974
+MD5 f9e103f7ee20a77e540335986c2c3f01 webmin-1.270.tar.gz 9418746
+RMD160 9fd621f1a9e418940d3c8ebcad7e21ee28b8e0d1 webmin-1.270.tar.gz 9418746
+SHA256 aa9bbf6589af5bb6b8e2203492c24b885b5ffed555ceab63a08bef07c6e3a311 webmin-1.270.tar.gz 9418746

diff --git a/app-admin/webmin/webmin-1.270-r1.ebuild b/app-admin/webmin/webmin-1.270-r1.ebuild
new file mode 100644 (file)
index 0000000..66cde4b
--- /dev/null
+++ b/app-admin/webmin/webmin-1.270-r1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.270-r1.ebuild,v 1.1 2006/06/05 08:23:25 eradicator Exp $
+
+IUSE="apache2 postgres ssl webmin-minimal"
+
+inherit eutils pam
+
+VM_V="2.611"
+
+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"
+
+# ~mips removed because of broken deps. Bug #86085
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+        ssl? ( dev-perl/Net-SSLeay )
+        postgres? ( dev-perl/DBD-Pg )
+        dev-perl/XML-Generator"
+
+# See bug #62123
+#       pam? ( dev-perl/Authen-PAM )
+
+
+src_unpack() {
+       unpack ${A}
+
+       cd ${S}
+
+       # in webmin-minimal apache2 are not present
+       if ! use webmin-minimal ; then
+               # Bug #50810, #51943
+               if use apache2; then
+                       epatch ${FILESDIR}/${PN}-1.140-apache2.patch
+               fi
+
+               # Correct ldapness
+               epatch ${FILESDIR}/${PN}-1.270-ldap-useradmin.patch
+
+               # 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.60-nocgibin.patch
+
+               # Check if a newly added IP is already active
+               epatch ${FILESDIR}/virtual-server-2.610-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() {
+       # Bug #97212
+       addpredict /var/lib/rpm
+
+       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 /var
+
+       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
+
+       newinitd ${FILESDIR}/init.d.webmin webmin
+
+       newpamd ${FILESDIR}/webmin-pam webmin
+       echo gentoo > ${D}/usr/libexec/webmin/install-type
+
+       # Fix ownership
+       chown -R root:0 ${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 atboot nostart nochown autothird nouninstall 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 -e "s:^pidfile=.*$:pidfile=${ROOT}/var/run/webmin.pid:" ${D}/etc/webmin/miniserv.conf
+       find ${D}/etc/webmin -type f | xargs sed -i -e "s:${D}:${ROOT}:g"
+
+       # Cleanup from the config script
+       rm -rf ${D}/var/log/webmin
+       keepdir /var/log/webmin/
+
+       # Get rid of this crap...
+       rm -rf ${D}/usr/libexec/webmin/acl/Authen-SolarisRBAC-0.1
+       rm -f ${D}/usr/libexec/webmin/acl/Authen-SolarisRBAC-0.1.tar.gz
+}
+
+pkg_postinst() {
+       local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
+       crypt=${crypt//\\/\\\\}
+       crypt=${crypt//\//\\\/}
+       sed -i -e "s/root:XXX/root:${crypt}/" /etc/webmin/miniserv.users
+
+       einfo "To make webmin start at boot time, run: 'rc-update add webmin default'."
+       use ssl && einfo "Point your web browser to https://localhost:10000 to use webmin."
+       use ssl || einfo "Point your web browser to http://localhost:10000 to use webmin."
+}
+
+pkg_prerm() {
+       ${ROOT}/etc/init.d/webmin stop >& /dev/null
+}