drop old due to security issue, bug 511624; bump new, bug 534092, thanks PhobosK

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55

4 files changed, 64 insertions, 31 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index b3fc2f4b49af..e1e72e010a31 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/webmin
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.207 2014/06/07 11:29:32 hwoarang Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.208 2015/01/05 03:23:01 dlan Exp $
+
+*webmin-1.730 (05 Jan 2015)
+
+  05 Jan 2015; Yixun Lan <dlan@gentoo.org> -webmin-1.690.ebuild,
+  +webmin-1.730.ebuild, files/gentoo-setup:
+  drop old due to security issue, bug 511624; bump new, bug 534092, thanks
+  PhobosK
 
 *webmin-1.690 (07 Jun 2014)
 
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index 1bd1262acc6e..1e8cdb1cb26c 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,30 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX gentoo-setup 11934 SHA256 0d0c74c4d6bc2cc4aa79b2a6f8473bf615dcbf26173022d8fd91da942e3f8c1c SHA512 29c6d9e0b8c7909dd07ded43e1c3e03840cecadaee01dafc26fd81b1ff4fc3639e8f5a81a95e906ce0533b64ffe10bea076117ffc8d76ea9b2c5863e746bfe63 WHIRLPOOL 60fe434a96fa3e1707f714cfd49caad3c3e0d7e12c85b8d881faa1d4df5336aa90d3e39adec0743bbcf4ec03cf52e6fba0403741dc6f4b46765795fd5a0e83d5
+AUX gentoo-setup 12857 SHA256 2646409bb4bc1a4d68791d8700107fd65952a81ca9848e00ff3099a7c4a37b57 SHA512 9d05224193cc95948bec93d1f1cb443c21fb786a25124c6f94f0e4c7d0a7a238a5ba88454dd85d4f38ede7d02c93fe6abb23b8027825f2eb47bedced6e43528a WHIRLPOOL 117c52169063417f2d8ba62b720f1a7ac7bffaddbceb6b6c1c8ebff425a046ce275b8a6eb2c6b201e899bf6718b5721db922551a637f6d3197f5c2a954fda312
 AUX init.d.webmin 2273 SHA256 2390a805885f088b9fe52691822d58154c6b4877dc290f18da220af7e07ad65b SHA512 435772cb2972845aaa364e187b04da2b61af29db2f2087c0e0365b4c9d4d5006385da4a56cc9bff7312d382d91587a1ac03faf8e98b8c5009f7fd3fc67188b29 WHIRLPOOL 7a85290836e8122ec7af7f0d2af46b11a2c131988dc835da78fc490cea7e7e5cfc0aa052e34a2ff6e85f35979b3c2e287ef79677924c172d2c27b20b95e39dbc
 AUX webmin.service 416 SHA256 f5e9301ad853929e15cb4c4860f8d3da5a27036bcaebce38a32ec81da798b8ef SHA512 7cf86342db3d34cbe39b62fa768660ba7dd160d9c0d113ef6a3a176187fa0c72531bed38e3203cf627ab05c1ac4d9a8b9e829d1baa9739d63dfa74f09c445f1e WHIRLPOOL 9d4fbe570364a94516cf5f66eb968209f9731b6a1f3083071f3c299d65c28559e35dd76ca7e2ac2f3e5381b854cb8b5a561c48388b761c3dbb4d57829c59520b
-DIST webmin-1.690-minimal.tar.gz 2594677 SHA256 e5644dc06947e201eba8570dbed72feb10442876dc1d3d1297d9698b0e042950 SHA512 8f223f20fc6b171f32c9c2def92eaad2d10f68e18328e9dbbca0b6c84560550b9f353aff0968ea77407cde5172249859d82d406e6c2acdf3e8df1e9347bcc409 WHIRLPOOL 2184c301a487130744265a95e55c29b9d97c2ae6906277c644917b9e7e50c414a7fc7e7040645f9041813cf2c223eacdd5f064e1cfc7f5431d9aa53ced198902
-DIST webmin-1.690.tar.gz 22486046 SHA256 f22642b4c8a4467a2ef1011ec674bf45b5f6a8e2bd8be42e3e24338a98e00757 SHA512 f46a286389a133abbf2adbd730e42b38f50c4de54caad8678e13bd396d34ca4064186e5033a2a840d31c764adefacc0735c81454fc00404b0fda3963ed609934 WHIRLPOOL b6e1607bd4de277c7327a7e4b8eeb8084e4cc7261c76e1d03a24dbbcac951f40020e0472957fb5359faf1652b8f355dc5cfccddf7842b8017ac6e7dc68a0a469
-EBUILD webmin-1.690.ebuild 10220 SHA256 852c1fdd8f41ae9c410da86212bd38afb2c4a606c522cd03152633d06856b330 SHA512 cc415bf5879f51118af054df16855b7cf2c683799922158e4077f83f0bd59b51f260062374a21d9bc888111f0ed74a61b4150b8a6c1583bf9cab0a201cfd6c72 WHIRLPOOL c6f2b1fb2a213a421767976ae04121f384fd26988e8106fd78e19516b039a175d20547ba980f09ab294b4cb843c929ae886caaf72a88d7aa60015f8f49022578
-MISC ChangeLog 3935 SHA256 aa949d744e536f336ddeea059c02cc43b37265805fa61afc06e7054ccc62b4f0 SHA512 d2d062973b025e554102125925c62514407a6db821b785edf4e970e6d9833b71eca2f305a54037be08f48833e1c3caaad8feebbacd6ec22d59298b78d8053dcd WHIRLPOOL 4fee68cb7315724ce9c63d83ea19c40f4fd2b372b97c5ed7c16fa857a17e3e96530f51aa0ef09f97f162131283540aa05167c74ddeafbf9805d72c387a1aa31f
+DIST webmin-1.730-minimal.tar.gz 2616032 SHA256 9e101e5cbd728f43474222dd3948aa8d4a006620e9b4b7074af60db8b22cd117 SHA512 62f5067a1dc122c037a08d3dddb6a6de7ea88203ca9f8d99c3d349e2bf20c138aa56a0cd62fd5b65d520b38b8df655a9177ffb412fea2f880bdb410b2817dd43 WHIRLPOOL 6eed741e901fe96843801d060e9ffaf3e80130ec532953144e6f2b33244fb4de2111e59800d6ef2113b788a67d81ee5b529cca8252d8ca7011afc56a356f94ea
+DIST webmin-1.730.tar.gz 22469783 SHA256 91ec24951c5df041da9a299d280fcfcd83df7406b60ffa6ff816cb7a63d3a9cc SHA512 060fe881e6e8588bc46c01769de913aa56f004fdab6144baefa705c66086624cbb621be5c65bee6814c6dee340b7f93434843b34def00a83acbd259056b21529 WHIRLPOOL ea86d251cf551a3661619c46101b30c28ab01aeb75ac4b5e8de6354c0ede6af8b3602410ca8eed876c876681233d8e5763aaa6b4f8a93d3c4c8ed14366521b4f
+EBUILD webmin-1.730.ebuild 10321 SHA256 91c798a1ba51341b881cebed08e2998e30c54c1490a22dc23cc729dbf437a1b4 SHA512 22fd90c479e4b431cb4e8a31e97d02853eafba74d101a37a5f1c4263c01841b750e8039910b3c653f865cc79e8c4d9a2e068c3821a7cba5d962ade50e5ead589 WHIRLPOOL 9b436eba779c161cc1eb715774c2c5e05c76e1e6fb8eef5337450d030dd0097be064e266862d64e2e9bd87e06f006d770131a62545cb96c4a99919e01784f7cd
+MISC ChangeLog 4155 SHA256 9d1e8459c3fc864112f3d2bf52b166ac8a3ccbc38ecec7d8c16cd663870765fd SHA512 7d100e7f0c373e14ae160a8f28a0c41874a62c6e92a444794b0fee86689e05d4b2884c50ad4f770e3548e06d311c35e1907016c25bff01433876611cbda6a38c WHIRLPOOL f23f9586d757d1db6113d6d0a6aa40914662e2b0aed9f9729afebd1b7e1d716633bc9a09faffc3b361a0345421f85d02a67fb3f8cdb5cf53c7d0a2d53ac582ea
 MISC metadata.xml 326 SHA256 44e634f8f6afe175e696bb53be1749163798e22862c6ab40d81a70146e28269f SHA512 7c400180abd54e464c3570f046ecbf2489de6f83738bdbda83285df1ebc5354a532ea7495b842e39219649d729488bc00ba39bc426faefa24bc88090a136f8b6 WHIRLPOOL 9124acba12823edb57b989ca40913e408e1ed2f894822beab847b0b49bea86a8f974e984b444cb05d7d0881b21c1bcdaf5676c863a21098b2ef2b4e772bd2d98
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTkvebXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88GHQP/ikRHqjGaqMOvNG6FLLtcArO
-agPG2Ax0INCR/HP8LwgrIqNu56NRKFT70Jm+Pt3GG5nSUJgEYHpnRX0FI/D3WN5T
-5aoXdB2h1m0tiIgGy5KcjBm24lLEojHndTOaVvpyiT2CysVlFyyoQrfPv2fvr0zS
-uIx4ENBJbHD8d/QnUtkmKn3BYZQiCcy+hXoE1foJmxDWkXyYaGwJOjTJ33JQaD0Q
-0TZLgjtiBDcuGphD1G9NghGUWDvDGJb/Bvay2BMsnGMkDGcSAyJupllYpBPfqZfy
-J5d6C6a5GPeSIh8WQgRAbbX8SXLxSdmAP5QshL9bTCj4ooaumXWU5EOZGj8qybNi
-xBST7l+9iZy/7ByEXVSR2tEgaXRceN4ds2QSCW0jifY0Z+y8hbZJ3cLyEvZ1xMOu
-WmsqvH2atC2za9G9CaEvgNNNm2TYGeO5tb7zUFD3bIfIFlpUDBUe1768CzPNS3xm
-/HWxzEzXkfZRHb+sPEb9HLRrxF1lDHqBOelaFA+C7Hhtv7nwdQv1qU18B2Wp9UX8
-1R3jvkAaTOqJayr++X3hqCX8UQLuQwHVHwJ1yW/Mr7SAuSvRN/DDlv8H2Y5IlseG
-yT0je6kbMQogLLiDHM8JcVYq/cwAKZ4fihoiULtSVP5qu3nH7sDoRDvXShTq3wjy
-t8LeRdnBpI3HdISHVxRS
-=yu27
+iQIcBAEBCAAGBQJUqgOfAAoJEJIMDbyqvv1VgVoQANzMeacE0jYig6x/GlN0JUgy
+qJMmF5oEGIUGejOib1N7lMx7jFVs+d2Co+HhnbyLCIycBGyKHeJBH9amt8EfTh1h
+SXFMSsDVpCttAHk8HSyXn5CnrwLqTmDeIb0hjoYY7mTc/nOwBJg07VKKsv+ds4Iu
+D2Vvf5TBFXnzFP7U0tQAdHlN06OiSrzIsCLlnZyXCGtyAHzkdjmiCHe/BLntuV0R
+eukrbr5lGb9JXMKC6o53+qAorUFEXQ5PRXYhpc4v3QGxWJk7UWp0z3iIzmmajbUf
+lV3mcEqjeeQ4jVCiULqqNQP7oRW487Cfvm/a6bAK8E7IIiNYumSzMSJ8rIZETLo5
+NSypE3ERE1wMAaWTqpqNJqkQiT6by2FsONTZmbC01n6HZIDHl1zZFRi4kxALGyTO
+t+qAitcq5Jp/+zuZUU5SXD+UGYZq17dFZCI5c43Vg1Rj5OEMcxlNPc5MD5wGCSL0
+zzZPYMyIME54CxrI1yX7pNDJdlCnxS5pavPxzY8legqL3RL8KSm4HVcQWS62h0/n
+bSFBag5p6DPAvn54vysUzjGOcRHzkaaOtwTGTCgTueOnMyR+AKgKBEJNLDAdQ7Go
+o8lViejsrKRoHSNQ9ELQ6c7Bk4Ve39c9wIxRXn4HnE3Z0nkckT5vM4dxDBunmDyD
+s2VDv5g8qw3VV+zUwGCl
+=GbJy
 -----END PGP SIGNATURE-----
diff --git a/app-admin/webmin/files/gentoo-setup b/app-admin/webmin/files/gentoo-setup
index 3443bb02f67a..0c2dd2d186d1 100755
--- a/app-admin/webmin/files/gentoo-setup
+++ b/app-admin/webmin/files/gentoo-setup
@@ -94,9 +94,11 @@ if [ "$upgrading" = 1 ]; then
 	real_os_type=`grep "^real_os_type=" $config_dir/config | sed -e 's/real_os_type=//g'`
 	real_os_version=`grep "^real_os_version=" $config_dir/config | sed -e 's/real_os_version=//g'`
 
-	# Get port, ssl, ssl_redirect, no_sslcompression and keyfile
+	# Get port, ssl, no_ssl2, no_ssl3, ssl_redirect, no_sslcompression and keyfile
 	port=`grep "^port=" $config_dir/miniserv.conf | sed -e 's/port=//g'`
 	ssl=`grep "^ssl=" $config_dir/miniserv.conf | sed -e 's/ssl=//g'`
+	no_ssl2=`grep "^no_ssl2=" $config_dir/miniserv.conf | sed -e 's/no_ssl2=//g'`
+	no_ssl3=`grep "^no_ssl3=" $config_dir/miniserv.conf | sed -e 's/no_ssl3=//g'`
 	ssl_redirect=`grep "^ssl_redirect=" $config_dir/miniserv.conf | sed -e 's/ssl_redirect=//g'`
 	no_sslcompression=`grep "^no_sslcompression=" $config_dir/miniserv.conf | sed -e 's/no_sslcompression=//g'`
 	keyfile=`grep "^keyfile=" $config_dir/miniserv.conf | sed -e 's/keyfile=//g'`
@@ -139,6 +141,8 @@ else
 	echo "logtime=168" >> $cfile
 	echo "ppath=$ppath" >> $cfile
 	echo "ssl=$ssl" >> $cfile
+	echo "no_ssl2=$no_ssl2" >> $cfile
+	echo "no_ssl3=$no_ssl3" >> $cfile
 	echo "ssl_redirect=$ssl_redirect" >> $cfile
 	echo "no_sslcompression=$no_sslcompression" >> $cfile
 	echo "keyfile=$keyfile" >> $cfile
@@ -206,7 +210,7 @@ if [ ! -f "${pidfile}" ]; then
 		systemctl start webmin.service
 	else
 		rc-service --ifexists -- webmin start
-	fi	
+	fi
 fi
 END
 
@@ -305,9 +309,22 @@ if [ "$?" != "0" ]; then
 	echo no_sslcompression=1 >> $config_dir/miniserv.conf
 fi
 
-# Make Perl crypt MD5 the default
-echo md5pass=1 >> $config_dir/config
+# Tighten SSL security
+grep no_ssl2= $config_dir/miniserv.conf >/dev/null
+if [ "$?" != "0" ]; then
+	echo no_ssl2=1 >> $config_dir/miniserv.conf
+fi
+
+grep no_ssl3= $config_dir/miniserv.conf >/dev/null
+if [ "$?" != "0" ]; then
+	echo no_ssl3=1 >> $config_dir/miniserv.conf
+fi
 
+# Make Perl crypt MD5 the default
+grep md5pass= $config_dir/config >/dev/null
+if [ "$?" != "0" ]; then
+	echo md5pass=1 >> $config_dir/config
+fi
 
 # Set a special theme if none was set before
 if [ "$theme" = "" ]; then
@@ -333,6 +350,13 @@ if [ "$themelist" != "" ]; then
 	echo "preroot=$themelist" >> $config_dir/miniserv.conf
 fi
 
+# If the old blue-theme is still in use, change it (new in 1.730)
+oldtheme=`grep "^theme=" $config_dir/config | sed -e 's/theme=//g'`
+if [ "$oldtheme" = "blue-theme" ]; then
+   sed -i -e 's/theme=blue-theme/theme=gray-theme/g' $config_dir/config
+   sed -i -e 's/preroot=blue-theme/preroot=gray-theme/g' $config_dir/miniserv.conf
+fi
+
 # Set the product field in the global config
 grep product= $config_dir/config >/dev/null
 if [ "$?" != "0" ]; then
diff --git a/app-admin/webmin/webmin-1.690.ebuild b/app-admin/webmin/webmin-1.730.ebuild
index ae64051f9906..223d5b840f5f 100644
--- a/app-admin/webmin/webmin-1.690.ebuild
+++ b/app-admin/webmin/webmin-1.730.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.690.ebuild,v 1.1 2014/06/07 11:29:32 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.730.ebuild,v 1.1 2015/01/05 03:23:01 dlan Exp $
 
 EAPI="5"
 
@@ -26,7 +26,9 @@ IUSE="minimal +ssl mysql postgres ldap"
 # to install them using the in-built cpan module, and this will mess up perl on the system
 # That's why some modules are forced without a use flag
 # NOTE: pam, ssl and dnssec-tools deps are forced for security and Gentoo compliance installation reasons
-DEPEND="virtual/perl-Sys-Syslog
+DEPEND="virtual/perl-MIME-Base64
+	virtual/perl-Socket
+	virtual/perl-Sys-Syslog
 	virtual/perl-Time-HiRes
 	virtual/perl-Time-Local
 	dev-perl/Authen-Libwrap
@@ -284,8 +286,10 @@ pkg_config(){
 	export os_version='*'
 	export real_os_type='Gentoo Linux'
 	export real_os_version='Any version'
-	# Forcing 'ssl', 'ssl_redirect' and 'no_sslcompression' for tightening security
+	# Forcing 'ssl', 'no_ssl2', 'no_ssl3', 'ssl_redirect' and 'no_sslcompression' for tightening security
 	export ssl=1
+	export no_ssl2=1
+	export no_ssl3=1
 	export ssl_redirect=1
 	export no_sslcompression=1
 	export keyfile="${EROOT}etc/ssl/webmin/server.pem"