--- rpms/e-smith-base/sme8/e-smith-base.spec 2007/10/13 23:29:50 1.11 +++ rpms/e-smith-base/sme8/e-smith-base.spec 2008/04/02 18:34:04 1.44 @@ -1,75 +1,23 @@ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} -%define version 4.18.0 -%define release 71 +%define version 4.18.1 +%define release 7 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.gz -Patch1: e-smith-base-4.18.0-backtitle.patch -Patch2: e-smith-base-4.18.0-consolebackup.patch -Patch3: e-smith-base-4.18.0-backupcancel.patch -Patch4: e-smith-base-4.18.0-gatewaydev.patch -Patch5: e-smith-base-4.18.0-elinks_caching.patch -Patch6: e-smith-base-4.18.0-unused_templates.patch -Patch7: e-smith-base-4.18.0-backuphome.patch -Patch8: e-smith-base-4.18.0-mediaglob.patch -Patch9: e-smith-base-4.18.0-setbeforeexpand.patch -Patch10: e-smith-base-4.18.0-runit17.patch -Patch11: e-smith-base-4.18.0-infobox.patch -Patch12: e-smith-base-4.18.0-infobox.patch2 -Patch13: e-smith-base-4.18.0-mediaglob.patch2 -Patch14: e-smith-base-4.18.0-run.static.patch -Patch15: e-smith-base-4.18.0-ethdriver.patch -Patch16: e-smith-base-4.18.0-ethdriver.patch2 -Patch17: e-smith-base-4.18.0-ethdriver.patch3 -Patch18: e-smith-base-4.18.0-ethdriver.patch4 -Patch19: e-smith-base-4.18.0-raid_no.patch -Patch20: e-smith-base-4.18.0-commonname.patch -Patch21: e-smith-base-4.18.0-noutf.patch -Patch22: e-smith-base-4.18.0-commonname.patch2 -Patch23: e-smith-base-4.18.0-pamtemplate.patch -Patch24: e-smith-base-4.18.0-pamtemplate.patch2 -Patch25: e-smith-base-4.18.0-rcscript.patch -Patch26: e-smith-base-4.18.0-logfile_rotation.patch -Patch27: e-smith-base-4.18.0-login_pam.patch -Patch28: e-smith-base-4.18.0-depmod.patch -Patch29: e-smith-base-4.18.0-perms.patch -Patch30: e-smith-base-4.18.0-dhcpd_perms.patch -Patch31: e-smith-base-4.18.0-noraid.patch -Patch32: e-smith-base-4.18.0-suborder.patch -Patch33: e-smith-base-4.18.0-standby.patch -Patch34: e-smith-base-4.18.0-usbback.patch -Patch35: e-smith-base-4.18.0-remoteaccess.pmfm2self.patch -Patch36: e-smith-base-4.18.0-SSHport.patch -Patch37: e-smith-base-4.18.0-gateway_validation.patch -Patch38: e-smith-base-4.18.0-service_re.patch -Patch39: e-smith-base-4.18.0-xencons.patch -Patch40: e-smith-base-4.18.0-lib64.patch -Patch41: e-smith-base-4.18.0-cracklib.patch -Patch42: e-smith-base-4.18.0-raid_no.patch2 -Patch43: e-smith-base-4.18.0-raidfix.patch -Patch44: e-smith-base-4.18.0-bootstrap.patch -Patch45: e-smith-base-4.18.0-pamtemplate.patch3 -Patch46: e-smith-base-4.18.0-restoredev.patch -Patch47: e-smith-base-4.18.0-no_kmodule.patch -Patch48: e-smith-base-4-18-0-MovePam_d_ftpTemplates.patch -Patch49: e-smith-base-4.18.0-usbback_errcheck.patch -Patch50: e-smith-base-4.18.0-devicechk.patch -Patch51: e-smith-base-4.18.0-devicechk.patch2 -Patch52: e-smith-base-4.18.0-conf_modules.patch -Patch53: e-smith-base-4.18.0-restoredev.patch2 -Patch54: e-smith-base-4.18.0-groups.pm.pod.patch -Patch55: e-smith-base-4.18.0-rename_apache2httpd.patch -Patch56: e-smith-base-4.18.0-remove_httpd__logrotate.patch -Patch57: e-smith-base-4.18.0-cert_regen.patch +Patch1: e-smith-base-4.18.1-fixgettext.patch +Patch2: e-smith-base-4.18.1-deleteorder.patch +Patch3: e-smith-base-4.18.1-insertmode.patch +Patch4: e-smith-base-4.18.1-freebusy.patch +Patch5: e-smith-base-4.18.1-frames.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external -Requires: e-smith-lib >= 1.18.0-7 +Requires: e-smith-lib >= 1.18.0-19 Requires: server-manager-images, server-manager -Requires: e-smith-formmagick >= 0.2.0 +Requires: e-smith-formmagick >= 1.4.0-9 Requires: initscripts >= 6.67-1es17 Requires: e-smith-daemontools >= 1.7.1-04 Requires: perl(Locale::gettext) @@ -112,9 +60,132 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog -* Thu Oct 11 2007 Charlie Brady 4.18.0-70 +* Wed Apr 2 2008 Shad L. Lords 4.18.1-7 +- Use frames in elinks [SME: 4156] +- Set homepage for elinks [SME: 4160] + +* Wed Apr 2 2008 Shad L. Lords 4.18.1-6 +- Fix free/busy field in useraccounts [SME: 4157] + +* Tue Apr 1 2008 Shad L. Lords 4.18.1-5 +- Add free/busy URL entry to help kronolith contribs [SME: 1806] + +* Fri Mar 28 2008 Shad L. Lords 4.18.1-4 +- Fix insert_mode for elinks on el5 platform [SME: 4127] + +* Wed Mar 26 2008 Shad L. Lords 4.18.1-3 +- Set accounts to deleted before template expansion [SME: 4122] + +* Wed Mar 26 2008 Shad L. Lords 4.18.1-2 +- Fix gettext strings returned by password checks [SME: 4104] + +* Wed Mar 26 2008 Shad L. Lords 4.18.1-1 +- Roll new stable stream consolidating patches. + +* Mon Mar 24 2008 Shad L. Lords 4.18.0-104 +- Finish removing pleasewait [SME: 126] + +* Tue Mar 18 2008 Shad L. Lords 4.18.0-103 +- Add gettext to console titles. [SME: 4089] + +* Sat Mar 15 2008 Stephen Noble 4.18.0-102 +- Minor translation fixes [SME: 4058] [SME: 4059] + +* Wed Mar 12 2008 Shad L. Lords 4.18.0-101 +- Remove tests for removed FORM_TITLE's [SME: 4050] + +* Wed Mar 12 2008 Shad L. Lords 4.18.0-100 +- Cleanup SAVE/ADD tag mixup [SME: 4045] + +* Sat Mar 10 2008 Shad L. Lords 4.18-99 +- Fix dyndns custom gettext [SME: 4032] + +* Sat Mar 07 2008 Stephen Noble 4.18-98 +- revised gettext messages [SME: 631] + +* Sat Mar 07 2008 Stephen Noble 4.18-97 +- gettext messages [SME: 631] + +* Sat Mar 07 2008 Stephen Noble 4.18-96 +- remove duplicate system password has been changed [SME: 3974] + +* Sat Mar 07 2008 Stephen Noble 4.18-95 +- EthernetAssign shouldn't be translated [SME: 3947] + +* Sun Feb 17 2008 Stephen Noble 4.18-94 +- Remove pleasewait function [SME: 126] + +* Sun Feb 17 2008 Stephen Noble 4.18-93 +- fix gettext formatting in three files [SME: 3938] + +* Wed Feb 13 2008 chris burnat 4.18-92 +- Fix creation of usernames and pseudonyms with one character +- [SME: 2451] + +* Wed Feb 13 2008 Stephen Noble 4.18-91 +- Remove tags now in general [SME: 3911] + +* Sun Feb 10 2008 Stephen Noble 4.18-90 +- Remove duplicate entries [SME: 3894] + +* Sat Feb 09 2008 Stephen Noble 4.18-89 +- remove unused ROUTER_DESC token from lexicon [SME: 3879] + +* Sat Jan 12 2008 Shad L. Lords 4.18-88 +- remove default of 1400 MTU for interfaces [SME: 549] + +* Wed Jan 09 2008 Stephen Noble 4.18-87 +- db prop to dissociate admin password from root in useraccounts.pm [SME: 3117] + +* Wed Jan 09 2008 Stephen Noble 4.18-86 +- pptp connections setting mtu/mru > 1400 [SME: 549] + +* Tue Jan 08 2008 Stephen Noble 4.18-85 +- console to strength validate password choice on first entry [SME: 3131] + +* Tue Jan 08 2008 Stephen Noble 4.18-84 +- Auto-mount USB REV-drive as usbdisk [SME: 2972] + +* Sun Jan 06 2008 Stephen Noble 4.18-83 +- ignore error returns from tar [SME: 3127] + +* Sun Jan 06 2008 Stephen Noble 4.18-82 +- Use esmith::util::validatePassword on console [SME: 2173] + +* Mon Dec 24 2007 Gavin Weight 4.18.0-81 +- Link smartd.conf to bootstrap-save-console and console-save. [SME: 1445] + +* Mon Dec 24 2007 Stephen Noble 4.18-80 +- Add smartd as a disabled service with template [SME: 1445] + +* Sun Dec 16 2007 Shad L. Lords 4.18.0-79 +- Lock user accounts with usermod instead of passwd [SME: 3595] + +* Sun Dec 16 2007 Gavin Weight 4.18.0-78 +- Add symlink to fr-fr locale. [SME: 3648] + +* Mon Nov 12 2007 Shad L. Lords 4.18.0-77 +- Add fix for varying partition sizes in add_raid [SME: 3547] + +* Sun Nov 11 2007 Gavin Weight 4.18.0-76 +- Fix removal of Corporate DNS from console. [SME: 3532] + +* Fri Nov 02 2007 Gavin Weight 4.18.0-75 +- Remove previous change, applied to wrong package. [SME: 3512] + +* Fri Nov 02 2007 Gavin Weight 4.18.0-74 +- Add WPAD feature for DHCP (Thanks Hector Perez). [SME: 3512] + +* Tue Oct 16 2007 Gavin Weight 4.18.0-73 +- Make non-Removable pseudonyms point to admin when reassigned. [SME: 2214] + +* Sun Oct 14 2007 Gavin Weight 4.18.0-72 +- Adjust success text when changing admin password. [SME: 2442] + +* Thu Oct 11 2007 Charlie Brady 4.18.0-71 - Fix comparison of expected to actual SSL cert data. Also change truncation point for email address from 40 chars to 64. [SME: 1736]. + [Note that -70 was inadvertently skipped.] * Tue Sep 11 2007 Gavin Weight 4.18.0-69 - Move httpd logrotate.d directory to e-smith-apache. [SME: 3380] @@ -1141,64 +1212,11 @@ e-smith server and gateway software - ba %setup %patch1 -p1 %patch2 -p1 +%if "%{?rhel}" == "5" %patch3 -p1 +%endif %patch4 -p1 %patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 -%patch28 -p1 -%patch29 -p1 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -p1 -%patch35 -p1 -%patch36 -p1 -%patch37 -p1 -%patch38 -p1 -%patch39 -p1 -%patch40 -p1 -%patch41 -p1 -%patch42 -p1 -%patch43 -p1 -%patch44 -p1 -%patch45 -p1 -%patch46 -p1 -%patch47 -p1 -%patch48 -p1 -%patch49 -p1 -%patch50 -p1 -%patch51 -p1 -%patch52 -p1 -%patch53 -p1 -%patch54 -p1 -%patch55 -p1 -%patch56 -p1 -%patch57 -p1 - -rm -rf root/etc/e-smith/db/configuration/defaults/httpd-admin -rm -rf root/etc/e-smith/templates/etc/identd.masq %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ] @@ -1244,7 +1262,7 @@ echo "disabled" > root/etc/e-smith/db/c %endif LEXICONS=$(find root/etc/e-smith/web/{functions,panels/password/cgi-bin} \ - -type f | grep -v CVS | grep -v pleasewait) + -type f | grep -v CVS) for lexicon in $LEXICONS do @@ -1267,7 +1285,8 @@ xgettext -o root/usr/share/locale/en_US/ mkdir -p root/etc/e-smith/locale # Make the fr-ca link in %pre to ease upgrades -# ln -s fr root/etc/e-smith/locale/fr-ca +# ln -s fr root/etc/e-smith/locale/fr-ca +ln -s fr root/etc/e-smith/locale/fr-fr ln -s en-us root/etc/e-smith/locale/en ln -s en-us root/etc/e-smith/locale/en-au ln -s en-us root/etc/e-smith/locale/en-gb