Version 2.4.57

Sync with production dracut config
Sync with mageia apache spec file

diff --git a/SOURCES/httpd-2.4.54.tar.bz2 b/SOURCES/httpd-2.4.54.tar.bz2
deleted file mode 100644 (file)
index 2b51803..0000000
Binary files a/SOURCES/httpd-2.4.54.tar.bz2 and /dev/null differ

diff --git a/SOURCES/httpd-2.4.57.tar.bz2 b/SOURCES/httpd-2.4.57.tar.bz2
new file mode 100644 (file)
index 0000000..19f1a43
Binary files /dev/null and b/SOURCES/httpd-2.4.57.tar.bz2 differ

diff --git a/SOURCES/httpd-2.4.57.tar.bz2.asc b/SOURCES/httpd-2.4.57.tar.bz2.asc
new file mode 100644 (file)
index 0000000..c15520b
--- /dev/null
+++ b/SOURCES/httpd-2.4.57.tar.bz2.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEZbLUT+dL1ePeOsPwgngd5G1ZVPoFAmQpqJUACgkQgngd5G1Z
+VPrSqhAAge2udhX49FI9zwhoxeCND0dxB/DZ8vWc6MbDryYUYZBA2+o7cvwSRSdZ
+fxghFliJUWDSDD7YFjIrsAKPcjdKS2vn6+vmNRU05dw+JoZuQuyzg9PMuEOo3qRN
+poVd7SsxFhAT3ow6+j2ns3ei+B87BWrgkN6P2A4UNiUKKej+EACL3JnrOGbcPoLa
+ThEdphd5B6qTegw3Sz3aHgJ06833mH5KdrUNXwjmhsZCdgmBORyepjAQFKQChOq6
+JExsk/PTPgy0KX27IWMgrgQohW0zEzr8BtrZsu+DXxuhjen7bKm06uEoYDCR6xF1
+gu/oGBLVuDkktnRfleGUtmXoJ+yVMyz06ILL/ka5Jy3ob8sdWqD37oAcGQJeZYog
+uUnW+FoCmfv6uLRxZbFr2SCr2Jc8cnI45cPpppG0OraBJHHja99W60lInDpjFvHF
+U9Ev+UNU3PwtYuIhwp8tJB61cnQzxyH0Frt5lQfXxPKWTuFY3MSuoNJi1x3IqZvx
+fan2kxN0R0RyvXOhD6eJcQpydRHNDj/zgIo46gL7XRPB4aFBZRPyXwTVejcT6juL
+CHX/AUk18DIlBd+X7wJ115UQg9m6bABrj+Jg6ujoTb62Vstuju3P6XJ/qbCpGQcY
+ZyLOwbFiDD8CMm06ELQixDa9momkXXWH6mH+cEQDkPl+Scz5pf0=
+=qbuf
+-----END PGP SIGNATURE-----

diff --git a/SOURCES/ihttpd.dracut b/SOURCES/ihttpd.dracut
index cbc996fee1ddc71d120699b73bbf778e2247157b..4fa9ed196f0dd150df8aff5489933c37c18233b8 100644 (file)
--- a/SOURCES/ihttpd.dracut
+++ b/SOURCES/ihttpd.dracut
@@ -1,4 +1,4 @@
-# Unomit mageia's omited network and systemd modules
+# Unomit mageia's omited systemd module

 omit_dracutmodules=" network "
 
 # Add various drivers
 omit_dracutmodules=" network "
 
 # Add various drivers

diff --git a/SPECS/ihttpd.spec b/SPECS/ihttpd.spec
index 7e4170ee80ab24c743663efaf16eb56676d5c473..37b08fee1cc960612470f90fd2fd2af0c7ea7114 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.57

 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


@@ -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


@@ -103,7 +106,7 @@ This version of apache is fully static, and few modules are available built-in.
 %patch101 -p0 -b .PR45994.droplet
 
 # Patch in vendor/release string
 %patch101 -p0 -b .PR45994.droplet
 
 # 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}