Change maintainership, add mysql use flag for perl deps, webmin-minimal to minimal...

Package-Manager: portage-2.1.4.4

diff --git a/app-admin/usermin/Manifest b/app-admin/usermin/Manifest
index 4431f773c689ed3001b6117fc0acd51bb0dba831..513107424694b11db57622a7b6e4285addb8bcc0 100644 (file)
--- a/app-admin/usermin/Manifest
+++ b/app-admin/usermin/Manifest
@@ -4,5 +4,5 @@ AUX usermin-1.150-setup-nocheck.patch 998 RMD160 2ca2541b8c71bea584ef2b69364c3a5
 AUX usermin.pam-include.1 210 RMD160 8933bcb2018ff43b9b5ee2124fc1a87fbfafc8bb SHA1 525a78c675402c3ddc4ab49da9ffe3fbe2c475d2 SHA256 facea91616049551f44655a7f8a270c61dd571e860284abc972fd3430a9b8d50
 DIST usermin-1.330.tar.gz 5407048 RMD160 ecb5148f1b0bf4be629ff3a9f6bde65b2321bfec SHA1 c3ec8f8a24eaba382038154eb9be52e6c8ef6518 SHA256 5001f4aaa71f727931082ecf4f28e75f4fd17a7ba8f21bd41065565d511916bd
 EBUILD usermin-1.330.ebuild 2236 RMD160 8aa6ac09990f55926eb2c5d7e3da6ae13e6f78b5 SHA1 052f2ded193dbe4625cd2c90ce4f382768011cc6 SHA256 d5db4acf241c15b5299cbd2e8e78ff51ef0310720e40fbef43598800f2d97c8b
-MISC ChangeLog 18463 RMD160 df3b2130d9cbeb687c764a83fd56067f234a3979 SHA1 c6071c2cdcd6b971f3a4f6240c3ec466f4f70bb0 SHA256 36e732d140bba708125bba4347ee69f32ad1e1f7ee22d3999e2c582fa85419ce
-MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
+MISC ChangeLog 18542 RMD160 b15486470d7304dfd802c289dfb6a5ca940acf52 SHA1 07a463f49ef60c65eb44b6e3d9e731846cd9abad SHA256 bb92c51908f5f33392bef14c91348dbf113d0318fceb1f1f504b45f7594f07e8
+MISC metadata.xml 226 RMD160 b4661c3a6122df3318817ca8feb70658a6408db5 SHA1 c81ffd0b4ab367967967c22e08b9919a620feb97 SHA256 61601fab138e219f8673fce9baf44c1ead1625fb8b21e9f7f6498073f5fa1bac

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 6bca3c423d25b00de18bb180d56f31efa3060fa1..6525977c5153dd33a1534af103e35ae2a29adf93 100644 (file)
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/webmin
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.169 2008/02/20 04:22:47 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.170 2008/03/12 20:13:58 beandog Exp $
+
+*webmin-1.400-r1 (12 Mar 2008)
+
+  12 Mar 2008; Steve Dibb <beandog@gentoo.org> metadata.xml,
+  +webmin-1.400-r1.ebuild:
+  Change maintainership, add mysql use flag for perl deps, webmin-minimal to
+  minimal use flag
 
   20 Feb 2008; Steve Dibb <beandog@gentoo.org> webmin-1.400.ebuild:
   amd64 stable, security bug 209453

diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index 653abc06485566ab3c7f62e89973907a1f9310db..526365796069e6f1f6082aeb3f774256375e5a6e 100644 (file)
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -24,6 +24,7 @@ DIST webmin-1.400-minimal.tar.gz 1570083 RMD160 3dab583852f374af5016e211a6460026
 DIST webmin-1.400.tar.gz 13457079 RMD160 4af2ca5eab965fc6f78d9745fa4d2b0c6565a088 SHA1 bf38da1278f0e2e0e468d60de7230b686dece224 SHA256 d937900de2ab2ae0bc63ba08cb4cd6f61e674ac6b7f9db6315f7adddd5e7a280
 EBUILD webmin-1.350.ebuild 3835 RMD160 7484624b98c2e304f1c55cf714448c60f93affa2 SHA1 c18711670b8e599c884b9d31d89869ac786db42d SHA256 bc85dfd87b7e4a462a8ed59915bde4fbd798f6376f13ac4cca65809578ccf387
 EBUILD webmin-1.390.ebuild 3818 RMD160 25fc2932657c1e38a9b71dc95f94810a9d45f286 SHA1 8853b158d6488215c47c9109f862834b4f050314 SHA256 d00293ddf81472d06e2d7e34b6f48991ab34df33578e09ec79de3e1e45c56df7
+EBUILD webmin-1.400-r1.ebuild 3791 RMD160 603d69ed61e6182e4d0e501dc2d72557718b7a4d SHA1 10dd433948204d77840acfb7c56e54cac46f5791 SHA256 d666157a8c06d4df3621d3ac2f61286cee34c242eff8fad066593e74bb8d58bc
 EBUILD webmin-1.400.ebuild 3772 RMD160 c3aa977b50105fcd30c9a48ae00439db222e2e78 SHA1 1c49b4b4679183d2803ad38912e98462e6a66276 SHA256 63660bbe2abbf6a860dae1914ec87f21ca4181993f9b9abbe05ba5d316722cb6
-MISC ChangeLog 23471 RMD160 6c19cb67dde16356c510c72e6c4d4fd9f480f64a SHA1 844f35dfcbea266c80ce64f82e67ae2c176f79f0 SHA256 afff5013debe8b9e04f2b0417830a909896ac2befff417c4903e002c7820cde0
-MISC metadata.xml 232 RMD160 854b06094287201d0b98f2b21d36054db25d81cd SHA1 cc4f98e9ee0102aea687d71cf3af924cf156edbb SHA256 21382e863647add08888c924279a4b931b2b90ccd0cf5e526ee74a3d5e1fd0df
+MISC ChangeLog 23688 RMD160 3ee83e8bbde4739271204a61c2ba7444cd794cba SHA1 8cffcd5db6cc974c7e8dcb9f4687716abdb668eb SHA256 52a06db0e585ba9de4f16b5dc9240d8b76d014e58169a628c519b24184f37c55
+MISC metadata.xml 222 RMD160 f67ae3f744b9db4bbf17b9141e8c01b185262bd5 SHA1 b5f83096136c0a206e39c3aef719439891b1d442 SHA256 a28546f6334805a80dab4dc57cb360aa28bffe3c675a73402fc5128daa97eb97

diff --git a/app-admin/webmin/metadata.xml b/app-admin/webmin/metadata.xml
index 616f0488f72eacc5abd1cd0854d8c011b3080c18..e0fb7da44300fdf90e29ca8441598c56878fb4f1 100644 (file)
--- a/app-admin/webmin/metadata.xml
+++ b/app-admin/webmin/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-       <email>maintainer-needed@gentoo.org</email>
+       <email>beandog@gentoo.org</email>
 </maintainer>
 </pkgmetadata>

diff --git a/app-admin/webmin/webmin-1.400-r1.ebuild b/app-admin/webmin/webmin-1.400-r1.ebuild
new file mode 100644 (file)
index 0000000..0e8b161
--- /dev/null
+++ b/app-admin/webmin/webmin-1.400-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.400-r1.ebuild,v 1.1 2008/03/12 20:13:58 beandog Exp $
+
+inherit eutils pam
+
+VM_V="3.23"
+
+DESCRIPTION="Webmin, a web-based system administration interface"
+HOMEPAGE="http://www.webmin.com/"
+SRC_URI="minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
+       !minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz
+                       http://www.webmin.com/download/virtualmin/virtual-server-${VM_V}.gpl.wbm.gz )"
+
+LICENSE="BSD"
+SLOT="0"
+# ~mips removed because of broken deps. Bug #86085
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="apache2 mysql pam postgres ssl minimal"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+       ssl? ( dev-perl/Net-SSLeay )
+       mysql? ( dev-perl/DBD-mysql )
+       postgres? ( dev-perl/DBD-Pg )
+       pam? ( dev-perl/Authen-PAM )
+       dev-perl/XML-Generator
+       virtual/logger"
+
+src_unpack() {
+       unpack ${A}
+
+       cd "${S}"
+
+       # in webmin-minimal apache2 are not present
+       if ! use 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
+
+               mv "${WORKDIR}"/virtual-server-${VM_V}.gpl.wbm "${T}"/vs.tar
+               tar -xf "${T}"/vs.tar
+
+               # Don't create ${HOME}/cgi-bin on new accounts
+               epatch "${FILESDIR}"/virtual-server-3.23-nocgibin.patch
+
+               # Verify Postgres usernames
+               epatch "${FILESDIR}"/virtual-server-3.23-pgsql.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=/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=/var/run/webmin.pid:" "${D}"/etc/webmin/miniserv.conf
+       find "${D}"/etc/webmin -type f | xargs sed -i -e "s:${D}:/: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}/" "${ROOT}/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."
+}