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

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

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

Revision 1.61.2.2 by slords, Sat Sep 13 18:12:11 2008 UTC Revision 1.109 by slords, Tue Nov 2 17:19:26 2010 UTC
# Line 1  Line 1 
1    # $Id: e-smith-base.spec,v 1.108 2010/10/14 16:21:30 vip-ire Exp $
2    
3  Summary: e-smith server and gateway - base module  Summary: e-smith server and gateway - base module
4  %define name e-smith-base  %define name e-smith-base
5  Name: %{name}  Name: %{name}
6  %define version 4.18.1  %define version 5.2.0
7  %define release 24  %define release 41
8  Version: %{version}  Version: %{version}
9  Release: %{release}%{?dist}  Release: %{release}%{?dist}
10  License: GPL  License: GPL
11  Group: Networking/Daemons  Group: Networking/Daemons
12  Source: %{name}-%{version}.tar.gz  Source: %{name}-%{version}.tar.gz
13  Patch1: e-smith-base-4.18.1-fixgettext.patch  Patch1: e-smith-base-5.2.0-sambaRole.patch
14  Patch2: e-smith-base-4.18.1-deleteorder.patch  Patch2: e-smith-base-5.2.0-smartd40.patch
15  Patch3: e-smith-base-4.18.1-insertmode.patch  Patch3: e-smith-base-5.2.0-usbRev70drive.patch
16  Patch4: e-smith-base-4.18.1-freebusy.patch  Patch4: e-smith-base-5.2.0-FixLabelArray.patch
17  Patch5: e-smith-base-4.18.1-frames.patch  Patch5: e-smith-base-5.2.0-straysymlink.patch
18  Patch6: e-smith-base-4.18.1-quitconsole.patch  Patch6: e-smith-base-5.2.0-nonetworkdrivers.patch
19  Patch7: e-smith-base-4.18.1-freebusy.patch2  Patch7: e-smith-base-5.2.0-checkIPOverlap.patch
20  Patch8: e-smith-base-4.18.1-dateManip.patch  Patch8: e-smith-base-5.2.0-adapter-translation-fixes.patch
21  Patch9: e-smith-base-4.18.1-ethernetlist.patch  Patch9: e-smith-base-5.2.0-FixLocale_External.patch
22  Patch10: e-smith-base-4.18.1-add2general.patch  Patch10: e-smith-base-5.2.0-perform_restore-hal.patch
23  Patch11: e-smith-base-4.18.1-get_raid_details_cciss.patch  Patch11: e-smith-base-5.2.0-generate-2048-bits-keys.patch
24  Patch12: e-smith-base-4.18.1-RevertInvalidLocaleReversion.patch  Patch12: e-smith-base-5.2.0-perform_backup-hal.patch
25  Patch13: e-smith-base-4.18.1-FixAndMoveRESET_PASSWORD_TITLE.patch  Patch13: e-smith-base-5.2.0-hwaddress.patch
26  Patch14: e-smith-base-4.18.1-removeInvalidEntryTag.patch  Patch14: e-smith-base-5.2.0-sha1.patch
27  Patch15: e-smith-base-4.18.1-fixPASSWORD_VERIFY_ERROR.patch  Patch15: e-smith-base-5.2.0-fix-template-expansion-error.patch
28  Patch16: e-smith-base-4.18.1-fixPASSWORD_VERIFY_NEW.patch  Patch16: e-smith-base-5.2.0-gettext.patch
29  Patch17: e-smith-base-4.18.1-ip-down.race.patch  Patch17: e-smith-base-5.2.0-remove-freebusy-references.patch
30  Patch18: e-smith-base-4.18.1-FixLocalizedTitle.patch  Patch18: e-smith-base-5.2.0-no-nic.patch
31  Patch19: e-smith-base-4.18.1-xenfix.patch  Patch19: e-smith-base-5.2.0-fix-local-nic-string-in-console.patch
32    Patch20: e-smith-base-5.2.0-freebusy-user-modify-fix.patch
33    Patch21: e-smith-base-5.2.0-condrestart.patch
34    Patch22: e-smith-base-5.2.0-condrestart.patch2
35    Patch23: e-smith-base-5.2.0-cpuspeed.patch
36    Patch24: e-smith-base-5.2.0-nss_ldap.patch
37    Patch25: e-smith-base-5.2.0-ibay_groups.patch
38    Patch26: e-smith-base-5.2.0-keep_external.patch
39    Patch27: e-smith-base-5.2.0-checkMaxUsers.patch
40    Patch28: e-smith-base-5.2.0-apmd64bit.patch
41    Patch29: e-smith-base-5.2.0-relocate_dhclient_conf.patch
42    Patch30: e-smith-base-5.2.0-echo-options.patch
43    Patch31: e-smith-base-5.2.0-migrateHWaddr.patch
44    Patch32: e-smith-base-5.2.0-relocate_dhcpd_leases_file.patch
45    Patch33: e-smith-base-5.2.0-fix_empty_file_test.patch
46    Patch34: e-smith-base-5.2.0-cpu-conf.patch
47    Patch35: e-smith-base-5.2.0-ldap-auth.patch
48    Patch36: e-smith-base-5.2.0-enable-cpu.patch
49  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
50  Requires: mod_auth_external  Requires: mod_auth_external
51  Requires: e-smith-lib >= 1.18.0-19  Requires: e-smith-lib >= 2.2.0-2
52  Requires: server-manager-images, server-manager  Requires: server-manager-images, server-manager
53  Requires: e-smith-formmagick >= 1.4.0-12  Requires: e-smith-formmagick >= 1.4.0-12
54  Requires: initscripts >= 6.67-1es17  Requires: initscripts >= 6.67-1es17
# Line 42  Requires: perl(Net::IPv4Addr) Line 61  Requires: perl(Net::IPv4Addr)
61  Requires: /usr/sbin/irqbalance  Requires: /usr/sbin/irqbalance
62  Requires: /usr/sbin/cpuspeed  Requires: /usr/sbin/cpuspeed
63  Requires: /sbin/microcode_ctl  Requires: /sbin/microcode_ctl
64    Requires: /usr/sbin/smartd
65  Requires: dbus  Requires: dbus
66  Requires: hal  Requires: hal
67  Requires: acpid  Requires: acpid
# Line 52  Requires: e-smith-bootloader Line 72  Requires: e-smith-bootloader
72  Requires: mdadm  Requires: mdadm
73  Requires: pv  Requires: pv
74  Requires: pam_abl  Requires: pam_abl
75    Requires: nss_ldap
76    Requires: cpu >= 1.4.3
77  Obsoletes: rlinetd, e-smith-mod_ssl  Obsoletes: rlinetd, e-smith-mod_ssl
78  Obsoletes: e-smith-serial-console  Obsoletes: e-smith-serial-console
79  Obsoletes: sshell  Obsoletes: sshell
80  Obsoletes: e-smith-rp-pppoe  Obsoletes: e-smith-rp-pppoe
 %if "%{?rhel}" == "5"  
81  Obsoletes: perl-Data-UUID  Obsoletes: perl-Data-UUID
 %endif  
82  BuildRequires: perl, perl(Test::Inline) >= 0.12  BuildRequires: perl, perl(Test::Inline) >= 0.12
83  BuildRequires: e-smith-devtools >= 1.13.1-03  BuildRequires: e-smith-devtools >= 1.13.1-03
84  BuildRequires: gettext  BuildRequires: gettext
# Line 73  AutoReqProv: no Line 93  AutoReqProv: no
93  e-smith server and gateway software - base module.  e-smith server and gateway software - base module.
94    
95  %changelog  %changelog
96  * Sat Sep 13 2008 Shad L. Lords <slords@mail.com> 4.18.1-24  * Mon Nov 1 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-40.sme
97    - Switch to cpu commands if ldap is master [SME: 6328]
98    
99    * Mon Nov 1 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-40.sme
100    - Add templates for ldap authentication if enabled [SME: 6329]
101    
102    * Mon Nov 1 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-39.sme
103    - Add cpu.conf and cpu-system.conf template/program to SME [SME: 6327]
104    
105    * Thu Oct 14 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-38.sme
106    - Fix empty leases file test [SME: 6274]
107    
108    * Tue Oct 12 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-37.sme
109    - Relocate dhcpd leases file [SME: 6274]
110    
111    * Mon Oct 11 2010 Shad L. Lords <slords@mail.com> 5.2.0-36.sme
112    - Add migrate script to add missing HWaddr to interface records [SME: 6267]
113    
114    * Mon Oct 11 2010 Shad L. Lords <slords@mail.com> 5.2.0-35.sme
115    - Make lcp options configurable [SME: 6277]
116    
117    * Mon Oct 11 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-34.sme
118    - Relocate dhclient conf file [SME: 5833]
119    
120    * Fri Oct 8 2010 Shad L. Lords <slords@mail.com> 5.2.0-33.sme
121    - Disable apmd on 64-bit arch [SME: 6170]
122    
123    * Fri Oct 8 2010 Shad L. Lords <slords@mail.com> 5.2.0-32.sme
124    - Remove check for maxUsers [SME: 5537]
125    
126    * Wed Oct 6 2010 Shad L. Lords <slords@mail.com> 5.2.0-31.sme
127    - Try and keep same external address for pppoe connections [SME: 6263]
128    
129    * Mon Sep 27 2010 Shad L. Lords <slords@mail.com> 5.2.0-30.sme
130    - Add ibay groups to group membership [SME: 6247]
131    
132    * Thu Sep 23 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-29.sme
133    - Prepare nss_ldap [SME: 6227]
134    
135    * Sun Aug 8 2010 Ian Wells <esmith@wellsi.com> 5.2.0-28.sme
136    - Enable cpuspeed by default [SME: 6066]
137    
138    * Sun Jul 25 2010 Charlie Brady <charlie_brady@mitel.com> 5.2.0-27.sme
139    - Fix syntax error in last patch. [SME: 5830]
140    
141    * Mon Jul 19 2010 Charlie Brady <charlie_brady@mitel.com> 5.2.0-26.sme
142    - Don't exit 99 from e-smith-service script when called with 'condrestart'
143      and service is disabled. [SME: 5830]
144    
145    * Fri Jun 11 2010 Federico Simoncelli <federico.simoncelli@gmail.com> 5.2.0-25.sme
146    - FreeBusy patch fix (save account changes) [SME: 5941]
147    
148    * Fri Jun 11 2010 Ian Wells <esmith@wellsi.com>  5.2.0-24.sme
149    - Remove checkMaxUsers patch due to regression. [SME: 5537]
150    
151    * Tue Jun  8 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-23.sme
152    - Fix translation of local nic string in console [SME: 5571]
153    
154    * Sun Jun  6 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-22.sme
155    - Handle no network interface scenario in console [SME: 6023]
156    
157    * Sat Jun 5 2010 Ian Wells <esmith@wellsi.com>  5.2.0-21.sme
158    - Remove checkMaxUsers(). [SME: 5537]
159    
160    * Mon May 10 2010 John H. Bennett III <bennettj@johnbennettservices.com> 5.2.0-20.sme
161    - Patch that will remove all FreeBusy references from e-smith-base. [SME: 5941]
162    
163    * Wed Mar  3 2010 Federico Simoncelli <federico.simoncelli@gmail.com> 5.2.0-19.sme
164    - Restate smartd dependency. [SME: 5814]
165    
166    * Mon Mar 1 2010 Shad L. Lords <slords@mail.com> 5.2.0-18.sme
167    - Fix gettext errors in WAN/LAN subnet error message [SME: 5501]
168    
169    * Sun Feb 14 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-17.sme
170    - Really fix template expansion error [SME: 4528]
171    
172    * Sun Feb 14 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-16.sme
173    - Fix template expansion error [SME: 4528]
174    
175    * Mon Feb 8 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-15.sme
176    - Improve security by using SHA1 algorithm for certificate signing [SME: 5737]
177    
178    * Fri Feb 5 2010 Stephen Noble <support@dungog.net> 5.2.0-14.sme
179    - Fix eth? swapping [SME: 4528]
180    
181    * Sun Jan 31 2010 Stephen Noble <support@dungog.net> 5.2.0-13.sme
182    - Fix console backup from removable media [SME: 4809]
183    
184    * Sat Jan 30 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-12.sme
185    - Bump certificate encryption from 1024 bits to 2048 bits [SME: 5735]
186    
187    * Thu Jan 14 2010 Filippo Carletti <filippo.carletti@gmail.com> 5.2.0-11.sme
188    - Fix console restore from removable media (Federico Simoncelli) [SME: 4809]
189    
190    * Mon Nov 23 2009 Gavin Weight <gweight@gmail.com> 5.2.0-10.sme
191    - Add a dummy call so xgettext can pull translated $ifName in console configuration pages. [SME: 5571]
192    
193    * Fri Nov 6 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-9.sme
194    - Translate $ifName in console configuration pages [SME: 5571]
195    
196    * Sat Oct 24 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-8.sme
197    - Prevent IP conflicts between local and external interface in server gateway mode [SME: 5501]
198    
199    * Tue Oct 20 2009 Filippo Carletti <filippo.carletti@gmail.com> 5.2.0-7.sme
200    - Clean up: remove unused nonetworkdrivers [SME: 5521]
201    
202    * Sat Jun 6 2009 Shad L. Lords <slords@mail.com> 5.2.0-6.sme
203    - Clean up stray symlinks in /lib/modules before depmod [SME: 5336]
204    
205    * Mon May 18 2009 Gavin Weight <gweight@gmail.com> 5.2.0-5.sme
206    - Allow for different mdadm output formats for DeviceSize. [SME: 5230]
207    
208    * Sat Feb 14 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-4.sme
209    - Auto-mount USB REV70-drive as usbdisk [SME: 5006]
210    
211    * Sat Oct 25 2008 Stephen Noble <support@dungog.net> 5.2.0-3.sme
212    - create service link for smartd [SME: 1445]
213    
214    * Mon Oct 13 2008 Shad L. Lords <slords@mail.com> 5.2.0-2.sme
215    - Add patch to support multiple samba roles [SME: 4172]
216    
217    * Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 5.2.0-1.sme
218    - Roll new stream to separate sme7/sme8 trees [SME: 4633]
219    
220    * Tue Sep 23 2008 Stephen Noble <support@dungog.net> 4.19.0-6
221    - Add locale tags for email in review panel [SME: 4267]
222    
223    * Sat Sep 20 2008 Shad L. Lords <slords@mail.com> 4.19.0-5
224    - Correct gettext type during build process [SME: 570]
225    
226    * Mon Sep 15 2008 Shad L. Lords <slords@mail.com> 4.19.0-4
227    - Fix screen corruption in console [SME: 4155]
228    
229    * Sat Sep 13 2008 Shad L. Lords <slords@mail.com> 4.19.0-3
230  - Fix detection of xen instance against newer kernels [SME: 4555]  - Fix detection of xen instance against newer kernels [SME: 4555]
231    
232  * Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-23  * Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.19.0-2
233  - Fixed warnings generated during build process [SME: 570]  - Fixed warnings generated during build process [SME: 570]
234    
235    * Wed Aug 20 2008 Shad L. Lords <slords@mail.com> 4.19.0-1
236    - Roll new dev stream.
237    
238  * Sun Aug 17 2008 Gavin Weight <gweight@gmail.com> 4.18.1-22  * Sun Aug 17 2008 Gavin Weight <gweight@gmail.com> 4.18.1-22
239  - Add gettext to creating backup file title for localization. [SME: 4467]  - Add gettext to creating backup file title for localization. [SME: 4467]
240    
# Line 1282  e-smith server and gateway software - ba Line 1438  e-smith server and gateway software - ba
1438  %setup  %setup
1439  %patch1 -p1  %patch1 -p1
1440  %patch2 -p1  %patch2 -p1
 %if "%{?rhel}" == "5"  
1441  %patch3 -p1  %patch3 -p1
 %endif  
1442  %patch4 -p1  %patch4 -p1
1443  %patch5 -p1  %patch5 -p1
1444  %patch6 -p1  %patch6 -p1
# Line 1301  e-smith server and gateway software - ba Line 1455  e-smith server and gateway software - ba
1455  %patch17 -p1  %patch17 -p1
1456  %patch18 -p1  %patch18 -p1
1457  %patch19 -p1  %patch19 -p1
1458    %patch20 -p1
1459    %patch21 -p1
1460    %patch22 -p1
1461    %patch23 -p1
1462    %patch24 -p1
1463    %patch25 -p1
1464    %patch26 -p1
1465    %patch27 -p1
1466    %patch28 -p1
1467    %patch29 -p1
1468    %patch30 -p1
1469    %patch31 -p1
1470    %patch32 -p1
1471    %patch33 -p1
1472    %patch34 -p1
1473    %patch35 -p1
1474    %patch36 -p1
1475    
1476  %pre  %pre
1477  if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]  if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]
# Line 1365  ln -s /etc/rc.d/rc7.d root/etc/rc7.d Line 1536  ln -s /etc/rc.d/rc7.d root/etc/rc7.d
1536  mkdir -p root/etc/rc.d/rc1.d  mkdir -p root/etc/rc.d/rc1.d
1537    
1538  mkdir -p root/usr/share/locale/en_US/LC_MESSAGES  mkdir -p root/usr/share/locale/en_US/LC_MESSAGES
1539  xgettext -L shell -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
1540    
1541  mkdir -p root/etc/e-smith/locale  mkdir -p root/etc/e-smith/locale
1542  # Make the fr-ca link in %pre to ease upgrades  # Make the fr-ca link in %pre to ease upgrades
# Line 1380  mkdir -p root/etc/e-smith/templates/etc/ Line 1551  mkdir -p root/etc/e-smith/templates/etc/
1551  ln -s /etc/e-smith/templates-default/template-begin-shell \  ln -s /etc/e-smith/templates-default/template-begin-shell \
1552        root/etc/e-smith/templates/etc/dhcpc/dhcpcd.exe/template-begin        root/etc/e-smith/templates/etc/dhcpc/dhcpcd.exe/template-begin
1553    
1554    mkdir -p root/etc/e-smith/templates/etc/ldap.secret/
1555    touch root/etc/e-smith/templates/etc/ldap.secret/template-begin
1556    
1557  for file in imap login passwd pwauth system-auth  for file in imap login passwd pwauth system-auth
1558  do  do
1559      mkdir -p root/etc/e-smith/templates/etc/pam.d/$file      mkdir -p root/etc/e-smith/templates/etc/pam.d/$file

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed