* [gentoo-commits] repo/gentoo:master commit in: sys-libs/libsemanage/files/
@ 2017-10-10 6:46 Jason Zaman
0 siblings, 0 replies; 2+ messages in thread
From: Jason Zaman @ 2017-10-10 6:46 UTC (permalink / raw
To: gentoo-commits
commit: cea2f65ff016b6669ad3a8625f51a03958e3e471
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Oct 1 13:46:11 2017 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Mon Oct 9 18:45:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cea2f65f
sys-libs/libsemanage: remove unused patch
.../files/libsemanage-2.4-build-paths.patch | 35 ----------------------
1 file changed, 35 deletions(-)
diff --git a/sys-libs/libsemanage/files/libsemanage-2.4-build-paths.patch b/sys-libs/libsemanage/files/libsemanage-2.4-build-paths.patch
deleted file mode 100644
index 7eeb9befb31..00000000000
--- a/sys-libs/libsemanage/files/libsemanage-2.4-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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/libsemanage/files/
@ 2018-05-27 16:11 Aaron Bauman
0 siblings, 0 replies; 2+ messages in thread
From: Aaron Bauman @ 2018-05-27 16:11 UTC (permalink / raw
To: gentoo-commits
commit: a9525b09130d6057b3eb639ca85e3d21627571c7
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun May 27 11:59:10 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun May 27 16:09:31 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9525b09
sys-libs/libsemanage: remove unused patch(es)
...-genhomedircon-only-set-MLS-level-if-MLS-.patch | 38 ----------------------
.../files/libsemanage-2.6-build-paths.patch | 35 --------------------
2 files changed, 73 deletions(-)
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 e3123ed70fe..00000000000
--- 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 <sds@tycho.nsa.gov>
-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 <jason@perfinion.com>
-Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
----
- 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 86e5c7e9a6b..00000000000
--- 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-05-27 16:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-27 16:11 [gentoo-commits] repo/gentoo:master commit in: sys-libs/libsemanage/files/ Aaron Bauman
-- strict thread matches above, loose matches on Subject: below --
2017-10-10 6:46 Jason Zaman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox