diff options
| author |   Zang Ruochen <zangrc.fnst@cn.fujitsu.com> | 2020-05-30 01:10:00 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2020-05-31 22:42:25 -0700 |
| commit | e44e7be3e9d140410d3c7d799a32cf867e494f9c (patch) | |
| tree | 8a3e2038d21d1849e94ce3538b9f33d8ab228418 /meta-networking/recipes-connectivity | |
| parent | aa615a8e6093759fd580217be79dc037d9c0d79c (diff) | |
| download | meta-openembedded-e44e7be3e9d140410d3c7d799a32cf867e494f9c.tar.gz | |
snort: upgrade 2.9.15 -> 2.9.16
-0001-chdeck-for-gettid-API-during-configure.patch
Removed since this is included in 2.9.16
Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-connectivity')
| -rw-r--r-- | meta-networking/recipes-connectivity/snort/snort/0001-chdeck-for-gettid-API-during-configure.patch | 48 | ||||
| -rw-r--r-- | meta-networking/recipes-connectivity/snort/snort_2.9.16.bb (renamed from meta-networking/recipes-connectivity/snort/snort_2.9.15.bb) | 5 |
2 files changed, 2 insertions, 51 deletions
diff --git a/meta-networking/recipes-connectivity/snort/snort/0001-chdeck-for-gettid-API-during-configure.patch b/meta-networking/recipes-connectivity/snort/snort/0001-chdeck-for-gettid-API-during-configure.patch deleted file mode 100644 index eff610de7c..0000000000 --- a/meta-networking/recipes-connectivity/snort/snort/0001-chdeck-for-gettid-API-during-configure.patch +++ /dev/null @@ -1,48 +0,0 @@ -From c45ab69f9428e4d2fc1146301a4546bb2b42c9ae Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 27 Jul 2019 00:25:58 -0700 -Subject: [PATCH] chdeck for gettid API during configure - -glibc 2.30 added gettid syscall wrapper - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.in | 2 +- - src/util.h | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index 000bb91..d79e6d0 100644 ---- a/configure.in -+++ b/configure.in -@@ -256,7 +256,7 @@ SN_CHECK_DECLS(printf fprintf syslog puts fputs fputc fopen \ - strcasecmp strncasecmp strerror perror socket sendto \ - vsnprintf snprintf strtoul) - --AC_CHECK_FUNCS([sigaction strlcpy strlcat strerror vswprintf wprintf memrchr inet_ntop]) -+AC_CHECK_FUNCS([sigaction strlcpy strlcat strerror vswprintf wprintf memrchr inet_ntop gettid]) - - AC_CHECK_FUNC([snprintf],[have_snprintf="yes"],[have_snprintf="no"]) - AM_CONDITIONAL(BUILD_SNPRINTF, test "x$have_snprintf" != "xyes") -diff --git a/src/util.h b/src/util.h -index 6880906..c310b83 100644 ---- a/src/util.h -+++ b/src/util.h -@@ -374,6 +374,7 @@ static inline int IsEmptyStr(const char *str) - return 0; - } - -+#if !HAVE_GETTID - static inline pid_t gettid(void) - { - #if defined(LINUX) && defined(SYS_gettid) -@@ -382,5 +383,6 @@ static inline pid_t gettid(void) - return getpid(); - #endif - } -+#endif - - #endif /*__UTIL_H__*/ --- -2.22.0 - diff --git a/meta-networking/recipes-connectivity/snort/snort_2.9.15.bb b/meta-networking/recipes-connectivity/snort/snort_2.9.16.bb index fbec1950d4..d8073d865b 100644 --- a/meta-networking/recipes-connectivity/snort/snort_2.9.15.bb +++ b/meta-networking/recipes-connectivity/snort/snort_2.9.16.bb @@ -13,11 +13,10 @@ SRC_URI = "https://www.snort.org/downloads/archive/snort/${BP}.tar.gz \ file://fix-host-contamination-when-enable-static-daq.patch \ file://disable-run-test-program-while-cross-compiling.patch \ file://configure.in-disable-tirpc-checking-for-fedora.patch \ - file://0001-chdeck-for-gettid-API-during-configure.patch \ " -SRC_URI[md5sum] = "b56cadfa840f706ff67d4df0256c03eb" -SRC_URI[sha256sum] = "bfb437746446ef72a03c501db13cd6da5edd2b41f55c80c437ba288be6da7dba" +SRC_URI[md5sum] = "1cec58babaea3420014d61a93e6e1545" +SRC_URI[sha256sum] = "9688d8edf1da09dec6574000fb3c0e62f99c56428587616e17c60103c0bcbad7" UPSTREAM_CHECK_URI = "https://www.snort.org/downloads" UPSTREAM_CHECK_REGEX = "snort-(?P<pver>\d+(\.\d+)+)\.tar" |