mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-09 17:59:26 +00:00
Armin Kuster
95370f4af5
[v2] Fix epan/.libs/libwireshark.so: error: undefined reference to 'gpg_strerror' and update to 2.4.5. includes: wnpa-sec-2018-05 The IEEE 802.11 dissector could crash. Bug 14442, CVE-2018-7335 wnpa-sec-2018-06 Multiple dissectors could go into large infinite loops. All ASN.1 BER dissectors (Bug 14444), along with the DICOM (Bug 14411), DMP (Bug 14408), LLTD (Bug 14419), OpenFlow (Bug 14420), RELOAD (Bug 14445), RPCoRDMA (Bug 14449), RPKI-Router (Bug 14414), S7COMM (Bug 14423), SCCP (Bug 14413), Thread (Bug 14428), Thrift (Bug 14379), USB (Bug 14421), and WCCP (Bug 14412) dissectors were susceptible. wnpa-sec-2018-07 The UMTS MAC dissector could crash. Bug 14339, CVE-2018-7334 wnpa-sec-2018-08 The DOCSIS dissector could crash. Bug 14446, CVE-2018-7337 wnpa-sec-2018-09 The FCP dissector could crash. Bug 14374, CVE-2018-7336 wnpa-sec-2018-10 The SIGCOMP dissector could crash. Bug 14398, CVE-2018-7320 wnpa-sec-2018-11 The pcapng file parser could crash. Bug 14403, CVE-2018-7420 wnpa-sec-2018-12 The IPMI dissector could crash. Bug 14409, CVE-2018-7417 wnpa-sec-2018-13 The SIGCOMP dissector could crash. Bug 14410, CVE-2018-7418 wnpa-sec-2018-14 The NBAP disssector could crash. Bug 14443, CVE-2018-7419 Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
54 lines
2.3 KiB
Diff
54 lines
2.3 KiB
Diff
use OR PKG_CONFIG scheme for libgcrypt
|
|
|
|
Upstream-Status: Inappropriate OE specific
|
|
|
|
Signed-off-by: Armin Kuster <akuster808@gmail.com>
|
|
|
|
Index: wireshark-2.4.4/m4/libgcrypt.m4
|
|
===================================================================
|
|
--- wireshark-2.4.4.orig/m4/libgcrypt.m4
|
|
+++ wireshark-2.4.4/m4/libgcrypt.m4
|
|
@@ -27,11 +27,11 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
|
|
libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
|
|
if test x$libgcrypt_config_prefix != x ; then
|
|
if test x${LIBGCRYPT_CONFIG+set} != xset ; then
|
|
- LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config
|
|
+ LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/libgcrypt.pc
|
|
fi
|
|
fi
|
|
|
|
- AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
|
|
+ AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt.pc, no)
|
|
tmp=ifelse([$1], ,1:1.2.0,$1)
|
|
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
|
|
req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
|
|
@@ -50,7 +50,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
|
|
req_micro=`echo $min_libgcrypt_version | \
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
|
|
- libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
|
|
+ libgcrypt_config_version=`$PKG_CONFIG --modversion libgcrypt`
|
|
major=`echo $libgcrypt_config_version | \
|
|
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
|
|
minor=`echo $libgcrypt_config_version | \
|
|
@@ -82,7 +82,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
|
|
# If we have a recent libgcrypt, we should also check that the
|
|
# API is compatible
|
|
if test "$req_libgcrypt_api" -gt 0 ; then
|
|
- tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
|
|
+ tmp=`$PKG_CONFIG --api-version libgcrypt 2>/dev/null || echo 0`
|
|
if test "$tmp" -gt 0 ; then
|
|
AC_MSG_CHECKING([LIBGCRYPT API version])
|
|
if test "$req_libgcrypt_api" -eq "$tmp" ; then
|
|
@@ -95,8 +95,8 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
|
|
fi
|
|
fi
|
|
if test $ok = yes; then
|
|
- LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
|
|
- LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
|
|
+ LIBGCRYPT_CFLAGS=`$PKG_CONFIG --cflags libgcrypt`
|
|
+ LIBGCRYPT_LIBS=`$PKG_CONFIG --libs libgcrypt`
|
|
ifelse([$2], , :, [$2])
|
|
else
|
|
LIBGCRYPT_CFLAGS=""
|