* [gentoo-commits] gentoo-x86 commit in sys-libs/libselinux/files: libselinux-2.1.12-mountsys.patch libselinux-2.1.9-support_ruby19.patch
@ 2012-10-09 20:00 Sven Vermeulen (swift)
0 siblings, 0 replies; only message in thread
From: Sven Vermeulen (swift) @ 2012-10-09 20:00 UTC (permalink / raw
To: gentoo-commits
swift 12/10/09 20:00:13
Added: libselinux-2.1.12-mountsys.patch
libselinux-2.1.9-support_ruby19.patch
Log:
New upstream SELinux utilities release
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Revision Changes Path
1.1 sys-libs/libselinux/files/libselinux-2.1.12-mountsys.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libselinux/files/libselinux-2.1.12-mountsys.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libselinux/files/libselinux-2.1.12-mountsys.patch?rev=1.1&content-type=text/plain
Index: libselinux-2.1.12-mountsys.patch
===================================================================
diff -ur libselinux-2.1.12.orig/src/load_policy.c libselinux-2.1.12/src/load_policy.c
--- libselinux-2.1.12.orig/src/load_policy.c 2012-09-29 09:32:18.374170451 +0200
+++ libselinux-2.1.12/src/load_policy.c 2012-09-29 09:34:05.130172917 +0200
@@ -370,8 +370,16 @@
* mount it if present for use in the calls below.
*/
const char *mntpoint = NULL;
- if (mount(SELINUXFS, SELINUXMNT, SELINUXFS, 0, 0) == 0 || errno == EBUSY) {
- mntpoint = SELINUXMNT;
+ /* First make sure /sys is mounted */
+ if (mount("sysfs", "/sys", "sysfs", 0, 0) == 0 || errno == EBUSY) {
+ if (mount(SELINUXFS, SELINUXMNT, SELINUXFS, 0, 0) == 0 || errno == EBUSY) {
+ mntpoint = SELINUXMNT;
+ } else {
+ /* check old mountpoint */
+ if (mount(SELINUXFS, OLDSELINUXMNT, SELINUXFS, 0, 0) == 0 || errno == EBUSY) {
+ mntpoint = OLDSELINUXMNT;
+ }
+ }
} else {
/* check old mountpoint */
if (mount(SELINUXFS, OLDSELINUXMNT, SELINUXFS, 0, 0) == 0 || errno == EBUSY) {
1.1 sys-libs/libselinux/files/libselinux-2.1.9-support_ruby19.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libselinux/files/libselinux-2.1.9-support_ruby19.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libselinux/files/libselinux-2.1.9-support_ruby19.patch?rev=1.1&content-type=text/plain
Index: libselinux-2.1.9-support_ruby19.patch
===================================================================
diff -ur libselinux-2.1.9.orig/src/Makefile libselinux-2.1.9/src/Makefile
--- libselinux-2.1.9.orig/src/Makefile 2012-10-06 21:11:43.140757973 +0200
+++ libselinux-2.1.9/src/Makefile 2012-10-06 21:12:54.896758126 +0200
@@ -15,7 +15,7 @@
PYLIBDIR ?= $(LIBDIR)/$(PYLIBVER)
RUBYLIBVER ?= $(shell ruby -e 'print RUBY_VERSION.split(".")[0..1].join(".")')
RUBYPLATFORM ?= $(shell ruby -e 'print RUBY_PLATFORM')
-RUBYINC ?= $(LIBDIR)/ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
+RUBYINC ?= $(shell pkg-config --cflags ruby-$(RUBYLIBVER))
RUBYINSTALL ?= $(LIBDIR)/ruby/site_ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
LIBBASE=$(shell basename $(LIBDIR))
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-10-09 20:00 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-09 20:00 [gentoo-commits] gentoo-x86 commit in sys-libs/libselinux/files: libselinux-2.1.12-mountsys.patch libselinux-2.1.9-support_ruby19.patch Sven Vermeulen (swift)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox