From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from eddie.linux-mips.org ([148.251.95.138] helo=cvs.linux-mips.org) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1jrHrF-00087W-4W for ptxdist@pengutronix.de; Fri, 03 Jul 2020 11:19:45 +0200 Received: (from localhost user: 'ladis' uid#1021 fake: STDIN (ladis@eddie.linux-mips.org)) by eddie.linux-mips.org id S23991811AbgGCJTl1ADUI (ORCPT ); Fri, 3 Jul 2020 11:19:41 +0200 Date: Fri, 3 Jul 2020 11:19:40 +0200 From: ladis@linux-mips.org Message-ID: <20200703091940.GA623498@lenoch> MIME-Version: 1.0 Content-Disposition: inline Subject: [ptxdist] [PATCH] libcap: add PAM support List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de Signed-off-by: Ladislav Michl --- rules/libcap.in | 1 + rules/libcap.make | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/rules/libcap.in b/rules/libcap.in index 6262467d1..5fef3a033 100644 --- a/rules/libcap.in +++ b/rules/libcap.in @@ -3,6 +3,7 @@ menuconfig LIBCAP tristate select HOST_GPERF + select PAM if GLOBAL_PAM prompt "libcap " help A library for getting and setting POSIX.1e capabilities. diff --git a/rules/libcap.make b/rules/libcap.make index 2bb25a068..a8e94c5f8 100644 --- a/rules/libcap.make +++ b/rules/libcap.make @@ -30,11 +30,13 @@ LIBCAP_LICENSE_FILES := file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1 # ---------------------------------------------------------------------------- LIBCAP_MAKE_OPT := \ - prefix=/usr PAM_CAP=no DYNAMIC=yes \ - LIBATTR=$(call ptx/yesno, PTXCONF_LIBCAP_SETCAP) \ - lib=lib \ + prefix=/usr lib=lib \ CC=$(CROSS_CC) \ - BUILD_CC=$(HOSTCC) + BUILD_CC=$(HOSTCC) \ + DYNAMIC=yes \ + GOLANG=no \ + LIBATTR=$(call ptx/yesno, PTXCONF_LIBCAP_SETCAP) \ + PAM_CAP=$(call ptx/yesno, PTXCONF_GLOBAL_PAM) LIBCAP_INSTALL_OPT := \ $(LIBCAP_MAKE_OPT) \ @@ -57,6 +59,10 @@ $(STATEDIR)/libcap.targetinstall: @$(call install_copy, libcap, 0, 0, 0755, -, /usr/sbin/getpcaps) @$(call install_copy, libcap, 0, 0, 0755, -, /usr/sbin/capsh) @$(call install_lib, libcap, 0, 0, 0644, libcap) +ifdef PTXCONF_GLOBAL_PAM + @$(call install_copy, libcap, 0, 0, 0755, -, \ + /usr/lib/security/pam_cap.so) +endif ifdef PTXCONF_LIBCAP_SETCAP @$(call install_copy, libcap, 0, 0, 0755, -, /usr/sbin/setcap) @$(call install_copy, libcap, 0, 0, 0755, -, /usr/sbin/getcap) -- 2.27.0 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de