diff options
| -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 @@ | |||
| 1 | From c45ab69f9428e4d2fc1146301a4546bb2b42c9ae Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sat, 27 Jul 2019 00:25:58 -0700 | ||
| 4 | Subject: [PATCH] chdeck for gettid API during configure | ||
| 5 | |||
| 6 | glibc 2.30 added gettid syscall wrapper | ||
| 7 | |||
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 9 | --- | ||
| 10 | configure.in | 2 +- | ||
| 11 | src/util.h | 2 ++ | ||
| 12 | 2 files changed, 3 insertions(+), 1 deletion(-) | ||
| 13 | |||
| 14 | diff --git a/configure.in b/configure.in | ||
| 15 | index 000bb91..d79e6d0 100644 | ||
| 16 | --- a/configure.in | ||
| 17 | +++ b/configure.in | ||
| 18 | @@ -256,7 +256,7 @@ SN_CHECK_DECLS(printf fprintf syslog puts fputs fputc fopen \ | ||
| 19 | strcasecmp strncasecmp strerror perror socket sendto \ | ||
| 20 | vsnprintf snprintf strtoul) | ||
| 21 | |||
| 22 | -AC_CHECK_FUNCS([sigaction strlcpy strlcat strerror vswprintf wprintf memrchr inet_ntop]) | ||
| 23 | +AC_CHECK_FUNCS([sigaction strlcpy strlcat strerror vswprintf wprintf memrchr inet_ntop gettid]) | ||
| 24 | |||
| 25 | AC_CHECK_FUNC([snprintf],[have_snprintf="yes"],[have_snprintf="no"]) | ||
| 26 | AM_CONDITIONAL(BUILD_SNPRINTF, test "x$have_snprintf" != "xyes") | ||
| 27 | diff --git a/src/util.h b/src/util.h | ||
| 28 | index 6880906..c310b83 100644 | ||
| 29 | --- a/src/util.h | ||
| 30 | +++ b/src/util.h | ||
| 31 | @@ -374,6 +374,7 @@ static inline int IsEmptyStr(const char *str) | ||
| 32 | return 0; | ||
| 33 | } | ||
| 34 | |||
| 35 | +#if !HAVE_GETTID | ||
| 36 | static inline pid_t gettid(void) | ||
| 37 | { | ||
| 38 | #if defined(LINUX) && defined(SYS_gettid) | ||
| 39 | @@ -382,5 +383,6 @@ static inline pid_t gettid(void) | ||
| 40 | return getpid(); | ||
| 41 | #endif | ||
| 42 | } | ||
| 43 | +#endif | ||
| 44 | |||
| 45 | #endif /*__UTIL_H__*/ | ||
| 46 | -- | ||
| 47 | 2.22.0 | ||
| 48 | |||
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 \ | |||
| 13 | file://fix-host-contamination-when-enable-static-daq.patch \ | 13 | file://fix-host-contamination-when-enable-static-daq.patch \ |
| 14 | file://disable-run-test-program-while-cross-compiling.patch \ | 14 | file://disable-run-test-program-while-cross-compiling.patch \ |
| 15 | file://configure.in-disable-tirpc-checking-for-fedora.patch \ | 15 | file://configure.in-disable-tirpc-checking-for-fedora.patch \ |
| 16 | file://0001-chdeck-for-gettid-API-during-configure.patch \ | ||
| 17 | " | 16 | " |
| 18 | 17 | ||
| 19 | SRC_URI[md5sum] = "b56cadfa840f706ff67d4df0256c03eb" | 18 | SRC_URI[md5sum] = "1cec58babaea3420014d61a93e6e1545" |
| 20 | SRC_URI[sha256sum] = "bfb437746446ef72a03c501db13cd6da5edd2b41f55c80c437ba288be6da7dba" | 19 | SRC_URI[sha256sum] = "9688d8edf1da09dec6574000fb3c0e62f99c56428587616e17c60103c0bcbad7" |
| 21 | 20 | ||
| 22 | UPSTREAM_CHECK_URI = "https://www.snort.org/downloads" | 21 | UPSTREAM_CHECK_URI = "https://www.snort.org/downloads" |
| 23 | UPSTREAM_CHECK_REGEX = "snort-(?P<pver>\d+(\.\d+)+)\.tar" | 22 | UPSTREAM_CHECK_REGEX = "snort-(?P<pver>\d+(\.\d+)+)\.tar" |
