gentoo resync : 29.05.2018

2 files changed, 0 insertions, 92 deletions

diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index fd7bee452d6f..9710a85c6e07 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,4 +1,3 @@
-AUX libselinux-2.6-0007-build-related-fixes-bug-500674.patch 3565 BLAKE2B 6e06cce02897a17e549a6fdfea1ecd0c5826c8810893d8ff0167dd72ce3c442ca2c433e4cccf9ed857b0b05bea1bee8dd37d8c212a7a2b10327efbfb4e18dcd5 SHA512 d377c6be001edb874e443d1a3992633bffef8b243ba73757e83b348d9db988be1af1239820471f4d319ea76a308148b5b06c23178910bfd032892ea861a47cd4
 DIST libselinux-2.7.tar.gz 187574 BLAKE2B cc6ee51d5015943dd73fe16efb2ce2478616f43eaf7da55655de50502010e69973c2de13c8a562c8814a31211a8dbd7200fa2f22761f3d0f81fa3a1d3cd1e998 SHA512 415d10306692d4323455b61fb61d7e56e53b9144276ff206d72760e1df9b04ab07c62a4d6f04bf4e5fa708f9f14b21a9801069b16ece0a0aade886950941ab8d
 DIST libselinux-2.8.tar.gz 187759 BLAKE2B 1e0e1a5aa2230fd6080e921efe871e97fa9412176b72a0c9721f60c6190459e508644fa3370f3b5f513f088428844c7c615cda4567990ddee91c13e1ee88f9ed SHA512 2f15d08888fbef9b0cf7bf01893b513edc6738974e2d0eab7e3f79cef9be79cf966742b0d2693b5d2ec7defddb5f4d6c6f6280be9d4158ed41f7a18d50b9f019
 EBUILD libselinux-2.7.ebuild 4019 BLAKE2B f5dfa22a258e893e7b084196a45e45ee3a9b8ceb2da5ebef5b7d329c4e37149197d0cbdf31e569dfaaf4881120a2ec80d25911bf47c1ec4f8ee9ffa55edf48ea SHA512 62ef94ea79e87533e38a9b98128f65dc8cc7179ba4993f2d346d543db0aa3658fc1741028f7e75a645d6e514fd41ea724ed55cf5a094c71c290f6117235dc677
diff --git a/sys-libs/libselinux/files/libselinux-2.6-0007-build-related-fixes-bug-500674.patch b/sys-libs/libselinux/files/libselinux-2.6-0007-build-related-fixes-bug-500674.patch
deleted file mode 100644
index 83596e8e0a7f..000000000000
--- a/sys-libs/libselinux/files/libselinux-2.6-0007-build-related-fixes-bug-500674.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-https://bugs.gentoo.org/500674
-
-random fixes:
-- make sure PCRE_CFLAGS get used
-- use PCRE_LIBS via pkg-config
-- move LDFLAGS to before objects, not after
-- do not hardcode -L$(LIBDIR) (let the toolchain handle it)
-- do not hardcode -I$(INCLUDEDIR) (let the toolchain handle it)
-
-diff --git a/libselinux/Makefile b/libselinux/Makefile
-index baa0db3..4dc5aa0 100644
---- libselinux/Makefile
-+++ libselinux/Makefile
-@@ -1,5 +1,6 @@
- SUBDIRS = src include utils man
- 
-+PKG_CONFIG ?= pkg-config
- DISABLE_SETRANS ?= n
- DISABLE_RPM ?= n
- ANDROID_HOST ?= n
-@@ -20,10 +21,11 @@ export DISABLE_SETRANS DISABLE_RPM DISABLE_FLAGS ANDROID_HOST
- 
- USE_PCRE2 ?= n
- ifeq ($(USE_PCRE2),y)
--	PCRE_CFLAGS := -DUSE_PCRE2 -DPCRE2_CODE_UNIT_WIDTH=8
--	PCRE_LDFLAGS := -lpcre2-8
-+	PCRE_CFLAGS := -DUSE_PCRE2 -DPCRE2_CODE_UNIT_WIDTH=8 $(shell $(PKG_CONFIG) --cflags libpcre2-8)
-+	PCRE_LDFLAGS := $(shell $(PKG_CONFIG) --libs libpcre2-8)
- else
--	PCRE_LDFLAGS := -lpcre
-+	PCRE_CFLAGS := $(shell $(PKG_CONFIG) --cflags libpcre)
-+	PCRE_LDFLAGS := $(shell $(PKG_CONFIG) --libs libpcre)
- endif
- export PCRE_CFLAGS PCRE_LDFLAGS
- 
-diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile
-index 13501cd..42cb2f6 100644
---- libselinux/src/Makefile
-+++ libselinux/src/Makefile
-@@ -67,7 +67,7 @@ CFLAGS ?= -O -Wall -W -Wundef -Wformat-y2k -Wformat-security -Winit-self -Wmissi
- 
- PCRE_LDFLAGS ?= -lpcre
- 
--override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE $(DISABLE_FLAGS) $(PCRE_CFLAGS)
-+override CFLAGS += -I../include -D_GNU_SOURCE $(DISABLE_FLAGS) $(PCRE_CFLAGS)
- 
- SWIG_CFLAGS += -Wno-error -Wno-unused-variable -Wno-unused-but-set-variable -Wno-unused-parameter \
- 		-Wno-shadow -Wno-uninitialized -Wno-missing-prototypes -Wno-missing-declarations
-@@ -107,17 +107,17 @@ $(SWIGRUBYLOBJ): $(SWIGRUBYCOUT)
- 	$(CC) $(CFLAGS) $(SWIG_CFLAGS) $(RUBYINC) -fPIC -DSHARED -c -o $@ $<
- 
- $(SWIGSO): $(SWIGLOBJ)
--	$(CC) $(CFLAGS) -shared -o $@ $< -L. -lselinux $(LDFLAGS) -L$(LIBDIR)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux
- 
- $(SWIGRUBYSO): $(SWIGRUBYLOBJ)
--	$(CC) $(CFLAGS) -shared -o $@ $^ -L. -lselinux $(LDFLAGS) -L$(LIBDIR)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux
- 
- $(LIBA): $(OBJS)
- 	$(AR) rcs $@ $^
- 	$(RANLIB) $@
- 
- $(LIBSO): $(LOBJS)
--	$(CC) $(CFLAGS) -shared -o $@ $^ $(PCRE_LDFLAGS) -ldl $(LDFLAGS) -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ $(PCRE_LDFLAGS) -ldl -Wl,-soname,$(LIBSO),-z,defs,-z,relro
- 	ln -sf $@ $(TARGET) 
- 
- $(LIBPC): $(LIBPC).in ../VERSION
-@@ -130,7 +130,7 @@ $(AUDIT2WHYLOBJ): audit2why.c
- 	$(CC) $(filter-out -Werror, $(CFLAGS)) $(PYINC) -fPIC -DSHARED -c -o $@ $<
- 
- $(AUDIT2WHYSO): $(AUDIT2WHYLOBJ)
--	$(CC) $(CFLAGS) -shared -o $@ $^ -L. $(LDFLAGS) -lselinux $(LIBDIR)/libsepol.a -L$(LIBDIR)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux $(LIBDIR)/libsepol.a
- 
- %.o:  %.c policy.h
- 	$(CC) $(CFLAGS) $(TLSFLAGS) -c -o $@ $<
-diff --git a/libselinux/utils/Makefile b/libselinux/utils/Makefile
-index e56a953..6fd205a 100644
---- libselinux/utils/Makefile
-+++ libselinux/utils/Makefile
-@@ -25,7 +25,7 @@ CFLAGS ?= -O -Wall -W -Wundef -Wformat-y2k -Wformat-security -Winit-self -Wmissi
-           -fipa-pure-const -Wno-suggest-attribute=pure -Wno-suggest-attribute=const \
-           -Werror -Wno-aggregate-return -Wno-redundant-decls
- override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE $(DISABLE_FLAGS) $(PCRE_CFLAGS)
--LDLIBS += -L../src -lselinux -L$(LIBDIR)
-+LDLIBS += -L../src -lselinux
- PCRE_LDFLAGS ?= -lpcre
- 
- ifeq ($(ANDROID_HOST),y)