| 1 |
naota 11/09/29 22:34:06 |
| 2 |
|
| 3 |
Added: tomoyo-tools-2.3.0_p20110929-flags-parallel.patch |
| 4 |
tomoyo-tools-2.3.0_p20110929-gentoo.patch |
| 5 |
Removed: tomoyo-tools-2.3.0_p20100820-flags-parallel.patch |
| 6 |
tomoyo-tools-2.3.0_p20100820-gentoo.patch |
| 7 |
Log: |
| 8 |
Version bumped. Bug #355823 |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.1 sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20110929-flags-parallel.patch |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20110929-flags-parallel.patch?rev=1.1&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20110929-flags-parallel.patch?rev=1.1&content-type=text/plain |
| 17 |
|
| 18 |
Index: tomoyo-tools-2.3.0_p20110929-flags-parallel.patch |
| 19 |
=================================================================== |
| 20 |
--- a/Makefile |
| 21 |
+++ b/Makefile |
| 22 |
@@ -1,12 +1,4 @@ |
| 23 |
-INSTALLDIR = / |
| 24 |
- |
| 25 |
-CC=gcc |
| 26 |
- |
| 27 |
-CFLAGS=-Wall -O2 ${shell $(CC) -Wno-pointer-sign -S -o /dev/null -x c - < /dev/null > /dev/null 2>&1 && echo "-Wno-pointer-sign"} |
| 28 |
- |
| 29 |
-export CC |
| 30 |
-export CFLAGS |
| 31 |
-export INSTALLDIR |
| 32 |
+CFLAGS += -Wall ${shell $(CC) -Wno-pointer-sign -S -o /dev/null -x c - < /dev/null > /dev/null 2>&1 && echo "-Wno-pointer-sign"} |
| 33 |
|
| 34 |
all: |
| 35 |
$(MAKE) -C sbin/ all |
| 36 |
--- a/kernel_test/Makefile |
| 37 |
+++ b/kernel_test/Makefile |
| 38 |
@@ -3,20 +3,18 @@ ALL_FILES = tomoyo_filesystem_test tomoyo_file_test tomoyo_rewrite_test newns to |
| 39 |
all: $(ALL_FILES) |
| 40 |
chmod 755 testall.sh |
| 41 |
|
| 42 |
-CC=gcc |
| 43 |
- |
| 44 |
-CFLAGS=-Wall -O2 ${shell $(CC) -Wno-pointer-sign -S -o /dev/null -x c - < /dev/null > /dev/null 2>&1 && echo "-Wno-pointer-sign"} |
| 45 |
+CFLAGS += -Wall ${shell $(CC) -Wno-pointer-sign -S -o /dev/null -x c - < /dev/null > /dev/null 2>&1 && echo "-Wno-pointer-sign"} |
| 46 |
|
| 47 |
# |
| 48 |
# Tools for kernel testing. |
| 49 |
# |
| 50 |
|
| 51 |
tomoyo_new_test: tomoyo_new_test.c include.h |
| 52 |
- $(CC) $(CFLAGS) -o tomoyo_new_test tomoyo_new_test.c -lutil |
| 53 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o tomoyo_new_test tomoyo_new_test.c -lutil |
| 54 |
chmod 700 tomoyo_new_test |
| 55 |
|
| 56 |
.c: include.h |
| 57 |
- $(CC) $(CFLAGS) -o $@ $< |
| 58 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< |
| 59 |
chmod 700 $@ |
| 60 |
|
| 61 |
# |
| 62 |
--- a/sbin/Makefile |
| 63 |
+++ b/sbin/Makefile |
| 64 |
@@ -9,7 +9,7 @@ install: all |
| 65 |
cp -af --remove-destination $(BUILD_FILES) $(INSTALLDIR)/sbin/ |
| 66 |
|
| 67 |
.c: |
| 68 |
- $(CC) $(CFLAGS) -o $@ $< |
| 69 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< |
| 70 |
|
| 71 |
clean: |
| 72 |
rm -f -- $(BUILD_FILES) |
| 73 |
--- a/usr_lib_tomoyo/Makefile |
| 74 |
+++ b/usr_lib_tomoyo/Makefile |
| 75 |
@@ -9,7 +9,7 @@ install: all |
| 76 |
cp -af --remove-destination $(BUILD_FILES) tomoyotools.conf ../README.tomoyo ../COPYING.tomoyo $(INSTALLDIR)/usr/lib/tomoyo/ |
| 77 |
|
| 78 |
.c: |
| 79 |
- $(CC) $(CFLAGS) -o $@ $< |
| 80 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< |
| 81 |
|
| 82 |
clean: |
| 83 |
rm -f -- $(BUILD_FILES) |
| 84 |
diff --git a/usr_sbin/Makefile b/usr_sbin/Makefile |
| 85 |
index cdaf507..2b7c4f0 100644 |
| 86 |
--- a/usr_sbin/Makefile |
| 87 |
+++ b/usr_sbin/Makefile |
| 88 |
@@ -14,17 +14,17 @@ $(BUILD_FILES): libtomoyotools.so |
| 89 |
sleep 10 |
| 90 |
|
| 91 |
libtomoyotools.so: tomoyotools.c tomoyotools.h |
| 92 |
- $(CC) $(CFLAGS) -fPIC tomoyotools.c -shared -Wl,-soname,libtomoyotools.so.1 -o libtomoyotools.so.1.0.1 |
| 93 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIC tomoyotools.c -shared -Wl,-soname,libtomoyotools.so.1 -o libtomoyotools.so.1.0.1 |
| 94 |
ln -sf libtomoyotools.so.1.0.1 libtomoyotools.so |
| 95 |
|
| 96 |
.c: |
| 97 |
- $(CC) $(CFLAGS) -o $@ $< -ltomoyotools -L. |
| 98 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -ltomoyotools -L. |
| 99 |
|
| 100 |
tomoyo-editpolicy: tomoyotools.h editpolicy*.c readline.h /usr/include/curses.h libtomoyotools.so |
| 101 |
- $(CC) $(CFLAGS) -o tomoyo-editpolicy editpolicy*.c -lncurses -ltomoyotools -L. -DCOLOR_ON |
| 102 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o tomoyo-editpolicy editpolicy*.c -lncurses -ltomoyotools -L. -DCOLOR_ON |
| 103 |
|
| 104 |
tomoyo-queryd: tomoyotools.h tomoyo-queryd.c readline.h /usr/include/curses.h libtomoyotools.so |
| 105 |
- $(CC) $(CFLAGS) -o tomoyo-queryd tomoyo-queryd.c -lncurses -ltomoyotools -L. |
| 106 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o tomoyo-queryd tomoyo-queryd.c -lncurses -ltomoyotools -L. |
| 107 |
|
| 108 |
install: all |
| 109 |
mkdir -p $(INSTALLDIR)/usr/sbin $(INSTALLDIR)/usr/lib |
| 110 |
|
| 111 |
|
| 112 |
|
| 113 |
1.1 sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20110929-gentoo.patch |
| 114 |
|
| 115 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20110929-gentoo.patch?rev=1.1&view=markup |
| 116 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20110929-gentoo.patch?rev=1.1&content-type=text/plain |
| 117 |
|
| 118 |
Index: tomoyo-tools-2.3.0_p20110929-gentoo.patch |
| 119 |
=================================================================== |
| 120 |
This is tomoyo-tools-2.2.0_p20090727-gentoo.patch blindly ported to 2.3.0. |
| 121 |
Every other change is included by now. |
| 122 |
|
| 123 |
--- usr_lib_tomoyo/init_policy.c 2011-01-17 22:50:05.241899861 +0100 |
| 124 |
+++ usr_lib_tomoyo/init_policy.c 2011-01-17 22:51:00.172806713 +0100 |
| 125 |
@@ -1106,6 +1106,10 @@ |
| 126 |
echo("file_pattern /etc/gshadow.\\$"); |
| 127 |
echo("file_pattern /etc/passwd.\\$"); |
| 128 |
echo("file_pattern /etc/shadow.\\$"); |
| 129 |
+ echo("file_pattern /etc/group.edit"); |
| 130 |
+ echo("file_pattern /etc/gshadow.edit"); |
| 131 |
+ echo("file_pattern /etc/passwd.edit"); |
| 132 |
+ echo("file_pattern /etc/shadow.edit"); |
| 133 |
echo("file_pattern /var/cache/logwatch/logwatch.\\*/"); |
| 134 |
echo("file_pattern /var/cache/logwatch/logwatch.\\*/\\*"); |
| 135 |
echo("file_pattern /var/tmp/sqlite_\\*"); |
Archives