osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

GLib: Bump requirement 2.32 -> 2.36

This commit is contained in:
John Thacker 2020-11-24 08:53:28 -05:00 committed by AndersBroman
parent 2999173126
commit 15d315c2ae
6 changed files with 12 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1038,7 +1038,7 @@ endmacro()
# The minimum package list
find_package(Git)
reset_find_package(GLIB2 GLIB2_MAIN_INCLUDE_DIR GLIB2_INTERNAL_INCLUDE_DIR)
find_package(GLIB2 "2.32.0" REQUIRED)
find_package(GLIB2 "2.36.0" REQUIRED)
include_directories(SYSTEM ${GLIB2_INCLUDE_DIRS})
reset_find_package(GMODULE2)
find_package(GMODULE2)

4
epan/dissectors/packet-fc00.c
View File

@ -121,7 +121,6 @@ dissect_cryptoauth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da
proto_tree_add_item(fc00_tree, hf_fc00_random_nonce, tvb,
NONCE_OFF, NONCE_LEN, ENC_NA);
#if GLIB_CHECK_VERSION(2, 36, 0) /* sha512 support was added in glib 2.36 */
if (fc00_tree)
{
GChecksum *hash = g_checksum_new(G_CHECKSUM_SHA512);
@ -151,9 +150,6 @@ dissect_cryptoauth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da
proto_tree_add_ipv6(key_tree, hf_fc00_ip_address, tvb, PUBLIC_KEY_OFF, PUBLIC_KEY_LEN, (ws_in6_addr*)ip_buf);
}
#else
proto_tree_add_expert(fc00_tree, pinfo, &ei_fc00_chksum_unsupported, tvb, PUBLIC_KEY_OFF, PUBLIC_KEY_LEN);
#endif
proto_tree_add_item(fc00_tree, hf_fc00_authenticator, tvb,
POLY_AUTH_OFF, POLY_AUTH_LEN, ENC_NA);

35
epan/wslua/lrexlib_glib.c
View File

@ -83,17 +83,6 @@ static int getcflags (lua_State *L, int pos);
/* we define ALG_USERETRY because GLib does expose PCRE's NOTEMPTY and ANCHORED flags */
#define ALG_USERETRY
#define VERSION_GLIB (GLIB_MAJOR_VERSION*100 + GLIB_MINOR_VERSION)
/* unfortunately GLib doesn't expose cerrtain macros it would be nice to have */
#if VERSION_GLIB >= 234
# define G_REGEX_COMPILE_MASK_234 (G_REGEX_FIRSTLINE | \
G_REGEX_NEWLINE_ANYCRLF | \
G_REGEX_BSR_ANYCRLF | \
G_REGEX_JAVASCRIPT_COMPAT)
#else
# define G_REGEX_COMPILE_MASK_234 0
#endif
/* Mask of all the possible values for GRegexCompileFlags. */
#define G_REGEX_COMPILE_MASK (G_REGEX_CASELESS | \
G_REGEX_MULTILINE | \
@ -109,18 +98,10 @@ static int getcflags (lua_State *L, int pos);
G_REGEX_NEWLINE_CR | \
G_REGEX_NEWLINE_LF | \
G_REGEX_NEWLINE_CRLF | \
G_REGEX_COMPILE_MASK_234)
#if VERSION_GLIB >= 234
# define G_REGEX_MATCH_MASK_234 (G_REGEX_MATCH_NEWLINE_ANYCRLF | \
G_REGEX_MATCH_BSR_ANYCRLF | \
G_REGEX_MATCH_BSR_ANY | \
G_REGEX_MATCH_PARTIAL_SOFT | \
G_REGEX_MATCH_PARTIAL_HARD | \
G_REGEX_MATCH_NOTEMPTY_ATSTART)
#else
# define G_REGEX_MATCH_MASK_234 0
#endif
G_REGEX_FIRSTLINE | \
G_REGEX_NEWLINE_ANYCRLF | \
G_REGEX_BSR_ANYCRLF | \
G_REGEX_JAVASCRIPT_COMPAT)
/* Mask of all the possible values for GRegexMatchFlags. */
#define G_REGEX_MATCH_MASK (G_REGEX_MATCH_ANCHORED | \
@ -131,7 +112,13 @@ static int getcflags (lua_State *L, int pos);
G_REGEX_MATCH_NEWLINE_CR | \
G_REGEX_MATCH_NEWLINE_LF | \
G_REGEX_MATCH_NEWLINE_CRLF | \
G_REGEX_MATCH_NEWLINE_ANY)
G_REGEX_MATCH_NEWLINE_ANY | \
G_REGEX_MATCH_NEWLINE_ANYCRLF | \
G_REGEX_MATCH_BSR_ANYCRLF | \
G_REGEX_MATCH_BSR_ANY | \
G_REGEX_MATCH_PARTIAL_SOFT | \
G_REGEX_MATCH_PARTIAL_HARD | \
G_REGEX_MATCH_NOTEMPTY_ATSTART)
static int check_eflags(lua_State *L, const int idx, const int def);

6
epan/wslua/lrexlib_glib_f.c
View File

@ -34,12 +34,10 @@ static flag_pair gregex_compile_flags[] = {
{ "NEWLINE_CR", G_REGEX_NEWLINE_CR },
{ "NEWLINE_LF", G_REGEX_NEWLINE_LF },
{ "NEWLINE_CRLF", G_REGEX_NEWLINE_CRLF },
#if VERSION_GLIB >= 234
{ "FIRSTLINE", G_REGEX_FIRSTLINE },
{ "NEWLINE_ANYCRLF", G_REGEX_NEWLINE_ANYCRLF },
{ "BSR_ANYCRLF", G_REGEX_BSR_ANYCRLF },
{ "JAVASCRIPT_COMPAT", G_REGEX_JAVASCRIPT_COMPAT },
#endif
/*---------------------------------------------------------------------------*/
{ NULL, 0 }
};
@ -55,14 +53,12 @@ static flag_pair gregex_match_flags[] = {
{ "NEWLINE_LF", G_REGEX_MATCH_NEWLINE_LF },
{ "NEWLINE_CRLF", G_REGEX_MATCH_NEWLINE_CRLF },
{ "NEWLINE_ANY", G_REGEX_MATCH_NEWLINE_ANY },
#if VERSION_GLIB >= 234
{ "NEWLINE_ANYCRLF", G_REGEX_MATCH_NEWLINE_ANYCRLF },
{ "BSR_ANYCRLF", G_REGEX_MATCH_BSR_ANYCRLF },
{ "BSR_ANY", G_REGEX_MATCH_BSR_ANY },
{ "PARTIAL_SOFT", G_REGEX_MATCH_PARTIAL_SOFT },
{ "PARTIAL_HARD", G_REGEX_MATCH_PARTIAL_HARD },
{ "NOTEMPTY_ATSTART", G_REGEX_MATCH_NOTEMPTY_ATSTART },
#endif
/*---------------------------------------------------------------------------*/
{ NULL, 0 }
};
@ -109,7 +105,6 @@ flag_pair gregex_error_flags[] = {
{ "TOO_MANY_BRANCHES_IN_DEFINE", G_REGEX_ERROR_TOO_MANY_BRANCHES_IN_DEFINE },
{ "INCONSISTENT_NEWLINE_OPTIONS", G_REGEX_ERROR_INCONSISTENT_NEWLINE_OPTIONS },
{ "MISSING_BACK_REFERENCE", G_REGEX_ERROR_MISSING_BACK_REFERENCE },
#if VERSION_GLIB >= 234
{ "INVALID_RELATIVE_REFERENCE", G_REGEX_ERROR_INVALID_RELATIVE_REFERENCE },
{ "BACKTRACKING_CONTROL_VERB_ARGUMENT_FORBIDDEN",G_REGEX_ERROR_BACKTRACKING_CONTROL_VERB_ARGUMENT_FORBIDDEN },
{ "UNKNOWN_BACKTRACKING_CONTROL_VERB", G_REGEX_ERROR_UNKNOWN_BACKTRACKING_CONTROL_VERB },
@ -125,7 +120,6 @@ flag_pair gregex_error_flags[] = {
{ "TOO_MANY_FORWARD_REFERENCES", G_REGEX_ERROR_TOO_MANY_FORWARD_REFERENCES },
{ "NAME_TOO_LONG", G_REGEX_ERROR_NAME_TOO_LONG },
{ "CHARACTER_VALUE_TOO_LARGE", G_REGEX_ERROR_CHARACTER_VALUE_TOO_LARGE },
#endif
/*---------------------------------------------------------------------------*/
{ NULL, 0 }
};

6
extcap.c
View File

@ -461,13 +461,7 @@ extcap_run_all(const char *argv[], extcap_run_cb_t output_cb, gsize data_size, g
GSList *paths = extcap_get_extcap_paths();
int i = 0;
#if GLIB_CHECK_VERSION(2,36,0)
int max_threads = (int)g_get_num_processors();
#else
// If the number of processors is unavailable, just use some sane maximum.
// extcap should not be CPU bound, so -1 could also be used for unlimited.
int max_threads = 8;
#endif
if (!paths) {
*count = 0;

4
plugins/epan/mate/mate.h
View File

@ -364,11 +364,7 @@ extern gchar* add_ranges(gchar* range, GPtrArray* range_ptr_arr);
extern gboolean mate_load_config(const gchar* filename, mate_config* mc);
/* Constructor/Destructor prototypes for Lemon Parser */
#if (GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 16))
#define YYMALLOCARGTYPE gsize
#else
#define YYMALLOCARGTYPE gulong
#endif
void *MateParserAlloc(void* (*)(YYMALLOCARGTYPE));
void MateParserFree(void*, void (*)(void *));
void MateParser(void*, int, gchar*, mate_config*);