commit e790a580cc5c84d0d062ae6d25dc7991b3d1dc78 Author: Rosa Date: Wed Feb 1 15:13:03 2012 +0400 Automatic import for version 1.560 diff --git a/.abf.yml b/.abf.yml new file mode 100644 index 0000000..bbfc0f2 --- /dev/null +++ b/.abf.yml @@ -0,0 +1,7 @@ +sources: + "openvpn-2.0.wbm.gz": 4039007c5f921fd4f32b1952f9cddf0dc98bef58 + "other.modules.tar.bz2": 96c8a928edf7f2ab40a6ad4c5c87f85654edfb5e + "webmin-1.560.tar.gz": 02ae664b0f01a8214aac018c74fd34447336ed5d + "webmin-i18n-20080131.tar.bz2": 7c8ba368a7543df997ca1351a8411c2003fc9ccd + "webmin-mandriva-theme.tar.bz2": 74b1b6d054ad136c22f84dc9bb24ed013bb1f7fc + "webmin-scripts-i18n.tar.bz2": 2f1a23774d5d563be934616d1c820e3bfbe48275 diff --git a/advanced.png b/advanced.png new file mode 100644 index 0000000..edadf78 Binary files /dev/null and b/advanced.png differ diff --git a/descs.png b/descs.png new file mode 100644 index 0000000..e08cd07 Binary files /dev/null and b/descs.png differ diff --git a/ldap_browser_LDAPapi.wbm b/ldap_browser_LDAPapi.wbm new file mode 100644 index 0000000..07d5c24 Binary files /dev/null and b/ldap_browser_LDAPapi.wbm differ diff --git a/ldap_groups_LDAPapi.wbm b/ldap_groups_LDAPapi.wbm new file mode 100644 index 0000000..c8ac5c9 Binary files /dev/null and b/ldap_groups_LDAPapi.wbm differ diff --git a/netatalk.wbm b/netatalk.wbm new file mode 100644 index 0000000..f31c197 Binary files /dev/null and b/netatalk.wbm differ diff --git a/openldap-0_6.wbm b/openldap-0_6.wbm new file mode 100644 index 0000000..726684e Binary files /dev/null and b/openldap-0_6.wbm differ diff --git a/openldap2-0_1.wbm b/openldap2-0_1.wbm new file mode 100644 index 0000000..15b6fdc Binary files /dev/null and b/openldap2-0_1.wbm differ diff --git a/webmin b/webmin new file mode 100644 index 0000000..7856892 --- /dev/null +++ b/webmin @@ -0,0 +1,46 @@ +#!/usr/bin/perl -w +# Copyright (C) 2001 Daouda Lo ;) +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +use POSIX; + +my $browser = $ENV{'BROWSER'}; +my $link = 'https://localhost:10000/'; +my $initscript = '/etc/rc.d/init.d/webmin'; + +if (!$browser) { + print "Webmin is a web server. You need to use a browser, but I could\n"; + print "not find your default browser in your environment variables.\n"; + print "Example: export BROWSER=mozilla\n"; + exit(-1); +} + +if (!-x $initscript) { + print "Installation problem. Please reinstall.\n"; + exit(-1); +} + +my $status = system("$initscript status > /dev/null") >> 8; +if ($status == 3) { + system($initscript, 'start'); + $status = system("$initscript status > /dev/null") >> 8; +} +if ($status != 0) { + print "Installation problem. Please reinstall.\n"; + exit(-1); +} + +print "Launching `$browser' with param `$link'\n"; +system("$browser $link > /dev/null 2> /dev/null &"); diff --git a/webmin-0.85-enable-changed-theme-at-installation.patch b/webmin-0.85-enable-changed-theme-at-installation.patch new file mode 100644 index 0000000..9e7cb28 --- /dev/null +++ b/webmin-0.85-enable-changed-theme-at-installation.patch @@ -0,0 +1,17 @@ +diff -p -up webmin-1.441/setup.sh.theme webmin-1.441/setup.sh +--- webmin-1.441/setup.sh.theme 2009-04-09 16:28:14.000000000 -0300 ++++ webmin-1.441/setup.sh 2009-04-09 16:28:58.000000000 -0300 +@@ -672,6 +672,13 @@ else + echo "referers_none=1" >>$config_dir/config + fi + fi ++theme_value=`grep "^theme=" $config_dir/config | sed -e 's/theme=//g'` ++if [ -n "$theme_value" ]; then ++ root_value=`grep "^root=" $config_dir/miniserv.conf | sed -e 's/root=//g'` ++ echo "A theme is configured, updating miniserv config file (theme is $theme_value)" ++ echo "preroot=$root_value/$theme_value" >> $config_dir/miniserv.conf ++fi ++ + echo $ver > $config_dir/version + echo "..done" + echo "" diff --git a/webmin-0.85-never-fail-detect-os.patch b/webmin-0.85-never-fail-detect-os.patch new file mode 100644 index 0000000..3099db2 --- /dev/null +++ b/webmin-0.85-never-fail-detect-os.patch @@ -0,0 +1,23 @@ +diff -p -up webmin-1.441/oschooser.pl.osdetect webmin-1.441/oschooser.pl +--- webmin-1.441/oschooser.pl.osdetect 2008-10-27 18:07:42.000000000 -0200 ++++ webmin-1.441/oschooser.pl 2009-04-09 16:28:42.000000000 -0300 +@@ -48,9 +48,16 @@ if ($auto) { + + if (!$ver) { + if ($auto == 1) { +- # Failed .. give up +- print "Failed to detect operating system\n"; +- exit 1; ++# # Failed .. give up ++# print "Failed to detect operating system\n"; ++# exit 1; ++# ++# ######### (gc) Do not give up but use the latest release of Mandrakelinux ++ foreach $o (@list) { ++ $ver = $o ++ if ($o->[0] eq "Mandrakelinux" && (!$ver || $ver->[1] < $o->[1])); ++ } ++ print "WARNING: could not guess OS, falling back to $ver->[0] version $ver->[1]\n"; + } + elsif ($auto == 3) { + # Do we have a tty? diff --git a/webmin-0.92-add-default-configs-logviewer-fp2k.patch b/webmin-0.92-add-default-configs-logviewer-fp2k.patch new file mode 100644 index 0000000..b7e74fa --- /dev/null +++ b/webmin-0.92-add-default-configs-logviewer-fp2k.patch @@ -0,0 +1,35 @@ +--- ./fp2k/config.gege Mon Feb 25 23:13:00 2002 ++++ ./fp2k/config Mon Feb 25 23:12:51 2002 +@@ -0,0 +1,5 @@ ++httpd_conf=/etc/httpd/conf/httpd.conf ++fpsrvadm=/usr/local/frontpage/version4.0/bin/fpsrvadm.exe ++fp_dir=/usr/local/frontpage ++frontpg_cnf=/usr/local/frontpage/version4.0/frontpg.cnf ++htaccess=.htaccess +--- ./fp2k/config.info.gege Mon Feb 25 23:14:56 2002 ++++ ./fp2k/config.info Mon Feb 25 23:14:52 2002 +@@ -0,0 +1,5 @@ ++httpd_conf=Path to Apache configuration file,0 ++fpsrvadm=Path to frontage Server Administration executable,0 ++fp_dir=Path to frontpage,0 ++frontpg_cnf=Path to frontpage configuration file,0 ++htaccess=htaccess hidden file,0 +--- ./fp2k/index.cgi.gege Mon Feb 25 23:07:05 2002 ++++ ./fp2k/index.cgi Mon Feb 25 23:13:32 2002 +@@ -17,7 +17,7 @@ + #################################################################### + # header + # +-&header($text{'index_title'}, ""); ++&header($text{'index_title'}, "", undef, 1); + print "
"; + + #################################################################### +--- ./logviewer/config.gege Mon Feb 25 23:14:08 2002 ++++ ./logviewer/config Mon Feb 25 23:14:08 2002 +@@ -0,0 +1,5 @@ ++live_tail_ttl=0.3 ++restart_interval=2 ++logs=/usr/bin/w,/usr/bin/uptime,/bin/dmesg,/usr/bin/last,/usr/bin/vmstat 1,/var/log/httpd/access_log,/var/log/httpd/error_log,/var/log/auth.log,/var/log/cfengine.log,/var/log/daemon.log,/var/log/messages,/var/log/kern.log,/var/log/lastlog,/var/log/lpr/errors,/var/log/lpr/info,/var/log/lpr/warnings,/var/log/debug,/var/log/mail/errors,/var/log/mail/info,/var/log/mail/warnings,/var/log/nmb,/var/log/smb,/var/log/setuid.changes,/var/log/setuid.today,/var/log/setuid.yesterday,/var/log/ppp.log,/var/log/syslog,/var/log/squid/access.log,/var/log/squid/cache.log,/var/log/squid/store.log,/var/log/user.log,/var/log/uucp.log,/var/log/wtmp.report,/var/log/xdm.log,/var/log/xntpd ++refresh_interval=5 ++last_bytes_to_display=1024 diff --git a/webmin-0.950-add-netsaint-mandrake-config.patch b/webmin-0.950-add-netsaint-mandrake-config.patch new file mode 100644 index 0000000..8c9d9a6 --- /dev/null +++ b/webmin-0.950-add-netsaint-mandrake-config.patch @@ -0,0 +1,15 @@ +--- ./netsaint/config-mandrake-linux.gege Thu Jan 1 01:00:00 1970 ++++ ./netsaint/config-mandrake-linux Sun Mar 31 18:49:06 2002 +@@ -0,0 +1,12 @@ ++icons_per_row=4 ++main_config=/etc/netsaint/netsaint.cfg ++host_config=/etc/netsaint/hosts.cfg ++cgi_config=/etc/netsaint/nscgi.cfg ++output_url= ++sort_hosts=1 ++sort_contacts=1 ++sort_commands=1 ++list_commands_detailed=1 ++sort_timeperiods=1 ++sort_services=1 ++show_logo=1 diff --git a/webmin-1.020-ssl-location.patch b/webmin-1.020-ssl-location.patch new file mode 100644 index 0000000..7784914 --- /dev/null +++ b/webmin-1.020-ssl-location.patch @@ -0,0 +1,20 @@ +--- ./setup.sh.gege 2002-10-08 16:44:57.000000000 +0200 ++++ ./setup.sh 2002-10-08 16:46:17.000000000 +0200 +@@ -454,7 +454,7 @@ + chmod 600 $ufile + echo "userfile=$ufile" >> $cfile + +- kfile=$config_dir/miniserv.pem ++ kfile=/etc/pki/tls/private/miniserv.pem + openssl version >/dev/null 2>&1 + if [ "$?" = "0" ]; then + # We can generate a new SSL key for this host +@@ -477,7 +477,7 @@ + cp "$wadir/miniserv.pem" $kfile + fi + chmod 600 $kfile +- echo "keyfile=$config_dir/miniserv.pem" >> $cfile ++ echo "keyfile=/etc/pki/tls/private/miniserv.pem" >> $cfile + + chmod 600 $cfile + echo "..done" diff --git a/webmin-1.020-suppress-missing-netatalk-interfaces.patch b/webmin-1.020-suppress-missing-netatalk-interfaces.patch new file mode 100644 index 0000000..4ad4aeb --- /dev/null +++ b/webmin-1.020-suppress-missing-netatalk-interfaces.patch @@ -0,0 +1,15 @@ +--- webmin-1.020/netatalk/index.cgi.ppc 2002-11-16 11:13:53.000000000 -0500 ++++ webmin-1.020/netatalk/index.cgi 2002-11-16 11:14:44.000000000 -0500 +@@ -94,9 +94,9 @@ + + print"

$text{index_global}

\n"; + +-my @links = ("servers.cgi","edit_interfaces.cgi","show_users.cgi", "misc_opt.cgi"); +-my @titles = ($text{'index_server'},$text{'index_interfaces'},$text{'index_users'},$text{'index_misc'}); +-my @icons = ("images/what.gif","images/interface.gif","images/procs.gif","images/icon_4.gif"); ++my @links = ("servers.cgi","show_users.cgi", "misc_opt.cgi"); ++my @titles = ($text{'index_server'},$text{'index_users'},$text{'index_misc'}); ++my @icons = ("images/what.gif","images/procs.gif","images/icon_4.gif"); + icons_table(\@links, \@titles, \@icons); + print"
\n"; + diff --git a/webmin-1.060-mysql-fix-installing-missing-packages.patch b/webmin-1.060-mysql-fix-installing-missing-packages.patch new file mode 100644 index 0000000..cee6d42 --- /dev/null +++ b/webmin-1.060-mysql-fix-installing-missing-packages.patch @@ -0,0 +1,25 @@ +diff -p -up webmin-1.441/mysql/index.cgi.mysql webmin-1.441/mysql/index.cgi +--- webmin-1.441/mysql/index.cgi.mysql 2009-04-09 16:28:14.000000000 -0300 ++++ webmin-1.441/mysql/index.cgi 2009-04-09 16:29:26.000000000 -0300 +@@ -260,15 +260,15 @@ else { + # Check if the optional perl modules are installed + if (foreign_available("cpan")) { + eval "use DBI"; +- push(@needs, "DBI") if ($@); ++ push(@needs, "perl-DBI") if ($@); + $nodbi++ if ($@); + eval "use DBD::mysql"; +- push(@needs, "DBD::mysql") if ($@); ++ push(@needs, "perl-Mysql") if ($@); + if (@needs) { +- $needs = &urlize(join(" ", @needs)); +- print "
",&text(@needs == 2 ? 'index_nomods' : 'index_nomod', @needs, +- "/cpan/download.cgi?source=3&cpan=$needs&mode=2&return=/$module_name/&returndesc=".&urlize($text{'index_return'})), +- "
\n"; ++ print "
Warning, the following package(s) are missing from your system\n". ++ "for reliable access to your MySQL database: @needs. To install them,\n". ++ "you may use the graphical program rpmdrake or the commandline program\n". ++ "urpmi. Then, re-load this page.\n"; + } + } + } diff --git a/webmin-1.100-let-localauth-config.patch b/webmin-1.100-let-localauth-config.patch new file mode 100644 index 0000000..b0d4981 --- /dev/null +++ b/webmin-1.100-let-localauth-config.patch @@ -0,0 +1,10 @@ +--- webmin-1.100/setup.sh.deush 2003-12-05 20:11:24.000000000 +0100 ++++ webmin-1.100/setup.sh 2003-12-05 20:14:53.000000000 +0100 +@@ -520,6 +520,7 @@ + fi + chmod 600 $kfile + echo "keyfile=/etc/pki/tls/private/miniserv.pem" >> $cfile ++ echo "localauth=/usr/sbin/lsof" >> $cfile + + chmod 600 $cfile + echo "..done" diff --git a/webmin-1.100-remove-atboot-problem b/webmin-1.100-remove-atboot-problem new file mode 100644 index 0000000..58dd75a --- /dev/null +++ b/webmin-1.100-remove-atboot-problem @@ -0,0 +1,35 @@ +--- setup.sh.orig 2011-08-04 09:09:54.000000000 +0200 ++++ setup.sh 2011-08-18 12:25:48.904902657 +0200 +@@ -440,19 +440,19 @@ + fi + + # Ask whether to run at boot time +- if [ "$atboot" = "" ]; then +- initsupp=`grep "^os_support=" "$srcdir/init/module.info" | sed -e 's/os_support=//g' | grep $os_type` +- atboot=0 +- if [ "$initsupp" != "" ]; then +- printf "Start Webmin at boot time (y/n): " +- read atbootyn +- if [ "$atbootyn" = "y" -o "$atbootyn" = "Y" ]; then +- atboot=1 +- fi +- else +- echo "Webmin does not support being started at boot time on your system." +- fi +- fi ++# if [ "$atboot" = "" ]; then ++# initsupp=`grep "^os_support=" "$srcdir/init/module.info" | sed -e 's/os_support=//g' | grep $os_type` ++# atboot=0 ++# if [ "$initsupp" != "" ]; then ++# printf "Start Webmin at boot time (y/n): " ++# read atbootyn ++# if [ "$atbootyn" = "y" -o "$atbootyn" = "Y" ]; then ++# atboot=1 ++# fi ++# else ++# echo "Webmin does not support being started at boot time on your system." ++# fi ++# fi + + # Copy files to target directory + echo "***********************************************************************" diff --git a/webmin-1.130-postgresql-fix-installing-missing-packages.patch b/webmin-1.130-postgresql-fix-installing-missing-packages.patch new file mode 100644 index 0000000..12ec342 --- /dev/null +++ b/webmin-1.130-postgresql-fix-installing-missing-packages.patch @@ -0,0 +1,25 @@ +diff -p -up webmin-1.441/postgresql/index.cgi.postgresql webmin-1.441/postgresql/index.cgi +--- webmin-1.441/postgresql/index.cgi.postgresql 2009-04-09 16:28:14.000000000 -0300 ++++ webmin-1.441/postgresql/index.cgi 2009-04-09 16:29:43.000000000 -0300 +@@ -280,15 +280,15 @@ else { + # Check if the optional perl modules are installed + if (&foreign_available("cpan")) { + eval "use DBI"; +- push(@needs, "DBI") if ($@); ++ push(@needs, "perl-DBI") if ($@); + $nodbi++ if ($@); + eval "use DBD::Pg"; +- push(@needs, "DBD::Pg") if ($@); ++ push(@needs, "perl-DBD-Pg") if ($@); + if (@needs) { +- $needs = &urlize(join(" ", @needs)); +- print "
",&text(@needs == 2 ? 'index_nomods' : 'index_nomod', @needs, +- "/cpan/download.cgi?source=3&cpan=$needs&mode=2&return=/$module_name/&returndesc=".&urlize($text{'index_return'})), +- "
\n"; ++ print "
Warning, the following package(s) are missing from your system\n". ++ "for reliable access to your PostgreSQL database: @needs. To install them,\n". ++ "you may use the graphical program rpmdrake or the commandline program\n". ++ "urpmi. Then, re-load this page.\n"; + } + } + } diff --git a/webmin-1.220-remove-mandrakestuff-from-init.patch b/webmin-1.220-remove-mandrakestuff-from-init.patch new file mode 100644 index 0000000..7560a22 --- /dev/null +++ b/webmin-1.220-remove-mandrakestuff-from-init.patch @@ -0,0 +1,34 @@ +--- webmin-1.220/init/init-lib.pl.deush 2005-07-20 21:06:28.410126659 +0200 ++++ webmin-1.220/init/init-lib.pl 2005-07-20 21:08:45.984436969 +0200 +@@ -96,6 +96,7 @@ + return sort(@rv); + } + ++sub member { my $e = shift; foreach (@_) { $e eq $_ and return 1 } 0 } + + =head2 list_actions + +@@ -60,15 +61,14 @@ + $dir = $config{init_dir}; + opendir(DIR, $dir); + foreach $f (sort { lc($a) cmp lc($b) } readdir(DIR)) { +- if ($f eq "." || $f eq ".." || $f =~ /\.bak$/ || $f eq "functions" || +- $f eq "core" || $f eq "README" || $f eq "rc" || $f eq "rcS" || +- -d "$dir/$f" || $f =~ /\.swp$/ || $f eq "skeleton" || +- $f =~ /\.lock$/ || $f =~ /\.dpkg-(old|dist)$/ || +- $f =~ /^\.depend\./) { next; } +- if (@stbuf = stat("$dir/$f")) { +- push(@rv, "$f $stbuf[1]"); +- } +- } ++ next if (member($f, qw(. .. functions core README rc rcS skeleton)) ++ || $f =~ /\.bak$/ || $f =~ /\.swp$/ || $f =~ /\.lock$/ ++ || $f =~ /^mandrake/ || $f =~ /^\.depend\./ ++ || -d "$dir/$f"); ++ if (@stbuf = stat("$dir/$f")) { ++ push(@rv, "$f $stbuf[1]"); ++ } ++} + closedir(DIR); + foreach $f (split(/\s+/, $config{'extra_init'})) { + if (@stbuf = stat($f)) { diff --git a/webmin-1.220-usermin-fix-index.patch b/webmin-1.220-usermin-fix-index.patch new file mode 100644 index 0000000..4d4d557 --- /dev/null +++ b/webmin-1.220-usermin-fix-index.patch @@ -0,0 +1,11 @@ +--- webmin-1.220/usermin/index.cgi.deush 2005-08-24 12:28:09.000000000 +0200 ++++ webmin-1.220/usermin/index.cgi 2005-08-24 12:28:44.000000000 +0200 +@@ -26,7 +26,7 @@ + "the graphical program rpmdrake or the commandline program\n". + "urpmi usermin. Then, re-load this page.\n"; + } +- } ++ + &ui_print_footer("/", $text{'index'}); + exit; + } diff --git a/webmin-1.310-usermin-fix-installing-missing-package.diff b/webmin-1.310-usermin-fix-installing-missing-package.diff new file mode 100644 index 0000000..6338a5b --- /dev/null +++ b/webmin-1.310-usermin-fix-installing-missing-package.diff @@ -0,0 +1,43 @@ +--- usermin/index.cgi 2006-11-29 23:36:58.000000000 +0100 ++++ usermin/index.cgi.oden 2007-01-15 18:39:07.000000000 +0100 +@@ -9,21 +9,25 @@ + print "

",&text('index_econfig', "$config{'usermin_dir'}", + "$gconfig{'webprefix'}/config.cgi?$module_name"),"

\n"; + if ($config{'usermin_dir'} eq $standard_usermin_dir) { +- local $mode; +- if (&foreign_check("software")) { +- local %sconfig = &foreign_config("software"); +- $mode = $sconfig{'package_system'} eq 'rpm' ? 'rpm' : +- $sconfig{'package_system'} eq 'dpkg' ? 'deb' : +- undef; +- } +- print "$text{'index_install'}
\n"; +- print "

\n"; +- print "\n"; +- print "\n"; +- print "\n"; +- print "\n"; +- print "
\n"; ++# local $mode; ++# if (&foreign_check("software")) { ++# local %sconfig = &foreign_config("software"); ++# $mode = $sconfig{'package_system'} eq 'rpm' ? 'rpm' : ++# $sconfig{'package_system'} eq 'dpkg' ? 'deb' : ++# undef; ++# } ++# print "$text{'index_install'}
\n"; ++# print "
\n"; ++# print "\n"; ++# print "\n"; ++# print "\n"; ++# print "\n"; ++# print "
\n"; ++ print "

If Usermin is not yet installed on your system, you may use ". ++ "the graphical program rpmdrake or the commandline program\n". ++ "urpmi usermin. Then, re-load this page.\n"; ++ } + } + &ui_print_footer("/", $text{'index'}); + exit; diff --git a/webmin-1.350-mandriva_theme.diff b/webmin-1.350-mandriva_theme.diff new file mode 100644 index 0000000..0f760cc --- /dev/null +++ b/webmin-1.350-mandriva_theme.diff @@ -0,0 +1,17 @@ +--- mandriva/index.cgi 2005-09-06 19:20:42.000000000 +0200 ++++ mandriva/index.cgi.oden 2007-07-08 11:57:15.000000000 +0200 +@@ -64,10 +64,13 @@ + foreach $m (@modules) { + next if ($m->{'category'} ne $in{'cat'}); + ++ my $icon="$m->{'dir'}/images/icon.png"; ++ if (not -e "$theme_root_directory/$m->{'dir'}/images/icon.png") {$icon = "/$m->{'dir'}/images/icon.gif"; } ++ + if ($pos % $cols == 0) { print "\n"; } + print "\n"; + print "
{'dir'}/>", +- "{'dir'}/images/icon.png alt=\"\" border=0>", ++ "\"\"", + "
\n"; + print "{'dir'}/>$m->{'desc'}\n"; + if ($pos++ % $cols == $cols - 1) { print "\n"; } diff --git a/webmin-1.510-fix-os-list.patch b/webmin-1.510-fix-os-list.patch new file mode 100644 index 0000000..59b771f --- /dev/null +++ b/webmin-1.510-fix-os-list.patch @@ -0,0 +1,11 @@ +--- webmin-1.510/os_list.txt.orig 2010-07-11 08:10:29.000000000 +0200 ++++ webmin-1.510/os_list.txt 2010-07-11 08:12:50.000000000 +0200 +@@ -138,7 +138,7 @@ + + # Mandriva Corporate + Mandrake Linux Corporate Server $i mandrake-linux $i $etc_issue =~ /Mandrake\s+Linux\s+Corporate\s+Server\s+release\s+([0-9\.]+)/i +-Mandriva Linux Enterprise Server 5.0 mandrake-linux 2009 $etc_issue =~ /Mandriva\s+Linux\s+Enterprise\s+Server\s+release\s+5\.0\s+\(Official\)\s+for\s+(i586|x86_64)/i ++Mandriva Linux Enterprise Server $1 mandrake-linux 2009 $etc_issue =~ /Mandriva\s+Linux\s+Enterprise\s+Server\s+release\s+(\d\.\d)\s+\(Official\)\s+for\s+(i586|x86_64)/i + + # Conectiva Linux (now subsumed into Mandrake?) + Conectiva Linux 3.0 redhat-linux 5.2 $etc_issue =~ /Conectiva.*Linux.*3\.0/i diff --git a/webmin-1.550-fix-status-in-init.patch b/webmin-1.550-fix-status-in-init.patch new file mode 100644 index 0000000..df6d490 --- /dev/null +++ b/webmin-1.550-fix-status-in-init.patch @@ -0,0 +1,24 @@ +--- init/init-lib.pl.orig 2011-08-04 09:09:54.000000000 +0200 ++++ init/init-lib.pl 2011-08-18 12:34:14.234398572 +0200 +@@ -1745,7 +1745,7 @@ + sub action_running + { + my ($file) = @_; +-my $out = &backquote_command("$file status"); ++my $out = &backquote_command("$file status >/dev/null"); + if ($out =~ /not\s+running/i || + $out =~ /no\s+server\s+running/i) { + return 0; +@@ -1756,6 +1756,12 @@ + elsif ($out =~ /stopped/i) { + return 0; + } ++elsif ($out =~ /^0\s*$/) { ++ return 1; ++} ++elsif ($out =~ /^\d+\s*$/) { ++ return 0; ++} + return -1; + } + diff --git a/webmin-16.png b/webmin-16.png new file mode 100644 index 0000000..eeee3fc Binary files /dev/null and b/webmin-16.png differ diff --git a/webmin-32.png b/webmin-32.png new file mode 100644 index 0000000..ad05828 Binary files /dev/null and b/webmin-32.png differ diff --git a/webmin-48.png b/webmin-48.png new file mode 100644 index 0000000..35f4a36 Binary files /dev/null and b/webmin-48.png differ diff --git a/webmin-fix-bandwith.diff b/webmin-fix-bandwith.diff new file mode 100644 index 0000000..99fe65a --- /dev/null +++ b/webmin-fix-bandwith.diff @@ -0,0 +1,6 @@ +--- webmin-1.490.orig/bandwidth/config 2009-09-17 18:21:53.000000000 +0200 ++++ webmin-1.490/bandwidth/config 2009-10-09 17:00:10.000000000 +0200 +@@ -1,2 +1,2 @@ + firewall_system= +-bandwidth_log=/var/log/bandwidth ++bandwidth_log=/var/log/syslog diff --git a/webmin-fix-configs.diff b/webmin-fix-configs.diff new file mode 100644 index 0000000..40d8eed --- /dev/null +++ b/webmin-fix-configs.diff @@ -0,0 +1,7 @@ +--- config-mandrake-linux.orig 2010-03-05 02:22:24.000000000 +0100 ++++ config-mandrake-linux 2010-04-04 11:59:30.000000000 +0200 +@@ -9,3 +9,4 @@ + by_view=0 + tempdelete_days=7 + charset=UTF-8 ++theme=mandriva diff --git a/webmin-fix-netatalk-paths.patch b/webmin-fix-netatalk-paths.patch new file mode 100644 index 0000000..be29d9d --- /dev/null +++ b/webmin-fix-netatalk-paths.patch @@ -0,0 +1,24 @@ +--- ./netatalk/config.gege Thu Nov 9 21:24:51 2000 ++++ ./netatalk/config Mon Feb 4 13:48:43 2002 +@@ -1,13 +1,13 @@ +-applevolumedefault_c=/usr/local/atalk/etc/AppleVolumes.default +-applevolumesystem_c=/usr/local/atalk/etc/AppleVolumes.system +-atalkd_d=/usr/local/atalk/sbin/atalkd ++applevolumedefault_c=/etc/netatalk/AppleVolumes.default ++applevolumesystem_c=/etc/netatalk/AppleVolumes.system ++atalkd_d=/usr/sbin/atalkd + select_minUsers= + netatalk_c=/etc/pam.d/netatalk +-papd_c=/usr/local/atalk/etc/papd.conf ++papd_c=/etc/netatalk/papd.conf + select_maxUsers= +-papd_d=/usr/local/atalk/sbin/papd ++papd_d=/usr/sbin/papd + atalk_nls= + atalk_start=/etc/rc.d/init.d/atalk +-afpd_c=/usr/local/atalk/etc/afpd.conf +-afpd_d=/usr/local/atalk/sbin/afpd +-atalk_c=/usr/local/atalk/etc/atalkd.conf ++afpd_c=/etc/netatalk/afpd.conf ++afpd_d=/usr/sbin/afpd ++atalk_c=/etc/netatalk/atalkd.conf diff --git a/webmin-fix-newmods.patch b/webmin-fix-newmods.patch new file mode 100644 index 0000000..ac69db0 --- /dev/null +++ b/webmin-fix-newmods.patch @@ -0,0 +1,11 @@ +--- ./newmods.pl.gege Wed Oct 4 19:07:36 2000 ++++ ./newmods.pl Wed Oct 4 19:07:52 2000 +@@ -3,7 +3,7 @@ + # + + + for($i=1; $i<@ARGV; $i++) { +- if (!(-d "$ARGV[0]/$ARGV[$i]")) { ++ if (-d "$ARGV[0]/$ARGV[$i]") { + push(@new, $ARGV[$i]); + } + } diff --git a/webmin-fix-sarg.diff b/webmin-fix-sarg.diff new file mode 100644 index 0000000..789a614 --- /dev/null +++ b/webmin-fix-sarg.diff @@ -0,0 +1,8 @@ +--- webmin-1.490.orig/sarg/config 2009-09-17 18:21:53.000000000 +0200 ++++ webmin-1.490/sarg/config 2009-10-15 12:09:55.000000000 +0200 +@@ -1,4 +1,4 @@ + sarg=sarg +-sarg_conf=/usr/local/sarg/sarg.conf ++sarg_conf=/etc/sarg/sarg.conf + clear=1 + naked=0 diff --git a/webmin-module_usermonitor_0.12a.wbm b/webmin-module_usermonitor_0.12a.wbm new file mode 100644 index 0000000..dd8b320 Binary files /dev/null and b/webmin-module_usermonitor_0.12a.wbm differ diff --git a/webmin-openldap.patch b/webmin-openldap.patch new file mode 100644 index 0000000..c891d88 --- /dev/null +++ b/webmin-openldap.patch @@ -0,0 +1,40 @@ +diff -bruN openldap/config-mandrake-linux openldap.mdk/config-mandrake-linux +--- openldap/config-mandrake-linux Thu Jan 1 01:00:00 1970 ++++ openldap.mdk/config-mandrake-linux Tue Dec 18 11:55:53 2001 +@@ -0,0 +1,7 @@ ++slapd_conf_file=/etc/openldap/slapd.conf ++restart_command=/sbin/service ldap restart ++start_command=/sbin/service ldap start ++stop_command=/sbin/service ldap stop ++slapd_port=389 ++slapd_path=/usr/sbin/slapd ++crypt_schema=MD5 +diff -bruN openldap/module.info openldap.mdk/module.info +--- openldap/module.info Wed Nov 22 23:47:02 2000 ++++ openldap.mdk/module.info Tue Dec 18 11:34:38 2001 +@@ -1,5 +1,5 @@ + category=servers +-os_support=debian-linux redhat-linux suse-linux hpux solaris ++os_support=debian-linux redhat-linux suse-linux hpux solaris mandrake-linux + desc=OpenLDAP server + desc_fr=Serveur OpenLDAP + name=OpenLDAP +diff -bruN openldap/start.cgi openldap.mdk/start.cgi +--- openldap/start.cgi Thu Nov 30 23:18:21 2000 ++++ openldap.mdk/start.cgi Tue Dec 18 11:54:13 2001 +@@ -21,12 +21,12 @@ + &init_config(); + use POSIX; + +-my $port =$config{slapd_port}||389 ; +-if ($config{slapd_start_command}) { ++my $port =$config{'slapd_port'}||389 ; ++if ($config{'start_command'}) { + # Use a start script + $out = system("$config{'start_command'} >/dev/null"); + if ($out) { +- &error("

$text{error_start}
"); ++ &error("
$text{'error_start'}
"); + } + } + else { diff --git a/webmin-postinstallscript.sh b/webmin-postinstallscript.sh new file mode 100755 index 0000000..8d8965c --- /dev/null +++ b/webmin-postinstallscript.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +cd /usr/share/webmin +config_dir=/etc/webmin +var_dir=/var/run/webmin +log_dir=/var/log/webmin +perl=/usr/bin/perl +autoos=1 +port=10000 +login=root +crypt=x +host=`hostname` +ssl=1 +atboot=0 +nochown=1 +autothird=1 +noperlpath=1 +nouninstall=1 +nostart=1 +export config_dir var_dir perl autoos port login crypt host ssl nochown autothird noperlpath nouninstall nostart allow +[ -z "$SECURE_LEVEL" ] && export SECURE_LEVEL=3 + +mkdir -p /var/log/webmin + +cat >> /var/log/webmin/webmin_install.log <<_EOF_ +-------------------------------------- +New install: $(date) +_EOF_ + +cat >> /var/log/webmin/webmin_install.log.err <<_EOF_ +-------------------------------------- +New install: $(date) +_EOF_ + +./setup.sh >> /var/log/webmin/webmin_install.log 2>> /var/log/webmin/webmin_install.log.err < /dev/null + diff --git a/webmin-ssldir-cosmetic.diff b/webmin-ssldir-cosmetic.diff new file mode 100644 index 0000000..493df8b --- /dev/null +++ b/webmin-ssldir-cosmetic.diff @@ -0,0 +1,19 @@ +--- webmin-1.490/setup.sh.temp-permissions 2009-10-06 12:06:22.000000000 +0200 ++++ webmin-1.490/setup.sh 2009-10-06 12:07:16.000000000 +0200 +@@ -758,11 +759,11 @@ + chmod -R og-rw $config_dir/$m + done + # Make miniserv config files non-world-readable +-for f in miniserv.conf miniserv.pem miniserv.users; do +- chown -R root $config_dir/$f +- chgrp -R bin $config_dir/$f +- chmod -R og-rw $config_dir/$f +-done ++#for f in miniserv.conf miniserv.pem miniserv.users; do ++# chown -R root $config_dir/$f ++# chgrp -R bin $config_dir/$f ++# chmod -R og-rw $config_dir/$f ++#done + chmod +r $config_dir/version + if [ "$nochown" = "" ]; then + # Make program directory non-world-writable, but executable diff --git a/webmin-temp-permission-fix.diff b/webmin-temp-permission-fix.diff new file mode 100644 index 0000000..a19c1f2 --- /dev/null +++ b/webmin-temp-permission-fix.diff @@ -0,0 +1,24 @@ +diff -u webmin-1.490.orig/maketemp.pl webmin-1.490/maketemp.pl +--- webmin-1.490.orig/maketemp.pl 2009-09-17 18:21:36.000000000 +0200 ++++ webmin-1.490/maketemp.pl 2009-10-15 14:30:53.000000000 +0200 +@@ -5,7 +5,7 @@ + + while($tries++ < 10) { + local @st = lstat($tmp_dir); +- exit(0) if ($st[4] == $< && (-d _) && ($st[2] & 0777) == 0755); ++ exit(0) if ($st[4] == $< && (-d _)); + if (@st) { + unlink($tmp_dir) || rmdir($tmp_dir) || + system("/bin/rm -rf ".quotemeta($tmp_dir)); +diff -u webmin-1.490.orig/web-lib-funcs.pl webmin-1.490/web-lib-funcs.pl +--- webmin-1.490.orig/web-lib-funcs.pl 2009-09-17 18:21:35.000000000 +0200 ++++ webmin-1.490/web-lib-funcs.pl 2009-10-15 16:58:22.000000000 +0200 +@@ -212,7 +212,7 @@ + my $tries = 0; + while($tries++ < 10) { + my @st = lstat($tmp_dir); +- last if ($st[4] == $< && (-d _) && ($st[2] & 0777) == 0755); ++ last if ($st[4] == $< && (-d _)); + if (@st) { + unlink($tmp_dir) || rmdir($tmp_dir) || + system("/bin/rm -rf ".quotemeta($tmp_dir)); diff --git a/webmin-theme_gehrigal_0.41.wbt b/webmin-theme_gehrigal_0.41.wbt new file mode 100644 index 0000000..d7785d2 Binary files /dev/null and b/webmin-theme_gehrigal_0.41.wbt differ diff --git a/webmin.initscript b/webmin.initscript new file mode 100644 index 0000000..725926c --- /dev/null +++ b/webmin.initscript @@ -0,0 +1,82 @@ +#!/bin/sh +# +# webmin Start Webmin remote administration tool. This script +# starts the Webmin server. +# +# chkconfig: 2345 90 20 +# +# description: Webmin is a remote administration tool using web-browser +# processname: perl +# pidfile: /var/run/webmin/miniserv.pid +# config: /etc/webmin/miniserv.conf +# config: /etc/webmin/miniserv.users + +### BEGIN INIT INFO +# Provides: webmin +# Required-Start: $network +# Required-Stop: $network +# Default-Start: 2 3 4 5 +# Short-Description: Webmin is a remote administration tool using web-browser +# Description: Start Webmin remote administration tool. This script +# starts the Webmin server. +### END INIT INFO + +. /etc/rc.d/init.d/functions + +RETVAL=0 + +if [ ! -d /usr/share/webmin ] || [ ! -d /etc/webmin ] || [ ! -f /etc/webmin/start ] || [ ! -f /etc/webmin/stop ]; then + echo "Webmin installation failed, I can't go further." + RETVAL="-1" +fi + +case "$1" in + start) + gprintf "Starting Webmin" + /etc/webmin/start + RETVAL=$? + [[ $RETVAL -eq 0 ]] && touch /var/lock/subsys/webmin + ;; + stop) + gprintf "Stopping Webmin" + /etc/webmin/stop + RETVAL=$? + [[ $RETVAL -eq 0 ]] && rm -f /var/lock/subsys/webmin + ;; + status) + if ! [ -f /var/run/webmin/miniserv.pid ] ; then + gprintf "miniserv.pl is stopped" + RETVAL=3 + else + pid=`cat /var/run/webmin/miniserv.pid` + kill -0 $pid >/dev/null 2>&1 + RETVAL=$? + if [ $RETVAL == 0 ] ; then + gprintf "miniserv.pl (pid %s) is running..." $pid + else + gprintf "miniserv.pl is stopped" + RETVAL=3 + fi + fi + ;; + restart) + $0 stop + $0 start + ;; + reload) + $0 stop + $0 start + ;; + condrestart) + if [ -f /var/lock/subsys/webmin ]; then + $0 stop + $0 start + fi + ;; +*) + gprintf "Usage: %s {start|stop|status|restart|condrestart }" $0 + RETVAL=1 + ;; +esac +echo +exit $RETVAL diff --git a/webmin.logrotate b/webmin.logrotate new file mode 100644 index 0000000..5043476 --- /dev/null +++ b/webmin.logrotate @@ -0,0 +1,23 @@ +/var/log/webmin/miniserv.error { + notifempty + missingok + postrotate + [ -f /var/run/webmin/miniserv.pid ] && kill -HUP `cat /var/run/webmin/miniserv.pid` > /dev/null 2>&1 || : + endscript +} + +/var/log/webmin/miniserv.log { + notifempty + missingok + postrotate + [ -f /var/run/webmin/miniserv.pid ] && kill -HUP `cat /var/run/webmin/miniserv.pid` > /dev/null 2>&1 || : + endscript +} + +/var/log/webmin/webmin.log { + notifempty + missingok + postrotate + [ -f /var/run/webmin/miniserv.pid ] && kill -HUP `cat /var/run/webmin/miniserv.pid` > /dev/null 2>&1 || : + endscript +} diff --git a/webmin.pam b/webmin.pam new file mode 100644 index 0000000..37eae44 --- /dev/null +++ b/webmin.pam @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth required /lib/security/pam_stack.so service=system-auth +account required /lib/security/pam_stack.so service=system-auth +password required /lib/security/pam_stack.so service=system-auth +session required /lib/security/pam_stack.so service=system-auth diff --git a/webmin.pam-new b/webmin.pam-new new file mode 100644 index 0000000..0a37e6e --- /dev/null +++ b/webmin.pam-new @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/webmin.spec b/webmin.spec new file mode 100644 index 0000000..da8f186 --- /dev/null +++ b/webmin.spec @@ -0,0 +1,640 @@ +# zero out some useless deps. +# (tv) we'd better had a link in minicom & package Encode::HanConvert: +%define _requires_exceptions HanConvert\\|runscript + +# don't spend time with this either +%define _enable_debug_packages %{nil} +%define debug_package %{nil} + +%define i18n_date 20080131 +%define with_i18n_tarball 1 +%define with_i18n_patch 1 + +%if %mandriva_branch == Cooker +# Cooker +%define release %mkrel 2 +%else +# Old distros +%define subrel 1 +%define release %mkrel 1 +%endif + +Summary: An SSL web-based administration interface for Unix systems +Name: webmin +Version: 1.560 +Release: %{release} +License: BSD +Group: System/Configuration/Other +URL: http://www.webmin.com/webmin/ +Source0: http://heanet.dl.sourceforge.net/sourceforge/webadmin/%{name}-%{version}.tar.gz +Source2: other.modules.tar.bz2 +Source30: webmin-mandriva-theme.tar.bz2 +# some images were missing +Source33: advanced.png +Source34: descs.png +Source4: webmin-postinstallscript.sh +Source5: webmin +Source6: webmin.initscript +Source9: http://www.openit.it/index.php/openit_en/content/download/2474/10171/file/openvpn-2.0.wbm.gz +Source10: webmin.pam +Source11: webmin-16.png +Source12: webmin-32.png +Source13: webmin-48.png +# uses include instead of pam_stack +Source14: webmin.pam-new +Source15: webmin.logrotate +# (gc) have the updates; this needs to change for each version and/or release, see +# http://www.webmin.com/webmin/updates.html +# Other Themes +Source51: http://www.gehrigal.net/download/webmin_theme/webmin-theme_gehrigal_0.41.wbt +# the configurator for this theme +Source52: http://www.gehrigal.net/download/webmin_themeconfig/webmin_gehrigal-themeconfigurator_0.21a.wbm +# Webmin Module Usermonitor +Source53: http://www.gehrigal.net/download/webmin_usermonitor/webmin-module_usermonitor_0.12a.wbm +# Other modules +Source54: http://gaia.anet.fr/webmin/openldap/openldap-0_6.wbm +Source541: http://gaia.anet.fr/webmin/openldap/openldap2-0_1.wbm +Source55: http://www.bvan.f2s.com/ldap_groups_LDAPapi.wbm +Source56: http://www.bvan.f2s.com/ldap_browser_LDAPapi.wbm +Source57: http://prdownloads.sourceforge.net/netatalk/netatalk.wbm +Source99: webmin-scripts-i18n.tar.bz2 +Source100: webmin-i18n-%{i18n_date}.tar.bz2 +Patch0: webmin-fix-configs.diff +Patch1: webmin-1.100-remove-atboot-problem +Patch5: webmin-fix-newmods.patch +Patch7: webmin-0.85-never-fail-detect-os.patch +Patch8: webmin-0.85-enable-changed-theme-at-installation.patch +Patch9: webmin-1.550-fix-status-in-init.patch +Patch10: webmin-1.510-fix-os-list.patch + +Patch13: webmin-openldap.patch +Patch15: webmin-fix-netatalk-paths.patch +Patch17: webmin-1.220-remove-mandrakestuff-from-init.patch +Patch19: webmin-0.92-add-default-configs-logviewer-fp2k.patch +Patch21: webmin-0.950-add-netsaint-mandrake-config.patch +Patch23: webmin-1.020-ssl-location.patch +Patch24: webmin-1.020-suppress-missing-netatalk-interfaces.patch +Patch26: webmin-1.060-mysql-fix-installing-missing-packages.patch +Patch29: webmin-1.100-let-localauth-config.patch +Patch32: webmin-1.310-usermin-fix-installing-missing-package.diff +Patch33: webmin-1.130-postgresql-fix-installing-missing-packages.patch +Patch35: webmin-1.220-usermin-fix-index.patch +Patch36: webmin-1.350-mandriva_theme.diff +Patch37: webmin-temp-permission-fix.diff +Patch38: webmin-ssldir-cosmetic.diff +Patch39: webmin-fix-bandwith.diff +Patch40: webmin-fix-sarg.diff +Requires(pre): rpm-helper +Requires: perl +Requires: perl-CGI +Requires: lsof +Requires(pre): sed chkconfig findutils coreutils initscripts grep perl-Net_SSLeay perl-Authen-PAM +Provides: %{name}-%{version} +Provides: %{name}-theme-mandriva +Obsoletes: %{name}-theme-mandriva +BuildArch: noarch +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot + +%description +A web-based administration interface for Unix systems. Using Webmin you can +configure DNS, Samba, NFS, local/remote filesystems, Apache, Sendmail/Postfix, +and more using your web browser. + +After installation, enter the URL https://localhost:10000/ into your browser +and login as root with your root password. Please consider logging in and +modify your password for security issue. + +PLEASE NOTE THAT THIS VERSION NOW USES SECURE WEB TRANSACTIONS: YOU HAVE TO +LOGIN TO "https://localhost:10000/" AND NOT "http://localhost:10000/". + +%prep + +%setup -q -a2 -a30 -a51 -a52 -a53 -a55 -a56 +# Unknow extension, rpm won't unpack it. +tar xf %{SOURCE54} +tar xf %{SOURCE541} +tar xf %{SOURCE57} + +install -m 0644 %{SOURCE33} mandriva/webmin/images +install -m 0644 %{SOURCE34} mandriva/webmin/images +rm -fr %{name}-%{version}/dhcpd +rm -fr %{name}-%{version}/useradmin + +%setup -q -D -T -c -a 9 -n %{name}-%{version} +%if %{mdkversion} < 20101 +%patch0 -p0 +%endif +%patch1 -p0 +%patch5 -p0 +%patch7 -p1 +%patch8 -p1 +%patch9 -p0 +%patch10 -p1 + +%patch13 -p0 +%patch15 -p0 +#%patch17 -p1 +%patch19 -p0 +%patch21 -p0 +%patch23 -p1 +%patch24 -p1 +%patch26 -p1 +%patch29 -p1 +%patch32 -p0 +%patch33 -p1 +%patch35 -p1 +%patch36 -p0 +%patch37 -p1 +%patch38 -p1 +%patch39 -p1 +%patch40 -p1 +# use MD5 by default + +for i in */config-mandrake-linux-8.2; do n=`echo $i | perl -pe 's/...$/9.0/'`; [ -e $n ] || cp $i $n; done +for i in */config-mandrake-linux-9.0; do n=`echo $i | perl -pe 's/...$/9.1/'`; [ -e $n ] || cp $i $n; done +for i in */config-mandrake-linux-9.1; do n=`echo $i | perl -pe 's/...$/9.2/'`; [ -e $n ] || cp $i $n; done +for i in */config-mandrake-linux-9.2; do n=`echo $i | perl -pe 's/...$/10.0/'`; [ -e $n ] || cp $i $n; done +for i in */config-mandrake-linux-10.0; do n=`echo $i | perl -pe 's/....$/10.1/'`; [ -e $n ] || cp $i $n; done +for i in */config-mandrake-linux-10.1; do n=`echo $i | perl -pe 's/....$/10.2/'`; [ -e $n ] || cp $i $n; done +for i in */config-mandrake-linux-10.2; do n=`echo $i | perl -pe 's/....$/2006.0/'`; [ -e $n ] || cp $i $n; done +find bind8 -type f -maxdepth 1 | xargs perl -pi -e 's|/var/run/named\.pid|/var/run/named/named.pid|' + +# daouda: added mandriva-linux to known OS +cp config-mandrake-linux config-mandriva-linux + +# force theme to blue +pushd theme_gehrigal/skins + ./change_skin.pl s blueedition.skininfo +popd + +perl -pi -e 's|redhat-linux(?! mandriva-linux)|redhat-linux mandriva-linux| if $_ =~ /^os_support.*redhat-linux/ && $_ !~ /mandriva-linux/' */module.info +#' +perl -pi -e 's|/etc/smb\.conf|/etc/samba/smb\.conf|' samba/config-mandrake-linux + +(find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl - +rm -f mount/freebsd-mounts-* +rm -f mount/openbsd-mounts-* + +find -name ".xvpics" -o -name ".*.swp" | xargs rm -rf + +# i18n +%if %{with_i18n_tarball} +#tar -jxf %{_sourcedir}/webmin-i18n-%{i18n_date}.tar.bz2 +tar -jxf %{SOURCE100} +%endif + +%build + +# nothing to do here... + +%install +rm -rf %{buildroot} + +# IMPORTANT: there is no %{_datadir} and so on, since the directories are decided by the post install script. +mkdir -p %{buildroot}/usr/share/webmin +mkdir -p %{buildroot}/%{_initrddir} +mkdir -p %{buildroot}/usr/bin + +find -type f -print0 | xargs -0 chmod a+r +find -type d -print0 | xargs -0 chmod a+rx + +# (gc) remove ldap module, we don't have perl modules to make it work +rm -rf ldap + +cp -a * %{buildroot}/usr/share/webmin +install -m755 %{SOURCE6} %{buildroot}/%{_initrddir}/webmin +install -m755 %{SOURCE4} %{buildroot}/usr/share/webmin/postinstall.sh +install -m755 %{SOURCE5} %{buildroot}/usr/bin + +mkdir -p %{buildroot}/%{_sysconfdir}/pam.d + +%if %{mdkversion} < 200610 +install -m755 %{SOURCE10} %{buildroot}/%{_sysconfdir}/pam.d/webmin +%else +install -m755 %{SOURCE14} %{buildroot}/%{_sysconfdir}/pam.d/webmin +%endif + +rm -rf %{buildroot}/usr/share/webmin/*/{CVS,*/CVS} +rm -f `find %{buildroot} -type f -name .cvsignore` + +# (gc) remove zero-length files (to check sometimes if they are still zero-length'ed) +for i in /usr/share/webmin/caldera/images/letters/254.gif /usr/share/webmin/i4lctrl-0.6.7/lang/de /usr/share/webmin/caldera/images/letters/255.gif; do + if [ -f $i ]; then rm -f %{buildroot}$i; fi +done + +echo "rpm" > %{buildroot}/usr/share/webmin/install-type + +# (sb) remove development file +rm -f %{buildroot}/usr/share/webmin/mount/macos-mounts.c + +%if %{mdkversion} < 20101 +# (deush) mandriva is the default theme +echo 'mandriva' > %{buildroot}%{_datadir}/webmin/defaulttheme +%else +echo 'blue-theme' > %{buildroot}%{_datadir}/webmin/defaulttheme +%endif + +# (oe) remove invalid file that breaks webmin +rm -f %{buildroot}%{_datadir}/webmin/mandriva/config.cgi + +# Install icons +install -d -m 0755 %{buildroot}%{_liconsdir} +install -d -m 0755 %{buildroot}%{_miconsdir} +install -m 0644 %{SOURCE11} %{buildroot}%{_miconsdir}/webmin.png +install -m 0644 %{SOURCE12} %{buildroot}%{_iconsdir}/webmin.png +install -m 0644 %{SOURCE11} %{buildroot}%{_liconsdir}/webmin.png + +# Menu entry + +# XDG menu +install -d %{buildroot}%{_datadir}/applications +cat > %{buildroot}%{_datadir}/applications/mandriva-%{name}.desktop << EOF +[Desktop Entry] +Name=%{name} +Comment=%{summary} +Exec=%{_bindir}/www-browser https://localhost:10000/ +Icon=%{name} +Terminal=false +Type=Application +Categories=X-MandrivaLinux-System-Configuration-Other;Settings; +EOF + +rm -fr %{buildroot}/usr/share/webmin/acl/Authen-SolarisRBAC-0.1 + +#logrotate +install -d %{buildroot}%{_sysconfdir}/logrotate.d +install -m 0644 %{SOURCE15} %{buildroot}%{_sysconfdir}/logrotate.d/webmin + +%post +%if %mdkversion > 200900 +%_create_ssl_certificate -b miniserv +%else +# fix SSL cert location +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ssl/webmin +mv -f $RPM_BUILD_ROOT%{_datadir}/webmin/miniserv.pem \ + $RPM_BUILD_ROOT%{_sysconfdir}/ssl/webmin +%endif +if [ "$1" != 0 ]; then + service webmin status >/dev/null 2>/dev/null && need_restart=1 + service webmin stop >/dev/null 2>/dev/null || : +else + [[ -e /etc/cron.allow ]] && if [ "x`grep root /etc/cron.allow`" == "x" ] ; then + echo root >> /etc/cron.allow + fi +fi +/usr/share/webmin/postinstall.sh +%_post_service webmin +[[ -n $need_restart ]] && service webmin start >/dev/null 2>/dev/null || : +%if %mdkversion < 200900 +%update_menus +%endif + +%preun +%_preun_service webmin + +%postun +if [ "$1" = 0 ]; then + rm -rf /etc/webmin /var/webmin /var/lib/webmin /var/run/webmin /var/log/webmin +fi +%if %mdkversion < 200900 +%clean_menus +%endif + +%clean +rm -rf %{buildroot} + +%files +%defattr(-, root, root, 0755) +%doc README LICENCE +%{_initrddir}/webmin +%config(noreplace) %{_sysconfdir}/pam.d/webmin +%config(noreplace) %{_sysconfdir}/logrotate.d/webmin +/usr/share/webmin +/usr/bin/%{name} +%{_iconsdir}/%{name}.png +%{_liconsdir}/%{name}.png +%{_miconsdir}/%{name}.png +%{_datadir}/applications/*.desktop + + +%changelog +* Thu Aug 18 2011 Lonyai Gergely 1.560-1.1mdv2011.0 ++ Revision: 695143 +- 1.560 + +* Mon Jun 13 2011 Oden Eriksson 1.550-2 ++ Revision: 684493 +- make it work on cs4 too + +* Mon May 09 2011 Funda Wang 1.550-1 ++ Revision: 672795 +- rediff patch9 + + + Oden Eriksson + - mass rebuild + + + Sergey Zhemoitel + - new version 1.540 + +* Fri Dec 03 2010 Lonyai Gergely 1.530-1mdv2011.0 ++ Revision: 606482 +- 1.530 + +* Sat Sep 25 2010 Lonyai Gergely 1.520-1mdv2011.0 ++ Revision: 581003 +- 1.520 +- #59961 - webmin fail on detect correct MES version + +* Sat Apr 17 2010 Lonyai Gergely 1.510-4mdv2010.1 ++ Revision: 535785 +- Uncomment webmin-1.220-remove-mandrakestuff-from-init.patch + Add webmin-1.510-fix-status-in-init.patch (send upstream) + Resolved a bug anno jura: #14411 - Webmin unable to display " Started now? " status & widgets + +* Fri Apr 16 2010 Lonyai Gergely 1.510-3mdv2010.1 ++ Revision: 535667 +- Test/commented: webmin-1.220-remove-mandrakestuff-from-init.patch + +* Tue Apr 06 2010 Lonyai Gergely 1.510-2mdv2010.1 ++ Revision: 532114 +- Change the theme to default in Cooker + +* Sun Apr 04 2010 Funda Wang 1.510-1mdv2010.1 ++ Revision: 531319 +- New version 1.5.000 +- drop merged patches + +* Thu Jan 28 2010 Oden Eriksson 1.500-3mdv2010.1 ++ Revision: 497687 +- don't barf on uninstall if not running +- fix a stupid typo... + +* Thu Jan 28 2010 Oden Eriksson 1.500-2mdv2010.1 ++ Revision: 497580 +- make it backportable to at least 2008.0 + +* Wed Dec 09 2009 Funda Wang 1.500-1mdv2010.1 ++ Revision: 475292 +- new version 1.500 + +* Thu Oct 15 2009 Lonyai Gergely 1.490-5mdv2010.0 ++ Revision: 457661 +- fix #53081 - Installation of WebMin empty tmp folder and change its permission. (step 4) + fix #53249 - Sarg configuration module of webmin does no work + fix #50233 - Invalid passwords generated when created or modified with webmin. + fix #50635 - bandwidth monitoring doesn't work + +* Thu Oct 08 2009 Lonyai Gergely 1.490-4mdv2010.0 ++ Revision: 456120 +- fix #53081 - Installation of WebMin empty tmp folder and change its permission. (3) + fix #53077 - Webmin fail to detect Mandriva 2010.0 and use wrong folder (3) + +* Tue Oct 06 2009 Lonyai Gergely 1.490-3mdv2010.0 ++ Revision: 454845 +- fix #54330 - Webmin login fails, Secure Connection Failed + fix #54195 - Webmin create miniserv.pem in a wrong place + fix #53081 - Installation of WebMin empty tmp folder and change its permission. (2) + fix #53077 - Webmin fail to detect Mandriva 2010.0 and use wrong folder (2) + +* Wed Sep 30 2009 Lonyai Gergely 1.490-1mdv2010.0 ++ Revision: 451502 +- fix #53879 (initscript of Webmin is not LSB-compliant) +- fix #53077 (Webmin fail to detect Mandriva 2010.0) +- fix #41347 (If /etc/cron.allow exists, root must be found in it if you want to add/modify root's cron jobs with Webmin) +- update to 1.490 + fix #15369 (miniserv.log is not rotated on a regular basis) + +* Thu Apr 09 2009 Eugeni Dodonov 1.441-2mdv2009.1 ++ Revision: 365481 +- Updated webmin to use MD5 for user passwords by default. + Rediffed patches. + +* Fri Oct 31 2008 Oden Eriksson 1.441-1mdv2009.1 ++ Revision: 298897 +- 1.441 + +* Thu Aug 07 2008 Thierry Vignaud 1.420-2mdv2009.0 ++ Revision: 265776 +- rebuild early 2009.0 package (before pixel changes) + + + Pixel + - rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas + - %update_menus must be in %%post, not %%preun (!) + +* Wed May 28 2008 Funda Wang 1.420-1mdv2009.0 ++ Revision: 212495 +- New version 1.420 + +* Mon Mar 31 2008 Tiago Salem 1.410-1mdv2008.1 ++ Revision: 191222 +- Update to 1.410 version. Requested in #39117 + +* Thu Mar 20 2008 Tiago Salem 1.400-1mdv2008.1 ++ Revision: 189183 +- Update to 1.400 version. Requested in #39117 + +* Wed Mar 19 2008 Tiago Salem 1.390-5mdv2008.1 ++ Revision: 188949 +- add fix for broken login (#27438) +- bump release + +* Fri Feb 15 2008 Thierry Vignaud 1.390-4mdv2008.1 ++ Revision: 168797 +- fix arch-independent-package-contains-binary-or-object & manpage-not-bzipped +- remove now uneeded hack that disabled auto-requires + +* Thu Jan 31 2008 Marcelo Ricardo Leitner 1.390-3mdv2008.1 ++ Revision: 160869 +- 3mdv +- Remove useless command at %%postun +- Do not remove all configs on upgrades. It's plain wrong! +- Do not handle /etc/issue if it's not there: it's not our reponsability. +- Do not replace setup.sh logs, rather append them with proper delims. +- Cleanup + +* Thu Jan 31 2008 Marcelo Ricardo Leitner 1.390-2mdv2008.1 ++ Revision: 160858 +- Updated i18n stuff. + + + Thierry Vignaud + - drop old menu + +* Sun Dec 23 2007 Funda Wang 1.390-1mdv2008.1 ++ Revision: 137323 +- New version 1.390 + + + Olivier Blin + - restore BuildRoot + + + Thierry Vignaud + - kill re-definition of %%buildroot on Pixel's request + +* Fri Nov 09 2007 Oden Eriksson 1.380-1mdv2008.1 ++ Revision: 107023 +- 1.380 +- rediffed P34 + +* Wed Oct 10 2007 Oden Eriksson 1.370-1mdv2008.1 ++ Revision: 96834 +- 1.370 +- rediffed P0 +- drop the quotes in the Exec= line (blino) + +* Thu Aug 23 2007 Thierry Vignaud 1.360-2mdv2008.0 ++ Revision: 69707 +- fileutils, sh-utils & textutils have been obsoleted by coreutils a long time ago + +* Tue Aug 07 2007 Oden Eriksson 1.360-1mdv2008.0 ++ Revision: 59766 +- 1.360 +- don't use older plugins, nuke S20,S21 + +* Sun Jul 08 2007 Oden Eriksson 1.350-3mdv2008.0 ++ Revision: 49775 +- added P36 by Loic Vaillant to handle icons better + +* Tue Jun 12 2007 Oden Eriksson 1.350-2mdv2008.0 ++ Revision: 38194 +- remove the borked mandriva/config.cgi file +- remove the desktop-file-utils dep +- remove the "/usr/share/webmin/mandriva/config.cgi" because it is broken and not needed + +* Mon Jun 11 2007 Marcelo Ricardo Leitner 1.350-1mdv2008.0 ++ Revision: 38045 +- New upstream: 1.350 +- Updated i18n packs. +- Updated support-mandriva patch due to new upstream. +- Merged back mandriva-theme and mandriva-theme-images tarballs. +- Patched mandriva-theme so that it falls back to .gif icons if the .png + version is missing. + +* Tue May 29 2007 Andreas Hasenack 1.320-2mdv2008.0 ++ Revision: 32648 +- fixed pam config +- the initscript is not a configuration file + + +* Fri Feb 09 2007 Marcelo Ricardo Leitner 1.320-1mdv2007.0 ++ Revision: 118584 +- New upstream: 1.320 +- Synced i18n. + +* Mon Jan 22 2007 Marcelo Ricardo Leitner 1.310-1mdv2007.1 ++ Revision: 111994 +- Updated i18n stuff. + +* Tue Jan 16 2007 Oden Eriksson 1.310-0mdv2007.1 ++ Revision: 109584 +- 1.310 +- rediffed patches; P32,P34 +- dropped fix for CVE-2006-4542, applied in this version +- openvpn-2.0 +- make it backportable +- misc spec file fixes + + + Marcelo Ricardo Leitner + - Adds missing Requires to perl-ldap and perl-IO-Socket-SSL. + + + Anssi Hannula + - fix menu entry + + + Andreas Hasenack + - fix permissions on webmin pam configuration file + +* Mon Nov 13 2006 Andreas Hasenack 1.290-5mdv2007.0 ++ Revision: 83724 +- bump to fix synch in mirror + +* Thu Nov 09 2006 Andreas Hasenack 1.290-4mdv2007.1 ++ Revision: 80067 +- added security patch from 2007 update (CVE-2006-4542) +- added some missing icons to the mandriva theme +- use correct name for config files (s/mandrake/mandriva/ mess) + (#26668) +- bunzip patches and some source files +- fix fallback release number +- Import webmin + +* Wed Aug 30 2006 Oden Eriksson 1.290-3 +- fix xdg menu stuff + +* Sat Jul 15 2006 Emmanuel Andry 1.290-2mdv2007.0 +- updated 2 modules + +* Sun Jul 09 2006 Emmanuel Andry 1.290-1mdv2007.0 +- 1.290 +- %%mkrel +- updated other modules content +- replaced freeswan (not working with 2.6 kernel) with openswan +- drop patches 9, 22, 100 +- rediff patch 34 to get rid of mandrake + +* Sun Sep 18 2005 Andreas Hasenack 1.220-9mdk +- from cavassin@mandriva.com: updated i18n and patch files to fix pt_BR + problem + +* Sat Sep 17 2005 David Baudens 1.220-8mdk +- Fix icons + +* Wed Sep 07 2005 Daouda LO 1.220-7mdk +- pt_Br updates (Thanks to Cleber and Alexandre from Mandriva Brazil) + +* Sat Aug 27 2005 Daouda LO 1.220-6mdk +- more icons (ln, david) + +* Thu Aug 25 2005 Daouda LO 1.220-5mdk +- fix typo in usermin index.cgi #17809 + +* Fri Aug 19 2005 Daouda LO 1.220-4mdk +- added fr translation (Thanx to Vincent and Marcelo) + +* Sun Aug 07 2005 Daouda LO 1.220-3mdk +- Integrated awesome eye-candy theme for Mandriva (thanx to Marcelo) +- handle correctly files and directories with special chars in + name (-print0). + +* Thu Aug 04 2005 Daouda LO 1.220-2mdk +- pt_BR i18n merge (Marcelo) +- updates for mount, mysql, postgresql modules + +* Fri Jul 22 2005 Daouda LO 1.220-1mdk +- 1.220 +- fix samba default config file location +- added webmin module usermonitor which can display all connections + based on Telnet / SSH and Samba to your System, kill them or send + a message to their owners +- Support for openldap 2 +- Refreshed updates list and urls location (dead links) +- Aware of new Mandriva Linux name change and new Corporate products. +- Regenerate patches #9, #17, #22, #34 +- Patch #4 (ssl support) merged upstream + +* Wed Feb 23 2005 Daouda LO 1.180-1mdk +- new version 1.180 +- according to rpmlint summary should not end with a dot :) + +* Fri Jan 21 2005 Guillaume Cottenceau 1.170-1mdk +- new version +- sshd patch merged upstream +- can security patch merged upstream + +* Sat Oct 09 2004 Warly 1.150-3mdk +- add security patch can-2004-0559 + +* Sat Sep 11 2004 David Baudens 1.150-2mdk +- Add menu entry + +* Fri Jun 25 2004 Guillaume Cottenceau 1.150-1mdk +- new version + +* Sat Mar 13 2004 Guillaume Cottenceau 1.130-1mdk +- new version +- updates + +* Fri Feb 27 2004 Guillaume Cottenceau 1.121-4mdk +- Patch32: don't allow installing usermin RPM package from webmin.com + it won't work anyway (first seen in #8459) + +* Tue Feb 24 2004 Guillaume Cottenceau 1.121-3mdk +- allow Mandrake-10.0 version (#8297) + diff --git a/webmin_gehrigal-themeconfigurator_0.21a.wbm b/webmin_gehrigal-themeconfigurator_0.21a.wbm new file mode 100644 index 0000000..237c75e Binary files /dev/null and b/webmin_gehrigal-themeconfigurator_0.21a.wbm differ