NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libsepol: bump to version 2.5

Browse Source 
An additional patch is needed to fix the build with uClibc.

Signed-off-by: Adam Duskett <Aduskett@gmail.com>
[Thomas: add patch to fix build with uClibc.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Adam Duskett 2016-06-26 18:39:12 -04:00 committed by Thomas Petazzoni
parent d6b803f846
commit a3ebe45dcb
5 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
package/libsepol/0001-support-static-only.patch
View File

@ -7,37 +7,37 @@ libraries. It allows to support cases where the target architecture
does not have support for shared libraries. does not have support for shared libraries.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Adam Duskett <Aduskett@gmail.com>
Index: b/src/Makefile Index: b/src/Makefile
=================================================================== ===================================================================
diff --git a/src/Makefile b/src/Makefile
index db6c2ba..0006285 100644
--- a/src/Makefile --- a/src/Makefile
+++ b/src/Makefile +++ b/src/Makefile
@@ -17,7 +17,12 @@ @@ -30,8 +30,12 @@ LOBJS += $(sort $(patsubst %.c,%.lo,$(wildcard $(CILDIR)/src/*.c) $(CIL_GENERATE
CFLAGS ?= -Werror -Wall -W -Wundef -Wshadow -Wmissing-noreturn -Wmissing-format-attribute override CFLAGS += -I$(CILDIR)/include
override CFLAGS += -I. -I../include -D_GNU_SOURCE endif
-all: $(LIBA) $(LIBSO) $(LIBPC)
+ALL_TARGETS = $(LIBA) $(LIBPC) +ALL_TARGETS = $(LIBA) $(LIBPC)
+ifeq ($(STATIC),) +ifeq ($(STATIC),)
+ALL_TARGETS += $(LIBSO) +ALL_TARGETS += $(LIBSO)
+endif +endif
+
-all: $(LIBA) $(LIBSO) $(LIBPC)
+all: $(ALL_TARGETS) +all: $(ALL_TARGETS)
$(LIBA): $(OBJS) $(LIBA): $(OBJS)
$(AR) rcs $@ $^ @@ -70,7 +74,11 @@ install: all
@@ -39,11 +44,13 @@ install -m 755 $(LIBSO) $(SHLIBDIR)
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)
test -d $(LIBDIR)/pkgconfig || install -m 755 -d $(LIBDIR)/pkgconfig test -d $(LIBDIR)/pkgconfig || install -m 755 -d $(LIBDIR)/pkgconfig
install -m 644 $(LIBPC) $(LIBDIR)/pkgconfig install -m 644 $(LIBPC) $(LIBDIR)/pkgconfig
+ifeq ($(STATIC),) +ifeq ($(STATIC),)
+ test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR) + test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR)
+ install -m 755 $(LIBSO) $(SHLIBDIR) + install -m 755 $(LIBSO) $(SHLIBDIR)
cd $(LIBDIR) && ln -sf ../../`basename $(SHLIBDIR)`/$(LIBSO) $(TARGET) ln -sf --relative $(SHLIBDIR)/$(LIBSO) $(LIBDIR)/$(TARGET)
+endif +endif
relabel: relabel:

8
package/libsepol/0002-workaround-blackfin-issue.patch
View File

@ -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. proper execution, it just isn't as clean.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Adam Duskett <Aduskett@gmail.com>
Index: b/src/dso.h Index: b/src/dso.h
=================================================================== ===================================================================
--- a/src/dso.h --- a/src/dso.h
+++ b/src/dso.h +++ b/src/dso.h
@@ -1,7 +1,7 @@ @@ -5,7 +5,7 @@
#ifndef _SELINUX_DSO_H #define DISABLE_SYMVER 1
#define _SELINUX_DSO_H 1 #endif
-#ifdef SHARED -#ifdef SHARED
+#if defined(SHARED) && !defined(__bfin__) +#if defined(SHARED) && !defined(__bfin__)
# define hidden __attribute__ ((visibility ("hidden"))) # define hidden __attribute__ ((visibility ("hidden")))
# define hidden_proto(fct) __hidden_proto (fct, fct##_internal) # define hidden_proto(fct) __hidden_proto (fct, fct##_internal)
# define __hidden_proto(fct, internal) \ # define __hidden_proto(fct, internal) \

18
package/libsepol/0003-add-stdarg-include.patch Normal file
View File

@ -0,0 +1,18 @@
Add missing <stdarg.h> include
This is needed to fix the build on uClibc, due to the usage of
va_list.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
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 <stdlib.h>
+#include <stdarg.h>
#include <cil/cil.h>
#define MAX_LOG_SIZE 512

2
package/libsepol/libsepol.hash
View File

@ -1,2 +1,2 @@
# From https://github.com/SELinuxProject/selinux/wiki/Releases # From https://github.com/SELinuxProject/selinux/wiki/Releases
sha256 290d17f583635a4a5d8a2141511272adf0571c4205cdea38b5a68df20d58a70b libsepol-2.1.9.tar.gz sha256 2bdeec56d0a08b082b93b40703b4b3329cc5562152f7254d8f6ef6b56afe850a libsepol-2.5.tar.gz

4
package/libsepol/libsepol.mk
View File

@ -4,8 +4,8 @@
# #
################################################################################ ################################################################################
LIBSEPOL_VERSION = 2.1.9 LIBSEPOL_VERSION = 2.5
LIBSEPOL_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20130423 LIBSEPOL_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160223
LIBSEPOL_LICENSE = LGPLv2.1+ LIBSEPOL_LICENSE = LGPLv2.1+
LIBSEPOL_LICENSE_FILES = COPYING LIBSEPOL_LICENSE_FILES = COPYING