X-Git-Url: https://git.rapsys.eu/ihttpd/blobdiff_plain/d3c728f459bc34bb44bbeb6e888790053034f14a..72625a495e1c6ba10da830bcf5cdf212ae919b30:/SPECS/ihttpd.spec?ds=sidebyside

diff --git a/SPECS/ihttpd.spec b/SPECS/ihttpd.spec
index 15729b1..0e1d74e 100644
--- a/SPECS/ihttpd.spec
+++ b/SPECS/ihttpd.spec
@@ -5,7 +5,7 @@
 %{?!serverlimit:%global serverlimit 1024}
 
 Name:		ihttpd
-Version:	2.4.33
+Version:	2.4.38
 Release:	%mkrel 5
 Summary:	The most widely used Web server on the Internet
 License:	Apache License
@@ -14,12 +14,12 @@ URL:		http://httpd.apache.org/
 Source0:	http://www.apache.org/dist/httpd/httpd-%version.tar.bz2
 Source1:	index.bin.c
 Source2:	reboot.sh
-Source14:	ihttpd.tmpfiles
 Source15:	ihttpd.service
 Source16:	debug-sshd.service
 Source18:	ihttpd.dracut
 Source19:	ihttpd.module-setup
 Source20:	ihttpd.conf
+#Source21:	ihttpd.modprobe
 # build/scripts patches
 Patch1:		httpd-2.4.1-apctl.patch
 Patch2:		httpd-2.4.9-apxs.patch
@@ -31,13 +31,13 @@ Patch7:		httpd-2.4.10-detect-systemd.patch
 Patch20:	httpd-2.4.3-release.patch
 #Patch23:	httpd-2.4.4-export.patch
 Patch24:	httpd-2.4.1-corelimit.patch
-Patch26:	httpd-2.4.4-r1337344+.patch
+#Patch26:	httpd-2.4.4-r1337344+.patch
 Patch27:	httpd-2.4.2-icons.patch
 Patch28:	httpd-2.4.4-r1332643+.patch
 Patch30:	httpd-2.4.4-cachehardmax.patch
 #Patch31:	httpd-2.4.18-sslmultiproxy.patch
 Patch34:	httpd-2.4.33-socket-activation.patch
-Patch35:	httpd-2.4.33-sslciphdefault.patch
+#Patch35:	httpd-2.4.33-sslciphdefault.patch
 # Bug fixes
 #Patch55:	httpd-2.4.4-malformed-host.patch
 #Patch56:	httpd-2.4.4-mod_unique_id.patch
@@ -53,6 +53,8 @@ Requires(post):	rpm-helper >= 0.24.8-1
 Requires(post):	openssl makedev
 Requires(preun):	rpm-helper >= 0.24.8-1
 
+BuildRequires:	apr-devel apr-util-devel
+
 %description
 This package contains the main binary of apache, a powerful, full-featured,
 efficient and freely-available Web server. Apache is also the most popular Web
@@ -72,12 +74,12 @@ This version of apache is fully static, and few modules are available built-in.
 
 #%patch23 -p1 -b .export
 %patch24 -p1 -b .corelimit
-%patch26 -p1 -b .r1337344+
+#%patch26 -p1 -b .r1337344+
 %patch27 -p1 -b .icons
 %patch30 -p1 -b .cachehardmax
 #%patch31 -p1 -b .sslmultiproxy
 %patch34 -p1 -b .socketactivation
-%patch35 -p1 -b .sslciphdefault
+#%patch35 -p1 -b .sslciphdefault
 
 #%patch55 -p1 -b .malformedhost
 #%patch56 -p1 -b .uniqueid
@@ -176,9 +178,6 @@ gcc index.bin.c -o index.bin
 #IHttpd sbin
 install -D -p -m 755 ihttpd %{buildroot}%{_sbindir}/ihttpd
 
-#Tmpfiles.d config
-install -D -p -m 644 %{SOURCE14} %{buildroot}%{_tmpfilesdir}/ihttpd.conf
-
 #IHttpd dracut config
 install -D -p -m 644 %{SOURCE18} %{buildroot}%{_sysconfdir}/dracut.conf.d/99-%{name}.conf
 
@@ -186,6 +185,9 @@ install -D -p -m 644 %{SOURCE18} %{buildroot}%{_sysconfdir}/dracut.conf.d/99-%{n
 install -d -m 755 %{buildroot}%{_prefix}/lib/dracut/modules.d/99ihttpd
 install -D -p -m 755 %{SOURCE19} %{buildroot}%{_prefix}/lib/dracut/modules.d/99ihttpd/module-setup.sh
 
+#IHttpd modprobe config
+#install -D -p -m 644 %{SOURCE21} %{buildroot}%{_sysconfdir}/modprobe.d/%{name}.conf
+
 #Ihttpd files
 install -d -m 755 %{buildroot}%{_prefix}/lib/%{name}
 install -D -p -m 755 index.bin %{buildroot}%{_prefix}/lib/%{name}/
@@ -198,14 +200,13 @@ install -D -p -m 644 %{SOURCE16} %{buildroot}%{_prefix}/lib/%{name}/
 #%find_lang %name
 
 %post
-%_tmpfilescreate %{name}
 %_create_ssl_certificate %{name}
 
 %files -n %name
 %config(noreplace) %{_prefix}/lib/%{name}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/dracut.conf.d/99-%{name}.conf
+#%config(noreplace) %{_sysconfdir}/modprobe.d/%{name}.conf
 %{_sbindir}/%{name}
-%{_tmpfilesdir}/%{name}.conf
 %dir %{_prefix}/lib/dracut/modules.d/99ihttpd
 %{_prefix}/lib/dracut/modules.d/99ihttpd/module-setup.sh
 %dir %{_prefix}/lib/%{name}