CentOS 8: Upgrade lighttpd to version 1.4.55-3
(1)Release Version Upgrade (2)Matching code changes with 1.4.55-1 to 1.4.55-3 Change-Id: I8e30c13dc8f6319c660dad5b3b711d490da67cd8 Story: 2006729 Task: 40378 Signed-off-by: Yong Fu <fuyong@neusoft.com>
This commit is contained in:
Yong Fu
parent
018a0afba7
commit
6eb93ebf93
@ -4,23 +4,24 @@ Date: Mon, 20 Mar 2017 10:21:28 -0400
|
||||
Subject: [PATCH 2/4] Update-package-versioning-for-TIS-format.patch
|
||||
|
||||
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
|
||||
Signed-off-by: Yong Fu <fuyong@neusoft.com>
|
||||
---
|
||||
SPECS/lighttpd.spec | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/SPECS/lighttpd.spec b/SPECS/lighttpd.spec
|
||||
index 20c4503..3280403 100644
|
||||
index 8b029b4..226bada 100644
|
||||
--- a/SPECS/lighttpd.spec
|
||||
+++ b/SPECS/lighttpd.spec
|
||||
@@ -44,7 +44,7 @@
|
||||
Summary: Lightning fast webserver with light system requirements
|
||||
Name: lighttpd
|
||||
Version: 1.4.55
|
||||
-Release: 1%{?dist}
|
||||
+Release: 1.el8%{?_tis_dist}.%{tis_patch_ver}
|
||||
-Release: 3%{?dist}
|
||||
+Release: 3.el8%{?_tis_dist}.%{tis_patch_ver}
|
||||
License: BSD
|
||||
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
|
||||
|
||||
|
||||
@ -7,25 +7,25 @@ Subject: [PATCH 4/4] Adding support for TPM 2.0
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/SPECS/lighttpd.spec b/SPECS/lighttpd.spec
|
||||
index fb0e5f9..7205133 100644
|
||||
index 8d20983..0442df7 100644
|
||||
--- a/SPECS/lighttpd.spec
|
||||
+++ b/SPECS/lighttpd.spec
|
||||
@@ -62,6 +62,7 @@ Patch0: lighttpd-1.4.54-defaultconf.patch
|
||||
|
||||
@@ -62,6 +62,7 @@ Patch0: lighttpd-1.4.55-defaultconf.patch
|
||||
|
||||
# STX Patches
|
||||
Patch100: check-content-length.patch
|
||||
+Patch101: lighttpd-tpm-support.patch
|
||||
|
||||
|
||||
Requires: system-logos
|
||||
Requires: %{name}-filesystem
|
||||
@@ -163,6 +164,7 @@ for the directories.
|
||||
|
||||
|
||||
# STX Patches
|
||||
%patch100 -p1 -b .content_length
|
||||
+%patch101 -p1 -b .tpm_support
|
||||
|
||||
|
||||
%build
|
||||
autoreconf -if
|
||||
--
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
||||
@ -3,18 +3,19 @@ From: Scott Little <scott.little@windriver.com>
|
||||
Date: Mon, 20 Mar 2017 10:21:28 -0400
|
||||
Subject: [PATCH 3/4] spec-check-content-length.patch
|
||||
|
||||
Signed-off-by: Yong Fu <fuyong@neusoft.com>
|
||||
---
|
||||
SPECS/lighttpd.spec | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/SPECS/lighttpd.spec b/SPECS/lighttpd.spec
|
||||
index 3280403..fb0e5f9 100644
|
||||
index 226bada..8d20983 100644
|
||||
--- a/SPECS/lighttpd.spec
|
||||
+++ b/SPECS/lighttpd.spec
|
||||
@@ -59,6 +59,10 @@ Source13: http://www.lighttpd.net/light_logo.png
|
||||
Source14: lighttpd-empty.png
|
||||
|
||||
Patch0: lighttpd-1.4.54-defaultconf.patch
|
||||
|
||||
Patch0: lighttpd-1.4.55-defaultconf.patch
|
||||
+
|
||||
+# STX Patches
|
||||
+Patch100: check-content-length.patch
|
||||
@ -25,13 +26,13 @@ index 3280403..fb0e5f9 100644
|
||||
@@ -157,6 +161,9 @@ for the directories.
|
||||
%setup -q
|
||||
%patch0 -p0 -b .defaultconf
|
||||
|
||||
|
||||
+# STX Patches
|
||||
+%patch100 -p1 -b .content_length
|
||||
+
|
||||
%build
|
||||
autoreconf -if
|
||||
%configure \
|
||||
--
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
||||
@ -4,12 +4,13 @@ Date: Mon, 20 Mar 2017 10:21:28 -0400
|
||||
Subject: [PATCH 1/4] spec-include-TiS-changes.patch
|
||||
|
||||
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
|
||||
Signed-off-by: Yong Fu <fuyong@neusoft.com>
|
||||
---
|
||||
SPECS/lighttpd.spec | 27 ++++++++++++++-------------
|
||||
1 file changed, 14 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/SPECS/lighttpd.spec b/SPECS/lighttpd.spec
|
||||
index b5517e4..20c4503 100644
|
||||
index a11898f..8b029b4 100644
|
||||
--- a/SPECS/lighttpd.spec
|
||||
+++ b/SPECS/lighttpd.spec
|
||||
@@ -57,6 +57,7 @@ Source11: http://www.lighttpd.net/favicon.ico
|
||||
@ -17,7 +18,7 @@ index b5517e4..20c4503 100644
|
||||
Source13: http://www.lighttpd.net/light_logo.png
|
||||
Source14: lighttpd-empty.png
|
||||
+
|
||||
Patch0: lighttpd-1.4.54-defaultconf.patch
|
||||
Patch0: lighttpd-1.4.55-defaultconf.patch
|
||||
Requires: system-logos
|
||||
Requires: %{name}-filesystem
|
||||
@@ -162,16 +163,18 @@ autoreconf -if
|
||||
@ -48,7 +49,7 @@ index b5517e4..20c4503 100644
|
||||
make %{?_smp_mflags}
|
||||
@@ -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
|
||||
-%if %{with systemd}
|
||||
+#%if %{with systemd}
|
||||
@ -61,7 +62,7 @@ index b5517e4..20c4503 100644
|
||||
%{buildroot}%{_sysconfdir}/rc.d/init.d/lighttpd
|
||||
-%endif
|
||||
+#%endif
|
||||
|
||||
|
||||
# Install our own default web page and images
|
||||
mkdir -p %{buildroot}%{webroot}
|
||||
@@ -278,11 +282,8 @@ fi
|
||||
@ -76,6 +77,6 @@ index b5517e4..20c4503 100644
|
||||
%if %{with tmpfiles}
|
||||
%config(noreplace) /usr/lib/tmpfiles.d/lighttpd.conf
|
||||
%endif
|
||||
--
|
||||
2.7.4
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
mirror:Source/lighttpd-1.4.55-1.el8.src.rpm
|
||||
mirror:Source/lighttpd-1.4.55-3.el8.src.rpm
|
||||
|
||||
@ -8,7 +8,7 @@ grubby-8.40-34.el8.src.rpm
|
||||
haproxy-1.8.15-5.el8.src.rpm
|
||||
initscripts-10.00.1-1.el8_0.1.src.rpm
|
||||
# libevent-2.0.21-4.el7.src.rpm
|
||||
lighttpd-1.4.55-1.el8.src.rpm
|
||||
lighttpd-1.4.55-3.el8.src.rpm
|
||||
# logrotate-3.8.6-17.el7.src.rpm
|
||||
net-snmp-5.8-7.el8_0.2.src.rpm
|
||||
net-tools-2.0-0.51.20160912git.el8.src.rpm
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user