1 |
# $Id: e-smith-base.spec,v 1.100 2010/09/27 20:33:28 slords Exp $ |
# $Id: e-smith-base.spec,v 1.139 2013/01/23 03:47:15 wellsi 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 5.2.0 |
%define version 5.2.0 |
7 |
%define release 31 |
%define release 68 |
8 |
Version: %{version} |
Version: %{version} |
9 |
Release: %{release}%{?dist} |
Release: %{release}%{?dist} |
10 |
License: GPL |
License: GPL |
36 |
Patch24: e-smith-base-5.2.0-nss_ldap.patch |
Patch24: e-smith-base-5.2.0-nss_ldap.patch |
37 |
Patch25: e-smith-base-5.2.0-ibay_groups.patch |
Patch25: e-smith-base-5.2.0-ibay_groups.patch |
38 |
Patch26: e-smith-base-5.2.0-keep_external.patch |
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 |
|
Patch42: e-smith-base-5.2.0-fix-gid.patch |
55 |
|
Patch43: e-smith-base-5.2.0-weak-updates.patch |
56 |
|
Patch44: e-smith-base-5.2.0-apache_alias_for_www.patch |
57 |
|
Patch45: e-smith-base-5.2.0-no-nic2.patch |
58 |
|
Patch46: e-smith-base-5.2.0-list-only-write-enabled-backup-targets.patch |
59 |
|
Patch47: e-smith-base-5.2.0-string-fix.patch |
60 |
|
Patch48: e-smith-base-5.2.0-dont_set_gecos_in_ldap.patch |
61 |
|
Patch49: e-smith-base-5.2.0-initExternal.patch |
62 |
|
Patch50: e-smith-base-5.2.0-ConsoleNetwork.patch |
63 |
|
Patch51: e-smith-base-5.2.0-ConsoleNetworkText.patch |
64 |
|
Patch52: e-smith-base-5.2.0-CipherSuite.patch |
65 |
|
Patch53: e-smith-base-5.2.0-updatedb.patch |
66 |
|
Patch54: e-smith-base-5.2.0-pppoeMlimit.patch |
67 |
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot |
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot |
68 |
Requires: mod_auth_external |
Requires: mod_auth_external |
69 |
Requires: e-smith-lib >= 2.2.0-2 |
Requires: e-smith-lib >= 2.2.0-2 |
91 |
Requires: pv |
Requires: pv |
92 |
Requires: pam_abl |
Requires: pam_abl |
93 |
Requires: nss_ldap |
Requires: nss_ldap |
94 |
|
Requires: cpu >= 1.4.3 |
95 |
Obsoletes: rlinetd, e-smith-mod_ssl |
Obsoletes: rlinetd, e-smith-mod_ssl |
96 |
Obsoletes: e-smith-serial-console |
Obsoletes: e-smith-serial-console |
97 |
Obsoletes: sshell |
Obsoletes: sshell |
111 |
e-smith server and gateway software - base module. |
e-smith server and gateway software - base module. |
112 |
|
|
113 |
%changelog |
%changelog |
114 |
|
* Tue Jan 29 2013 Ian Wells <esmith@wellsi.com> 5.2.0-68.sme |
115 |
|
- Updated previous patch to avoid migrate fragment [SME: 7000] |
116 |
|
|
117 |
|
* Tue Jan 22 2013 Ian Wells <esmith@wellsi.com> 5.2.0-67.sme |
118 |
|
- Increase memory limit for pppoe to 100Mb [SME: 7000] |
119 |
|
|
120 |
|
* Sun Dec 30 2012 Ian Wells <esmith@wellsi.com> 5.2.0-66.sme |
121 |
|
- Template /etc/updatedb.conf [SME: 7090] |
122 |
|
|
123 |
|
* Wed Jul 18 2012 Ian Wells <esmith@wellsi.com> 5.2.0-65.sme |
124 |
|
- Make CipherSuite secure by default [SME: 7026] |
125 |
|
|
126 |
|
* Fri Mar 16 2012 Ian Wells <esmith@wellsi.com> 5.2.0-64.sme |
127 |
|
- Add MAC address into console network selection [SME: 6844] |
128 |
|
|
129 |
|
* Sun Nov 6 2011 Shad L. Lords <slords@mail.com> 5.2.0-63.sme |
130 |
|
- Initialize ExternalInterface db structure so hwaddr in console works |
131 |
|
[SME: 6775] |
132 |
|
|
133 |
|
* Mon Mar 14 2011 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-62.sme |
134 |
|
- Stop using gecos attribute in LDAP [SME: 6539] |
135 |
|
|
136 |
|
* Mon Mar 14 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-61.sme |
137 |
|
- Fix a typo in strings [SME: 5932] |
138 |
|
|
139 |
|
* Mon Mar 14 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-60.sme |
140 |
|
- Rework text changes in console screen in previous revision [SME: 5932] |
141 |
|
|
142 |
|
* Mon Mar 14 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-59.sme |
143 |
|
- Only list backup targets that are writeable [SME: 5932] |
144 |
|
|
145 |
|
* Sun Mar 13 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-58.sme |
146 |
|
- Revert admin password change through user-manager [SME: 3759] |
147 |
|
|
148 |
|
* Sun Mar 13 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-57.sme |
149 |
|
- Allow admin password change through user-manager [SME: 3759] |
150 |
|
|
151 |
|
* Wed Mar 2 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-57.sme |
152 |
|
- Handle no network interface scenario in console and bootstrap-console [SME: 6023] |
153 |
|
|
154 |
|
* Mon Dec 6 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-56.sme |
155 |
|
- change apache uid and gid so they become aliases for www [SME: 6425] |
156 |
|
|
157 |
|
* Tue Nov 30 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-55.sme |
158 |
|
- Only remove dangling symlinks in weak-updates directories [SME: 6376] |
159 |
|
|
160 |
|
* Tue Nov 30 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-54.sme |
161 |
|
- Fix create user gid parameter [SME: 6416] |
162 |
|
|
163 |
|
* Mon Nov 29 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-53.sme |
164 |
|
- Fix gpasswd path [SME: 6412] |
165 |
|
|
166 |
|
* Mon Nov 22 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-52.sme |
167 |
|
- Fix relocation of dhclient conf file [SME: 6385] |
168 |
|
|
169 |
|
* Sun Nov 7 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-51.sme |
170 |
|
- No longer need to pass supplemental groups to cpu [SME: 6349] |
171 |
|
|
172 |
|
* Fri Nov 5 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-50.sme |
173 |
|
- Allow cpu to remove empty attributes [SME: 6343] |
174 |
|
|
175 |
|
* Thu Nov 4 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-49.sme |
176 |
|
- Fix maxUsers patch (again) to not break setting passwords [SME: 5537] |
177 |
|
|
178 |
|
* Thu Nov 4 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-48.sme |
179 |
|
- Fix maxUsers patch to not break setting passwords [SME: 5537] |
180 |
|
|
181 |
|
* Thu Nov 4 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-47.sme |
182 |
|
- Don't put empty attributes in file for cpu [SME: 6334] |
183 |
|
|
184 |
|
* Thu Nov 4 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-46.sme |
185 |
|
- Add flush to tmpfile so that data is available to cpu [SME: 6334] |
186 |
|
|
187 |
|
* Thu Nov 4 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-45.sme |
188 |
|
- Add extra attributes to ldap objects with cpu call [SME: 6334] |
189 |
|
|
190 |
|
* Wed Nov 3 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-44.sme |
191 |
|
- Fix cpu critical patch missing ' [SME: 6330] |
192 |
|
|
193 |
|
* Wed Nov 3 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-43.sme |
194 |
|
- Make cpu calls critical only with ldap{Auth} is enabled [SME: 6330] |
195 |
|
- Add cpu.conf and cpu-system.conf to post-upgrade event [SME: 6327] |
196 |
|
|
197 |
|
* Tue Nov 2 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-42.sme |
198 |
|
- Always use cpu, do unix if ldap{Auth} is disabled [SME: 6328] |
199 |
|
|
200 |
|
* Mon Nov 1 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-41.sme |
201 |
|
- Switch to cpu commands if ldap is master [SME: 6328] |
202 |
|
|
203 |
|
* Mon Nov 1 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-40.sme |
204 |
|
- Add templates for ldap authentication if enabled [SME: 6329] |
205 |
|
|
206 |
|
* Mon Nov 1 2010 Shad L. Lords <slords@lordsfam.net> 5.2.0-39.sme |
207 |
|
- Add cpu.conf and cpu-system.conf template/program to SME [SME: 6327] |
208 |
|
|
209 |
|
* Thu Oct 14 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-38.sme |
210 |
|
- Fix empty leases file test [SME: 6274] |
211 |
|
|
212 |
|
* Tue Oct 12 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-37.sme |
213 |
|
- Relocate dhcpd leases file [SME: 6274] |
214 |
|
|
215 |
|
* Mon Oct 11 2010 Shad L. Lords <slords@mail.com> 5.2.0-36.sme |
216 |
|
- Add migrate script to add missing HWaddr to interface records [SME: 6267] |
217 |
|
|
218 |
|
* Mon Oct 11 2010 Shad L. Lords <slords@mail.com> 5.2.0-35.sme |
219 |
|
- Make lcp options configurable [SME: 6277] |
220 |
|
|
221 |
|
* Mon Oct 11 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-34.sme |
222 |
|
- Relocate dhclient conf file [SME: 5833] |
223 |
|
|
224 |
|
* Fri Oct 8 2010 Shad L. Lords <slords@mail.com> 5.2.0-33.sme |
225 |
|
- Disable apmd on 64-bit arch [SME: 6170] |
226 |
|
|
227 |
|
* Fri Oct 8 2010 Shad L. Lords <slords@mail.com> 5.2.0-32.sme |
228 |
|
- Remove check for maxUsers [SME: 5537] |
229 |
|
|
230 |
* Wed Oct 6 2010 Shad L. Lords <slords@mail.com> 5.2.0-31.sme |
* Wed Oct 6 2010 Shad L. Lords <slords@mail.com> 5.2.0-31.sme |
231 |
- Try and keep same external address for pppoe connections [SME: 6263] |
- Try and keep same external address for pppoe connections [SME: 6263] |
232 |
|
|
1566 |
%patch24 -p1 |
%patch24 -p1 |
1567 |
%patch25 -p1 |
%patch25 -p1 |
1568 |
%patch26 -p1 |
%patch26 -p1 |
1569 |
|
%patch27 -p1 |
1570 |
|
%patch28 -p1 |
1571 |
|
%patch29 -p1 |
1572 |
|
%patch30 -p1 |
1573 |
|
%patch31 -p1 |
1574 |
|
%patch32 -p1 |
1575 |
|
%patch33 -p1 |
1576 |
|
%patch34 -p1 |
1577 |
|
%patch35 -p1 |
1578 |
|
%patch36 -p1 |
1579 |
|
%patch37 -p1 |
1580 |
|
%patch38 -p1 |
1581 |
|
%patch39 -p1 |
1582 |
|
%patch40 -p1 |
1583 |
|
%patch41 -p1 |
1584 |
|
%patch42 -p1 |
1585 |
|
%patch43 -p1 |
1586 |
|
%patch44 -p1 |
1587 |
|
%patch45 -p1 |
1588 |
|
%patch46 -p1 |
1589 |
|
%patch47 -p1 |
1590 |
|
%patch48 -p1 |
1591 |
|
%patch49 -p1 |
1592 |
|
%patch50 -p1 |
1593 |
|
%patch51 -p1 |
1594 |
|
%patch52 -p1 |
1595 |
|
%patch53 -p1 |
1596 |
|
%patch54 -p1 |
1597 |
|
|
1598 |
%pre |
%pre |
1599 |
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 ] |
1699 |
ln -s ../daemontools root/etc/rc.d/init.d/supervise/$service |
ln -s ../daemontools root/etc/rc.d/init.d/supervise/$service |
1700 |
done |
done |
1701 |
|
|
1702 |
|
mkdir -p root/var/service/wan/env.pppoe |
1703 |
|
|
1704 |
# Remove (for now) supervised syslog and klogd services |
# Remove (for now) supervised syslog and klogd services |
1705 |
rm root/etc/rc.d/init.d/supervise/{syslog,klogd} |
rm root/etc/rc.d/init.d/supervise/{syslog,klogd} |
1706 |
rm root/service/{syslog,klogd} |
rm root/service/{syslog,klogd} |