/[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.44 by slords, Wed Apr 2 18:34:04 2008 UTC Revision 1.101 by slords, Wed Oct 6 15:41:12 2010 UTC
# Line 1  Line 1 
1    # $Id: e-smith-base.spec,v 1.100 2010/09/27 20:33:28 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 7  %define release 31
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-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  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
40  Requires: mod_auth_external  Requires: mod_auth_external
41  Requires: e-smith-lib >= 1.18.0-19  Requires: e-smith-lib >= 2.2.0-2
42  Requires: server-manager-images, server-manager  Requires: server-manager-images, server-manager
43  Requires: e-smith-formmagick >= 1.4.0-9  Requires: e-smith-formmagick >= 1.4.0-12
44  Requires: initscripts >= 6.67-1es17  Requires: initscripts >= 6.67-1es17
45  Requires: e-smith-daemontools >= 1.7.1-04  Requires: e-smith-daemontools >= 1.7.1-04
46  Requires: perl(Locale::gettext)  Requires: perl(Locale::gettext)
# Line 28  Requires: perl(Net::IPv4Addr) Line 51  Requires: perl(Net::IPv4Addr)
51  Requires: /usr/sbin/irqbalance  Requires: /usr/sbin/irqbalance
52  Requires: /usr/sbin/cpuspeed  Requires: /usr/sbin/cpuspeed
53  Requires: /sbin/microcode_ctl  Requires: /sbin/microcode_ctl
54    Requires: /usr/sbin/smartd
55  Requires: dbus  Requires: dbus
56  Requires: hal  Requires: hal
57  Requires: acpid  Requires: acpid
 Requires: whiptail  
58  Requires: rssh  Requires: rssh
59  Requires: bridge-utils  Requires: bridge-utils
60  Requires: vconfig  Requires: vconfig
# Line 39  Requires: e-smith-bootloader Line 62  Requires: e-smith-bootloader
62  Requires: mdadm  Requires: mdadm
63  Requires: pv  Requires: pv
64  Requires: pam_abl  Requires: pam_abl
65    Requires: nss_ldap
66  Obsoletes: rlinetd, e-smith-mod_ssl  Obsoletes: rlinetd, e-smith-mod_ssl
67  Obsoletes: e-smith-serial-console  Obsoletes: e-smith-serial-console
68  Obsoletes: sshell  Obsoletes: sshell
69  Obsoletes: e-smith-rp-pppoe  Obsoletes: e-smith-rp-pppoe
 %if "%{?rhel}" == "5"  
70  Obsoletes: perl-Data-UUID  Obsoletes: perl-Data-UUID
 %endif  
71  BuildRequires: perl, perl(Test::Inline) >= 0.12  BuildRequires: perl, perl(Test::Inline) >= 0.12
72  BuildRequires: e-smith-devtools >= 1.13.1-03  BuildRequires: e-smith-devtools >= 1.13.1-03
73  BuildRequires: gettext  BuildRequires: gettext
# Line 60  AutoReqProv: no Line 82  AutoReqProv: no
82  e-smith server and gateway software - base module.  e-smith server and gateway software - base module.
83    
84  %changelog  %changelog
85    * Wed Oct 6 2010 Shad L. Lords <slords@mail.com> 5.2.0-31.sme
86    - Try and keep same external address for pppoe connections [SME: 6263]
87    
88    * Mon Sep 27 2010 Shad L. Lords <slords@mail.com> 5.2.0-30.sme
89    - Add ibay groups to group membership [SME: 6247]
90    
91    * Thu Sep 23 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-29.sme
92    - Prepare nss_ldap [SME: 6227]
93    
94    * Sun Aug 8 2010 Ian Wells <esmith@wellsi.com> 5.2.0-28.sme
95    - Enable cpuspeed by default [SME: 6066]
96    
97    * Sun Jul 25 2010 Charlie Brady <charlie_brady@mitel.com> 5.2.0-27.sme
98    - Fix syntax error in last patch. [SME: 5830]
99    
100    * Mon Jul 19 2010 Charlie Brady <charlie_brady@mitel.com> 5.2.0-26.sme
101    - Don't exit 99 from e-smith-service script when called with 'condrestart'
102      and service is disabled. [SME: 5830]
103    
104    * Fri Jun 11 2010 Federico Simoncelli <federico.simoncelli@gmail.com> 5.2.0-25.sme
105    - FreeBusy patch fix (save account changes) [SME: 5941]
106    
107    * Fri Jun 11 2010 Ian Wells <esmith@wellsi.com>  5.2.0-24.sme
108    - Remove checkMaxUsers patch due to regression. [SME: 5537]
109    
110    * Tue Jun  8 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-23.sme
111    - Fix translation of local nic string in console [SME: 5571]
112    
113    * Sun Jun  6 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-22.sme
114    - Handle no network interface scenario in console [SME: 6023]
115    
116    * Sat Jun 5 2010 Ian Wells <esmith@wellsi.com>  5.2.0-21.sme
117    - Remove checkMaxUsers(). [SME: 5537]
118    
119    * Mon May 10 2010 John H. Bennett III <bennettj@johnbennettservices.com> 5.2.0-20.sme
120    - Patch that will remove all FreeBusy references from e-smith-base. [SME: 5941]
121    
122    * Wed Mar  3 2010 Federico Simoncelli <federico.simoncelli@gmail.com> 5.2.0-19.sme
123    - Restate smartd dependency. [SME: 5814]
124    
125    * Mon Mar 1 2010 Shad L. Lords <slords@mail.com> 5.2.0-18.sme
126    - Fix gettext errors in WAN/LAN subnet error message [SME: 5501]
127    
128    * Sun Feb 14 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-17.sme
129    - Really fix template expansion error [SME: 4528]
130    
131    * Sun Feb 14 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-16.sme
132    - Fix template expansion error [SME: 4528]
133    
134    * Mon Feb 8 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-15.sme
135    - Improve security by using SHA1 algorithm for certificate signing [SME: 5737]
136    
137    * Fri Feb 5 2010 Stephen Noble <support@dungog.net> 5.2.0-14.sme
138    - Fix eth? swapping [SME: 4528]
139    
140    * Sun Jan 31 2010 Stephen Noble <support@dungog.net> 5.2.0-13.sme
141    - Fix console backup from removable media [SME: 4809]
142    
143    * Sat Jan 30 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-12.sme
144    - Bump certificate encryption from 1024 bits to 2048 bits [SME: 5735]
145    
146    * Thu Jan 14 2010 Filippo Carletti <filippo.carletti@gmail.com> 5.2.0-11.sme
147    - Fix console restore from removable media (Federico Simoncelli) [SME: 4809]
148    
149    * Mon Nov 23 2009 Gavin Weight <gweight@gmail.com> 5.2.0-10.sme
150    - Add a dummy call so xgettext can pull translated $ifName in console configuration pages. [SME: 5571]
151    
152    * Fri Nov 6 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-9.sme
153    - Translate $ifName in console configuration pages [SME: 5571]
154    
155    * Sat Oct 24 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-8.sme
156    - Prevent IP conflicts between local and external interface in server gateway mode [SME: 5501]
157    
158    * Tue Oct 20 2009 Filippo Carletti <filippo.carletti@gmail.com> 5.2.0-7.sme
159    - Clean up: remove unused nonetworkdrivers [SME: 5521]
160    
161    * Sat Jun 6 2009 Shad L. Lords <slords@mail.com> 5.2.0-6.sme
162    - Clean up stray symlinks in /lib/modules before depmod [SME: 5336]
163    
164    * Mon May 18 2009 Gavin Weight <gweight@gmail.com> 5.2.0-5.sme
165    - Allow for different mdadm output formats for DeviceSize. [SME: 5230]
166    
167    * Sat Feb 14 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-4.sme
168    - Auto-mount USB REV70-drive as usbdisk [SME: 5006]
169    
170    * Sat Oct 25 2008 Stephen Noble <support@dungog.net> 5.2.0-3.sme
171    - create service link for smartd [SME: 1445]
172    
173    * Mon Oct 13 2008 Shad L. Lords <slords@mail.com> 5.2.0-2.sme
174    - Add patch to support multiple samba roles [SME: 4172]
175    
176    * Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 5.2.0-1.sme
177    - Roll new stream to separate sme7/sme8 trees [SME: 4633]
178    
179    * Tue Sep 23 2008 Stephen Noble <support@dungog.net> 4.19.0-6
180    - Add locale tags for email in review panel [SME: 4267]
181    
182    * Sat Sep 20 2008 Shad L. Lords <slords@mail.com> 4.19.0-5
183    - Correct gettext type during build process [SME: 570]
184    
185    * Mon Sep 15 2008 Shad L. Lords <slords@mail.com> 4.19.0-4
186    - Fix screen corruption in console [SME: 4155]
187    
188    * Sat Sep 13 2008 Shad L. Lords <slords@mail.com> 4.19.0-3
189    - Fix detection of xen instance against newer kernels [SME: 4555]
190    
191    * Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.19.0-2
192    - Fixed warnings generated during build process [SME: 570]
193    
194    * Wed Aug 20 2008 Shad L. Lords <slords@mail.com> 4.19.0-1
195    - Roll new dev stream.
196    
197    * Sun Aug 17 2008 Gavin Weight <gweight@gmail.com> 4.18.1-22
198    - Add gettext to creating backup file title for localization. [SME: 4467]
199    
200    * Mon Aug 11 2008 Charlie Brady <charlie_brady@mitel.com> 4.18.1-21
201    - Fix race condition in VPN ip-down handling which could cause loss of
202      LAN connectivity. [SME: 4405]
203    
204    * Sat Aug 9 2008 Shad L. Lords <slords@mail.com> 4.18.1-20
205    - Remove requires for whiptail.  No longer needed [SME: 4491]
206    
207    * Fri Aug  8 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-19
208    - Change userpassword panel to use PASSWORD_VERIFY_NEW instead of PASSWORD_NEW_VERIFY [SME: 4487]
209    
210    * Thu Aug  7 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-18
211    - Revert locale key PASSWORD_RESET_TITLE to RESET_PASSWORD_TITLE and move it
212      to e-smith-formmagick's general [SME: 4475]
213    - Reverting all *PASSWORD_NO_MATCH to *PASSWORD_VERIFY_ERROR locale keys [SME: 4476]
214    - Remove invalid entry tag from userpassword's locale file preventing the
215      form from displaying properly [SME: 4479]
216    
217    * Tue Aug  5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-17
218    - Revert previous invalid locale changes (reverting to 4.18.1-15) [SME: 4472]
219    
220    * Mon Aug  4 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-16
221    - Revert some locale changes
222    
223    * Tue Jul 22 2008 Gavin Weight <gweight@gmail.com> 4.18.1-15
224    - Add regex to support cciss device names in manageRAID.pl. [SME: 4455]
225    
226    * Sat Jul 5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-14
227    - Add common <base> tags to e-smith-formmagick's general [SME: 4279]
228    
229    * Sun Apr 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-13
230    - Add common <base> tags to e-smith-formmagick's general [SME: 4279]
231    
232    * Wed Apr 23 2008 Shad L. Lords <slords@mail.com> 4.18.1-12
233    - Fix for > 5 nics detected [SME: 4232]
234    
235    * Tue Apr 22 2008 Shad L. Lords <slords@mail.com> 4.18.1-11
236    - Remove use of Date::Manip from ssl.crt [SME: 3155]
237    
238    * Sat Apr 19 2008 Shad L. Lords <slords@mail.com> 4.18.1-10
239    - Fix FreeBusy param when disabled [SME: 1806]
240    - Remove .orig file [SME: 4228]
241    
242    * Wed Apr 2 2008 Shad L. Lords <slords@mail.com> 4.18.1-9
243    - Remove quitConsole from menu [SME: 4154]
244    
245    * Wed Apr 2 2008 Shad L. Lords <slords@mail.com> 4.18.1-8
246    - Really fix free/busy in usermanager [SME: 4157]
247    
248  * Wed Apr 2 2008 Shad L. Lords <slords@mail.com> 4.18.1-7  * Wed Apr 2 2008 Shad L. Lords <slords@mail.com> 4.18.1-7
249  - Use frames in elinks [SME: 4156]  - Use frames in elinks [SME: 4156]
250  - Set homepage for elinks [SME: 4160]  - Set homepage for elinks [SME: 4160]
# Line 1212  e-smith server and gateway software - ba Line 1397  e-smith server and gateway software - ba
1397  %setup  %setup
1398  %patch1 -p1  %patch1 -p1
1399  %patch2 -p1  %patch2 -p1
 %if "%{?rhel}" == "5"  
1400  %patch3 -p1  %patch3 -p1
 %endif  
1401  %patch4 -p1  %patch4 -p1
1402  %patch5 -p1  %patch5 -p1
1403    %patch6 -p1
1404    %patch7 -p1
1405    %patch8 -p1
1406    %patch9 -p1
1407    %patch10 -p1
1408    %patch11 -p1
1409    %patch12 -p1
1410    %patch13 -p1
1411    %patch14 -p1
1412    %patch15 -p1
1413    %patch16 -p1
1414    %patch17 -p1
1415    %patch18 -p1
1416    %patch19 -p1
1417    %patch20 -p1
1418    %patch21 -p1
1419    %patch22 -p1
1420    %patch23 -p1
1421    %patch24 -p1
1422    %patch25 -p1
1423    %patch26 -p1
1424    
1425  %pre  %pre
1426  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 1281  ln -s /etc/rc.d/rc7.d root/etc/rc7.d Line 1485  ln -s /etc/rc.d/rc7.d root/etc/rc7.d
1485  mkdir -p root/etc/rc.d/rc1.d  mkdir -p root/etc/rc.d/rc1.d
1486    
1487  mkdir -p root/usr/share/locale/en_US/LC_MESSAGES  mkdir -p root/usr/share/locale/en_US/LC_MESSAGES
1488  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
1489    
1490  mkdir -p root/etc/e-smith/locale  mkdir -p root/etc/e-smith/locale
1491  # Make the fr-ca link in %pre to ease upgrades  # Make the fr-ca link in %pre to ease upgrades
# Line 1296  mkdir -p root/etc/e-smith/templates/etc/ Line 1500  mkdir -p root/etc/e-smith/templates/etc/
1500  ln -s /etc/e-smith/templates-default/template-begin-shell \  ln -s /etc/e-smith/templates-default/template-begin-shell \
1501        root/etc/e-smith/templates/etc/dhcpc/dhcpcd.exe/template-begin        root/etc/e-smith/templates/etc/dhcpc/dhcpcd.exe/template-begin
1502    
1503    mkdir -p root/etc/e-smith/templates/etc/ldap.secret/
1504    touch root/etc/e-smith/templates/etc/ldap.secret/template-begin
1505    
1506  for file in imap login passwd pwauth system-auth  for file in imap login passwd pwauth system-auth
1507  do  do
1508      mkdir -p root/etc/e-smith/templates/etc/pam.d/$file      mkdir -p root/etc/e-smith/templates/etc/pam.d/$file
# Line 1326  rm root/service/{syslog,klogd} Line 1533  rm root/service/{syslog,klogd}
1533  mkdir -p root/etc/e-smith/events/local  mkdir -p root/etc/e-smith/events/local
1534  mkdir -p root/etc/e-smith/events/user-modify-admin  mkdir -p root/etc/e-smith/events/user-modify-admin
1535  mkdir -p root/home/e-smith/db  mkdir -p root/home/e-smith/db
 touch root/home/e-smith/db/configuration  
1536    
1537  mkdir -p root/etc/e-smith/pam  mkdir -p root/etc/e-smith/pam
1538  mkdir -p root/home/e-smith/ssl.key  mkdir -p root/home/e-smith/ssl.key
# Line 1338  mkdir -p root/var/state/e-smith Line 1544  mkdir -p root/var/state/e-smith
1544  for file in %{dbfiles}  for file in %{dbfiles}
1545  do  do
1546      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  
1547  done  done
1548    
1549  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