[oe-commits] Openembedded-commits Digest, Vol 141, Issue 238
Vaultoro Limited
support at vaultoro.com
Sun Jul 29 15:54:15 UTC 2018
Thanks for reaching out to the Vaultoro support team.
We will try to always get back to you as soon as possible usually
within 24 hours.
Thanks for your support.
On July 29, 2018 at 5:54 PM openembedded-commits wrote:
Send Openembedded-commits mailing list submissions to
openembedded-commits at lists.openembedded.org (
mailto:openembedded-commits at lists.openembedded.org )
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openembedded.org/mailman/listinfo/openembedded-commits
( http://lists.openembedded.org/mailman/listinfo/openembedded-commits )
or, via email, send a message with subject or body 'help' to
openembedded-commits-request at lists.openembedded.org (
mailto:openembedded-commits-request at lists.openembedded.org )
You can reach the person managing the list at
openembedded-commits-owner at lists.openembedded.org (
mailto:openembedded-commits-owner at lists.openembedded.org )
When replying, please edit your Subject line so it is more
specific
than "Re: Contents of Openembedded-commits digest..."
Today's Topics:
1. [meta-openembedded] 14/71: meta-oe: update websocketpp to
0.8.1, drop all patches (git at git.openembedded.org (
mailto:git at git.openembedded.org ))
2. [meta-openembedded] 18/71: yaffs2-utils: update to latest
master (git at git.openembedded.org (
mailto:git at git.openembedded.org ))
3. [meta-openembedded] 20/71: python-pyiface: Upgrade to
version 0.0.9 (git at git.openembedded.org (
mailto:git at git.openembedded.org ))
4. [meta-openembedded] 17/71: snort: upgrade 2.9.7.5 ->
2.9.11.1 (git at git.openembedded.org (
mailto:git at git.openembedded.org ))
----------------------------------------------------------------------
Message: 1
Date: Sun, 29 Jul 2018 15:53:38 +0000
From: git at git.openembedded.org ( mailto:git at git.openembedded.org
)
To: openembedded-commits at lists.openembedded.org (
mailto:openembedded-commits at lists.openembedded.org )
Subject: [oe-commits] [meta-openembedded] 14/71: meta-oe: update
websocketpp to 0.8.1, drop all patches
Message-ID:
Content-Type: text/plain; charset=utf-8
This is an automated email from the git hooks/post-receive
script.
khem pushed a commit to branch master-next
in repository meta-openembedded.
commit b1a3f656a550c43c8e9797531fc3402542b21f6b
Author: Gianfranco Costamagna
AuthorDate: Mon Jul 23 18:48:26 2018 +0200
meta-oe: update websocketpp to 0.8.1, drop all patches
Signed-off-by: Khem Raj
---
.../0001-Fix-issue-599.patch |
0
.../4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch |
0
.../9ddb300d874a30db35e3ad58f188944bef0bf31b.patch |
0
.../disable-tests.patch |
0
.../websocketpp/{websocketpp_0.7.0.bb => websocketpp_0.8.1.bb} |
10 ++--------
5 files changed, 2 insertions(+), 8 deletions(-)
diff --git
a/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/0001-Fix-issue-599.patch
b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Fix-issue-599.patch
similarity index 100%
rename from
meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/0001-Fix-issue-599.patch
rename to
meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Fix-issue-599.patch
diff --git
a/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch
b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch
similarity index 100%
rename from
meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch
rename to
meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch
diff --git
a/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/9ddb300d874a30db35e3ad58f188944bef0bf31b.patch
b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/9ddb300d874a30db35e3ad58f188944bef0bf31b.patch
similarity index 100%
rename from
meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/9ddb300d874a30db35e3ad58f188944bef0bf31b.patch
rename to
meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/9ddb300d874a30db35e3ad58f188944bef0bf31b.patch
diff --git
a/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/disable-tests.patch
b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/disable-tests.patch
similarity index 100%
rename from
meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/disable-tests.patch
rename to
meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/disable-tests.patch
diff --git
a/meta-oe/recipes-support/websocketpp/websocketpp_0.7.0.bb
b/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb
similarity index 57%
rename from
meta-oe/recipes-support/websocketpp/websocketpp_0.7.0.bb
rename to
meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb
index 65fc974..75a5f88 100644
--- a/meta-oe/recipes-support/websocketpp/websocketpp_0.7.0.bb
+++ b/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb
@@ -7,14 +7,8 @@ DEPENDS = "openssl boost zlib"
SRC_URI =
"git://github.com/zaphoyd/websocketpp.git;protocol=https;branch=master"
-# tag 0.7.0
-SRCREV= "378437aecdcb1dfe62096ffd5d944bf1f640ccc3"
-
-SRC_URI += "file://0001-Fix-issue-599.patch \
-
file://9ddb300d874a30db35e3ad58f188944bef0bf31b.patch \
-
file://4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch \
- file://disable-tests.patch \
- "
+# tag 0.8.1
+SRCREV= "c6d7e295bf5a0ab9b5f896720cc1a0e0fdc397a7"
S = "${WORKDIR}/git"
--
To stop receiving notification emails like this one, please
contact
the administrator of this repository.
------------------------------
Message: 2
Date: Sun, 29 Jul 2018 15:53:42 +0000
From: git at git.openembedded.org ( mailto:git at git.openembedded.org
)
To: openembedded-commits at lists.openembedded.org (
mailto:openembedded-commits at lists.openembedded.org )
Subject: [oe-commits] [meta-openembedded] 18/71: yaffs2-utils:
update
to latest master
Message-ID:
Content-Type: text/plain; charset=utf-8
This is an automated email from the git hooks/post-receive
script.
khem pushed a commit to branch master-next
in repository meta-openembedded.
commit c031adb61d36ada4ac9afeadeaa64d43ffb76323
Author: Yi Zhao
AuthorDate: Tue Jul 24 10:34:08 2018 +0800
yaffs2-utils: update to latest master
License-Update: Modify the line number for mkyaffs2image.c
license.
Add license for mkyaffsimage.c since it also
be built.
Signed-off-by: Yi Zhao
Signed-off-by: Khem Raj
---
meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb
| 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git
a/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb
b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb
index 317965e..9ca6d9b 100644
---
a/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb
+++
b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb
@@ -5,7 +5,9 @@ SECTION = "base"
HOMEPAGE = "http://www.yaffs.net" ( http://www.yaffs.net" );
LICENSE = "GPLv2"
-LIC_FILES_CHKSUM =
"file://utils/mkyaffs2image.c;beginline=12;endline=14;md5=5f5464f9b3e981ca574e65b00e438561"
+LIC_FILES_CHKSUM =
"file://utils/mkyaffs2image.c;beginline=11;endline=13;md5=5f5464f9b3e981ca574e65b00e438561
\
+
file://utils/mkyaffsimage.c;beginline=10;endline=12;md5=5f5464f9b3e981ca574e65b00e438561
\
+ "
PV = "0.0+git${SRCPV}"
@@ -17,7 +19,7 @@ SRC_URI =
"git://www.aleph1.co.uk/yaffs2;protocol=git;branch=master ( http://www.aleph1.co.uk/yaffs2;protocol=git;branch=master ) \
file://0001-define-loff_t-if-not-already-defined.patch \
"
-SRCREV = "bc76682d93955cfb33051beb503ad9f8a5450578"
+SRCREV = "0065378b27638ee07352282b51b596fabcac26e4"
UPSTREAM_CHECK_COMMITS = "1"
--
To stop receiving notification emails like this one, please
contact
the administrator of this repository.
------------------------------
Message: 3
Date: Sun, 29 Jul 2018 15:53:44 +0000
From: git at git.openembedded.org ( mailto:git at git.openembedded.org
)
To: openembedded-commits at lists.openembedded.org (
mailto:openembedded-commits at lists.openembedded.org )
Subject: [oe-commits] [meta-openembedded] 20/71: python-pyiface:
Upgrade to version 0.0.9
Message-ID:
Content-Type: text/plain; charset=utf-8
This is an automated email from the git hooks/post-receive
script.
khem pushed a commit to branch master-next
in repository meta-openembedded.
commit 9cd4375617c567ba08c96616bce66fb8088ac5e8
Author: Alexandru Vasiu
AuthorDate: Tue Jul 24 13:41:31 2018 +0300
python-pyiface: Upgrade to version 0.0.9
Signed-off-by: Alexandru Vasiu
Signed-off-by: Khem Raj
---
meta-python/recipes-devtools/python/python-pyiface.inc
| 4 ++--
.../python/{python-pyiface_0.0.7.bb => python-pyiface_0.0.9.bb}
| 0
.../python/{python3-pyiface_0.0.7.bb =>
python3-pyiface_0.0.9.bb} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/meta-python/recipes-devtools/python/python-pyiface.inc
b/meta-python/recipes-devtools/python/python-pyiface.inc
index 895a0ae..a1156f4 100644
--- a/meta-python/recipes-devtools/python/python-pyiface.inc
+++ b/meta-python/recipes-devtools/python/python-pyiface.inc
@@ -5,7 +5,7 @@ LICENSE = "GPLv3+"
LIC_FILES_CHKSUM =
"file://LICENSE.txt;md5=4fe869ee987a340198fb0d54c55c47f1"
-SRC_URI[md5sum] = "1bbc53c281925eae5f508b8b1a1f8259"
-SRC_URI[sha256sum] =
"83a64f5672cda48776ca9ed228dbf2e2df7b074a7dcb52ed4f6987322051928d"
+SRC_URI[md5sum] = "bc94e3d0c1cf8f49ac86514a8e90ed5c"
+SRC_URI[sha256sum] =
"a58367d456ac0b4b9d1d5c31d5dd24363ad6c5bcc73edf027ded63732f784cf4"
inherit pypi
diff --git
a/meta-python/recipes-devtools/python/python-pyiface_0.0.7.bb
b/meta-python/recipes-devtools/python/python-pyiface_0.0.9.bb
similarity index 100%
rename from
meta-python/recipes-devtools/python/python-pyiface_0.0.7.bb
rename to
meta-python/recipes-devtools/python/python-pyiface_0.0.9.bb
diff --git
a/meta-python/recipes-devtools/python/python3-pyiface_0.0.7.bb
b/meta-python/recipes-devtools/python/python3-pyiface_0.0.9.bb
similarity index 100%
rename from
meta-python/recipes-devtools/python/python3-pyiface_0.0.7.bb
rename to
meta-python/recipes-devtools/python/python3-pyiface_0.0.9.bb
--
To stop receiving notification emails like this one, please
contact
the administrator of this repository.
------------------------------
Message: 4
Date: Sun, 29 Jul 2018 15:53:41 +0000
From: git at git.openembedded.org ( mailto:git at git.openembedded.org
)
To: openembedded-commits at lists.openembedded.org (
mailto:openembedded-commits at lists.openembedded.org )
Subject: [oe-commits] [meta-openembedded] 17/71: snort: upgrade
2.9.7.5 -> 2.9.11.1
Message-ID:
Content-Type: text/plain; charset=utf-8
This is an automated email from the git hooks/post-receive
script.
khem pushed a commit to branch master-next
in repository meta-openembedded.
commit 6d960cf729ed238916bb42e3bf6db9d9c2f5dd4d
Author: Yi Zhao
AuthorDate: Tue Jul 24 10:33:33 2018 +0800
snort: upgrade 2.9.7.5 -> 2.9.11.1
* Update SRC_URI
* Drop 0001-fix-do_package-failed-since-snort-2.9.7.0.patch
since the
issue had been fixed upstream.
* Drop the following patches and merge their modifications to
disable-run-test-program-while-cross-compiling.patch:
disable-dap-address-space-id.patch
disable-daq-flow-id.patch
disable-daq-verdict-retry.patch
disable-inaddr-none.patch
* Add disable-run-test-program-while-cross-compiling.patch to
fix
configure error: cannot run test program while cross
compiling.
The variables have_daq_real_addresses,
have_daq_ext_modflow,
have_daq_queryflow, have_daq_data_channel_flags and
have_daq_data_channel_separate_ip_versions are set to no
since they
are for daq 2.2.2 but we have daq 2.0.6 in meta-networking
layer.
Signed-off-by: Yi Zhao
Signed-off-by: Khem Raj
---
...fix-do_package-failed-since-snort-2.9.7.0.patch | 33 ---
.../snort/snort/disable-dap-address-space-id.patch | 62 -----
.../snort/snort/disable-daq-flow-id.patch | 60 -----
.../snort/snort/disable-daq-verdict-retry.patch | 60 -----
.../snort/snort/disable-inaddr-none.patch | 85 -------
...le-run-test-program-while-cross-compiling.patch | 254
+++++++++++++++++++++
.../snort/{snort_2.9.7.5.bb => snort_2.9.11.1.bb} | 12 +-
7 files changed, 258 insertions(+), 308 deletions(-)
diff --git
a/meta-networking/recipes-connectivity/snort/snort/0001-fix-do_package-failed-since-snort-2.9.7.0.patch
b/meta-networking/recipes-connectivity/snort/snort/0001-fix-do_package-failed-since-snort-2.9.7.0.patch
deleted file mode 100644
index 047caec..0000000
---
a/meta-networking/recipes-connectivity/snort/snort/0001-fix-do_package-failed-since-snort-2.9.7.0.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 4335c4c61877c0b65ff4ec767e8ad3ad8c73c32d Mon Sep 17
00:00:00 2001
-From: Zhiquan Li
-Date: Fri, 13 Nov 2015 17:40:24 +0800
-Subject: [PATCH] fix do_package failed since snort 2.9.7.0
-
-Remove redundant '/' as a workround for below error:
-/lib/rpm/bin/debugedit: canonicalization unexpectedly shrank by
one character
-
-It's a rpm debugedit bug:
-* http://sourceforge.net/p/snort/mailman/message/34130268/ ( http://sourceforge.net/p/snort/mailman/message/34130268/ )
-* https://bugzilla.redhat.com/show_bug.cgi?id=304121 ( https://bugzilla.redhat.com/show_bug.cgi?id=304121 )
-
-Upstream-Status:Inappropriate [embedded specific]
-
-Signed-off-by: Zhiquan Li
-
----
- src/snort.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/snort.h b/src/snort.h
-index 8308e57..499d157 100644
---- a/src/snort.h
-+++ b/src/snort.h
-@@ -39,7 +39,7 @@
- #include "sfdaq.h"
- #include "sf_types.h"
- #include "sfutil/sflsq.h"
--#include "sfutil//sfActionQueue.h"
-+#include "sfutil/sfActionQueue.h"
- #include "profiler.h"
- #include "rules.h"
- #include "treenodes.h"
diff --git
a/meta-networking/recipes-connectivity/snort/snort/disable-dap-address-space-id.patch
b/meta-networking/recipes-connectivity/snort/snort/disable-dap-address-space-id.patch
deleted file mode 100644
index 6aa0b73..0000000
---
a/meta-networking/recipes-connectivity/snort/snort/disable-dap-address-space-id.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 5a53260a819e2873f58165e96852529719101c53 Mon Sep 17
00:00:00 2001
-From: Chunrong Guo
-Date: Mon, 4 Nov 2013 10:39:56 +0800
-Subject: [PATCH] snort: add recipe
-
-Upstream-Status:Inappropriate [embedded specific]
-
-fix the below error:
-checking for dap address space id... configure:
-configure: error: cannot run test program while cross compiling
-
-Signed-off-by: Chunrong Guo
-
----
- configure.in | 34 +++++++++++++++++-----------------
- 1 file changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 6fe5d68..e7636ce 100644
---- a/configure.in
-+++ b/configure.in
-@@ -698,23 +698,23 @@ if test "x$ac_cv_func_daq_dp_add_dc" =
"xyes"; then
-
- fi
-
--AC_MSG_CHECKING([for daq address space ID])
--AC_RUN_IFELSE(
--[AC_LANG_PROGRAM(
--[[
--#include
--]],
--[[
-- DAQ_PktHdr_t hdr;
-- hdr.address_space_id = 0;
--]])],
--[have_daq_address_space_id="yes"],
--[have_daq_address_space_id="no"])
--AC_MSG_RESULT($have_daq_address_space_id)
--if test "x$have_daq_address_space_id" = "xyes"; then
-- AC_DEFINE([HAVE_DAQ_ADDRESS_SPACE_ID],[1],
-- [DAQ version supports address space ID in header.])
--fi
-+#AC_MSG_CHECKING([for daq address space ID])
-+#AC_RUN_IFELSE(
-+#[AC_LANG_PROGRAM(
-+#[[
-+##include
-+#]],
-+#[[
-+# DAQ_PktHdr_t hdr;
-+# hdr.address_space_id = 0;
-+#]])],
-+have_daq_address_space_id="yes"
-+#[have_daq_address_space_id="no"])
-+#AC_MSG_RESULT($have_daq_address_space_id)
-+#if test "x$have_daq_address_space_id" = "xyes"; then
-+# AC_DEFINE([HAVE_DAQ_ADDRESS_SPACE_ID],[1],
-+# [DAQ version supports address space ID in header.])
-+#fi
-
- AC_MSG_CHECKING([for daq flow ID])
- AC_RUN_IFELSE(
diff --git
a/meta-networking/recipes-connectivity/snort/snort/disable-daq-flow-id.patch
b/meta-networking/recipes-connectivity/snort/snort/disable-daq-flow-id.patch
deleted file mode 100644
index 04df37c..0000000
---
a/meta-networking/recipes-connectivity/snort/snort/disable-daq-flow-id.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 5aa42a3137c657b5eddd4608343aa1854bd7cd27 Mon Sep 17
00:00:00 2001
-From: Zhiquan Li
-Date: Mon, 16 Nov 2015 10:23:00 +0800
-Subject: [PATCH] snort: 2.9.6.0 -> 2.9.7.5
-
-Upstream-Status:Inappropriate [embedded specific]
-
-fix the below error:
-checking for daq flow ID... configure:
-configure: error: cannot run test program while cross compiling
-
----
- configure.in | 34 +++++++++++++++++-----------------
- 1 file changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index e7636ce..2fbd298 100644
---- a/configure.in
-+++ b/configure.in
-@@ -716,23 +716,23 @@ have_daq_address_space_id="yes"
- # [DAQ version supports address space ID in header.])
- #fi
-
--AC_MSG_CHECKING([for daq flow ID])
--AC_RUN_IFELSE(
--[AC_LANG_PROGRAM(
--[[
--#include
--]],
--[[
-- DAQ_PktHdr_t hdr;
-- hdr.flow_id = 0;
--]])],
--[have_daq_flow_id="yes"],
--[have_daq_flow_id="no"])
--AC_MSG_RESULT($have_daq_flow_id)
--if test "x$have_daq_flow_id" = "xyes"; then
-- AC_DEFINE([HAVE_DAQ_FLOW_ID],[1],
-- [DAQ version supports flow ID in header.])
--fi
-+#AC_MSG_CHECKING([for daq flow ID])
-+#AC_RUN_IFELSE(
-+#[AC_LANG_PROGRAM(
-+#[[
-+##include
-+#]],
-+#[[
-+# DAQ_PktHdr_t hdr;
-+# hdr.flow_id = 0;
-+#]])],
-+have_daq_flow_id="yes"
-+#[have_daq_flow_id="no"])
-+#AC_MSG_RESULT($have_daq_flow_id)
-+#if test "x$have_daq_flow_id" = "xyes"; then
-+# AC_DEFINE([HAVE_DAQ_FLOW_ID],[1],
-+# [DAQ version supports flow ID in header.])
-+#fi
-
- AC_MSG_CHECKING([for DAQ_VERDICT_RETRY])
- AC_RUN_IFELSE(
diff --git
a/meta-networking/recipes-connectivity/snort/snort/disable-daq-verdict-retry.patch
b/meta-networking/recipes-connectivity/snort/snort/disable-daq-verdict-retry.patch
deleted file mode 100644
index 15958a7..0000000
---
a/meta-networking/recipes-connectivity/snort/snort/disable-daq-verdict-retry.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From b916443d43f2e1eeacfbed0033274a0270ef634d Mon Sep 17
00:00:00 2001
-From: Zhiquan Li
-Date: Mon, 16 Nov 2015 10:23:00 +0800
-Subject: [PATCH] snort: 2.9.6.0 -> 2.9.7.5
-
-Upstream-Status:Inappropriate [embedded specific]
-
-fix the below error:
-checking for DAQ_VERDICT_RETRY... configure:
-configure: error: cannot run test program while cross compiling
-
----
- configure.in | 34 +++++++++++++++++-----------------
- 1 file changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 2fbd298..62573a8 100644
---- a/configure.in
-+++ b/configure.in
-@@ -734,23 +734,23 @@ have_daq_flow_id="yes"
- # [DAQ version supports flow ID in header.])
- #fi
-
--AC_MSG_CHECKING([for DAQ_VERDICT_RETRY])
--AC_RUN_IFELSE(
--[AC_LANG_PROGRAM(
--[[
--#include
--]],
--[[
-- DAQ_Verdict verdict;
-- verdict = DAQ_VERDICT_RETRY;
--]])],
--[have_daq_verdict_retry="yes"],
--[have_daq_verdict_retry="no"])
--AC_MSG_RESULT($have_daq_verdict_retry)
--if test "x$have_daq_verdict_retry" = "xyes"; then
-- AC_DEFINE([HAVE_DAQ_VERDICT_RETRY],[1],
-- [DAQ version supports DAQ_VERDICT_RETRY in
DAQ_Verdict.])
--fi
-+#AC_MSG_CHECKING([for DAQ_VERDICT_RETRY])
-+#AC_RUN_IFELSE(
-+#[AC_LANG_PROGRAM(
-+#[[
-+##include
-+#]],
-+#[[
-+# DAQ_Verdict verdict;
-+# verdict = DAQ_VERDICT_RETRY;
-+#]])],
-+have_daq_verdict_retry="yes"
-+#[have_daq_verdict_retry="no"])
-+#AC_MSG_RESULT($have_daq_verdict_retry)
-+#if test "x$have_daq_verdict_retry" = "xyes"; then
-+# AC_DEFINE([HAVE_DAQ_VERDICT_RETRY],[1],
-+# [DAQ version supports DAQ_VERDICT_RETRY in
DAQ_Verdict.])
-+#fi
-
- # any sparc platform has to have this one defined.
- AC_MSG_CHECKING(for sparc)
diff --git
a/meta-networking/recipes-connectivity/snort/snort/disable-inaddr-none.patch
b/meta-networking/recipes-connectivity/snort/snort/disable-inaddr-none.patch
deleted file mode 100644
index 79e9f07..0000000
---
a/meta-networking/recipes-connectivity/snort/snort/disable-inaddr-none.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From a1fdbced4166cb0f35d23b63a59312d86860485a Mon Sep 17
00:00:00 2001
-From: Chunrong Guo
-Date: Mon, 4 Nov 2013 10:39:56 +0800
-Subject: [PATCH] snort: add recipe
-
-Upstream-Status: Inappropriate [embedded specific]
-
-fix the below error:
-checking for INADDR_NONE... configure:
-configure: error: cannot run test program while cross compiling
-
-Signed-off-by: Chunrong Guo
-
----
- configure.in | 50
++++++++++++++++----------------------------------
- 1 file changed, 16 insertions(+), 34 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 20d15eb..6fe5d68 100644
---- a/configure.in
-+++ b/configure.in
-@@ -274,25 +274,7 @@
AC_CHECK_TYPES([int8_t,int16_t,int32_t,int64_t])
- AC_CHECK_TYPES([boolean])
-
- # In case INADDR_NONE is not defined (like on Solaris)
--have_inaddr_none="no"
--AC_MSG_CHECKING([for INADDR_NONE])
--AC_RUN_IFELSE(
--[AC_LANG_PROGRAM(
--[[
--#include
--#include
--#include
--]],
--[[
-- if (inet_addr("10,5,2") == INADDR_NONE);
-- return 0;
--]])],
--[have_inaddr_none="yes"],
--[have_inaddr_none="no"])
--AC_MSG_RESULT($have_inaddr_none)
--if test "x$have_inaddr_none" = "xno"; then
-- AC_DEFINE([INADDR_NONE],[-1],[For INADDR_NONE definition])
--fi
-+have_inaddr_none="yes"
-
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include
-@@ -421,21 +403,21 @@ if test "x$LPCAP" = "xno"; then
- fi
- fi
-
--AC_MSG_CHECKING([for pcap_lex_destroy])
--AC_RUN_IFELSE(
--[AC_LANG_PROGRAM(
--[[
--#include
--]],
--[[
-- pcap_lex_destroy();
--]])],
--[have_pcap_lex_destroy="yes"],
--[have_pcap_lex_destroy="no"])
--AC_MSG_RESULT($have_pcap_lex_destroy)
--if test "x$have_pcap_lex_destroy" = "xyes"; then
-- AC_DEFINE([HAVE_PCAP_LEX_DESTROY],[1],[Can cleanup lex
buffer stack created by pcap bpf filter])
--fi
-+#AC_MSG_CHECKING([for pcap_lex_destroy])
-+#AC_RUN_IFELSE(
-+#[AC_LANG_PROGRAM(
-+#[[
-+##include
-+#]],
-+#[[
-+# pcap_lex_destroy();
-+#]])],
-+have_pcap_lex_destroy="yes"
-+#[have_pcap_lex_destroy="no"])
-+#AC_MSG_RESULT($have_pcap_lex_destroy)
-+#if test "x$have_pcap_lex_destroy" = "xyes"; then
-+# AC_DEFINE([HAVE_PCAP_LEX_DESTROY],[1],[Can cleanup lex
buffer stack created by pcap bpf filter])
-+#fi
-
- AC_MSG_CHECKING([for pcap_lib_version])
- AC_LINK_IFELSE(
diff --git
a/meta-networking/recipes-connectivity/snort/snort/disable-run-test-program-while-cross-compiling.patch
b/meta-networking/recipes-connectivity/snort/snort/disable-run-test-program-while-cross-compiling.patch
new file mode 100644
index 0000000..037962f
--- /dev/null
+++
b/meta-networking/recipes-connectivity/snort/snort/disable-run-test-program-while-cross-compiling.patch
@@ -0,0 +1,254 @@
+From dc390837bc7adc205bb955d0922040a7e365d8dd Mon Sep 17
00:00:00 2001
+From: Yi Zhao
+Date: Mon, 23 Jul 2018 13:54:07 +0800
+Subject: [PATCH] Disable run test program while cross compiling
+
+fix configure error:
+configure: error: cannot run test program while cross compiling
+
+Upstream-Status:Inappropriate [embedded specific]
+
+Signed-off-by: Yi Zhao
+---
+ configure.in | 148
+++++------------------------------------------------------
+ 1 file changed, 12 insertions(+), 136 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 4b3a5db..a6c5498 100644
+--- a/configure.in
++++ b/configure.in
+@@ -284,19 +284,7 @@ AC_CHECK_TYPES([boolean])
+ # In case INADDR_NONE is not defined (like on Solaris)
+ have_inaddr_none="no"
+ AC_MSG_CHECKING([for INADDR_NONE])
+-AC_RUN_IFELSE(
+-[AC_LANG_PROGRAM(
+-[[
+-#include
+-#include
+-#include
+-]],
+-[[
+- if (inet_addr("10,5,2") == INADDR_NONE);
+- return 0;
+-]])],
+-[have_inaddr_none="yes"],
+-[have_inaddr_none="no"])
++have_inaddr_none="yes"
+ AC_MSG_RESULT($have_inaddr_none)
+ if test "x$have_inaddr_none" = "xno"; then
+ AC_DEFINE([INADDR_NONE],[-1],[For INADDR_NONE definition])
+@@ -429,16 +417,7 @@ if test "x$LPCAP" = "xno"; then
+ fi
+
+ AC_MSG_CHECKING([for pcap_lex_destroy])
+-AC_RUN_IFELSE(
+-[AC_LANG_PROGRAM(
+-[[
+-#include
+-]],
+-[[
+- pcap_lex_destroy();
+-]])],
+-[have_pcap_lex_destroy="yes"],
+-[have_pcap_lex_destroy="no"])
++have_pcap_lex_destroy="yes"
+ AC_MSG_RESULT($have_pcap_lex_destroy)
+ if test "x$have_pcap_lex_destroy" = "xyes"; then
+ AC_DEFINE([HAVE_PCAP_LEX_DESTROY],[1],[Can cleanup lex
buffer stack created by pcap bpf filter])
+@@ -716,17 +695,7 @@ fi
+ AC_CHECK_FUNCS([daq_hup_apply] [daq_acquire_with_meta]
[daq_dp_add_dc])
+
+ AC_MSG_CHECKING([for daq real addresses])
+-AC_RUN_IFELSE(
+-[AC_LANG_PROGRAM(
+-[[
+-#include
+-]],
+-[[
+- DAQ_PktHdr_t hdr;
+- hdr.n_real_dPort = 0;
+-]])],
+-[have_daq_real_addresses="yes"],
+-[have_daq_real_addresses="no"])
++have_daq_real_addresses="no"
+ AC_MSG_RESULT($have_daq_real_addresses)
+ if test "x$have_daq_real_addresses" = "xyes"; then
+ AC_DEFINE([HAVE_DAQ_REAL_ADDRESSES],[1],
+@@ -754,17 +723,7 @@ if test "x$ac_cv_func_daq_dp_add_dc" =
"xyes"; then
+ fi
+
+ AC_MSG_CHECKING([for daq address space ID])
+-AC_RUN_IFELSE(
+-[AC_LANG_PROGRAM(
+-[[
+-#include
+-]],
+-[[
+- DAQ_PktHdr_t hdr;
+- hdr.address_space_id = 0;
+-]])],
+-[have_daq_address_space_id="yes"],
+-[have_daq_address_space_id="no"])
++have_daq_address_space_id="yes"
+ AC_MSG_RESULT($have_daq_address_space_id)
+ if test "x$have_daq_address_space_id" = "xyes"; then
+ AC_DEFINE([HAVE_DAQ_ADDRESS_SPACE_ID],[1],
+@@ -772,17 +731,7 @@ if test "x$have_daq_address_space_id" =
"xyes"; then
+ fi
+
+ AC_MSG_CHECKING([for daq flow ID])
+-AC_RUN_IFELSE(
+-[AC_LANG_PROGRAM(
+-[[
+-#include
+-]],
+-[[
+- DAQ_PktHdr_t hdr;
+- hdr.flow_id = 0;
+-]])],
+-[have_daq_flow_id="yes"],
+-[have_daq_flow_id="no"])
++have_daq_flow_id="yes"
+ AC_MSG_RESULT($have_daq_flow_id)
+ if test "x$have_daq_flow_id" = "xyes"; then
+ AC_DEFINE([HAVE_DAQ_FLOW_ID],[1],
+@@ -790,19 +739,7 @@ if test "x$have_daq_flow_id" = "xyes"; then
+ fi
+
+ AC_MSG_CHECKING([for daq extended flow modifiers])
+-AC_RUN_IFELSE(
+-[AC_LANG_PROGRAM(
+-[[
+-#include
+-]],
+-[[
+- DAQ_ModFlow_t mod;
+- mod.type = 0;
+- mod.length = 0;
+- mod.value = NULL;
+-]])],
+-[have_daq_ext_modflow="yes"],
+-[have_daq_ext_modflow="no"])
++have_daq_ext_modflow="no"
+ AC_MSG_RESULT($have_daq_ext_modflow)
+ if test "x$have_daq_ext_modflow" = "xyes"; then
+ CCONFIGFLAGS="${CCONFIGFLAGS} -DHAVE_DAQ_EXT_MODFLOW"
+@@ -811,19 +748,7 @@ if test "x$have_daq_ext_modflow" = "xyes";
then
+ fi
+
+ AC_MSG_CHECKING([for daq query flow])
+-AC_RUN_IFELSE(
+-[AC_LANG_PROGRAM(
+-[[
+-#include
+-]],
+-[[
+- DAQ_QueryFlow_t mod;
+- mod.type = 0;
+- mod.length = 0;
+- mod.value = NULL;
+-]])],
+-[have_daq_queryflow="yes"],
+-[have_daq_queryflow="no"])
++have_daq_queryflow="no"
+ AC_MSG_RESULT($have_daq_queryflow)
+ if test "x$have_daq_queryflow" = "xyes"; then
+ CCONFIGFLAGS="${CCONFIGFLAGS} -DHAVE_DAQ_QUERYFLOW"
+@@ -832,16 +757,7 @@ if test "x$have_daq_queryflow" = "xyes";
then
+ fi
+
+ AC_MSG_CHECKING([for daq data channel flags])
+-AC_RUN_IFELSE(
+-[AC_LANG_PROGRAM(
+-[[
+-#include
+-]],
+-[[
+- DAQ_Data_Channel_Params_t params;
+-]])],
+-[have_daq_data_channel_flags="yes"],
+-[have_daq_data_channel_flags="no"])
++have_daq_data_channel_flags="no"
+ AC_MSG_RESULT($have_daq_data_channel_flags)
+ if test "x$have_daq_data_channel_flags" = "xyes"; then
+ CCONFIGFLAGS="${CCONFIGFLAGS}
-DHAVE_DAQ_DATA_CHANNEL_PARAMS"
+@@ -850,17 +766,7 @@ if test "x$have_daq_data_channel_flags" =
"xyes"; then
+ fi
+
+ AC_MSG_CHECKING([for separate IP versions on pinhole
endpoints])
+-AC_RUN_IFELSE(
+-[AC_LANG_PROGRAM(
+-[[
+-#include
+-]],
+-[[
+- DAQ_DP_key_t dpKey;
+- dpKey.src_af = 0;
+-]])],
+-[have_daq_data_channel_separate_ip_versions="yes"],
+-[have_daq_data_channel_separate_ip_versions="no"])
++have_daq_data_channel_separate_ip_versions="no"
+ AC_MSG_RESULT($have_daq_data_channel_separate_ip_versions)
+ if test "x$have_daq_data_channel_separate_ip_versions" =
"xyes"; then
+ CCONFIGFLAGS="${CCONFIGFLAGS}
-DHAVE_DAQ_DATA_CHANNEL_SEPARATE_IP_VERSIONS"
+@@ -869,17 +775,7 @@ if test
"x$have_daq_data_channel_separate_ip_versions" = "xyes"; then
+ fi
+
+ AC_MSG_CHECKING([for DAQ_VERDICT_RETRY])
+-AC_RUN_IFELSE(
+-[AC_LANG_PROGRAM(
+-[[
+-#include
+-]],
+-[[
+- DAQ_Verdict verdict;
+- verdict = DAQ_VERDICT_RETRY;
+-]])],
+-[have_daq_verdict_retry="yes"],
+-[have_daq_verdict_retry="no"])
++have_daq_verdict_retry="yes"
+ AC_MSG_RESULT($have_daq_verdict_retry)
+ if test "x$have_daq_verdict_retry" = "xyes"; then
+ AC_DEFINE([HAVE_DAQ_VERDICT_RETRY],[1],
+@@ -887,17 +783,7 @@ if test "x$have_daq_verdict_retry" =
"xyes"; then
+ fi
+
+ AC_MSG_CHECKING([for daq packet trace])
+-AC_RUN_IFELSE(
+-[AC_LANG_PROGRAM(
+-[[
+-#include
+-]],
+-[[
+- DAQ_PktHdr_t hdr;
+- hdr.flags = DAQ_PKT_FLAG_TRACE_ENABLED;
+-]])],
+-[have_daq_packet_trace="yes"],
+-[have_daq_packet_trace="no"])
++have_daq_packet_trace="yes"
+ AC_MSG_RESULT($have_daq_packet_trace)
+ if test "x$have_daq_packet_trace" = "xyes"; then
+ AC_DEFINE([HAVE_DAQ_PKT_TRACE],[1],
+@@ -907,17 +793,7 @@ else
+ fi
+
+ AC_MSG_CHECKING([for daq verdict reason])
+-AC_RUN_IFELSE(
+-[AC_LANG_PROGRAM(
+-[[
+-#include
+-]],
+-[[
+- DAQ_ModFlow_t fl;
+- fl.type = DAQ_MODFLOW_TYPE_VER_REASON;
+-]])],
+-[have_daq_verdict_reason="yes"],
+-[have_daq_verdict_reason="no"])
++have_daq_verdict_reason="yes"
+ AC_MSG_RESULT($have_daq_verdict_reason)
+ if test "x$have_daq_verdict_reason" = "xyes"; then
+ AC_DEFINE([HAVE_DAQ_VERDICT_REASON],[1],
+--
+2.7.4
+
diff --git
a/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb
b/meta-networking/recipes-connectivity/snort/snort_2.9.11.1.bb
similarity index 89%
rename from
meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb
rename to
meta-networking/recipes-connectivity/snort/snort_2.9.11.1.bb
index 24b91b9..fdf41bf 100644
--- a/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb
+++
b/meta-networking/recipes-connectivity/snort/snort_2.9.11.1.bb
@@ -6,19 +6,15 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=78fa8ef966b48fbf9095e13cc92377c5"
DEPENDS = "xz libpcap libpcre daq libdnet util-linux daq-native
libtirpc"
-SRC_URI = " ${GENTOO_MIRROR}/${BP}.tar.gz;name=tarball \
+SRC_URI = "https://www.snort.org/downloads/snort/${BP}.tar.gz ( https://www.snort.org/downloads/snort/%24%7BBP%7D.tar.gz ) \
file://snort.init \
- file://disable-inaddr-none.patch \
- file://disable-dap-address-space-id.patch \
- file://disable-daq-flow-id.patch \
- file://disable-daq-verdict-retry.patch \
file://0001-libpcap-search-sysroot-for-headers.patch \
- file://0001-fix-do_package-failed-since-snort-2.9.7.0.patch
\
file://fix-host-contamination-when-enable-static-daq.patch \
+ file://disable-run-test-program-while-cross-compiling.patch
\
"
-SRC_URI[tarball.md5sum] = "fd271788c0f8876be87a858a9142f202"
-SRC_URI[tarball.sha256sum] =
"ad03f11b5301b16642199a86aa90388eaa53f5003f83b0c5595745a490047be1"
+SRC_URI[md5sum] = "378e3938b2b5c8e358f942d0ffce18cc"
+SRC_URI[sha256sum] =
"9f6b3aeac5a109f55504bd370564ac431cb1773507929dc461626898f33f46cd"
UPSTREAM_CHECK_URI = "https://www.snort.org/downloads" ( https://www.snort.org/downloads" );
UPSTREAM_CHECK_REGEX = "snort-(?P\d+(\.\d+)+)\.tar"
--
To stop receiving notification emails like this one, please
contact
the administrator of this repository.
------------------------------
--
_______________________________________________
Openembedded-commits mailing list
Openembedded-commits at lists.openembedded.org (
mailto:Openembedded-commits at lists.openembedded.org )
http://lists.openembedded.org/mailman/listinfo/openembedded-commits
( http://lists.openembedded.org/mailman/listinfo/openembedded-commits )
End of Openembedded-commits Digest, Vol 141, Issue 238
******************************************************
Powered by UserVoice. ( http://www.uservoice.com/powered-by?utm_campaign=poweredby&utm_medium=email&utm_source=ticket&uv_company=Vaultoro+Limited&uv_contact_url=support.vaultoro.com&uv_experience=email )
More information about the Openembedded-commits
mailing list