summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2008-05-21 14:36:57 +0000
committerMarc Kleine-Budde <mkl@pengutronix.de>2008-05-21 14:36:57 +0000
commit4e121d80b2559cf339e151725663812de68c07ea (patch)
treeaeffe2254439cc181c0e2ae5ec28c209eef6635d /patches
parente9dbb825c65aae502155f47d8abd59a2d5492d0f (diff)
downloadptxdist-4e121d80b2559cf339e151725663812de68c07ea.tar.gz
ptxdist-4e121d80b2559cf339e151725663812de68c07ea.tar.xz
* strace-4.5.15/generic/strace-undef-PACKET_MEMBERSHIP.patch:
port from horst * strace-4.5.15/generic/autoreconf.diff.bz2, strace-4.5.15/generic/strace-4.5.15-blackfin-autoreconf.patch.bz2: renamed git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8202 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches')
-rw-r--r--patches/strace-4.5.15/generic/series3
-rw-r--r--patches/strace-4.5.15/generic/strace-4.5.15-blackfin-autoreconf.patch.bz2 (renamed from patches/strace-4.5.15/generic/autoreconf.diff.bz2)bin42784 -> 42784 bytes
-rw-r--r--patches/strace-4.5.15/generic/strace-undef-PACKET_MEMBERSHIP.patch16
3 files changed, 18 insertions, 1 deletions
diff --git a/patches/strace-4.5.15/generic/series b/patches/strace-4.5.15/generic/series
index 6e69aac5d..fba98aae6 100644
--- a/patches/strace-4.5.15/generic/series
+++ b/patches/strace-4.5.15/generic/series
@@ -1,2 +1,3 @@
+strace-undef-PACKET_MEMBERSHIP.patch
strace-4.5.15-blackfin.patch
-autoreconf.diff.bz2
+strace-4.5.15-blackfin-autoreconf.patch.bz2
diff --git a/patches/strace-4.5.15/generic/autoreconf.diff.bz2 b/patches/strace-4.5.15/generic/strace-4.5.15-blackfin-autoreconf.patch.bz2
index d4c93c9e9..d4c93c9e9 100644
--- a/patches/strace-4.5.15/generic/autoreconf.diff.bz2
+++ b/patches/strace-4.5.15/generic/strace-4.5.15-blackfin-autoreconf.patch.bz2
Binary files differ
diff --git a/patches/strace-4.5.15/generic/strace-undef-PACKET_MEMBERSHIP.patch b/patches/strace-4.5.15/generic/strace-undef-PACKET_MEMBERSHIP.patch
new file mode 100644
index 000000000..5bc4ac8a4
--- /dev/null
+++ b/patches/strace-4.5.15/generic/strace-undef-PACKET_MEMBERSHIP.patch
@@ -0,0 +1,16 @@
+#http://www.busybox.net/cgi-bin/viewcvs.cgi/trunk/buildroot/package/strace/strace-undef-PACKET_MEMBERSHIP.patch?rev=16557
+--- strace-4.5.14/net.c.oorig 2005-07-05 01:33:38.000000000 +0200
++++ strace-4.5.14/net.c 2006-10-09 16:35:02.000000000 +0200
+@@ -800,8 +800,12 @@
+
+ #ifdef SOL_PACKET
+ static const struct xlat sockpacketoptions[] = {
++#if defined(PACKET_ADD_MEMBERSHIP)
+ { PACKET_ADD_MEMBERSHIP, "PACKET_ADD_MEMBERSHIP" },
++#endif
++#if defined(PACKET_DROP_MEMBERSHIP)
+ { PACKET_DROP_MEMBERSHIP, "PACKET_DROP_MEMBERSHIP"},
++#endif
+ #if defined(PACKET_RECV_OUTPUT)
+ { PACKET_RECV_OUTPUT, "PACKET_RECV_OUTPUT" },
+ #endif