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