SOURCES: dmraid-selinux-static.patch - proper fix

baggins baggins at pld-linux.org
Thu Mar 19 00:19:31 CET 2009


Author: baggins                      Date: Wed Mar 18 23:19:30 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- proper fix

---- Files affected:
SOURCES:
   dmraid-selinux-static.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/dmraid-selinux-static.patch
diff -u SOURCES/dmraid-selinux-static.patch:1.3 SOURCES/dmraid-selinux-static.patch:1.4
--- SOURCES/dmraid-selinux-static.patch:1.3	Tue May 16 21:59:34 2006
+++ SOURCES/dmraid-selinux-static.patch	Thu Mar 19 00:19:25 2009
@@ -1,16 +1,17 @@
 diff -ur dmraid/1.0.0.rc7/tools/Makefile.in dmraid.new/1.0.0.rc7/tools/Makefile.in
 --- dmraid/1.0.0.rc7/tools/Makefile.in	2005-03-11 12:47:28.000000000 +0000
 +++ dmraid.new/1.0.0.rc7/tools/Makefile.in	2005-04-17 12:35:13.262390032 +0000
-@@ -40,6 +40,7 @@
+@@ -40,6 +40,13 @@
  		DMRAIDLIBS += -rdynamic
  	else
  		LDFLAGS += -static
-+		DMRAIDLIBS += -lselinux -lsepol
++		ifeq ("@LIBSELINUX@", "yes")
++			DMRAIDLIBS += -lselinux
++		endif
++
++		ifeq ("@LIBSEPOL@", "yes")
++			DMRAIDLIBS += -lsepol
++		endif
  	endif
  endif
  
-@@ -64,3 +65,4 @@
- 	done
- 
- remove:	remove_dmraid_tools
-+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/dmraid-selinux-static.patch?r1=1.3&r2=1.4&f=u



More information about the pld-cvs-commit mailing list