summaryrefslogtreecommitdiff
path: root/prelink/prelink-20031029
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-12-09 09:47:41 +0000
committerChris Larson <clarson@kergoth.com>2004-12-09 09:47:41 +0000
commit2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch)
treebf879bea7ef8517ba8c3d1286ef300401d3d484c /prelink/prelink-20031029
parent101e2f1623def0a355d20aacb8bd93810703e834 (diff)
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded 2004/12/09 03:39:39-06:00 kergoth.com!kergoth Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit. BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'prelink/prelink-20031029')
-rw-r--r--prelink/prelink-20031029/Makefile.in.patch11
-rw-r--r--prelink/prelink-20031029/dso.c.patch16
-rw-r--r--prelink/prelink-20031029/layout.c.patch26
-rw-r--r--prelink/prelink-20031029/prelink.conf0
-rw-r--r--prelink/prelink-20031029/prelink.cron.daily43
-rw-r--r--prelink/prelink-20031029/prelink.default25
-rw-r--r--prelink/prelink-20031029/prelink.h.patch48
-rw-r--r--prelink/prelink-20031029/ts.Makefile.am.patch11
-rw-r--r--prelink/prelink-20031029/ts.Makefile.in.patch11
9 files changed, 0 insertions, 191 deletions
diff --git a/prelink/prelink-20031029/Makefile.in.patch b/prelink/prelink-20031029/Makefile.in.patch
deleted file mode 100644
index 930ea5f9c4..0000000000
--- a/prelink/prelink-20031029/Makefile.in.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- prelink-0.0.20030902.orig/src/Makefile.in 2003-07-01 14:38:41.000000000 +0000
-+++ prelink-0.0.20030902/src/Makefile.in 2003-09-16 23:26:16.000000000 +0000
-@@ -108,7 +108,7 @@
- $(prelink_SYSDEPS)
-
- prelink_LDADD = @LIBGELF@
--prelink_LDFLAGS = -all-static
-+#prelink_LDFLAGS = -all-static
-
- extra_DIST = makecrc.c
- subdir = src
diff --git a/prelink/prelink-20031029/dso.c.patch b/prelink/prelink-20031029/dso.c.patch
deleted file mode 100644
index 1be2f52961..0000000000
--- a/prelink/prelink-20031029/dso.c.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- prelink-0.0.20030902.orig/src/dso.c 2003-08-11 11:55:11.000000000 +0000
-+++ prelink-0.0.20030902/src/dso.c 2003-09-16 23:26:16.000000000 +0000
-@@ -334,7 +334,13 @@
- }
- else
- sections[--k] = i;
-+/* this fails for the statically linked upx executable
- assert (j == k);
-+*/
-+ if (j != k) {
-+ printf("assert(j == k) at dso.c:311 has failed for file %s\n", name);
-+ goto error_out;
-+ }
-
- section_cmp_dso = dso;
- qsort (sections + k, dso->ehdr.e_shnum - k, sizeof (*sections), section_cmp);
diff --git a/prelink/prelink-20031029/layout.c.patch b/prelink/prelink-20031029/layout.c.patch
deleted file mode 100644
index 3961d84d0b..0000000000
--- a/prelink/prelink-20031029/layout.c.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- prelink-0.0.20030902.orig/src/layout.c 2003-06-13 15:12:26.000000000 +0000
-+++ prelink-0.0.20030902/src/layout.c 2003-09-16 23:26:16.000000000 +0000
-@@ -614,7 +614,23 @@
- < ((deps[j - 1]->end + max_page_size - 1)
- & ~(max_page_size - 1))
- && (deps[j]->type == ET_DYN || deps[j - 1]->type == ET_DYN))
-+{ /* XXX some binaries cause a segfault but I do not know why -- Md*/
-+ fprintf(stderr,
-+ "Unknown fatal error at src/layout.c:538\n"
-+ "l.binlibs[i]->filename: %s\n"
-+ "deps[j]->base: %lx\n"
-+ "(deps[j - 1]->end + max_page_size - 1) & ~(max_page_size - 1): %ld\n"
-+ "[deps[j - 1]->end: %lx max_page_size: %lu]\n"
-+ "deps[j]->type: %x deps[j - 1]->type: %x\n"
-+ ,
-+ l.binlibs[i]->filename,
-+ deps[j]->base,
-+ ((deps[j - 1]->end + max_page_size - 1) & ~(max_page_size - 1)),
-+ deps[j - 1]->end, max_page_size,
-+ deps[j]->type, deps[j - 1]->type
-+ );
- abort ();
-+}
- }
- #endif
- }
diff --git a/prelink/prelink-20031029/prelink.conf b/prelink/prelink-20031029/prelink.conf
deleted file mode 100644
index e69de29bb2..0000000000
--- a/prelink/prelink-20031029/prelink.conf
+++ /dev/null
diff --git a/prelink/prelink-20031029/prelink.cron.daily b/prelink/prelink-20031029/prelink.cron.daily
deleted file mode 100644
index 91983ee18b..0000000000
--- a/prelink/prelink-20031029/prelink.cron.daily
+++ /dev/null
@@ -1,43 +0,0 @@
---- prelink-0.0.20040115.orig/debian/prelink.cron.daily
-+++ prelink-0.0.20040115/debian/prelink.cron.daily
-@@ -0,0 +1,40 @@
-+#!/bin/sh
-+
-+. /etc/default/prelink
-+
-+renice +19 -p $$ >/dev/null 2>&1
-+
-+if [ "$PRELINKING" != yes ]; then
-+ if [ -f /etc/prelink.cache ]; then
-+ echo /usr/sbin/prelink -uav > /var/log/prelink.log
-+ /usr/sbin/prelink -uav >> /var/log/prelink.log 2>&1
-+ rm -f /etc/prelink.cache
-+ # Restart init if needed
-+ [ -n "$(find `ldd /sbin/init | awk '{ print $3 }'` /sbin/init -ctime -1 2>/dev/null )" ] && /sbin/telinit u
-+ fi
-+ exit 0
-+fi
-+
-+if [ ! -f /etc/prelink.cache -o -f /var/lib/misc/prelink.force ] \
-+ || grep -q '^prelink-ELF0.[0-2]' /etc/prelink.cache; then
-+ # If cache does not exist or is from older prelink versions or
-+ # if we were asked to explicitely, force full prelinking
-+ rm -f /etc/prelink.cache /var/lib/misc/prelink.force
-+ PRELINK_OPTS="$PRELINK_OPTS -f"
-+ date > /var/lib/misc/prelink.full
-+elif [ -n "$PRELINK_FULL_TIME_INTERVAL" \
-+ -a "`find /var/lib/misc/prelink.full -mtime -${PRELINK_FULL_TIME_INTERVAL} 2>/dev/null`" \
-+ = /var/lib/misc/prelink.full ]; then
-+ # If prelink without -q has been run in the last
-+ # PRELINK_FULL_TIME_INTERVAL days, just use quick mode
-+ PRELINK_OPTS="$PRELINK_OPTS -q"
-+else
-+ date > /var/lib/misc/prelink.full
-+fi
-+
-+echo /usr/sbin/prelink -av $PRELINK_OPTS > /var/log/prelink.log
-+/usr/sbin/prelink -av $PRELINK_OPTS >> /var/log/prelink.log 2>&1
-+# Restart init if needed
-+[ -n "$(find `ldd /sbin/init | awk '{ print $3 }'` /sbin/init -ctime -1 2>/dev/null )" ] && /sbin/telinit u
-+
-+exit 0
diff --git a/prelink/prelink-20031029/prelink.default b/prelink/prelink-20031029/prelink.default
deleted file mode 100644
index d89649e49b..0000000000
--- a/prelink/prelink-20031029/prelink.default
+++ /dev/null
@@ -1,25 +0,0 @@
---- prelink-0.0.20040115.orig/debian/prelink.default
-+++ prelink-0.0.20040115/debian/prelink.default
-@@ -0,0 +1,22 @@
-+# Set this to no to disable prelinking altogether
-+# or to yes to enable it.
-+# (if you change this from yes to no prelink -ua
-+# will be run next night to undo prelinking)
-+PRELINKING=unknown
-+
-+# Options to pass to prelink
-+# -m Try to conserve virtual memory by allowing overlapping
-+# assigned virtual memory slots for libraries which
-+# never appear together in one binary
-+# -R Randomize virtual memory slot assignments for libraries.
-+# This makes it slightly harder for various buffer overflow
-+# attacks, since library addresses will be different on each
-+# host using -R.
-+PRELINK_OPTS=-mR
-+
-+# How often should full prelink be run (in days)
-+# Normally, prelink will be run in quick mode, every
-+# $PRELINK_FULL_TIME_INTERVAL days it will be run
-+# in normal mode. Comment this line out if prelink
-+# should be run in normal mode always.
-+PRELINK_FULL_TIME_INTERVAL=14
diff --git a/prelink/prelink-20031029/prelink.h.patch b/prelink/prelink-20031029/prelink.h.patch
deleted file mode 100644
index 3ca2930d3a..0000000000
--- a/prelink/prelink-20031029/prelink.h.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- prelink-0.0.20030902.orig/src/prelink.h 2003-08-11 11:54:01.000000000 +0000
-+++ prelink-0.0.20030902/src/prelink.h 2003-09-16 23:26:16.000000000 +0000
-@@ -26,6 +26,45 @@
- #include <stdio.h>
- #include <sys/stat.h>
-
-+/* http://gcc.gnu.org/ml/gcc/2003-01/msg00922.html */
-+#ifndef R_390_TLS_DTPMOD
-+#define R_390_TLS_DTPMOD 54
-+#define R_390_TLS_DTPOFF 55
-+#define R_390_TLS_TPOFF 56
-+#endif
-+
-+/* from http://www.cygwin.com/ml/libc-alpha/2003-02/msg00241.html */
-+#ifndef R_PPC_TLS
-+#define R_PPC_TLS 67
-+#define R_PPC_DTPMOD32 68
-+#define R_PPC_TPREL16 69
-+#define R_PPC_TPREL16_LO 70
-+#define R_PPC_TPREL16_HI 71
-+#define R_PPC_TPREL16_HA 72
-+#define R_PPC_TPREL32 73
-+#define R_PPC_DTPREL16 74
-+#define R_PPC_DTPREL16_LO 75
-+#define R_PPC_DTPREL16_HI 76
-+#define R_PPC_DTPREL16_HA 77
-+#define R_PPC_DTPREL32 78
-+#define R_PPC_GOT_TLSGD16 79
-+#define R_PPC_GOT_TLSGD16_LO 80
-+#define R_PPC_GOT_TLSGD16_HI 81
-+#define R_PPC_GOT_TLSGD16_HA 82
-+#define R_PPC_GOT_TLSLD16 83
-+#define R_PPC_GOT_TLSLD16_LO 84
-+#define R_PPC_GOT_TLSLD16_HI 85
-+#define R_PPC_GOT_TLSLD16_HA 86
-+#define R_PPC_GOT_TPREL16 87
-+#define R_PPC_GOT_TPREL16_LO 88
-+#define R_PPC_GOT_TPREL16_HI 89
-+#define R_PPC_GOT_TPREL16_HA 90
-+#define R_PPC_GOT_DTPREL16 91
-+#define R_PPC_GOT_DTPREL16_LO 92
-+#define R_PPC_GOT_DTPREL16_HI 93
-+#define R_PPC_GOT_DTPREL16_HA 94
-+#endif
-+
- #ifndef DT_GNU_LIBLIST
- #define DT_GNU_LIBLIST 0x6ffffef9
- #define DT_GNU_LIBLISTSZ 0x6ffffdf7
diff --git a/prelink/prelink-20031029/ts.Makefile.am.patch b/prelink/prelink-20031029/ts.Makefile.am.patch
deleted file mode 100644
index 6b8c3c5c38..0000000000
--- a/prelink/prelink-20031029/ts.Makefile.am.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- prelink-0.0.20031029.orig/testsuite/Makefile.am 2003-09-02 21:44:23.000000000 +0000
-+++ prelink-0.0.20031029/testsuite/Makefile.am 2003-10-31 20:28:02.000000000 +0000
-@@ -11,7 +11,7 @@
- shuffle1.sh shuffle2.sh shuffle3.sh shuffle4.sh shuffle5.sh \
- shuffle6.sh shuffle7.sh \
- layout1.sh layout2.sh tls1.sh tls2.sh tls3.sh tls4.sh \
-- cxx1.sh quick1.sh cycle1.sh cycle2.sh \
-+ cxx1.sh cycle1.sh cycle2.sh \
- undosyslibs.sh
- TESTS_ENVIRONMENT = \
- PRELINK="../src/prelink -c ./prelink.conf -C ./prelink.cache --ld-library-path=. --dynamic-linker=`echo ./ld*.so.*[0-9]`" \
diff --git a/prelink/prelink-20031029/ts.Makefile.in.patch b/prelink/prelink-20031029/ts.Makefile.in.patch
deleted file mode 100644
index 4253badb65..0000000000
--- a/prelink/prelink-20031029/ts.Makefile.in.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- prelink-0.0.20031029.orig/testsuite/Makefile.in 2003-10-28 20:01:56.000000000 +0000
-+++ prelink-0.0.20031029/testsuite/Makefile.in 2003-10-31 20:28:10.000000000 +0000
-@@ -106,7 +106,7 @@
- shuffle1.sh shuffle2.sh shuffle3.sh shuffle4.sh shuffle5.sh \
- shuffle6.sh shuffle7.sh \
- layout1.sh layout2.sh tls1.sh tls2.sh tls3.sh tls4.sh \
-- cxx1.sh quick1.sh cycle1.sh cycle2.sh \
-+ cxx1.sh cycle1.sh cycle2.sh \
- undosyslibs.sh
-
- TESTS_ENVIRONMENT = \