diff options
author | Alastair Tse <liquidx@gentoo.org> | 2004-01-09 01:07:28 +0000 |
---|---|---|
committer | Alastair Tse <liquidx@gentoo.org> | 2004-01-09 01:07:28 +0000 |
commit | e7ae5f9d95bc04faa9e04f2c7580931be8fb6041 (patch) | |
tree | c8500cc517f9c8305622a1718b2e95e2c8feeaab /dev-util/fenris/files | |
parent | CVS snapshot for Jan 2004 (diff) | |
download | historical-e7ae5f9d95bc04faa9e04f2c7580931be8fb6041.tar.gz historical-e7ae5f9d95bc04faa9e04f2c7580931be8fb6041.tar.bz2 historical-e7ae5f9d95bc04faa9e04f2c7580931be8fb6041.zip |
version bump to the latest devel version. mirroring versioned source on gentoo mirrors. added many patches to fix compilation again binutils and gcc plus remove certain cruft from the makefile. should fix (#21190) finally
Diffstat (limited to 'dev-util/fenris/files')
-rw-r--r-- | dev-util/fenris/files/digest-fenris-0.07m-r1 | 1 | ||||
-rw-r--r-- | dev-util/fenris/files/fenris-0.07m-debian.patch | 162 | ||||
-rw-r--r-- | dev-util/fenris/files/fenris-0.07m-dress.c.patch | 29 | ||||
-rw-r--r-- | dev-util/fenris/files/fenris-0.07m-noansiart.patch | 13 | ||||
-rw-r--r-- | dev-util/fenris/files/fenris-0.07m-speedup.patch | 11 |
5 files changed, 216 insertions, 0 deletions
diff --git a/dev-util/fenris/files/digest-fenris-0.07m-r1 b/dev-util/fenris/files/digest-fenris-0.07m-r1 new file mode 100644 index 000000000000..0f0767d2b77b --- /dev/null +++ b/dev-util/fenris/files/digest-fenris-0.07m-r1 @@ -0,0 +1 @@ +MD5 c5d8079bd95aaf61fb13a5a4e4ac8d82 fenris-0.07m-r1.tgz 1084157 diff --git a/dev-util/fenris/files/fenris-0.07m-debian.patch b/dev-util/fenris/files/fenris-0.07m-debian.patch new file mode 100644 index 000000000000..d47d2d3b7681 --- /dev/null +++ b/dev-util/fenris/files/fenris-0.07m-debian.patch @@ -0,0 +1,162 @@ +diff -ur fenris-0.07build3244/asmstring.h fenris-0.07build3244.fixed/asmstring.h +--- fenris-0.07build3244/asmstring.h 2002-09-02 04:03:29.000000000 +0200 ++++ fenris-0.07build3244.fixed/asmstring.h 2003-08-24 10:23:51.000000000 +0200 +@@ -521,10 +521,10 @@ + { + if (!size) + return addr; +- __asm__("repnz; scasb +- jnz 1f +- dec %%edi +-1: " ++ __asm__("repnz; scasb\n" ++ "jnz 1f\n" ++ "dec %%edi\n" ++"1: " + : "=D" (addr), "=c" (size) + : "0" (addr), "1" (size), "a" (c)); + return addr; +diff -ur fenris-0.07build3244/build fenris-0.07build3244.fixed/build +--- fenris-0.07build3244/build 2003-08-24 10:39:58.000000000 +0200 ++++ fenris-0.07build3244.fixed/build 2003-08-24 10:22:05.000000000 +0200 +@@ -386,15 +386,15 @@ + + echo "break main" >.testerr 2>/dev/null + echo "x/2w getuid" >>.testerr 2>/dev/null +-echo "x/16w __do_global_ctors_aux" >>.testerr 2>/dev/null +-echo "x/16w __do_global_ctors_aux+1" >>.testerr 2>/dev/null +-echo "x/16w __do_global_ctors_aux+2" >>.testerr 2>/dev/null +-echo "x/16w __do_global_ctors_aux+3" >>.testerr 2>/dev/null +-echo "x/16w __do_global_ctors_aux+4" >>.testerr 2>/dev/null +-echo "x/16w __do_global_ctors_aux+5" >>.testerr 2>/dev/null +-echo "x/16w __do_global_ctors_aux+6" >>.testerr 2>/dev/null +-echo "x/16w __do_global_ctors_aux+7" >>.testerr 2>/dev/null +-echo "x/16w __do_global_ctors_aux+8" >>.testerr 2>/dev/null ++echo "x/13w __do_global_ctors_aux" >>.testerr 2>/dev/null ++echo "x/13w __do_global_ctors_aux+1" >>.testerr 2>/dev/null ++echo "x/13w __do_global_ctors_aux+2" >>.testerr 2>/dev/null ++echo "x/13w __do_global_ctors_aux+3" >>.testerr 2>/dev/null ++echo "x/13w __do_global_ctors_aux+4" >>.testerr 2>/dev/null ++echo "x/13w __do_global_ctors_aux+5" >>.testerr 2>/dev/null ++echo "x/13w __do_global_ctors_aux+6" >>.testerr 2>/dev/null ++echo "x/13w __do_global_ctors_aux+7" >>.testerr 2>/dev/null ++echo "x/13w __do_global_ctors_aux+8" >>.testerr 2>/dev/null + + echo "run" >>.testerr 2>/dev/null + echo "x open" >>.testerr 2>/dev/null +@@ -404,7 +404,7 @@ + ADDR=`grep open .gtmp 2>/dev/null|grep ^0x 2>/dev/null | awk '{print $1}' 2>/dev/null` + + RES=`grep -F resolve .gtmp 2>/dev/null` +-JMP=`grep -F getuid .gtmp 2>/dev/null` ++JMP=`grep ^0x .gtmp 2>/dev/null | head -n 1` + + rm -f .testerr .testme + +diff -ur fenris-0.07build3244/config.h fenris-0.07build3244.fixed/config.h +--- fenris-0.07build3244/config.h 2002-08-05 17:08:56.000000000 +0200 ++++ fenris-0.07build3244.fixed/config.h 2003-08-24 10:23:10.000000000 +0200 +@@ -77,14 +77,12 @@ + // This piece of code must remain intact and be included in all cases. + + const static char spell[]= +- +-" +- +-A null pointer points to regions filled with dragons, demons, core +-dumps, and numberless other foul creatures, all of which delight in +-frolicing in thy program if thou disturb their sleep. +- +-"; ++"\n" ++"\n" ++"A null pointer points to regions filled with dragons, demons, core\n" ++"dumps, and numberless other foul creatures, all of which delight in\n" ++"frolicing in thy program if thou disturb their sleep.\n" ++"\n"; + + + #endif /* not _HAVE_CONFIG_H */ +diff -ur fenris-0.07build3244/fenris.c fenris-0.07build3244.fixed/fenris.c +--- fenris-0.07build3244/fenris.c 2002-09-02 04:02:34.000000000 +0200 ++++ fenris-0.07build3244.fixed/fenris.c 2003-08-24 10:33:58.000000000 +0200 +@@ -42,6 +42,23 @@ + + #define _GNU_SOURCE + ++// Ok, this is hackish. I do not really want to copy whole ++// kernel stat struct here, so I include kernel headers. Unfortunately, ++// they differ somewhat, and collide with user-space headers, so we ++// have to tweak them. ++ ++#define stat __kernel_stat ++#define stat64 __kernel_stat64 ++#define old_stat __old_kernel_stat ++#define new_stat __kernel_stat ++ ++#include <asm/stat.h> ++ ++#undef stat ++#undef stat64 ++#undef old_stat ++#undef new_stat ++ + #include <sys/ptrace.h> + #include <sys/user.h> + #include <stdio.h> +@@ -78,24 +95,6 @@ + #include <bfd.h> + //#include <libiberty.h> + +- +-// Ok, this is hackish. I do not really want to copy whole +-// kernel stat struct here, so I include kernel headers. Unfortunately, +-// they differ somewhat, and collide with user-space headers, so we +-// have to tweak them. +- +-#define stat __kernel_stat +-#define stat64 __kernel_stat64 +-#define old_stat __old_kernel_stat +-#define new_stat __kernel_stat +- +-#include <asm/stat.h> +- +-#undef stat +-#undef stat64 +-#undef old_stat +-#undef new_stat +- + #include "config.h" + #include "fenris.h" + #include "ioctls.h" +Only in fenris-0.07build3244.fixed: PLT.txt +diff -ur fenris-0.07build3244/ragnarok.c fenris-0.07build3244.fixed/ragnarok.c +--- fenris-0.07build3244/ragnarok.c 2002-09-02 04:11:24.000000000 +0200 ++++ fenris-0.07build3244.fixed/ragnarok.c 2003-08-24 10:38:18.000000000 +0200 +@@ -1709,15 +1709,14 @@ + + } + +-const static char spell2[] = " +- +- +-It cannot be seen, cannot be felt, +-Cannot be heard, cannot be smelt. +-It lies behind stars and under hills, +-And empty holes it fills. +-It comes first and follows after, +-Ends life, kills laughter. +- +- +-"; ++const static char spell2[] = "\n" ++"\n" ++"\n" ++"It cannot be seen, cannot be felt,\n" ++"Cannot be heard, cannot be smelt.\n" ++"It lies behind stars and under hills,\n" ++"And empty holes it fills.\n" ++"It comes first and follows after,\n" ++"Ends life, kills laughter.\n" ++"\n" ++"\n"; diff --git a/dev-util/fenris/files/fenris-0.07m-dress.c.patch b/dev-util/fenris/files/fenris-0.07m-dress.c.patch new file mode 100644 index 000000000000..edbcc1ae0349 --- /dev/null +++ b/dev-util/fenris/files/fenris-0.07m-dress.c.patch @@ -0,0 +1,29 @@ +--- fenris/dress.c 2002-08-05 16:08:56.000000000 +0100 ++++ fenris.new/dress.c 2004-01-08 23:34:03.536699488 +0000 +@@ -141,7 +141,7 @@ + int main(int argc,char* argv[]) { + bfd* b; + char opt; +- struct sec* ss; ++ asection* ss; + int fi; + int i; + +@@ -263,7 +263,7 @@ + + void copier(char* src,char* dst,char* secname) { + +- struct sec* s; ++ asection* s; + bfd *ibfd,*obfd; + + bfd_init(); +@@ -288,7 +288,7 @@ + debug("[+] Setting up sections: "); + + while (s) { +- struct sec* os; ++ asection* os; + + os=bfd_make_section_anyway(obfd,bfd_section_name(ibfd,s)); + if (s->name[0]=='.') debug("%s ",bfd_section_name(ibfd,s)); diff --git a/dev-util/fenris/files/fenris-0.07m-noansiart.patch b/dev-util/fenris/files/fenris-0.07m-noansiart.patch new file mode 100644 index 000000000000..8e1ade8d0cf5 --- /dev/null +++ b/dev-util/fenris/files/fenris-0.07m-noansiart.patch @@ -0,0 +1,13 @@ +--- build.o 2004-01-08 22:08:29.954122664 +0000 ++++ build 2004-01-08 22:08:52.104755256 +0000 +@@ -95,10 +95,6 @@ + ulimit -c 0 2>/dev/null + + clear +-cat doc/fenris.a +-usleep 100000 &>/dev/null +-test "$1" = "" && sleep 2 +-clear + + echo + echo "fenris - program execution path analysis tool" diff --git a/dev-util/fenris/files/fenris-0.07m-speedup.patch b/dev-util/fenris/files/fenris-0.07m-speedup.patch new file mode 100644 index 000000000000..3351de71d54b --- /dev/null +++ b/dev-util/fenris/files/fenris-0.07m-speedup.patch @@ -0,0 +1,11 @@ +--- build.old 2004-01-09 00:53:04.164014592 +0000 ++++ build 2004-01-09 00:53:27.511465240 +0000 +@@ -1209,7 +1209,7 @@ + + rm -f .news .tmp + +- echo "[+] You have $[`grep -c . fnprints.dat`] fingerprints." ++# echo "[+] You have $[`grep -c . fnprints.dat`] fingerprints." + + + fi |