Author: zbyniu Date: Sun Apr 16 23:47:57 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- up to 2.3
---- Files affected:
SOURCES:
setools-opt.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/setools-opt.patch
diff -u SOURCES/setools-opt.patch:1.1 SOURCES/setools-opt.patch:1.2
--- SOURCES/setools-opt.patch:1.1 Tue Mar 29 17:54:24 2005
+++ SOURCES/setools-opt.patch Mon Apr 17 01:47:52 2006
@@ -1,96 +1,87 @@
---- setools-2.0/Makefile.orig 2005-03-01 00:31:59.000000000 +0100
-+++ setools-2.0/Makefile 2005-03-12 16:47:17.401244528 +0100
-@@ -90,9 +90,9 @@
- endif
+diff -ur setools.org/libapol/Makefile setools.new/libapol/Makefile
+--- setools.org/libapol/Makefile 2006-01-23 16:58:42.000000000 +0100
++++ setools.new/libapol/Makefile 2006-04-17 00:31:08.188294750 +0200
+@@ -21,7 +21,7 @@
+ CFLAGS += -DLIBAPOL_POLICY_INSTALL_DIR='"$(POLICY_INSTALL_DIR)"'
+ CFLAGS += -DLIBAPOL_SELINUX_DIR='"$(SELINUX_DIR)"'
+ CFLAGS += -DLIBAPOL_DEFAULT_POLICY='"$(POLICY_SRC_FILE)"'
+-CFLAGS += -I.
++CFLAGS += -I. -fPIC
- ifeq ($(DEBUG), 0)
--CFLAGS = -Wall -O2 -fPIC $(TCL_INCLUDE) $(CC_DEFINES)
-+CFLAGS = -Wall $(OPT) $(TCL_INCLUDE) $(CC_DEFINES)
- else
--CFLAGS = -Wall -g $(TCL_INCLUDE) $(CC_DEFINES)
-+CFLAGS = -Wall $(OPT) -g $(TCL_INCLUDE) $(CC_DEFINES)
- #CFLAGS = -Wall -ansi -pedantic -g $(TCL_INCLUDE) $(CC_DEFINES)
- endif
+ LDFLAGS += -lfl
+
+diff -ur setools.org/libseaudit/Makefile setools.new/libseaudit/Makefile
+--- setools.org/libseaudit/Makefile 2006-01-23 16:58:42.000000000 +0100
++++ setools.new/libseaudit/Makefile 2006-04-17 00:32:42.678200000 +0200
+@@ -4,6 +4,7 @@
+ SEAUDIT_LIBS = libseaudit.a ../libapol/libapol.a $(LIBS)
+ CFLAGS += -D_GNU_SOURCE
+ CFLAGS += -DLIBSEAUDIT_VERSION_STRING='"$(shell cat VERSION)"'
++CFLAGS += -fPIC
+ LIBXML_FLAGS = `pkg-config --cflags libxml-2.0`
+
+ TARGET = libseaudit.so
+diff -ur setools.org/libsefs/fsdata.c setools.new/libsefs/fsdata.c
+--- setools.org/libsefs/fsdata.c 2006-01-23 16:58:42.000000000 +0100
++++ setools.new/libsefs/fsdata.c 2006-04-17 00:30:06.880463250 +0200
+@@ -10,7 +10,7 @@
+
+ #include "fsdata.h"
+ /* sqlite db stuff */
+-#include "sqlite/sqlite3.h"
++#include <sqlite3.h>
---- setools-2.0/libsefs/Makefile.orig 2005-03-01 00:31:59.000000000 +0100
-+++ setools-2.0/libsefs/Makefile 2005-03-29 13:52:13.652651704 +0200
+ /* SE Linux includes*/
+ #include <selinux/selinux.h>
+diff -ur setools.org/libsefs/Makefile setools.new/libsefs/Makefile
+--- setools.org/libsefs/Makefile 2006-01-23 16:58:42.000000000 +0100
++++ setools.new/libsefs/Makefile 2006-04-17 00:29:01.912403000 +0200
@@ -14,7 +14,7 @@
LIBSO = $(TARGET).$(shell cat VERSION)
--CFLAGS += -I. -I../libapol
+-CFLAGS += -I. -I../libapol
+CFLAGS += -I. -I../libapol -fPIC
- all: sqlite libsefs $(LIBSO)
-
-@@ -23,13 +23,13 @@
- sqlite: nothing
- cd sqlite; $(MAKE)
+ all: libsefs libsefsso
--libsefs: sqlite libsefs.a
-+libsefs: libsefs.a
+@@ -25,10 +25,10 @@
+ $(MAKE) -C sqlite all
--$(LIBSO): $(LIB-OBJ) $(SQL-OBJ)
-- $(CC) $(LDFLAGS) -shared -o $(LIBSO) $^ -Wl,-soname,$(SONAME)
-+$(LIBSO): $(LIB-OBJ)
-+ $(CC) $(LDFLAGS) -shared -o $(LIBSO) $^ -Wl,-soname,$(SONAME) -lsqlite3
+ $(LIBSO): sqlite $(LIB-OBJ)
+- $(CC) $(LDFLAGS) -shared -o $(LIBSO) $(LIB-OBJ) $(SQL-OBJ)
-Wl,-soname,$(SONAME)
++ $(CC) $(LDFLAGS) -shared -o $(LIBSO) $(LIB-OBJ) $(SQL-OBJ)
-Wl,-soname,$(SONAME) -lsqlite3
- libsefs.a: $(LIB-OBJ)
+ libsefs.a: sqlite $(LIB-OBJ)
- ar cr $@ $(LIB-OBJ) $(SQL-OBJ)
+ ar cr $@ $(LIB-OBJ)
- install-libsefs-shared: $(LIBSO)
+ install-libsefs-shared: $(LIBSO) install-includes
install -m 755 $(LIBSO) $(SHARED_LIB_INSTALL_DIR)
---- setools-2.0/libsefs/fsdata.c.orig 2005-03-01 00:31:59.000000000 +0100
-+++ setools-2.0/libsefs/fsdata.c 2005-03-29 13:52:32.959716584 +0200
-@@ -10,7 +10,7 @@
-
- #include "fsdata.h"
- /* sqlite db stuff */
--#include "sqlite/sqlite3.h"
-+#include <sqlite3.h>
-
-
- /* SE Linux includes*/
---- setools-2.0/libapol/Makefile.orig 2005-03-01 00:31:59.000000000 +0100
-+++ setools-2.0/libapol/Makefile 2005-03-29 14:04:13.687189816 +0200
-@@ -22,7 +22,7 @@
- CFLAGS += -DLIBAPOL_POLICY_INSTALL_DIR='"$(POLICY_INSTALL_DIR)"'
- CFLAGS += -DLIBAPOL_SELINUX_DIR='"$(SELINUX_DIR)"'
- CFLAGS += -DLIBAPOL_DEFAULT_POLICY='"$(POLICY_SRC_FILE)"'
--CFLAGS += -I.
-+CFLAGS += -I. -fPIC
-
- all: libapol libapol-tcl libapolso libapol-tclso
+diff -ur setools.org/Makefile setools.new/Makefile
+--- setools.org/Makefile 2006-01-23 16:58:42.000000000 +0100
++++ setools.new/Makefile 2006-04-17 00:24:58.009160000 +0200
+@@ -89,9 +89,9 @@
+ endif
---- setools-2.0/libseuser/Makefile.orig 2005-03-01 00:31:59.000000000
+0100
-+++ setools-2.0/libseuser/Makefile 2005-03-29 14:04:45.020426440 +0200
-@@ -6,6 +6,7 @@
-
- CFLAGS += -DLIBSEUSER_VERSION_STRING='"$(shell cat VERSION)"'
- CFLAGS += -DSETFILES_PROG='"$(SETFILES_PROG)"'
-+CFLAGS += -fPIC
-
- TARGET = libseuser.so
- SONAME = $(TARGET).1
---- setools-2.0/libseaudit/Makefile.orig 2005-03-01 00:31:59.000000000
+0100
-+++ setools-2.0/libseaudit/Makefile 2005-03-29 14:05:11.066466840 +0200
-@@ -3,6 +3,7 @@
- SEAUDIT_LIBS = libseaudit.a ../libapol/libapol.a $(LIBS)
- CFLAGS += -D_GNU_SOURCE
- CFLAGS += -DLIBSEAUDIT_VERSION_STRING='"$(shell cat VERSION)"'
-+CFLAGS += -fPIC
- LIBXML_FLAGS = `pkg-config --cflags libxml-2.0`
+ ifeq ($(DEBUG), 0)
+-CFLAGS = -Wall -O2 -fPIC $(CC_DEFINES)
++CFLAGS = $(OPT) -fPIC $(CC_DEFINES)
+ else
+-CFLAGS = -Wall -g -fPIC $(CC_DEFINES) -DDEBUG
++CFLAGS = $(OPT) -fPIC $(CC_DEFINES) -DDEBUG
+ #CFLAGS = -Wall -ansi -pedantic -g $(CC_DEFINES)
+ endif
- TARGET = libseaudit.so
---- setools-2.0/secmds/Makefile.orig 2005-03-01 00:31:59.000000000 +0100
-+++ setools-2.0/secmds/Makefile 2005-03-29 15:22:33.467714576 +0200
-@@ -56,7 +56,7 @@
+diff -ur setools.org/secmds/Makefile setools.new/secmds/Makefile
+--- setools.org/secmds/Makefile 2006-01-20 23:01:04.000000000 +0100
++++ setools.new/secmds/Makefile 2006-04-17 00:52:47.641505500 +0200
+@@ -47,7 +47,7 @@
$(CC) -c indexcon.c $(CFLAGS) $(INCLUDE)
- indexcon: indexcon.o $(LIBAPOL) $(LIBSEFS)
-- $(CC) -static -o $@ indexcon.o $(LINKFLAGS) $(STATICSEFS)
$(LIBSELINUXSO) $(STATICAPOL) $(LIBS)
-+ $(CC) -o $@ indexcon.o $(LINKFLAGS) $(LIBSEFS) $(LIBSELINUXSO)
$(LIBAPOL) $(LIBS)
+ indexcon: indexcon.o $(LIBSEFS) $(LIBAPOL)
+- $(CC) -o $@ indexcon.o $(LINKFLAGS) $(STATICSEFS) $(LIBSELINUXSO)
$(STATICAPOL) $(LIBS)
++ $(CC) -o $@ indexcon.o $(LINKFLAGS) $(STATICSEFS) $(LIBSELINUXSO)
$(STATICAPOL) $(LIBS) -lsqlite3
searchcon.o: searchcon.c
$(CC) -c searchcon.c $(CFLAGS) $(INCLUDE)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/setools-opt.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
