r529 - in devmapper/trunk/debian: . patches

Bastian Blank waldi at alioth.debian.org
Tue Jan 8 16:40:51 UTC 2008


Author: waldi
Date: Tue Jan  8 16:40:50 2008
New Revision: 529

Log:
Always export selinux function.

* debian/changelog: Update.
* debian/patches/series: Add abi.patch.
* debian/patches/abi.patch: Add.


Added:
   devmapper/trunk/debian/patches/abi.patch
Modified:
   devmapper/trunk/debian/changelog
   devmapper/trunk/debian/patches/series

Modified: devmapper/trunk/debian/changelog
==============================================================================
--- devmapper/trunk/debian/changelog	(original)
+++ devmapper/trunk/debian/changelog	Tue Jan  8 16:40:50 2008
@@ -1,3 +1,9 @@
+devmapper (2:1.02.24-3) UNRELEASED; urgency=low
+
+  * Always export selinux function.
+
+ -- Bastian Blank <waldi at debian.org>  Tue, 08 Jan 2008 16:35:12 +0000
+
 devmapper (2:1.02.24-2) unstable; urgency=low
 
   * Build depend against automake.

Added: devmapper/trunk/debian/patches/abi.patch
==============================================================================
--- (empty file)
+++ devmapper/trunk/debian/patches/abi.patch	Tue Jan  8 16:40:50 2008
@@ -0,0 +1,35 @@
+--- trunk.orig/lib/libdm-common.c
++++ trunk/lib/libdm-common.c
+@@ -233,9 +233,9 @@
+ 	return 1;
+ }
+ 
+-#ifdef HAVE_SELINUX
+ int dm_set_selinux_context(const char *path, mode_t mode)
+ {
++#ifdef HAVE_SELINUX
+ 	security_context_t scontext;
+ 
+ 	if (is_selinux_enabled() <= 0)
+@@ -256,9 +256,9 @@
+ 	}
+ 
+ 	freecon(scontext);
++#endif
+ 	return 1;
+ }
+-#endif
+ 
+ static int _add_dev_node(const char *dev_name, uint32_t major, uint32_t minor,
+ 			 uid_t uid, gid_t gid, mode_t mode)
+@@ -302,10 +302,8 @@
+ 
+ 	log_debug("Created %s", path);
+ 
+-#ifdef HAVE_SELINUX
+ 	if (!dm_set_selinux_context(path, S_IFBLK))
+ 		return 0;
+-#endif
+ 
+ 	return 1;
+ }

Modified: devmapper/trunk/debian/patches/series
==============================================================================
--- devmapper/trunk/debian/patches/series	(original)
+++ devmapper/trunk/debian/patches/series	Tue Jan  8 16:40:50 2008
@@ -2,3 +2,4 @@
 libs-cleanup.patch
 install.patch
 pkgconfig.patch
+abi.patch



More information about the pkg-lvm-commits mailing list