From bfe522304da217296e2a61040f58e35ec5d6f3f2 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 16 Aug 2021 09:51:46 +0200 Subject: New upstream version 1.30.6 --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 9fcb2f6e..6392c2fe 100644 --- a/meson.build +++ b/meson.build @@ -6,7 +6,7 @@ project( # - add corresponding NM_VERSION_x_y_z macros in # "shared/nm-version-macros.h.in" # - update number in configure.ac - version: '1.30.0', + version: '1.30.6', license: 'GPL2+', default_options: [ 'buildtype=debugoptimized', -- cgit 1.3.0-6-gf8a5 From e74c568b07b50b97873fb4ee1d776dedefbd54d6 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 1 Oct 2021 23:05:04 +0200 Subject: New upstream version 1.32.12 --- meson.build | 57 ++++++++++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 25 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 6392c2fe..37c2fe1c 100644 --- a/meson.build +++ b/meson.build @@ -4,9 +4,9 @@ project( 'NetworkManager', 'c', # NOTE: When incrementing version also: # - add corresponding NM_VERSION_x_y_z macros in -# "shared/nm-version-macros.h.in" +# "src/libnm-core-public/nm-version-macros.h.in" # - update number in configure.ac - version: '1.30.6', + version: '1.32.12', license: 'GPL2+', default_options: [ 'buildtype=debugoptimized', @@ -530,26 +530,29 @@ if polkit_agent_helper_1_path[0] != '/' endif config_h.set_quoted('POLKIT_AGENT_HELPER_1_PATH', polkit_agent_helper_1_path) - +crypto_nss_dep = dependency( + 'nss', + required: false, +) +crypto_gnutls_dep = dependency( + 'gnutls', + version: '>= 2.12', + required: false, +) crypto = get_option('crypto') if crypto == 'nss' - crypto_dep = dependency('nss', required: false) - assert(crypto_dep.found(), 'Requires nss crypto support') -elif crypto == 'gnutls' - crypto_dep = dependency( - 'gnutls', - version: '>= 2.12', - required: false, - ) - assert(crypto_dep.found(), 'Requires gnutls crypto support') + assert(crypto_nss_dep.found(), 'Requires nss crypto support') + crypto_dep = crypto_nss_dep else - error('bug') + assert(crypto == 'gnutls', 'Unexpected setting "crypto=' + crypto + '"') + assert(crypto_gnutls_dep.found(), 'Requires gnutls crypto support') + crypto_dep = crypto_gnutls_dep endif dbus_conf_dir = get_option('dbus_conf_dir') if dbus_conf_dir == '' assert(dbus_dep.found(), 'D-Bus required but not found, please provide a valid system bus config dir') - dbus_conf_dir = join_paths(dbus_dep.get_pkgconfig_variable('sysconfdir', define_variable: ['sysconfdir', nm_sysconfdir]), 'dbus-1', 'system.d') + dbus_conf_dir = join_paths(dbus_dep.get_pkgconfig_variable('datadir'), 'dbus-1', 'system.d') endif dbus_interfaces_dir = dbus_dep.get_pkgconfig_variable('interfaces_dir', define_variable: ['datadir', nm_datadir]) @@ -688,7 +691,8 @@ dnssec_ts_paths = ['/usr/local/libexec', '/usr/lib/dnssec-trigger'] # 0: cmdline option, 1: paths, 2: fallback -progs = [['iptables', default_paths, '/sbin/iptables'], +progs = [['iptables', default_paths, '/usr/sbin/iptables'], + ['nft', default_paths, '/usr/sbin/nft'], ['dnsmasq', default_paths, ''], ['dnssec_trigger', dnssec_ts_paths, join_paths(nm_libexecdir, 'dnssec-trigger-script') ], ] @@ -782,11 +786,17 @@ config_h.set('NM_MORE_ASSERTS', more_asserts) more_logging = get_option('more_logging') config_h.set10('NM_MORE_LOGGING', more_logging) -generic_support_src = 'int main() { int a = 0; int b = _Generic (a, int: 4); return b + a; };' -config_h.set10('_NM_CC_SUPPORT_GENERIC', cc.compiles(generic_support_src)) +config_h.set10('_NM_CC_SUPPORT_GENERIC', + cc.compiles( + 'int foo(void); static const char *const buf[1] = { "a" }; int foo() { int a = 0; int b = _Generic (a, int: 4) + _Generic(buf, const char *const*: 5); return b + a; }' + ) +) -auto_support_src = 'int main() { int a = 0; __auto_type b = a; return b + a; };' -config_h.set10('_NM_CC_SUPPORT_AUTO_TYPE', cc.compiles(auto_support_src)) +config_h.set10('_NM_CC_SUPPORT_AUTO_TYPE', + cc.compiles( + 'int main() { int a = 0; __auto_type b = a; return b + a; };' + ) +) # Vala bindings vapi_opt = get_option('vapi') @@ -916,12 +926,7 @@ fi content_files = [] subdir('introspection') -subdir('shared') -subdir('libnm-core') -subdir('src/core') -subdir('libnm') -subdir('dispatcher') -subdir('clients') +subdir('src') subdir('data') subdir('po') @@ -1040,6 +1045,8 @@ if enable_ppp endif output += '\n' output += ' jansson: ' + jansson_msg + '\n' +output += ' iptables: ' + config_h.get('IPTABLES_PATH') + '\n' +output += ' nft: ' + config_h.get('NFT_PATH') + '\n' output += ' modemmanager-1: ' + enable_modem_manager.to_string() + '\n' output += ' ofono: ' + enable_ofono.to_string() + '\n' output += ' concheck: ' + enable_concheck.to_string() + '\n' -- cgit 1.3.0-6-gf8a5 From 88c227d90a6b7b388c5c85d72802a0ca8f05ed5c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 13 Jan 2022 22:30:39 +0100 Subject: New upstream version 1.34.0 --- meson.build | 48 +++++++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 17 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 37c2fe1c..a02e43f9 100644 --- a/meson.build +++ b/meson.build @@ -6,7 +6,7 @@ project( # - add corresponding NM_VERSION_x_y_z macros in # "src/libnm-core-public/nm-version-macros.h.in" # - update number in configure.ac - version: '1.32.12', + version: '1.34.0', license: 'GPL2+', default_options: [ 'buildtype=debugoptimized', @@ -644,6 +644,7 @@ enable_ovs = get_option('ovs') if enable_ovs assert(jansson_dep.found(), 'jansson is needed for Open vSwitch integration. Use -Dovs=false to disable it') endif +config_h.set10('WITH_OPENVSWITCH', enable_ovs) # DNS resolv.conf managers config_dns_rc_manager_default = get_option('config_dns_rc_manager_default') @@ -733,24 +734,36 @@ if enable_concheck endif config_h.set10('WITH_CONCHECK', enable_concheck) +config_h.set10('HAVE_READLINE_HISTORY', false) +config_h.set10('HAVE_EDITLINE_READLINE', false) +with_readline = get_option('readline') +if with_readline != 'none' + if with_readline == 'libreadline' or with_readline == 'auto' + readline = cc.find_library('readline', required: false) + if readline.found() + readline_dep = declare_dependency(link_args: '-lreadline') + config_h.set10('HAVE_READLINE_HISTORY', true) + with_readline = 'libreadline' + else + assert(with_readline == 'auto', 'libreadline was not found') + endif + endif + if with_readline == 'libedit' or with_readline == 'auto' + edit = dependency('libedit', required: false) + if edit.found() + readline_dep = declare_dependency(link_args: '-ledit') + config_h.set10('HAVE_EDITLINE_READLINE', true) + with_readline = 'libedit' + else + assert(with_readline == 'auto', 'libedit was not found') + with_readline = 'none' + endif + endif +endif + enable_nmcli = get_option('nmcli') if enable_nmcli - # FIXME: check for readline - # AX_LIB_READLINE - readline_dep = declare_dependency(link_args: '-lreadline') - ''' - foreach readline_lib: ['-lreadline', '-ledit', '-leditline'] - if not is_variable('readline_dep') - foreach termcap_lib: ['', '-lncurses', '-ltermcap', '-lcurses'] - test_dep = declare_dependency(link_args: ' '.join([readline_lib, termcap_lib])) - if cc.has_function('readline', dependencies: test_dep) and cc.has_header('readline', dependencies: test_dep) - readline_dep = test_dep - endif - endforeach - endif - endforeach - ''' - assert(readline_dep.found(), 'readline library with terminfo support is required (one of readline, edit, or editline, AND one of ncurses, curses, or termcap)') + assert(with_readline != 'none', 'nmcli requires readline library (-Dnmcli=false or -Dreadline=auto|libreadline|libedit|none)') endif enable_nmtui = get_option('nmtui') @@ -1086,4 +1099,5 @@ output += ' sanitizers: ' + get_option('b_sanitize') + '\n' output += ' Mozilla Public Suffix List: ' + enable_libpsl.to_string() + '\n' output += ' vapi: ' + enable_vapi.to_string() + '\n' output += ' ebpf: ' + enable_ebpf.to_string() + '\n' +output += ' readline: ' + with_readline + '\n' message(output) -- cgit 1.3.0-6-gf8a5