ad18be7c4c
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>
122 lines
3.5 KiB
Diff
122 lines
3.5 KiB
Diff
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
|
|
|
|
---
|
|
SPECS/lighttpd.spec | 53 ++++++++++++++++++++++++++++++++++++++++-------------
|
|
1 file changed, 40 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/SPECS/lighttpd.spec b/SPECS/lighttpd.spec
|
|
index de52e46..7acdc84 100644
|
|
--- a/SPECS/lighttpd.spec
|
|
+++ b/SPECS/lighttpd.spec
|
|
@@ -61,6 +61,14 @@ Source13: http://www.lighttpd.net/light_logo.png
|
|
Source14: lighttpd-empty.png
|
|
#Source100: lighttpd-mod_geoip.c
|
|
#Source101: lighttpd-mod_geoip.txt
|
|
+
|
|
+# WRS
|
|
+Source102: index.html.lighttpd
|
|
+Source103: lighttpd.conf
|
|
+Source104: lighttpd-inc.conf
|
|
+Source105: lighttpd.logrotate
|
|
+Source106: lighttpd-csr.conf
|
|
+
|
|
Patch0: lighttpd-1.4.39-defaultconf.patch
|
|
#Patch1: lighttpd-1.4.40-mod_geoip.patch
|
|
Patch2: lighttpd-1.4.35-system-crypto-policy.patch
|
|
@@ -184,17 +192,19 @@ autoreconf -if
|
|
%configure \
|
|
--libdir='%{_libdir}/lighttpd' \
|
|
%{confswitch mysql} \
|
|
- %{confswitch ldap} \
|
|
+ --without-ldap \
|
|
%{confswitch attr} \
|
|
- %{confswitch openssl} \
|
|
+ --with-openssl \
|
|
%{confswitch kerberos5} \
|
|
- %{confswitch pcre} \
|
|
+ --with-pcre \
|
|
%{confswitch fam} \
|
|
- %{?with_webdavprops:--with-webdav-props} \
|
|
- %{?with_webdavlocks:--with-webdav-locks} \
|
|
+ --without-webdav-props \
|
|
+ --without-webdav-locks \
|
|
%{confswitch gdbm} \
|
|
- %{confswitch memcache} \
|
|
- %{confswitch lua} \
|
|
+ --without-memcache \
|
|
+ --without-lua \
|
|
+ --without-bzip2 \
|
|
+ --disable-static \
|
|
%{confswitch geoip} \
|
|
%{confswitch krb5}
|
|
make %{?_smp_mflags}
|
|
@@ -213,13 +223,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}
|
|
install -D -p -m 0644 %{SOURCE4} \
|
|
%{buildroot}%{_unitdir}/lighttpd.service
|
|
-%else
|
|
+#%else
|
|
+mkdir -p /etc/rc.d/init.d
|
|
install -D -p -m 0755 %{SOURCE3} \
|
|
%{buildroot}%{_sysconfdir}/rc.d/init.d/lighttpd
|
|
-%endif
|
|
+#%endif
|
|
|
|
# Install our own default web page and images
|
|
mkdir -p %{buildroot}%{webroot}
|
|
@@ -257,6 +268,20 @@ echo 'D /var/run/lighttpd 0750 lighttpd lighttpd -' > \
|
|
%{buildroot}%{_sysconfdir}/tmpfiles.d/lighttpd.conf
|
|
%endif
|
|
|
|
+# WRS
|
|
+CONFDIR=%{buildroot}%{_sysconfdir}/lighttpd
|
|
+ROOTDIR=%{buildroot}/www
|
|
+
|
|
+install -d ${CONFDIR}/ssl
|
|
+install -d ${ROOTDIR}/pages/dav
|
|
+install -m 0640 %{SOURCE103} ${CONFDIR}/lighttpd.conf
|
|
+install -m 0644 %{SOURCE104} ${CONFDIR}/lighttpd-inc.conf
|
|
+install -m 0644 %{SOURCE102} ${ROOTDIR}/pages/index.html
|
|
+
|
|
+install -d %{buildroot}%{_sysconfdir}/logrotate.d
|
|
+install -m 644 %{SOURCE105} %{buildroot}%{_sysconfdir}/logrotate.d/lighttpd
|
|
+
|
|
+chmod 02770 %{buildroot}%{_sysconfdir}/lighttpd
|
|
|
|
%clean
|
|
rm -rf %{buildroot}
|
|
@@ -305,11 +330,8 @@ fi
|
|
%config %{_sysconfdir}/lighttpd/conf.d/mod.template
|
|
%config %{_sysconfdir}/lighttpd/vhosts.d/vhosts.template
|
|
%config(noreplace) %{_sysconfdir}/logrotate.d/lighttpd
|
|
-%if %{with systemd}
|
|
%{_unitdir}/lighttpd.service
|
|
-%else
|
|
%{_sysconfdir}/rc.d/init.d/lighttpd
|
|
-%endif
|
|
%if %{with tmpfiles}
|
|
%config(noreplace) %{_sysconfdir}/tmpfiles.d/lighttpd.conf
|
|
%endif
|
|
@@ -335,6 +357,11 @@ fi
|
|
# This is not really configuration, but prevent loss of local changes
|
|
%config %{webroot}/index.html
|
|
|
|
+# WRS
|
|
+%dir /www/pages/
|
|
+/www/pages/*
|
|
+
|
|
+
|
|
%files fastcgi
|
|
%defattr(-,root,root,-)
|
|
%doc doc/outdated/fastcgi*.txt doc/scripts/spawn-php.sh
|
|
--
|
|
2.7.4
|
|
|