1 |
# $Id: e-smith-apache.spec,v 1.11 2020/06/23 18:42:24 jpp Exp $ |
# $Id: e-smith-apache.spec,v 1.14 2020/06/27 20:46:34 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 12 |
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 |
|
|
22 |
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot |
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot |
23 |
BuildArchitectures: noarch |
BuildArchitectures: noarch |
45 |
%patch3 -p1 |
%patch3 -p1 |
46 |
%patch4 -p1 |
%patch4 -p1 |
47 |
%patch5 -p1 |
%patch5 -p1 |
48 |
|
%patch6 -p1 |
49 |
|
%patch7 -p1 |
50 |
|
rm -rf root/var/service/ root/service/ root/etc/rc.d/init.d/httpd-e-smith |
51 |
|
|
52 |
%build |
%build |
53 |
perl createlinks |
perl createlinks |
57 |
(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) |
(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) |
58 |
|
|
59 |
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ |
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ |
60 |
|
--file /sbin/e-smith/systemd/httpd-e-smith-prepare 'attr(0554,root,root)' \ |
61 |
--dir /var/service/httpd-e-smith 'attr(01755,root,root)' \ |
--dir /var/service/httpd-e-smith 'attr(01755,root,root)' \ |
62 |
--file /var/service/httpd-e-smith/down 'attr(0644,root,root)' \ |
--file /var/service/httpd-e-smith/down 'attr(0644,root,root)' \ |
63 |
--file /var/service/httpd-e-smith/run 'attr(0755,root,root)' \ |
--file /var/service/httpd-e-smith/run 'attr(0755,root,root)' \ |
71 |
%files -f e-smith-%{version}-filelist |
%files -f e-smith-%{version}-filelist |
72 |
%defattr(-,root,root) |
%defattr(-,root,root) |
73 |
|
|
74 |
|
%pre |
75 |
|
# ease the transition between runit and systemd |
76 |
|
if [ $1 -gt 1 ] ; then |
77 |
|
if [ -e /var/service/httpd-e-smith/run ] ; then |
78 |
|
/usr/bin/sv d httpd-e-smith |
79 |
|
fi |
80 |
|
fi |
81 |
|
|
82 |
%changelog |
%changelog |
83 |
|
* Wed Dec 09 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-12.sme |
84 |
|
- create-update event [SME: 11123] |
85 |
|
- move httpd-e-smith to systemd [SME: 11111] |
86 |
|
changed sigusr1 used in events to reload as defined in the unit file |
87 |
|
- give a logger to httpd-e-smith : journald [SME: 1416] |
88 |
|
|
89 |
|
* Sat Jun 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-11.sme |
90 |
|
- set default SSLStrictSNIVHostCheck to off [SME: 8693] |
91 |
|
|
92 |
|
* Sat Jun 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-10.sme |
93 |
|
- add SNI support for individual certificates per VirtualHosts [SME: 8693] |
94 |
|
|
95 |
* 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 |
96 |
- port 80 and 443 should not be hardcoded [SME: 9192] |
- port 80 and 443 should not be hardcoded [SME: 9192] |
97 |
- e-smith-apache removing hardcoded ports [SME: 10966] |
- e-smith-apache removing hardcoded ports [SME: 10966] |