diff --git a/NetworkManager-0.9.8.10-libnl-3.2.25.patch b/NetworkManager-0.9.8.10-libnl-3.2.25.patch deleted file mode 100644 index 1111e6c..0000000 --- a/NetworkManager-0.9.8.10-libnl-3.2.25.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 8e4576b9fdb5c888d20a13aa2cc198df790dba54 Mon Sep 17 00:00:00 2001 -From: Thomas Haller -Date: Fri, 18 Jul 2014 13:34:33 +0200 -Subject: netlink: fix crash in netlink-monitor validating netlink messages - -The wrong callback data pointer was passed to the netlink message -validation function. - -Since libnl commit 4dd5fdd0af2c0b7ffe1dbc49313f263dbb2e906f, -nl_socket_get_local_port() actually modifes the provided @sk -pointer. Hence, since libnl 3.2.25 NM will crash due to -this bug. - - #0 _nl_socket_generate_local_port_no_release (sk=0x715500) at socket.c:339 - #1 0x00007ffff76f3ad5 in nl_socket_get_local_port (sk=sk@entry=0x715500) at socket.c:369 - #2 0x000000000046b81a in event_msg_recv (msg=, arg=0x715500) at nm-netlink-monitor.c:204 - #3 0x00007ffff76f2604 in nl_cb_call (msg=0x71f240, type=5, cb=0x71f150) at ../include/netlink-private/netlink.h:141 - #4 recvmsgs (cb=0x71f150, sk=0x71f070) at nl.c:823 - #5 nl_recvmsgs_report (sk=sk@entry=0x71f070, cb=cb@entry=0x71f150) at nl.c:1003 - #6 0x00007ffff76f2bc9 in nl_recvmsgs (sk=sk@entry=0x71f070, cb=cb@entry=0x71f150) at nl.c:1027 - #7 0x00007ffff76ec6b8 in __cache_pickup (sk=sk@entry=0x71f070, cache=cache@entry=0x71f0c0, param=param@entry=0x7fffffffd3f0) at cache.c:701 - #8 0x00007ffff76ed0dd in nl_cache_pickup (sk=sk@entry=0x71f070, cache=cache@entry=0x71f0c0) at cache.c:753 - #9 0x00007ffff76ed2d8 in nl_cache_refill (sk=sk@entry=0x71f070, cache=cache@entry=0x71f0c0) at cache.c:983 - #10 0x00007ffff7b224db in rtnl_link_alloc_cache (sk=0x71f070, family=family@entry=0, result=result@entry=0x7154e0) at route/link.c:1029 - #11 0x000000000046c5f7 in sync_connection_setup (self=self@entry=0x715500, error=error@entry=0x7fffffffd4f8) at nm-netlink-monitor.c:412 - #12 0x000000000046c91f in nm_netlink_monitor_open_connection (self=0x715500, error=error@entry=0x7fffffffd4f8) at nm-netlink-monitor.c:447 - #13 0x000000000046cad7 in nm_netlink_monitor_get () at nm-netlink-monitor.c:840 - #14 0x00000000004558b9 in main (argc=1, argv=0x7fffffffd958) at main.c:527 - -Reported-by: Jan Engelhardt -Fixes: 9fee99e1230580067efb33f3aaea0fddad5cfe66 -Signed-off-by: Thomas Haller - -diff --git a/src/nm-netlink-monitor.c b/src/nm-netlink-monitor.c -index ba8053e..593dec9 100644 ---- a/src/nm-netlink-monitor.c -+++ b/src/nm-netlink-monitor.c -@@ -285,7 +285,7 @@ nlh_setup (struct nl_sock *nlh, - { - int err; - -- nl_socket_modify_cb (nlh, NL_CB_MSG_IN, NL_CB_CUSTOM, event_msg_recv, cb_data); -+ nl_socket_modify_cb (nlh, NL_CB_MSG_IN, NL_CB_CUSTOM, event_msg_recv, nlh); - - if (valid_func) - nl_socket_modify_cb (nlh, NL_CB_VALID, NL_CB_CUSTOM, valid_func, cb_data); --- -cgit v0.10.2 - diff --git a/NetworkManager.spec b/NetworkManager.spec index 1adb458..a0756e4 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -1,13 +1,13 @@ %define majver %(echo %version | cut -d. -f 1-2) Name: NetworkManager -Version: 0.9.8.10 -Release: 3mamba +Version: 0.9.10.0 +Release: 2mamba Summary: A hardware level network management tool integrated with D-Bus Group: System/Kernel and Hardware Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco -URL: http://www.gnome.org +URL: https://wiki.gnome.org/Projects/NetworkManager Source: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/%{majver}/%{name}-%{version}.tar.xz Source1: NetworkManager-0.8.2-polkit-localauthority.patch # From svn: @@ -15,30 +15,38 @@ Source1: NetworkManager-0.8.2-polkit-localauthority.patch Patch0: %{name}-0.8.2-initscript.patch Patch7: %{name}-0.9.4.0-wpa_supplicant_longer_timeout.patch Patch12: %{name}-0.9.4.0-upstream-fixes-2.patch -Patch13: NetworkManager-0.9.8.10-libnl-3.2.25.patch License: GPL ## AUTOBUILDREQ-BEGIN +BuildRequires: ModemManager-devel BuildRequires: glibc-devel BuildRequires: libdbus-devel BuildRequires: libdbus-glib-devel +BuildRequires: libdw-devel BuildRequires: libffi-devel +BuildRequires: libgcrypt-devel BuildRequires: libglib-devel +BuildRequires: libgpg-error-devel BuildRequires: liblzma-devel +BuildRequires: libndp-devel +BuildRequires: libnewt-devel BuildRequires: libnl-devel BuildRequires: libnspr-devel BuildRequires: libnss-devel +BuildRequires: libpolkit-devel +BuildRequires: libreadline-devel BuildRequires: libselinux-devel BuildRequires: libsoup-devel +BuildRequires: libsqlite-devel +BuildRequires: libsystemd-devel +BuildRequires: libteam-devel +BuildRequires: libtermcap-devel +BuildRequires: libudev-devel BuildRequires: libuuid-devel BuildRequires: libxml2-devel BuildRequires: libz-devel -BuildRequires: polkit-devel -BuildRequires: systemd-devel -BuildRequires: udev-devel ## AUTOBUILDREQ-END BuildRequires: gettext-devel BuildRequires: pkgconfig -BuildRequires: libgcrypt-devel BuildRequires: dhcdbd BuildRequires: dhcp-client BuildRequires: libiw-devel @@ -89,9 +97,8 @@ This package includes the %{name} API documentation. %prep %setup -q %patch0 -p1 -%patch7 -p1 +#%patch7 -p1 #%patch12 -p1 -%patch13 -p1 %build %configure \ @@ -100,9 +107,14 @@ This package includes the %{name} API documentation. --enable-gtk-doc \ --enable-ifcfg-rh \ --with-systemdsystemunitdir=`pkg-config systemd --variable=systemdsystemunitdir` \ + --with-session-tracking=systemd \ --with-modem-manager-1 \ --enable-bluez4 \ - --with-session-tracking=systemd + --enable-teamdctl \ + --enable-polkit \ + --enable-modify-system \ + --enable-concheck \ + LIBS="-ltermcap" # --enable-wimax \ # --with-distro=redhat \ @@ -171,7 +183,10 @@ exit 0 %{_initrddir}/NetworkManager %{_sbindir}/NetworkManager %{_bindir}/nmcli -%{_bindir}/nm-tool +%{_bindir}/nmtui +%{_bindir}/nmtui-connect +%{_bindir}/nmtui-edit +%{_bindir}/nmtui-hostname %{_bindir}/nm-online %{_libdir}/pppd/*/nm-pppd-plugin.la %{_libdir}/pppd/*/nm-pppd-plugin.so @@ -179,9 +194,10 @@ exit 0 /lib/systemd/system/NetworkManager.service /lib/systemd/system/NetworkManager-dispatcher.service /lib/systemd/system/NetworkManager-wait-online.service +/lib/systemd/system/network-online.target.wants/NetworkManager-wait-online.service %{_libexecdir}/nm-avahi-autoipd.action -%{_libexecdir}/nm-dhcp-client.action -%{_libexecdir}/nm-dispatcher.action +%{_libexecdir}/nm-dhcp-helper +%{_libexecdir}/nm-dispatcher %{_datadir}/bash-completion/completions/nmcli %{_datadir}/polkit-1/actions/org.freedesktop.NetworkManager.policy %{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service @@ -190,11 +206,12 @@ exit 0 #%{_datadir}/NetworkManager/gdb-cmd /var/run/NetworkManager %{_mandir}/man1/nm-online.1.* -%{_mandir}/man1/nm-tool.1* +#%{_mandir}/man1/nm-tool.1* %{_mandir}/man1/nmcli.1* %{_mandir}/man5/NetworkManager.conf.5* %{_mandir}/man5/nm-settings.5* %{_mandir}/man5/nm-system-settings.conf.5* +%{_mandir}/man5/nmcli-examples.5* %{_mandir}/man8/NetworkManager.8* %files -n libnm @@ -205,6 +222,16 @@ exit 0 %dir %{_libdir}/NetworkManager %{_libdir}/NetworkManager/libnm-settings-plugin-ifcfg-rh.la %{_libdir}/NetworkManager/libnm-settings-plugin-ifcfg-rh.so +%{_libdir}/NetworkManager/libnm-device-plugin-adsl.la +%{_libdir}/NetworkManager/libnm-device-plugin-adsl.so +%{_libdir}/NetworkManager/libnm-device-plugin-bluetooth.la +%{_libdir}/NetworkManager/libnm-device-plugin-bluetooth.so +%{_libdir}/NetworkManager/libnm-device-plugin-wifi.la +%{_libdir}/NetworkManager/libnm-device-plugin-wifi.so +%{_libdir}/NetworkManager/libnm-device-plugin-wwan.la +%{_libdir}/NetworkManager/libnm-device-plugin-wwan.so +%{_libdir}/NetworkManager/libnm-wwan.la +%{_libdir}/NetworkManager/libnm-wwan.so %{_libdir}/girepository-1.0/NMClient-1.0.typelib %{_libdir}/girepository-1.0/NetworkManager-1.0.typelib %doc AUTHORS COPYING @@ -234,13 +261,22 @@ exit 0 %{_datadir}/gtk-doc/html/libnm-glib/* %dir %{_datadir}/gtk-doc/html/libnm-util %{_datadir}/gtk-doc/html/libnm-util/* +%dir %{_datadir}/doc/NetworkManager +%dir %{_datadir}/doc/NetworkManager/examples +%{_datadir}/doc/NetworkManager/examples/server.conf %changelog -* Sun Aug 24 2014 Silvan Calarco 0.9.8.10-3mamba -- added a patch to fix segfault with libnl 3.2.25 +* Thu Oct 16 2014 Silvan Calarco 0.9.10.0-2mamba +- rebuilt with --with-session-tracking=systemd and more new options -* Mon Jun 30 2014 Silvan Calarco 0.9.8.10-2mamba -- rebuilt with --with-session-tracking=systemd +* Fri Jul 04 2014 Automatic Build System 0.9.10.0-1mamba +- automatic version update by autodist + +* Sat Jun 21 2014 Automatic Build System 0.9.9.98-1mamba +- automatic version update by autodist + +* Wed Jun 18 2014 Automatic Build System 0.9.9.95-1mamba +- automatic version update by autodist * Thu Apr 24 2014 Automatic Build System 0.9.8.10-1mamba - automatic version update by autodist