The SA51201 patch does need to apply in the minimal version

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xB4AFF2C2

3 files changed, 23 insertions, 20 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 8e12ecc02749..8a14016bc2fd 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/webmin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.200 2012/11/05 21:40:01 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.201 2012/11/07 18:51:57 hwoarang Exp $
+
+  07 Nov 2012; Markos Chandras <hwoarang@gentoo.org> webmin-1.600-r1.ebuild:
+  The SA51201 patch does need to apply in the minimal version
 
 *webmin-1.600-r1 (05 Nov 2012)
 
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index b1fea467b9c1..68fd02c76817 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -6,23 +6,23 @@ AUX init.d.webmin 2254 SHA256 c596712f1dffd69a618055372a39245ecf732a3bbcfadf6c26
 AUX webmin-1.600-SA51201.patch 3338 SHA256 cf66e9d7e4f51301b903debf58f861530911b3d5c757dd4e1ac3f4b14b35ec74 SHA512 5441f727a15ac004af51e9499bf2714ea68a942e5d6181fb7dad4fa9d973b2090981652e21ea50ba98a6390f93bc232734396f0ddafc1083b7d5101d1c81c27d WHIRLPOOL 304747f61a5bda45ed45cfdc37a8a2d6230239587434b3ac939c5de9b1cbb5d73c680e9a669f46cd818f80a43321d1a509c453f5c4a81f0799629e3d461a6bca
 DIST webmin-1.600-minimal.tar.gz 2432340 SHA256 6ffbd63da362638784b2b45ca2f3b46e89b78a868b8d0eb1c73499bcdb90207f SHA512 8fb4cbed2dcc85a0542ee5035637fe05abf45a90e53600112d31353725aef026f513063ea44341639d4d820e0f9336c58b955d490558927b999013b476710268 WHIRLPOOL 5c231e4cc28a985235b8eb8c62ec69e94e03797d9bb818e506c9f112bb1f7c8ff59dc28d10c43019b06f5ad214f30d05ccc967261274bc62a385ddea348ffff3
 DIST webmin-1.600.tar.gz 21397348 SHA256 a45ddad342e9a3b9263f45749ec1d440e0702645c6297310701e988f5f1c74a9 SHA512 bd73ba2ed6df9ed7c6e336ea07571ca17f552f1d41ffda2f78ea00f43e31e4652a9afc8877addc5cd2bdcfebae1d787294601f17cfc43db78c3682a6200fe0d6 WHIRLPOOL f27abf2ec43a9cc6f04ea4ab019628a83e3f305ebfa27a435787167289c92a4f4a0cf9464e7cdd18e37b59846fb10e8dd64dd46f318c3421369dd51e0b95c391
-EBUILD webmin-1.600-r1.ebuild 9140 SHA256 2ea21fb871f51c884d654c386c4a0c6e1a55abdbae71d999cd6426e21c53c6d2 SHA512 d46e8b9c9fc4dae08d96c37dbf6969824af1efa0579fdc5937166e533a3f06dc3c79d520dc3d360d21525442874730f717efc001686ac74461ef0aed6b326aa4 WHIRLPOOL d2da93c55f4c56a6f0d02e7aee004a09de3afa36ecb1f7c7b32f824ea2b9c98dd339995bd53b692730c80483d0f8872f957f4e482e5ffb11646f29ee9dd057df
-MISC ChangeLog 2459 SHA256 2714dea85519c34f98ac8d618ec4bac1151b1b4505285b992b14ced9a72c0e55 SHA512 45233d966706e1323c4d721ff08f6a7419b432423360c0bd6d09f3d854407126be792d7b19e1a71604ea0fc615ecf15a208c79b26b99269bf3142272b74c412f WHIRLPOOL 19397ea5902533af278979e5cec4d0a057c62a641ca2b8df232e12c758f36e7f4fc1f5f0457f4f2daa39c78e95e72da7524621e1fa49d42f2aa34475623a0cc2
+EBUILD webmin-1.600-r1.ebuild 9142 SHA256 65d8b20ccdbc095889aba0e1c0687233168a3b82642e44ac6392ebc44ffa3672 SHA512 60c1288d6cc74c5bb52e0eac12198b8d883c9c69b3137c557c4297ba60add8e1dfa72a1120ef7a5dea421fdc69ea58ecb0d5e9031e7cb709e6b7a8123af2bb24 WHIRLPOOL 4666b2a26f175616e156a51cf9576d6fe408aa1b30446a6632092a3ab20a3621e3743c4f1fe755989544ae5fb65d9d200ce1ca83c103f6fc7014a397e708a38a
+MISC ChangeLog 2599 SHA256 373ec1687ae2c2575f9b4f636087a784d6ded0a7af7b7a7bd921dda13236e874 SHA512 bb7e82b1b65d21162a8ddae2bba21b001bbe7c1b7af2bc50d5617f9b28c869df6d9865ae2946eb20db58ab081aed32d17771087a73378b8fda0082a775e699a8 WHIRLPOOL f3e8c109c5c6454d6712ed4970c2d767439a69e60643e09dc6af955d569ae167225f3d9c29ecf358f8a177f4da4e1cfa0a45267dd2552d8a88888937986ab79d
 MISC metadata.xml 496 SHA256 ae874cee0c2bc4eb921cd7dfa1f9b3f390e86feaab5ffd5194283f89d2ded5e3 SHA512 78df915de2d5da5562f43b01653e1649d82eb5a526a7f8ac8bea5d5990a49af9dd52b1d15fd00b7f92ae679705c2c916c0f8da9b270023c5bab860aabe210336 WHIRLPOOL 8b25e2c8cf98ac8293fbdebaf50181194cae05042d5b89ce96edaa75a6ec4e1a107c0de921abfc7a8aef723c02f49737f43de2cf0f049d0bec1af661356df0d6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQmDIwAAoJEPqDWhW0r/LCJgwQAMJ10ggNPV2kqVE8HYt01PDO
-JHZ4UEJhZUu9eyOMib1xB9n6e9LpYao/Pvy+fSe2ufVdCEqyLvv97/bpFX34IIFu
-vuPWkseadFp7tWPUfk+oArk0kmfuN0KkgBqpTh5AJfB5Kd7+96DiU/RSXXKe0ngq
-n0ec1yMV+QyxIDpUXa36xPz46eKUCdy9fcPAM3h2Bef8vqGD6cMUBM0KfGAxIFKB
-xmaxRDAoaEzkVO7kuJ2pk9+bos7TH+m2URm7QSr0+orQihstuhNYIus/YNMJiaRg
-lV1t4rWPXENmwr5YbASFo4ZRAbouUfGXC/M9xRnTAhjRO3C3EQkqPIID1FbqkC2h
-R6D+NSBxOgeTGPYXoQtZT5qh6clLn+7d+5WyGIv+wMnc1cu50gjkdRytjHNNRofB
-A3lWiPUq2Mq6DD8Jz7usachVp5BJevrckyXOFbrFIb9HoCYI4pnOMUBw3XQaZ0Km
-/9TjI5auHzno1VHF/cqKEqiLQzos0wR4ZOJ5TymP6a/WNlF3AUBPQKjm8BlzgSbf
-xy6JKezfkOcDO63BYACeXXvDOOGrv8MARcFoBF26nGzBsDCF7CT2l8FGD6lwwNSR
-met8qPJlXG9d8gSFhrdoMixj32nqLMeet4DGMBxGWan805Wvy+LhLuCqyfe4Qw7R
-TlJaWbzywNIseQwibTb6
-=O5eM
+iQIcBAEBCAAGBQJQmq3OAAoJEPqDWhW0r/LCQEUP/jhV+n7qtlYIAqXvp3/WFjay
+Nko4Pz7kfydXIBYra9fILCQKxng+kJSj+DZe32JatTho6mhvELnSX/Zfd7FG7s1j
+l2U89h1dDY/2ywe2u8Z7rtSt/e1vS/vVs6j9qNi9LEn6FjkOnIRa5s0TBsml1RTB
+gyIkf228ldo6QtmrfiGAq7dNleMHA2N6MEwvo8nijjPJrnE4FskcjS/7bUVEyh7y
+cuPEZQn7+ukarWcYqdyLrkBtJmx8Z7OnFBYT4c+4snYeTXhFbGuciQXyczkV9Dpx
+ruZ7Wrh5EYse9YRSRn9/lH+bNpAQBePyBeKzwXacjpbGgvc/+dtH+J+A1NrzpyeR
+L9HD1qbkBgMaNrXANG6hSDGx+lqLm8qzaW+GbvRluVif8cY7S5I03XPf9IEjSs84
+baa0OcssYQnvJD7Bfw6NXn5Zu/lA8YrUuoHXZpIpqzu3mCRq6u1zU02RPBWfVEqZ
+en2B8IdWa4Mo/uG8qVbN28DErCt7JZ3GpK/swdPdDJLaNPrcG0oYLMg+i/8O5d/j
+SqxSG6R8E5GRQYAkEM5SsMRmNpprIasOyNgeQCoPC7Q7AIKkuTal2fKGXFbCTigZ
+2hvAtZoxTkA+Zn43YlDZUSIDJqRvIbpB6etvwW4pdzRm4hOEQc+5jLuCPJNsP/Zt
+qw26mkTV380WKEvG6RJJ
+=XfFy
 -----END PGP SIGNATURE-----
diff --git a/app-admin/webmin/webmin-1.600-r1.ebuild b/app-admin/webmin/webmin-1.600-r1.ebuild
index 1d2e90d61103..939ce83a12a4 100644
--- a/app-admin/webmin/webmin-1.600-r1.ebuild
+++ b/app-admin/webmin/webmin-1.600-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.600-r1.ebuild,v 1.1 2012/11/05 21:40:01 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.600-r1.ebuild,v 1.2 2012/11/07 18:51:57 hwoarang Exp $
 
 EAPI="3"
 
@@ -46,9 +46,6 @@ DEPEND="virtual/perl-Sys-Syslog
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	# Fix security bug - https://bugs.gentoo.org/show_bug.cgi?id=441840
-	epatch "${FILESDIR}/${P}-SA51201.patch"
-
 	local perl="$( which perl )"
 
 	# Remove the unnecessary and incompatible files
@@ -57,6 +54,9 @@ src_prepare() {
 		rm -rf {format,{bsd,hpux,sgi}exports,zones,rbac}
 		rm -f mount/{free,net,open}bsd-mounts*
 		rm -f mount/macos-mounts*
+
+		# Fix security bug - https://bugs.gentoo.org/show_bug.cgi?id=441840
+		epatch "${FILESDIR}/${P}-SA51201.patch"
 	fi
 
 	# For security reasons remove the SSL certificate that comes with Webmin