starlingx
/
integ
Code Issues Proposed changes

de-fuzz lighttpd patches 

When do Centos 7.5 upgraded, some patches didn't resolve and cause
the fuzzy in the line numbers of the patches. And it may cause
.orig file is created when do patch. And this .orig file will lead
to rpm packaging failure due to the unexpected and unpackaged .orig
file.

Please visit below link to get more detail info:
https://bugs.launchpad.net/starlingx/+bug/1794611

Solution:
  Safest solution is to de-fuzz our patches.

Story: 2003389
Task: 26755

Change-Id: I46cbc0a80fff6561b5e21d75feb2bb1963ca62a6
Signed-off-by: slin14 <shuicheng.lin@intel.com>
This commit is contained in:
slin14 2018-09-28 08:00:55 +08:00
parent c522cb6310
commit ad18be7c4c
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
base/lighttpd/centos/meta_patches/0001-Adding-tmp-dir-under-lighttpd-chroot-environ.patch
View File

@ -1,4 +1,4 @@
From bfca4119209067c0af4abf88b62d54767fcfd7ab Mon Sep 17 00:00:00 2001 From 804b1d2ae37de293c2859d37d1c2cc9885e9d09e Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com> From: Scott Little <scott.little@windriver.com>
Date: Mon, 20 Mar 2017 10:21:28 -0400 Date: Mon, 20 Mar 2017 10:21:28 -0400
Subject: [PATCH 2/4] WRS: Subject: [PATCH 2/4] WRS:
@ -9,10 +9,10 @@ Subject: [PATCH 2/4] WRS:
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/lighttpd.spec b/SPECS/lighttpd.spec diff --git a/SPECS/lighttpd.spec b/SPECS/lighttpd.spec
index a313a1b..71737ac 100644 index 7acdc84..2f7b261 100644
--- a/SPECS/lighttpd.spec --- a/SPECS/lighttpd.spec
+++ b/SPECS/lighttpd.spec +++ b/SPECS/lighttpd.spec
@@ -267,7 +267,7 @@ echo 'D /var/run/lighttpd 0750 lighttpd lighttpd -' > \ @@ -271,7 +271,7 @@ echo 'D /var/run/lighttpd 0750 lighttpd lighttpd -' > \
# WRS # WRS
CONFDIR=%{buildroot}%{_sysconfdir}/lighttpd CONFDIR=%{buildroot}%{_sysconfdir}/lighttpd
ROOTDIR=%{buildroot}/www ROOTDIR=%{buildroot}/www
@ -22,5 +22,5 @@ index a313a1b..71737ac 100644
install -d ${ROOTDIR}/pages/dav install -d ${ROOTDIR}/pages/dav
install -m 0640 %{SOURCE103} ${CONFDIR}/lighttpd.conf install -m 0640 %{SOURCE103} ${CONFDIR}/lighttpd.conf
-- --
1.8.3.1 2.7.4

10
base/lighttpd/centos/meta_patches/meta_add_support_for_tpm.patch
View File

@ -1,4 +1,4 @@
From 653e25505b1df7e7b3fd89e08729d6d9f9698d39 Mon Sep 17 00:00:00 2001 From 2cfc139ffabdb52c82834be2f88333f99c181677 Mon Sep 17 00:00:00 2001
From: Kam Nasim <kam.nasim@windriver.com> From: Kam Nasim <kam.nasim@windriver.com>
Date: Tue, 28 Mar 2017 17:33:34 -0400 Date: Tue, 28 Mar 2017 17:33:34 -0400
Subject: [PATCH] Adding support for TPM 2.0 Subject: [PATCH] Adding support for TPM 2.0
@ -8,10 +8,10 @@ Subject: [PATCH] Adding support for TPM 2.0
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
diff --git a/SPECS/lighttpd.spec b/SPECS/lighttpd.spec diff --git a/SPECS/lighttpd.spec b/SPECS/lighttpd.spec
index 0598472..64df753 100644 index c27f78f..bc11989 100644
--- a/SPECS/lighttpd.spec --- a/SPECS/lighttpd.spec
+++ b/SPECS/lighttpd.spec +++ b/SPECS/lighttpd.spec
@@ -81,6 +81,7 @@ Patch8: lighttpd-1.4.43-mysql.patch @@ -82,6 +82,7 @@ Patch3: lighttpd-1.4.39-socket.patch
# WRS Patches # WRS Patches
Patch100: check-content-length.patch Patch100: check-content-length.patch
@ -19,7 +19,7 @@ index 0598472..64df753 100644
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
# For the target poweredby.png image (skip requirement + provide image on EL5) # For the target poweredby.png image (skip requirement + provide image on EL5)
@@ -186,6 +187,7 @@ Authentication module for lighttpd that uses GSSAPI @@ -189,6 +190,7 @@ Authentication module for lighttpd that uses GSSAPI
# WRS Patches # WRS Patches
%patch100 -p1 -b .content_length %patch100 -p1 -b .content_length
@ -28,5 +28,5 @@ index 0598472..64df753 100644
#install -p -m 0644 %{SOURCE100} src/mod_geoip.c #install -p -m 0644 %{SOURCE100} src/mod_geoip.c
#install -p -m 0644 %{SOURCE101} mod_geoip.txt #install -p -m 0644 %{SOURCE101} mod_geoip.txt
-- --
1.8.3.1 2.7.4

16
base/lighttpd/centos/meta_patches/spec-include-TiS-changes.patch
View File

@ -1,4 +1,4 @@
From 4012a8fe42371386d864d2aa3277f43169909d6e Mon Sep 17 00:00:00 2001 From 8f91c53ae95b97e12d4a7b16fac8f3d5195ccd52 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com> From: Scott Little <scott.little@windriver.com>
Date: Mon, 20 Mar 2017 10:21:28 -0400 Date: Mon, 20 Mar 2017 10:21:28 -0400
Subject: [PATCH 1/4] WRS: spec-include-TiS-changes.patch Subject: [PATCH 1/4] WRS: spec-include-TiS-changes.patch
@ -8,7 +8,7 @@ Subject: [PATCH 1/4] WRS: spec-include-TiS-changes.patch
1 file changed, 40 insertions(+), 13 deletions(-) 1 file changed, 40 insertions(+), 13 deletions(-)
diff --git a/SPECS/lighttpd.spec b/SPECS/lighttpd.spec diff --git a/SPECS/lighttpd.spec b/SPECS/lighttpd.spec
index 20668f7..a313a1b 100644 index de52e46..7acdc84 100644
--- a/SPECS/lighttpd.spec --- a/SPECS/lighttpd.spec
+++ b/SPECS/lighttpd.spec +++ b/SPECS/lighttpd.spec
@@ -61,6 +61,14 @@ Source13: http://www.lighttpd.net/light_logo.png @@ -61,6 +61,14 @@ Source13: http://www.lighttpd.net/light_logo.png
@ -26,7 +26,7 @@ index 20668f7..a313a1b 100644
Patch0: lighttpd-1.4.39-defaultconf.patch Patch0: lighttpd-1.4.39-defaultconf.patch
#Patch1: lighttpd-1.4.40-mod_geoip.patch #Patch1: lighttpd-1.4.40-mod_geoip.patch
Patch2: lighttpd-1.4.35-system-crypto-policy.patch Patch2: lighttpd-1.4.35-system-crypto-policy.patch
@@ -180,17 +188,19 @@ autoreconf -if @@ -184,17 +192,19 @@ autoreconf -if
%configure \ %configure \
--libdir='%{_libdir}/lighttpd' \ --libdir='%{_libdir}/lighttpd' \
%{confswitch mysql} \ %{confswitch mysql} \
@ -53,7 +53,7 @@ index 20668f7..a313a1b 100644
%{confswitch geoip} \ %{confswitch geoip} \
%{confswitch krb5} %{confswitch krb5}
make %{?_smp_mflags} make %{?_smp_mflags}
@@ -209,13 +219,14 @@ install -D -p -m 0644 %{SOURCE2} \ @@ -213,13 +223,14 @@ install -D -p -m 0644 %{SOURCE2} \
%{buildroot}%{_sysconfdir}/php.d/lighttpd.ini %{buildroot}%{_sysconfdir}/php.d/lighttpd.ini
# Install our own init script (included one is old style) or systemd service # Install our own init script (included one is old style) or systemd service
@ -71,7 +71,7 @@ index 20668f7..a313a1b 100644
# Install our own default web page and images # Install our own default web page and images
mkdir -p %{buildroot}%{webroot} mkdir -p %{buildroot}%{webroot}
@@ -253,6 +264,20 @@ echo 'D /var/run/lighttpd 0750 lighttpd lighttpd -' > \ @@ -257,6 +268,20 @@ echo 'D /var/run/lighttpd 0750 lighttpd lighttpd -' > \
%{buildroot}%{_sysconfdir}/tmpfiles.d/lighttpd.conf %{buildroot}%{_sysconfdir}/tmpfiles.d/lighttpd.conf
%endif %endif
@ -92,7 +92,7 @@ index 20668f7..a313a1b 100644
%clean %clean
rm -rf %{buildroot} rm -rf %{buildroot}
@@ -301,11 +326,8 @@ fi @@ -305,11 +330,8 @@ fi
%config %{_sysconfdir}/lighttpd/conf.d/mod.template %config %{_sysconfdir}/lighttpd/conf.d/mod.template
%config %{_sysconfdir}/lighttpd/vhosts.d/vhosts.template %config %{_sysconfdir}/lighttpd/vhosts.d/vhosts.template
%config(noreplace) %{_sysconfdir}/logrotate.d/lighttpd %config(noreplace) %{_sysconfdir}/logrotate.d/lighttpd
@ -104,7 +104,7 @@ index 20668f7..a313a1b 100644
%if %{with tmpfiles} %if %{with tmpfiles}
%config(noreplace) %{_sysconfdir}/tmpfiles.d/lighttpd.conf %config(noreplace) %{_sysconfdir}/tmpfiles.d/lighttpd.conf
%endif %endif
@@ -331,6 +353,11 @@ fi @@ -335,6 +357,11 @@ fi
# This is not really configuration, but prevent loss of local changes # This is not really configuration, but prevent loss of local changes
%config %{webroot}/index.html %config %{webroot}/index.html
@ -117,5 +117,5 @@ index 20668f7..a313a1b 100644
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc doc/outdated/fastcgi*.txt doc/scripts/spawn-php.sh %doc doc/outdated/fastcgi*.txt doc/scripts/spawn-php.sh
-- --
1.8.3.1 2.7.4