* [meta-security][PATCH 2/6] ossec-hids: add UPSTREAM_CHECK_COMMITS
2021-05-09 15:47 [meta-security][PATCH 1/6] clamav: update to tip Armin Kuster
@ 2021-05-09 15:47 ` Armin Kuster
2021-05-09 15:47 ` [meta-security][PATCH 3/6] python3-scapy: " Armin Kuster
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Armin Kuster @ 2021-05-09 15:47 UTC (permalink / raw)
To: yocto
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
recipes-ids/ossec/ossec-hids_3.6.0.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/recipes-ids/ossec/ossec-hids_3.6.0.bb b/recipes-ids/ossec/ossec-hids_3.6.0.bb
index 10354a7..242bbdb 100644
--- a/recipes-ids/ossec/ossec-hids_3.6.0.bb
+++ b/recipes-ids/ossec/ossec-hids_3.6.0.bb
@@ -11,6 +11,8 @@ SRC_URI = "git://github.com/ossec/ossec-hids;branch=master \
SRCREV = "1303c78e2c67d7acee0508cb00c3bc63baaa27c2"
+UPSTREAM_CHECK_COMMITS = "1"
+
inherit autotools-brokensep useradd
S = "${WORKDIR}/git"
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [meta-security][PATCH 3/6] python3-scapy: add UPSTREAM_CHECK_COMMITS
2021-05-09 15:47 [meta-security][PATCH 1/6] clamav: update to tip Armin Kuster
2021-05-09 15:47 ` [meta-security][PATCH 2/6] ossec-hids: add UPSTREAM_CHECK_COMMITS Armin Kuster
@ 2021-05-09 15:47 ` Armin Kuster
2021-05-09 15:47 ` [meta-security][PATCH 4/6] suricata: 4.1.x add UPSTREAM_CHECK_REGEX Armin Kuster
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Armin Kuster @ 2021-05-09 15:47 UTC (permalink / raw)
To: yocto
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
recipes-security/scapy/python3-scapy_2.4.4.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/recipes-security/scapy/python3-scapy_2.4.4.bb b/recipes-security/scapy/python3-scapy_2.4.4.bb
index 8d81ed1..23ddfce 100644
--- a/recipes-security/scapy/python3-scapy_2.4.4.bb
+++ b/recipes-security/scapy/python3-scapy_2.4.4.bb
@@ -13,6 +13,8 @@ SRC_URI = "git://github.com/secdev/scapy.git \
S = "${WORKDIR}/git"
+UPSTREAM_CHECK_COMMITS = "1"
+
inherit setuptools3 ptest
do_install_append() {
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [meta-security][PATCH 4/6] suricata: 4.1.x add UPSTREAM_CHECK_REGEX
2021-05-09 15:47 [meta-security][PATCH 1/6] clamav: update to tip Armin Kuster
2021-05-09 15:47 ` [meta-security][PATCH 2/6] ossec-hids: add UPSTREAM_CHECK_COMMITS Armin Kuster
2021-05-09 15:47 ` [meta-security][PATCH 3/6] python3-scapy: " Armin Kuster
@ 2021-05-09 15:47 ` Armin Kuster
2021-05-09 17:39 ` [yocto] " Quentin Schulz
2021-05-09 15:47 ` [meta-security][PATCH 5/6] ibmswtpm2: update to 1661 Armin Kuster
2021-05-09 15:47 ` [meta-security][PATCH 6/6] ibmtpm2tss: update to tip Armin Kuster
4 siblings, 1 reply; 7+ messages in thread
From: Armin Kuster @ 2021-05-09 15:47 UTC (permalink / raw)
To: yocto
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
recipes-ids/suricata/suricata_4.1.10.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/recipes-ids/suricata/suricata_4.1.10.bb b/recipes-ids/suricata/suricata_4.1.10.bb
index 3f7beaa..bf08843 100644
--- a/recipes-ids/suricata/suricata_4.1.10.bb
+++ b/recipes-ids/suricata/suricata_4.1.10.bb
@@ -12,6 +12,8 @@ SRC_URI += " \
file://run-ptest \
"
+UPSTREAM_CHECK_URI = "www.openinfosecfoundation.org/download"
+
inherit autotools-brokensep pkgconfig python3-dir systemd ptest
CFLAGS += "-D_DEFAULT_SOURCE -fcommon"
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [yocto] [meta-security][PATCH 4/6] suricata: 4.1.x add UPSTREAM_CHECK_REGEX
2021-05-09 15:47 ` [meta-security][PATCH 4/6] suricata: 4.1.x add UPSTREAM_CHECK_REGEX Armin Kuster
@ 2021-05-09 17:39 ` Quentin Schulz
0 siblings, 0 replies; 7+ messages in thread
From: Quentin Schulz @ 2021-05-09 17:39 UTC (permalink / raw)
To: yocto, Armin Kuster
Hi Armin,
On May 9, 2021 3:47:38 PM UTC, Armin Kuster <akuster808@gmail.com> wrote:
>Signed-off-by: Armin Kuster <akuster808@gmail.com>
>---
> recipes-ids/suricata/suricata_4.1.10.bb | 2 ++
> 1 file changed, 2 insertions(+)
>
>diff --git a/recipes-ids/suricata/suricata_4.1.10.bb b/recipes-ids/suricata/suricata_4.1.10.bb
>index 3f7beaa..bf08843 100644
>--- a/recipes-ids/suricata/suricata_4.1.10.bb
>+++ b/recipes-ids/suricata/suricata_4.1.10.bb
>@@ -12,6 +12,8 @@ SRC_URI += " \
> file://run-ptest \
> "
>
>+UPSTREAM_CHECK_URI = "www.openinfosecfoundation.org/download"
>+
There is a mismatch between what you're doing and what the title of this commit is, I guess the commit title is to be updated?
Cheers,
Quentin
^ permalink raw reply [flat|nested] 7+ messages in thread
* [meta-security][PATCH 5/6] ibmswtpm2: update to 1661
2021-05-09 15:47 [meta-security][PATCH 1/6] clamav: update to tip Armin Kuster
` (2 preceding siblings ...)
2021-05-09 15:47 ` [meta-security][PATCH 4/6] suricata: 4.1.x add UPSTREAM_CHECK_REGEX Armin Kuster
@ 2021-05-09 15:47 ` Armin Kuster
2021-05-09 15:47 ` [meta-security][PATCH 6/6] ibmtpm2tss: update to tip Armin Kuster
4 siblings, 0 replies; 7+ messages in thread
From: Armin Kuster @ 2021-05-09 15:47 UTC (permalink / raw)
To: yocto
Drop patch now included in updated
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../ibmswtpm2/files/fix-wrong-cast.patch | 27 -------------------
.../{ibmswtpm2_1637.bb => ibmswtpm2_1661.bb} | 10 +++----
2 files changed, 4 insertions(+), 33 deletions(-)
delete mode 100644 meta-tpm/recipes-tpm2/ibmswtpm2/files/fix-wrong-cast.patch
rename meta-tpm/recipes-tpm2/ibmswtpm2/{ibmswtpm2_1637.bb => ibmswtpm2_1661.bb} (69%)
diff --git a/meta-tpm/recipes-tpm2/ibmswtpm2/files/fix-wrong-cast.patch b/meta-tpm/recipes-tpm2/ibmswtpm2/files/fix-wrong-cast.patch
deleted file mode 100644
index f2938e0..0000000
--- a/meta-tpm/recipes-tpm2/ibmswtpm2/files/fix-wrong-cast.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Fix strict aliasing issue of gcc10
-
-fixes:
-
-TpmFail.c: In function 'TpmLogFailure':
-TpmFail.c:217:23: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
- 217 | s_failFunction = *(UINT32 *)&function; /* kgold */
- | ^~~~~~~~~~~~~~~~~~~
-cc1: all warnings being treated as errors
-
-Upstream-Status: Submitted
-
-Signed-off-by: Jens Rehsack <sno@NetBSD.org>
-
-Index: src/TpmFail.c
-===================================================================
---- src.orig/TpmFail.c 2020-09-10 15:43:57.085063875 +0200
-+++ src/TpmFail.c 2020-09-10 15:48:35.563302634 +0200
-@@ -214,7 +214,7 @@
- // On a 64-bit machine, this may truncate the address of the string
- // of the function name where the error occurred.
- #if FAIL_TRACE
-- s_failFunction = *(UINT32 *)&function; /* kgold */
-+ memcpy(&s_failFunction, function, sizeof(uint32_t)); /* kgold */
- s_failLine = line;
- #else
- s_failFunction = 0;
diff --git a/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1637.bb b/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1661.bb
similarity index 69%
rename from meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1637.bb
rename to meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1661.bb
index 301980d..7ea40a8 100644
--- a/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1637.bb
+++ b/meta-tpm/recipes-tpm2/ibmswtpm2/ibmswtpm2_1661.bb
@@ -17,13 +17,11 @@ DEPENDS = "openssl"
SRC_URI = "https://sourceforge.net/projects/ibmswtpm2/files/ibmtpm${PV}.tar.gz \
file://tune-makefile.patch \
- file://fix-wrong-cast.patch \
"
-SRC_URI[md5sum] = "43b217d87056e9155633925eb6ef749c"
-SRC_URI[sha256sum] = "dd3a4c3f7724243bc9ebcd5c39bbf87b82c696d1c1241cb8e5883534f6e2e327"
-SRC_URI[sha1sum] = "ab4b94079e57a86996991e8a2b749ce063e4ad3e"
-SRC_URI[sha384sum] = "bbef16a934853ce78cba7ddc766aa9d7ef3cde3430a322b1be772bf3ad4bd6d413ae9c4de21bc1a4879d17dfe2aadc1d"
-SRC_URI[sha512sum] = "007aa415cccf19a2bcf789c426727dc4032dcb04cc9d11eedc231d2add708c1134d3d5ee5cfbe7de68307c95fff7a30bd306fbd8d53c198a5ef348440440a6ed"
+
+SRC_URI[sha256sum] = "55145928ad2b24f34be6a0eacf9fb492e10e0ea919b8428c721fa970e85d6147"
+
+UPSTREAM_CHECK_REGEX = "libtpm(?P<pver>).tar.gz"
S = "${WORKDIR}/src"
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [meta-security][PATCH 6/6] ibmtpm2tss: update to tip
2021-05-09 15:47 [meta-security][PATCH 1/6] clamav: update to tip Armin Kuster
` (3 preceding siblings ...)
2021-05-09 15:47 ` [meta-security][PATCH 5/6] ibmswtpm2: update to 1661 Armin Kuster
@ 2021-05-09 15:47 ` Armin Kuster
4 siblings, 0 replies; 7+ messages in thread
From: Armin Kuster @ 2021-05-09 15:47 UTC (permalink / raw)
To: yocto
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-tpm/recipes-tpm2/ibmtpm2tss/ibmtpm2tss_1.6.0.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta-tpm/recipes-tpm2/ibmtpm2tss/ibmtpm2tss_1.6.0.bb b/meta-tpm/recipes-tpm2/ibmtpm2tss/ibmtpm2tss_1.6.0.bb
index 4d9b554..ae8974b 100644
--- a/meta-tpm/recipes-tpm2/ibmtpm2tss/ibmtpm2tss_1.6.0.bb
+++ b/meta-tpm/recipes-tpm2/ibmtpm2tss/ibmtpm2tss_1.6.0.bb
@@ -17,11 +17,13 @@ DEPENDS = "openssl ibmswtpm2"
inherit autotools pkgconfig
-SRCREV = "3e736f712ba53c8f06e66751f60fae428fd2e20f"
+SRCREV = "c4e131e34ec0ed09411aa3bc76f76129ef881573"
SRC_URI = " git://git.code.sf.net/p/ibmtpm20tss/tss;nobranch=1 \
file://0001-utils-12-Makefile.am-expand-wildcards-in-prereqs.patch \
"
+UPSTREAM_CHECK_COMMITS = "1"
+
EXTRA_OECONF = "--disable-tpm-1.2"
S = "${WORKDIR}/git"
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread