From: Adam Duskett <aduskett@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v6 5/6] libsepol: bump to version 2.5
Date: Sun, 26 Jun 2016 18:39:12 -0400 [thread overview]
Message-ID: <1466980753-667-6-git-send-email-Aduskett@gmail.com> (raw)
In-Reply-To: <1466980753-667-1-git-send-email-Aduskett@gmail.com>
Signed-off-by: Adam Duskett <Aduskett@gmail.com>
---
Changes v3 - v6:
- Patch series version bump.
Changes v2 - v3:
- Added SOB to included patch files.
Changes v1 - v2:
- Fixed broken (by me) support static-only patch that caused build
errors
package/libsepol/0001-support-static-only.patch | 26 +++++++++++-----------
.../libsepol/0002-workaround-blackfin-issue.patch | 8 ++++---
package/libsepol/libsepol.hash | 2 +-
package/libsepol/libsepol.mk | 4 ++--
4 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/package/libsepol/0001-support-static-only.patch b/package/libsepol/0001-support-static-only.patch
index b974680..3e9a84f 100644
--- a/package/libsepol/0001-support-static-only.patch
+++ b/package/libsepol/0001-support-static-only.patch
@@ -7,37 +7,37 @@ libraries. It allows to support cases where the target architecture
does not have support for shared libraries.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Adam Duskett <Aduskett@gmail.com>
Index: b/src/Makefile
===================================================================
+
+diff --git a/src/Makefile b/src/Makefile
+index db6c2ba..0006285 100644
--- a/src/Makefile
+++ b/src/Makefile
-@@ -17,7 +17,12 @@
- CFLAGS ?= -Werror -Wall -W -Wundef -Wshadow -Wmissing-noreturn -Wmissing-format-attribute
- override CFLAGS += -I. -I../include -D_GNU_SOURCE
+@@ -30,8 +30,12 @@ LOBJS += $(sort $(patsubst %.c,%.lo,$(wildcard $(CILDIR)/src/*.c) $(CIL_GENERATE
+ override CFLAGS += -I$(CILDIR)/include
+ endif
--all: $(LIBA) $(LIBSO) $(LIBPC)
+ALL_TARGETS = $(LIBA) $(LIBPC)
+ifeq ($(STATIC),)
+ALL_TARGETS += $(LIBSO)
+endif
-+
+
+-all: $(LIBA) $(LIBSO) $(LIBPC)
+all: $(ALL_TARGETS)
+
$(LIBA): $(OBJS)
- $(AR) rcs $@ $^
-@@ -39,11 +44,13 @@
- install: all
- test -d $(LIBDIR) || install -m 755 -d $(LIBDIR)
- install -m 644 $(LIBA) $(LIBDIR)
-- test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR)
-- install -m 755 $(LIBSO) $(SHLIBDIR)
+@@ -70,7 +74,11 @@ install: all
+ install -m 755 $(LIBSO) $(SHLIBDIR)
test -d $(LIBDIR)/pkgconfig || install -m 755 -d $(LIBDIR)/pkgconfig
install -m 644 $(LIBPC) $(LIBDIR)/pkgconfig
+ifeq ($(STATIC),)
+ test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR)
+ install -m 755 $(LIBSO) $(SHLIBDIR)
- cd $(LIBDIR) && ln -sf ../../`basename $(SHLIBDIR)`/$(LIBSO) $(TARGET)
+ ln -sf --relative $(SHLIBDIR)/$(LIBSO) $(LIBDIR)/$(TARGET)
+endif
relabel:
diff --git a/package/libsepol/0002-workaround-blackfin-issue.patch b/package/libsepol/0002-workaround-blackfin-issue.patch
index 5d00c69..3c3bd48 100644
--- a/package/libsepol/0002-workaround-blackfin-issue.patch
+++ b/package/libsepol/0002-workaround-blackfin-issue.patch
@@ -8,17 +8,19 @@ symbols are visible in the final DSO, which is not a problem for
proper execution, it just isn't as clean.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Adam Duskett <Aduskett@gmail.com>
Index: b/src/dso.h
===================================================================
--- a/src/dso.h
+++ b/src/dso.h
-@@ -1,7 +1,7 @@
- #ifndef _SELINUX_DSO_H
- #define _SELINUX_DSO_H 1
+@@ -5,7 +5,7 @@
+ #define DISABLE_SYMVER 1
+ #endif
-#ifdef SHARED
+#if defined(SHARED) && !defined(__bfin__)
# define hidden __attribute__ ((visibility ("hidden")))
# define hidden_proto(fct) __hidden_proto (fct, fct##_internal)
# define __hidden_proto(fct, internal) \
+
diff --git a/package/libsepol/libsepol.hash b/package/libsepol/libsepol.hash
index df5dabd..266ce43 100644
--- a/package/libsepol/libsepol.hash
+++ b/package/libsepol/libsepol.hash
@@ -1,2 +1,2 @@
# From https://github.com/SELinuxProject/selinux/wiki/Releases
-sha256 290d17f583635a4a5d8a2141511272adf0571c4205cdea38b5a68df20d58a70b libsepol-2.1.9.tar.gz
+sha256 2bdeec56d0a08b082b93b40703b4b3329cc5562152f7254d8f6ef6b56afe850a libsepol-2.5.tar.gz
diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk
index 1e709c6..93896cf 100644
--- a/package/libsepol/libsepol.mk
+++ b/package/libsepol/libsepol.mk
@@ -4,8 +4,8 @@
#
################################################################################
-LIBSEPOL_VERSION = 2.1.9
-LIBSEPOL_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20130423
+LIBSEPOL_VERSION = 2.5
+LIBSEPOL_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160223
LIBSEPOL_LICENSE = LGPLv2.1+
LIBSEPOL_LICENSE_FILES = COPYING
--
2.7.4
next prev parent reply other threads:[~2016-06-26 22:39 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-26 22:39 [Buildroot] [PATCH v6 0/6] *** Update selinux libraries *** Adam Duskett
2016-06-26 22:39 ` [Buildroot] [PATCH v6 1/6] audit: bump to version 2.6 Adam Duskett
2016-06-29 19:42 ` Yann E. MORIN
2016-07-01 9:08 ` Thomas Petazzoni
2016-07-05 17:16 ` Yann E. MORIN
2016-07-06 13:47 ` Adam Duskett
2016-07-06 14:42 ` Adam Duskett
2016-07-06 20:43 ` Yann E. MORIN
2016-06-26 22:39 ` [Buildroot] [PATCH v6 2/6] libsemanage: bump to version 2.5 Adam Duskett
2016-06-29 20:32 ` Yann E. MORIN
2016-07-01 9:08 ` Thomas Petazzoni
2016-06-26 22:39 ` [Buildroot] [PATCH v6 3/6] checkpolicy: " Adam Duskett
2016-06-29 20:34 ` Yann E. MORIN
2016-07-01 9:10 ` Thomas Petazzoni
2016-06-26 22:39 ` [Buildroot] [PATCH v6 4/6] libselinux: " Adam Duskett
2016-06-30 22:38 ` Yann E. MORIN
2016-07-01 9:10 ` Thomas Petazzoni
2016-06-26 22:39 ` Adam Duskett [this message]
2016-07-01 9:11 ` [Buildroot] [PATCH v6 5/6] libsepol: " Thomas Petazzoni
2016-06-26 22:39 ` [Buildroot] [PATCH v6 6/6] setools: fix build with latest selinux libraries Adam Duskett
2016-07-01 9:11 ` Thomas Petazzoni
-- strict thread matches above, loose matches on Subject: below --
2016-06-26 22:26 [Buildroot] [PATCH 1/6] audit: bump to version 2.6 Adam Duskett
2016-06-26 22:26 ` [Buildroot] [PATCH v6 5/6] libsepol: bump to version 2.5 Adam Duskett
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=1466980753-667-6-git-send-email-Aduskett@gmail.com \
--to=aduskett@gmail.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