/[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.41 by slords, Wed Mar 26 21:01:12 2008 UTC Revision 1.108 by vip-ire, Thu Oct 14 16:21:30 2010 UTC
# Line 1  Line 1 
1    # $Id: e-smith-base.spec,v 1.107 2010/10/12 17:55:13 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 3  %define release 38
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-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  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
47  Requires: mod_auth_external  Requires: mod_auth_external
48  Requires: e-smith-lib >= 1.18.0-19  Requires: e-smith-lib >= 2.2.0-2
49  Requires: server-manager-images, server-manager  Requires: server-manager-images, server-manager
50  Requires: e-smith-formmagick >= 1.4.0-9  Requires: e-smith-formmagick >= 1.4.0-12
51  Requires: initscripts >= 6.67-1es17  Requires: initscripts >= 6.67-1es17
52  Requires: e-smith-daemontools >= 1.7.1-04  Requires: e-smith-daemontools >= 1.7.1-04
53  Requires: perl(Locale::gettext)  Requires: perl(Locale::gettext)
# Line 25  Requires: perl(Net::IPv4Addr) Line 58  Requires: perl(Net::IPv4Addr)
58  Requires: /usr/sbin/irqbalance  Requires: /usr/sbin/irqbalance
59  Requires: /usr/sbin/cpuspeed  Requires: /usr/sbin/cpuspeed
60  Requires: /sbin/microcode_ctl  Requires: /sbin/microcode_ctl
61    Requires: /usr/sbin/smartd
62  Requires: dbus  Requires: dbus
63  Requires: hal  Requires: hal
64  Requires: acpid  Requires: acpid
 Requires: whiptail  
65  Requires: rssh  Requires: rssh
66  Requires: bridge-utils  Requires: bridge-utils
67  Requires: vconfig  Requires: vconfig
# Line 36  Requires: e-smith-bootloader Line 69  Requires: e-smith-bootloader
69  Requires: mdadm  Requires: mdadm
70  Requires: pv  Requires: pv
71  Requires: pam_abl  Requires: pam_abl
72    Requires: nss_ldap
73  Obsoletes: rlinetd, e-smith-mod_ssl  Obsoletes: rlinetd, e-smith-mod_ssl
74  Obsoletes: e-smith-serial-console  Obsoletes: e-smith-serial-console
75  Obsoletes: sshell  Obsoletes: sshell
76  Obsoletes: e-smith-rp-pppoe  Obsoletes: e-smith-rp-pppoe
 %if "%{?rhel}" == "5"  
77  Obsoletes: perl-Data-UUID  Obsoletes: perl-Data-UUID
 %endif  
78  BuildRequires: perl, perl(Test::Inline) >= 0.12  BuildRequires: perl, perl(Test::Inline) >= 0.12
79  BuildRequires: e-smith-devtools >= 1.13.1-03  BuildRequires: e-smith-devtools >= 1.13.1-03
80  BuildRequires: gettext  BuildRequires: gettext
# Line 57  AutoReqProv: no Line 89  AutoReqProv: no
89  e-smith server and gateway software - base module.  e-smith server and gateway software - base module.
90    
91  %changelog  %changelog
92    * Thu Oct 14 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-38.sme
93    - Fix empty leases file test [SME: 6274]
94    
95    * Tue Oct 12 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-37.sme
96    - Relocate dhcpd leases file [SME: 6274]
97    
98    * Mon Oct 11 2010 Shad L. Lords <slords@mail.com> 5.2.0-36.sme
99    - Add migrate script to add missing HWaddr to interface records [SME: 6267]
100    
101    * Mon Oct 11 2010 Shad L. Lords <slords@mail.com> 5.2.0-35.sme
102    - Make lcp options configurable [SME: 6277]
103    
104    * Mon Oct 11 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-34.sme
105    - Relocate dhclient conf file [SME: 5833]
106    
107    * Fri Oct 8 2010 Shad L. Lords <slords@mail.com> 5.2.0-33.sme
108    - Disable apmd on 64-bit arch [SME: 6170]
109    
110    * Fri Oct 8 2010 Shad L. Lords <slords@mail.com> 5.2.0-32.sme
111    - Remove check for maxUsers [SME: 5537]
112    
113    * Wed Oct 6 2010 Shad L. Lords <slords@mail.com> 5.2.0-31.sme
114    - Try and keep same external address for pppoe connections [SME: 6263]
115    
116    * Mon Sep 27 2010 Shad L. Lords <slords@mail.com> 5.2.0-30.sme
117    - Add ibay groups to group membership [SME: 6247]
118    
119    * Thu Sep 23 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-29.sme
120    - Prepare nss_ldap [SME: 6227]
121    
122    * Sun Aug 8 2010 Ian Wells <esmith@wellsi.com> 5.2.0-28.sme
123    - Enable cpuspeed by default [SME: 6066]
124    
125    * Sun Jul 25 2010 Charlie Brady <charlie_brady@mitel.com> 5.2.0-27.sme
126    - Fix syntax error in last patch. [SME: 5830]
127    
128    * Mon Jul 19 2010 Charlie Brady <charlie_brady@mitel.com> 5.2.0-26.sme
129    - Don't exit 99 from e-smith-service script when called with 'condrestart'
130      and service is disabled. [SME: 5830]
131    
132    * Fri Jun 11 2010 Federico Simoncelli <federico.simoncelli@gmail.com> 5.2.0-25.sme
133    - FreeBusy patch fix (save account changes) [SME: 5941]
134    
135    * Fri Jun 11 2010 Ian Wells <esmith@wellsi.com>  5.2.0-24.sme
136    - Remove checkMaxUsers patch due to regression. [SME: 5537]
137    
138    * Tue Jun  8 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-23.sme
139    - Fix translation of local nic string in console [SME: 5571]
140    
141    * Sun Jun  6 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-22.sme
142    - Handle no network interface scenario in console [SME: 6023]
143    
144    * Sat Jun 5 2010 Ian Wells <esmith@wellsi.com>  5.2.0-21.sme
145    - Remove checkMaxUsers(). [SME: 5537]
146    
147    * Mon May 10 2010 John H. Bennett III <bennettj@johnbennettservices.com> 5.2.0-20.sme
148    - Patch that will remove all FreeBusy references from e-smith-base. [SME: 5941]
149    
150    * Wed Mar  3 2010 Federico Simoncelli <federico.simoncelli@gmail.com> 5.2.0-19.sme
151    - Restate smartd dependency. [SME: 5814]
152    
153    * Mon Mar 1 2010 Shad L. Lords <slords@mail.com> 5.2.0-18.sme
154    - Fix gettext errors in WAN/LAN subnet error message [SME: 5501]
155    
156    * Sun Feb 14 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-17.sme
157    - Really fix template expansion error [SME: 4528]
158    
159    * Sun Feb 14 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-16.sme
160    - Fix template expansion error [SME: 4528]
161    
162    * Mon Feb 8 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-15.sme
163    - Improve security by using SHA1 algorithm for certificate signing [SME: 5737]
164    
165    * Fri Feb 5 2010 Stephen Noble <support@dungog.net> 5.2.0-14.sme
166    - Fix eth? swapping [SME: 4528]
167    
168    * Sun Jan 31 2010 Stephen Noble <support@dungog.net> 5.2.0-13.sme
169    - Fix console backup from removable media [SME: 4809]
170    
171    * Sat Jan 30 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-12.sme
172    - Bump certificate encryption from 1024 bits to 2048 bits [SME: 5735]
173    
174    * Thu Jan 14 2010 Filippo Carletti <filippo.carletti@gmail.com> 5.2.0-11.sme
175    - Fix console restore from removable media (Federico Simoncelli) [SME: 4809]
176    
177    * Mon Nov 23 2009 Gavin Weight <gweight@gmail.com> 5.2.0-10.sme
178    - Add a dummy call so xgettext can pull translated $ifName in console configuration pages. [SME: 5571]
179    
180    * Fri Nov 6 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-9.sme
181    - Translate $ifName in console configuration pages [SME: 5571]
182    
183    * Sat Oct 24 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-8.sme
184    - Prevent IP conflicts between local and external interface in server gateway mode [SME: 5501]
185    
186    * Tue Oct 20 2009 Filippo Carletti <filippo.carletti@gmail.com> 5.2.0-7.sme
187    - Clean up: remove unused nonetworkdrivers [SME: 5521]
188    
189    * Sat Jun 6 2009 Shad L. Lords <slords@mail.com> 5.2.0-6.sme
190    - Clean up stray symlinks in /lib/modules before depmod [SME: 5336]
191    
192    * Mon May 18 2009 Gavin Weight <gweight@gmail.com> 5.2.0-5.sme
193    - Allow for different mdadm output formats for DeviceSize. [SME: 5230]
194    
195    * Sat Feb 14 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-4.sme
196    - Auto-mount USB REV70-drive as usbdisk [SME: 5006]
197    
198    * Sat Oct 25 2008 Stephen Noble <support@dungog.net> 5.2.0-3.sme
199    - create service link for smartd [SME: 1445]
200    
201    * Mon Oct 13 2008 Shad L. Lords <slords@mail.com> 5.2.0-2.sme
202    - Add patch to support multiple samba roles [SME: 4172]
203    
204    * Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 5.2.0-1.sme
205    - Roll new stream to separate sme7/sme8 trees [SME: 4633]
206    
207    * Tue Sep 23 2008 Stephen Noble <support@dungog.net> 4.19.0-6
208    - Add locale tags for email in review panel [SME: 4267]
209    
210    * Sat Sep 20 2008 Shad L. Lords <slords@mail.com> 4.19.0-5
211    - Correct gettext type during build process [SME: 570]
212    
213    * Mon Sep 15 2008 Shad L. Lords <slords@mail.com> 4.19.0-4
214    - Fix screen corruption in console [SME: 4155]
215    
216    * Sat Sep 13 2008 Shad L. Lords <slords@mail.com> 4.19.0-3
217    - Fix detection of xen instance against newer kernels [SME: 4555]
218    
219    * Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.19.0-2
220    - Fixed warnings generated during build process [SME: 570]
221    
222    * Wed Aug 20 2008 Shad L. Lords <slords@mail.com> 4.19.0-1
223    - Roll new dev stream.
224    
225    * Sun Aug 17 2008 Gavin Weight <gweight@gmail.com> 4.18.1-22
226    - Add gettext to creating backup file title for localization. [SME: 4467]
227    
228    * Mon Aug 11 2008 Charlie Brady <charlie_brady@mitel.com> 4.18.1-21
229    - Fix race condition in VPN ip-down handling which could cause loss of
230      LAN connectivity. [SME: 4405]
231    
232    * Sat Aug 9 2008 Shad L. Lords <slords@mail.com> 4.18.1-20
233    - Remove requires for whiptail.  No longer needed [SME: 4491]
234    
235    * Fri Aug  8 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-19
236    - Change userpassword panel to use PASSWORD_VERIFY_NEW instead of PASSWORD_NEW_VERIFY [SME: 4487]
237    
238    * Thu Aug  7 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-18
239    - Revert locale key PASSWORD_RESET_TITLE to RESET_PASSWORD_TITLE and move it
240      to e-smith-formmagick's general [SME: 4475]
241    - Reverting all *PASSWORD_NO_MATCH to *PASSWORD_VERIFY_ERROR locale keys [SME: 4476]
242    - Remove invalid entry tag from userpassword's locale file preventing the
243      form from displaying properly [SME: 4479]
244    
245    * Tue Aug  5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-17
246    - Revert previous invalid locale changes (reverting to 4.18.1-15) [SME: 4472]
247    
248    * Mon Aug  4 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-16
249    - Revert some locale changes
250    
251    * Tue Jul 22 2008 Gavin Weight <gweight@gmail.com> 4.18.1-15
252    - Add regex to support cciss device names in manageRAID.pl. [SME: 4455]
253    
254    * Sat Jul 5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-14
255    - Add common <base> tags to e-smith-formmagick's general [SME: 4279]
256    
257    * Sun Apr 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-13
258    - Add common <base> tags to e-smith-formmagick's general [SME: 4279]
259    
260    * Wed Apr 23 2008 Shad L. Lords <slords@mail.com> 4.18.1-12
261    - Fix for > 5 nics detected [SME: 4232]
262    
263    * Tue Apr 22 2008 Shad L. Lords <slords@mail.com> 4.18.1-11
264    - Remove use of Date::Manip from ssl.crt [SME: 3155]
265    
266    * Sat Apr 19 2008 Shad L. Lords <slords@mail.com> 4.18.1-10
267    - Fix FreeBusy param when disabled [SME: 1806]
268    - Remove .orig file [SME: 4228]
269    
270    * Wed Apr 2 2008 Shad L. Lords <slords@mail.com> 4.18.1-9
271    - Remove quitConsole from menu [SME: 4154]
272    
273    * Wed Apr 2 2008 Shad L. Lords <slords@mail.com> 4.18.1-8
274    - Really fix free/busy in usermanager [SME: 4157]
275    
276    * Wed Apr 2 2008 Shad L. Lords <slords@mail.com> 4.18.1-7
277    - Use frames in elinks [SME: 4156]
278    - Set homepage for elinks [SME: 4160]
279    
280    * Wed Apr 2 2008 Shad L. Lords <slords@mail.com> 4.18.1-6
281    - Fix free/busy field in useraccounts [SME: 4157]
282    
283    * Tue Apr 1 2008 Shad L. Lords <slords@mail.com> 4.18.1-5
284    - Add free/busy URL entry to help kronolith contribs [SME: 1806]
285    
286    * Fri Mar 28 2008 Shad L. Lords <slords@mail.com> 4.18.1-4
287    - Fix insert_mode for elinks on el5 platform [SME: 4127]
288    
289  * Wed Mar 26 2008 Shad L. Lords <slords@mail.com> 4.18.1-3  * Wed Mar 26 2008 Shad L. Lords <slords@mail.com> 4.18.1-3
290  - Set accounts to deleted before template expansion [SME: 4122]  - Set accounts to deleted before template expansion [SME: 4122]
291    
# Line 1196  e-smith server and gateway software - ba Line 1425  e-smith server and gateway software - ba
1425  %setup  %setup
1426  %patch1 -p1  %patch1 -p1
1427  %patch2 -p1  %patch2 -p1
1428    %patch3 -p1
1429    %patch4 -p1
1430    %patch5 -p1
1431    %patch6 -p1
1432    %patch7 -p1
1433    %patch8 -p1
1434    %patch9 -p1
1435    %patch10 -p1
1436    %patch11 -p1
1437    %patch12 -p1
1438    %patch13 -p1
1439    %patch14 -p1
1440    %patch15 -p1
1441    %patch16 -p1
1442    %patch17 -p1
1443    %patch18 -p1
1444    %patch19 -p1
1445    %patch20 -p1
1446    %patch21 -p1
1447    %patch22 -p1
1448    %patch23 -p1
1449    %patch24 -p1
1450    %patch25 -p1
1451    %patch26 -p1
1452    %patch27 -p1
1453    %patch28 -p1
1454    %patch29 -p1
1455    %patch30 -p1
1456    %patch31 -p1
1457    %patch32 -p1
1458    %patch33 -p1
1459    
1460  %pre  %pre
1461  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 1260  ln -s /etc/rc.d/rc7.d root/etc/rc7.d Line 1520  ln -s /etc/rc.d/rc7.d root/etc/rc7.d
1520  mkdir -p root/etc/rc.d/rc1.d  mkdir -p root/etc/rc.d/rc1.d
1521    
1522  mkdir -p root/usr/share/locale/en_US/LC_MESSAGES  mkdir -p root/usr/share/locale/en_US/LC_MESSAGES
1523  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
1524    
1525  mkdir -p root/etc/e-smith/locale  mkdir -p root/etc/e-smith/locale
1526  # Make the fr-ca link in %pre to ease upgrades  # Make the fr-ca link in %pre to ease upgrades
# Line 1275  mkdir -p root/etc/e-smith/templates/etc/ Line 1535  mkdir -p root/etc/e-smith/templates/etc/
1535  ln -s /etc/e-smith/templates-default/template-begin-shell \  ln -s /etc/e-smith/templates-default/template-begin-shell \
1536        root/etc/e-smith/templates/etc/dhcpc/dhcpcd.exe/template-begin        root/etc/e-smith/templates/etc/dhcpc/dhcpcd.exe/template-begin
1537    
1538    mkdir -p root/etc/e-smith/templates/etc/ldap.secret/
1539    touch root/etc/e-smith/templates/etc/ldap.secret/template-begin
1540    
1541  for file in imap login passwd pwauth system-auth  for file in imap login passwd pwauth system-auth
1542  do  do
1543      mkdir -p root/etc/e-smith/templates/etc/pam.d/$file      mkdir -p root/etc/e-smith/templates/etc/pam.d/$file
# Line 1305  rm root/service/{syslog,klogd} Line 1568  rm root/service/{syslog,klogd}
1568  mkdir -p root/etc/e-smith/events/local  mkdir -p root/etc/e-smith/events/local
1569  mkdir -p root/etc/e-smith/events/user-modify-admin  mkdir -p root/etc/e-smith/events/user-modify-admin
1570  mkdir -p root/home/e-smith/db  mkdir -p root/home/e-smith/db
 touch root/home/e-smith/db/configuration  
1571    
1572  mkdir -p root/etc/e-smith/pam  mkdir -p root/etc/e-smith/pam
1573  mkdir -p root/home/e-smith/ssl.key  mkdir -p root/home/e-smith/ssl.key
# Line 1317  mkdir -p root/var/state/e-smith Line 1579  mkdir -p root/var/state/e-smith
1579  for file in %{dbfiles}  for file in %{dbfiles}
1580  do  do
1581      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  
1582  done  done
1583    
1584  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