commit 5602b2166e2b8ea3fadeea89ba4cb853c941cb2e
Author: Jakub Bogusz <[email protected]>
Date: Sun Jul 6 21:54:07 2014 +0200
- updated to 0.9.10.0
- updated systemd-fallback patch
- removed llh340 patch (causes build failure with llh 3.15, the required
headers are back now)
NetworkManager.spec | 54 +++++++++++++++++----------
llh340.patch | 21 -----------
systemd-fallback.patch | 99 +++++++++++++++++++++++++++-----------------------
3 files changed, 88 insertions(+), 86 deletions(-)
---
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 015c434..6ac80fa 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -7,38 +7,41 @@
Summary: Network Manager for GNOME
Summary(pl.UTF-8): Zarządca sieci dla GNOME
Name: NetworkManager
-Version: 0.9.8.10
-Release: 2
+Version: 0.9.10.0
+Release: 1
Epoch: 2
License: GPL v2+
Group: Networking/Admin
Source0:
http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.9/%{name}-%{version}.tar.xz
-# Source0-md5: aad2558887e25417c52eb2deaade2f85
+# Source0-md5: 21b9051dbbd6434df4624a90ca9d71b6
Source1: %{name}.conf
Source2: %{name}.upstart
Source3: %{name}.tmpfiles
Source4: %{name}.init
Patch0: ifcfg-path.patch
Patch1: systemd-fallback.patch
-Patch2: llh340.patch
URL: http://projects.gnome.org/NetworkManager/
BuildRequires: ModemManager-devel >= 1.0.0
BuildRequires: autoconf >= 2.63
BuildRequires: automake >= 1:1.11
BuildRequires: dbus-devel >= 1.1.0
-BuildRequires: dbus-glib-devel >= 0.94
+BuildRequires: dbus-glib-devel >= 0.100
BuildRequires: docbook-dtd412-xml
BuildRequires: gettext-devel >= 0.17
-BuildRequires: glib2-devel >= 1:2.24.0
+BuildRequires: glib2-devel >= 1:2.32
BuildRequires: gobject-introspection-devel >= 0.10.0
BuildRequires: gtk-doc >= 1.0
BuildRequires: gtk-doc-automake >= 1.0
BuildRequires: intltool >= 0.40.0
BuildRequires: libiw-devel >= 1:28-0.pre9.1
-BuildRequires: libnl-devel >= 3.2.7
+BuildRequires: libndp-devel
+BuildRequires: libnl-devel >= 3.2.8
+BuildRequires: libselinux-devel
BuildRequires: libsoup-devel >= 2.26.0
+BuildRequires: libteam-devel >= 1.9
BuildRequires: libtool >= 2:2.2
BuildRequires: libuuid-devel
+BuildRequires: newt-devel >= 0.52.15
BuildRequires: nss-devel >= 3.11
BuildRequires: pkgconfig
BuildRequires: polkit-devel >= 0.97
@@ -63,8 +66,9 @@ Requires: ConsoleKit-x11
%endif
Requires: dhcp-client
Requires: filesystem >= 3.0-37
-Requires: libnl >= 3.2.7
+Requires: libnl >= 3.2.8
Requires: libsoup >= 2.26.0
+Requires: libteam >= 1.9
Requires: polkit >= 0.97
Requires: rc-scripts >= 0.4.3.0
Requires: systemd-units >= 38
@@ -102,8 +106,8 @@ Dokumentacja API biblioteki libnm-glib.
Summary: Network Manager shared libraries
Summary(pl.UTF-8): Biblioteki dzielone Network Managera
Group: Libraries
-Requires: dbus-glib >= 0.94
-Requires: glib2 >= 1:2.24.0
+Requires: dbus-glib >= 0.100
+Requires: glib2 >= 1:2.32
Requires: nss >= 3.11
Requires: udev-glib >= 1:165
Conflicts: NetworkManager < 0.6.4-0.2
@@ -119,8 +123,8 @@ Summary: Network Manager includes and more
Summary(pl.UTF-8): Pliki nagłówkowe Network Managera
Group: Development/Libraries
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: dbus-glib-devel >= 0.94
-Requires: glib2-devel >= 1:2.24.0
+Requires: dbus-glib-devel >= 0.100
+Requires: glib2-devel >= 1:2.32
Requires: libuuid-devel
Requires: nss-devel >= 3.11
Requires: udev-glib-devel >= 1:165
@@ -176,7 +180,6 @@ Bashowe uzupełnianie nazw dla polecenia NetworkManagera
(nmcli).
%setup -q
%patch0 -p1
%{?with_systemd:%patch1 -p1}
-%patch2 -p1
%build
%{__gtkdocize}
@@ -192,12 +195,15 @@ Bashowe uzupełnianie nazw dla polecenia NetworkManagera
(nmcli).
--enable-ifcfg-rh \
--enable-more-warnings=yes \
--with-dhclient=/sbin/dhclient \
+ --with-dhcpcd=/sbin/dhcpcd \
--with-iptables=/usr/sbin/iptables \
--with-system-ca-path=/etc/certs \
--with-systemdsystemunitdir=%{systemdunitdir} \
--with-session-tracking=%{?with_systemd:systemd}%{!?with_systemd:ck} \
--with-suspend-resume=%{?with_systemd:systemd}%{!?with_systemd:upower} \
+ --with-pppd=/usr/sbin/pppd \
--with-pppd-plugin-dir=%{_libdir}/pppd/plugins \
+ --with-pppoe=/usr/sbin/pppoe \
--with-resolvconf=/sbin/resolvconf \
--with-dist-version=%{version}-%{release} \
--with-docs \
@@ -277,20 +283,31 @@ exit 0
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README TODO
%attr(755,root,root) %{_bindir}/nm-online
-%attr(755,root,root) %{_bindir}/nm-tool
%attr(755,root,root) %{_bindir}/nmcli
+%attr(755,root,root) %{_bindir}/nmtui
+%attr(755,root,root) %{_bindir}/nmtui-connect
+%attr(755,root,root) %{_bindir}/nmtui-edit
+%attr(755,root,root) %{_bindir}/nmtui-hostname
%attr(755,root,root) %{_sbindir}/NetworkManager
%dir %{_libdir}/NetworkManager
+%attr(755,root,root) %{_libdir}/NetworkManager/libnm-device-plugin-adsl.so
+%attr(755,root,root) %{_libdir}/NetworkManager/libnm-device-plugin-bluetooth.so
+%attr(755,root,root) %{_libdir}/NetworkManager/libnm-device-plugin-wifi.so
+%attr(755,root,root) %{_libdir}/NetworkManager/libnm-device-plugin-wwan.so
%attr(755,root,root)
%{_libdir}/NetworkManager/libnm-settings-plugin-ifcfg-rh.so
+%attr(755,root,root) %{_libdir}/NetworkManager/libnm-wwan.so
%attr(755,root,root) %{_libexecdir}/nm-avahi-autoipd.action
-%attr(755,root,root) %{_libexecdir}/nm-dhcp-client.action
-%attr(755,root,root) %{_libexecdir}/nm-dispatcher.action
+%attr(755,root,root) %{_libexecdir}/nm-dhcp-helper
+%attr(755,root,root) %{_libexecdir}/nm-dispatcher
%attr(755,root,root) %{_libdir}/pppd/plugins/nm-pppd-plugin.so
%attr(754,root,root) /etc/rc.d/init.d/NetworkManager
%config(noreplace) %verify(not md5 mtime size) /etc/init/NetworkManager.conf
%{systemdunitdir}/NetworkManager.service
%{systemdunitdir}/NetworkManager-dispatcher.service
%{systemdunitdir}/NetworkManager-wait-online.service
+# XXX: dir here or add to systemd-units?
+%dir %{systemdunitdir}/network-online.target.wants
+%{systemdunitdir}/network-online.target.wants/NetworkManager-wait-online.service
%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service
%{systemdtmpfilesdir}/%{name}.conf
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
@@ -299,7 +316,6 @@ exit 0
%dir %{_sysconfdir}/%{name}/VPN
%dir %{_sysconfdir}/%{name}/system-connections
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/%{name}/%{name}.conf
-%config(noreplace) %verify(not md5 mtime size)
/etc/dbus-1/system.d/nm-dhcp-client.conf
%config(noreplace) %verify(not md5 mtime size)
/etc/dbus-1/system.d/nm-avahi-autoipd.conf
%config(noreplace) %verify(not md5 mtime size)
/etc/dbus-1/system.d/nm-dispatcher.conf
%config(noreplace) %verify(not md5 mtime size)
/etc/dbus-1/system.d/nm-ifcfg-rh.conf
@@ -307,11 +323,11 @@ exit 0
%attr(700,root,root) %dir /var/run/%{name}
%attr(700,root,root) %dir /var/lib/%{name}
%{_mandir}/man1/nm-online.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/NetworkManager.conf.5*
+%{_mandir}/man5/nmcli-examples.5*
%{_mandir}/man8/NetworkManager.8*
%{_examplesdir}/%{name}-%{version}
diff --git a/llh340.patch b/llh340.patch
deleted file mode 100644
index 632d9fd..0000000
--- a/llh340.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# there's no <linux/if_ppp.h> in linux-libc-headers-3.4.0
---- NetworkManager-0.9.4.0/src/ppp-manager/nm-ppp-manager.c.orig
2012-06-14 09:42:51.793598842 +0200
-+++ NetworkManager-0.9.4.0/src/ppp-manager/nm-ppp-manager.c 2012-06-14
09:46:36.876054350 +0200
-@@ -32,14 +32,14 @@
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #include <asm/types.h>
--#include <linux/if.h>
-+#include <net/if.h>
- #include <sys/stat.h>
-
--#include <linux/ppp_defs.h>
-+#include <net/ppp_defs.h>
- #ifndef aligned_u64
- #define aligned_u64 unsigned long long __attribute__((aligned(8)))
- #endif
--#include <linux/if_ppp.h>
-+#include <net/if_ppp.h>
-
- #include "NetworkManager.h"
- #include "nm-glib-compat.h"
diff --git a/systemd-fallback.patch b/systemd-fallback.patch
index f1651c0..7ad09ed 100644
--- a/systemd-fallback.patch
+++ b/systemd-fallback.patch
@@ -9,8 +9,8 @@
AC_SUBST(SYSTEMD_LOGIN_CFLAGS)
AC_SUBST(SYSTEMD_LOGIN_LIBS)
fi
---- NetworkManager-0.9.6.4/src/nm-session-monitor-systemd.c.orig
2012-09-12 22:37:01.000000000 +0200
-+++ NetworkManager-0.9.6.4/src/nm-session-monitor-systemd.c 2012-11-01
08:58:24.084129513 +0100
+--- NetworkManager-0.9.10.0/src/nm-session-monitor-systemd.c.orig
2014-07-04 02:44:13.000000000 +0200
++++ NetworkManager-0.9.10.0/src/nm-session-monitor-systemd.c 2014-07-05
09:46:03.260229549 +0200
@@ -28,6 +28,10 @@
#include <glib/gstdio.h>
#include <systemd/sd-login.h>
@@ -22,7 +22,7 @@
#include "nm-session-utils.h"
#include "nm-session-monitor.h"
-@@ -108,10 +112,20 @@
+@@ -108,10 +112,20 @@ sd_source_new (void)
return source;
}
@@ -43,7 +43,7 @@
};
struct _NMSessionMonitorClass {
-@@ -131,6 +145,215 @@
+@@ -131,6 +145,215 @@ G_DEFINE_TYPE (NMSessionMonitor, nm_sess
/*
----------------------------------------------------------------------------------------------------
*/
@@ -259,7 +259,7 @@
static gboolean
sessions_changed (gpointer user_data)
{
-@@ -144,9 +367,50 @@
+@@ -144,9 +367,50 @@ sessions_changed (gpointer user_data)
static void
nm_session_monitor_init (NMSessionMonitor *monitor)
{
@@ -313,7 +313,7 @@
}
static void
-@@ -159,6 +423,12 @@
+@@ -159,6 +423,12 @@ nm_session_monitor_finalize (GObject *ob
g_source_unref (monitor->sd_source);
}
@@ -326,7 +326,7 @@
if (G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize != NULL)
G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize
(object);
}
-@@ -207,15 +477,36 @@
+@@ -204,15 +474,36 @@ nm_session_monitor_user_has_session (NMS
uid_t *out_uid,
GError **error)
{
@@ -369,7 +369,7 @@
}
gboolean
-@@ -223,12 +514,31 @@
+@@ -220,12 +511,31 @@ nm_session_monitor_user_active (NMSessio
const char *username,
GError **error)
{
@@ -405,28 +405,33 @@
}
gboolean
-@@ -239,16 +549,37 @@
+@@ -234,19 +544,40 @@ nm_session_monitor_uid_has_session (NMSe
+ const char **out_user,
+ GError **error)
{
- int ret;
+- int num_sessions;
++ if (monitor->sd_source != NULL) {
++ int num_sessions;
- if (!nm_session_uid_to_user (uid, out_user, error))
- return FALSE;
-+ if (monitor->sd_source != NULL) {
+ if (!nm_session_uid_to_user (uid, out_user, error))
+ return FALSE;
-- ret = sd_uid_get_sessions (uid, FALSE, NULL) > 0;
-- if (ret < 0) {
+- /* Get all sessions (including inactive ones) for the user */
+- num_sessions = sd_uid_get_sessions (uid, 0, NULL);
+- if (num_sessions < 0) {
- nm_log_warn (LOGD_CORE, "Failed to get systemd sessions for uid
%d: %d",
-- uid, ret);
+- uid, num_sessions);
- return FALSE;
-+ ret = sd_uid_get_sessions (uid, FALSE, NULL) > 0;
-+ if (ret < 0) {
++ /* Get all sessions (including inactive ones) for the user */
++ num_sessions = sd_uid_get_sessions (uid, 0, NULL);
++ if (num_sessions < 0) {
+ nm_log_warn (LOGD_CORE, "Failed to get systemd sessions
for uid %d: %d",
-+ uid, ret);
++ uid, num_sessions);
+ return FALSE;
+ }
-+ return ret > 0 ? TRUE : FALSE;
++ return num_sessions > 0;
+ } else {
+ Session *s;
+
@@ -447,27 +452,32 @@
+ *out_user = s->user;
+ return TRUE;
}
-- return ret > 0 ? TRUE : FALSE;
+- return num_sessions > 0;
}
gboolean
-@@ -258,11 +589,30 @@
+@@ -254,14 +585,33 @@ nm_session_monitor_uid_active (NMSession
+ uid_t uid,
+ GError **error)
{
- int ret;
+- int num_sessions;
++ if (monitor->sd_source != NULL) {
++ int num_sessions;
-- ret = sd_uid_get_sessions (uid, TRUE, NULL) > 0;
-- if (ret < 0) {
+- /* Get active sessions for the user */
+- num_sessions = sd_uid_get_sessions (uid, 1, NULL);
+- if (num_sessions < 0) {
- nm_log_warn (LOGD_CORE, "Failed to get active systemd sessions
for uid %d: %d",
-- uid, ret);
+- uid, num_sessions);
- return FALSE;
-+ if (monitor->sd_source != NULL) {
-+ ret = sd_uid_get_sessions (uid, TRUE, NULL) > 0;
-+ if (ret < 0) {
++ /* Get active sessions for the user */
++ num_sessions = sd_uid_get_sessions (uid, 1, NULL);
++ if (num_sessions < 0) {
+ nm_log_warn (LOGD_CORE, "Failed to get active systemd
sessions for uid %d: %d",
-+ uid, ret);
++ uid, num_sessions);
+ return FALSE;
+ }
-+ return ret > 0 ? TRUE : FALSE;
++ return num_sessions > 0;
+ } else {
+ Session *s;
+
@@ -486,38 +496,35 @@
+
+ return s->active;
}
-- return ret > 0 ? TRUE : FALSE;
+- return num_sessions > 0;
}
-
---- NetworkManager-0.9.8.0/src/nm-sleep-monitor-systemd.c.new 2013-02-21
15:01:09.404910471 +0100
-+++ NetworkManager-0.9.8.0/src/nm-sleep-monitor-systemd.c 2013-02-21
15:10:58.429453872 +0100
-@@ -25,6 +25,7 @@
- #include <dbus/dbus-glib.h>
+--- NetworkManager-0.9.10.0/src/nm-sleep-monitor-systemd.c.orig
2014-07-04 02:44:13.000000000 +0200
++++ NetworkManager-0.9.10.0/src/nm-sleep-monitor-systemd.c 2014-07-05
09:49:32.623554089 +0200
+@@ -26,6 +26,7 @@
+ #include <glib/gi18n.h>
#include <gio/gio.h>
#include <gio/gunixfdlist.h>
+#include <systemd/sd-daemon.h>
#include "nm-logging.h"
#include "nm-dbus-manager.h"
-@@ -35,6 +36,8 @@
+@@ -36,12 +37,15 @@
#define SD_PATH "/org/freedesktop/login1"
#define SD_INTERFACE "org.freedesktop.login1.Manager"
+#define UPOWER_DBUS_SERVICE "org.freedesktop.UPower"
-+
- /* Do we have GDBus (glib >= 2.26) and GUnixFDList (glib >= 2.30) support ? */
- #if GLIB_CHECK_VERSION(2,30,0)
- #define IS_GDBUS_UNIXFD_AVAILABLE 1
-@@ -50,6 +53,8 @@ struct _NMSleepMonitor {
- DBusGProxy *sd_proxy;
- #endif
+
+ struct _NMSleepMonitor {
+ GObject parent_instance;
+
+ GDBusProxy *sd_proxy;
gint inhibit_fd;
+
+ DBusGProxy *upower_proxy;
};
struct _NMSleepMonitorClass {
-@@ -71,6 +76,20 @@ G_DEFINE_TYPE (NMSleepMonitor, nm_sleep_
+@@ -63,6 +67,20 @@ G_DEFINE_TYPE (NMSleepMonitor, nm_sleep_
/********************************************************************/
@@ -538,7 +545,7 @@
static gboolean
drop_inhibitor (NMSleepMonitor *self)
{
-@@ -304,9 +323,34 @@ sleep_setup (NMSleepMonitor *self)
+@@ -164,9 +182,34 @@ sleep_setup (NMSleepMonitor *self)
static void
nm_sleep_monitor_init (NMSleepMonitor *self)
{
@@ -576,7 +583,7 @@
}
static void
-@@ -314,9 +358,14 @@ finalize (GObject *object)
+@@ -174,9 +217,14 @@ finalize (GObject *object)
{
NMSleepMonitor *self = NM_SLEEP_MONITOR (object);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/NetworkManager.git/commitdiff/5602b2166e2b8ea3fadeea89ba4cb853c941cb2e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
