From: bill.c.roberts@gmail.com
To: selinux@vger.kernel.org, omosnace@redhat.com
Cc: William Roberts <william.c.roberts@intel.com>
Subject: [PATCH] libsemanage: check libsepol version
Date: Fri, 28 Feb 2020 07:32:07 -0600 [thread overview]
Message-ID: <20200228133207.32441-1-william.c.roberts@intel.com> (raw)
In-Reply-To: <CAFftDdr0uCE106AYCgs27nubTntevz40WiFzMr7rn4sFrdWazQ@mail.gmail.com>
From: William Roberts <william.c.roberts@intel.com>
If libsepol is older than version 3.0, the required routine
sepol_policydb_optimize will not be present. Use pkg-config to get the
modversion and check that it is 3.0 or higher.
This can manifest as a compilation issue:
direct_api.c: In function ‘semanage_direct_commit’:
direct_api.c:1466:13: error: implicit declaration of function ‘sepol_policydb_optimize’; did you mean ‘sepol_policydb_to_image’? [-Werror=implicit-function-declaration]
retval = sepol_policydb_optimize(out);
Which is not really clear on how to check.
Signed-off-by: William Roberts <william.c.roberts@intel.com>
---
libsemanage/src/Makefile | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/libsemanage/src/Makefile b/libsemanage/src/Makefile
index f6780dc6048e..a329797fe1cc 100644
--- a/libsemanage/src/Makefile
+++ b/libsemanage/src/Makefile
@@ -65,6 +65,14 @@ SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./
SWIGRUBY = swig -Wall -ruby -o $(SWIGRUBYCOUT) -outdir ./
+sepol-version-check:
+ @v=$$($(PKG_CONFIG) --modversion libsepol); \
+ major=$$(echo "$$v" | cut -d"." -f 1-1); \
+ if [ "$$major" -lt 3 ]; then \
+ >&2 echo "libsepol is required to be version 3.0 or higher, got: $$v"; \
+ exit 1; \
+ fi
+
all: $(LIBA) $(LIBSO) $(LIBPC)
pywrap: all $(SWIGSO)
@@ -83,12 +91,12 @@ $(SWIGSO): $(SWIGLOBJ)
$(SWIGRUBYSO): $(SWIGRUBYLOBJ)
$(CC) $(CFLAGS) $(LDFLAGS) -L. -shared -o $@ $^ -lsemanage $(RUBYLIBS)
-$(LIBA): $(OBJS)
- $(AR) rcs $@ $^
+$(LIBA): sepol-version-check $(OBJS)
+ $(AR) rcs $@ $(filter-out $<,$^)
$(RANLIB) $@
-$(LIBSO): $(LOBJS)
- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lsepol -laudit -lselinux -lbz2 -Wl,-soname,$(LIBSO),--version-script=libsemanage.map,-z,defs
+$(LIBSO): sepol-version-check $(LOBJS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $(filter-out $<,$^) -lsepol -laudit -lselinux -lbz2 -Wl,-soname,$(LIBSO),--version-script=libsemanage.map,-z,defs
ln -sf $@ $(TARGET)
$(LIBPC): $(LIBPC).in ../VERSION
@@ -163,4 +171,4 @@ distclean: clean
indent:
../../scripts/Lindent $(filter-out $(GENERATED),$(wildcard *.[ch]))
-.PHONY: all clean pywrap rubywrap swigify install install-pywrap install-rubywrap distclean
+.PHONY: all clean pywrap rubywrap swigify install install-pywrap install-rubywrap distclean sepol-version-check
--
2.17.1
next prev parent reply other threads:[~2020-02-28 13:32 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-27 22:47 [PATCH] libsemange: add missing header sepol/policydb.h bill.c.roberts
2020-02-28 8:17 ` Ondrej Mosnacek
2020-02-28 12:43 ` William Roberts
2020-02-28 13:32 ` bill.c.roberts [this message]
2020-03-01 19:24 ` [PATCH] libsemanage: check libsepol version Nicolas Iooss
2020-03-01 19:53 ` William Roberts
2020-03-01 20:21 ` Nicolas Iooss
2020-03-01 20:33 ` William Roberts
[not found] ` <CAJfZ7=kocVtoWs2fo8JkH+7FicnORGGVQEH51tG95u2nGoaPTw@mail.gmail.com>
[not found] ` <CAFftDdpkV9furWPR1VzuSV6ew93+Rij3bF7gw2Lup9aa8VMrSw@mail.gmail.com>
2020-03-01 21:43 ` Nicolas Iooss
2020-03-01 22:19 ` William Roberts
2020-03-02 15:24 ` Stephen Smalley
2020-03-02 15:32 ` William Roberts
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=20200228133207.32441-1-william.c.roberts@intel.com \
--to=bill.c.roberts@gmail.com \
--cc=omosnace@redhat.com \
--cc=selinux@vger.kernel.org \
--cc=william.c.roberts@intel.com \
/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;
as well as URLs for NNTP newsgroup(s).