| 1 |
naota 12/06/01 07:56:06 |
| 2 |
|
| 3 |
Added: tomoyo-tools-2.2.0_p20120414-gentoo.patch |
| 4 |
tomoyo-tools-2.5.0_p20120414-flags-parallel.patch |
| 5 |
tomoyo-tools-2.3.0_p20120414-flags-parallel.patch |
| 6 |
tomoyo-tools-2.2.0_p20120414-ldflags.patch |
| 7 |
Removed: tomoyo-tools-2.5.0_p20111025-flags-parallel.patch |
| 8 |
tomoyo-tools-2.2.0_p20110211-ldflags.patch |
| 9 |
tomoyo-tools-2.3.0_p20110929-flags-parallel.patch |
| 10 |
tomoyo-tools-2.2.0_p20110211-gentoo.patch |
| 11 |
Log: |
| 12 |
Version bump. Drop old. |
| 13 |
|
| 14 |
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64) |
| 15 |
|
| 16 |
Revision Changes Path |
| 17 |
1.1 sys-apps/tomoyo-tools/files/tomoyo-tools-2.2.0_p20120414-gentoo.patch |
| 18 |
|
| 19 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/tomoyo-tools/files/tomoyo-tools-2.2.0_p20120414-gentoo.patch?rev=1.1&view=markup |
| 20 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/tomoyo-tools/files/tomoyo-tools-2.2.0_p20120414-gentoo.patch?rev=1.1&content-type=text/plain |
| 21 |
|
| 22 |
Index: tomoyo-tools-2.2.0_p20120414-gentoo.patch |
| 23 |
=================================================================== |
| 24 |
diff -Naur tomoyo-tools.orig/tomoyo_init_policy.c tomoyo-tools/tomoyo_init_policy.c |
| 25 |
--- tomoyo-tools.orig/tomoyo_init_policy.c 2009-07-27 15:00:00.000000000 +0900 |
| 26 |
+++ tomoyo-tools/tomoyo_init_policy.c 2009-07-29 01:56:32.000000000 +0900 |
| 27 |
@@ -1238,6 +1259,10 @@ |
| 28 |
echo("file_pattern /etc/gshadow.\\$"); |
| 29 |
echo("file_pattern /etc/passwd.\\$"); |
| 30 |
echo("file_pattern /etc/shadow.\\$"); |
| 31 |
+ echo("file_pattern /etc/group.edit"); |
| 32 |
+ echo("file_pattern /etc/gshadow.edit"); |
| 33 |
+ echo("file_pattern /etc/passwd.edit"); |
| 34 |
+ echo("file_pattern /etc/shadow.edit"); |
| 35 |
echo("file_pattern /var/cache/logwatch/logwatch.\\*/"); |
| 36 |
echo("file_pattern /var/cache/logwatch/logwatch.\\*/\\*"); |
| 37 |
echo("file_pattern /var/tmp/sqlite_\\*"); |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.1 sys-apps/tomoyo-tools/files/tomoyo-tools-2.5.0_p20120414-flags-parallel.patch |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/tomoyo-tools/files/tomoyo-tools-2.5.0_p20120414-flags-parallel.patch?rev=1.1&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/tomoyo-tools/files/tomoyo-tools-2.5.0_p20120414-flags-parallel.patch?rev=1.1&content-type=text/plain |
| 45 |
|
| 46 |
Index: tomoyo-tools-2.5.0_p20120414-flags-parallel.patch |
| 47 |
=================================================================== |
| 48 |
diff --git a/Include.make b/Include.make |
| 49 |
index 3f85e61..c34ba28 100644 |
| 50 |
--- a/Include.make |
| 51 |
+++ b/Include.make |
| 52 |
@@ -1,7 +1,5 @@ |
| 53 |
-CC := gcc |
| 54 |
INSTALL := install |
| 55 |
SBINDIR := /sbin |
| 56 |
USRSBINDIR := /usr/sbin |
| 57 |
USRLIBDIR := /usr/lib |
| 58 |
MAN8 := /usr/share/man/man8 |
| 59 |
-CFLAGS := -Wall -O2 |
| 60 |
diff --git a/kernel_test/Makefile b/kernel_test/Makefile |
| 61 |
index 2559b4b..ef599a2 100644 |
| 62 |
--- a/kernel_test/Makefile |
| 63 |
+++ b/kernel_test/Makefile |
| 64 |
@@ -10,16 +10,14 @@ all: $(ALL_FILES) |
| 65 |
|
| 66 |
$(ALL_FILES): include.h |
| 67 |
|
| 68 |
-CC=gcc |
| 69 |
- |
| 70 |
-CFLAGS=-Wall -O2 |
| 71 |
+CFLAGS += -Wall -O2 |
| 72 |
|
| 73 |
# |
| 74 |
# Tools for kernel testing. |
| 75 |
# |
| 76 |
|
| 77 |
.c: |
| 78 |
- $(CC) $(CFLAGS) -o $@ $< |
| 79 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< |
| 80 |
|
| 81 |
# |
| 82 |
# Delete all test programs. |
| 83 |
diff --git a/sbin/Makefile b/sbin/Makefile |
| 84 |
index 0f53bc6..0e8e42e 100644 |
| 85 |
--- a/sbin/Makefile |
| 86 |
+++ b/sbin/Makefile |
| 87 |
@@ -9,7 +9,7 @@ install: all |
| 88 |
$(INSTALL) -m 0700 $(BUILD_FILES) $(INSTALLDIR)$(SBINDIR) |
| 89 |
|
| 90 |
.c: |
| 91 |
- $(CC) $(CFLAGS) -o $@ $< |
| 92 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< |
| 93 |
|
| 94 |
clean: |
| 95 |
rm -f -- $(BUILD_FILES) |
| 96 |
diff --git a/usr_lib_tomoyo/Makefile b/usr_lib_tomoyo/Makefile |
| 97 |
index 94020ee..f20ae40 100644 |
| 98 |
--- a/usr_lib_tomoyo/Makefile |
| 99 |
+++ b/usr_lib_tomoyo/Makefile |
| 100 |
@@ -11,7 +11,7 @@ install: all |
| 101 |
$(INSTALL) -m 0644 ../README.tomoyo ../COPYING.tomoyo $(INSTALLDIR)/$(USRLIBDIR)/tomoyo/ |
| 102 |
|
| 103 |
.c: |
| 104 |
- $(CC) $(CFLAGS) -o $@ $< |
| 105 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< |
| 106 |
|
| 107 |
clean: |
| 108 |
rm -f -- $(BUILD_FILES) |
| 109 |
diff --git a/usr_sbin/Makefile b/usr_sbin/Makefile |
| 110 |
index fa715b0..5b991db 100644 |
| 111 |
--- a/usr_sbin/Makefile |
| 112 |
+++ b/usr_sbin/Makefile |
| 113 |
@@ -15,17 +15,17 @@ $(BUILD_FILES): libtomoyotools.so |
| 114 |
sleep 10 |
| 115 |
|
| 116 |
libtomoyotools.so: tomoyotools.c tomoyotools.h |
| 117 |
- $(CC) $(CFLAGS) -fPIC tomoyotools.c -shared -Wl,-soname,libtomoyotools.so.3 -o libtomoyotools.so.3.0.1 |
| 118 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIC tomoyotools.c -shared -Wl,-soname,libtomoyotools.so.3 -o libtomoyotools.so.3.0.1 |
| 119 |
ln -sf libtomoyotools.so.3.0.1 libtomoyotools.so |
| 120 |
|
| 121 |
.c: |
| 122 |
- $(CC) $(CFLAGS) -o $@ $< -ltomoyotools -L. |
| 123 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -ltomoyotools -L. |
| 124 |
|
| 125 |
tomoyo-editpolicy: tomoyotools.h editpolicy*.c readline.h /usr/include/curses.h libtomoyotools.so |
| 126 |
- $(CC) $(CFLAGS) -o tomoyo-editpolicy editpolicy*.c -lncurses -ltomoyotools -L. -DCOLOR_ON |
| 127 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o tomoyo-editpolicy editpolicy*.c -lncurses -ltomoyotools -L. -DCOLOR_ON |
| 128 |
|
| 129 |
tomoyo-queryd: tomoyotools.h tomoyo-queryd.c readline.h /usr/include/curses.h libtomoyotools.so |
| 130 |
- $(CC) $(CFLAGS) -o tomoyo-queryd tomoyo-queryd.c -lncurses -ltomoyotools -L. |
| 131 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o tomoyo-queryd tomoyo-queryd.c -lncurses -ltomoyotools -L. |
| 132 |
|
| 133 |
install: all |
| 134 |
mkdir -p -m 0755 $(INSTALLDIR)$(USRLIBDIR) |
| 135 |
|
| 136 |
|
| 137 |
|
| 138 |
1.1 sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20120414-flags-parallel.patch |
| 139 |
|
| 140 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20120414-flags-parallel.patch?rev=1.1&view=markup |
| 141 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20120414-flags-parallel.patch?rev=1.1&content-type=text/plain |
| 142 |
|
| 143 |
Index: tomoyo-tools-2.3.0_p20120414-flags-parallel.patch |
| 144 |
=================================================================== |
| 145 |
--- a/Include.make |
| 146 |
+++ b/Include.make |
| 147 |
@@ -1,4 +1,4 @@ |
| 148 |
USRSBINDIR := /usr/sbin |
| 149 |
USRLIBDIR := /usr/lib |
| 150 |
MAN8 := /usr/share/man/man8 |
| 151 |
-CFLAGS := -Wall -O2 ${shell $(CC) -Wno-pointer-sign -S -o /dev/null -x c - < /dev/null > /dev/null 2>&1 && echo "-Wno-pointer-sign"} |
| 152 |
+CFLAGS := -Wall ${shell $(CC) -Wno-pointer-sign -S -o /dev/null -x c - < /dev/null > /dev/null 2>&1 && echo "-Wno-pointer-sign"} |
| 153 |
--- a/kernel_test/Makefile |
| 154 |
+++ b/kernel_test/Makefile |
| 155 |
@@ -3,20 +3,18 @@ ALL_FILES = tomoyo_filesystem_test tomoyo_file_test tomoyo_rewrite_test newns to |
| 156 |
all: $(ALL_FILES) |
| 157 |
chmod 755 testall.sh |
| 158 |
|
| 159 |
-CC=gcc |
| 160 |
- |
| 161 |
-CFLAGS=-Wall -O2 ${shell $(CC) -Wno-pointer-sign -S -o /dev/null -x c - < /dev/null > /dev/null 2>&1 && echo "-Wno-pointer-sign"} |
| 162 |
+CFLAGS += -Wall ${shell $(CC) -Wno-pointer-sign -S -o /dev/null -x c - < /dev/null > /dev/null 2>&1 && echo "-Wno-pointer-sign"} |
| 163 |
|
| 164 |
# |
| 165 |
# Tools for kernel testing. |
| 166 |
# |
| 167 |
|
| 168 |
tomoyo_new_test: tomoyo_new_test.c include.h |
| 169 |
- $(CC) $(CFLAGS) -o tomoyo_new_test tomoyo_new_test.c -lutil |
| 170 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o tomoyo_new_test tomoyo_new_test.c -lutil |
| 171 |
chmod 700 tomoyo_new_test |
| 172 |
|
| 173 |
.c: include.h |
| 174 |
- $(CC) $(CFLAGS) -o $@ $< |
| 175 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< |
| 176 |
chmod 700 $@ |
| 177 |
|
| 178 |
# |
| 179 |
--- a/sbin/Makefile |
| 180 |
+++ b/sbin/Makefile |
| 181 |
@@ -9,7 +9,7 @@ install: all |
| 182 |
cp -af --remove-destination $(BUILD_FILES) $(INSTALLDIR)/sbin/ |
| 183 |
|
| 184 |
.c: |
| 185 |
- $(CC) $(CFLAGS) -o $@ $< |
| 186 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< |
| 187 |
|
| 188 |
clean: |
| 189 |
rm -f -- $(BUILD_FILES) |
| 190 |
--- a/usr_lib_tomoyo/Makefile |
| 191 |
+++ b/usr_lib_tomoyo/Makefile |
| 192 |
@@ -9,7 +9,7 @@ install: all |
| 193 |
cp -af --remove-destination $(BUILD_FILES) tomoyotools.conf ../README.tomoyo ../COPYING.tomoyo $(INSTALLDIR)/usr/lib/tomoyo/ |
| 194 |
|
| 195 |
.c: |
| 196 |
- $(CC) $(CFLAGS) -o $@ $< |
| 197 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< |
| 198 |
|
| 199 |
clean: |
| 200 |
rm -f -- $(BUILD_FILES) |
| 201 |
diff --git a/usr_sbin/Makefile b/usr_sbin/Makefile |
| 202 |
index cdaf507..2b7c4f0 100644 |
| 203 |
--- a/usr_sbin/Makefile |
| 204 |
+++ b/usr_sbin/Makefile |
| 205 |
@@ -14,17 +14,17 @@ $(BUILD_FILES): libtomoyotools.so |
| 206 |
sleep 10 |
| 207 |
|
| 208 |
libtomoyotools.so: tomoyotools.c tomoyotools.h |
| 209 |
- $(CC) $(CFLAGS) -fPIC tomoyotools.c -shared -Wl,-soname,libtomoyotools.so.1 -o libtomoyotools.so.1.0.1 |
| 210 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIC tomoyotools.c -shared -Wl,-soname,libtomoyotools.so.1 -o libtomoyotools.so.1.0.1 |
| 211 |
ln -sf libtomoyotools.so.1.0.1 libtomoyotools.so |
| 212 |
|
| 213 |
.c: |
| 214 |
- $(CC) $(CFLAGS) -o $@ $< -ltomoyotools -L. |
| 215 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -ltomoyotools -L. |
| 216 |
|
| 217 |
tomoyo-editpolicy: tomoyotools.h editpolicy*.c readline.h /usr/include/curses.h libtomoyotools.so |
| 218 |
- $(CC) $(CFLAGS) -o tomoyo-editpolicy editpolicy*.c -lncurses -ltomoyotools -L. -DCOLOR_ON |
| 219 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o tomoyo-editpolicy editpolicy*.c -lncurses -ltomoyotools -L. -DCOLOR_ON |
| 220 |
|
| 221 |
tomoyo-queryd: tomoyotools.h tomoyo-queryd.c readline.h /usr/include/curses.h libtomoyotools.so |
| 222 |
- $(CC) $(CFLAGS) -o tomoyo-queryd tomoyo-queryd.c -lncurses -ltomoyotools -L. |
| 223 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o tomoyo-queryd tomoyo-queryd.c -lncurses -ltomoyotools -L. |
| 224 |
|
| 225 |
install: all |
| 226 |
mkdir -p $(INSTALLDIR)/usr/sbin $(INSTALLDIR)/usr/lib |
| 227 |
|
| 228 |
|
| 229 |
|
| 230 |
1.1 sys-apps/tomoyo-tools/files/tomoyo-tools-2.2.0_p20120414-ldflags.patch |
| 231 |
|
| 232 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/tomoyo-tools/files/tomoyo-tools-2.2.0_p20120414-ldflags.patch?rev=1.1&view=markup |
| 233 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/tomoyo-tools/files/tomoyo-tools-2.2.0_p20120414-ldflags.patch?rev=1.1&content-type=text/plain |
| 234 |
|
| 235 |
Index: tomoyo-tools-2.2.0_p20120414-ldflags.patch |
| 236 |
=================================================================== |
| 237 |
diff --git a/Makefile b/Makefile |
| 238 |
index d84a02b..e1cb36b 100644 |
| 239 |
--- a/Makefile |
| 240 |
+++ b/Makefile |
| 241 |
@@ -39,10 +39,10 @@ CFLAGS=-Wall -O2 -pipe -fomit-frame-pointer -march=core2 -mcx16 -msahf -maes -mp |
| 242 |
sleep 10 |
| 243 |
|
| 244 |
tomoyotools: tomoyotools.src/*.c tomoyotools.src/*.h /usr/include/curses.h |
| 245 |
- $(CC) $(CFLAGS) -o tomoyotools tomoyotools.src/*.c -lncurses -DCOLOR_ON |
| 246 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o tomoyotools tomoyotools.src/*.c -lncurses -DCOLOR_ON |
| 247 |
|
| 248 |
.c: |
| 249 |
- $(CC) $(CFLAGS) -o $@ $< |
| 250 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< |
| 251 |
|
| 252 |
clean: |
| 253 |
rm -f $(MAIN_FILES) $(MISC_FILES) |
Archives