Cleanup

[ihttpd] / SPECS / ihttpd.spec

diff --git a/SPECS/ihttpd.spec b/SPECS/ihttpd.spec
index a7c4ff7f71038e6497dd1ab0d087442300b2d36d..a8062446de6d5af8726c61d629dd79e07cad9e66 100644 (file)
--- a/SPECS/ihttpd.spec
+++ b/SPECS/ihttpd.spec
@@ -5,8 +5,8 @@
 %{?!serverlimit:%global serverlimit 1024}
 
 Name:          ihttpd
-Version:       2.4.20
-Release:       %mkrel 2
+Version:       2.4.38
+Release:       %mkrel 6
 Summary:       The most widely used Web server on the Internet
 License:       Apache License
 Group:         System/Servers
@@ -14,7 +14,6 @@ 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
@@ -29,19 +28,19 @@ Patch6:             httpd-2.4.3-apctl-systemd.patch
 Patch7:                httpd-2.4.10-detect-systemd.patch
 # Features/functional changes
 Patch20:       httpd-2.4.3-release.patch
-Patch23:       httpd-2.4.4-export.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.17-socket-activation.patch
-Patch35:       httpd-2.4.17-sslciphdefault.patch
+#Patch31:      httpd-2.4.18-sslmultiproxy.patch
+Patch34:       httpd-2.4.33-socket-activation.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
-Patch57:       httpd-2.4.10-sigint.patch
+#Patch55:      httpd-2.4.4-malformed-host.patch
+#Patch56:      httpd-2.4.4-mod_unique_id.patch
+#Patch57:      httpd-2.4.10-sigint.patch
 
 # For /var/www/html
 Requires:      webserver-base
@@ -53,6 +52,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
@@ -70,18 +71,18 @@ This version of apache is fully static, and few modules are available built-in.
 %patch6 -p1 -b .apctlsystemd
 %patch7 -p1 -b .detectsystemd
 
-%patch23 -p1 -b .export
+#%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
+#%patch31 -p1 -b .sslmultiproxy
 %patch34 -p1 -b .socketactivation
-%patch35 -p1 -b .sslciphdefault
+#%patch35 -p1 -b .sslciphdefault
 
-%patch55 -p1 -b .malformedhost
-%patch56 -p1 -b .uniqueid
-%patch57 -p1 -b .sigint
+#%patch55 -p1 -b .malformedhost
+#%patch56 -p1 -b .uniqueid
+#%patch57 -p1 -b .sigint
 
 # Patch in vendor/release string
 sed "s/@RELEASE@/%{product_distribution}/" < %{PATCH20} | patch -p1
@@ -176,9 +177,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
 
@@ -195,17 +193,15 @@ install -D -p -m 644 %{SOURCE15} %{buildroot}%{_prefix}/lib/%{name}/
 install -D -p -m 644 %{SOURCE16} %{buildroot}%{_prefix}/lib/%{name}/
 
 
-%find_lang %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
 %{_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}