Fixing bug #78017 on new emerges.

Package-Manager: portage-2.0.51-r12

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 9ab9d518b5b996839b463dcc434dcbc3732ad260..98ce58feea7e1c2e0e3406f7225e0cd8541ced5f 100644 (file)
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/webmin
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.71 2005/01/13 13:19:13 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.72 2005/01/15 05:13:10 eradicator Exp $
+
+  14 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  webmin-1.170-r3.ebuild:
+  Fixing bug #78017 on new emerges.
 
 *webmin-1.170-r3 (13 Jan 2005)
 

diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index c315cb14da971edad612f65bbb621f607a736d53..95c76fd12c8a6d6d19ee3ebed5ed88a89c588712 100644 (file)
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -3,9 +3,9 @@ Hash: SHA1
 
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
 MD5 71f6129acd61d2e8309c7d4c3e962659 webmin-1.170.ebuild 2697
-MD5 f0e3049b6840ef1a15f7095626964640 webmin-1.170-r3.ebuild 3670
+MD5 b40064cf8c0ec2b92933d6b251da891c webmin-1.170-r3.ebuild 3721
 MD5 e626ba52c08958842e196639ca78255e webmin-1.160.ebuild 2689
-MD5 be297c895aa2c00246c2bd2d2a45a505 ChangeLog 10400
+MD5 1148f029996c1f885e7f4954f7c8d9e2 ChangeLog 10520
 MD5 7d80c86adbd36eeb8f220b9efdd30819 files/webmin-pam 101
 MD5 54dc8937e05bd76ad86a6c5f5ae6a333 files/init.d.webmin 859
 MD5 58f9530c780e652271313555858ad909 files/digest-webmin-1.170 138
@@ -24,7 +24,7 @@ MD5 512204473654b6eb41308d3319ba6144 files/webmin-1.170-setup-nocheck.patch 943
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB5nW3ArHZZzCEUG0RAii8AJwKowvK2hEfOKxxvNhxJu0EAr9n2wCfSuAS
-9SJVkeHPXOlN9qlbfrAMMh0=
-=hHS+
+iD8DBQFB6KZyArHZZzCEUG0RAv5tAKCHXqa71TWMLYS7BBgCK8AmEOfmZwCfY/7p
+0Z2iiPNWMJhJvBeJHLyIms8=
+=x9P7
 -----END PGP SIGNATURE-----

diff --git a/app-admin/webmin/webmin-1.170-r3.ebuild b/app-admin/webmin/webmin-1.170-r3.ebuild
index 1868ba791b120eb069d0703e4e32be803af2cbc1..6dce15c39b668eac49ad84cc53282a25a140b3ec 100644 (file)
--- a/app-admin/webmin/webmin-1.170-r3.ebuild
+++ b/app-admin/webmin/webmin-1.170-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.170-r3.ebuild,v 1.1 2005/01/13 13:19:13 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.170-r3.ebuild,v 1.2 2005/01/15 05:13:10 eradicator Exp $
 
 IUSE="ssl apache2 webmin-minimal"
 
@@ -118,7 +118,9 @@ src_install() {
 
 pkg_postinst() {
        local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
-       dosed "s/root:XXX/root:${crypt}/" /etc/webmin/miniserv.users
+       crypt=${crypt//\\/\\\\}
+       crypt=${crypt//\//\\\/}
+       sed -i "s/root:XXX/root:${crypt}/" /etc/webmin/miniserv.users
 
        einfo "To make webmin start at boot time, run: 'rc-update add webmin default'."
        einfo "Point your web browser to http://localhost:10000 to use webmin."