/[smeserver]/rpms/e-smith-base/sme8/e-smith-base.spec

Diff of /rpms/e-smith-base/sme8/e-smith-base.spec

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-Revision 1.61 by bytegw,
Sun Aug 17 15:05:23 2008 UTC
+Revision 1.108 by vip-ire,
Thu Oct 14 16:21:30 2010 UTC
 Line 1
+ # $Id: e-smith-base.spec,v 1.107 2010/10/12 17:55:13 vip-ire Exp $
  Summary: e-smith server and gateway - base module
  %define name e-smith-base
  Name: %{name}
- %define version 4.18.1
+ %define version 5.2.0
- %define release 22
+ %define release 38
  Version: %{version}
  Release: %{release}%{?dist}
  License: GPL
  Group: Networking/Daemons
  Source: %{name}-%{version}.tar.gz
- Patch1: e-smith-base-4.18.1-fixgettext.patch
+ Patch1: e-smith-base-5.2.0-sambaRole.patch
- Patch2: e-smith-base-4.18.1-deleteorder.patch
+ Patch2: e-smith-base-5.2.0-smartd40.patch
- Patch3: e-smith-base-4.18.1-insertmode.patch
+ Patch3: e-smith-base-5.2.0-usbRev70drive.patch
- Patch4: e-smith-base-4.18.1-freebusy.patch
+ Patch4: e-smith-base-5.2.0-FixLabelArray.patch
- Patch5: e-smith-base-4.18.1-frames.patch
+ Patch5: e-smith-base-5.2.0-straysymlink.patch
- Patch6: e-smith-base-4.18.1-quitconsole.patch
+ Patch6: e-smith-base-5.2.0-nonetworkdrivers.patch
- Patch7: e-smith-base-4.18.1-freebusy.patch2
+ Patch7: e-smith-base-5.2.0-checkIPOverlap.patch
- Patch8: e-smith-base-4.18.1-dateManip.patch
+ Patch8: e-smith-base-5.2.0-adapter-translation-fixes.patch
- Patch9: e-smith-base-4.18.1-ethernetlist.patch
+ Patch9: e-smith-base-5.2.0-FixLocale_External.patch
- Patch10: e-smith-base-4.18.1-add2general.patch
+ Patch10: e-smith-base-5.2.0-perform_restore-hal.patch
- Patch11: e-smith-base-4.18.1-get_raid_details_cciss.patch
+ Patch11: e-smith-base-5.2.0-generate-2048-bits-keys.patch
- Patch12: e-smith-base-4.18.1-RevertInvalidLocaleReversion.patch
+ Patch12: e-smith-base-5.2.0-perform_backup-hal.patch
- Patch13: e-smith-base-4.18.1-FixAndMoveRESET_PASSWORD_TITLE.patch
+ Patch13: e-smith-base-5.2.0-hwaddress.patch
- Patch14: e-smith-base-4.18.1-removeInvalidEntryTag.patch
+ Patch14: e-smith-base-5.2.0-sha1.patch
- Patch15: e-smith-base-4.18.1-fixPASSWORD_VERIFY_ERROR.patch
+ Patch15: e-smith-base-5.2.0-fix-template-expansion-error.patch
- Patch16: e-smith-base-4.18.1-fixPASSWORD_VERIFY_NEW.patch
+ Patch16: e-smith-base-5.2.0-gettext.patch
- Patch17: e-smith-base-4.18.1-ip-down.race.patch
+ Patch17: e-smith-base-5.2.0-remove-freebusy-references.patch
- Patch18: e-smith-base-4.18.1-FixLocalizedTitle.patch
+ Patch18: e-smith-base-5.2.0-no-nic.patch
+ Patch19: e-smith-base-5.2.0-fix-local-nic-string-in-console.patch
+ Patch20: e-smith-base-5.2.0-freebusy-user-modify-fix.patch
+ Patch21: e-smith-base-5.2.0-condrestart.patch
+ Patch22: e-smith-base-5.2.0-condrestart.patch2
+ Patch23: e-smith-base-5.2.0-cpuspeed.patch
+ Patch24: e-smith-base-5.2.0-nss_ldap.patch
+ Patch25: e-smith-base-5.2.0-ibay_groups.patch
+ Patch26: e-smith-base-5.2.0-keep_external.patch
+ Patch27: e-smith-base-5.2.0-checkMaxUsers.patch
+ Patch28: e-smith-base-5.2.0-apmd64bit.patch
+ Patch29: e-smith-base-5.2.0-relocate_dhclient_conf.patch
+ Patch30: e-smith-base-5.2.0-echo-options.patch
+ Patch31: e-smith-base-5.2.0-migrateHWaddr.patch
+ Patch32: e-smith-base-5.2.0-relocate_dhcpd_leases_file.patch
+ Patch33: e-smith-base-5.2.0-fix_empty_file_test.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-12
  Requires: initscripts >= 6.67-1es17
-Line 41 
 Requires: perl(Net::IPv4Addr)
+Line 58 
 Requires: perl(Net::IPv4Addr)
  Requires: /usr/sbin/irqbalance
  Requires: /usr/sbin/cpuspeed
  Requires: /sbin/microcode_ctl
+ Requires: /usr/sbin/smartd
  Requires: dbus
  Requires: hal
  Requires: acpid
-Line 51 
 Requires: e-smith-bootloader
+Line 69 
 Requires: e-smith-bootloader
  Requires: mdadm
  Requires: pv
  Requires: pam_abl
+ Requires: nss_ldap
  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
-Line 72 
 AutoReqProv: no
+Line 89 
 AutoReqProv: no
  e-smith server and gateway software - base module.
  %changelog
+ * Thu Oct 14 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-38.sme
+ - Fix empty leases file test [SME: 6274]
+ * Tue Oct 12 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-37.sme
+ - Relocate dhcpd leases file [SME: 6274]
+ * Mon Oct 11 2010 Shad L. Lords <slords@mail.com> 5.2.0-36.sme
+ - Add migrate script to add missing HWaddr to interface records [SME: 6267]
+ * Mon Oct 11 2010 Shad L. Lords <slords@mail.com> 5.2.0-35.sme
+ - Make lcp options configurable [SME: 6277]
+ * Mon Oct 11 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-34.sme
+ - Relocate dhclient conf file [SME: 5833]
+ * Fri Oct 8 2010 Shad L. Lords <slords@mail.com> 5.2.0-33.sme
+ - Disable apmd on 64-bit arch [SME: 6170]
+ * Fri Oct 8 2010 Shad L. Lords <slords@mail.com> 5.2.0-32.sme
+ - Remove check for maxUsers [SME: 5537]
+ * Wed Oct 6 2010 Shad L. Lords <slords@mail.com> 5.2.0-31.sme
+ - Try and keep same external address for pppoe connections [SME: 6263]
+ * Mon Sep 27 2010 Shad L. Lords <slords@mail.com> 5.2.0-30.sme
+ - Add ibay groups to group membership [SME: 6247]
+ * Thu Sep 23 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-29.sme
+ - Prepare nss_ldap [SME: 6227]
+ * Sun Aug 8 2010 Ian Wells <esmith@wellsi.com> 5.2.0-28.sme
+ - Enable cpuspeed by default [SME: 6066]
+ * Sun Jul 25 2010 Charlie Brady <charlie_brady@mitel.com> 5.2.0-27.sme
+ - Fix syntax error in last patch. [SME: 5830]
+ * Mon Jul 19 2010 Charlie Brady <charlie_brady@mitel.com> 5.2.0-26.sme
+ - Don't exit 99 from e-smith-service script when called with 'condrestart'
+   and service is disabled. [SME: 5830]
+ * Fri Jun 11 2010 Federico Simoncelli <federico.simoncelli@gmail.com> 5.2.0-25.sme
+ - FreeBusy patch fix (save account changes) [SME: 5941]
+ * Fri Jun 11 2010 Ian Wells <esmith@wellsi.com>  5.2.0-24.sme
+ - Remove checkMaxUsers patch due to regression. [SME: 5537]
+ * Tue Jun  8 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-23.sme
+ - Fix translation of local nic string in console [SME: 5571]
+ * Sun Jun  6 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-22.sme
+ - Handle no network interface scenario in console [SME: 6023]
+ * Sat Jun 5 2010 Ian Wells <esmith@wellsi.com>  5.2.0-21.sme
+ - Remove checkMaxUsers(). [SME: 5537]
+ * Mon May 10 2010 John H. Bennett III <bennettj@johnbennettservices.com> 5.2.0-20.sme
+ - Patch that will remove all FreeBusy references from e-smith-base. [SME: 5941]
+ * Wed Mar  3 2010 Federico Simoncelli <federico.simoncelli@gmail.com> 5.2.0-19.sme
+ - Restate smartd dependency. [SME: 5814]
+ * Mon Mar 1 2010 Shad L. Lords <slords@mail.com> 5.2.0-18.sme
+ - Fix gettext errors in WAN/LAN subnet error message [SME: 5501]
+ * Sun Feb 14 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-17.sme
+ - Really fix template expansion error [SME: 4528]
+ * Sun Feb 14 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-16.sme
+ - Fix template expansion error [SME: 4528]
+ * Mon Feb 8 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-15.sme
+ - Improve security by using SHA1 algorithm for certificate signing [SME: 5737]
+ * Fri Feb 5 2010 Stephen Noble <support@dungog.net> 5.2.0-14.sme
+ - Fix eth? swapping [SME: 4528]
+ * Sun Jan 31 2010 Stephen Noble <support@dungog.net> 5.2.0-13.sme
+ - Fix console backup from removable media [SME: 4809]
+ * Sat Jan 30 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-12.sme
+ - Bump certificate encryption from 1024 bits to 2048 bits [SME: 5735]
+ * Thu Jan 14 2010 Filippo Carletti <filippo.carletti@gmail.com> 5.2.0-11.sme
+ - Fix console restore from removable media (Federico Simoncelli) [SME: 4809]
+ * Mon Nov 23 2009 Gavin Weight <gweight@gmail.com> 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 <smeserver-contribs@snetram.nl> 5.2.0-9.sme
+ - Translate $ifName in console configuration pages [SME: 5571]
+ * Sat Oct 24 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 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 <filippo.carletti@gmail.com> 5.2.0-7.sme
+ - Clean up: remove unused nonetworkdrivers [SME: 5521]
+ * Sat Jun 6 2009 Shad L. Lords <slords@mail.com> 5.2.0-6.sme
+ - Clean up stray symlinks in /lib/modules before depmod [SME: 5336]
+ * Mon May 18 2009 Gavin Weight <gweight@gmail.com> 5.2.0-5.sme
+ - Allow for different mdadm output formats for DeviceSize. [SME: 5230]
+ * Sat Feb 14 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-4.sme
+ - Auto-mount USB REV70-drive as usbdisk [SME: 5006]
+ * Sat Oct 25 2008 Stephen Noble <support@dungog.net> 5.2.0-3.sme
+ - create service link for smartd [SME: 1445]
+ * Mon Oct 13 2008 Shad L. Lords <slords@mail.com> 5.2.0-2.sme
+ - Add patch to support multiple samba roles [SME: 4172]
+ * Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 5.2.0-1.sme
+ - Roll new stream to separate sme7/sme8 trees [SME: 4633]
+ * Tue Sep 23 2008 Stephen Noble <support@dungog.net> 4.19.0-6
+ - Add locale tags for email in review panel [SME: 4267]
+ * Sat Sep 20 2008 Shad L. Lords <slords@mail.com> 4.19.0-5
+ - Correct gettext type during build process [SME: 570]
+ * Mon Sep 15 2008 Shad L. Lords <slords@mail.com> 4.19.0-4
+ - Fix screen corruption in console [SME: 4155]
+ * Sat Sep 13 2008 Shad L. Lords <slords@mail.com> 4.19.0-3
+ - Fix detection of xen instance against newer kernels [SME: 4555]
+ * Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.19.0-2
+ - Fixed warnings generated during build process [SME: 570]
+ * Wed Aug 20 2008 Shad L. Lords <slords@mail.com> 4.19.0-1
+ - Roll new dev stream.
  * Sun Aug 17 2008 Gavin Weight <gweight@gmail.com> 4.18.1-22
  - Add gettext to creating backup file title for localization. [SME: 4467]
-Line 1275 
 e-smith server and gateway software - ba
+Line 1425 
 e-smith server and gateway software - ba
  %setup
  %patch1 -p1
  %patch2 -p1
- %if "%{?rhel}" == "5"
  %patch3 -p1
- %endif
  %patch4 -p1
  %patch5 -p1
  %patch6 -p1
-Line 1293 
 e-smith server and gateway software - ba
+Line 1441 
 e-smith server and gateway software - ba
  %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
  %pre
  if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]
-Line 1357 
 ln -s /etc/rc.d/rc7.d root/etc/rc7.d
+Line 1520 
 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
-Line 1372 
 mkdir -p root/etc/e-smith/templates/etc/
+Line 1535 
 mkdir -p root/etc/e-smith/templates/etc/
  ln -s /etc/e-smith/templates-default/template-begin-shell \
        root/etc/e-smith/templates/etc/dhcpc/dhcpcd.exe/template-begin
+ mkdir -p root/etc/e-smith/templates/etc/ldap.secret/
+ touch root/etc/e-smith/templates/etc/ldap.secret/template-begin
  for file in imap login passwd pwauth system-auth
  do
      mkdir -p root/etc/e-smith/templates/etc/pam.d/$file
-Line 1402 
 rm root/service/{syslog,klogd}
+Line 1568 
 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
-Line 1414 
 mkdir -p root/var/state/e-smith
+Line 1579 
 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

 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
-Removed lines/characters
+Added lines/characters

admin@koozali.org	ViewVC Help
Powered by ViewVC 1.2.1