From a3ebe45dcb3ef19e48e99b5a51829ed901a29f08 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Sun, 26 Jun 2016 18:39:12 -0400 Subject: [PATCH] libsepol: bump to version 2.5 An additional patch is needed to fix the build with uClibc. Signed-off-by: Adam Duskett [Thomas: add patch to fix build with uClibc.] Signed-off-by: Thomas Petazzoni --- .../libsepol/0001-support-static-only.patch | 26 +++++++++---------- .../0002-workaround-blackfin-issue.patch | 8 +++--- .../libsepol/0003-add-stdarg-include.patch | 18 +++++++++++++ package/libsepol/libsepol.hash | 2 +- package/libsepol/libsepol.mk | 4 +-- 5 files changed, 39 insertions(+), 19 deletions(-) create mode 100644 package/libsepol/0003-add-stdarg-include.patch diff --git a/package/libsepol/0001-support-static-only.patch b/package/libsepol/0001-support-static-only.patch index b9746807ba..3e9a84f822 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 +Signed-off-by: Adam Duskett 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 5d00c6983b..3c3bd4827f 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 +Signed-off-by: Adam Duskett 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/0003-add-stdarg-include.patch b/package/libsepol/0003-add-stdarg-include.patch new file mode 100644 index 0000000000..246c9654dd --- /dev/null +++ b/package/libsepol/0003-add-stdarg-include.patch @@ -0,0 +1,18 @@ +Add missing include + +This is needed to fix the build on uClibc, due to the usage of +va_list. + +Signed-off-by: Thomas Petazzoni +Index: b/cil/src/cil_log.h +=================================================================== +--- a/cil/src/cil_log.h ++++ b/cil/src/cil_log.h +@@ -30,6 +30,7 @@ + #define CIL_LOG_H_ + + #include ++#include + #include + + #define MAX_LOG_SIZE 512 diff --git a/package/libsepol/libsepol.hash b/package/libsepol/libsepol.hash index df5dabdf68..266ce43f73 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 1e709c6186..93896cf667 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.30.2