diff options
author | Jeremy Huddleston <eradicator@gentoo.org> | 2006-10-16 19:14:58 +0000 |
---|---|---|
committer | Jeremy Huddleston <eradicator@gentoo.org> | 2006-10-16 19:14:58 +0000 |
commit | 5c30b838a9daded0077b0fe13462cedd5be52f5b (patch) | |
tree | 5c1bd6044f98fc19190c4f1bdb46020a617c0032 /app-admin | |
parent | fix multilib-strict QA checks (diff) | |
download | historical-5c30b838a9daded0077b0fe13462cedd5be52f5b.tar.gz historical-5c30b838a9daded0077b0fe13462cedd5be52f5b.tar.bz2 historical-5c30b838a9daded0077b0fe13462cedd5be52f5b.zip |
Version bump for security bug #145829.
Package-Manager: portage-2.1.2_pre1
Diffstat (limited to 'app-admin')
-rw-r--r-- | app-admin/webmin/ChangeLog | 10 | ||||
-rw-r--r-- | app-admin/webmin/Manifest | 40 | ||||
-rw-r--r-- | app-admin/webmin/files/digest-webmin-1.300 | 9 | ||||
-rw-r--r-- | app-admin/webmin/files/virtual-server-3.23-nocgibin.patch | 13 | ||||
-rw-r--r-- | app-admin/webmin/files/virtual-server-3.23-pgsql.patch | 14 | ||||
-rw-r--r-- | app-admin/webmin/files/webmin-1.300-postfix.patch | 22 | ||||
-rw-r--r-- | app-admin/webmin/webmin-1.300.ebuild | 135 |
7 files changed, 228 insertions, 15 deletions
diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog index 0f2cbe9be204..c4830edca86f 100644 --- a/app-admin/webmin/ChangeLog +++ b/app-admin/webmin/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-admin/webmin # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.126 2006/08/04 16:55:04 tcort Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.127 2006/10/16 19:14:58 eradicator Exp $ + +*webmin-1.300 (16 Oct 2006) + + 16 Oct 2006; Jeremy Huddleston <eradicator@gentoo.org> + +files/webmin-1.300-postfix.patch, + +files/virtual-server-3.23-nocgibin.patch, + +files/virtual-server-3.23-pgsql.patch, +webmin-1.300.ebuild: + Version bump for security bug #145829. 04 Aug 2006; Thomas Cort <tcort@gentoo.org> webmin-1.290.ebuild: Stable on amd64 wrt security Bug #138552. diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest index 08a33d905673..140e00134afb 100644 --- a/app-admin/webmin/Manifest +++ b/app-admin/webmin/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX init.d.webmin 859 RMD160 3b08582c897721d9511d2cdb34b259ade6bf8225 SHA1 e6b36175db577c3878fb1357b453f9fba396db8f SHA256 8a96c59989ba2a3ae116b9155f72c058dc56be24da355ee1fae43588096520e8 MD5 54dc8937e05bd76ad86a6c5f5ae6a333 files/init.d.webmin 859 RMD160 3b08582c897721d9511d2cdb34b259ade6bf8225 files/init.d.webmin 859 @@ -33,6 +30,14 @@ AUX virtual-server-2.610-checkip.patch 703 RMD160 21c32714ba93c489b545362e65d02c MD5 2e5e13d75a542015f01283316fdcf16d files/virtual-server-2.610-checkip.patch 703 RMD160 21c32714ba93c489b545362e65d02c06cc28c92f files/virtual-server-2.610-checkip.patch 703 SHA256 dbaebb30bc221aba099f2ea7f1a865edb82d9af8dcadbb4e616b04283257075d files/virtual-server-2.610-checkip.patch 703 +AUX virtual-server-3.23-nocgibin.patch 616 RMD160 61074351e8fd1bcb161e5360b57f477e2ec2b451 SHA1 efffa7d438a2f89049933284b7d0ce5444b02c25 SHA256 1a67a05d722994003b0751b8b62a9ca08b21d1638bb80491584ec558b634ab67 +MD5 70e758bab5d0d64ec4f8872d5c28845b files/virtual-server-3.23-nocgibin.patch 616 +RMD160 61074351e8fd1bcb161e5360b57f477e2ec2b451 files/virtual-server-3.23-nocgibin.patch 616 +SHA256 1a67a05d722994003b0751b8b62a9ca08b21d1638bb80491584ec558b634ab67 files/virtual-server-3.23-nocgibin.patch 616 +AUX virtual-server-3.23-pgsql.patch 626 RMD160 91c79ab0615b9555888104b88181974fb36e7d69 SHA1 ec42024a389c66b52be8aa83b225b513af31dedb SHA256 deedb2228f710da2163714f4e76519e8ea6375a981946d3d1af9bf659750c1a9 +MD5 40849da9a18330b246a375b228a242e7 files/virtual-server-3.23-pgsql.patch 626 +RMD160 91c79ab0615b9555888104b88181974fb36e7d69 files/virtual-server-3.23-pgsql.patch 626 +SHA256 deedb2228f710da2163714f4e76519e8ea6375a981946d3d1af9bf659750c1a9 files/virtual-server-3.23-pgsql.patch 626 AUX webmin-1.140-apache2.patch 1250 RMD160 d6085f73b3631f28e4d8154288271fd911bce491 SHA1 f2c751f8e27cf8b250eed2934d054766e1d13363 SHA256 024291db8cd2606cdaeee3e6688c2abd75516f9ed8de6fceb337338e1601b6ac MD5 395e49092aa7b9e808d3e9d723508884 files/webmin-1.140-apache2.patch 1250 RMD160 d6085f73b3631f28e4d8154288271fd911bce491 files/webmin-1.140-apache2.patch 1250 @@ -53,6 +58,10 @@ AUX webmin-1.270-ldap-useradmin.patch 582 RMD160 a61b31b787aa1e8c4c63f04c00736ac MD5 5d06113bd08dbb7320efb398aa6ca1d2 files/webmin-1.270-ldap-useradmin.patch 582 RMD160 a61b31b787aa1e8c4c63f04c00736ac574262fbe files/webmin-1.270-ldap-useradmin.patch 582 SHA256 57c8766c7c46a3d9a34099ba4285b39f23b538241f563455c83866945d3a73ef files/webmin-1.270-ldap-useradmin.patch 582 +AUX webmin-1.300-postfix.patch 985 RMD160 1901eac1d2155c43c52cf9a3270666165c181d02 SHA1 6a5c68648e06dcd78752aebf43733ff154018550 SHA256 12a5fb28eebd1238b91e3bea0bf35ce46816d163663055e2744bec3671745f7e +MD5 8a3207e00bb1e86b1b6cbe14b510c35a files/webmin-1.300-postfix.patch 985 +RMD160 1901eac1d2155c43c52cf9a3270666165c181d02 files/webmin-1.300-postfix.patch 985 +SHA256 12a5fb28eebd1238b91e3bea0bf35ce46816d163663055e2744bec3671745f7e files/webmin-1.300-postfix.patch 985 AUX webmin-gentoo-init 864 RMD160 6e584eb9bb77b014e688cc13bdce99f315fec41b SHA1 963d9fd8b6faee0e1751c1b898d832bddf9f463f SHA256 f27fb9f944f32994858a3d27aa78d03742618c53267f31bca85d9f65da1c757b MD5 6a55026b21c4da9284b31236deeceda7 files/webmin-gentoo-init 864 RMD160 6e584eb9bb77b014e688cc13bdce99f315fec41b files/webmin-gentoo-init 864 @@ -64,6 +73,7 @@ SHA256 93df67451eae9866fcbc23453c18c4fe23a7b5c8dd879de16c09b476d1db597f files/we DIST virtual-server-2.609.wbm.gz 281789 RMD160 aa84090cc2f4c571ff1fca9654f4ec31d08472e1 SHA1 0963c09968b88c81ac5bff46a519b173051096d0 SHA256 f466bffb3d6c9cd102ddb0877d2cb283f6d67dbc9412f0b4b4dbb2319e316b1a DIST virtual-server-2.610.wbm.gz 281828 RMD160 03ceb41b68ca454138fd41fbce135c5f20f2473d SHA1 9562de39c944ecba606e4fe19f1a123a41ab65fc SHA256 7ed07d52fe6697217835aa97f63422aafc4ff166693482e93aa9a6adb55ce489 DIST virtual-server-2.611.wbm.gz 283217 RMD160 bbcee33f9398a78d7e8a68168316f011d2cf391d SHA1 eb40437cb6774317bca20581644879bb95ef4558 SHA256 f7579da94a6b356ce4548a0ed8fcc366e1d8e7e7199e5337e8d703bf4f92090a +DIST virtual-server-3.23.gpl.wbm.gz 379417 RMD160 912ba4ff66b7644f05e7e5b52286b5a41cf7163d SHA1 1b032a1463547ecf3f792ec051c93c5a79458086 SHA256 c5631f73921058df40a08b0d248bad1acf1dd5b7ded451c7c6f9fff1d923a360 DIST webmin-1.250-minimal.tar.gz 1269765 DIST webmin-1.250.tar.gz 8928214 RMD160 5d1d50af6032bc261b47721fe53db945f0412504 SHA1 93540aaccaac8e2b9379b7709ff5d853cf36c734 SHA256 961b6b6873c8e8683134326eaec31a66a68a929caaed3f14a8ad92b387ed9af3 DIST webmin-1.270-minimal.tar.gz 1301974 RMD160 94847d56eb9aebefc234178656dc53daa3af91c6 SHA1 31fa4cf18205a0dac74e38290a03950450abae26 SHA256 ee55df6476812289a42d75d5b7833bb666500d0321a80056fa4ba006032083dc @@ -72,6 +82,8 @@ DIST webmin-1.280-minimal.tar.gz 1396687 RMD160 08cd7b50952e89f92a8356afd1a03ac3 DIST webmin-1.280.tar.gz 10299513 RMD160 de915cfca7b9fa7c0eb0e3c060434273f4963ae6 SHA1 8a8a2211ed41198fc5757187c50c36a7c4475bda SHA256 b6d911dca8dcbbdcf5d650b14f9c5ea04a279aa48ae54b4c20e023fda462fd78 DIST webmin-1.290-minimal.tar.gz 1397131 RMD160 87d043f5a4aadd00066e6f9bb8d300732e340a4f SHA1 00297b11f19d368260306727ffffcb4eac379755 SHA256 e9f7afdc67ab3f96ac9fe8cdeed986e98c25de7c9d55c6b90b8617e90a078614 DIST webmin-1.290.tar.gz 10324511 RMD160 ecf80a2abf295ad9b3f05034da47a500202ee0e0 SHA1 4b1b1ab1da5d3a696c0ee0af9a9f858536ca1417 SHA256 98a547d1a1aeeca4fb71a529b55514e7a8b35471de884e169c549df65923d321 +DIST webmin-1.300-minimal.tar.gz 1404945 RMD160 cb5bab5a5f34b9bc256d7ed91677441018ef6d6a SHA1 d52acdc3ea67d6b15754dceb82fe99b8ac8c0e3e SHA256 29cc112d99995acc74a2dc69aaa6cf0eb2b1169307b0485d70661b7c03a40c98 +DIST webmin-1.300.tar.gz 10782513 RMD160 1259e16725ea7f2491dd91d2d6eef8e80f1240d8 SHA1 c510fce1bee04729bfa84a1fca975aa0a789f3bb SHA256 d5ce8bb7ef0c3e0d38ebd43e962aba984276dc6f23f8f913f712aaac2f17b1a4 EBUILD webmin-1.250.ebuild 4106 RMD160 50a3307e3c3f14e8d049304a4936d36465fb0d45 SHA1 7f4f14e02572631293e749a248744d2bc8e61728 SHA256 2a10a6f7f2bee1838d5fbef929c5cfc799a64f8fc40b7e3a8c55a1c0ee60686b MD5 feeac49d3448abf1d8e155f3a63d3b11 webmin-1.250.ebuild 4106 RMD160 50a3307e3c3f14e8d049304a4936d36465fb0d45 webmin-1.250.ebuild 4106 @@ -92,10 +104,14 @@ EBUILD webmin-1.290.ebuild 4114 RMD160 2ae200cbd7c96883c930575142e0af2aa1b019c5 MD5 c72372741ca9cfc5d9e6cdb55da1e916 webmin-1.290.ebuild 4114 RMD160 2ae200cbd7c96883c930575142e0af2aa1b019c5 webmin-1.290.ebuild 4114 SHA256 e13b0d34026ff06c1928ae8f9d76123b15f3b14e3383f9a063255563c2f7c1b3 webmin-1.290.ebuild 4114 -MISC ChangeLog 17523 RMD160 39406e193eb81847d44fb615867c7117d323867d SHA1 c7ee03888c8140807c968987784040afe57b1f0f SHA256 d0e95c7831ab69b2e88f575cdb1eb4b2199c1c5a491b15a0818eaffeb144686c -MD5 03c8973b96da981edb177ccc5b564c81 ChangeLog 17523 -RMD160 39406e193eb81847d44fb615867c7117d323867d ChangeLog 17523 -SHA256 d0e95c7831ab69b2e88f575cdb1eb4b2199c1c5a491b15a0818eaffeb144686c ChangeLog 17523 +EBUILD webmin-1.300.ebuild 3928 RMD160 6b2e0b6adf3dec3a424ac08be5a09157dcf6c6be SHA1 1454a4857cd5cfbb3be780e607c99aa0dabc1761 SHA256 3ea58c1c087e34ab4db2a0249cf75e378419a18428f86b14ac74735e6f802445 +MD5 195f1fd4ebc00dfc20fa64ad829ba951 webmin-1.300.ebuild 3928 +RMD160 6b2e0b6adf3dec3a424ac08be5a09157dcf6c6be webmin-1.300.ebuild 3928 +SHA256 3ea58c1c087e34ab4db2a0249cf75e378419a18428f86b14ac74735e6f802445 webmin-1.300.ebuild 3928 +MISC ChangeLog 17802 RMD160 f3b88d0309f7b404c7ba7683899e292085e5986d SHA1 189bf2beabe35004892e484cc0e46692899eecfd SHA256 79aef2034f100d2482d115c5117b7ba9962be25d36b33d9052294ae027dc6f40 +MD5 7401c8bc8551db4cb6ec3beb9fd18343 ChangeLog 17802 +RMD160 f3b88d0309f7b404c7ba7683899e292085e5986d ChangeLog 17802 +SHA256 79aef2034f100d2482d115c5117b7ba9962be25d36b33d9052294ae027dc6f40 ChangeLog 17802 MISC metadata.xml 226 RMD160 5ae23077f29775d25714161f12bee0773317ea90 SHA1 e128d6143915f277d78c38141025f8b781354b0a SHA256 2dedab96a5432a22169e538ec05751e1631088c658b557056de4d6ab4b89013f MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226 RMD160 5ae23077f29775d25714161f12bee0773317ea90 metadata.xml 226 @@ -115,10 +131,6 @@ SHA256 4eb18f4f477be9fbe681b5108289d94d43e2615b949e186c07b6083a0437524e files/di MD5 4ae5c41e6e43ad3cee543b6188d747f4 files/digest-webmin-1.290 771 RMD160 067a6ea1ff4f629bb40dbd3d84f3c50f638a6ca2 files/digest-webmin-1.290 771 SHA256 729f06a31c4c42e2f0d7c39244df0b0bbba2117c2f5661ff562018535ddd4eb7 files/digest-webmin-1.290 771 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.4 (GNU/Linux) - -iD8DBQFE1hb0amhnQswr0vIRAoBYAJwNOwSnaHSoKuvgwG16wQqZv0VCOACffYEq -taTY9JIhasRtOZtmIvXMGjA= -=+B59 ------END PGP SIGNATURE----- +MD5 8e53e5db8ddeba481c2e756abd1894b9 files/digest-webmin-1.300 780 +RMD160 cd43f9975c8658e11059ab77ba1303c5201579be files/digest-webmin-1.300 780 +SHA256 9e1e25b807367456f797f4d6c2ec9e232ae5f33dc614c141c4c816caf4a23a10 files/digest-webmin-1.300 780 diff --git a/app-admin/webmin/files/digest-webmin-1.300 b/app-admin/webmin/files/digest-webmin-1.300 new file mode 100644 index 000000000000..bd5a7c8ef3f1 --- /dev/null +++ b/app-admin/webmin/files/digest-webmin-1.300 @@ -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 5d232a887529aa0376fe281d9027f9a5 webmin-1.300-minimal.tar.gz 1404945 +RMD160 cb5bab5a5f34b9bc256d7ed91677441018ef6d6a webmin-1.300-minimal.tar.gz 1404945 +SHA256 29cc112d99995acc74a2dc69aaa6cf0eb2b1169307b0485d70661b7c03a40c98 webmin-1.300-minimal.tar.gz 1404945 +MD5 b1c170a8e62705ba7a376a8bff90c422 webmin-1.300.tar.gz 10782513 +RMD160 1259e16725ea7f2491dd91d2d6eef8e80f1240d8 webmin-1.300.tar.gz 10782513 +SHA256 d5ce8bb7ef0c3e0d38ebd43e962aba984276dc6f23f8f913f712aaac2f17b1a4 webmin-1.300.tar.gz 10782513 diff --git a/app-admin/webmin/files/virtual-server-3.23-nocgibin.patch b/app-admin/webmin/files/virtual-server-3.23-nocgibin.patch new file mode 100644 index 000000000000..f527efc9ae98 --- /dev/null +++ b/app-admin/webmin/files/virtual-server-3.23-nocgibin.patch @@ -0,0 +1,13 @@ +diff -Naurp webmin-1.300.orig/virtual-server/feature-dir.pl webmin-1.300/virtual-server/feature-dir.pl +--- webmin-1.300.orig/virtual-server/feature-dir.pl 2006-10-01 17:21:42.000000000 -0700 ++++ webmin-1.300/virtual-server/feature-dir.pl 2006-10-16 12:01:09.000000000 -0700 +@@ -262,8 +262,8 @@ sub virtual_server_directories + { + local $tmpl = &get_template($_[0]->{'template'}); + local $perms = $tmpl->{'web_html_perms'}; ++# [ 'cgi-bin', $perms ], + return ( [ &public_html_dir($_[0], 1), $perms ], +- [ 'cgi-bin', $perms ], + [ 'logs', '750' ], + [ $config{'homes_dir'}, '755' ] ); + } diff --git a/app-admin/webmin/files/virtual-server-3.23-pgsql.patch b/app-admin/webmin/files/virtual-server-3.23-pgsql.patch new file mode 100644 index 000000000000..3f10f5daa9af --- /dev/null +++ b/app-admin/webmin/files/virtual-server-3.23-pgsql.patch @@ -0,0 +1,14 @@ +diff -Naurp webmin-1.300.orig/virtual-server/domain_setup.cgi webmin-1.300/virtual-server/domain_setup.cgi +--- webmin-1.300.orig/virtual-server/domain_setup.cgi 2006-10-01 17:21:42.000000000 -0700 ++++ webmin-1.300/virtual-server/domain_setup.cgi 2006-10-16 12:07:09.000000000 -0700 +@@ -81,6 +81,10 @@ if (!$parentuser) { + defined(getpwnam($user)) && &error($text{'setup_euser'}); + } + ++ if ($config{'postgres'} && $in{'postgres'}) { ++ $user =~ /^[A-Za-z]/ || &error("Username must begin with a letter if you are using postgres."); ++ } ++ + # Parse mail group name + if ($in{'mgroup_def'}) { + $in{'dom'} =~ /^([^\.]+)/; diff --git a/app-admin/webmin/files/webmin-1.300-postfix.patch b/app-admin/webmin/files/webmin-1.300-postfix.patch new file mode 100644 index 000000000000..15384d689012 --- /dev/null +++ b/app-admin/webmin/files/webmin-1.300-postfix.patch @@ -0,0 +1,22 @@ +diff -Naurp webmin-1.300.orig/postfix/postfix-lib.pl webmin-1.300/postfix/postfix-lib.pl +--- webmin-1.300.orig/postfix/postfix-lib.pl 2006-09-14 15:21:43.000000000 -0700 ++++ webmin-1.300/postfix/postfix-lib.pl 2006-10-16 11:55:45.000000000 -0700 +@@ -682,15 +682,15 @@ sub create_mapping + { + &get_maps($_[0], $_[2]); # force cache init + my @maps_files = $_[2] ? @{$_[2]} : &get_maps_files(&get_real_value($_[0])); +-local $lref = &read_file_lines($maps_files[0]); ++local $lref = &read_file_lines($maps_files[$#maps_files]); + $_[1]->{'line'} = scalar(@$lref); + push(@$lref, &make_table_comment($_[1]->{'cmt'})); + push(@$lref, "$_[1]->{'name'}\t$_[1]->{'value'}"); + $_[1]->{'eline'} = scalar(@$lref)-1; + &flush_file_lines(); + +-$_[1]->{'map_file'} = $maps_files[0]; +-$_[1]->{'file'} = $maps_files[0]; ++$_[1]->{'map_file'} = $maps_files[$#maps_files]; ++$_[1]->{'file'} = $maps_files[$#maps_files]; + $_[1]->{'number'} = scalar(@{$maps_cache{$_[0]}}); + push(@{$maps_cache{$_[0]}}, $_[1]); + } diff --git a/app-admin/webmin/webmin-1.300.ebuild b/app-admin/webmin/webmin-1.300.ebuild new file mode 100644 index 000000000000..daed0d4b7e85 --- /dev/null +++ b/app-admin/webmin/webmin-1.300.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.300.ebuild,v 1.1 2006/10/16 19:14:58 eradicator 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 +} |