60 lines
2.1 KiB
Diff
60 lines
2.1 KiB
Diff
|
Index: tomoyo-tools/usr_sbin/Makefile
|
||
|
|
===================================================================
|
||
|
|
--- tomoyo-tools.orig/usr_sbin/Makefile
|
||
|
|
+++ tomoyo-tools/usr_sbin/Makefile
|
||
|
|
@@ -18,7 +18,7 @@ libtomoyotools.so: tomoyotools.c tomoyot
|
||
|
|
ln -sf libtomoyotools.so.1.0.0 libtomoyotools.so
|
||
|
|
|
||
|
|
.c:
|
||
|
|
- $(CC) $(CFLAGS) -o $@ -ltomoyotools -L. $<
|
||
|
|
+ $(CC) $(CFLAGS) -o $@ $< -ltomoyotools -L.
|
||
|
|
|
||
|
|
install: all
|
||
|
|
mkdir -p $(INSTALLDIR)/usr/sbin $(INSTALLDIR)/usr/lib
|
||
|
|
Index: tomoyo-tools/sbin/Makefile
|
||
|
|
===================================================================
|
||
|
|
--- tomoyo-tools.orig/sbin/Makefile
|
||
|
|
+++ tomoyo-tools/sbin/Makefile
|
||
|
|
@@ -5,7 +5,6 @@ all: $(BUILD_FILES)
|
||
|
|
install: all
|
||
|
|
mkdir -p $(INSTALLDIR)/sbin
|
||
|
|
chmod 700 $(BUILD_FILES)
|
||
|
|
- chown -R root:root .
|
||
|
|
cp -af --remove-destination $(BUILD_FILES) $(INSTALLDIR)/sbin/
|
||
|
|
|
||
|
|
.c:
|
||
|
|
Index: tomoyo-tools/usr_lib_tomoyo/Makefile
|
||
|
|
===================================================================
|
||
|
|
--- tomoyo-tools.orig/usr_lib_tomoyo/Makefile
|
||
|
|
+++ tomoyo-tools/usr_lib_tomoyo/Makefile
|
||
|
|
@@ -2,11 +2,12 @@ BUILD_FILES = tomoyo-notifyd tomoyo-edit
|
||
|
|
|
||
|
|
all: $(BUILD_FILES)
|
||
|
|
|
||
|
|
+LIB=lib
|
||
|
|
+
|
||
|
|
install: all
|
||
|
|
- mkdir -p $(INSTALLDIR)/usr/lib/tomoyo
|
||
|
|
- chmod 755 $(INSTALLDIR)/usr/lib/tomoyo
|
||
|
|
- chown -R root:root .
|
||
|
|
- cp -af --remove-destination $(BUILD_FILES) tomoyotools.conf ../README.tomoyo ../COPYING.tomoyo $(INSTALLDIR)/usr/lib/tomoyo/
|
||
|
|
+ mkdir -p $(INSTALLDIR)/usr/$(LIB)/tomoyo
|
||
|
|
+ chmod 755 $(INSTALLDIR)/usr/$(LIB)/tomoyo
|
||
|
|
+ cp -af --remove-destination $(BUILD_FILES) tomoyotools.conf ../README.tomoyo ../COPYING.tomoyo $(INSTALLDIR)/usr/$(LIB)/tomoyo/
|
||
|
|
|
||
|
|
.c:
|
||
|
|
$(CC) $(CFLAGS) -o $@ $<
|
||
|
|
Index: tomoyo-tools/usr_sbin/editpolicy.h
|
||
|
|
===================================================================
|
||
|
|
--- tomoyo-tools.orig/usr_sbin/editpolicy.h
|
||
|
|
+++ tomoyo-tools/usr_sbin/editpolicy.h
|
||
|
|
@@ -151,7 +151,7 @@ enum tomoyo_color_pair {
|
||
|
|
|
||
|
|
#define CCS_HEADER_LINES 3
|
||
|
|
|
||
|
|
-#define CCS_CONFIG_FILE "/usr/lib/tomoyo/tomoyotools.conf"
|
||
|
|
+#define CCS_CONFIG_FILE "/etc/tomoyotools.conf"
|
||
|
|
|
||
|
|
int tomoyo_add_address_group_policy(char *data, const _Bool is_delete);
|
||
|
|
int tomoyo_add_number_group_policy(char *data, const _Bool is_delete);
|