diff options
Diffstat (limited to 'app-admin/webmin')
| -rw-r--r-- | app-admin/webmin/ChangeLog | 12 | ||||
| -rw-r--r-- | app-admin/webmin/Manifest | 40 | ||||
| -rwxr-xr-x | app-admin/webmin/files/gentoo-setup | 13 | ||||
| -rw-r--r-- | app-admin/webmin/files/webmin-1.600-SA51201.patch | 105 | ||||
| -rw-r--r-- | app-admin/webmin/webmin-1.610.ebuild | 265 | ||||
| -rw-r--r-- | app-admin/webmin/webmin-1.620.ebuild (renamed from app-admin/webmin/webmin-1.600-r1.ebuild) | 13 |
6 files changed, 47 insertions, 401 deletions
diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog index 17dc4707d833..b5c4df439d0b 100644 --- a/app-admin/webmin/ChangeLog +++ b/app-admin/webmin/ChangeLog @@ -1,6 +1,14 @@ # 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.202 2012/12/05 18:57:25 hwoarang Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.203 2013/02/06 20:13:50 hwoarang Exp $ + +*webmin-1.620 (06 Feb 2013) + + 06 Feb 2013; Markos Chandras <hwoarang@gentoo.org> +webmin-1.620.ebuild, + -files/webmin-1.600-SA51201.patch, -webmin-1.600-r1.ebuild, + -webmin-1.610.ebuild, files/gentoo-setup: + Version bump. Drop old ebuilds. Bug #455898. Thanks to PhobosK + <phobosk@fastmail.fm> *webmin-1.610 (05 Dec 2012) diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest index e4db587b4f3d..a24bc5c89bcc 100644 --- a/app-admin/webmin/Manifest +++ b/app-admin/webmin/Manifest @@ -1,31 +1,27 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX gentoo-setup 11154 SHA256 136c2955e6c380e2e8cc8ad8991f4d8d6a404c386fb7846ca8b269921fef534f SHA512 575079793316790f869c31747a7418c986204dfcb73d0c78207014bec0dedfff74546e9182bccf71a0e05160f190275fb9e31c6284a3bffa6a378dc6f4ea6fdf WHIRLPOOL ba744bced5bea07570e63e60c4f98579a9b304314a13369da369043f76bd4f29ac8e224c198beed1a1dc5566e86973da85d361df4023a3757079cbb41bf57677 +AUX gentoo-setup 11549 SHA256 1468c8641cd292006e2dc70bb656db8cf0bb858f79c50a39f605072c520cf7a4 SHA512 3ae80ff0dd7a4fd10c0fcc26521d7dcf3b2ca26e87d6282b5272dca855563992fa97ff3c2d1bc721e69449e45ba779f81eff5bd0ccb6e80f6d5a8d64a3d8e74e WHIRLPOOL b60a1f317dbfbf297097d3bc5598867c127e62ac410819c5d60062650326b57fe407c6181eaee0a8c1c7d4c45cb6f08b3546f87d9524d0ef2f384f868a546a9e AUX init.d.webmin 2254 SHA256 c596712f1dffd69a618055372a39245ecf732a3bbcfadf6c26c9d03640af3547 SHA512 13b28390220a2b653cfdea347b0164e307f8ee6fbe3fff70b12c771829d31b32617f876faab1942f35ca9c46dceb7fcb26d199beccabd683ebe774b69c375d25 WHIRLPOOL 1c5067dc113a692ef68e15a890e325c61ab9e356cc7d43a586afa778eb0708c9cafac219e5766301a284da8998a48e31e600c4cc23d8c7b4ae524888def4db36 -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 -DIST webmin-1.610-minimal.tar.gz 2433278 SHA256 43fdf50662ae423e4903e0c671198918f45e314c0813e1b072e4c85b8a920789 SHA512 9dc932e312b083f4dd87099c0b7a61c46107ce634e8e67b34a83c396b6f81697a45128f72fe9a7d8112ccfb02bf3456c3d949934af95be5ab36942ebf5eaf263 WHIRLPOOL a803b6e04613056c105c690c81d7987b88821b33de23f00c38fa26fcd387076f682c323f96803037ac612afea02b84b75592c709845e1304b069504f3d2a8e00 -DIST webmin-1.610.tar.gz 21526599 SHA256 6393a2a33040951b17bb2d3e663b2a54f921e0f7b74ec49f4997dcd74f8a8d6e SHA512 72a363425f227144d988d9b95bcd43ce06db9fde8cb0638266e3cd429cfe74fe92f19f573c1a23194ec95ad36fd12bf9d324abcc4d174abfa05a689b98b91340 WHIRLPOOL f575ad5cc36edb8f71c39cc60075ae732239601c9e66e8c0fbbf3b9835fa12b0179ec0c075b668d867ab8a84ed8afc97d1b73bc48639126d10182f8cf8dafb3b -EBUILD webmin-1.600-r1.ebuild 9142 SHA256 65d8b20ccdbc095889aba0e1c0687233168a3b82642e44ac6392ebc44ffa3672 SHA512 60c1288d6cc74c5bb52e0eac12198b8d883c9c69b3137c557c4297ba60add8e1dfa72a1120ef7a5dea421fdc69ea58ecb0d5e9031e7cb709e6b7a8123af2bb24 WHIRLPOOL 4666b2a26f175616e156a51cf9576d6fe408aa1b30446a6632092a3ab20a3621e3743c4f1fe755989544ae5fb65d9d200ce1ca83c103f6fc7014a397e708a38a -EBUILD webmin-1.610.ebuild 9026 SHA256 c8059d021807b7a2251a6283578983d9311f8d065305322873e6f430e82c77e0 SHA512 1ceb998aa7e54bb76c5ce8ae14bb3dfdc7da4da53fe5afe35b236a0a5cd48aef7a7dd4f7eac6e540c381a2e53878d1d0c1b3f240f23c6973c721f098ee1c1579 WHIRLPOOL f2f4d621a702f80593c0c4042288f95c35a7057d09731b6f15890e479ea7dc60dbeb2eb2ec019dd637f112116f369638ca564892656c49e70c0fe58e4621e30d -MISC ChangeLog 2789 SHA256 10e7efef65d0cfb4ad1e6d17a777cc3e8d1293f1dfdc9240eeb3426e970f7fba SHA512 4920dd55dab543bf315035c25f34cd7b94e565c777606dfef0d206abc0458403d94b1970f45a47485bf32b0f3ed20209675c9914f424f6f7fd46e65155fe0886 WHIRLPOOL 8b89556a8f34d8ebebc6827fd31343817ea058255bbcaad5a7505d56c2b130d6a555bcfc58a669a71df630e38a0b729e210c2b4b76c31df015fd9e5b4256cc1c +DIST webmin-1.620-minimal.tar.gz 2440850 SHA256 51d75ce76a9038357dec4fbf74069aca1b003bb1e64c7339626cb28ce42fd834 SHA512 099c5197eba2ad205c4aad785fe21c4bc4994be1e70c75157dc0f59fb3292b912b16a0a81ef6e147eb9dd7506a445ab5e677935e1c13449599744d90b8d0d52f WHIRLPOOL d88fa9ccdefdf9d7f9d981225da4f47ef50f0cc976c9691ebae362f974942f26ffca6a43c5b0da50a18937c44a4c23b60228e2155611274aca78f6724db61614 +DIST webmin-1.620.tar.gz 21646366 SHA256 3d36153406d8e5d3dcaeadba34dfb5cdbc4060b75c38339174ac97b2277f284b SHA512 18fcf5dcee161b71b927a7fb5acffe5c655376982989d4f92a08c296186b40b1c185bde83df2cc670eaf6efa8070d73fb39755f94309347e040e8e5edde12312 WHIRLPOOL 6cdcc8855998d1f1f2482d43765894584445bc1f75f2606e39ed7569522891af6ec2c260dcfb0a2a0350cff8a4b21964b3a91edceb49278963f2b71df1211633 +EBUILD webmin-1.620.ebuild 9150 SHA256 b8ce00cdf89feffc8c270313f1520ec5b28c2e69d15e01e4c2a652f82b50a132 SHA512 b21dec9cac334b8baffff45593b162e7e5c7a133b5b26aa676610f8e98b84673f4336e942150be0b7ce453de4a6a5a123210896a740835d4801b6d3d67053ae5 WHIRLPOOL 012712fd2a62f8f1604c032458140f8ecef22f726c8db274ed62e036bcb53c0263bef20a665bb9119bb39178e7d356b1c0b118562b053267404cc5e6bf858f97 +MISC ChangeLog 3089 SHA256 de1554ee6826386417d06b7453ec469013f66379389106481e94bedffe429b1f SHA512 bf4278fd21fcf8d09d96884ac7401237cf62ea58307683b914b4d6fb956dc7c5a1e6ecbb27aaa67d63a415836eb47257843e38288eb9b94f12fa3c60de03cec9 WHIRLPOOL d2962477916e1489d55ff10d88fd1aad6b6f33d76e093e0866351772b9275173c2e8b356ae6e6fcd53a21f9ee14b4a35fb7d37e377181b38c6a71d1473d831dd MISC metadata.xml 326 SHA256 44e634f8f6afe175e696bb53be1749163798e22862c6ab40d81a70146e28269f SHA512 7c400180abd54e464c3570f046ecbf2489de6f83738bdbda83285df1ebc5354a532ea7495b842e39219649d729488bc00ba39bc426faefa24bc88090a136f8b6 WHIRLPOOL 9124acba12823edb57b989ca40913e408e1ed2f894822beab847b0b49bea86a8f974e984b444cb05d7d0881b21c1bcdaf5676c863a21098b2ef2b4e772bd2d98 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCAAGBQJQv5kWAAoJEPqDWhW0r/LCkVoP/2D4qP2vwCWgRYxGVPvUEAwc -cUZWbhM7WCNzR0dJ8AwcNNk7LznElfMn5BxPlvCFi3nC1QrvHykTpYc92T7gaoC3 -X0bGiVobBuLHUwyRCXg2as4vLy/1RZogoVMdR9DEqBHnMR28Ncy2iYmiil2X++DO -Frg+RU4NdfIuHfVf94tAV+DF/DuRhacYIqVbpjWvA7KeNmLZrW1MmEcUeAPgNf/a -eXpzCFJksiN+TQ5uscZ27mKHLN6HG9QaaW5d7o1zTCDdnhzoNATLNmbYaKVoSHGw -FecFQwHU1ydx+d+w4WGD0cq+X0/wHL6XKQnRwC9SjFzZF0WYe+r+LdZTqzn+rvcO -yiAmpr1j7fC5b/I0coNDlVgY4xaz49QcwChVbhMwzAyXe0wj16G8g8Qfa/jqzOWl -uPDmkxSAaXBwClooXuSrWkjFhuFyXnsJv0QzrfKUXtI86jNf4MbiJ2QykedRqiPC -KKSK/G9XF885hYAAagUQZgQcvSjdq1wt8ZexErqa05Ef8qjU6LbKRnvzJfsJMh9H -HL/r2O2kksy/xKGpSKBYwUNZg3NJVSZj1nyesUlzU7vQqA8icHHPtDg5DM/uybph -lBE815QdJib+7ETQN2fuYoCex/OUM1NGOxznZaqIoA/t/60Ednwr2rH6kynEhu4o -iwvdfdZScTx5QRyDjMec -=VAVU +iQIcBAEBCAAGBQJRErmAAAoJEPqDWhW0r/LCth4QALCuAadLydstj5LYcGHi9Z0J +PFsPUZfVGS8CQgrgsOo+1pGXVZUv0vlHjXkibHfqqqxF6rnEptIdWolj6SkNtNQC +2Gsm9py7i+F08Czi/tDNNarZ5Kp6v6QEcDnwiWhBRbId/5WLi0Uhvm9Qie8O/8kV +dwBMqJzLO8lIUYQzrbGw7KWIb/N2YuhxLhCRrnuygHEwGLxkf1qnrWShY0VkRPpc +8IpnAPK3CBhECHXyA2sXXx4vh8iNRwlHigsnsbbsvL878/O7OSC88XAYjZRKcwan +CExk3RrmAG6dYl+fL+u+xiYHNXXZCcwcL7ELTGnm0BzLMfjoPQnGCgRAr94484Sn +sQGqnt/9J98tGjPfDs9EuLocBckGq0WmP4k9i5oEIX7hKy6iAwAEMwWLiEkBcCbB +/uzu/ejjipGCZGmzqnxjgXvhMLiWWohdOspKx/6YIWa0wPA5VYejIaiyD1bx9GVt +Yu4w0AaE/KYZHCAQfdyvYZuOFyzm8S6HKP+nxpQpu9gtWP9s7bUNpl8GN2yVgDzL +S16ZHUGFoGb3pQxdWDrvcs0bH+nKqH93ghDndt1jUcXuajkGbfI75gz6EGQssV3Z +7sqIdCXWKb0H4zsSN9jghHx0su0w2HrzeOvp0m+2W4nDjnGIZXDH86c81ccgND1N +gBEBnJC2qfrM4BHMbX/r +=f0N8 -----END PGP SIGNATURE----- diff --git a/app-admin/webmin/files/gentoo-setup b/app-admin/webmin/files/gentoo-setup index 566e564ed387..ef03a9a59059 100755 --- a/app-admin/webmin/files/gentoo-setup +++ b/app-admin/webmin/files/gentoo-setup @@ -1,5 +1,8 @@ #!/bin/sh # gentoo-setup.sh +# +# Version 1.1 +# # A modified original Webmin setup.sh script to comply with Gentoo specifics # # Modification done by: PhobosK <phobosk@kbfx.net> @@ -91,10 +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 and keyfile + # Get port, ssl, 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'` 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'` # Update ACLs @@ -136,6 +140,7 @@ else echo "ppath=$ppath" >> $cfile echo "ssl=$ssl" >> $cfile echo "ssl_redirect=$ssl_redirect" >> $cfile + echo "no_sslcompression=$no_sslcompression" >> $cfile echo "keyfile=$keyfile" >> $cfile echo "env_WEBMIN_CONFIG=$config_dir" >> $cfile echo "env_WEBMIN_VAR=$var_dir" >> $cfile @@ -277,6 +282,12 @@ if [ "$?" != "0" ]; then echo passwd_mode=0 >> $config_dir/miniserv.conf fi +# Disable SSL compression to defeat BEAST attack +grep no_sslcompression= $config_dir/miniserv.conf >/dev/null +if [ "$?" != "0" ]; then + echo no_sslcompression=1 >> $config_dir/miniserv.conf +fi + # Make Perl crypt MD5 the default echo md5pass=1 >> $config_dir/config diff --git a/app-admin/webmin/files/webmin-1.600-SA51201.patch b/app-admin/webmin/files/webmin-1.600-SA51201.patch deleted file mode 100644 index 43d1783f9d84..000000000000 --- a/app-admin/webmin/files/webmin-1.600-SA51201.patch +++ /dev/null @@ -1,105 +0,0 @@ -diff -ur a/passwd/edit_passwd.cgi b/passwd/edit_passwd.cgi ---- a/passwd/edit_passwd.cgi 2012-09-21 21:07:11.000000000 +0300 -+++ b/passwd/edit_passwd.cgi 2012-11-01 19:00:02.000000000 +0200 -@@ -19,7 +19,7 @@ - %uconfig = &foreign_config("useradmin"); - $user[6] =~ s/,.*$// if ($uconfig{'extra_real'}); - print &ui_table_row($text{'passwd_for'}, -- $user[0].( $user[6] ? " ($user[6])" : "" )); -+ &html_escape($user[0].( $user[6] ? " ($user[6])" : "" ))); - - # Old password field - if ($access{'old'} == 1 || -diff -ur a/passwd/index.cgi b/passwd/index.cgi ---- a/passwd/index.cgi 2012-09-21 21:07:11.000000000 +0300 -+++ b/passwd/index.cgi 2012-11-01 19:00:02.000000000 +0200 -@@ -85,7 +85,7 @@ - @grid = ( ); - for($i=0; $i<@ulist; $i++) { - push(@grid, "<a href=\"edit_passwd.cgi?". -- "user=$ulist[$i]->[0]\">". -+ "user=".&urlize($ulist[$i]->[0])."\">". - &html_escape($ulist[$i]->[0])."</a>"); - } - print &ui_grid_table(\@grid, 4, 100, undef, undef, -diff -ur a/passwd/module.info b/passwd/module.info ---- a/passwd/module.info 2012-09-21 21:11:10.000000000 +0300 -+++ b/passwd/module.info 2012-11-01 19:00:02.000000000 +0200 -@@ -1,48 +1,38 @@ --desc_pt_BR=Alterar Senha --desc_ca=Canvi de Contrasenyes --desc_it=Cambio Password --desc_hu.UTF-8=Jelszavak --readonly=1 --desc=Change Passwords - category=system --desc_ja_JP.euc=パスワードの変更 --desc_zh_TW.Big5=怒鷄KX --desc_ko_KR.UTF-8= 覲蟆 --desc_fi=Vaihda Salasanoja -+depends=useradmin -+desc=Change Passwords -+desc_pl=Zmiany hase -+desc_hu=Jelszavak - name=Passwd --desc_tr=Parolalar Deitir --os_support=!windows -+desc_ca=Canvi de Contrasenyes - desc_de=Passwörter ändern --desc_af=Verander Wagwoord --desc_sk=Zmena hesla --desc_pl.UTF-8=Zmiany hase --desc_cz.UTF-8=Zmna hesla --desc_ja_JP.UTF-8=鴻若紊 --desc_fr=Changez le Mot de Passe --desc_pl=Zmiany hase -+desc_nl=Wachtwoorden Wijzigen -+desc_zh_TW.Big5=怒鷄KX - desc_es=Cambio de Contraseñas --desc_ru_RU=瑁鉉 - desc_no=Passord administrasjon --desc_cz=Zmna hesla --desc_ms=Menukar Katalaluan --desc_nl=Wachtwoorden Wijzigen --desc_sk.UTF-8=Zmena hesla --desc_hu=Jelszavak --desc_zh_TW.UTF-8=莅翫腆 --version=1.600 --longdesc=Change the password of any user on the system. -+desc_af=Verander Wagwoord -+desc_it=Cambio Password - desc_ru_SU=霑厦棉 -+desc_ru_RU=瑁鉉 - passwd=Change the passwords of Unix users. -+longdesc=Change the password of any user on the system. -+desc_pt_BR=Alterar Senha -+desc_ms=Menukar Katalaluan -+desc_cz=Zmna hesla -+desc_sk=Zmena hesla -+desc_tr=Parolalar Deitir -+readonly=1 -+os_support=!windows -+desc_zh_TW.UTF-8=莅翫腆 -+desc_fi=Vaihda Salasanoja - desc_ko_KR.euc=章硲 痕井 -+desc_ko_KR.UTF-8= 覲蟆 -+desc_ja_JP.euc=パスワードの変更 -+desc_ja_JP.UTF-8=鴻若紊 - desc_ru.UTF-8=舒仂仍亳 --depends=useradmin 1.600 --desc_de.UTF-8=Passwörter ändern --desc_fi.UTF-8=Vaihda Salasanoja --desc_af.UTF-8=Verander Wagwoord --desc_fr.UTF-8=Changez le Mot de Passe --desc_ms.UTF-8=Menukar Katalaluan --desc_it.UTF-8=Cambio Password --desc_es.UTF-8=Cambio de Contraseñas --desc_ca.UTF-8=Canvi de Contrasenyes --desc_pt_BR.UTF-8=Alterar Senha --desc_nl.UTF-8=Wachtwoorden Wijzigen -+desc_fr=Changez le Mot de Passe -+desc_hu.UTF-8=Jelszavak -+desc_cz.UTF-8=Zmna hesla -+desc_pl.UTF-8=Zmiany hase -+desc_sk.UTF-8=Zmena hesla -+version=1.605 diff --git a/app-admin/webmin/webmin-1.610.ebuild b/app-admin/webmin/webmin-1.610.ebuild deleted file mode 100644 index 04154b8f469f..000000000000 --- a/app-admin/webmin/webmin-1.610.ebuild +++ /dev/null @@ -1,265 +0,0 @@ -# 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.610.ebuild,v 1.1 2012/12/05 18:57:25 hwoarang Exp $ - -EAPI="3" - -inherit eutils pam ssl-cert - -DESCRIPTION="A web-based Unix systems administration interface" -HOMEPAGE="http://www.webmin.com/" -SRC_URI="minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz ) - !minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )" - -LICENSE="BSD GPL-2" -SLOT="0" - -KEYWORDS="~amd64 ~x86" - -# NOTE: The ssl flag auto added by ssl-cert eclass is not used actually -# because openssl is forced by dev-perl/Net-SSLeay -IUSE="minimal +ssl mysql postgres ldap" - -# All the required perl modules can be found easily using (in Webmin's root src dir): -# find . -name cpan_modules.pl -exec grep "::" {} \; -# NOTE: If Webmin doesn't find the required perl modules, it offers(runtime) the user -# 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 - virtual/perl-Time-HiRes - virtual/perl-Time-Local - dev-perl/Authen-Libwrap - dev-perl/IO-Tty - dev-perl/MD5 - dev-perl/Net-SSLeay - dev-perl/Authen-PAM - dev-perl/Sys-Hostname-Long - >=net-dns/dnssec-tools-1.13 - !minimal? ( - mysql? ( dev-perl/DBD-mysql ) - postgres? ( dev-perl/DBD-Pg ) - ldap? ( dev-perl/perl-ldap ) - dev-perl/XML-Generator - dev-perl/XML-Parser - )" -RDEPEND="${DEPEND}" - -src_prepare() { - local perl="$( which perl )" - - # Remove the unnecessary and incompatible files - rm -rf acl/Authen-SolarisRBAC-0.1* - if ! use minimal ; then - rm -rf {format,{bsd,hpux,sgi}exports,zones,rbac} - rm -f mount/{free,net,open}bsd-mounts* - rm -f mount/macos-mounts* - fi - - # For security reasons remove the SSL certificate that comes with Webmin - # We will create our own later - rm -f miniserv.pem - - # Remove the Webmin setup scripts to avoid Webmin in runtime to mess up config - # We will use our own later - rm -f setup.{sh,pl} - - # Fix the permissions of the install files - chmod -R og-w "${S}" - - # Since we should not modify any files after install - # we set the perl path in all cgi and pl files here using Webmin's routines - # The pl file is Prefix safe and works only on provided input, no other filesystem files - ebegin "Fixing perl path in source files" - (find "${S}" -name '*.cgi' -print ; find "${S}" -name '*.pl' -print) | $perl "${S}"/perlpath.pl $perl - - eend $? -} - -src_install() { - # Create config dir and keep - diropts -m0755 - dodir /etc/webmin - keepdir /etc/webmin - - # Create install dir - # Third party modules installed through Webmin go here too, so keep - dodir /usr/libexec/webmin - keepdir /usr/libexec/webmin - - # Copy our own setup script to installation folder - insinto /usr/libexec/webmin - newins "${FILESDIR}"/gentoo-setup gentoo-setup.sh - fperms 0744 /usr/libexec/webmin/gentoo-setup.sh - - # This is here if we ever want in future ebuilds to add some specific - # config values in the /etc/webmin/miniserv.conf - # The format of this file should be the same as the one of miniserv.conf: - # var=value - # - # Uncomment it if you use such file. Before that check if upstream - # has this file in root dir too. - #newins "${FILESDIR}/miniserv-conf" miniserv-conf - - # Create the log dir and keep - diropts -m0700 - dodir /var/log/webmin - keepdir /var/log/webmin - - # Create the init.d file and put the neccessary variables there - newinitd "${FILESDIR}"/init.d.webmin webmin - sed -i \ - -e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \ - -e "s:%pid%:${EROOT}var/run/webmin.pid:" \ - -e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \ - -e "s:%perllib%:${EROOT}usr/libexec/webmin:" \ - "${ED}etc/init.d/webmin" \ - || die "Failed to patch the webmin init file" - - # Setup pam - pamd_mimic system-auth webmin auth account session - - # Copy files to installation folder - ebegin "Copying install files to destination" - cp -pPR "${S}"/* "${ED}usr/libexec/webmin" - eend $? -} - -pkg_preinst() { - # First stop service if running so Webmin to not messup our config - ebegin "Stopping any running Webmin instance prior merging" - rc-service --ifexists -- webmin --ifstarted stop - eend $? -} - -pkg_postinst() { - # Run pkg_config phase first - non interactively - export INTERACTIVE="no" - pkg_config - # Every next time pkg_config should be interactive - INTERACTIVE="yes" - - ewarn - ewarn "Bare in mind that not all Webmin modules are Gentoo tweaked and may have some issues." - ewarn "Always be careful when using modules that modify init entries, do update of webmin, install CPAN modules etc." - ewarn "To avoid problems, please before using any module, look at its configuration options first." - ewarn "(Usually there is a link at top in the right pane of Webmin for configuring the module.)" - ewarn - elog "- To make Webmin start at boot time, run: 'rc-update add webmin default'" - elog "- The default URL to connect to Webmin is: https://localhost:10000" - elog "- The default user that can login is: root" - elog "- To reconfigure Webmin in case of problems run 'emerge --config app-admin/webmin'" -} - -pkg_prerm() { - # First stop service if running - we do not want Webmin to mess up config - ebegin "Stopping any running Webmin instance prior unmerging" - rc-service --ifexists -- webmin --ifstarted stop - eend $? -} - -pkg_postrm() { - ewarn - ewarn "You have uninstalled Webmin, so have in mind that all cron jobs scheduled" - ewarn "by Webmin for its own modules, are left active and they will fail when Webmin is missing." - ewarn "To fix this just disable them if you intend to use Webmin again," - ewarn "OR delete them if not." - ewarn -} - -pkg_config(){ - # First stop service if running - ebegin "Stopping any running Webmin instance" - rc-service --ifexists -- webmin --ifstarted stop - eend $? - - # Next set the default reset variable to 'none' - # reset/_reset can be: - # 'none' - does not reset anything, just upgrades if a conf is present - # OR installs new conf if a conf is missing - # 'soft' - deletes only $config_dir/config file and thus resetting most - # conf values to their defaults. Keeps the specific Webmin cron jobs - # 'hard' - deletes all files in $config_dir (keeping the .keep_* Gentoo file) - # and thus resetting all Webmin. Deletes the specific Webmin cron jobs too. - local _reset="none" - - # If in interactive mode ask user what should we do - if [[ "${INTERACTIVE}" = "yes" ]]; then - einfo - einfo "Please enter the number of the action you would like to perform?" - einfo - einfo "1. Update configuration" - einfo " (keeps old config options and adds the new ones)" - einfo "2. Soft reset configuration" - einfo " (keeps some old config options, the other options are set to default)" - ewarn " All Webmin users will be reset" - einfo "3. Hard reset configuration" - einfo " (all options including module options are set to default)" - ewarn " You will lose all Webmin configuration options you have done till now" - einfo "4. Exit this configuration utility (default)" - while [ "$correct" != "true" ] ; do - read answer - if [[ "$answer" = "1" ]] ; then - _reset="none" - correct="true" - elif [[ "$answer" = "2" ]] ; then - _reset="soft" - correct="true" - elif [[ "$answer" = "3" ]] ; then - _reset="hard" - correct="true" - elif [ "$answer" = "4" -o "$answer" = "" ] ; then - die "User aborted configuration." - else - echo "Answer not recognized. Enter a number from 1 to 4" - fi - done - - if [[ "$_reset" = "hard" ]]; then - while [ "$sure" != "true" ] ; do - ewarn "You will lose all Webmin configuration options you have done till now." - ewarn "Are you sure you want to do this? (y/n)" - read answer - if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then - sure="true" - elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then - die "User aborted configuration." - else - echo "Answer not recognized. Enter 'y' or 'n'" - fi - done - fi - fi - - export reset=$_reset - - # Create ssl certificate for Webmin if there is not one in the proper place - if [[ ! -e "${EROOT}etc/ssl/webmin/server.pem" ]]; then - SSL_ORGANIZATION="${SSL_ORGANIZATION:-Webmin Server}" - SSL_COMMONNAME="${SSL_COMMONNAME:-*}" - install_cert "${EROOT}/etc/ssl/webmin/server" - fi - - # Ensure all paths passed to the setup script use EROOT - export wadir="${EROOT}usr/libexec/webmin" - export config_dir="${EROOT}etc/webmin" - export var_dir="${EROOT}var/log/webmin" - export tempdir="${T}" - export pidfile="${EROOT}var/run/webmin.pid" - export perl="$( which perl )" - export os_type='gentoo-linux' - export os_version='*' - export real_os_type='Gentoo Linux' - export real_os_version='Any version' - # Forcing 'ssl' and 'ssl_redirect' for tightening security - export ssl=1 - export ssl_redirect=1 - export keyfile="${EROOT}etc/ssl/webmin/server.pem" - export port=10000 - - export atboot=0 - - einfo "Executing Webmin's configure script" - $wadir/gentoo-setup.sh - - einfo "Configuration of Webmin done" -} diff --git a/app-admin/webmin/webmin-1.600-r1.ebuild b/app-admin/webmin/webmin-1.620.ebuild index 939ce83a12a4..5055a52a7d54 100644 --- a/app-admin/webmin/webmin-1.600-r1.ebuild +++ b/app-admin/webmin/webmin-1.620.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 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.2 2012/11/07 18:51:57 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.620.ebuild,v 1.1 2013/02/06 20:13:50 hwoarang Exp $ EAPI="3" @@ -54,9 +54,6 @@ 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 @@ -67,6 +64,9 @@ src_prepare() { # We will use our own later rm -f setup.{sh,pl} + # Set the installation type/mode to Gentoo + echo "gentoo" > install-type + # Fix the permissions of the install files chmod -R og-w "${S}" @@ -253,9 +253,10 @@ pkg_config(){ export os_version='*' export real_os_type='Gentoo Linux' export real_os_version='Any version' - # Forcing 'ssl' and 'ssl_redirect' for tightening security + # Forcing 'ssl', 'ssl_redirect' and 'no_sslcompression' for tightening security export ssl=1 export ssl_redirect=1 + export no_sslcompression=1 export keyfile="${EROOT}etc/ssl/webmin/server.pem" export port=10000 |