Version bump, bug 157198, thanks to Conrad Kostecki <ConiKost at gmx dot de> for...

Package-Manager: portage-2.1.2.3

diff --git a/app-admin/usermin/Manifest b/app-admin/usermin/Manifest
index 50c575e5f5f182b9d1b76597be8a2b1e17071d80..00887d5e6729ff7b3bc15de34f34f637f1a2fe83 100644 (file)
--- a/app-admin/usermin/Manifest
+++ b/app-admin/usermin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX init.d.usermin 825 RMD160 e3b471844d7dfdfaaa00d3da73d679514f29e5a0 SHA1 65701d01c9b880587d279f8b77711e3551ef175e SHA256 b1103d5c733a0c49a19c407a718617454342b19c34f238f11dc20be3356d38bf
 MD5 2e7c19bb66f99c168fc2e86b4bb4862c files/init.d.usermin 825
 RMD160 e3b471844d7dfdfaaa00d3da73d679514f29e5a0 files/init.d.usermin 825
@@ -19,6 +16,7 @@ RMD160 8a95f72ac16a16c23c881b333e47c7cb7add5e5c files/usermin.pam-include 210
 SHA256 5c5a78f5c04dbf033c129054af7741769d23be4887533800515c9bcacffd6bf1 files/usermin.pam-include 210
 DIST usermin-1.220.tar.gz 3154583 RMD160 ee6fcd1892a2d67d06e5a0c13f3448bf6bccf7a8 SHA1 950d3b82ff4f58d966dc0c29db8e669ced4e71c9 SHA256 f94466cab791745bcdac3f6d4d2c32e46db8ab8009d5ea63488f432181536ba1
 DIST usermin-1.230.tar.gz 3173021 RMD160 e5181d85369a5cf06b377a1729fe6ab3b5fa6c13 SHA1 102c8ddd10753a4fce9133455645d51479456483 SHA256 40748c01cb77a308e11238e326d8522421e24e48a644a599c61bb67f52115cc1
+DIST usermin-1.270.tar.gz 8205679 RMD160 083fc693096aa70a75360de33e1c162965dda354 SHA1 700bd86cc6bc7e8b3e7acb32045250c0c1950f44 SHA256 0d3c2d09d27418909aa1e4704b60cf5d07e8e7c2fac4c6020530aa5ffe35b1d0
 EBUILD usermin-1.220.ebuild 2288 RMD160 174224fe0fc589f37c156348b1ee9f215f0413e4 SHA1 58f4c54e6405bd2b54906330ec1241450f4546c6 SHA256 4a932249d65cfccd2ddd6dafd386a4692a13bd78ff569643988592efd2525ff2
 MD5 bbb7c8b6ae12ded40ff74c32b48eefea usermin-1.220.ebuild 2288
 RMD160 174224fe0fc589f37c156348b1ee9f215f0413e4 usermin-1.220.ebuild 2288
@@ -27,10 +25,14 @@ EBUILD usermin-1.230.ebuild 2288 RMD160 df15e7626e8c64cb1e645d8b9f29fb50feb7844d
 MD5 5dee52b9becf6c887b878b5734d77f84 usermin-1.230.ebuild 2288
 RMD160 df15e7626e8c64cb1e645d8b9f29fb50feb7844d usermin-1.230.ebuild 2288
 SHA256 64d064d8f9ad35037d4fabbfa12447db7bdd663c06cceba09d68abe746da8080 usermin-1.230.ebuild 2288
-MISC ChangeLog 13485 RMD160 9b19619dfe03412b05bf92a25c578a2a97b3279b SHA1 e9e453ca7ea7af8465a83e1ee242f54f8ab37cb7 SHA256 7d81ca8b87854a8555970587b84c609e9aefdaff78909539d76842b6eeb60640
-MD5 7110bbe6c742ef320e9a9419adaf3291 ChangeLog 13485
-RMD160 9b19619dfe03412b05bf92a25c578a2a97b3279b ChangeLog 13485
-SHA256 7d81ca8b87854a8555970587b84c609e9aefdaff78909539d76842b6eeb60640 ChangeLog 13485
+EBUILD usermin-1.270.ebuild 2296 RMD160 272b275ab1c7d39185addc35e166900a592cd184 SHA1 892878712e9338fd7099b2913f9f386f6cb60b8a SHA256 3b2ecddc09708052748e0cd0247e911d38b027f19a248102e8277d73b1916a20
+MD5 9c1b1bf4c9fe22bb64a291988ffa0a6f usermin-1.270.ebuild 2296
+RMD160 272b275ab1c7d39185addc35e166900a592cd184 usermin-1.270.ebuild 2296
+SHA256 3b2ecddc09708052748e0cd0247e911d38b027f19a248102e8277d73b1916a20 usermin-1.270.ebuild 2296
+MISC ChangeLog 13709 RMD160 e32ee5e44e30e18b916a2f180921026283d22e22 SHA1 19bc52ee9a8708c670a27ed091e5ee35d2b225a2 SHA256 25f34a3b7e36af73ac4933770ee8891ff82cffbf0e92083ef5a6098c4e661108
+MD5 f8451078f4bc66b945dc67c2a50279ad ChangeLog 13709
+RMD160 e32ee5e44e30e18b916a2f180921026283d22e22 ChangeLog 13709
+SHA256 25f34a3b7e36af73ac4933770ee8891ff82cffbf0e92083ef5a6098c4e661108 ChangeLog 13709
 MISC metadata.xml 219 RMD160 d143b9bfc730a60b09531271e6fba3ed40f71245 SHA1 06fba309d7f5cc3fce67ad01b88cde3a8de44876 SHA256 cbaa8798606262e312a9367341221d7816ad29d8fd446baab796f519b7c30437
 MD5 1f90ee0a7bcf20ac86ec307846fb298e metadata.xml 219
 RMD160 d143b9bfc730a60b09531271e6fba3ed40f71245 metadata.xml 219
@@ -41,10 +43,6 @@ SHA256 1a48d5ad636056642124f52931d1729478cbd2ebeb878238b12f1b5b888c9318 files/di
 MD5 5d2cc8e94a52d22157de033bc52c138c files/digest-usermin-1.230 244
 RMD160 7593609f83ea70201c90af1c47786313b9f9db03 files/digest-usermin-1.230 244
 SHA256 e936ac6b1c2aceec189ff5b5d18b1fdeea29dba445f103bb955bc414e331fbc9 files/digest-usermin-1.230 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFt3jc6J2i8a8J4okRAntUAKCJDDVMty0cXSrD3j3fnj2kC//OvgCcD0yJ
-9s08D4+ToIQzZQC01zSAyyM=
-=GtEt
------END PGP SIGNATURE-----
+MD5 3361a46b7a50a5ef39aa186391ce4d45 files/digest-usermin-1.270 244
+RMD160 39c1690349d11312a7465ddd7fedfe5d01b42660 files/digest-usermin-1.270 244
+SHA256 6cc5e394f41a93441bb765e796ea15074b91722a59cbcaf429eeaa72b438aa7a files/digest-usermin-1.270 244

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 44247cb83d992b63bf325b0fda55f937ac1e0786..ca1265fc573688d8f0aef2b44e49fb3f45a9b0f5 100644 (file)
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/webmin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.137 2007/01/27 18:46:29 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.138 2007/04/13 11:08:35 armin76 Exp $
+
+*webmin-1.340 (13 Apr 2007)
+
+  13 Apr 2007; Raúl Porcel <armin76@gentoo.org> +webmin-1.340.ebuild:
+  Version bump, bug 157198, thanks to Conrad Kostecki <ConiKost at gmx dot de>
+  for reporting, and security bug 168878
 
 *webmin-1.320 (27 Jan 2007)
 

diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index 3a33c6d96c77b62a24df5458355be488e2a62d42..270a05f492982915881ff0fd5c0c4b43a488f24b 100644 (file)
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -70,6 +70,8 @@ DIST webmin-1.300-minimal.tar.gz 1404945 RMD160 cb5bab5a5f34b9bc256d7ed916774410
 DIST webmin-1.300.tar.gz 10782513 RMD160 1259e16725ea7f2491dd91d2d6eef8e80f1240d8 SHA1 c510fce1bee04729bfa84a1fca975aa0a789f3bb SHA256 d5ce8bb7ef0c3e0d38ebd43e962aba984276dc6f23f8f913f712aaac2f17b1a4
 DIST webmin-1.320-minimal.tar.gz 1436590 RMD160 dd9294f2b59caf028beda03940b16bd0a79635ff SHA1 7133e745a2ce0ea289c7fd76df038f6b90efd2bb SHA256 0aaec93f46255d9b114f2854f6a13ad499596d8d015e7806b0283a6674f476b5
 DIST webmin-1.320.tar.gz 10756996 RMD160 7e1eae27c1656742630a24d99c1eb5e7f8adbe62 SHA1 015a99793ede00f7048c7b948b9fabfa75a8b4dd SHA256 2a4ec408d1644a00276809cb9468f9459e04e77452b46cf341068daa2facf392
+DIST webmin-1.340-minimal.tar.gz 1414776 RMD160 74d202d87340a6d9f1339f7dcd5bca418ff8207d SHA1 22526358e39e0563487d8d7ff51d668b91df4164 SHA256 4d8a51ade5d44cef10194e36331cfcf8eed547a84980c7117580c8c7b89c3ed0
+DIST webmin-1.340.tar.gz 15851601 RMD160 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05 SHA1 530bb583824688f24fc4c6d0b8522d43c7f5bb96 SHA256 7d0b1affa548518dc724765578b908da3a2634483c53fb38de4e682e4769a9ac
 EBUILD webmin-1.290-r1.ebuild 4113 RMD160 19b3650af4dc67a90965acd55e7b02cfb6805f4c SHA1 f3654bc5eca64f7addee2574727117aa26a4b4e6 SHA256 2b5d5069126fe465bd29b2b540a71d711a65fe37d64f0082111f12a3fa01bed5
 MD5 ab43b3529431e3a59df730da8bbb2f53 webmin-1.290-r1.ebuild 4113
 RMD160 19b3650af4dc67a90965acd55e7b02cfb6805f4c webmin-1.290-r1.ebuild 4113
@@ -90,10 +92,14 @@ EBUILD webmin-1.320.ebuild 3926 RMD160 bb9b9426826c2462319d034058474824eb0e5d95
 MD5 2bb0bc14131be44885bff4048d13137d webmin-1.320.ebuild 3926
 RMD160 bb9b9426826c2462319d034058474824eb0e5d95 webmin-1.320.ebuild 3926
 SHA256 f1c8171565bf1a03f182f1c1e348e21c1c43f1b6306ce17afad6d30b8b87054e webmin-1.320.ebuild 3926
-MISC ChangeLog 19275 RMD160 2dc495739052f262b9c381e617290ef144aa71dd SHA1 98080299ba5cd3875af2e63e6f95e7a031b06592 SHA256 c8363edc89b4bcb4ba1b9e03abdbadf46020a21a4fd09bed0f9f37be777d395a
-MD5 f6f2bf269df425aa0f32ceaac6394fbf ChangeLog 19275
-RMD160 2dc495739052f262b9c381e617290ef144aa71dd ChangeLog 19275
-SHA256 c8363edc89b4bcb4ba1b9e03abdbadf46020a21a4fd09bed0f9f37be777d395a ChangeLog 19275
+EBUILD webmin-1.340.ebuild 3926 RMD160 7ef91b81b85b0894e3c09801e35e6d11b930fc9f SHA1 83d757603dcef3370f698ceb5ec9fa624cf8411d SHA256 0ea1bde10e26fc050f937b69bf3a38e4acf7e7071442bb76965c8a7369caa0fb
+MD5 f2833c2c2c38000d4d5aa7464da1b0ec webmin-1.340.ebuild 3926
+RMD160 7ef91b81b85b0894e3c09801e35e6d11b930fc9f webmin-1.340.ebuild 3926
+SHA256 0ea1bde10e26fc050f937b69bf3a38e4acf7e7071442bb76965c8a7369caa0fb webmin-1.340.ebuild 3926
+MISC ChangeLog 19496 RMD160 b9744bca18b8f35be23f7f7d87e8af12e7368911 SHA1 4ffb002e1d30d53340a67158a07ad1bc21f57f6a SHA256 4949af9b37398f7ee8385ef2fad77dfa3c5e964bdd069890dc254a7daeab68ee
+MD5 2d15d968fd890ec7b2ed0eef604172ca ChangeLog 19496
+RMD160 b9744bca18b8f35be23f7f7d87e8af12e7368911 ChangeLog 19496
+SHA256 4949af9b37398f7ee8385ef2fad77dfa3c5e964bdd069890dc254a7daeab68ee ChangeLog 19496
 MISC metadata.xml 219 RMD160 d143b9bfc730a60b09531271e6fba3ed40f71245 SHA1 06fba309d7f5cc3fce67ad01b88cde3a8de44876 SHA256 cbaa8798606262e312a9367341221d7816ad29d8fd446baab796f519b7c30437
 MD5 1f90ee0a7bcf20ac86ec307846fb298e metadata.xml 219
 RMD160 d143b9bfc730a60b09531271e6fba3ed40f71245 metadata.xml 219
@@ -113,3 +119,6 @@ SHA256 9e1e25b807367456f797f4d6c2ec9e232ae5f33dc614c141c4c816caf4a23a10 files/di
 MD5 589ed660270383d0890d265f481010c8 files/digest-webmin-1.320 780
 RMD160 3a15bcf8a42ecbc583af905ec7725aba440dbb66 files/digest-webmin-1.320 780
 SHA256 3805b7fcb6d50a4849b4bbca24bf54c1cfba337636c085cd74eabccbd2c0246b files/digest-webmin-1.320 780
+MD5 76b0dda2c3a573c214219c83125ed9da files/digest-webmin-1.340 780
+RMD160 9e7165ab0bd7d5febeb5003b562bc0f88edf01d4 files/digest-webmin-1.340 780
+SHA256 efa549b7b193d855ff4dfbcc70e53d4e0d4bc10e6dc34c8e1a68b64b58a3082f files/digest-webmin-1.340 780

diff --git a/app-admin/webmin/files/digest-webmin-1.340 b/app-admin/webmin/files/digest-webmin-1.340
new file mode 100644 (file)
index 0000000..da62f83
--- /dev/null
+++ b/app-admin/webmin/files/digest-webmin-1.340
@@ -0,0 +1,9 @@
+MD5 f74d252d7fa9c736895fb3a257dd3edc virtual-server-3.23.gpl.wbm.gz 379417
+RMD160 912ba4ff66b7644f05e7e5b52286b5a41cf7163d virtual-server-3.23.gpl.wbm.gz 379417
+SHA256 c5631f73921058df40a08b0d248bad1acf1dd5b7ded451c7c6f9fff1d923a360 virtual-server-3.23.gpl.wbm.gz 379417
+MD5 0a08dbfe332baeddd188f7cdac98051a webmin-1.340-minimal.tar.gz 1414776
+RMD160 74d202d87340a6d9f1339f7dcd5bca418ff8207d webmin-1.340-minimal.tar.gz 1414776
+SHA256 4d8a51ade5d44cef10194e36331cfcf8eed547a84980c7117580c8c7b89c3ed0 webmin-1.340-minimal.tar.gz 1414776
+MD5 5ccd990fa725b1fed078af3846b35e1a webmin-1.340.tar.gz 15851601
+RMD160 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05 webmin-1.340.tar.gz 15851601
+SHA256 7d0b1affa548518dc724765578b908da3a2634483c53fb38de4e682e4769a9ac webmin-1.340.tar.gz 15851601

diff --git a/app-admin/webmin/webmin-1.340.ebuild b/app-admin/webmin/webmin-1.340.ebuild
new file mode 100644 (file)
index 0000000..32347a7
--- /dev/null
+++ b/app-admin/webmin/webmin-1.340.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.340.ebuild,v 1.1 2007/04/13 11:08:35 armin76 Exp $
+
+inherit eutils pam
+
+VM_V="3.23"
+
+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}.gpl.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"
+IUSE="apache2 pam postgres ssl webmin-minimal"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+        ssl? ( dev-perl/Net-SSLeay )
+        postgres? ( dev-perl/DBD-Pg )
+        pam? ( dev-perl/Authen-PAM )
+        dev-perl/XML-Generator"
+
+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.300-postfix.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=${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
+}