/[smeserver]/rpms/e-smith-apache/sme10/e-smith-apache.spec

Diff of /rpms/e-smith-apache/sme10/e-smith-apache.spec

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-Revision 1.3 by stephdl,
Sat Feb  6 08:53:30 2016 UTC
+Revision 1.17 by jpp,
Tue Mar 30 23:05:16 2021 UTC
 Line 1
- # $Id: e-smith-apache.spec,v 1.2 2016/02/06 08:36:07 stephdl Exp $
+ # $Id: e-smith-apache.spec,v 1.16 2020/12/11 03:28:37 jpp Exp $
  Summary: e-smith server and gateway - apache module
  %define name e-smith-apache
  Name: %{name}
- %define version 2.6.1
+ %define version 2.6.0
- %define release 2
+ %define release 14
  Version: %{version}
  Release: %{release}%{?dist}
  License: GPL
  Group: Networking/Daemons
  Source: %{name}-%{version}.tar.xz
+ Patch0: e-smith-apache-2.6.0-httpd24.patch
+ Patch1: e-smith-apache-2.6.0-bz9591-iconspath.patch
+ Patch2: e-smith-apache-2.6.0-bz10916-SSLHonorCipherOrder.patch
+ Patch3: e-smith-apache-2.6.0-bz10459-Ciphers-and-TLS.patch
+ Patch4: e-smith-apache-2.6.0-bz10867-remove-php3-refs.patch
+ Patch5: e-smith-apache-2.6.0-bz10966-remove-hardcoded-ports.patch
+ Patch6: e-smith-apache-2.6.0-bz8693-SNI.patch
+ Patch7: e-smith-apache-2.6.0-bz11123-bz11111-systemd-update.patch
+ Patch8: e-smith-apache-2.6.0-bz10826-defaultSSLCert-if-file-does-not-exist.patch
+ Patch9: e-smith-apache-2.6.0-bz11551-httpsForceLocalOnly.patch
  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
  BuildArchitectures: noarch
  Requires: e-smith-base >= 4.15.1
-Line 28 
 BuildRequires: e-smith-devtools >= 1.11.
+Line 39 
 BuildRequires: e-smith-devtools >= 1.11.
  %description
  e-smith server and gateway software - apache module.
+ %prep
+ %setup
+ %patch0 -p1
+ %patch1 -p1
+ %patch2 -p1
+ %patch3 -p1
+ %patch4 -p1
+ %patch5 -p1
+ %patch6 -p1
+ %patch7 -p1
+ rm -rf  root/var/service/ root/service/ root/etc/rc.d/init.d/httpd-e-smith
+ %patch8 -p1
+ %patch9 -p1
+ %build
+ perl createlinks
+ %install
+ rm -rf $RPM_BUILD_ROOT
+ (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
+ /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
+     --file /sbin/e-smith/systemd/httpd-e-smith-prepare 'attr(0554,root,root)' \
+     --dir /var/service/httpd-e-smith 'attr(01755,root,root)' \
+     --file /var/service/httpd-e-smith/down 'attr(0644,root,root)' \
+     --file /var/service/httpd-e-smith/run 'attr(0755,root,root)' \
+     > e-smith-%{version}-filelist
+ echo "%doc COPYING"          >> e-smith-%{version}-filelist
+ %clean
+ rm -rf $RPM_BUILD_ROOT
+ %files -f e-smith-%{version}-filelist
+ %defattr(-,root,root)
+ %pre
+ # ease the transition between runit and systemd
+ if [ $1 -gt 1 ] ; then
+   if [ -e /var/service/httpd-e-smith/run ] ; then
+        /usr/bin/sv d httpd-e-smith
+   fi
+ fi
  %changelog
- * Sat Feb 6 2016 stephane de Labrusse <stephdl@de-labrusse.fr>  2.6.1-2.sme
+ * Tue Mar 30 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-14.sme
- - Corrected the problem of hard symlink in archive by a symlink creation
+ - add possibility to force https on LAN only [SME: 11511]
- - in the createlinks [SME: 9215]
+   usefull for VPN over port 443
+ * Thu Dec 10 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-13.sme
+ - prevent httpd to fail if modSSL defined certs does not exist [SME: 10826]
+   default on self generated cert
+ * Wed Dec 09 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-12.sme
+ - create-update event [SME: 11123]
+ - move httpd-e-smith to systemd [SME: 11111]
+   changed sigusr1 used in events to reload as defined in the unit file
+ - give a logger to httpd-e-smith : journald [SME: 1416]
+ * Sat Jun 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-11.sme
+ - set default SSLStrictSNIVHostCheck to off [SME: 8693]
+ * Sat Jun 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-10.sme
+ - add SNI support for individual certificates per VirtualHosts [SME: 8693]
+ * Sat Jun 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-9.sme
+ - port 80 and 443 should not be hardcoded [SME: 9192]
+ - e-smith-apache removing hardcoded ports [SME: 10966]
+ * Tue Jun 23 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-8.sme
+ - remove php3 and php4 refs [SME: 10867]
+ * Fri May 01 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-7.sme
+ - disable TLSv1 TLSv1.1 by default [SME: 10459]
+   * put strong ciphers first in default string
+   * cipher order and properties with periods
+ * Fri May 01 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-4.sme
+ - add SSLHonorCipherOrder Directive  [SME: 10916]
+ * Tue Dec 10 2019 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-3.sme
+ - update apache icon path [SME: 9591]
+ * Wed Mar 23 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-2.sme
+ - fix syntax preventing httpd to launch [SME: 9364]
+ - moved changelog at end of file
  * Thu Feb 4 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-1.sme
  - Roll new stream for sme10
-Line 599 
 e-smith server and gateway software - ap
+Line 692 
 e-smith server and gateway software - ap
  - [0.1.0-01]
  - Initial release, split out from e-smith-base [markk 6428]
- %prep
- %setup
- %build
- perl createlinks
- %install
- rm -rf $RPM_BUILD_ROOT
- (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
- /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
-     --dir /var/service/httpd-e-smith 'attr(01755,root,root)' \
-     --file /var/service/httpd-e-smith/down 'attr(0644,root,root)' \
-     --file /var/service/httpd-e-smith/run 'attr(0755,root,root)' \
-     > e-smith-%{version}-filelist
- echo "%doc COPYING"          >> e-smith-%{version}-filelist
- %clean
- rm -rf $RPM_BUILD_ROOT
- %files -f e-smith-%{version}-filelist
- %defattr(-,root,root)

 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
-Removed lines/characters
+Added lines/characters

admin@koozali.org	ViewVC Help
Powered by ViewVC 1.2.1