1 |
# $Id: e-smith-apache.spec,v 1.11 2020/06/23 18:42:24 jpp Exp $ |
# $Id: e-smith-apache.spec,v 1.17 2021/03/30 23:05:16 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 9 |
%define release 15 |
8 |
Version: %{version} |
Version: %{version} |
9 |
Release: %{release}%{?dist} |
Release: %{release}%{?dist} |
10 |
License: GPL |
License: GPL |
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 |
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 |
|
|
24 |
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot |
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot |
25 |
BuildArchitectures: noarch |
BuildArchitectures: noarch |
47 |
%patch3 -p1 |
%patch3 -p1 |
48 |
%patch4 -p1 |
%patch4 -p1 |
49 |
%patch5 -p1 |
%patch5 -p1 |
50 |
|
%patch6 -p1 |
51 |
|
%patch7 -p1 |
52 |
|
rm -rf root/var/service/ root/service/ root/etc/rc.d/init.d/httpd-e-smith |
53 |
|
%patch8 -p1 |
54 |
|
%patch9 -p1 |
55 |
|
|
56 |
%build |
%build |
57 |
perl createlinks |
perl createlinks |
61 |
(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) |
(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) |
62 |
|
|
63 |
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ |
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ |
64 |
|
--file /sbin/e-smith/systemd/httpd-e-smith-prepare 'attr(0554,root,root)' \ |
65 |
--dir /var/service/httpd-e-smith 'attr(01755,root,root)' \ |
--dir /var/service/httpd-e-smith 'attr(01755,root,root)' \ |
66 |
--file /var/service/httpd-e-smith/down 'attr(0644,root,root)' \ |
--file /var/service/httpd-e-smith/down 'attr(0644,root,root)' \ |
67 |
--file /var/service/httpd-e-smith/run 'attr(0755,root,root)' \ |
--file /var/service/httpd-e-smith/run 'attr(0755,root,root)' \ |
75 |
%files -f e-smith-%{version}-filelist |
%files -f e-smith-%{version}-filelist |
76 |
%defattr(-,root,root) |
%defattr(-,root,root) |
77 |
|
|
78 |
|
%pre |
79 |
|
# ease the transition between runit and systemd |
80 |
|
if [ $1 -gt 1 ] ; then |
81 |
|
if [ -e /var/service/httpd-e-smith/run ] ; then |
82 |
|
/usr/bin/sv d httpd-e-smith |
83 |
|
fi |
84 |
|
fi |
85 |
|
|
86 |
%changelog |
%changelog |
87 |
|
* Thu Sep 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-15.sme |
88 |
|
- fix httpd-e-smith failing to start on reboot in private server-gateway mode [SME: 11596] |
89 |
|
|
90 |
|
* Tue Mar 30 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-14.sme |
91 |
|
- add possibility to force https on LAN only [SME: 11511] |
92 |
|
usefull for VPN over port 443 |
93 |
|
|
94 |
|
* Thu Dec 10 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-13.sme |
95 |
|
- prevent httpd to fail if modSSL defined certs does not exist [SME: 10826] |
96 |
|
default on self generated cert |
97 |
|
|
98 |
|
* Wed Dec 09 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-12.sme |
99 |
|
- create-update event [SME: 11123] |
100 |
|
- move httpd-e-smith to systemd [SME: 11111] |
101 |
|
changed sigusr1 used in events to reload as defined in the unit file |
102 |
|
- give a logger to httpd-e-smith : journald [SME: 1416] |
103 |
|
|
104 |
|
* Sat Jun 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-11.sme |
105 |
|
- set default SSLStrictSNIVHostCheck to off [SME: 8693] |
106 |
|
|
107 |
|
* Sat Jun 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-10.sme |
108 |
|
- add SNI support for individual certificates per VirtualHosts [SME: 8693] |
109 |
|
|
110 |
* Sat Jun 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-9.sme |
* Sat Jun 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-9.sme |
111 |
- port 80 and 443 should not be hardcoded [SME: 9192] |
- port 80 and 443 should not be hardcoded [SME: 9192] |
112 |
- e-smith-apache removing hardcoded ports [SME: 10966] |
- e-smith-apache removing hardcoded ports [SME: 10966] |