From: Michael Olbrich <mol@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [APPLIED] libcap: add PAM support
Date: Mon, 06 Jul 2020 08:32:02 +0200 [thread overview]
Message-ID: <E1jsKfa-0002AV-4V@dude02.hi.pengutronix.de> (raw)
In-Reply-To: <20200703091940.GA623498@lenoch>
Thanks, applied as b5b016c09863783f69d97dd206d03ffaed225168.
Michael
[sent from post-receive hook]
On Mon, 06 Jul 2020 08:32:02 +0200, Ladislav Michl <ladis@linux-mips.org> wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> Message-Id: <20200703091940.GA623498@lenoch>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/libcap.in b/rules/libcap.in
> index 6262467d19ab..5fef3a033f1c 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 2bb25a068afb..a8e94c5f81a6 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)
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
prev parent reply other threads:[~2020-07-06 6:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-03 9:19 [ptxdist] [PATCH] " ladis
2020-07-06 6:32 ` Michael Olbrich [this message]
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=E1jsKfa-0002AV-4V@dude02.hi.pengutronix.de \
--to=mol@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/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