From patchwork Wed Feb 21 16:20:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 39868 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4B5C6C48BF6 for ; Wed, 21 Feb 2024 16:21:08 +0000 (UTC) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by mx.groups.io with SMTP id smtpd.web10.17341.1708532460126568068 for ; Wed, 21 Feb 2024 08:21:00 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=QgD8iHLH; spf=pass (domain: gmail.com, ip: 209.85.210.178, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-6da9c834646so757517b3a.3 for ; Wed, 21 Feb 2024 08:21:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708532459; x=1709137259; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=71d/j6/T2A4719HO7ebDJjdq715TOz+zMz45OcCFIRE=; b=QgD8iHLHssCxHhvLaQMIRKpJpGI4DBnCicNNEQGnRfNm3AdhAdO/wsWqoGlXJu4Cvo cW39rIH4pvRx+qjFAak7pmv8w24Xt/sBAUdgT4FXdwD7jLgnXMp647nVUfUjD8eBLv+L 0cleO7wYe8lPC9ot1Y+lsOFNHyHs30Wibg8KRcHt+bumuWBnZiPESUciTuQVuPY2u4ge Ug+NV31sKfq62FhvcZIf/h6MwJgulAyeFZAjWlZP/VPFXB0FH5XWaIILlogyx81QhgKj r8E6uy7EMwAyQS8Tck5opFjLMfCkEwSV2M1mkQbOSEwfwkYsxV7Jj/ZN3NvuUW8rkUOK 1E7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708532459; x=1709137259; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=71d/j6/T2A4719HO7ebDJjdq715TOz+zMz45OcCFIRE=; b=Tbu8Xy3QD3WdvvSHOrLGazYE9u1G3OQmUwGLfqi0Ug7xj0+/d3kqnjaAnctdlg21su NkOQtEbo6xBG+dUUvGFbbwEKZUj/FD7AbfwwSjueRiBS2H5kLLmQWFfHdU3NpEot7HPV MiIa+9r/Jic+tZflgK0nN6flfYywo6EPvJUA+C8qnioFAxXq2YfblN7ydvL/2f6+770q qWT7C6dYQgQ6BZI1kONXagtdGkdUYNZAYMNx7TLxlFL7Lp06BbN+pdnCbzjHBd9sgDLW nG71qUOs6SgW3hBT9byDH2/WI6CKg0InERv7IqoWx+JiGpO+fSkJ1YcOW/abzoofGZxm D3bg== X-Gm-Message-State: AOJu0YwRI1Omm0wbCLewl5Kmx6EdS3MgzL4703qVrEZrgws6nCNm3CNM uvDa/4zyyhDVt9iqukW5dqpXIFalBNcq+DYwJqISgMd8bhz7Bj+/b000P6cOj+M= X-Google-Smtp-Source: AGHT+IFPh6D/dcCk+BeBrtrjpTYfxzKC3L2o/1Bad6NM8QrsiJRw/QxP4fwE6Qv7m9RvxqeFtpXtBA== X-Received: by 2002:a05:6a20:9c8b:b0:1a0:6496:84c1 with SMTP id mj11-20020a056a209c8b00b001a0649684c1mr23805254pzb.37.1708532459112; Wed, 21 Feb 2024 08:20:59 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::67c2]) by smtp.gmail.com with ESMTPSA id nv13-20020a17090b1b4d00b00298e639d17esm9753550pjb.22.2024.02.21.08.20.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Feb 2024 08:20:58 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khawaja Shaheryar , Khem Raj Subject: [meta-networking][PATCH 1/4] libdaq: add recipe Date: Wed, 21 Feb 2024 08:20:54 -0800 Message-ID: <20240221162057.4154660-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.43.2 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 21 Feb 2024 16:21:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/108964 From: Khawaja Shaheryar I am adding this recipe as snort3 depends on it. snort3 recipe will be provided in next commit. See more: https://github.com/snort3/libdaq Signed-off-by: Khawaja Shaheryar Signed-off-by: Khem Raj --- ...01-example-Use-lm-for-the-fst-module.patch | 32 +++++++++++++++++++ .../recipes-connectivity/daq/libdaq_git.bb | 18 +++++++++++ 2 files changed, 50 insertions(+) create mode 100644 meta-networking/recipes-connectivity/daq/libdaq/0001-example-Use-lm-for-the-fst-module.patch create mode 100644 meta-networking/recipes-connectivity/daq/libdaq_git.bb diff --git a/meta-networking/recipes-connectivity/daq/libdaq/0001-example-Use-lm-for-the-fst-module.patch b/meta-networking/recipes-connectivity/daq/libdaq/0001-example-Use-lm-for-the-fst-module.patch new file mode 100644 index 0000000000..7147c042a1 --- /dev/null +++ b/meta-networking/recipes-connectivity/daq/libdaq/0001-example-Use-lm-for-the-fst-module.patch @@ -0,0 +1,32 @@ +From 9357da2a5a829f7a0620e6c19835a65b7b02a8fb Mon Sep 17 00:00:00 2001 +From: Khawaja Shaheryar +Date: Tue, 20 Feb 2024 21:03:26 +0500 +Subject: [PATCH] example: Use -lm for the fst module + +If -lm is not passed in Makefile.am, the following is seen +| arm-yoe-linux-gnueabi-ld.lld: error: undefined symbol: ceilf +| >>> referenced by math.h:632 (/usr/include/c++/v1/math.h:632) +| >>> libdaq_static_fst_la-daq_fst.o:(std::__1::pair, void*>*>, bool> std::__1::__hash_table, std::__1::__unordered_map_hasher, FstKeyHash, std::__1::equal_to, true>, std::__1::__unordered_map_equal, std::__1::equal_to, FstKeyHash, true>, std::__1::allocator>>::__emplace_unique_key_args>(FstKey const&, std::__1::pair&&)) in archive ../modules/fst/.libs/libdaq_static_fst.a + +Upstream-Status: Pending + +Signed-off-by: Khawaja Shaheryar +--- + example/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/example/Makefile.am b/example/Makefile.am +index 0d5ca31..1eaa9e8 100644 +--- a/example/Makefile.am ++++ b/example/Makefile.am +@@ -31,6 +31,7 @@ endif + if BUILD_FST_MODULE + daqtest_static_CFLAGS += -DBUILD_FST_MODULE + daqtest_static_LDADD += ${top_builddir}/modules/fst/libdaq_static_fst.la $(DAQ_FST_LIBS) ++daqtest_static_LDFLAGS += -lm + endif + if BUILD_NETMAP_MODULE + daqtest_static_CFLAGS += -DBUILD_NETMAP_MODULE +-- +2.34.1 + diff --git a/meta-networking/recipes-connectivity/daq/libdaq_git.bb b/meta-networking/recipes-connectivity/daq/libdaq_git.bb new file mode 100644 index 0000000000..19346124bf --- /dev/null +++ b/meta-networking/recipes-connectivity/daq/libdaq_git.bb @@ -0,0 +1,18 @@ +SUMMARY = "LibDAQ: The Data AcQuisition Library" +DESCRIPTION = "LibDAQ is a pluggable abstraction layer for interacting with a data source (traditionally a network interface or network data plane)." +HOMEPAGE = "http://www.snort.org" +SECTION = "libs" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=79258250506422d064560a7b95b2d53e" + +DEPENDS = "libdnet libpcap" + +inherit autotools pkgconfig + +SRC_URI = "git://github.com/snort3/libdaq.git;protocol=https;branch=master \ + file://0001-example-Use-lm-for-the-fst-module.patch" +SRCREV = "c757aaae5a70d5bbb3239c5a16bca217a5aca651" + +S = "${WORKDIR}/git" + +FILES:${PN} += "${libdir}/daq/*.so" From patchwork Wed Feb 21 16:20:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 39871 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58E67C48BEB for ; Wed, 21 Feb 2024 16:21:08 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mx.groups.io with SMTP id smtpd.web10.17342.1708532460878605900 for ; Wed, 21 Feb 2024 08:21:00 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Lh84HkId; spf=pass (domain: gmail.com, ip: 209.85.216.53, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-29a2fd8007bso303045a91.1 for ; Wed, 21 Feb 2024 08:21:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708532460; x=1709137260; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=twTUj+6CD+He0xW3OhsIlycKL0gbQ4nxu+DpsUW/rfc=; b=Lh84HkIdkakx+Y/ozqmPEIwAMtzE0dFL9Q/a/OJJFQWipSYURySOJpIaSlkfXNi9hT 96Swc0DuAPa2LNUtirVeZ2HOz/n0c9xuJJhJVWQYrDQPAC4M2siTrUygRU1rEJH5yczC nGl1GexG0t2lbANm31lOcV41NynejvB6HhqCZPfrOtXlhM0oB+8sM0k+Hum7ySABToQu BsmNddsuatH5XX7Kc5TglSZsgNlR709tGF6Us+t1ISG7Y4RDqcjvoF7BOQjiHWay4/zN Ik/bMOKCM/0nc3h0ITRrf7x2h+iVu85bVegMcWF1lFdNq/TNgtqHKgwLRj7ThYjv7ybd pTqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708532460; x=1709137260; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=twTUj+6CD+He0xW3OhsIlycKL0gbQ4nxu+DpsUW/rfc=; b=U8ZrZ/q4QPD7+kxiWbahJscTYtuc8yfrUuOZA2SpLr4+/PLlZb+MNX2GsD7/NY1Ys7 TdoxQGQ5CFkBJQgrNTT83X0jnxpCp0pTaVFuKVB9bNECJhOGetKzeV3xejjqgtKeY16p +r23UZjUKO1jgOktIjQKWIB3L/hWwM7mf+KAc01kf2JWOlN0YOhze/U63dvwHvLtuCuP HIFeexC/tjF3VIjCso8MzeJcNPYp62F+N3ExBHfz+Tw0tzXTdBzUOUQApHQDOGu/P4Xb /waWnSYCA5ryLlCn4WLzNjJnjo110X8x3C4bPtJ1BXoRei1/uVv8s2BKBi2STSFgkgL9 acbA== X-Gm-Message-State: AOJu0Yxqx+vSe0BorXCV316srUn3FP+xflSrSsx5dNjGIyq2W4i1Uw5P KjwRCoMH17MDg0Zr3zGS0BKVs4JznNoSxjGi7u/JNT00M0eb4DiQSp5GugfWp/U= X-Google-Smtp-Source: AGHT+IG4qJNhnYpiN5zI5NTg5MIFfwHtdXh2atv5Gf7Vptx1GQyKTgl6lLArdVJHWKlcE7GKldD9Xg== X-Received: by 2002:a17:90a:fa0c:b0:299:2ed1:d462 with SMTP id cm12-20020a17090afa0c00b002992ed1d462mr12726551pjb.6.1708532459792; Wed, 21 Feb 2024 08:20:59 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::67c2]) by smtp.gmail.com with ESMTPSA id nv13-20020a17090b1b4d00b00298e639d17esm9753550pjb.22.2024.02.21.08.20.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Feb 2024 08:20:59 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khawaja Shaheryar , Khem Raj Subject: [meta-networking][PATCH 2/4] snort: add snort3 initial recipe Date: Wed, 21 Feb 2024 08:20:55 -0800 Message-ID: <20240221162057.4154660-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240221162057.4154660-1-raj.khem@gmail.com> References: <20240221162057.4154660-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 21 Feb 2024 16:21:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/108965 From: Khawaja Shaheryar I am adding this recipe as snort2 is legacy now. See more: https://github.com/snort3/snort3 Signed-off-by: Khawaja Shaheryar Signed-off-by: Khem Raj --- .../recipes-connectivity/snort/snort3_git.bb | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 meta-networking/recipes-connectivity/snort/snort3_git.bb diff --git a/meta-networking/recipes-connectivity/snort/snort3_git.bb b/meta-networking/recipes-connectivity/snort/snort3_git.bb new file mode 100644 index 0000000000..f40a1d7d6f --- /dev/null +++ b/meta-networking/recipes-connectivity/snort/snort3_git.bb @@ -0,0 +1,34 @@ +SUMMARY = "snort3" +DESCRIPTION = "snort3 - a free lightweight network intrusion detection system for UNIX and Windows." +HOMEPAGE = "http://www.snort.org/" +SECTION = "net" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=78fa8ef966b48fbf9095e13cc92377c5" + +PV = "3+git${SRCPV}" + +DEPENDS = "flex hwloc libdaq libdnet libpcap libpcre libtirpc libunwind luajit zlib" + +SRC_URI = "git://github.com/snort3/snort3.git;protocol=https;branch=master" +SRCREV = "e1760a8dbb829bb3fcf1a340ab6cc4bb80a47ecd" + +S = "${WORKDIR}/git" + +PACKAGES =+ "${PN}-scripts" + +inherit cmake pkgconfig + +FILES:${PN} += "${libdir}/snort/daq/*.so" + +FILES:${PN}-scripts = "${bindir}/appid_detector_builder.sh" + +RDEPENDS:${PN}-scripts += "bash" + +# mips64/ppc/ppc64/riscv64/riscv32 is not supported in this release +COMPATIBLE_HOST:mipsarchn32 = "null" +COMPATIBLE_HOST:mipsarchn64 = "null" +COMPATIBLE_HOST:powerpc = "null" +COMPATIBLE_HOST:powerpc64 = "null" +COMPATIBLE_HOST:powerpc64le = "null" +COMPATIBLE_HOST:riscv64 = "null" +COMPATIBLE_HOST:riscv32 = "null" From patchwork Wed Feb 21 16:20:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 39870 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67AA3C5478A for ; Wed, 21 Feb 2024 16:21:08 +0000 (UTC) Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by mx.groups.io with SMTP id smtpd.web10.17343.1708532461518680319 for ; Wed, 21 Feb 2024 08:21:01 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=eeQ+PyWu; spf=pass (domain: gmail.com, ip: 209.85.215.178, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-5e152c757a5so556966a12.2 for ; Wed, 21 Feb 2024 08:21:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708532460; x=1709137260; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+JGLrv9KxOPnCPsuYZnPnrGdCewJwu75t9Ud1Uei5WU=; b=eeQ+PyWuia84XqB9HOWj0uMG/DmUKEOS552/ygsmhQnjdkG4fyaM+UyOS9R+QF9Os/ T1iSwoMiLPWt4/V5s6xcqDjw+h/i9752orrVFYyVZ0OQXjC8l7twooexfgZHdoF6yhON ruDYozRFUaakhQzygKTgwvubUeMZTXssaJenmwKJUo0OPk4vmqVC25OEE8k9sqloI0I0 rFecnlvIecACsaxrVsWa+cp48eUFsPruKt/EjE4q2S5nQLNfBlsUFUFrCOUQKwsGFPtF tY27hzcREBLnXAgEcOrn6N7caLiBCCBqu3D0Cnjs0bOH+KZ0xlgohNqw5rDADOj+f2Z9 ujKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708532460; x=1709137260; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+JGLrv9KxOPnCPsuYZnPnrGdCewJwu75t9Ud1Uei5WU=; b=bXZ3sb96OXQGGKK8easRc/iyYLkaRPTYo63ldqfr+pSZns5MxaqxyJy7/GsFZAXAvj EcQFG6iABLC/YF4fklesA1VDYKPUzi/g75yRYkmCnUlos4ZYMo3pzrmUyQ6cA1asgFb+ 5sxJK/vDYZULcXz7L11LOhIKdQhIWqurOr8nWqDBpULjnxaWI4TghakH31sB5xtbNX+W 3lTeKwbrm+hWuXMAqj3yGcFWmi0QvAOAryk4nRUFQ/Ws6Q7+jlYLcevih406OC9raUYH lqhylOQH6OZJSZcHq9zghBLW/DCV2FxslFqw5xNPTv0Zr91Dwvngmssj59Oz32ycBMua PBow== X-Gm-Message-State: AOJu0Yyce18vvpoAi46d/Tb6fCoLFCSmJsaL/LEpk7r0/cPKAhMGcyed 0OiVSD7+gZOkkh9USLY8rLFpz71VhETTTdXaH/gASOOIzcVGJv8qY3IXUJcQMDI= X-Google-Smtp-Source: AGHT+IGSVGx59OO0NsbY9uXKfKvUcLlTQ1HNml9efVN/F8AfWo1htnMbsZSYzpIIhi7PLuA1tQ6Kkw== X-Received: by 2002:a17:90a:2dce:b0:299:63fe:3a27 with SMTP id q14-20020a17090a2dce00b0029963fe3a27mr8547554pjm.19.1708532460506; Wed, 21 Feb 2024 08:21:00 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::67c2]) by smtp.gmail.com with ESMTPSA id nv13-20020a17090b1b4d00b00298e639d17esm9753550pjb.22.2024.02.21.08.20.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Feb 2024 08:21:00 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 3/4] snort: Do not use llvm libunwind Date: Wed, 21 Feb 2024 08:20:56 -0800 Message-ID: <20240221162057.4154660-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240221162057.4154660-1-raj.khem@gmail.com> References: <20240221162057.4154660-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 21 Feb 2024 16:21:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/108966 If llvm unwind is present then disable unwinding support since it will not have all unw_* functions eg. unw_strerror Signed-off-by: Khem Raj --- .../0001-cmake-Check-for-HP-libunwind.patch | 33 +++++++++++++++++++ .../recipes-connectivity/snort/snort3_git.bb | 3 +- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Check-for-HP-libunwind.patch diff --git a/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Check-for-HP-libunwind.patch b/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Check-for-HP-libunwind.patch new file mode 100644 index 0000000000..7b7a0d098f --- /dev/null +++ b/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Check-for-HP-libunwind.patch @@ -0,0 +1,33 @@ +From 433a412fad2ab0383ac3c625d183a71684f2b97b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 20 Feb 2024 15:35:14 -0800 +Subject: [PATCH] cmake: Check for HP libunwind + +This is to ensure that cmake does not detect LLVM unwinder, which +can provide the support for some HP unwinder functionality but not all +e.g. unw_strerror goes missing. By checking for libunwind-common.h in +tests we ensure that this test passes only with HP libunwind. + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj +--- + cmake/FindLibunwind.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/FindLibunwind.cmake b/cmake/FindLibunwind.cmake +index f66800a18..1ad66fc83 100644 +--- a/cmake/FindLibunwind.cmake ++++ b/cmake/FindLibunwind.cmake +@@ -22,7 +22,7 @@ find_package(PkgConfig QUIET) + pkg_check_modules(PC_LIBUNWIND libunwind) + + find_path(LIBUNWIND_INCLUDE_DIRS +- NAMES libunwind.h ++ NAMES libunwind-common.h + HINTS ${PC_LIBUNWIND_INCLUDE_DIRS} + ) + +-- +2.43.2 + diff --git a/meta-networking/recipes-connectivity/snort/snort3_git.bb b/meta-networking/recipes-connectivity/snort/snort3_git.bb index f40a1d7d6f..0f4a86f61e 100644 --- a/meta-networking/recipes-connectivity/snort/snort3_git.bb +++ b/meta-networking/recipes-connectivity/snort/snort3_git.bb @@ -9,7 +9,8 @@ PV = "3+git${SRCPV}" DEPENDS = "flex hwloc libdaq libdnet libpcap libpcre libtirpc libunwind luajit zlib" -SRC_URI = "git://github.com/snort3/snort3.git;protocol=https;branch=master" +SRC_URI = "git://github.com/snort3/snort3.git;protocol=https;branch=master \ + file://0001-cmake-Check-for-HP-libunwind.patch" SRCREV = "e1760a8dbb829bb3fcf1a340ab6cc4bb80a47ecd" S = "${WORKDIR}/git" From patchwork Wed Feb 21 16:20:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 39869 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4910EC48BC3 for ; Wed, 21 Feb 2024 16:21:08 +0000 (UTC) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by mx.groups.io with SMTP id smtpd.web10.17347.1708532462130910397 for ; Wed, 21 Feb 2024 08:21:02 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=jiRSOUy0; spf=pass (domain: gmail.com, ip: 209.85.216.46, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-299dba8fd24so1577953a91.2 for ; Wed, 21 Feb 2024 08:21:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708532461; x=1709137261; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fbNHfcQW7eBtEc/6k5I7OtVq5MGI//UmhONCTY2pWz0=; b=jiRSOUy0NFKOWhtkF+uDo8aP0v6+mPnhiVOdSy7htMK2YP0dlHzyjCNjX0ebpg03Px JqIVIzWzyFVpCRyJjQ+NepFjULKoF3gDoAhFevGb2XNPqc4dRKTIIog243wmwJz1f6Al 9xU7eocIMR7qv3TAqfeksBZUAm9PDqFExQF/spEHLsjzdCx1pwsxYODQQeezpViDD1Tu +Olmbe4KgTjb2tw7dIanjHwifqFawryBTaHOJb+JTbHbiFueYjTNSm08qJ9Cpq6BsuRr ROWo5Wucis0tdPW4d6YmqzKb3waIzu4o6osfUPgB/IH++J/3S10N3jhrjcoC7G808V65 OQIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708532461; x=1709137261; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fbNHfcQW7eBtEc/6k5I7OtVq5MGI//UmhONCTY2pWz0=; b=MIEdBU9xIHJD+6lgn0ha7O4fFElSxsUMWlnFp2VoG3CdAOrqqp9Lcp1Djx3fon9KGP tiuZTTVo85uXsoMHq/e7hLURLiXdNt+RLL/ldwipgxj4/1ZIUL++PwDrK6uZ+bOqhc5L fClK0z2pndtaiKg8yhxDwp5CNPcArkHO1qoHBVPrcdVa3zh61hTWRzeB6WZHSa0mgNHx 4VTAbAEoFpvYAG88eq1vmb0t/hwlurhW//Yd2JbI24GxeVu9M5XuXgS5RtpTw+aRzMRd m74Bzut4nEkTsSUMoFHaPCbfvqsgiwG8VdX1idNXEdsHLQRfIvGr266x4rF4DQnOhM+n iQNw== X-Gm-Message-State: AOJu0YyZjj1YOKddmoYtudRdsY5DwqxAPsbVcJrR1gif2s4UMon1HEFK yoi48E1cZEOBT29vATS2apMiVcCAqvEvvEoznKQHFplGv6QFMS/L+0dOf+h8v9k= X-Google-Smtp-Source: AGHT+IHPXjw0mBptQOY9l3ff89fULfmI9GC3W7dvyKbr+agVuAtz66va7rHJyADJ+n9ixEWqInITQA== X-Received: by 2002:a17:90b:4b44:b0:29a:377e:c393 with SMTP id mi4-20020a17090b4b4400b0029a377ec393mr527371pjb.4.1708532461150; Wed, 21 Feb 2024 08:21:01 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::67c2]) by smtp.gmail.com with ESMTPSA id nv13-20020a17090b1b4d00b00298e639d17esm9753550pjb.22.2024.02.21.08.21.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Feb 2024 08:21:00 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 4/4] snort3: Fix contains reference to TMPDIR [buildpaths] warnings Date: Wed, 21 Feb 2024 08:20:57 -0800 Message-ID: <20240221162057.4154660-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240221162057.4154660-1-raj.khem@gmail.com> References: <20240221162057.4154660-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 21 Feb 2024 16:21:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/108967 Fixes WARNING: snort3-3+git-r0 do_package_qa: QA Issue: File /usr/lib/pkgconfig/snort.pc in package snort3-dev contains reference to TMPDIR [buildpaths] WARNING: snort3-3+git-r0 do_package_qa: QA Issue: File /usr/src/debug/snort3/3+git/src/js_norm/pdf_tokenizer.cc in package snort3-src contains reference to TMPDIR File /usr/src/debug/snort3/3+git/src/js_norm/js_tokenizer.cc in package snort3-src contains reference to TMPDIR [buildpaths] Signed-off-by: Khem Raj --- .../0001-cmake-Pass-noline-flag-to-flex.patch | 31 +++++++++++++++++++ .../recipes-connectivity/snort/snort3_git.bb | 9 ++++-- 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Pass-noline-flag-to-flex.patch diff --git a/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Pass-noline-flag-to-flex.patch b/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Pass-noline-flag-to-flex.patch new file mode 100644 index 0000000000..ec7b90cfb4 --- /dev/null +++ b/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Pass-noline-flag-to-flex.patch @@ -0,0 +1,31 @@ +From 417ed0045b3d04f539a8eb18b07a208c75f6c7e1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 20 Feb 2024 16:08:20 -0800 +Subject: [PATCH] cmake: Pass --noline flag to flex + +This ensures that line directive is not emitted into lexer output which +could be absolute build paths, since these files end up in dbg packages +this can be flagged as a build/packaging warning. + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + cmake/configure_options.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/configure_options.cmake b/cmake/configure_options.cmake +index f3673f399..fbd0bd2c3 100644 +--- a/cmake/configure_options.cmake ++++ b/cmake/configure_options.cmake +@@ -28,7 +28,7 @@ if ( ENABLE_LARGE_PCAP ) + endif ( ENABLE_LARGE_PCAP ) + + # Flex Lexer +-set ( FLEX_FLAGS "-Ca" ) ++set ( FLEX_FLAGS "-Ca --noline" ) + + # documentation + +-- +2.43.2 + diff --git a/meta-networking/recipes-connectivity/snort/snort3_git.bb b/meta-networking/recipes-connectivity/snort/snort3_git.bb index 0f4a86f61e..4bc2395fae 100644 --- a/meta-networking/recipes-connectivity/snort/snort3_git.bb +++ b/meta-networking/recipes-connectivity/snort/snort3_git.bb @@ -7,10 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=78fa8ef966b48fbf9095e13cc92377c5" PV = "3+git${SRCPV}" -DEPENDS = "flex hwloc libdaq libdnet libpcap libpcre libtirpc libunwind luajit zlib" +DEPENDS = "flex-native hwloc libdaq libdnet libpcap libpcre libtirpc libunwind luajit zlib" SRC_URI = "git://github.com/snort3/snort3.git;protocol=https;branch=master \ - file://0001-cmake-Check-for-HP-libunwind.patch" + file://0001-cmake-Check-for-HP-libunwind.patch \ + file://0001-cmake-Pass-noline-flag-to-flex.patch" SRCREV = "e1760a8dbb829bb3fcf1a340ab6cc4bb80a47ecd" S = "${WORKDIR}/git" @@ -19,6 +20,10 @@ PACKAGES =+ "${PN}-scripts" inherit cmake pkgconfig +do_install:append() { + sed -i "s#${RECIPE_SYSROOT}##g" ${D}${libdir}/pkgconfig/snort.pc +} + FILES:${PN} += "${libdir}/snort/daq/*.so" FILES:${PN}-scripts = "${bindir}/appid_detector_builder.sh"