--- rpms/e-smith-base/sme8/e-smith-base.spec 2008/04/02 18:34:04 1.44 +++ rpms/e-smith-base/sme8/e-smith-base.spec 2010/01/30 21:34:04 1.82 @@ -1,23 +1,31 @@ +# $Id: e-smith-base.spec,v 1.81 2010/01/14 12:12:57 filippocarletti Exp $ + Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} -%define version 4.18.1 -%define release 7 +%define version 5.2.0 +%define release 12 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.gz -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 +Patch1: e-smith-base-5.2.0-sambaRole.patch +Patch2: e-smith-base-5.2.0-smartd40.patch +Patch3: e-smith-base-5.2.0-usbRev70drive.patch +Patch4: e-smith-base-5.2.0-FixLabelArray.patch +Patch5: e-smith-base-5.2.0-straysymlink.patch +Patch6: e-smith-base-5.2.0-nonetworkdrivers.patch +Patch7: e-smith-base-5.2.0-checkIPOverlap.patch +Patch8: e-smith-base-5.2.0-adapter-translation-fixes.patch +Patch9: e-smith-base-5.2.0-FixLocale_External.patch +Patch10: e-smith-base-5.2.0-perform_restore-hal.patch +Patch11: e-smith-base-5.2.0-generate-2048-bits-keys.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external -Requires: e-smith-lib >= 1.18.0-19 +Requires: e-smith-lib >= 2.2.0-2 Requires: server-manager-images, server-manager -Requires: e-smith-formmagick >= 1.4.0-9 +Requires: e-smith-formmagick >= 1.4.0-12 Requires: initscripts >= 6.67-1es17 Requires: e-smith-daemontools >= 1.7.1-04 Requires: perl(Locale::gettext) @@ -31,7 +39,6 @@ Requires: /sbin/microcode_ctl Requires: dbus Requires: hal Requires: acpid -Requires: whiptail Requires: rssh Requires: bridge-utils Requires: vconfig @@ -43,9 +50,7 @@ Obsoletes: rlinetd, e-smith-mod_ssl Obsoletes: e-smith-serial-console Obsoletes: sshell Obsoletes: e-smith-rp-pppoe -%if "%{?rhel}" == "5" Obsoletes: perl-Data-UUID -%endif BuildRequires: perl, perl(Test::Inline) >= 0.12 BuildRequires: e-smith-devtools >= 1.13.1-03 BuildRequires: gettext @@ -60,6 +65,111 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Sat Jan 30 2010 Jonathan Martens 5.2.0-12.sme +- Bump certificate encryption from 1024 bits to 2048 bits [SME: 5735] + +* Thu Jan 14 2010 Filippo Carletti 5.2.0-11.sme +- Fix console restore from removable media (Federico Simoncelli) [SME: 4809] + +* Mon Nov 23 2009 Gavin Weight 5.2.0-10.sme +- Add a dummy call so xgettext can pull translated $ifName in console configuration pages. [SME: 5571] + +* Fri Nov 6 2009 Jonathan Martens 5.2.0-9.sme +- Translate $ifName in console configuration pages [SME: 5571] + +* Sat Oct 24 2009 Jonathan Martens 5.2.0-8.sme +- Prevent IP conflicts between local and external interface in server gateway mode [SME: 5501] + +* Tue Oct 20 2009 Filippo Carletti 5.2.0-7.sme +- Clean up: remove unused nonetworkdrivers [SME: 5521] + +* Sat Jun 6 2009 Shad L. Lords 5.2.0-6.sme +- Clean up stray symlinks in /lib/modules before depmod [SME: 5336] + +* Mon May 18 2009 Gavin Weight 5.2.0-5.sme +- Allow for different mdadm output formats for DeviceSize. [SME: 5230] + +* Sat Feb 14 2009 Jonathan Martens 5.2.0-4.sme +- Auto-mount USB REV70-drive as usbdisk [SME: 5006] + +* Sat Oct 25 2008 Stephen Noble 5.2.0-3.sme +- create service link for smartd [SME: 1445] + +* Mon Oct 13 2008 Shad L. Lords 5.2.0-2.sme +- Add patch to support multiple samba roles [SME: 4172] + +* Tue Oct 7 2008 Shad L. Lords 5.2.0-1.sme +- Roll new stream to separate sme7/sme8 trees [SME: 4633] + +* Tue Sep 23 2008 Stephen Noble 4.19.0-6 +- Add locale tags for email in review panel [SME: 4267] + +* Sat Sep 20 2008 Shad L. Lords 4.19.0-5 +- Correct gettext type during build process [SME: 570] + +* Mon Sep 15 2008 Shad L. Lords 4.19.0-4 +- Fix screen corruption in console [SME: 4155] + +* Sat Sep 13 2008 Shad L. Lords 4.19.0-3 +- Fix detection of xen instance against newer kernels [SME: 4555] + +* Thu Aug 28 2008 Jonathan Martens 4.19.0-2 +- Fixed warnings generated during build process [SME: 570] + +* Wed Aug 20 2008 Shad L. Lords 4.19.0-1 +- Roll new dev stream. + +* Sun Aug 17 2008 Gavin Weight 4.18.1-22 +- Add gettext to creating backup file title for localization. [SME: 4467] + +* Mon Aug 11 2008 Charlie Brady 4.18.1-21 +- Fix race condition in VPN ip-down handling which could cause loss of + LAN connectivity. [SME: 4405] + +* Sat Aug 9 2008 Shad L. Lords 4.18.1-20 +- Remove requires for whiptail. No longer needed [SME: 4491] + +* Fri Aug 8 2008 Jonathan Martens 4.18.1-19 +- Change userpassword panel to use PASSWORD_VERIFY_NEW instead of PASSWORD_NEW_VERIFY [SME: 4487] + +* Thu Aug 7 2008 Jonathan Martens 4.18.1-18 +- Revert locale key PASSWORD_RESET_TITLE to RESET_PASSWORD_TITLE and move it + to e-smith-formmagick's general [SME: 4475] +- Reverting all *PASSWORD_NO_MATCH to *PASSWORD_VERIFY_ERROR locale keys [SME: 4476] +- Remove invalid entry tag from userpassword's locale file preventing the + form from displaying properly [SME: 4479] + +* Tue Aug 5 2008 Jonathan Martens 4.18.1-17 +- Revert previous invalid locale changes (reverting to 4.18.1-15) [SME: 4472] + +* Mon Aug 4 2008 Jonathan Martens 4.18.1-16 +- Revert some locale changes + +* Tue Jul 22 2008 Gavin Weight 4.18.1-15 +- Add regex to support cciss device names in manageRAID.pl. [SME: 4455] + +* Sat Jul 5 2008 Jonathan Martens 4.18.1-14 +- Add common tags to e-smith-formmagick's general [SME: 4279] + +* Sun Apr 27 2008 Jonathan Martens 4.18.1-13 +- Add common tags to e-smith-formmagick's general [SME: 4279] + +* Wed Apr 23 2008 Shad L. Lords 4.18.1-12 +- Fix for > 5 nics detected [SME: 4232] + +* Tue Apr 22 2008 Shad L. Lords 4.18.1-11 +- Remove use of Date::Manip from ssl.crt [SME: 3155] + +* Sat Apr 19 2008 Shad L. Lords 4.18.1-10 +- Fix FreeBusy param when disabled [SME: 1806] +- Remove .orig file [SME: 4228] + +* Wed Apr 2 2008 Shad L. Lords 4.18.1-9 +- Remove quitConsole from menu [SME: 4154] + +* Wed Apr 2 2008 Shad L. Lords 4.18.1-8 +- Really fix free/busy in usermanager [SME: 4157] + * Wed Apr 2 2008 Shad L. Lords 4.18.1-7 - Use frames in elinks [SME: 4156] - Set homepage for elinks [SME: 4160] @@ -1212,11 +1322,15 @@ 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 %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ] @@ -1281,7 +1395,7 @@ ln -s /etc/rc.d/rc7.d root/etc/rc7.d mkdir -p root/etc/rc.d/rc1.d mkdir -p root/usr/share/locale/en_US/LC_MESSAGES -xgettext -o root/usr/share/locale/en_US/LC_MESSAGES/server-console.po root/sbin/e-smith/console +xgettext -L perl -o root/usr/share/locale/en_US/LC_MESSAGES/server-console.po root/sbin/e-smith/console mkdir -p root/etc/e-smith/locale # Make the fr-ca link in %pre to ease upgrades @@ -1326,7 +1440,6 @@ rm root/service/{syslog,klogd} mkdir -p root/etc/e-smith/events/local mkdir -p root/etc/e-smith/events/user-modify-admin mkdir -p root/home/e-smith/db -touch root/home/e-smith/db/configuration mkdir -p root/etc/e-smith/pam mkdir -p root/home/e-smith/ssl.key @@ -1338,8 +1451,6 @@ mkdir -p root/var/state/e-smith for file in %{dbfiles} do mkdir -p root/etc/e-smith/db/$file/{defaults,migrate,force} - # Create ghost file for rpm - touch root/home/e-smith/db/$file done mkdir -p root/etc/tcprules