| 1 |
idl0r 09/06/29 22:32:38 |
| 2 |
|
| 3 |
Added: paxtest-0.9.7_pre5-Makefile.patch |
| 4 |
paxtest-0.9.7_pre5-missing-includes.patch |
| 5 |
Log: |
| 6 |
Version bump to 0.9.7_pre5, fixes bug 246755. Fix HOMEPAGE, some QA stuff QA_EXECSTACK and missing includes. Cleanup. Install also the manpage. |
| 7 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-admin/paxtest/files/paxtest-0.9.7_pre5-Makefile.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/paxtest/files/paxtest-0.9.7_pre5-Makefile.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/paxtest/files/paxtest-0.9.7_pre5-Makefile.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: paxtest-0.9.7_pre5-Makefile.patch |
| 16 |
=================================================================== |
| 17 |
--- Makefile 2006-03-21 15:33:21.000000000 +0100 |
| 18 |
+++ Makefile 2009-06-29 22:46:43.623289281 +0200 |
| 19 |
@@ -58,7 +58,7 @@ DUMMY := $(shell echo '${PAXCTLBIN} $$*' |
| 20 |
endif |
| 21 |
|
| 22 |
# for some reason the .c files need it, else GNU_STACK=RWE |
| 23 |
-OPT_FLAGS := -O2 $(ASFLAGS) |
| 24 |
+OPT_FLAGS := $(CFLAGS) $(ASFLAGS) |
| 25 |
PTHREAD := -lpthread |
| 26 |
# define stripping of binaries/libs here, or set these on make's commandline, |
| 27 |
# else you'll loose the chpax flags! |
| 28 |
@@ -134,7 +134,7 @@ paxtest: $(TESTS) genpaxtest |
| 29 |
|
| 30 |
$(EXEC_TESTS) $(MPROT_TESTS): body.o |
| 31 |
$(CC) $(CFLAGS) -o $@.o -c $@.c |
| 32 |
- $(CC) $(LDFLAGS) $(PTHREAD) -o $@ $< $@.o |
| 33 |
+ $(CC) $(LDFLAGS) -o $@ $< $@.o $(PTHREAD) |
| 34 |
|
| 35 |
$(RAND_TESTS): randbody.o |
| 36 |
$(CC) $(CFLAGS) -o $@.o -c $@.c |
| 37 |
@@ -180,7 +180,7 @@ getstack2: getstack.o |
| 38 |
|
| 39 |
$(MPROTSH_TESTS): body.o shlibtest.so |
| 40 |
$(CC) $(CFLAGS) -o $@.o -c $@.c |
| 41 |
- $(CC) $(LDFLAGS) $(PTHREAD) -o $@ $@.o $^ |
| 42 |
+ $(CC) $(LDFLAGS) -o $@ $@.o $^ $(PTHREAD) |
| 43 |
|
| 44 |
# used for RANDEXEC'd binaries |
| 45 |
retbody.o: body.c |
| 46 |
@@ -189,12 +189,12 @@ retbody.o: body.c |
| 47 |
# build as ET_EXEC (recommended by PaX Team, not really a requirement) |
| 48 |
$(RET_TESTS): retbody.o |
| 49 |
$(CC) $(CFLAGS) $(CC_ETEXEC) -o $@.o -c $@.c |
| 50 |
- $(CC) $(LDFLAGS) $(LD_ETEXEC) $(PTHREAD) -o $@ $< $@.o |
| 51 |
+ $(CC) $(LDFLAGS) $(LD_ETEXEC) -o $@ $< $@.o $(PTHREAD) |
| 52 |
|
| 53 |
# build as ET_EXEC (not in Adamantix's Makefile) |
| 54 |
$(RETX_TESTS): retbody.o |
| 55 |
$(CC) $(CFLAGS) $(CC_ETEXEC) -o $@.o -c $@.c |
| 56 |
- $(CC) $(LDFLAGS) $(LD_ETEXEC) $(PTHREAD) -o $@ $< $@.o |
| 57 |
+ $(CC) $(LDFLAGS) $(LD_ETEXEC) -o $@ $< $@.o $(PTHREAD) |
| 58 |
$(PAXBIN) -SPXM $@ |
| 59 |
|
| 60 |
# should also shlibbss.o and shlibdata.o be built w/ PIC? |
| 61 |
@@ -206,4 +206,4 @@ shlib%.so: shlib%.o |
| 62 |
$(CC) $(SHLDFLAGS) -shared -o $@ $< |
| 63 |
|
| 64 |
$(SHLIB_TESTS): body.o $(SHLIBS) shlibbss.o shlibdata.o |
| 65 |
- $(CC) $(LDFLAGS) $(PTHREAD) -o $@ body.o $@.o $(SHLIBS) $(DL) |
| 66 |
+ $(CC) $(LDFLAGS) -o $@ body.o $@.o $(SHLIBS) $(DL) $(PTHREAD) |
| 67 |
|
| 68 |
|
| 69 |
|
| 70 |
1.1 app-admin/paxtest/files/paxtest-0.9.7_pre5-missing-includes.patch |
| 71 |
|
| 72 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/paxtest/files/paxtest-0.9.7_pre5-missing-includes.patch?rev=1.1&view=markup |
| 73 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/paxtest/files/paxtest-0.9.7_pre5-missing-includes.patch?rev=1.1&content-type=text/plain |
| 74 |
|
| 75 |
Index: paxtest-0.9.7_pre5-missing-includes.patch |
| 76 |
=================================================================== |
| 77 |
diff -Naurp getstack.c.old getstack.c |
| 78 |
--- getstack.c.old 2004-03-05 12:50:42.000000000 +0100 |
| 79 |
+++ getstack.c 2009-06-29 22:52:19.036289874 +0200 |
| 80 |
@@ -6,6 +6,7 @@ |
| 81 |
*/ |
| 82 |
|
| 83 |
#include <stdio.h> |
| 84 |
+#include <stdlib.h> |
| 85 |
|
| 86 |
int main( int argc, char *argv[] ){ |
| 87 |
char a; |
| 88 |
diff -Naurp randbody.c.old randbody.c |
| 89 |
--- randbody.c.old 2005-06-19 16:53:40.000000000 +0200 |
| 90 |
+++ randbody.c 2009-06-29 22:52:05.021047393 +0200 |
| 91 |
@@ -5,6 +5,7 @@ |
| 92 |
*/ |
| 93 |
|
| 94 |
#include <stdio.h> |
| 95 |
+#include <stdlib.h> |
| 96 |
|
| 97 |
#define COUNT (25) |
| 98 |
|
| 99 |
diff -Naurp rettofunc1.c.old rettofunc1.c |
| 100 |
--- rettofunc1.c.old 2005-05-29 18:02:41.000000000 +0200 |
| 101 |
+++ rettofunc1.c 2009-06-29 22:52:39.553037638 +0200 |
| 102 |
@@ -6,6 +6,7 @@ |
| 103 |
|
| 104 |
#include <stdio.h> |
| 105 |
#include <string.h> |
| 106 |
+#include <stdlib.h> |
| 107 |
#include "body.h" |
| 108 |
|
| 109 |
const char testname[] = "Return to function (strcpy) "; |
| 110 |
diff -Naurp rettofunc1x.c.old rettofunc1x.c |
| 111 |
--- rettofunc1x.c.old 2005-05-29 18:02:47.000000000 +0200 |
| 112 |
+++ rettofunc1x.c 2009-06-29 22:52:45.869055602 +0200 |
| 113 |
@@ -6,6 +6,7 @@ |
| 114 |
|
| 115 |
#include <stdio.h> |
| 116 |
#include <string.h> |
| 117 |
+#include <stdlib.h> |
| 118 |
#include "body.h" |
| 119 |
|
| 120 |
const char testname[] = "Return to function (strcpy, RANDEXEC) "; |
Archives