Version 2.4.62

[ihttpd] / SPECS / ihttpd.spec

diff --git a/SPECS/ihttpd.spec b/SPECS/ihttpd.spec
index 7e4170ee80ab24c743663efaf16eb56676d5c473..6c25f8c58faf22082d2d10993826cf092d8666ae 100644 (file)
--- a/SPECS/ihttpd.spec
+++ b/SPECS/ihttpd.spec
@@ -1,16 +1,19 @@
+%global __brp_check_rpaths %{nil}
+%define _disable_ld_no_undefined 1

 # (luigiwalser, ngompa): httpd build hates parallelization
 %define _smp_ncpus_max 8
 %define contentdir %{_datadir}/httpd
 %define docroot /var/www
 # (luigiwalser, ngompa): httpd build hates parallelization
 %define _smp_ncpus_max 8
 %define contentdir %{_datadir}/httpd
 %define docroot /var/www

+%define vstring Mageia

 
 %{?!maxmodules:%global maxmodules 128}
 %{?!serverlimit:%global serverlimit 1024}
 
 Name:          ihttpd
 
 %{?!maxmodules:%global maxmodules 128}
 %{?!serverlimit:%global serverlimit 1024}
 
 Name:          ihttpd

-Version:       2.4.54
+Version:       2.4.62

 Release:       %mkrel 1
 Summary:       The most widely used Web server on the Internet
 Release:       %mkrel 1
 Summary:       The most widely used Web server on the Internet

-License:       Apache License
+License:       ASL 2.0

 Group:         System/Servers
 URL:           http://httpd.apache.org/
 Source0:       http://www.apache.org/dist/httpd/httpd-%version.tar.bz2
 Group:         System/Servers
 URL:           http://httpd.apache.org/
 Source0:       http://www.apache.org/dist/httpd/httpd-%version.tar.bz2


@@ -40,7 +43,7 @@ Patch28:      httpd-2.4.4-r1332643+.patch
 Patch29:       httpd-2.4.27-systemd.patch
 Patch30:       httpd-2.4.4-cachehardmax.patch
 #Patch31:      httpd-2.4.18-sslmultiproxy.patch
 Patch29:       httpd-2.4.27-systemd.patch
 Patch30:       httpd-2.4.4-cachehardmax.patch
 #Patch31:      httpd-2.4.18-sslmultiproxy.patch

-Patch34:       httpd-2.4.17-socket-activation.patch
+Patch34:       httpd-2.4.60-socket-activation.patch

 #Patch35:      httpd-2.4.33-sslciphdefault.patch
 # Bug fixes
 # http://issues.apache.org/bugzilla/show_bug.cgi?id=32524
 #Patch35:      httpd-2.4.33-sslciphdefault.patch
 # Bug fixes
 # http://issues.apache.org/bugzilla/show_bug.cgi?id=32524


@@ -64,9 +67,9 @@ BuildRequires:  libtool >= 1.4.2
 BuildRequires:  multiarch-utils >= 1.0.3
 BuildRequires:  pkgconfig(apr-1) >= 1.7.0-4
 BuildRequires:  pkgconfig(apr-util-1) >= 1.6.1-5
 BuildRequires:  multiarch-utils >= 1.0.3
 BuildRequires:  pkgconfig(apr-1) >= 1.7.0-4
 BuildRequires:  pkgconfig(apr-util-1) >= 1.6.1-5

-BuildRequires:  pkgconfig(libpcre)
+BuildRequires:  pkgconfig(libpcre2-8)

 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(openssl)

-BuildRequires:  pkgconfig(systemd)
+BuildRequires:  pkgconfig(libsystemd)

 BuildRequires:  pkgconfig(zlib)
 
 %description
 BuildRequires:  pkgconfig(zlib)
 
 %description


@@ -79,31 +82,31 @@ This version of apache is fully static, and few modules are available built-in.
 %prep
 %setup -q -n httpd-%{version}
 
 %prep
 %setup -q -n httpd-%{version}
 

-%patch1 -p1 -b .apctl
-%patch2 -p1 -b .apxs
-%patch3 -p1 -b .deplibs
-%patch5 -p1 -b .layout
-%patch6 -p1 -b .apctlsystemd
-%patch7 -p1 -b .detectsystemd
+%patch1 -P 1 -p1 -b .apctl
+%patch2 -P 2 -p1 -b .apxs
+%patch3 -P 3 -p1 -b .deplibs
+%patch5 -P 5 -p1 -b .layout
+%patch6 -P 6 -p1 -b .apctlsystemd
+%patch7 -P 7 -p1 -b .detectsystemd

 
 #Disable in ihttpd to avoid build fail
 
 #Disable in ihttpd to avoid build fail

-#%patch23 -p1 -b .export
-%patch24 -p1 -b .corelimit
-#%patch26 -p1 -b .r1337344+
-%patch27 -p1 -b .icons
-%patch29 -p1 -b .systemd
-%patch30 -p1 -b .cachehardmax
+#%patch23 -P 23 -p1 -b .export
+%patch24 -P 24 -p1 -b .corelimit
+#%patch26 -P 26 -p1 -b .r1337344+
+%patch27 -P 27 -p1 -b .icons
+%patch29 -P 29 -p1 -b .systemd
+%patch30 -P 30 -p1 -b .cachehardmax

 # No longer applies
 # No longer applies

-#%patch31 -p1 -b .sslmultiproxy
-%patch34 -p1 -b .socketactivation
-#%patch35 -p1 -b .sslciphdefault
-#patch44 -p1 -b .luaresume
+#%patch31 -P 31 -p1 -b .sslmultiproxy
+%patch34 -P 34 -p1 -b .socketactivation
+#%patch35 -P 35 -p1 -b .sslciphdefault
+#patch44 -P 44 -p1 -b .luaresume

 
 

-%patch100 -p1 -b .ab_source_address.droplet
-%patch101 -p0 -b .PR45994.droplet
+%patch100 -P 100 -p1 -b .ab_source_address.droplet
+%patch101 -P 101 -p0 -b .PR45994.droplet

 
 # Patch in vendor/release string
 
 # Patch in vendor/release string

-sed "s/@RELEASE@/%{product_distribution}/" < %{PATCH20} | patch -p1
+sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1

 
 # forcibly prevent use of bundled apr, apr-util, pcre
 rm -rf srclib/{apr,apr-util,pcre}
 
 # forcibly prevent use of bundled apr, apr-util, pcre
 rm -rf srclib/{apr,apr-util,pcre}