| 1 |
commit: a9525b09130d6057b3eb639ca85e3d21627571c7 |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun May 27 11:59:10 2018 +0000 |
| 4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 27 16:09:31 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9525b09 |
| 7 |
|
| 8 |
sys-libs/libsemanage: remove unused patch(es) |
| 9 |
|
| 10 |
...-genhomedircon-only-set-MLS-level-if-MLS-.patch | 38 ---------------------- |
| 11 |
.../files/libsemanage-2.6-build-paths.patch | 35 -------------------- |
| 12 |
2 files changed, 73 deletions(-) |
| 13 |
|
| 14 |
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 |
| 15 |
deleted file mode 100644 |
| 16 |
index e3123ed70fe..00000000000 |
| 17 |
--- a/sys-libs/libsemanage/files/libsemanage-2.6-0001-libsemanage-genhomedircon-only-set-MLS-level-if-MLS-.patch |
| 18 |
+++ /dev/null |
| 19 |
@@ -1,38 +0,0 @@ |
| 20 |
-From 4cf9b9ce2df06fd5a29e5264a6552c9b02ec0b5b Mon Sep 17 00:00:00 2001 |
| 21 |
-From: Stephen Smalley <sds@×××××××××.gov> |
| 22 |
-Date: Fri, 14 Oct 2016 13:36:37 -0400 |
| 23 |
-Subject: [PATCH] libsemanage: genhomedircon: only set MLS level if MLS is |
| 24 |
- enabled |
| 25 |
- |
| 26 |
-When a non-MLS policy was used with genhomedircon context_from_record() |
| 27 |
-in sepol would report an error because an MLS level was present when MLS |
| 28 |
-is disabled. Based on a patch by Gary Tierney, amended to use |
| 29 |
-sepol_policydb_mls_enabled rather than semanage_mls_enabled because |
| 30 |
-we are testing the temporary working policy, not the active policy. |
| 31 |
- |
| 32 |
-Reported-by: Jason Zaman <jason@×××××××××.com> |
| 33 |
-Signed-off-by: Stephen Smalley <sds@×××××××××.gov> |
| 34 |
---- |
| 35 |
- libsemanage/src/genhomedircon.c | 6 +++++- |
| 36 |
- 1 file changed, 5 insertions(+), 1 deletion(-) |
| 37 |
- |
| 38 |
-diff --git a/libsemanage/src/genhomedircon.c b/libsemanage/src/genhomedircon.c |
| 39 |
-index 6991fff..5e9d722 100644 |
| 40 |
---- libsemanage/src/genhomedircon.c |
| 41 |
-+++ libsemanage/src/genhomedircon.c |
| 42 |
-@@ -638,7 +638,11 @@ static int write_contexts(genhomedircon_settings_t *s, FILE *out, |
| 43 |
- goto fail; |
| 44 |
- } |
| 45 |
- |
| 46 |
-- if (sepol_context_set_user(sepolh, context, user->sename) < 0 || |
| 47 |
-+ if (sepol_context_set_user(sepolh, context, user->sename) < 0) { |
| 48 |
-+ goto fail; |
| 49 |
-+ } |
| 50 |
-+ |
| 51 |
-+ if (sepol_policydb_mls_enabled(s->policydb) && |
| 52 |
- sepol_context_set_mls(sepolh, context, user->level) < 0) { |
| 53 |
- goto fail; |
| 54 |
- } |
| 55 |
--- |
| 56 |
-2.7.3 |
| 57 |
- |
| 58 |
|
| 59 |
diff --git a/sys-libs/libsemanage/files/libsemanage-2.6-build-paths.patch b/sys-libs/libsemanage/files/libsemanage-2.6-build-paths.patch |
| 60 |
deleted file mode 100644 |
| 61 |
index 86e5c7e9a6b..00000000000 |
| 62 |
--- a/sys-libs/libsemanage/files/libsemanage-2.6-build-paths.patch |
| 63 |
+++ /dev/null |
| 64 |
@@ -1,35 +0,0 @@ |
| 65 |
-there's no point in using -I/-L flags to the system paths and this breaks |
| 66 |
-cross-compiling. just drop them. |
| 67 |
- |
| 68 |
---- a/src/Makefile |
| 69 |
-+++ b/src/Makefile |
| 70 |
-@@ -60,7 +60,7 @@ |
| 71 |
- SWIG_CFLAGS += -Wno-error -Wno-unused-but-set-variable -Wno-unused-variable -Wno-shadow \ |
| 72 |
- -Wno-unused-parameter |
| 73 |
- |
| 74 |
--override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE |
| 75 |
-+override CFLAGS += -I../include -D_GNU_SOURCE |
| 76 |
- RANLIB ?= ranlib |
| 77 |
- |
| 78 |
- SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./ |
| 79 |
-@@ -82,17 +82,17 @@ |
| 80 |
- $(CC) $(CFLAGS) $(SWIG_CFLAGS) $(RUBYINC) -fPIC -DSHARED -c -o $@ $< |
| 81 |
- |
| 82 |
- $(SWIGSO): $(SWIGLOBJ) |
| 83 |
-- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lsemanage -L$(LIBDIR) |
| 84 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lsemanage |
| 85 |
- |
| 86 |
- $(SWIGRUBYSO): $(SWIGRUBYLOBJ) |
| 87 |
-- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lsemanage -L$(LIBDIR) |
| 88 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lsemanage |
| 89 |
- |
| 90 |
- $(LIBA): $(OBJS) |
| 91 |
- $(AR) rcs $@ $^ |
| 92 |
- $(RANLIB) $@ |
| 93 |
- |
| 94 |
- $(LIBSO): $(LOBJS) |
| 95 |
-- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lsepol -laudit -lselinux -lbz2 -lustr -L$(LIBDIR) -Wl,-soname,$(LIBSO),--version-script=libsemanage.map,-z,defs |
| 96 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lsepol -laudit -lselinux -lbz2 -lustr -Wl,-soname,$(LIBSO),--version-script=libsemanage.map,-z,defs |
| 97 |
- ln -sf $@ $(TARGET) |
| 98 |
- |
| 99 |
- $(LIBPC): $(LIBPC).in ../VERSION |
Archives