From d4bd6695641f6d2ec7ff8681913d304e995902f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 29 May 2018 03:22:09 +0100 Subject: gentoo resync : 29.05.2018 --- sys-libs/Manifest.gz | Bin 15759 -> 15754 bytes sys-libs/libselinux/Manifest | 1 - ...x-2.6-0007-build-related-fixes-bug-500674.patch | 91 --------------------- sys-libs/libsemanage/Manifest | 6 +- ...-genhomedircon-only-set-MLS-level-if-MLS-.patch | 38 --------- .../files/libsemanage-2.6-build-paths.patch | 35 -------- sys-libs/libsemanage/libsemanage-2.8.ebuild | 2 +- sys-libs/libsemanage/libsemanage-9999.ebuild | 2 +- 8 files changed, 4 insertions(+), 171 deletions(-) delete mode 100644 sys-libs/libselinux/files/libselinux-2.6-0007-build-related-fixes-bug-500674.patch delete mode 100644 sys-libs/libsemanage/files/libsemanage-2.6-0001-libsemanage-genhomedircon-only-set-MLS-level-if-MLS-.patch delete mode 100644 sys-libs/libsemanage/files/libsemanage-2.6-build-paths.patch (limited to 'sys-libs') diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz index 8ce73a7427d7..0444deb12f66 100644 Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ 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) diff --git a/sys-libs/libsemanage/Manifest b/sys-libs/libsemanage/Manifest index fa5386b3585b..c1f4775cb670 100644 --- a/sys-libs/libsemanage/Manifest +++ b/sys-libs/libsemanage/Manifest @@ -1,8 +1,6 @@ -AUX libsemanage-2.6-0001-libsemanage-genhomedircon-only-set-MLS-level-if-MLS-.patch 1370 BLAKE2B fc666edd6f8f2e9ad1e92d8d4a459f721e44a0f934b1e15af9b05a14599b46c300c9a6af9f2fabc819da954c1d93418ae8cd86890e9c0afab90af78c65d4aadc SHA512 08663502d489730b2bcc2ea2e1a15fc3cb0874dff4d2b9e650fc6b71f74d8e395a6787186ba1d138bfa99897ba44a9acbbe7b695e88e98591a8ea9f4bc3857c3 -AUX libsemanage-2.6-build-paths.patch 1325 BLAKE2B 89806798190f645d1064830775e55f5ddbbc5bfe8615c96e5f603b6d4a3d655987993443d53e44761330480c0713f0dc26a7680a45558fe094b0ca0b3c5c0331 SHA512 06fb96608f27169efde64bf679b8cc3e337857e4b6cf0743953f96be7df382e11ea0a20837d854c73dc5c216cee8f9723e23b17fa1a7844d3a4b7ef4ebe937d2 DIST libsemanage-2.7.tar.gz 153465 BLAKE2B fb585b8caba394757dbabb7c0825086059578b7449cddd5ff19ffe13d4b2ed3938a03f307cee01d852ce3680485ee58cf0dba59cfbacbb660c988d9542ffdf55 SHA512 6b30ea87f1ab3944935188539bbf869c8e287e05c174ea61cd19722a89cf8156518f336476e23b4117a5a05aec9a99a4db679b58a6952bf0c31ad809e9ab91d9 DIST libsemanage-2.8.tar.gz 154200 BLAKE2B db987e42aed7177cd9b3d1e495c97878a816fe78d7c73631f475649d0ab4182e5966a9ee691f2d59863eab2b7a62f608bc00f0789f22401a54f18b41f6ebfb68 SHA512 53f09c79da168a79b853f55e0f1c20a96229df9d82929c514bcaf72697446ae836f7f0457fc0056d2418cc6d0712157faf0152881518fe84a1b1b9b9af17e7ef EBUILD libsemanage-2.7.ebuild 4758 BLAKE2B 3d5c1366e85a5be7ce44394eafc7a698d1721b4a242a03450c16f8cfaae2587c604741b1326123821330b63addcae5343be44dae489663251f0f855567fe7d40 SHA512 38217988193c9c0afe87497548e2d4239337f763a937025b7648435a8bfb1451ba2a2596349afd5acb768bf605f52967694af1f56b964e5ca0f3234cd3f0c1ac -EBUILD libsemanage-2.8.ebuild 4674 BLAKE2B c8117194c6e60645140f138526efeaafbe257ef4ef060b39dcee3d170c69dfcd215486bf84d38eb870d9a45c0e5df9c319bb3abe4ad78552cd0bd9e9b5296fd2 SHA512 6d5bbb372911cf7a80d57ba432eec048ee710ecfcd0fede674db4d0db152dd4c5eed854dbc9538b59807191a65bb175f8dd8b43cf6d1ccd202e85541ffad6f62 -EBUILD libsemanage-9999.ebuild 4674 BLAKE2B c8117194c6e60645140f138526efeaafbe257ef4ef060b39dcee3d170c69dfcd215486bf84d38eb870d9a45c0e5df9c319bb3abe4ad78552cd0bd9e9b5296fd2 SHA512 6d5bbb372911cf7a80d57ba432eec048ee710ecfcd0fede674db4d0db152dd4c5eed854dbc9538b59807191a65bb175f8dd8b43cf6d1ccd202e85541ffad6f62 +EBUILD libsemanage-2.8.ebuild 4682 BLAKE2B f732a87738e59f6b8043c7a3c42234f3a5a57b8b0f86ecb2bf63099acedea3e91ea20aef8fb864ec4ad3352018143376cbd7e2572207c7cb5cac308b074da1f0 SHA512 31a87af89af0c8f69a18da4791f0898006250da4e88319681dd21d1ca29f32c9796926045989b7f8d2640343dad2cfc1257b340c8d1c31984ca40cf672e1bfcf +EBUILD libsemanage-9999.ebuild 4682 BLAKE2B f732a87738e59f6b8043c7a3c42234f3a5a57b8b0f86ecb2bf63099acedea3e91ea20aef8fb864ec4ad3352018143376cbd7e2572207c7cb5cac308b074da1f0 SHA512 31a87af89af0c8f69a18da4791f0898006250da4e88319681dd21d1ca29f32c9796926045989b7f8d2640343dad2cfc1257b340c8d1c31984ca40cf672e1bfcf MISC metadata.xml 406 BLAKE2B c9f83aef9f66b26a895bad604ab829ba1d6b6865cb519ac23be395cfb9b81f06d35a3ac4602d5a0b53f0ca58e50a8ca71efba8dc8d70740294cee2a49ed0e777 SHA512 742aba47cdd9ad8f97fcb03a01cc2552c6e1d715f6b717c9dff2ae86ab34b850745888e4f2e3963ec2c258cf16a33cb161205f4ea72563446eada82f6c298479 diff --git a/sys-libs/libsemanage/files/libsemanage-2.6-0001-libsemanage-genhomedircon-only-set-MLS-level-if-MLS-.patch b/sys-libs/libsemanage/files/libsemanage-2.6-0001-libsemanage-genhomedircon-only-set-MLS-level-if-MLS-.patch deleted file mode 100644 index e3123ed70fe0..000000000000 --- a/sys-libs/libsemanage/files/libsemanage-2.6-0001-libsemanage-genhomedircon-only-set-MLS-level-if-MLS-.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4cf9b9ce2df06fd5a29e5264a6552c9b02ec0b5b Mon Sep 17 00:00:00 2001 -From: Stephen Smalley -Date: Fri, 14 Oct 2016 13:36:37 -0400 -Subject: [PATCH] libsemanage: genhomedircon: only set MLS level if MLS is - enabled - -When a non-MLS policy was used with genhomedircon context_from_record() -in sepol would report an error because an MLS level was present when MLS -is disabled. Based on a patch by Gary Tierney, amended to use -sepol_policydb_mls_enabled rather than semanage_mls_enabled because -we are testing the temporary working policy, not the active policy. - -Reported-by: Jason Zaman -Signed-off-by: Stephen Smalley ---- - libsemanage/src/genhomedircon.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/libsemanage/src/genhomedircon.c b/libsemanage/src/genhomedircon.c -index 6991fff..5e9d722 100644 ---- libsemanage/src/genhomedircon.c -+++ libsemanage/src/genhomedircon.c -@@ -638,7 +638,11 @@ static int write_contexts(genhomedircon_settings_t *s, FILE *out, - goto fail; - } - -- if (sepol_context_set_user(sepolh, context, user->sename) < 0 || -+ if (sepol_context_set_user(sepolh, context, user->sename) < 0) { -+ goto fail; -+ } -+ -+ if (sepol_policydb_mls_enabled(s->policydb) && - sepol_context_set_mls(sepolh, context, user->level) < 0) { - goto fail; - } --- -2.7.3 - diff --git a/sys-libs/libsemanage/files/libsemanage-2.6-build-paths.patch b/sys-libs/libsemanage/files/libsemanage-2.6-build-paths.patch deleted file mode 100644 index 86e5c7e9a6b7..000000000000 --- a/sys-libs/libsemanage/files/libsemanage-2.6-build-paths.patch +++ /dev/null @@ -1,35 +0,0 @@ -there's no point in using -I/-L flags to the system paths and this breaks -cross-compiling. just drop them. - ---- a/src/Makefile -+++ b/src/Makefile -@@ -60,7 +60,7 @@ - SWIG_CFLAGS += -Wno-error -Wno-unused-but-set-variable -Wno-unused-variable -Wno-shadow \ - -Wno-unused-parameter - --override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE -+override CFLAGS += -I../include -D_GNU_SOURCE - RANLIB ?= ranlib - - SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./ -@@ -82,17 +82,17 @@ - $(CC) $(CFLAGS) $(SWIG_CFLAGS) $(RUBYINC) -fPIC -DSHARED -c -o $@ $< - - $(SWIGSO): $(SWIGLOBJ) -- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lsemanage -L$(LIBDIR) -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lsemanage - - $(SWIGRUBYSO): $(SWIGRUBYLOBJ) -- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lsemanage -L$(LIBDIR) -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lsemanage - - $(LIBA): $(OBJS) - $(AR) rcs $@ $^ - $(RANLIB) $@ - - $(LIBSO): $(LOBJS) -- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lsepol -laudit -lselinux -lbz2 -lustr -L$(LIBDIR) -Wl,-soname,$(LIBSO),--version-script=libsemanage.map,-z,defs -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lsepol -laudit -lselinux -lbz2 -lustr -Wl,-soname,$(LIBSO),--version-script=libsemanage.map,-z,defs - ln -sf $@ $(TARGET) - - $(LIBPC): $(LIBPC).in ../VERSION diff --git a/sys-libs/libsemanage/libsemanage-2.8.ebuild b/sys-libs/libsemanage/libsemanage-2.8.ebuild index 0cc1dbbf8b49..f527f9bb25f7 100644 --- a/sys-libs/libsemanage/libsemanage-2.8.ebuild +++ b/sys-libs/libsemanage/libsemanage-2.8.ebuild @@ -116,7 +116,7 @@ multilib_src_install() { pkg_postinst() { # Migrate the SELinux semanage configuration store if not done already local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' "${EROOT}"/etc/selinux/config 2>/dev/null) - if [ -n "${selinuxtype}" ] && [ ! -d "${EROOT}"/var/lib/selinux/${mcs}/active ] ; then + if [ -n "${selinuxtype}" ] && [ ! -d "${EROOT}"/var/lib/selinux/${selinuxtype}/active ] ; then ewarn "Since the 2.4 SELinux userspace, the policy module store is moved" ewarn "from /etc/selinux to /var/lib/selinux. The migration will be run now." ewarn "If there are any issues, it can be done manually by running:" diff --git a/sys-libs/libsemanage/libsemanage-9999.ebuild b/sys-libs/libsemanage/libsemanage-9999.ebuild index 0cc1dbbf8b49..f527f9bb25f7 100644 --- a/sys-libs/libsemanage/libsemanage-9999.ebuild +++ b/sys-libs/libsemanage/libsemanage-9999.ebuild @@ -116,7 +116,7 @@ multilib_src_install() { pkg_postinst() { # Migrate the SELinux semanage configuration store if not done already local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' "${EROOT}"/etc/selinux/config 2>/dev/null) - if [ -n "${selinuxtype}" ] && [ ! -d "${EROOT}"/var/lib/selinux/${mcs}/active ] ; then + if [ -n "${selinuxtype}" ] && [ ! -d "${EROOT}"/var/lib/selinux/${selinuxtype}/active ] ; then ewarn "Since the 2.4 SELinux userspace, the policy module store is moved" ewarn "from /etc/selinux to /var/lib/selinux. The migration will be run now." ewarn "If there are any issues, it can be done manually by running:" -- cgit v1.2.3