Merge "CentOS 8: Upgrade lighttpd to version 1.4.54-4" into f/centos8

2020-02-12 15:41:08 +00:00 · 2020-02-12 15:41:08 +00:00 · 73767011e3
commit 73767011e3
parent 6cf6e96910 ff5a840952
7 changed files with 59 additions and 78 deletions
--- a/base/lighttpd/centos/build_srpm.data
+++ b/base/lighttpd/centos/build_srpm.data
@ -1 +1 @@
-TIS_PATCH_VER=7
+TIS_PATCH_VER=1
--- a/base/lighttpd/centos/meta_patches/Update-package-versioning-for-TIS-format.patch
+++ b/base/lighttpd/centos/meta_patches/Update-package-versioning-for-TIS-format.patch
@ -1,27 +1,25 @@
 From 1c4a8d83d96eab943d1cb7b4f0d9b7175e6858f1 Mon Sep 17 00:00:00 2001
 From: Scott Little <scott.little@windriver.com>
 Date: Mon, 20 Mar 2017 10:21:28 -0400
-Subject: [PATCH] WRS: 0001-Update-package-versioning-for-TIS-format.patch
+Subject: [PATCH 2/4] Update-package-versioning-for-TIS-format.patch

-Conflicts:
-	SPECS/lighttpd.spec
 ---
 SPECS/lighttpd.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/SPECS/lighttpd.spec b/SPECS/lighttpd.spec
-index 2f7b261..2553b27 100644
+index 20c4503..3280403 100644
 --- a/SPECS/lighttpd.spec
 +++ b/SPECS/lighttpd.spec
-@@ -46,7 +46,7 @@
+@@ -44,7 +44,7 @@
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
 Version: 1.4.54
-Release: 1%{?dist}
-+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
+-Release: 4%{?dist}
+Release: 4.el8%{?_tis_dist}.%{tis_patch_ver}
 License: BSD
- Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
+ Source0: http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-%{version}.tar.gz
 -- 
-2.7.4
+2.17.1

--- a/base/lighttpd/centos/meta_patches/meta_add_support_for_tpm.patch
+++ b/base/lighttpd/centos/meta_patches/meta_add_support_for_tpm.patch
@ -1,32 +1,31 @@
 From 2cfc139ffabdb52c82834be2f88333f99c181677 Mon Sep 17 00:00:00 2001
 From: Kam Nasim <kam.nasim@windriver.com>
 Date: Tue, 28 Mar 2017 17:33:34 -0400
-Subject: [PATCH] Adding support for TPM 2.0
-
+Subject: [PATCH 4/4] Adding support for TPM 2.0
 ---
 SPECS/lighttpd.spec | 2 ++
 1 file changed, 2 insertions(+)

 diff --git a/SPECS/lighttpd.spec b/SPECS/lighttpd.spec
-index c27f78f..bc11989 100644
+index fb0e5f9..7205133 100644
 --- a/SPECS/lighttpd.spec
 +++ b/SPECS/lighttpd.spec
-@@ -76,6 +76,7 @@ Patch3: lighttpd-1.4.39-socket.patch
+@@ -62,6 +62,7 @@ Patch0: lighttpd-1.4.54-defaultconf.patch
 
- # WRS Patches
+ # STX Patches
 Patch100: check-content-length.patch
 +Patch101: lighttpd-tpm-support.patch
 
- BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
- # For the target poweredby.png image (skip requirement + provide image on EL5)
-@@ -191,6 +192,7 @@ Authentication module for lighttpd that uses PAM.
+ Requires: system-logos
+ Requires: %{name}-filesystem
+@@ -163,6 +164,7 @@ for the directories.
 
- # WRS Patches
+ # STX Patches
 %patch100 -p1 -b .content_length
 +%patch101 -p1 -b .tpm_support
 
- #install -p -m 0644 %{SOURCE100} src/mod_geoip.c
- #install -p -m 0644 %{SOURCE101} mod_geoip.txt
+ %build
+ autoreconf -if
 -- 
-2.7.4
+2.17.1

--- a/base/lighttpd/centos/meta_patches/spec-check-content-length.patch
+++ b/base/lighttpd/centos/meta_patches/spec-check-content-length.patch
@ -1,40 +1,37 @@
 From 730a5321581e70790da4e94085698fd299072be5 Mon Sep 17 00:00:00 2001
 From: Scott Little <scott.little@windriver.com>
 Date: Mon, 20 Mar 2017 10:21:28 -0400
-Subject: [PATCH] WRS: spec-check-content-length.patch
+Subject: [PATCH 3/4] spec-check-content-length.patch

-Conflicts:
-	SPECS/lighttpd.spec
 ---
- SPECS/lighttpd.spec | 8 ++++++++
- 1 file changed, 8 insertions(+)
+ SPECS/lighttpd.spec | 7 +++++++
+ 1 file changed, 7 insertions(+)

 diff --git a/SPECS/lighttpd.spec b/SPECS/lighttpd.spec
-index 2553b27..c27f78f 100644
+index 3280403..fb0e5f9 100644
 --- a/SPECS/lighttpd.spec
 +++ b/SPECS/lighttpd.spec
-@@ -73,6 +73,10 @@ Patch3: lighttpd-1.4.39-socket.patch
- #Patch7: lighttpd-1.4.42-bignum.patch
- #Patch8: lighttpd-1.4.43-mysql.patch
- #Patch9:  lighttpd-1.4.48-autoconf.patch
+@@ -59,6 +59,10 @@ Source13: http://www.lighttpd.net/light_logo.png
+ Source14: lighttpd-empty.png
+ 
+ Patch0: lighttpd-1.4.54-defaultconf.patch
 +
-+# WRS Patches
+# STX Patches
 +Patch100: check-content-length.patch
 +
- BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
- # For the target poweredby.png image (skip requirement + provide image on EL5)
- %if %{with systemlogos}
-@@ -184,6 +188,10 @@ Authentication module for lighttpd that uses PAM.
- #%patch7 -p0 -b .bignum
- #%patch8 -p0 -b .mysql
- #%patch9 -p0 -b .autoconf
-+
-+# WRS Patches
+ Requires: system-logos
+ Requires: %{name}-filesystem
+ %if %{with systemd}
+@@ -157,6 +161,9 @@ for the directories.
+ %setup -q
+ %patch0 -p0 -b .defaultconf
+ 
+# STX Patches
 +%patch100 -p1 -b .content_length
 +
- #install -p -m 0644 %{SOURCE100} src/mod_geoip.c
- #install -p -m 0644 %{SOURCE101} mod_geoip.txt
- 
+ %build
+ autoreconf -if
+ %configure \
 -- 
-2.7.4
+2.17.1

--- a/base/lighttpd/centos/meta_patches/spec-include-TiS-changes.patch
+++ b/base/lighttpd/centos/meta_patches/spec-include-TiS-changes.patch
@ -1,25 +1,25 @@
 From 8f91c53ae95b97e12d4a7b16fac8f3d5195ccd52 Mon Sep 17 00:00:00 2001
 From: Scott Little <scott.little@windriver.com>
 Date: Mon, 20 Mar 2017 10:21:28 -0400
-Subject: [PATCH 1/4] WRS: spec-include-TiS-changes.patch
+Subject: [PATCH 1/4] spec-include-TiS-changes.patch

 ---
- SPECS/lighttpd.spec | 29 ++++++++++++++---------------
- 1 file changed, 14 insertions(+), 15 deletions(-)
+ SPECS/lighttpd.spec | 27 ++++++++++++++-------------
+ 1 file changed, 14 insertions(+), 13 deletions(-)

 diff --git a/SPECS/lighttpd.spec b/SPECS/lighttpd.spec
-index de52e46..7acdc84 100644
+index b5517e4..20c4503 100644
 --- a/SPECS/lighttpd.spec
 +++ b/SPECS/lighttpd.spec
-@@ -62,6 +62,7 @@ Source13: http://www.lighttpd.net/light_logo.png
+@@ -57,6 +57,7 @@ Source11: http://www.lighttpd.net/favicon.ico
+ Source12: http://www.lighttpd.net/light_button.png
+ Source13: http://www.lighttpd.net/light_logo.png
 Source14: lighttpd-empty.png
- #Source100: lighttpd-mod_geoip.c
- #Source101: lighttpd-mod_geoip.txt
 +
- Patch0: lighttpd-1.4.39-defaultconf.patch
- #Patch1: lighttpd-1.4.40-mod_geoip.patch
- Patch2: lighttpd-1.4.35-system-crypto-policy.patch
-@@ -194,17 +195,19 @@ autoreconf -if
+ Patch0: lighttpd-1.4.54-defaultconf.patch
+ Requires: system-logos
+ Requires: %{name}-filesystem
+@@ -162,16 +163,18 @@ autoreconf -if
     --libdir='%{_libdir}/lighttpd' \
     %{confswitch mysql} \
     %{confswitch pam} \
@ -27,9 +27,8 @@ index de52e46..7acdc84 100644
 +    --without-ldap \
     %{confswitch attr} \
 -    %{confswitch openssl} \
-+    --with-openssl \
-     %{confswitch kerberos5} \
 -    %{confswitch pcre} \
+    --with-openssl \
 +    --with-pcre \
     %{confswitch fam} \
 -    %{?with_webdavprops:--with-webdav-props} \
@ -37,16 +36,16 @@ index de52e46..7acdc84 100644
 +    --without-webdav-props \
 +    --without-webdav-locks \
     %{confswitch gdbm} \
-    %{confswitch memcache} \
+-    %{confswitch memcached} \
 -    %{confswitch lua} \
-+    --without-memcache \
+    --without-memcached \
 +    --without-lua \
 +    --without-bzip2 \
 +    --disable-static \
     %{confswitch geoip} \
     %{confswitch krb5}
 make %{?_smp_mflags}
-@@ -223,13 +226,14 @@ install -D -p -m 0644 %{SOURCE2} \
+@@ -189,13 +192,14 @@ install -D -p -m 0644 %{SOURCE2} \
     %{buildroot}%{_sysconfdir}/php.d/lighttpd.ini
 
 # Install our own init script (included one is old style) or systemd service
@ -64,19 +63,7 @@ index de52e46..7acdc84 100644
 
 # Install our own default web page and images
 mkdir -p %{buildroot}%{webroot}
-@@ -267,11 +271,9 @@ echo 'D /var/run/lighttpd 0750 lighttpd lighttpd -' > \
-     %{buildroot}%{_sysconfdir}/tmpfiles.d/lighttpd.conf
- %endif
- 
-
- %clean
- rm -rf %{buildroot}
- 
-
- %pre
- /usr/sbin/useradd -s /sbin/nologin -M -r -d %{webroot} \
-     -c 'lighttpd web server' lighttpd &>/dev/null || :
-@@ -315,11 +317,8 @@ fi
+@@ -278,11 +282,8 @@ fi
 %config %{_sysconfdir}/lighttpd/conf.d/mod.template
 %config %{_sysconfdir}/lighttpd/vhosts.d/vhosts.template
 %config(noreplace) %{_sysconfdir}/logrotate.d/lighttpd
@ -89,5 +76,5 @@ index de52e46..7acdc84 100644
 %config(noreplace) %{_sysconfdir}/tmpfiles.d/lighttpd.conf
 %endif
 -- 
-2.7.4
+2.17.1

--- a/base/lighttpd/centos/srpm_path
+++ b/base/lighttpd/centos/srpm_path
@ -1 +1 @@
-mirror:Source/lighttpd-1.4.54-1.el7.src.rpm
+mirror:Source/lighttpd-1.4.54-4.el8.src.rpm
--- a/centos_srpms_centos.lst
+++ b/centos_srpms_centos.lst
@ -10,7 +10,7 @@ initscripts-9.49.46-1.el7.src.rpm
 kernel-3.10.0-1062.1.2.el7.src.rpm
 libevent-2.0.21-4.el7.src.rpm
 # libibverbs-41mlnx1-OFED.4.5.0.1.0.45101.src.rpm
-lighttpd-1.4.54-1.el7.src.rpm
+lighttpd-1.4.54-4.el8.src.rpm
 logrotate-3.8.6-17.el7.src.rpm
 # mlnx-ofa_kernel-4.5-OFED.4.5.1.0.1.1.gb4fdfac.src.rpm
 net-snmp-5.7.2-37.el7.src.rpm