From patchwork Tue May 27 15:50:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 30983 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f199.google.com (mail-ob0-f199.google.com [209.85.214.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 597402066E for ; Tue, 27 May 2014 15:50:38 +0000 (UTC) Received: by mail-ob0-f199.google.com with SMTP id wm4sf47553099obc.2 for ; Tue, 27 May 2014 08:50:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:subject:precedence:reply-to:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=cJ06TUMhOk8c6EpXJITK4uJFVCMklUL6XCtOyN/WYJI=; b=K/aV3rEMcoOcjDsawUwdgEYfHhED4H8GCczgtC4brOtDOJntAdslKQViUqSyhBlTq2 Mmg7LrN9byMGjP6Y5Qr/UlMAdyusVoecms4YHefXvjoXWOYpM0ix/6MI/atNZZfQ7rx9 1BwY5N3/nAuIhn4TGlKN/CN6CnTzGOmzt4cZqkG7PrHFMVaQJHjYuIQSbkns7YwtnfaT sBmLYwmFvEofp9nn0qWncEA0A90fBqyfZWuLAuR0D39AywyZe+Iskn6mGF7dw1kXKGl+ pYwo2iz0Lw7owktQF1mQ0ax4iJY60Y6ABL6ZQYvuQgcf3kw9wApaQ+NfBnyDiLacbdZl oUCg== X-Gm-Message-State: ALoCoQmlOTMAJrVUIvVwNOK30QDt8dRpQiZYsuhS2JfsGq88sbqZf+zvouOPqH2SQEOMTCE9hOlq X-Received: by 10.42.233.133 with SMTP id jy5mr12387376icb.32.1401205837470; Tue, 27 May 2014 08:50:37 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.104.234 with SMTP id a97ls3134683qgf.51.gmail; Tue, 27 May 2014 08:50:37 -0700 (PDT) X-Received: by 10.52.103.74 with SMTP id fu10mr23829251vdb.7.1401205837243; Tue, 27 May 2014 08:50:37 -0700 (PDT) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id vs2si8410663veb.10.2014.05.27.08.50.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 27 May 2014 08:50:37 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 as permitted sender) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id hy4so7391669vcb.40 for ; Tue, 27 May 2014 08:50:37 -0700 (PDT) X-Received: by 10.220.44.141 with SMTP id a13mr1594443vcf.71.1401205837115; Tue, 27 May 2014 08:50:37 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp129751vcb; Tue, 27 May 2014 08:50:36 -0700 (PDT) X-Received: by 10.66.65.169 with SMTP id y9mr37018328pas.145.1401205836317; Tue, 27 May 2014 08:50:36 -0700 (PDT) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id pg7si19290431pbb.78.2014.05.27.08.50.35 for ; Tue, 27 May 2014 08:50:36 -0700 (PDT) Received-SPF: none (google.com: openembedded-devel-bounces@lists.openembedded.org does not designate permitted sender hosts) client-ip=140.211.169.62; Received: from mail.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 2B7116FAE1; Tue, 27 May 2014 15:50:31 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-la0-f42.google.com (unknown [209.85.215.42]) by mail.openembedded.org (Postfix) with ESMTP id 00D406FAE9 for ; Tue, 27 May 2014 15:50:24 +0000 (UTC) Received: by mail-la0-f42.google.com with SMTP id el20so6665415lab.15 for ; Tue, 27 May 2014 08:50:24 -0700 (PDT) X-Received: by 10.152.21.130 with SMTP id v2mr24331773lae.1.1401205824565; Tue, 27 May 2014 08:50:24 -0700 (PDT) Received: from maxim-lap.localhost.onion ([92.39.133.154]) by mx.google.com with ESMTPSA id h11sm15509186lbm.13.2014.05.27.08.50.23 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 27 May 2014 08:50:23 -0700 (PDT) From: Maxim Uvarov To: openembedded-devel@lists.openembedded.org Date: Tue, 27 May 2014 19:50:19 +0400 Message-Id: <1401205819-21761-1-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.8.5.1.163.gd7aced9 Subject: [oe] [PATCH] update snort to 2.9.6.0 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: maxim.uvarov@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 1. looks like snort dropped reference to barnyard2. At least it's missing in configure. Also download link to barnyard2 is not available now. Drop this package. 2. update snort version from 2.9.4.6 to 2.9.6.0. 3. fix libdnet paths. Signed-off-by: Maxim Uvarov --- .../barnyard2-1.8/barnyard2-cross-fix.patch | 24 ---------------------- .../barnyard2/barnyard2_1.8.bb | 18 ---------------- .../snort/{snort_2.9.4.6.bb => snort_2.9.6.0.bb} | 8 ++++---- 3 files changed, 4 insertions(+), 46 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/barnyard2/barnyard2-1.8/barnyard2-cross-fix.patch delete mode 100644 meta-networking/recipes-connectivity/barnyard2/barnyard2_1.8.bb rename meta-networking/recipes-connectivity/snort/{snort_2.9.4.6.bb => snort_2.9.6.0.bb} (89%) diff --git a/meta-networking/recipes-connectivity/barnyard2/barnyard2-1.8/barnyard2-cross-fix.patch b/meta-networking/recipes-connectivity/barnyard2/barnyard2-1.8/barnyard2-cross-fix.patch deleted file mode 100644 index 7b5a60c..0000000 --- a/meta-networking/recipes-connectivity/barnyard2/barnyard2-1.8/barnyard2-cross-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -Upstream-Status: Pending - -Index: barnyard2-1.8/configure.in -=================================================================== ---- barnyard2-1.8.orig/configure.in 2010-08-03 15:12:06.000000000 +0400 -+++ barnyard2-1.8/configure.in 2010-08-03 15:13:46.000000000 +0400 -@@ -73,7 +73,7 @@ - # libpcap doesn't even LOOK at the timeout you give it under Linux - AC_DEFINE([PCAP_TIMEOUT_IGNORED],[1],[Define if pcap timeout is ignored]) - AC_SUBST(extra_incl) -- extra_incl="-I/usr/include/pcap" -+ extra_incl="-I=/usr/include/pcap" - ;; - *-hpux10*|*-hpux11*) - AC_DEFINE([HPUX],[1],[Define if HP-UX 10 or 11]) -@@ -230,7 +230,7 @@ - # In case INADDR_NONE is not defined (like on Solaris) - have_inaddr_none="no" - AC_MSG_CHECKING([for INADDR_NONE]) --AC_RUN_IFELSE( -+AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[ - #include diff --git a/meta-networking/recipes-connectivity/barnyard2/barnyard2_1.8.bb b/meta-networking/recipes-connectivity/barnyard2/barnyard2_1.8.bb deleted file mode 100644 index 14acdac..0000000 --- a/meta-networking/recipes-connectivity/barnyard2/barnyard2_1.8.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "Barnyard2 is a fork of the original barnyard project, designed specifically for Snort's new unified2 file format" -HOMEPAGE = "http://www.securixlive.com/barnyard2/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "libpcap" - -SRC_URI = " \ - http://www.securixlive.com/download/barnyard2/${BP}.tar.gz \ - file://barnyard2-cross-fix.patch \ - " -SRC_URI[md5sum] = "72fc6c490db6ea6a0f46c27d24998067" -SRC_URI[sha256sum] = "1abfe6530d721debd98921421722b02c844c289564730b1e85729e4915b2bb7a" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--enable-prelude --enable-gre --without-mysql" - -CONFFILES_${PN} = "${sysconfdir}/barnyard2.conf" diff --git a/meta-networking/recipes-connectivity/snort/snort_2.9.4.6.bb b/meta-networking/recipes-connectivity/snort/snort_2.9.6.0.bb similarity index 89% rename from meta-networking/recipes-connectivity/snort/snort_2.9.4.6.bb rename to meta-networking/recipes-connectivity/snort/snort_2.9.6.0.bb index acb1b1a..aba2850 100644 --- a/meta-networking/recipes-connectivity/snort/snort_2.9.4.6.bb +++ b/meta-networking/recipes-connectivity/snort/snort_2.9.6.0.bb @@ -13,8 +13,8 @@ SRC_URI = " ${GENTOO_MIRROR}/${BP}.tar.gz;name=tarball \ file://0001-libpcap-search-sysroot-for-headers.patch \ " -SRC_URI[tarball.md5sum] = "4111df01a4f21bd1d328a18b76d625bd" -SRC_URI[tarball.sha256sum] = "cfaa5390b1840aaaa68a6c05a7077dd92cb916e6186a014baa451d43cdb0b3bc" +SRC_URI[tarball.md5sum] = "18111f6de3989ca89add36077a7c2659" +SRC_URI[tarball.sha256sum] = "3cc6c8a9b52f4c863a5736a73b4012aff340b50b5e002771b04d4877f47cd19e" inherit autotools gettext update-rc.d @@ -28,6 +28,8 @@ EXTRA_OECONF = " \ --enable-reload-error-restart \ --enable-targetbased \ --disable-static-daq \ + --with-dnet-includes=${STAGING_INCDIR} \ + --with-dnet-libraries=${STAGING_LIBDIR} \ " do_install_append() { @@ -69,5 +71,3 @@ FILES_${PN}-dev += " \ ${libdir}/snort_dynamicrules/*.so \ ${prefix}/src/snort_dynamicsrc \ " - -RRECOMMENDS_${PN} += "barnyard2"