From patchwork Tue Jan 14 12:33:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: christian.braunersorensen@prevas.dk X-Patchwork-Id: 310614 X-Patchwork-Delegate: esben@haabendal.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id A1CEC2C00AB for ; Tue, 14 Jan 2014 23:35:37 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 7B7A93FDBE for ; Tue, 14 Jan 2014 13:35:36 +0100 (CET) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail01.prevas.se (mail01.prevas.se [62.95.78.3]) by hugin.dotsrc.org (Postfix) with ESMTPS id 8F0A03FDBC for ; Tue, 14 Jan 2014 13:35:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=6535; q=dns/txt; s=ironport1; t=1389702903; x=1421238903; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=nzlma1/p7ez2bz10bmo62xOygW8+kv/sRalDFqSHvHg=; b=reTIF8mNKsQN5dC6weQgYuNZk3e4L/PXspBfzwsDhP1GbKlCqsTzQ2fO V2cBq/TReB0E7U6GteKU0ieaDMK1wd0R+mBnCdVzdkMM+pqh95MX4A3cq 1MsLNz4cv8ONjK9ex2XHDkazaQX3+uh2MmHH7d6XVTXe5b8UlyRLpnwIX A=; X-IronPort-AV: E=Sophos;i="4.95,658,1384297200"; d="scan'208";a="4300213" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport1.prevas.se with ESMTP/TLS/AES128-SHA; 14 Jan 2014 13:35:01 +0100 Received: from localhost (172.16.10.102) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server id 14.2.347.0; Tue, 14 Jan 2014 13:35:01 +0100 Received: by localhost (Postfix, from userid 30007) id 7C37F681580; Tue, 14 Jan 2014 12:35:01 +0000 (UTC) From: To: Subject: [PATCH 033/131] tcpdump: Remove version 4.3.0 Date: Tue, 14 Jan 2014 12:33:20 +0000 Message-ID: X-Mailer: git-send-email 1.8.4 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org From: Christian Sørensen Signed-off-by: Christian Sørensen --- .../0001-minimal-IEEE802.15.4-allowed.patch | 22 ------------ recipes/tcpdump/tcpdump-4.3.0/configure.patch | 29 --------------- recipes/tcpdump/tcpdump-4.3.0/ipv6-cross.patch | 41 --------------------- .../tcpdump-4.3.0/tcpdump_configure_no_-O2.patch | 42 ---------------------- recipes/tcpdump/tcpdump_4.3.0.oe | 7 ---- recipes/tcpdump/tcpdump_4.3.0.oe.sig | 1 - 6 files changed, 142 deletions(-) delete mode 100644 recipes/tcpdump/tcpdump-4.3.0/0001-minimal-IEEE802.15.4-allowed.patch delete mode 100644 recipes/tcpdump/tcpdump-4.3.0/configure.patch delete mode 100644 recipes/tcpdump/tcpdump-4.3.0/ipv6-cross.patch delete mode 100644 recipes/tcpdump/tcpdump-4.3.0/tcpdump_configure_no_-O2.patch delete mode 100644 recipes/tcpdump/tcpdump_4.3.0.oe delete mode 100644 recipes/tcpdump/tcpdump_4.3.0.oe.sig diff --git a/recipes/tcpdump/tcpdump-4.3.0/0001-minimal-IEEE802.15.4-allowed.patch b/recipes/tcpdump/tcpdump-4.3.0/0001-minimal-IEEE802.15.4-allowed.patch deleted file mode 100644 index 9d3d60d..0000000 --- a/recipes/tcpdump/tcpdump-4.3.0/0001-minimal-IEEE802.15.4-allowed.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Sergey Lapin -Date: Wed, 28 Jan 2009 16:34:15 +0300 -Subject: [PATCH] minimal IEEE802.15.4 allowed - ---- - tcpdump.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/tcpdump.c b/tcpdump.c -index 06683af..fbc944c 100644 ---- a/tcpdump.c -+++ b/tcpdump.c -@@ -282,6 +282,9 @@ static struct printer printers[] = { - #ifdef DLT_MFR - { mfr_if_print, DLT_MFR }, - #endif -+#ifdef DLT_IEEE802_15_4 -+ { raw_if_print, DLT_IEEE802_15_4 }, -+#endif - #if defined(DLT_BLUETOOTH_HCI_H4_WITH_PHDR) && defined(HAVE_PCAP_BLUETOOTH_H) - { bt_if_print, DLT_BLUETOOTH_HCI_H4_WITH_PHDR}, - #endif diff --git a/recipes/tcpdump/tcpdump-4.3.0/configure.patch b/recipes/tcpdump/tcpdump-4.3.0/configure.patch deleted file mode 100644 index 3697420..0000000 --- a/recipes/tcpdump/tcpdump-4.3.0/configure.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- - aclocal.m4 | 1 - - configure.in | 1 + - 2 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/aclocal.m4 b/aclocal.m4 -index 40b5866..0c662b0 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -40,7 +40,6 @@ dnl - AC_DEFUN(AC_LBL_C_INIT_BEFORE_CC, - [AC_PREREQ(2.50) - AC_BEFORE([$0], [AC_LBL_C_INIT]) -- AC_BEFORE([$0], [AC_PROG_CC]) - AC_BEFORE([$0], [AC_LBL_FIXINCLUDES]) - AC_BEFORE([$0], [AC_LBL_DEVEL]) - AC_ARG_WITH(gcc, [ --without-gcc don't use gcc]) -diff --git a/configure.in b/configure.in -index 11257c9..7f9591c 100644 ---- a/configure.in -+++ b/configure.in -@@ -19,6 +19,7 @@ AC_REVISION($Revision: 1.204 $) - AC_PREREQ(2.50) - AC_INIT(tcpdump.c) - -+AC_PROG_CC - AC_CANONICAL_HOST - - AC_LBL_C_INIT_BEFORE_CC(V_CCOPT, V_INCLS) diff --git a/recipes/tcpdump/tcpdump-4.3.0/ipv6-cross.patch b/recipes/tcpdump/tcpdump-4.3.0/ipv6-cross.patch deleted file mode 100644 index 7eba2c5..0000000 --- a/recipes/tcpdump/tcpdump-4.3.0/ipv6-cross.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- - configure.in | 12 ++++++++---- - 1 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/configure.in b/configure.in -index eb3e5e8..11257c9 100644 ---- a/configure.in -+++ b/configure.in -@@ -181,8 +181,9 @@ yes) AC_MSG_RESULT(yes) - ipv6=no - ;; - esac ], -- -- AC_TRY_RUN([ /* AF_INET6 available check */ -+[ -+ if test x"$cross_compiling" != "xyes"; then -+ AC_TRY_RUN([ /* AF_INET6 avalable check */ - #include - #include - main() -@@ -201,7 +202,10 @@ main() - ipv6=no], - [ AC_MSG_RESULT(no) - ipv6=no] --)) -+ ) -+else -+ AC_MSG_FAILURE([Unable to check for ipv6 when crosscompiling, please specify.]) -+fi]) - - ipv6type=unknown - ipv6lib=none -@@ -316,7 +320,7 @@ if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then - fi - - --if test "$ipv6" = "yes"; then -+if test x"$cross_compiling" != "xyes" -a "$ipv6" = "yes"; then - # - # XXX - on Tru64 UNIX 5.1, there is no "getaddrinfo()" - # function in libc; there are "ngetaddrinfo()" and diff --git a/recipes/tcpdump/tcpdump-4.3.0/tcpdump_configure_no_-O2.patch b/recipes/tcpdump/tcpdump-4.3.0/tcpdump_configure_no_-O2.patch deleted file mode 100644 index 7929da5..0000000 --- a/recipes/tcpdump/tcpdump-4.3.0/tcpdump_configure_no_-O2.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- - configure | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure b/configure -index cb51d19..73d51af 100755 ---- a/configure -+++ b/configure -@@ -2691,13 +2691,13 @@ if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then -- CFLAGS="-g -O2" -+ CFLAGS="-g" - else - CFLAGS="-g" - fi - else - if test "$GCC" = yes; then -- CFLAGS="-O2" -+ CFLAGS="" - else - CFLAGS= - fi -@@ -2830,7 +2830,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "$GCC" = yes ; then - if test "$SHLICC2" = yes ; then - ac_cv_lbl_gcc_vers=2 -- V_CCOPT="-O2" -+ V_CCOPT="" - else - { echo "$as_me:$LINENO: checking gcc version" >&5 - echo $ECHO_N "checking gcc version... $ECHO_C" >&6; } -@@ -2847,7 +2847,7 @@ fi - { echo "$as_me:$LINENO: result: $ac_cv_lbl_gcc_vers" >&5 - echo "${ECHO_T}$ac_cv_lbl_gcc_vers" >&6; } - if test $ac_cv_lbl_gcc_vers -gt 1 ; then -- V_CCOPT="-O2" -+ V_CCOPT="" - fi - fi - else diff --git a/recipes/tcpdump/tcpdump_4.3.0.oe b/recipes/tcpdump/tcpdump_4.3.0.oe deleted file mode 100644 index 6efd256..0000000 --- a/recipes/tcpdump/tcpdump_4.3.0.oe +++ /dev/null @@ -1,7 +0,0 @@ -require ${PN}.inc - -SRC_URI += "file://tcpdump_configure_no_-O2.patch \ - file://0001-minimal-IEEE802.15.4-allowed.patch \ - file://ipv6-cross.patch \ - file://configure.patch \ -" diff --git a/recipes/tcpdump/tcpdump_4.3.0.oe.sig b/recipes/tcpdump/tcpdump_4.3.0.oe.sig deleted file mode 100644 index eebf594..0000000 --- a/recipes/tcpdump/tcpdump_4.3.0.oe.sig +++ /dev/null @@ -1 +0,0 @@ -5d0432e4831ca81633a6c9da732caad77d64a9ac tcpdump-4.3.0.tar.gz