Update to new version

[ihttpd] / SPECS / ihttpd.spec

diff --git a/SPECS/ihttpd.spec b/SPECS/ihttpd.spec
index 15729b10a14418333eb27285390b679f7a85cb9f..693e93afc842b9bf3f9e09779ebac58b73278737 100644 (file)
--- a/SPECS/ihttpd.spec
+++ b/SPECS/ihttpd.spec
@@ -5,8 +5,8 @@
 %{?!serverlimit:%global serverlimit 1024}
 
 Name:          ihttpd
 %{?!serverlimit:%global serverlimit 1024}
 
 Name:          ihttpd

-Version:       2.4.33
-Release:       %mkrel 5
+Version:       2.4.38
+Release:       %mkrel 6

 Summary:       The most widely used Web server on the Internet
 License:       Apache License
 Group:         System/Servers
 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
 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
 Source15:      ihttpd.service
 Source16:      debug-sshd.service
 Source18:      ihttpd.dracut


@@ -31,13 +30,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
 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
 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
 # Bug fixes
 #Patch55:      httpd-2.4.4-malformed-host.patch
 #Patch56:      httpd-2.4.4-mod_unique_id.patch


@@ -53,6 +52,8 @@ Requires(post):       rpm-helper >= 0.24.8-1
 Requires(post):        openssl makedev
 Requires(preun):       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
 %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 +73,12 @@ This version of apache is fully static, and few modules are available built-in.
 
 #%patch23 -p1 -b .export
 %patch24 -p1 -b .corelimit
 
 #%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
 %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
 
 #%patch55 -p1 -b .malformedhost
 #%patch56 -p1 -b .uniqueid


@@ -135,7 +136,7 @@ export LDFLAGS="-Wl,-z,relro,-z,now"
 # Hard-code path to links to avoid unnecessary builddep
 export LYNX_PATH=/usr/bin/links
 
 # Hard-code path to links to avoid unnecessary builddep
 export LYNX_PATH=/usr/bin/links
 

-%configure2_5x \
+%configure \

        --enable-layout=IHttpd \
        --sysconfdir='/etc' \
        --includedir='/usr/include/ihttpd' \
        --enable-layout=IHttpd \
        --sysconfdir='/etc' \
        --includedir='/usr/include/ihttpd' \


@@ -166,7 +167,7 @@ export LYNX_PATH=/usr/bin/links
        --enable-modules=none \
        --enable-mods-static='unixd auth_basic authn_core authn_file authz_core authz_host authz_user rewrite socache_shmcb dir mime log_config cgi ssl'
 
        --enable-modules=none \
        --enable-mods-static='unixd auth_basic authn_core authn_file authz_core authz_host authz_user rewrite socache_shmcb dir mime log_config cgi ssl'
 

-%make
+%make_build

 
 export CFLAGS="$RPM_OPT_FLAGS"
 gcc index.bin.c -o index.bin
 
 export CFLAGS="$RPM_OPT_FLAGS"
 gcc index.bin.c -o index.bin


@@ -176,9 +177,6 @@ gcc index.bin.c -o index.bin
 #IHttpd sbin
 install -D -p -m 755 ihttpd %{buildroot}%{_sbindir}/ihttpd
 
 #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
 
 #IHttpd dracut config
 install -D -p -m 644 %{SOURCE18} %{buildroot}%{_sysconfdir}/dracut.conf.d/99-%{name}.conf
 


@@ -198,14 +196,12 @@ install -D -p -m 644 %{SOURCE16} %{buildroot}%{_prefix}/lib/%{name}/
 #%find_lang %name
 
 %post
 #%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}
 %_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}
 %dir %{_prefix}/lib/dracut/modules.d/99ihttpd
 %{_prefix}/lib/dracut/modules.d/99ihttpd/module-setup.sh
 %dir %{_prefix}/lib/%{name}