1 |
# $Id: e-smith-apache.spec,v 1.10 2020/05/03 02:07:56 jpp Exp $ |
# $Id: e-smith-apache.spec,v 1.25 2022/07/25 08:51:14 jpp Exp $ |
2 |
|
|
3 |
Summary: e-smith server and gateway - apache module |
Summary: e-smith server and gateway - apache module |
4 |
%define name e-smith-apache |
%define name e-smith-apache |
5 |
Name: %{name} |
Name: %{name} |
6 |
%define version 2.6.0 |
%define version 2.6.0 |
7 |
%define release 8 |
%define release 22 |
8 |
Version: %{version} |
Version: %{version} |
9 |
Release: %{release}%{?dist} |
Release: %{release}%{?dist} |
10 |
License: GPL |
License: GPL |
15 |
Patch2: e-smith-apache-2.6.0-bz10916-SSLHonorCipherOrder.patch |
Patch2: e-smith-apache-2.6.0-bz10916-SSLHonorCipherOrder.patch |
16 |
Patch3: e-smith-apache-2.6.0-bz10459-Ciphers-and-TLS.patch |
Patch3: e-smith-apache-2.6.0-bz10459-Ciphers-and-TLS.patch |
17 |
Patch4: e-smith-apache-2.6.0-bz10867-remove-php3-refs.patch |
Patch4: e-smith-apache-2.6.0-bz10867-remove-php3-refs.patch |
18 |
|
Patch5: e-smith-apache-2.6.0-bz10966-remove-hardcoded-ports.patch |
19 |
|
Patch6: e-smith-apache-2.6.0-bz8693-SNI.patch |
20 |
|
Patch7: e-smith-apache-2.6.0-bz11123-bz11111-systemd-update.patch |
21 |
|
Patch8: e-smith-apache-2.6.0-bz10826-defaultSSLCert-if-file-does-not-exist.patch |
22 |
|
Patch9: e-smith-apache-2.6.0-bz11551-httpsForceLocalOnly.patch |
23 |
|
Patch10: e-smith-apache-2.6.0-bz11760-moremodules.patch |
24 |
|
Patch11: e-smith-apache-2.6.0-bz11867.patch |
25 |
|
Patch12: e-smith-apache-2.6.0-bz9375-Require.patch |
26 |
|
|
27 |
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot |
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot |
28 |
BuildArchitectures: noarch |
BuildArchitectures: noarch |
35 |
Obsoletes: mod_auth_external |
Obsoletes: mod_auth_external |
36 |
Obsoletes: e-smith-proxypass |
Obsoletes: e-smith-proxypass |
37 |
Obsoletes: e-smith-apache-proxy |
Obsoletes: e-smith-apache-proxy |
38 |
Conflicts: e-smith-ibays < 1.0.2 |
# for the new httpd 2.4 syntax |
39 |
|
Conflicts: e-smith-ibays < 2.6.0-19 |
40 |
|
Conflicts: smeserver-horde < 1.0.0-32 |
41 |
|
Conflicts: smeserver-php < 3.0.0-43 |
42 |
|
Conflicts: e-smith-proxy < 5.6.0-11 |
43 |
|
Conflicts: e-smith-manager < 2.8.0-36 |
44 |
AutoReqProv: no |
AutoReqProv: no |
45 |
BuildRequires: e-smith-devtools >= 1.11.0-12 |
BuildRequires: e-smith-devtools >= 1.11.0-12 |
46 |
|
|
54 |
%patch2 -p1 |
%patch2 -p1 |
55 |
%patch3 -p1 |
%patch3 -p1 |
56 |
%patch4 -p1 |
%patch4 -p1 |
57 |
|
%patch5 -p1 |
58 |
|
%patch6 -p1 |
59 |
|
%patch7 -p1 |
60 |
|
rm -rf root/var/service/ root/service/ root/etc/rc.d/init.d/httpd-e-smith |
61 |
|
%patch8 -p1 |
62 |
|
%patch9 -p1 |
63 |
|
%patch10 -p1 |
64 |
|
%patch11 -p1 |
65 |
|
%patch12 -p1 |
66 |
|
|
67 |
%build |
%build |
68 |
perl createlinks |
perl createlinks |
72 |
(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) |
(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) |
73 |
|
|
74 |
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ |
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ |
75 |
|
--file /sbin/e-smith/systemd/httpd-e-smith-prepare 'attr(0554,root,root)' \ |
76 |
--dir /var/service/httpd-e-smith 'attr(01755,root,root)' \ |
--dir /var/service/httpd-e-smith 'attr(01755,root,root)' \ |
77 |
--file /var/service/httpd-e-smith/down 'attr(0644,root,root)' \ |
--file /var/service/httpd-e-smith/down 'attr(0644,root,root)' \ |
78 |
--file /var/service/httpd-e-smith/run 'attr(0755,root,root)' \ |
--file /var/service/httpd-e-smith/run 'attr(0755,root,root)' \ |
86 |
%files -f e-smith-%{version}-filelist |
%files -f e-smith-%{version}-filelist |
87 |
%defattr(-,root,root) |
%defattr(-,root,root) |
88 |
|
|
89 |
|
%pre |
90 |
|
# ease the transition between runit and systemd |
91 |
|
if [ $1 -gt 1 ] ; then |
92 |
|
if [ -e /var/service/httpd-e-smith/run ] ; then |
93 |
|
/usr/bin/sv d httpd-e-smith |
94 |
|
fi |
95 |
|
fi |
96 |
|
|
97 |
%changelog |
%changelog |
98 |
|
* Mon Jul 25 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-22.sme |
99 |
|
- reverting last change [SME: 9375] |
100 |
|
- add conflict on older ibays, php, horde, proxy, manager rpms |
101 |
|
|
102 |
|
* Sun Jul 24 2022 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-20.sme |
103 |
|
- removing mod_access_compat [SME: 9375] |
104 |
|
|
105 |
|
* Sat Apr 16 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-19.sme |
106 |
|
- convert httpd 2.2 allow,deny to Require for 2.4 [SME: 9375] |
107 |
|
- use maxsize, not size [SME: 11867] |
108 |
|
|
109 |
|
* Fri Feb 18 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-18.sme |
110 |
|
- use logrotate.d instead of event action [SME: 11867] |
111 |
|
use size to force log rotate before normal delay |
112 |
|
|
113 |
|
* Mon Nov 15 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-16.sme |
114 |
|
- add modules ldap authnz_ldap and proxy_wstunnel [SME: 11760] |
115 |
|
previously provided by webapps-common |
116 |
|
|
117 |
|
* Thu Sep 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-15.sme |
118 |
|
- fix httpd-e-smith failing to start on reboot in private server-gateway mode [SME: 11596] |
119 |
|
|
120 |
|
* Tue Mar 30 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-14.sme |
121 |
|
- add possibility to force https on LAN only [SME: 11511] |
122 |
|
usefull for VPN over port 443 |
123 |
|
|
124 |
|
* Thu Dec 10 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-13.sme |
125 |
|
- prevent httpd to fail if modSSL defined certs does not exist [SME: 10826] |
126 |
|
default on self generated cert |
127 |
|
|
128 |
|
* Wed Dec 09 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-12.sme |
129 |
|
- create-update event [SME: 11123] |
130 |
|
- move httpd-e-smith to systemd [SME: 11111] |
131 |
|
changed sigusr1 used in events to reload as defined in the unit file |
132 |
|
- give a logger to httpd-e-smith : journald [SME: 1416] |
133 |
|
|
134 |
|
* Sat Jun 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-11.sme |
135 |
|
- set default SSLStrictSNIVHostCheck to off [SME: 8693] |
136 |
|
|
137 |
|
* Sat Jun 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-10.sme |
138 |
|
- add SNI support for individual certificates per VirtualHosts [SME: 8693] |
139 |
|
|
140 |
|
* Sat Jun 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-9.sme |
141 |
|
- port 80 and 443 should not be hardcoded [SME: 9192] |
142 |
|
- e-smith-apache removing hardcoded ports [SME: 10966] |
143 |
|
|
144 |
* Tue Jun 23 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-8.sme |
* Tue Jun 23 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-8.sme |
145 |
- remove php3 and php4 refs [SME: 10867] |
- remove php3 and php4 refs [SME: 10867] |
146 |
|
|