update to 1.22.4 [release 1.22.4-1mamba;Fri Jan 10 2020]

This commit is contained in:
Silvan Calarco 2024-01-05 17:49:45 +01:00
parent 0423ec399a
commit 2a9818d221
3 changed files with 173 additions and 84 deletions

View File

@ -0,0 +1,11 @@
--- NetworkManager-1.20.2/meson.build.orig 2019-09-07 14:46:31.521000000 +0200
+++ NetworkManager-1.20.2/meson.build 2019-09-07 14:46:43.328000000 +0200
@@ -646,7 +646,7 @@
if enable_nmcli
# FIXME: check for readline
# AX_LIB_READLINE
- readline_dep = declare_dependency(link_args: '-lreadline')
+ readline_dep = declare_dependency(link_args: ['-lreadline','-ltermcap'])
'''
foreach readline_lib: ['-lreadline', '-ledit', '-leditline']
if not is_variable('readline_dep')

View File

@ -0,0 +1,57 @@
From a369e61d2a20493e6fcde9b6ac7e800174487a41 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Fri, 6 Sep 2019 11:00:52 +0200
Subject: [PATCH] build: use regexp in gtkdoc --ignore-decorators option
gtkdoc-scan supports regular expressions in the --ignore-decorators
command-line option. Since it is easier to use a regexp than grepping
macros from a source file, revert the ugly solution from commit
2d941dc95a1d ('build: fix errors when building with gtk-doc 1.32').
(cherry picked from commit 11cf082a6233a5c2f17da1b49457a66266062678)
---
docs/libnm/Makefile.am | 4 +---
docs/libnm/meson.build | 5 +----
tools/decorators.sh | 7 -------
3 files changed, 2 insertions(+), 14 deletions(-)
delete mode 100755 tools/decorators.sh
diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am
index ded32f821..20dc8de57 100644
--- a/docs/libnm/Makefile.am
+++ b/docs/libnm/Makefile.am
@@ -18,10 +18,8 @@ DOC_SOURCE_DIR= \
$(top_srcdir)/libnm \
$(top_builddir)/libnm
-decorators := $(shell $(top_srcdir)/tools/decorators.sh $(top_srcdir)/libnm-core/nm-version.h)
-
# Extra options to supply to gtkdoc-scan.
-SCAN_OPTIONS=--rebuild-types --rebuild-sections --ignore-decorators "$(decorators)"
+SCAN_OPTIONS=--rebuild-types --rebuild-sections --ignore-decorators="NM_AVAILABLE_IN_\d_\d\d?|NM_DEPRECATED_IN_\d_\d\d?"
# Extra options to supply to gtkdoc-mkdb.
MKDB_OPTIONS=--sgml-mode --output-format=xml
diff --git a/docs/libnm/meson.build b/docs/libnm/meson.build
index 3403b339d..b4a23729b 100644
--- a/docs/libnm/meson.build
+++ b/docs/libnm/meson.build
@@ -32,9 +32,6 @@ configure_file(
configuration: version_conf,
)
-result = run_command(join_paths(meson.source_root(), 'tools', 'decorators.sh'),
- join_paths(meson.source_root(), 'libnm-core', 'nm-version.h'))
-
gnome.gtkdoc(
doc_module,
main_xml: doc_module + '-docs.xml',
@@ -46,7 +43,7 @@ gnome.gtkdoc(
scan_args: [
'--rebuild-types',
'--rebuild-sections',
- '--ignore-decorators=' + result.stdout().strip(),
+ '--ignore-decorators=NM_AVAILABLE_IN_\d_\d\d?|NM_DEPRECATED_IN_\d_\d\d?',
'--ignore-headers=' + ' '.join(private_headers),
],
scanobjs_args: '--type-init-func="g_type_init();"',

View File

@ -1,6 +1,7 @@
%define majver %(echo %version | cut -d. -f 1-2) %define majver %(echo %version | cut -d. -f 1-2)
%define pppdver %(rpm -q --queryformat '%%{version}\\n' ppp | head -n1)
Name: NetworkManager Name: NetworkManager
Version: 1.18.2 Version: 1.22.4
Release: 1mamba Release: 1mamba
Summary: A hardware level network management tool integrated with D-Bus Summary: A hardware level network management tool integrated with D-Bus
Group: System/Kernel and Hardware Group: System/Kernel and Hardware
@ -13,51 +14,31 @@ Source1: NetworkManager-0.8.2-polkit-localauthority.patch
Patch0: NetworkManager-0.9.10.0-stop-before-dbus.patch Patch0: NetworkManager-0.9.10.0-stop-before-dbus.patch
Patch7: %{name}-0.9.4.0-wpa_supplicant_longer_timeout.patch Patch7: %{name}-0.9.4.0-wpa_supplicant_longer_timeout.patch
Patch8: NetworkManager-1.0.8-kernel-headers-3.17.patch Patch8: NetworkManager-1.0.8-kernel-headers-3.17.patch
Patch9: NetworkManager-1.20.2-upstream-gtkdoc-fix.patch
Patch10: NetworkManager-1.20.2-readline-termcap.patch
License: GPL License: GPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: ModemManager-devel BuildRequires: ModemManager-devel
BuildRequires: glibc-devel BuildRequires: glibc-devel
BuildRequires: ldconfig
BuildRequires: libaudit-devel BuildRequires: libaudit-devel
BuildRequires: libblkid-devel
BuildRequires: libbluetooth-devel BuildRequires: libbluetooth-devel
BuildRequires: libcap-devel
BuildRequires: libcap-ng-devel
BuildRequires: libcares-devel
BuildRequires: libcurl-devel BuildRequires: libcurl-devel
BuildRequires: libdbus-devel
BuildRequires: libdbus-glib-devel
BuildRequires: libexpat-devel
BuildRequires: libffi-devel
BuildRequires: libgcrypt-devel
BuildRequires: libglib-devel BuildRequires: libglib-devel
BuildRequires: libgpg-error-devel
BuildRequires: libgss-devel
BuildRequires: libjansson-devel BuildRequires: libjansson-devel
BuildRequires: liblzma-devel
BuildRequires: libmount-devel
BuildRequires: libndp-devel BuildRequires: libndp-devel
BuildRequires: libnewt-devel BuildRequires: libnewt-devel
BuildRequires: libnspr-devel BuildRequires: libnspr-devel
BuildRequires: libnss-devel BuildRequires: libnss-devel
BuildRequires: libopenldap-devel
BuildRequires: libopenssl-devel
BuildRequires: libpcre-devel
BuildRequires: libpolkit-devel BuildRequires: libpolkit-devel
BuildRequires: libpsl-devel
BuildRequires: libreadline-devel BuildRequires: libreadline-devel
BuildRequires: librtmp-devel
BuildRequires: libsasl2-devel
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
BuildRequires: libsepol-devel
BuildRequires: libsodium-devel
BuildRequires: libssh2-devel
BuildRequires: libstdc++6-devel
BuildRequires: libsystemd-devel BuildRequires: libsystemd-devel
BuildRequires: libteam-devel BuildRequires: libteam-devel
BuildRequires: libtermcap-devel BuildRequires: libtermcap-devel
BuildRequires: libudev-devel BuildRequires: libudev-devel
BuildRequires: libuuid-devel BuildRequires: libuuid-devel
BuildRequires: libz-devel
BuildRequires: libzeromq-devel
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
BuildRequires: libsodium-devel >= 1.0.8-1mamba BuildRequires: libsodium-devel >= 1.0.8-1mamba
BuildRequires: gettext-devel BuildRequires: gettext-devel
@ -66,7 +47,7 @@ BuildRequires: dhcdbd
BuildRequires: dhcp-client BuildRequires: dhcp-client
BuildRequires: libiw-devel BuildRequires: libiw-devel
BuildRequires: ppp-devel BuildRequires: ppp-devel
BuildRequires: libsystemd-devel BuildRequires: libpsl-devel
Requires: iproute >= 2.6.11 Requires: iproute >= 2.6.11
Requires: wpa_supplicant >= 0.7.3-3mamba Requires: wpa_supplicant >= 0.7.3-3mamba
Requires: ppp >= 2.4.5-5mamba Requires: ppp >= 2.4.5-5mamba
@ -115,37 +96,70 @@ This package includes the %{name} API documentation.
%setup -q %setup -q
#%patch0 -p1 #%patch0 -p1
#%patch8 -p1 #%patch8 -p1
#%patch9 -p1
%patch10 -p1
%build %build
%configure \ #% configure \
--with-udev-dir=/lib/udev \ # --with-udev-dir=/lib/udev \
--with-tests \ # --with-tests \
--enable-doc \ # --enable-doc \
--enable-gtk-doc \ # --enable-gtk-doc \
--enable-ifcfg-rh \ # --enable-ifcfg-rh \
--with-systemdsystemunitdir=%{_unitdir} \ # --with-systemdsystemunitdir=%{_unitdir} \
--with-session-tracking=systemd \ # --with-session-tracking=systemd \
--with-libnm-glib \ # --with-libnm-glib \
--with-modem-manager-1 \ # --with-modem-manager-1 \
--enable-bluez4 \ # --enable-bluez4 \
--enable-bluez5-dun \ # --enable-bluez5-dun \
--enable-teamdctl \ # --enable-teamdctl \
--enable-polkit \ # --enable-polkit \
--enable-modify-system \ # --enable-modify-system \
--enable-concheck \ # --enable-concheck \
--enable-wifi \ # --enable-wifi \
--enable-config-plugin-ibft \ # --enable-config-plugin-ibft \
--enable-polkit-agent \ # --enable-polkit-agent \
LIBS="-ltermcap" # LIBS="-ltermcap"
%meson \
-D udev_dir=/lib/udev \
-D tests=yes \
-D docs=true \
-D ifcfg_rh=true \
-D systemdsystemunitdir=%{_unitdir} \
-D session_tracking=systemd \
-D session_tracking_consolekit=false \
-D modem_manager=true \
-D bluez5_dun=true \
-D teamdctl=true \
-D polkit=true \
-D modify_system=true \
-D concheck=true \
-D wifi=true \
-D polkit_agent=true \
-D suspend_resume=systemd \
-D iwd=true \
-D ebpf=true \
-D config_plugins_default=keyfile \
-D vapi=true \
-D more_asserts=no \
-D more_logging=false \
-D qt=false \
-D pppd=%{_sbindir}/pppd \
-D pppd_plugin_dir=%{_libdir}/pppd/%{pppdver}
# -D dbus_conf_dir=/usr/share/dbus-1/system.d
# -D dist_version="$pkgver-$pkgrel"
# -D selinux=false
# --enable-wimax \ # --enable-wimax \
# --with-distro=redhat \ # --with-distro=redhat \
%make %meson_build
%install %install
[ "%{buildroot}" != / ] && rm -rf %{buildroot} [ "%{buildroot}" != / ] && rm -rf %{buildroot}
%makeinstall %meson_install
#install -m0755 test/.libs/nm-online %{buildroot}%{_bindir}/nm-online #install -m0755 test/.libs/nm-online %{buildroot}%{_bindir}/nm-online
install -D -m0644 %{SOURCE1} \ install -D -m0644 %{SOURCE1} \
@ -162,10 +176,10 @@ cat > %{buildroot}%{_sysconfdir}/NetworkManager/NetworkManager.conf << _EOF
plugins=ifcfg-rh,keyfile plugins=ifcfg-rh,keyfile
_EOF _EOF
# 1.12.2: built but not installed by make install ## 1.12.2: built but not installed by make install
cp ./src/settings/plugins/ibft/.libs/libnm-settings-plugin-ibft.{so,la} \ #cp ./src/settings/plugins/ibft/.libs/libnm-settings-plugin-ibft.{so,la} \
./src/devices/team/.libs/libnm-device-plugin-team.{so,la} \ # ./src/devices/team/.libs/libnm-device-plugin-team.{so,la} \
%{buildroot}%{_libdir}/NetworkManager/%{version}/ # %{buildroot}%{_libdir}/NetworkManager/%{version}/
%clean %clean
[ "%{buildroot}" != / ] && rm -rf %{buildroot} [ "%{buildroot}" != / ] && rm -rf %{buildroot}
@ -240,51 +254,40 @@ exit 0
%{_libexecdir}/nm-ifdown %{_libexecdir}/nm-ifdown
%{_libexecdir}/nm-ifup %{_libexecdir}/nm-ifup
%{_libdir}/libnm.so.* %{_libdir}/libnm.so.*
%{_libdir}/libnm-util.so.* #%{_libdir}/libnm-util.so.*
%{_libdir}/libnm-glib-vpn.so.* #%{_libdir}/libnm-glib-vpn.so.*
%{_libdir}/libnm-glib.so.* #%{_libdir}/libnm-glib.so.*
%dir %{_libdir}/NetworkManager %dir %{_libdir}/NetworkManager
%{_libdir}/NetworkManager/%{version}/libnm-device-plugin-*.la
%{_libdir}/NetworkManager/%{version}/libnm-device-plugin-*.so %{_libdir}/NetworkManager/%{version}/libnm-device-plugin-*.so
%{_libdir}/NetworkManager/%{version}/libnm-settings-plugin-*.la
%{_libdir}/NetworkManager/%{version}/libnm-settings-plugin-*.so %{_libdir}/NetworkManager/%{version}/libnm-settings-plugin-*.so
%{_libdir}/NetworkManager/%{version}/libnm-ppp-plugin.la
%{_libdir}/NetworkManager/%{version}/libnm-ppp-plugin.so %{_libdir}/NetworkManager/%{version}/libnm-ppp-plugin.so
%{_libdir}/NetworkManager/%{version}/libnm-wwan.la
%{_libdir}/NetworkManager/%{version}/libnm-wwan.so %{_libdir}/NetworkManager/%{version}/libnm-wwan.so
%{_libdir}/pppd/*/nm-pppd-plugin.la
%{_libdir}/pppd/*/nm-pppd-plugin.so %{_libdir}/pppd/*/nm-pppd-plugin.so
%{_libexecdir}/nm-dhcp-helper %{_libexecdir}/nm-dhcp-helper
%{_libexecdir}/nm-dispatcher %{_libexecdir}/nm-dispatcher
%{_libexecdir}/nm-initrd-generator %{_libexecdir}/nm-initrd-generator
%{_libdir}/girepository-1.0/NM-1.0.typelib %{_libdir}/girepository-1.0/NM-1.0.typelib
%{_libdir}/girepository-1.0/NMClient-1.0.typelib #%{_libdir}/girepository-1.0/NMClient-1.0.typelib
%{_libdir}/girepository-1.0/NetworkManager-1.0.typelib #%{_libdir}/girepository-1.0/NetworkManager-1.0.typelib
%doc AUTHORS COPYING %doc AUTHORS COPYING
%files -n libnm-devel %files -n libnm-devel
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_includedir}/libnm %dir %{_includedir}/libnm
%{_includedir}/libnm/*.h %{_includedir}/libnm/*.h
%{_includedir}/libnm-glib/libnm_glib.h #%{_includedir}/libnm-glib/libnm_glib.h
%{_includedir}/libnm-glib/nm-*.h #%{_includedir}/libnm-glib/nm-*.h
%dir %{_includedir}/NetworkManager #%{_libdir}/libnm-glib-vpn.so
%{_includedir}/NetworkManager/*.h #%{_libdir}/libnm-glib.so
%{_libdir}/libnm-glib-vpn.la #%{_libdir}/libnm-util.so
%{_libdir}/libnm-glib-vpn.so
%{_libdir}/libnm-glib.la
%{_libdir}/libnm-glib.so
%{_libdir}/libnm-util.la
%{_libdir}/libnm-util.so
%{_libdir}/libnm.la
%{_libdir}/libnm.so %{_libdir}/libnm.so
%{_datadir}/gir-1.0/NM-1.0.gir %{_datadir}/gir-1.0/NM-1.0.gir
%{_datadir}/gir-1.0/NMClient-1.0.gir #%{_datadir}/gir-1.0/NMClient-1.0.gir
%{_datadir}/gir-1.0/NetworkManager-1.0.gir #%{_datadir}/gir-1.0/NetworkManager-1.0.gir
%{_datadir}/vala/vapi/libnm-glib.deps #%{_datadir}/vala/vapi/libnm-glib.deps
%{_datadir}/vala/vapi/libnm-glib.vapi #%{_datadir}/vala/vapi/libnm-glib.vapi
%{_datadir}/vala/vapi/libnm-util.deps #%{_datadir}/vala/vapi/libnm-util.deps
%{_datadir}/vala/vapi/libnm-util.vapi #%{_datadir}/vala/vapi/libnm-util.vapi
%{_datadir}/vala/vapi/libnm.deps %{_datadir}/vala/vapi/libnm.deps
%{_datadir}/vala/vapi/libnm.vapi %{_datadir}/vala/vapi/libnm.vapi
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
@ -294,17 +297,35 @@ exit 0
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_datadir}/gtk-doc/html/NetworkManager %dir %{_datadir}/gtk-doc/html/NetworkManager
%{_datadir}/gtk-doc/html/NetworkManager/* %{_datadir}/gtk-doc/html/NetworkManager/*
%dir %{_datadir}/gtk-doc/html/libnm-glib #%dir %{_datadir}/gtk-doc/html/libnm-glib
%{_datadir}/gtk-doc/html/libnm-glib/* #%{_datadir}/gtk-doc/html/libnm-glib/*
%dir %{_datadir}/gtk-doc/html/libnm %dir %{_datadir}/gtk-doc/html/libnm
%{_datadir}/gtk-doc/html/libnm/* %{_datadir}/gtk-doc/html/libnm/*
%dir %{_datadir}/gtk-doc/html/libnm-util #%dir %{_datadir}/gtk-doc/html/libnm-util
%{_datadir}/gtk-doc/html/libnm-util/* #%{_datadir}/gtk-doc/html/libnm-util/*
%dir %{_datadir}/doc/NetworkManager %dir %{_datadir}/doc/NetworkManager
%dir %{_datadir}/doc/NetworkManager/examples %dir %{_datadir}/doc/NetworkManager/examples
%{_datadir}/doc/NetworkManager/examples/server.conf %{_datadir}/doc/NetworkManager/examples/server.conf
%changelog %changelog
* Fri Jan 10 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 1.22.4-1mamba
- update to 1.22.4
* Tue Dec 24 2019 Automatic Build System <autodist@mambasoft.it> 1.22.2-1mamba
- automatic version update by autodist
* Tue Dec 17 2019 Automatic Build System <autodist@mambasoft.it> 1.22.0-1mamba
- automatic version update by autodist
* Mon Nov 25 2019 Automatic Build System <autodist@mambasoft.it> 1.20.8-1mamba
- automatic version update by autodist
* Thu Nov 07 2019 Automatic Build System <autodist@mambasoft.it> 1.20.6-1mamba
- automatic version update by autodist
* Sun Oct 27 2019 Automatic Build System <autodist@mambasoft.it> 1.20.4-1mamba
- automatic version update by autodist
* Thu Jul 25 2019 Automatic Build System <autodist@mambasoft.it> 1.18.2-1mamba * Thu Jul 25 2019 Automatic Build System <autodist@mambasoft.it> 1.18.2-1mamba
- automatic version update by autodist - automatic version update by autodist
@ -445,7 +466,7 @@ exit 0
* Tue Jan 22 2013 Automatic Build System <autodist@mambasoft.it> 0.9.7.995-1mamba * Tue Jan 22 2013 Automatic Build System <autodist@mambasoft.it> 0.9.7.995-1mamba
- automatic version update by autodist - automatic version update by autodist
* Sun Oct 29 2012 Automatic Build System <autodist@mambasoft.it> 0.9.6.4-1mamba * Mon Oct 29 2012 Automatic Build System <autodist@mambasoft.it> 0.9.6.4-1mamba
- automatic version update by autodist - automatic version update by autodist
- source edit: require ppp > 2.4.5-5mamba (with ipv6 support enabled) - source edit: require ppp > 2.4.5-5mamba (with ipv6 support enabled)