Update to 1.590

This commit is contained in:
Sergey Zhemoitel 2012-07-21 16:52:51 +04:00
parent e790a580cc
commit f69592d4c9
2 changed files with 39 additions and 357 deletions

View file

@ -2,6 +2,7 @@ sources:
"openvpn-2.0.wbm.gz": 4039007c5f921fd4f32b1952f9cddf0dc98bef58
"other.modules.tar.bz2": 96c8a928edf7f2ab40a6ad4c5c87f85654edfb5e
"webmin-1.560.tar.gz": 02ae664b0f01a8214aac018c74fd34447336ed5d
"webmin-1.590.tar.gz": aa300202a16b1200c0bb4e5f86b9b2933b4577fd
"webmin-i18n-20080131.tar.bz2": 7c8ba368a7543df997ca1351a8411c2003fc9ccd
"webmin-mandriva-theme.tar.bz2": 74b1b6d054ad136c22f84dc9bb24ed013bb1f7fc
"webmin-scripts-i18n.tar.bz2": 2f1a23774d5d563be934616d1c820e3bfbe48275

View file

@ -12,7 +12,7 @@
%if %mandriva_branch == Cooker
# Cooker
%define release %mkrel 2
%define release %mkrel 1
%else
# Old distros
%define subrel 1
@ -21,12 +21,12 @@
Summary: An SSL web-based administration interface for Unix systems
Name: webmin
Version: 1.560
Version: 1.590
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
Source0: http://heanet.dl.sourceforge.net/project/webadmin/%{name}/%{version}/%{name}-%{version}.tar.gz
Source2: other.modules.tar.bz2
Source30: webmin-mandriva-theme.tar.bz2
# some images were missing
@ -59,6 +59,8 @@ 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
Source101: awstats-1.9.wbm
Source102: dgwebmin-0.7.1.wbm
Patch0: webmin-fix-configs.diff
Patch1: webmin-1.100-remove-atboot-problem
Patch5: webmin-fix-newmods.patch
@ -114,6 +116,8 @@ LOGIN TO "https://localhost:10000/" AND NOT "http://localhost:10000/".
tar xf %{SOURCE54}
tar xf %{SOURCE541}
tar xf %{SOURCE57}
tar xf %{SOURCE101}
tar xf %{SOURCE102}
install -m 0644 %{SOURCE33} mandriva/webmin/images
install -m 0644 %{SOURCE34} mandriva/webmin/images
@ -121,33 +125,33 @@ 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
#%if %{mdkversion} < 20101
#%patch0 -p0
#%endif
#%patch1 -p0
#%patch5 -p0
#%patch7 -p1
#%patch8 -p1
#%patch9 -p0
#%patch10 -p1
%patch13 -p0
%patch15 -p0
#%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
#%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
@ -178,10 +182,10 @@ rm -f mount/openbsd-mounts-*
find -name ".xvpics" -o -name ".*.swp" | xargs rm -rf
# i18n
%if %{with_i18n_tarball}
#%if %{with_i18n_tarball}
#tar -jxf %{_sourcedir}/webmin-i18n-%{i18n_date}.tar.bz2
tar -jxf %{SOURCE100}
%endif
#tar -jxf %{SOURCE100}
#%endif
%build
@ -270,9 +274,9 @@ install -m 0644 %{SOURCE15} %{buildroot}%{_sysconfdir}/logrotate.d/webmin
%_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
mkdir -p %{buildroot}%{_sysconfdir}/ssl/webmin
mv -f %{buildroot}%{_datadir}/webmin/miniserv.pem \
%{buildroot}%{_sysconfdir}/ssl/webmin
%endif
if [ "$1" != 0 ]; then
service webmin status >/dev/null 2>/dev/null && need_restart=1
@ -315,326 +319,3 @@ rm -rf %{buildroot}
%{_liconsdir}/%{name}.png
%{_miconsdir}/%{name}.png
%{_datadir}/applications/*.desktop
%changelog
* Thu Aug 18 2011 Lonyai Gergely <aleph@mandriva.org> 1.560-1.1mdv2011.0
+ Revision: 695143
- 1.560
* Mon Jun 13 2011 Oden Eriksson <oeriksson@mandriva.com> 1.550-2
+ Revision: 684493
- make it work on cs4 too
* Mon May 09 2011 Funda Wang <fwang@mandriva.org> 1.550-1
+ Revision: 672795
- rediff patch9
+ Oden Eriksson <oeriksson@mandriva.com>
- mass rebuild
+ Sergey Zhemoitel <serg@mandriva.org>
- new version 1.540
* Fri Dec 03 2010 Lonyai Gergely <aleph@mandriva.org> 1.530-1mdv2011.0
+ Revision: 606482
- 1.530
* Sat Sep 25 2010 Lonyai Gergely <aleph@mandriva.org> 1.520-1mdv2011.0
+ Revision: 581003
- 1.520
- #59961 - webmin fail on detect correct MES version
* Sat Apr 17 2010 Lonyai Gergely <aleph@mandriva.org> 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 <aleph@mandriva.org> 1.510-3mdv2010.1
+ Revision: 535667
- Test/commented: webmin-1.220-remove-mandrakestuff-from-init.patch
* Tue Apr 06 2010 Lonyai Gergely <aleph@mandriva.org> 1.510-2mdv2010.1
+ Revision: 532114
- Change the theme to default in Cooker
* Sun Apr 04 2010 Funda Wang <fwang@mandriva.org> 1.510-1mdv2010.1
+ Revision: 531319
- New version 1.5.000
- drop merged patches
* Thu Jan 28 2010 Oden Eriksson <oeriksson@mandriva.com> 1.500-3mdv2010.1
+ Revision: 497687
- don't barf on uninstall if not running
- fix a stupid typo...
* Thu Jan 28 2010 Oden Eriksson <oeriksson@mandriva.com> 1.500-2mdv2010.1
+ Revision: 497580
- make it backportable to at least 2008.0
* Wed Dec 09 2009 Funda Wang <fwang@mandriva.org> 1.500-1mdv2010.1
+ Revision: 475292
- new version 1.500
* Thu Oct 15 2009 Lonyai Gergely <aleph@mandriva.org> 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 <aleph@mandriva.org> 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 <aleph@mandriva.org> 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 <aleph@mandriva.org> 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 <eugeni@mandriva.com> 1.441-2mdv2009.1
+ Revision: 365481
- Updated webmin to use MD5 for user passwords by default.
Rediffed patches.
* Fri Oct 31 2008 Oden Eriksson <oeriksson@mandriva.com> 1.441-1mdv2009.1
+ Revision: 298897
- 1.441
* Thu Aug 07 2008 Thierry Vignaud <tv@mandriva.org> 1.420-2mdv2009.0
+ Revision: 265776
- rebuild early 2009.0 package (before pixel changes)
+ Pixel <pixel@mandriva.com>
- 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 <fwang@mandriva.org> 1.420-1mdv2009.0
+ Revision: 212495
- New version 1.420
* Mon Mar 31 2008 Tiago Salem <salem@mandriva.com.br> 1.410-1mdv2008.1
+ Revision: 191222
- Update to 1.410 version. Requested in #39117
* Thu Mar 20 2008 Tiago Salem <salem@mandriva.com.br> 1.400-1mdv2008.1
+ Revision: 189183
- Update to 1.400 version. Requested in #39117
* Wed Mar 19 2008 Tiago Salem <salem@mandriva.com.br> 1.390-5mdv2008.1
+ Revision: 188949
- add fix for broken login (#27438)
- bump release
* Fri Feb 15 2008 Thierry Vignaud <tv@mandriva.org> 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 <mrl@mandriva.com> 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 <mrl@mandriva.com> 1.390-2mdv2008.1
+ Revision: 160858
- Updated i18n stuff.
+ Thierry Vignaud <tv@mandriva.org>
- drop old menu
* Sun Dec 23 2007 Funda Wang <fwang@mandriva.org> 1.390-1mdv2008.1
+ Revision: 137323
- New version 1.390
+ Olivier Blin <blino@mandriva.org>
- restore BuildRoot
+ Thierry Vignaud <tv@mandriva.org>
- kill re-definition of %%buildroot on Pixel's request
* Fri Nov 09 2007 Oden Eriksson <oeriksson@mandriva.com> 1.380-1mdv2008.1
+ Revision: 107023
- 1.380
- rediffed P34
* Wed Oct 10 2007 Oden Eriksson <oeriksson@mandriva.com> 1.370-1mdv2008.1
+ Revision: 96834
- 1.370
- rediffed P0
- drop the quotes in the Exec= line (blino)
* Thu Aug 23 2007 Thierry Vignaud <tv@mandriva.org> 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 <oeriksson@mandriva.com> 1.360-1mdv2008.0
+ Revision: 59766
- 1.360
- don't use older plugins, nuke S20,S21
* Sun Jul 08 2007 Oden Eriksson <oeriksson@mandriva.com> 1.350-3mdv2008.0
+ Revision: 49775
- added P36 by Loic Vaillant to handle icons better
* Tue Jun 12 2007 Oden Eriksson <oeriksson@mandriva.com> 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 <mrl@mandriva.com> 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 <andreas@mandriva.com> 1.320-2mdv2008.0
+ Revision: 32648
- fixed pam config
- the initscript is not a configuration file
* Fri Feb 09 2007 Marcelo Ricardo Leitner <mrl@mandriva.com> 1.320-1mdv2007.0
+ Revision: 118584
- New upstream: 1.320
- Synced i18n.
* Mon Jan 22 2007 Marcelo Ricardo Leitner <mrl@mandriva.com> 1.310-1mdv2007.1
+ Revision: 111994
- Updated i18n stuff.
* Tue Jan 16 2007 Oden Eriksson <oeriksson@mandriva.com> 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 <mrl@mandriva.com>
- Adds missing Requires to perl-ldap and perl-IO-Socket-SSL.
+ Anssi Hannula <anssi@mandriva.org>
- fix menu entry
+ Andreas Hasenack <andreas@mandriva.com>
- fix permissions on webmin pam configuration file
* Mon Nov 13 2006 Andreas Hasenack <andreas@mandriva.com> 1.290-5mdv2007.0
+ Revision: 83724
- bump to fix synch in mirror
* Thu Nov 09 2006 Andreas Hasenack <andreas@mandriva.com> 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 <oeriksson@mandriva.com> 1.290-3
- fix xdg menu stuff
* Sat Jul 15 2006 Emmanuel Andry <eandry@mandriva.org> 1.290-2mdv2007.0
- updated 2 modules
* Sun Jul 09 2006 Emmanuel Andry <eandry@mandriva.org> 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 <andreas@mandriva.com> 1.220-9mdk
- from cavassin@mandriva.com: updated i18n and patch files to fix pt_BR
problem
* Sat Sep 17 2005 David Baudens <baudens@mandrakesoft.com> 1.220-8mdk
- Fix icons
* Wed Sep 07 2005 Daouda LO <daouda@mandrakesoft.com> 1.220-7mdk
- pt_Br updates (Thanks to Cleber and Alexandre from Mandriva Brazil)
* Sat Aug 27 2005 Daouda LO <daouda@mandrakesoft.com> 1.220-6mdk
- more icons (ln, david)
* Thu Aug 25 2005 Daouda LO <daouda@mandrakesoft.com> 1.220-5mdk
- fix typo in usermin index.cgi #17809
* Fri Aug 19 2005 Daouda LO <daouda@mandriva.com> 1.220-4mdk
- added fr translation (Thanx to Vincent and Marcelo)
* Sun Aug 07 2005 Daouda LO <daouda@mandrakesoft.com> 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 <daouda@mandrakesoft.com> 1.220-2mdk
- pt_BR i18n merge (Marcelo)
- updates for mount, mysql, postgresql modules
* Fri Jul 22 2005 Daouda LO <daouda@mandrakesoft.com> 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 <daouda@mandrakesoft.com> 1.180-1mdk
- new version 1.180
- according to rpmlint summary should not end with a dot :)
* Fri Jan 21 2005 Guillaume Cottenceau <gc@mandrakesoft.com> 1.170-1mdk
- new version
- sshd patch merged upstream
- can security patch merged upstream
* Sat Oct 09 2004 Warly <warly@mandrakesoft.com> 1.150-3mdk
- add security patch can-2004-0559
* Sat Sep 11 2004 David Baudens <baudens@mandrakesoft.com> 1.150-2mdk
- Add menu entry
* Fri Jun 25 2004 Guillaume Cottenceau <gc@mandrakesoft.com> 1.150-1mdk
- new version
* Sat Mar 13 2004 Guillaume Cottenceau <gc@mandrakesoft.com> 1.130-1mdk
- new version
- updates
* Fri Feb 27 2004 Guillaume Cottenceau <gc@mandrakesoft.com> 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 <gc@mandrakesoft.com> 1.121-3mdk
- allow Mandrake-10.0 version (#8297)