From 91f1bd05e5acc70789d17de47de7813bb615027c Mon Sep 17 00:00:00 2001 From: Yue Tao Date: Tue, 9 Mar 2021 18:26:53 -0800 Subject: [PATCH] lighttpd: backport spec-include-TiS-changes.patch from StarlingX f/centos8 branch Signed-off-by: Yue Tao --- debian/control | 99 ++++++++++++++++++++++++-------------------------- debian/rules | 12 +++--- 2 files changed, 55 insertions(+), 56 deletions(-) diff --git a/debian/control b/debian/control index 7807525..682477b 100644 --- a/debian/control +++ b/debian/control @@ -62,15 +62,12 @@ Suggests: lighttpd-mod-authn-gssapi, lighttpd-mod-authn-pam, lighttpd-mod-authn-sasl, - lighttpd-mod-cml, lighttpd-mod-geoip, - lighttpd-mod-magnet, lighttpd-mod-maxminddb, lighttpd-mod-trigger-b4-dl, lighttpd-mod-vhostdb-dbi, lighttpd-mod-vhostdb-pgsql, lighttpd-mod-webdav, - lighttpd-modules-ldap, lighttpd-modules-mysql, Description: fast webserver with minimal memory footprint lighttpd is a small webserver and fast webserver developed with @@ -99,29 +96,29 @@ Description: documentation for lighttpd . This package contains documentation for lighttpd. -Package: lighttpd-modules-ldap -Architecture: any -Depends: - ${misc:Depends}, - ${shlibs:Depends}, - lighttpd (= ${binary:Version}), -Breaks: - lighttpd (<< 1.4.52-2+exp1), - lighttpd-mod-authn-ldap (<< 1.4.52-2+exp1), -Replaces: - lighttpd (<< 1.4.52-2+exp1), - lighttpd-mod-authn-ldap (<< 1.4.52-2+exp1), -Provides: - ${lighttpd:ModuleProvides}, -Description: LDAP-based modules for lighttpd - This package contains the following modules: - * mod_authn_ldap: With this module, it is possible to perform - authentication against an LDAP server. - * mod_vhostdb_ldap: Database backend module for using LDAP as - a source for virtual host configuration using mod_vhostdb. - . - Do not depend on this package. Depend on the provided lighttpd-mod-* - packages instead. +#Package: lighttpd-modules-ldap +#Architecture: any +#Depends: +# ${misc:Depends}, +# ${shlibs:Depends}, +# lighttpd (= ${binary:Version}), +#Breaks: +# lighttpd (<< 1.4.52-2+exp1), +# lighttpd-mod-authn-ldap (<< 1.4.52-2+exp1), +#Replaces: +# lighttpd (<< 1.4.52-2+exp1), +# lighttpd-mod-authn-ldap (<< 1.4.52-2+exp1), +#Provides: +# ${lighttpd:ModuleProvides}, +#Description: LDAP-based modules for lighttpd +# This package contains the following modules: +# * mod_authn_ldap: With this module, it is possible to perform +# authentication against an LDAP server. +# * mod_vhostdb_ldap: Database backend module for using LDAP as +# a source for virtual host configuration using mod_vhostdb. +# . +# Do not depend on this package. Depend on the provided lighttpd-mod-* +# packages instead. Package: lighttpd-modules-mysql Architecture: any @@ -165,32 +162,32 @@ Description: anti-deep-linking module for lighttpd from other sites by requiring users to visit a trigger URL to be able to download certain files. -Package: lighttpd-mod-cml -Architecture: any -Depends: - ${misc:Depends}, - ${shlibs:Depends}, - lighttpd (= ${binary:Version}), -Recommends: - memcached, -Description: cache meta language module for lighttpd - With the cache meta language, it is possible to describe to the - dependencies of a cached file to its source files/scripts. For the - cache files, the scripting language Lua is used. - . - THIS MODULE IS OBSOLETED, USE mod_magnet INSTEAD. +#Package: lighttpd-mod-cml +#Architecture: any +#Depends: +# ${misc:Depends}, +# ${shlibs:Depends}, +# lighttpd (= ${binary:Version}), +#Recommends: +# memcached, +#Description: cache meta language module for lighttpd +# With the cache meta language, it is possible to describe to the +# dependencies of a cached file to its source files/scripts. For the +# cache files, the scripting language Lua is used. +# . +# THIS MODULE IS OBSOLETED, USE mod_magnet INSTEAD. -Package: lighttpd-mod-magnet -Architecture: any -Depends: - ${misc:Depends}, - ${shlibs:Depends}, - lighttpd (= ${binary:Version}), -Description: control the request handling module for lighttpd - mod_magnet can attract a request in several stages in the request-handling. - either at the same level as mod_rewrite, before any parsing of the URL is done - or at a later stage, when the doc-root is known and the physical-path is - already setup +#Package: lighttpd-mod-magnet +#Architecture: any +#Depends: +# ${misc:Depends}, +# ${shlibs:Depends}, +# lighttpd (= ${binary:Version}), +#Description: control the request handling module for lighttpd +# mod_magnet can attract a request in several stages in the request-handling. +# either at the same level as mod_rewrite, before any parsing of the URL is done +# or at a later stage, when the doc-root is known and the physical-path is +# already setup Package: lighttpd-mod-webdav Architecture: any diff --git a/debian/rules b/debian/rules index 7c0440b..e456781 100755 --- a/debian/rules +++ b/debian/rules @@ -16,6 +16,7 @@ override_dh_clean: override_dh_auto_configure: dh_auto_configure -- \ --disable-dependency-tracking \ + --disable-static \ --libdir=/usr/lib/lighttpd \ --libexecdir="/usr/lib/lighttpd" \ --with-attr \ @@ -23,10 +24,12 @@ override_dh_auto_configure: --with-fam \ --with-gdbm \ --with-krb5 \ - --with-ldap \ + --without-ldap \ --with-geoip \ --with-memcached \ - --with-lua=lua5.1 \ + --without-lua \ + --without-bzip2 \ + --without-memcache \ --with-maxminddb \ --with-mysql \ --with-openssl \ @@ -34,8 +37,8 @@ override_dh_auto_configure: --with-pcre \ --with-pgsql \ --with-sasl \ - --with-webdav-locks \ - --with-webdav-props \ + --without-webdav-locks \ + --without-webdav-props \ $(if $(filter pkg.lighttpd.libunwind,$(DEB_BUILD_PROFILES)),--with-libunwind) \ CFLAGS_FOR_BUILD="$(shell dpkg-buildflags --get CFLAGS)" \ LDFLAGS_FOR_BUILD="$(shell dpkg-buildflags --get LDFLAGS)" \ @@ -49,7 +52,6 @@ override_dh_missing: dh_missing --fail-missing DOCLESS_PACKAGES=\ - lighttpd-modules-ldap \ lighttpd-modules-mysql \ lighttpd-mod-authn-pam \ lighttpd-mod-authn-sasl \ -- 2.31.1