/[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.62 by slords, Wed Aug 20 21:22:12 2008 UTC Revision 1.122 by vip-ire, Mon Nov 29 19:32:08 2010 UTC
# Line 1  Line 1 
1    # $Id: e-smith-base.spec,v 1.121 2010/11/22 16:27:05 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.19.0  %define version 5.2.0
7  %define release 1  %define release 53
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-5.2.0-sambaRole.patch
14    Patch2: e-smith-base-5.2.0-smartd40.patch
15    Patch3: e-smith-base-5.2.0-usbRev70drive.patch
16    Patch4: e-smith-base-5.2.0-FixLabelArray.patch
17    Patch5: e-smith-base-5.2.0-straysymlink.patch
18    Patch6: e-smith-base-5.2.0-nonetworkdrivers.patch
19    Patch7: e-smith-base-5.2.0-checkIPOverlap.patch
20    Patch8: e-smith-base-5.2.0-adapter-translation-fixes.patch
21    Patch9: e-smith-base-5.2.0-FixLocale_External.patch
22    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    Patch38: e-smith-base-5.2.0-add-extra-ldap.patch
51    Patch39: e-smith-base-5.2.0-cpu-can-delete.patch
52    Patch40: e-smith-base-5.2.0-supp-groups.patch
53    Patch41: e-smith-base-5.2.0-fix_gpasswd_path.patch
54  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
55  Requires: mod_auth_external  Requires: mod_auth_external
56  Requires: e-smith-lib >= 1.18.0-19  Requires: e-smith-lib >= 2.2.0-2
57  Requires: server-manager-images, server-manager  Requires: server-manager-images, server-manager
58  Requires: e-smith-formmagick >= 1.4.0-12  Requires: e-smith-formmagick >= 1.4.0-12
59  Requires: initscripts >= 6.67-1es17  Requires: initscripts >= 6.67-1es17
# Line 23  Requires: perl(Net::IPv4Addr) Line 66  Requires: perl(Net::IPv4Addr)
66  Requires: /usr/sbin/irqbalance  Requires: /usr/sbin/irqbalance
67  Requires: /usr/sbin/cpuspeed  Requires: /usr/sbin/cpuspeed
68  Requires: /sbin/microcode_ctl  Requires: /sbin/microcode_ctl
69    Requires: /usr/sbin/smartd
70  Requires: dbus  Requires: dbus
71  Requires: hal  Requires: hal
72  Requires: acpid  Requires: acpid
# Line 33  Requires: e-smith-bootloader Line 77  Requires: e-smith-bootloader
77  Requires: mdadm  Requires: mdadm
78  Requires: pv  Requires: pv
79  Requires: pam_abl  Requires: pam_abl
80    Requires: nss_ldap
81    Requires: cpu >= 1.4.3
82  Obsoletes: rlinetd, e-smith-mod_ssl  Obsoletes: rlinetd, e-smith-mod_ssl
83  Obsoletes: e-smith-serial-console  Obsoletes: e-smith-serial-console
84  Obsoletes: sshell  Obsoletes: sshell
85  Obsoletes: e-smith-rp-pppoe  Obsoletes: e-smith-rp-pppoe
 %if "%{?rhel}" == "5"  
86  Obsoletes: perl-Data-UUID  Obsoletes: perl-Data-UUID
 %endif  
87  BuildRequires: perl, perl(Test::Inline) >= 0.12  BuildRequires: perl, perl(Test::Inline) >= 0.12
88  BuildRequires: e-smith-devtools >= 1.13.1-03  BuildRequires: e-smith-devtools >= 1.13.1-03
89  BuildRequires: gettext  BuildRequires: gettext
# Line 54  AutoReqProv: no Line 98  AutoReqProv: no
98  e-smith server and gateway software - base module.  e-smith server and gateway software - base module.
99    
100  %changelog  %changelog
101    * Mon Nov 29 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-53.sme
102    - Fix gpasswd path [SME: 6412]
103    
104    * Mon Nov 22 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-52.sme
105    - Fix relocation of dhclient conf file [SME: 6385]
106    
107    * Sun Nov 7 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-51.sme
108    - No longer need to pass supplemental groups to cpu [SME: 6349]
109    
110    * Fri Nov 5 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-50.sme
111    - Allow cpu to remove empty attributes [SME: 6343]
112    
113    * Thu Nov 4 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-49.sme
114    - Fix maxUsers patch (again) to not break setting passwords [SME: 5537]
115    
116    * Thu Nov 4 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-48.sme
117    - Fix maxUsers patch to not break setting passwords [SME: 5537]
118    
119    * Thu Nov 4 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-47.sme
120    - Don't put empty attributes in file for cpu [SME: 6334]
121    
122    * Thu Nov 4 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-46.sme
123    - Add flush to tmpfile so that data is available to cpu [SME: 6334]
124    
125    * Thu Nov 4 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-45.sme
126    - Add extra attributes to ldap objects with cpu call [SME: 6334]
127    
128    * Wed Nov 3 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-44.sme
129    - Fix cpu critical patch missing ' [SME: 6330]
130    
131    * Wed Nov 3 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-43.sme
132    - Make cpu calls critical only with ldap{Auth} is enabled [SME: 6330]
133    - Add cpu.conf and cpu-system.conf to post-upgrade event [SME: 6327]
134    
135    * Tue Nov 2 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-42.sme
136    - Always use cpu, do unix if ldap{Auth} is disabled [SME: 6328]
137    
138    * Mon Nov 1 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-41.sme
139    - Switch to cpu commands if ldap is master [SME: 6328]
140    
141    * Mon Nov 1 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-40.sme
142    - Add templates for ldap authentication if enabled [SME: 6329]
143    
144    * Mon Nov 1 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-39.sme
145    - Add cpu.conf and cpu-system.conf template/program to SME [SME: 6327]
146    
147    * Thu Oct 14 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-38.sme
148    - Fix empty leases file test [SME: 6274]
149    
150    * Tue Oct 12 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-37.sme
151    - Relocate dhcpd leases file [SME: 6274]
152    
153    * Mon Oct 11 2010 Shad L. Lords <slords@mail.com> 5.2.0-36.sme
154    - Add migrate script to add missing HWaddr to interface records [SME: 6267]
155    
156    * Mon Oct 11 2010 Shad L. Lords <slords@mail.com> 5.2.0-35.sme
157    - Make lcp options configurable [SME: 6277]
158    
159    * Mon Oct 11 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-34.sme
160    - Relocate dhclient conf file [SME: 5833]
161    
162    * Fri Oct 8 2010 Shad L. Lords <slords@mail.com> 5.2.0-33.sme
163    - Disable apmd on 64-bit arch [SME: 6170]
164    
165    * Fri Oct 8 2010 Shad L. Lords <slords@mail.com> 5.2.0-32.sme
166    - Remove check for maxUsers [SME: 5537]
167    
168    * Wed Oct 6 2010 Shad L. Lords <slords@mail.com> 5.2.0-31.sme
169    - Try and keep same external address for pppoe connections [SME: 6263]
170    
171    * Mon Sep 27 2010 Shad L. Lords <slords@mail.com> 5.2.0-30.sme
172    - Add ibay groups to group membership [SME: 6247]
173    
174    * Thu Sep 23 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-29.sme
175    - Prepare nss_ldap [SME: 6227]
176    
177    * Sun Aug 8 2010 Ian Wells <esmith@wellsi.com> 5.2.0-28.sme
178    - Enable cpuspeed by default [SME: 6066]
179    
180    * Sun Jul 25 2010 Charlie Brady <charlie_brady@mitel.com> 5.2.0-27.sme
181    - Fix syntax error in last patch. [SME: 5830]
182    
183    * Mon Jul 19 2010 Charlie Brady <charlie_brady@mitel.com> 5.2.0-26.sme
184    - Don't exit 99 from e-smith-service script when called with 'condrestart'
185      and service is disabled. [SME: 5830]
186    
187    * Fri Jun 11 2010 Federico Simoncelli <federico.simoncelli@gmail.com> 5.2.0-25.sme
188    - FreeBusy patch fix (save account changes) [SME: 5941]
189    
190    * Fri Jun 11 2010 Ian Wells <esmith@wellsi.com>  5.2.0-24.sme
191    - Remove checkMaxUsers patch due to regression. [SME: 5537]
192    
193    * Tue Jun  8 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-23.sme
194    - Fix translation of local nic string in console [SME: 5571]
195    
196    * Sun Jun  6 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-22.sme
197    - Handle no network interface scenario in console [SME: 6023]
198    
199    * Sat Jun 5 2010 Ian Wells <esmith@wellsi.com>  5.2.0-21.sme
200    - Remove checkMaxUsers(). [SME: 5537]
201    
202    * Mon May 10 2010 John H. Bennett III <bennettj@johnbennettservices.com> 5.2.0-20.sme
203    - Patch that will remove all FreeBusy references from e-smith-base. [SME: 5941]
204    
205    * Wed Mar  3 2010 Federico Simoncelli <federico.simoncelli@gmail.com> 5.2.0-19.sme
206    - Restate smartd dependency. [SME: 5814]
207    
208    * Mon Mar 1 2010 Shad L. Lords <slords@mail.com> 5.2.0-18.sme
209    - Fix gettext errors in WAN/LAN subnet error message [SME: 5501]
210    
211    * Sun Feb 14 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-17.sme
212    - Really fix template expansion error [SME: 4528]
213    
214    * Sun Feb 14 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-16.sme
215    - Fix template expansion error [SME: 4528]
216    
217    * Mon Feb 8 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-15.sme
218    - Improve security by using SHA1 algorithm for certificate signing [SME: 5737]
219    
220    * Fri Feb 5 2010 Stephen Noble <support@dungog.net> 5.2.0-14.sme
221    - Fix eth? swapping [SME: 4528]
222    
223    * Sun Jan 31 2010 Stephen Noble <support@dungog.net> 5.2.0-13.sme
224    - Fix console backup from removable media [SME: 4809]
225    
226    * Sat Jan 30 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-12.sme
227    - Bump certificate encryption from 1024 bits to 2048 bits [SME: 5735]
228    
229    * Thu Jan 14 2010 Filippo Carletti <filippo.carletti@gmail.com> 5.2.0-11.sme
230    - Fix console restore from removable media (Federico Simoncelli) [SME: 4809]
231    
232    * Mon Nov 23 2009 Gavin Weight <gweight@gmail.com> 5.2.0-10.sme
233    - Add a dummy call so xgettext can pull translated $ifName in console configuration pages. [SME: 5571]
234    
235    * Fri Nov 6 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-9.sme
236    - Translate $ifName in console configuration pages [SME: 5571]
237    
238    * Sat Oct 24 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-8.sme
239    - Prevent IP conflicts between local and external interface in server gateway mode [SME: 5501]
240    
241    * Tue Oct 20 2009 Filippo Carletti <filippo.carletti@gmail.com> 5.2.0-7.sme
242    - Clean up: remove unused nonetworkdrivers [SME: 5521]
243    
244    * Sat Jun 6 2009 Shad L. Lords <slords@mail.com> 5.2.0-6.sme
245    - Clean up stray symlinks in /lib/modules before depmod [SME: 5336]
246    
247    * Mon May 18 2009 Gavin Weight <gweight@gmail.com> 5.2.0-5.sme
248    - Allow for different mdadm output formats for DeviceSize. [SME: 5230]
249    
250    * Sat Feb 14 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-4.sme
251    - Auto-mount USB REV70-drive as usbdisk [SME: 5006]
252    
253    * Sat Oct 25 2008 Stephen Noble <support@dungog.net> 5.2.0-3.sme
254    - create service link for smartd [SME: 1445]
255    
256    * Mon Oct 13 2008 Shad L. Lords <slords@mail.com> 5.2.0-2.sme
257    - Add patch to support multiple samba roles [SME: 4172]
258    
259    * Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 5.2.0-1.sme
260    - Roll new stream to separate sme7/sme8 trees [SME: 4633]
261    
262    * Tue Sep 23 2008 Stephen Noble <support@dungog.net> 4.19.0-6
263    - Add locale tags for email in review panel [SME: 4267]
264    
265    * Sat Sep 20 2008 Shad L. Lords <slords@mail.com> 4.19.0-5
266    - Correct gettext type during build process [SME: 570]
267    
268    * Mon Sep 15 2008 Shad L. Lords <slords@mail.com> 4.19.0-4
269    - Fix screen corruption in console [SME: 4155]
270    
271    * Sat Sep 13 2008 Shad L. Lords <slords@mail.com> 4.19.0-3
272    - Fix detection of xen instance against newer kernels [SME: 4555]
273    
274    * Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.19.0-2
275    - Fixed warnings generated during build process [SME: 570]
276    
277  * Wed Aug 20 2008 Shad L. Lords <slords@mail.com> 4.19.0-1  * Wed Aug 20 2008 Shad L. Lords <slords@mail.com> 4.19.0-1
278  - Roll new dev stream.  - Roll new dev stream.
279    
# Line 1258  e-smith server and gateway software - ba Line 1478  e-smith server and gateway software - ba
1478    
1479  %prep  %prep
1480  %setup  %setup
1481    %patch1 -p1
1482    %patch2 -p1
1483    %patch3 -p1
1484    %patch4 -p1
1485    %patch5 -p1
1486    %patch6 -p1
1487    %patch7 -p1
1488    %patch8 -p1
1489    %patch9 -p1
1490    %patch10 -p1
1491    %patch11 -p1
1492    %patch12 -p1
1493    %patch13 -p1
1494    %patch14 -p1
1495    %patch15 -p1
1496    %patch16 -p1
1497    %patch17 -p1
1498    %patch18 -p1
1499    %patch19 -p1
1500    %patch20 -p1
1501    %patch21 -p1
1502    %patch22 -p1
1503    %patch23 -p1
1504    %patch24 -p1
1505    %patch25 -p1
1506    %patch26 -p1
1507    %patch27 -p1
1508    %patch28 -p1
1509    %patch29 -p1
1510    %patch30 -p1
1511    %patch31 -p1
1512    %patch32 -p1
1513    %patch33 -p1
1514    %patch34 -p1
1515    %patch35 -p1
1516    %patch36 -p1
1517    %patch37 -p1
1518    %patch38 -p1
1519    %patch39 -p1
1520    %patch40 -p1
1521    %patch41 -p1
1522    
1523  %pre  %pre
1524  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 1322  ln -s /etc/rc.d/rc7.d root/etc/rc7.d Line 1583  ln -s /etc/rc.d/rc7.d root/etc/rc7.d
1583  mkdir -p root/etc/rc.d/rc1.d  mkdir -p root/etc/rc.d/rc1.d
1584    
1585  mkdir -p root/usr/share/locale/en_US/LC_MESSAGES  mkdir -p root/usr/share/locale/en_US/LC_MESSAGES
1586  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
1587    
1588  mkdir -p root/etc/e-smith/locale  mkdir -p root/etc/e-smith/locale
1589  # Make the fr-ca link in %pre to ease upgrades  # Make the fr-ca link in %pre to ease upgrades
# Line 1337  mkdir -p root/etc/e-smith/templates/etc/ Line 1598  mkdir -p root/etc/e-smith/templates/etc/
1598  ln -s /etc/e-smith/templates-default/template-begin-shell \  ln -s /etc/e-smith/templates-default/template-begin-shell \
1599        root/etc/e-smith/templates/etc/dhcpc/dhcpcd.exe/template-begin        root/etc/e-smith/templates/etc/dhcpc/dhcpcd.exe/template-begin
1600    
1601    mkdir -p root/etc/e-smith/templates/etc/ldap.secret/
1602    touch root/etc/e-smith/templates/etc/ldap.secret/template-begin
1603    
1604  for file in imap login passwd pwauth system-auth  for file in imap login passwd pwauth system-auth
1605  do  do
1606      mkdir -p root/etc/e-smith/templates/etc/pam.d/$file      mkdir -p root/etc/e-smith/templates/etc/pam.d/$file
# Line 1367  rm root/service/{syslog,klogd} Line 1631  rm root/service/{syslog,klogd}
1631  mkdir -p root/etc/e-smith/events/local  mkdir -p root/etc/e-smith/events/local
1632  mkdir -p root/etc/e-smith/events/user-modify-admin  mkdir -p root/etc/e-smith/events/user-modify-admin
1633  mkdir -p root/home/e-smith/db  mkdir -p root/home/e-smith/db
 touch root/home/e-smith/db/configuration  
1634    
1635  mkdir -p root/etc/e-smith/pam  mkdir -p root/etc/e-smith/pam
1636  mkdir -p root/home/e-smith/ssl.key  mkdir -p root/home/e-smith/ssl.key
# Line 1379  mkdir -p root/var/state/e-smith Line 1642  mkdir -p root/var/state/e-smith
1642  for file in %{dbfiles}  for file in %{dbfiles}
1643  do  do
1644      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  
1645  done  done
1646    
1647  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