From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/2] lighttpd: add optional pam support
Date: Tue, 30 Oct 2018 11:21:52 +0100 [thread overview]
Message-ID: <20181030102152.9755-2-peter@korsgaard.com> (raw)
In-Reply-To: <20181030102152.9755-1-peter@korsgaard.com>
Let the option depend on linux-pam as pam has quite some dependencies and
this is unlikely to be used if pam isn't explicitly enabled.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/lighttpd/Config.in | 7 +++++++
package/lighttpd/lighttpd.mk | 8 +++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in
index 383c10f70f..0f37422aea 100644
--- a/package/lighttpd/Config.in
+++ b/package/lighttpd/Config.in
@@ -26,6 +26,13 @@ config BR2_PACKAGE_LIGHTTPD_OPENSSL
help
Enable OpenSSL support for lighttpd.
+config BR2_PACKAGE_LIGHTTPD_PAM
+ bool "pam authentication support"
+ depends on BR2_PACKAGE_LINUX_PAM
+ default y
+ help
+ Enable PAM authentication support for lighttpd.
+
config BR2_PACKAGE_LIGHTTPD_ZLIB
bool "zlib support"
select BR2_PACKAGE_ZLIB
diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
index 44bee6f90f..d8f64dc7e8 100644
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -12,7 +12,6 @@ LIGHTTPD_LICENSE = BSD-3-Clause
LIGHTTPD_LICENSE_FILES = COPYING
LIGHTTPD_DEPENDENCIES = host-pkgconf
LIGHTTPD_CONF_OPTS = \
- --without-pam \
--without-wolfssl \
--libdir=/usr/lib/lighttpd \
--libexecdir=/usr/lib
@@ -24,6 +23,13 @@ else
LIGHTTPD_CONF_OPTS += --without-openssl
endif
+ifeq ($(BR2_PACKAGE_LIGHTTPD_PAM),y)
+LIGHTTPD_DEPENDENCIES += linux-pam
+LIGHTTPD_CONF_OPTS += --with-pam
+else
+LIGHTTPD_CONF_OPTS += --without-pam
+endif
+
ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y)
LIGHTTPD_DEPENDENCIES += zlib
LIGHTTPD_CONF_OPTS += --with-zlib
--
2.11.0
next prev parent reply other threads:[~2018-10-30 10:21 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-30 10:21 [Buildroot] [PATCH 1/2] lighttpd: security bump to version 1.14.51 Peter Korsgaard
2018-10-30 10:21 ` Peter Korsgaard [this message]
2018-10-30 11:38 ` [Buildroot] [PATCH 2/2] lighttpd: add optional pam support Baruch Siach
2018-10-30 13:49 ` Peter Korsgaard
2018-10-30 12:43 ` Matthew Weber
2018-10-31 9:24 ` Thomas Petazzoni
2018-10-30 20:04 ` [Buildroot] [PATCH 1/2] lighttpd: security bump to version 1.14.51 Peter Korsgaard
2018-11-13 23:11 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181030102152.9755-2-peter@korsgaard.com \
--to=peter@korsgaard.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox