/[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.53 by snetram, Sat Jul 5 17:57:46 2008 UTC Revision 1.112 by slords, Wed Nov 3 18:55:06 2010 UTC
# Line 1  Line 1 
1    # $Id: e-smith-base.spec,v 1.111 2010/11/03 14:00:42 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 14  %define release 44
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-5.2.0-generate-2048-bits-keys.patch
24    Patch12: e-smith-base-5.2.0-perform_backup-hal.patch
25    Patch13: e-smith-base-5.2.0-hwaddress.patch
26    Patch14: e-smith-base-5.2.0-sha1.patch
27    Patch15: e-smith-base-5.2.0-fix-template-expansion-error.patch
28    Patch16: e-smith-base-5.2.0-gettext.patch
29    Patch17: e-smith-base-5.2.0-remove-freebusy-references.patch
30    Patch18: e-smith-base-5.2.0-no-nic.patch
31    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 33  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
 Requires: whiptail  
69  Requires: rssh  Requires: rssh
70  Requires: bridge-utils  Requires: bridge-utils
71  Requires: vconfig  Requires: vconfig
# Line 44  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 65  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    * Wed Nov 3 2010 Shad L. Lords <slords@lordsfam.net 5.2.0-44.sme
98    - Fix cpu critical patch missing ' [SME: 6330]
99    
100    * Wed Nov 3 2010 Shad L. Lords <slords@lordsfam.net 5.2.0-43.sme
101    - Make cpu calls critical only with ldap{Auth} is enabled [SME: 6330]
102    - Add cpu.conf and cpu-system.conf to post-upgrade event [SME: 6327]
103    
104    * Tue Nov 2 2010 Shad L. Lords <slords@lordsfam.net 5.2.0-42.sme
105    - Always use cpu, do unix if ldap{Auth} is disabled [SME: 6328]
106    
107    * Mon Nov 1 2010 Shad L. Lords <slords@lordsfam.net 5.2.0-41.sme
108    - Switch to cpu commands if ldap is master [SME: 6328]
109    
110    * Mon Nov 1 2010 Shad L. Lords <slords@lordsfam.net 5.2.0-40.sme
111    - Add templates for ldap authentication if enabled [SME: 6329]
112    
113    * Mon Nov 1 2010 Shad L. Lords <slords@lordsfam.net 5.2.0-39.sme
114    - Add cpu.conf and cpu-system.conf template/program to SME [SME: 6327]
115    
116    * Thu Oct 14 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-38.sme
117    - Fix empty leases file test [SME: 6274]
118    
119    * Tue Oct 12 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-37.sme
120    - Relocate dhcpd leases file [SME: 6274]
121    
122    * Mon Oct 11 2010 Shad L. Lords <slords@mail.com> 5.2.0-36.sme
123    - Add migrate script to add missing HWaddr to interface records [SME: 6267]
124    
125    * Mon Oct 11 2010 Shad L. Lords <slords@mail.com> 5.2.0-35.sme
126    - Make lcp options configurable [SME: 6277]
127    
128    * Mon Oct 11 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-34.sme
129    - Relocate dhclient conf file [SME: 5833]
130    
131    * Fri Oct 8 2010 Shad L. Lords <slords@mail.com> 5.2.0-33.sme
132    - Disable apmd on 64-bit arch [SME: 6170]
133    
134    * Fri Oct 8 2010 Shad L. Lords <slords@mail.com> 5.2.0-32.sme
135    - Remove check for maxUsers [SME: 5537]
136    
137    * Wed Oct 6 2010 Shad L. Lords <slords@mail.com> 5.2.0-31.sme
138    - Try and keep same external address for pppoe connections [SME: 6263]
139    
140    * Mon Sep 27 2010 Shad L. Lords <slords@mail.com> 5.2.0-30.sme
141    - Add ibay groups to group membership [SME: 6247]
142    
143    * Thu Sep 23 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-29.sme
144    - Prepare nss_ldap [SME: 6227]
145    
146    * Sun Aug 8 2010 Ian Wells <esmith@wellsi.com> 5.2.0-28.sme
147    - Enable cpuspeed by default [SME: 6066]
148    
149    * Sun Jul 25 2010 Charlie Brady <charlie_brady@mitel.com> 5.2.0-27.sme
150    - Fix syntax error in last patch. [SME: 5830]
151    
152    * Mon Jul 19 2010 Charlie Brady <charlie_brady@mitel.com> 5.2.0-26.sme
153    - Don't exit 99 from e-smith-service script when called with 'condrestart'
154      and service is disabled. [SME: 5830]
155    
156    * Fri Jun 11 2010 Federico Simoncelli <federico.simoncelli@gmail.com> 5.2.0-25.sme
157    - FreeBusy patch fix (save account changes) [SME: 5941]
158    
159    * Fri Jun 11 2010 Ian Wells <esmith@wellsi.com>  5.2.0-24.sme
160    - Remove checkMaxUsers patch due to regression. [SME: 5537]
161    
162    * Tue Jun  8 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-23.sme
163    - Fix translation of local nic string in console [SME: 5571]
164    
165    * Sun Jun  6 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-22.sme
166    - Handle no network interface scenario in console [SME: 6023]
167    
168    * Sat Jun 5 2010 Ian Wells <esmith@wellsi.com>  5.2.0-21.sme
169    - Remove checkMaxUsers(). [SME: 5537]
170    
171    * Mon May 10 2010 John H. Bennett III <bennettj@johnbennettservices.com> 5.2.0-20.sme
172    - Patch that will remove all FreeBusy references from e-smith-base. [SME: 5941]
173    
174    * Wed Mar  3 2010 Federico Simoncelli <federico.simoncelli@gmail.com> 5.2.0-19.sme
175    - Restate smartd dependency. [SME: 5814]
176    
177    * Mon Mar 1 2010 Shad L. Lords <slords@mail.com> 5.2.0-18.sme
178    - Fix gettext errors in WAN/LAN subnet error message [SME: 5501]
179    
180    * Sun Feb 14 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-17.sme
181    - Really fix template expansion error [SME: 4528]
182    
183    * Sun Feb 14 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-16.sme
184    - Fix template expansion error [SME: 4528]
185    
186    * Mon Feb 8 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-15.sme
187    - Improve security by using SHA1 algorithm for certificate signing [SME: 5737]
188    
189    * Fri Feb 5 2010 Stephen Noble <support@dungog.net> 5.2.0-14.sme
190    - Fix eth? swapping [SME: 4528]
191    
192    * Sun Jan 31 2010 Stephen Noble <support@dungog.net> 5.2.0-13.sme
193    - Fix console backup from removable media [SME: 4809]
194    
195    * Sat Jan 30 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-12.sme
196    - Bump certificate encryption from 1024 bits to 2048 bits [SME: 5735]
197    
198    * Thu Jan 14 2010 Filippo Carletti <filippo.carletti@gmail.com> 5.2.0-11.sme
199    - Fix console restore from removable media (Federico Simoncelli) [SME: 4809]
200    
201    * Mon Nov 23 2009 Gavin Weight <gweight@gmail.com> 5.2.0-10.sme
202    - Add a dummy call so xgettext can pull translated $ifName in console configuration pages. [SME: 5571]
203    
204    * Fri Nov 6 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-9.sme
205    - Translate $ifName in console configuration pages [SME: 5571]
206    
207    * Sat Oct 24 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-8.sme
208    - Prevent IP conflicts between local and external interface in server gateway mode [SME: 5501]
209    
210    * Tue Oct 20 2009 Filippo Carletti <filippo.carletti@gmail.com> 5.2.0-7.sme
211    - Clean up: remove unused nonetworkdrivers [SME: 5521]
212    
213    * Sat Jun 6 2009 Shad L. Lords <slords@mail.com> 5.2.0-6.sme
214    - Clean up stray symlinks in /lib/modules before depmod [SME: 5336]
215    
216    * Mon May 18 2009 Gavin Weight <gweight@gmail.com> 5.2.0-5.sme
217    - Allow for different mdadm output formats for DeviceSize. [SME: 5230]
218    
219    * Sat Feb 14 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-4.sme
220    - Auto-mount USB REV70-drive as usbdisk [SME: 5006]
221    
222    * Sat Oct 25 2008 Stephen Noble <support@dungog.net> 5.2.0-3.sme
223    - create service link for smartd [SME: 1445]
224    
225    * Mon Oct 13 2008 Shad L. Lords <slords@mail.com> 5.2.0-2.sme
226    - Add patch to support multiple samba roles [SME: 4172]
227    
228    * Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 5.2.0-1.sme
229    - Roll new stream to separate sme7/sme8 trees [SME: 4633]
230    
231    * Tue Sep 23 2008 Stephen Noble <support@dungog.net> 4.19.0-6
232    - Add locale tags for email in review panel [SME: 4267]
233    
234    * Sat Sep 20 2008 Shad L. Lords <slords@mail.com> 4.19.0-5
235    - Correct gettext type during build process [SME: 570]
236    
237    * Mon Sep 15 2008 Shad L. Lords <slords@mail.com> 4.19.0-4
238    - Fix screen corruption in console [SME: 4155]
239    
240    * Sat Sep 13 2008 Shad L. Lords <slords@mail.com> 4.19.0-3
241    - Fix detection of xen instance against newer kernels [SME: 4555]
242    
243    * Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.19.0-2
244    - Fixed warnings generated during build process [SME: 570]
245    
246    * Wed Aug 20 2008 Shad L. Lords <slords@mail.com> 4.19.0-1
247    - Roll new dev stream.
248    
249    * Sun Aug 17 2008 Gavin Weight <gweight@gmail.com> 4.18.1-22
250    - Add gettext to creating backup file title for localization. [SME: 4467]
251    
252    * Mon Aug 11 2008 Charlie Brady <charlie_brady@mitel.com> 4.18.1-21
253    - Fix race condition in VPN ip-down handling which could cause loss of
254      LAN connectivity. [SME: 4405]
255    
256    * Sat Aug 9 2008 Shad L. Lords <slords@mail.com> 4.18.1-20
257    - Remove requires for whiptail.  No longer needed [SME: 4491]
258    
259    * Fri Aug  8 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-19
260    - Change userpassword panel to use PASSWORD_VERIFY_NEW instead of PASSWORD_NEW_VERIFY [SME: 4487]
261    
262    * Thu Aug  7 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-18
263    - Revert locale key PASSWORD_RESET_TITLE to RESET_PASSWORD_TITLE and move it
264      to e-smith-formmagick's general [SME: 4475]
265    - Reverting all *PASSWORD_NO_MATCH to *PASSWORD_VERIFY_ERROR locale keys [SME: 4476]
266    - Remove invalid entry tag from userpassword's locale file preventing the
267      form from displaying properly [SME: 4479]
268    
269    * Tue Aug  5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-17
270    - Revert previous invalid locale changes (reverting to 4.18.1-15) [SME: 4472]
271    
272    * Mon Aug  4 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-16
273    - Revert some locale changes
274    
275    * Tue Jul 22 2008 Gavin Weight <gweight@gmail.com> 4.18.1-15
276    - Add regex to support cciss device names in manageRAID.pl. [SME: 4455]
277    
278  * Sat Jul 5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-14  * Sat Jul 5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-14
279  - Add common <base> tags to e-smith-formmagick's general [SME: 4279]  - Add common <base> tags to e-smith-formmagick's general [SME: 4279]
280    
# Line 1239  e-smith server and gateway software - ba Line 1449  e-smith server and gateway software - ba
1449  %setup  %setup
1450  %patch1 -p1  %patch1 -p1
1451  %patch2 -p1  %patch2 -p1
 %if "%{?rhel}" == "5"  
1452  %patch3 -p1  %patch3 -p1
 %endif  
1453  %patch4 -p1  %patch4 -p1
1454  %patch5 -p1  %patch5 -p1
1455  %patch6 -p1  %patch6 -p1
# Line 1249  e-smith server and gateway software - ba Line 1457  e-smith server and gateway software - ba
1457  %patch8 -p1  %patch8 -p1
1458  %patch9 -p1  %patch9 -p1
1459  %patch10 -p1  %patch10 -p1
1460    %patch11 -p1
1461    %patch12 -p1
1462    %patch13 -p1
1463    %patch14 -p1
1464    %patch15 -p1
1465    %patch16 -p1
1466    %patch17 -p1
1467    %patch18 -p1
1468    %patch19 -p1
1469    %patch20 -p1
1470    %patch21 -p1
1471    %patch22 -p1
1472    %patch23 -p1
1473    %patch24 -p1
1474    %patch25 -p1
1475    %patch26 -p1
1476    %patch27 -p1
1477    %patch28 -p1
1478    %patch29 -p1
1479    %patch30 -p1
1480    %patch31 -p1
1481    %patch32 -p1
1482    %patch33 -p1
1483    %patch34 -p1
1484    %patch35 -p1
1485    %patch36 -p1
1486    %patch37 -p1
1487    
1488  %pre  %pre
1489  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 1313  ln -s /etc/rc.d/rc7.d root/etc/rc7.d Line 1548  ln -s /etc/rc.d/rc7.d root/etc/rc7.d
1548  mkdir -p root/etc/rc.d/rc1.d  mkdir -p root/etc/rc.d/rc1.d
1549    
1550  mkdir -p root/usr/share/locale/en_US/LC_MESSAGES  mkdir -p root/usr/share/locale/en_US/LC_MESSAGES
1551  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
1552    
1553  mkdir -p root/etc/e-smith/locale  mkdir -p root/etc/e-smith/locale
1554  # Make the fr-ca link in %pre to ease upgrades  # Make the fr-ca link in %pre to ease upgrades
# Line 1328  mkdir -p root/etc/e-smith/templates/etc/ Line 1563  mkdir -p root/etc/e-smith/templates/etc/
1563  ln -s /etc/e-smith/templates-default/template-begin-shell \  ln -s /etc/e-smith/templates-default/template-begin-shell \
1564        root/etc/e-smith/templates/etc/dhcpc/dhcpcd.exe/template-begin        root/etc/e-smith/templates/etc/dhcpc/dhcpcd.exe/template-begin
1565    
1566    mkdir -p root/etc/e-smith/templates/etc/ldap.secret/
1567    touch root/etc/e-smith/templates/etc/ldap.secret/template-begin
1568    
1569  for file in imap login passwd pwauth system-auth  for file in imap login passwd pwauth system-auth
1570  do  do
1571      mkdir -p root/etc/e-smith/templates/etc/pam.d/$file      mkdir -p root/etc/e-smith/templates/etc/pam.d/$file
# Line 1358  rm root/service/{syslog,klogd} Line 1596  rm root/service/{syslog,klogd}
1596  mkdir -p root/etc/e-smith/events/local  mkdir -p root/etc/e-smith/events/local
1597  mkdir -p root/etc/e-smith/events/user-modify-admin  mkdir -p root/etc/e-smith/events/user-modify-admin
1598  mkdir -p root/home/e-smith/db  mkdir -p root/home/e-smith/db
 touch root/home/e-smith/db/configuration  
1599    
1600  mkdir -p root/etc/e-smith/pam  mkdir -p root/etc/e-smith/pam
1601  mkdir -p root/home/e-smith/ssl.key  mkdir -p root/home/e-smith/ssl.key
# Line 1370  mkdir -p root/var/state/e-smith Line 1607  mkdir -p root/var/state/e-smith
1607  for file in %{dbfiles}  for file in %{dbfiles}
1608  do  do
1609      mkdir -p root/etc/e-smith/db/$file/{defaults,migrate,force}      mkdir -p root/etc/e-smith/db/$file/{defaults,migrate,force}
     # Create ghost file for rpm  
     touch root/home/e-smith/db/$file  
1610  done  done
1611    
1612  mkdir -p root/etc/tcprules  mkdir -p root/etc/tcprules

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