Fix a crash

epel8
Lubomir Rintel 9 years ago
parent 2438ff1441
commit c204a64435

@ -0,0 +1,30 @@
From 5878c8644f1989464583d3537a88fe16e4664e0d Mon Sep 17 00:00:00 2001
From: Mikhail Efremov <sem@altlinux.org>
Date: Wed, 13 Apr 2016 21:43:18 +0300
Subject: [PATCH] nm-pppd-plugin: fix crash
A bus name is not an object path.
Fix crash introduced by commit 17ae85788987ef1f7c92a251c535312163144c33.
(cherry picked from commit f145851f93614473e63d0a7a1a452fedcc90e914)
---
src/nm-pptp-pppd-plugin.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/nm-pptp-pppd-plugin.c b/src/nm-pptp-pppd-plugin.c
index 2b8c819..4567fcc 100644
--- a/src/nm-pptp-pppd-plugin.c
+++ b/src/nm-pptp-pppd-plugin.c
@@ -318,8 +318,8 @@ plugin_init (void)
proxy = g_dbus_proxy_new_sync (bus,
G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
NULL,
- NM_DBUS_SERVICE_PPTP_PPP,
bus_name,
+ NM_DBUS_PATH_PPTP_PPP,
NM_DBUS_INTERFACE_PPTP_PPP,
NULL, &err);
g_object_unref (bus);
--
2.5.5

@ -5,12 +5,14 @@ Summary: NetworkManager VPN plugin for PPTP
Name: NetworkManager-pptp
Epoch: 1
Version: 1.2.0
Release: 0.3%{?snapshot}%{?dist}
Release: 0.4%{?snapshot}%{?dist}
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
Group: System Environment/Base
Source0: https://download.gnome.org/sources/NetworkManager-pptp/1.1/%{name}-1.1.93.tar.xz
Patch0: 0001-nm-pppd-plugin-fix-crash.patch
BuildRequires: gtk3-devel
BuildRequires: NetworkManager-devel
BuildRequires: NetworkManager-glib-devel >= 1:1.1.0
@ -49,6 +51,7 @@ the PPTP server with NetworkManager (GNOME files).
%prep
%setup -q -n %{name}-1.1.93
%patch0 -p1
%build
if [ ! -f configure ]; then
@ -88,6 +91,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la
%{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name
%changelog
* Thu Apr 14 2016 Lubomir Rintel <lkundrak@v3.sk> - 1:1.2.0-0.4.rc1
- Fix a crash
* Tue Apr 5 2016 Lubomir Rintel <lkundrak@v3.sk> - 1:1.2.0-0.3.rc1
- Update to NetworkManager-pptp 1.2-rc1

Loading…
Cancel
Save