summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2010-04-19 14:25:32 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2010-06-17 10:20:50 +0200
commitb1ae6c587617534d225a90757a15f3ddebe92cde (patch)
tree4b190f2f6600ee1575e77e73e86d23556762b748
parent011a49607c29f478f4dc063a05b52b2da0dfe691 (diff)
downloadptxdist-b1ae6c587617534d225a90757a15f3ddebe92cde.tar.gz
ptxdist-b1ae6c587617534d225a90757a15f3ddebe92cde.tar.xz
[strace] version bump to 4.5.20
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r--patches/strace-4.5.19/0001-Fix-check-for-linux-netlink.h-on-Linux-2.6.32-rc5.patch30
-rw-r--r--rules/strace.make4
2 files changed, 2 insertions, 32 deletions
diff --git a/patches/strace-4.5.19/0001-Fix-check-for-linux-netlink.h-on-Linux-2.6.32-rc5.patch b/patches/strace-4.5.19/0001-Fix-check-for-linux-netlink.h-on-Linux-2.6.32-rc5.patch
deleted file mode 100644
index 84ead17fb..000000000
--- a/patches/strace-4.5.19/0001-Fix-check-for-linux-netlink.h-on-Linux-2.6.32-rc5.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d6320e322ef3e896ffe6da5cd7c0f50b92b85b22 Mon Sep 17 00:00:00 2001
-From: Dmitry V. Levin <ldv@altlinux.org>
-Date: Tue, 3 Nov 2009 16:49:49 +0000
-Subject: [PATCH] Fix check for linux/netlink.h on Linux 2.6.32-rc5+
-
-* configure.ac (AC_CHECK_HEADERS): In check for linux/netlink.h, include
-sys/socket.h instead of linux/socket.h beforehand.
-(cherry picked from commit f0df31e71a58c6e79ba77c1a9d84b2f38d44bec7)
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c8450cd..96c1c24 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -258,7 +258,7 @@ AC_CHECK_HEADERS([ \
- ], [], [])
- AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h],
- [], [], [#include <stddef.h>
--#include <linux/socket.h>])
-+#include <sys/socket.h>])
- AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include <signal.h>])
- AC_CHECK_TYPES([struct sigcontext_struct,
- struct sigcontext],,, [#include <signal.h>])
---
-1.6.6
-
diff --git a/rules/strace.make b/rules/strace.make
index fccc2c46a..99165113b 100644
--- a/rules/strace.make
+++ b/rules/strace.make
@@ -2,7 +2,7 @@
#
# Copyright (C) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
# 2003-2008 by Pengutronix e.K., Hildesheim, Germany
-# 2009 by Marc Kleine-Budde <mkl@pengutronix.de>
+# 2009, 2010 by Marc Kleine-Budde <mkl@pengutronix.de>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -18,7 +18,7 @@ PACKAGES-$(PTXCONF_STRACE) += strace
#
# Paths and names
#
-STRACE_VERSION := 4.5.19
+STRACE_VERSION := 4.5.20
STRACE := strace-$(STRACE_VERSION)
STRACE_SUFFIX := tar.bz2
STRACE_URL := $(PTXCONF_SETUP_SFMIRROR)/strace/$(STRACE).$(STRACE_SUFFIX)