jklimes pushed to NetworkManager-pptp (private-jklimes-el6). "Load nf_conntrack_pptp module needed for new kernels (rh #1206276)"

[notifications at fedoraproject.org]

>From 304b4bbf36b860151b637c396c20e30e8b4b5272 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes at redhat.com>
Date: Tue, 28 Apr 2015 15:17:49 +0200
Subject: Load nf_conntrack_pptp module needed for new kernels (rh #1206276)


diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec
index 6f16b22..1b8af80 100644
--- a/NetworkManager-pptp.spec
+++ b/NetworkManager-pptp.spec
@@ -11,12 +11,13 @@ Summary:   NetworkManager VPN plugin for pptp
 Name:      NetworkManager-pptp
 Epoch:     1
 Version:   0.8.0
-Release:   1%{snapshot}%{?dist}
+Release:   2%{snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
 Source:    %{name}-%{realversion}%{snapshot}.tar.bz2
 Patch1: fix-build-import-export.patch
+Patch2: rh1206276-conntrack-pptp-module.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -51,6 +52,7 @@ the NetworkManager and the GNOME desktop.
 %setup -q -n NetworkManager-pptp-%{realversion}
 
 %patch1 -p1 -b .fix-build-import-export
+%patch2 -p1 -b .rh1206276-conntrack-pptp-module
 
 %build
 %configure \
@@ -111,6 +113,9 @@ fi
 %dir %{_datadir}/gnome-vpn-properties/pptp
 
 %changelog
+* Tue Apr 28 2015 Jiří Klimeš <jklimes at redhat.com> - 1:0.8.0-2
+- load nf_conntrack_pptp module needed for new kernels (rh #1206276)
+
 * Sun Apr 11 2010 Dan Williams <dcbw at redhat.com> - 1:0.8.0-1
 - Fix saving of MPPE security levels
 - Updated translations
diff --git a/rh1206276-conntrack-pptp-module.patch b/rh1206276-conntrack-pptp-module.patch
new file mode 100644
index 0000000..d06a3c8
--- /dev/null
+++ b/rh1206276-conntrack-pptp-module.patch
@@ -0,0 +1,51 @@
+From 5c114bcb51e24910e7c8d5555d4345f25ebcb56f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes at redhat.com>
+Date: Fri, 17 Apr 2015 16:54:49 +0200
+Subject: [PATCH] service: try to load nf_conntrack_pptp kernel module (rh
+ #1214643)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The module is necessary with newer kernels so that PPTP work correctly.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1214643
+https://bugzilla.redhat.com/show_bug.cgi?id=1187328
+Signed-off-by: Jiří Klimeš <jklimes at redhat.com>
+---
+ src/nm-pptp-service.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/nm-pptp-service.c b/src/nm-pptp-service.c
+index 1bc869d..59d189c 100644
+--- a/src/nm-pptp-service.c
++++ b/src/nm-pptp-service.c
+@@ -1240,6 +1240,8 @@ main (int argc, char *argv[])
+ {
+ 	NMPptpPlugin *plugin;
+ 	GMainLoop *main_loop;
++	char *conntrack_module[] = { "/sbin/modprobe", "nf_conntrack_pptp", NULL };
++	GError *error = NULL;
+ 
+ 	g_type_init ();
+ 
+@@ -1253,6 +1255,16 @@ main (int argc, char *argv[])
+ 				   G_CALLBACK (quit_mainloop),
+ 				   main_loop);
+ 
++	/* Newer kernels require nf_conntrack_pptp kernel module so that PPTP
++	 * worked correctly. Load the module now. Ignore errors, the module
++	 * might not exist (older kernels).
++	 * https://bugzilla.redhat.com/show_bug.cgi?id=1187328
++	 */
++	if (!g_spawn_sync (NULL, conntrack_module, NULL, 0, NULL, NULL, NULL, NULL, NULL, &error)) {
++		g_warning ("modprobing nf_conntrack_pptp failed: %s", error->message);
++		g_error_free (error);
++	}
++
+ 	g_main_loop_run (main_loop);
+ 
+ 	g_main_loop_unref (main_loop);
+-- 
+2.1.0
+
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/NetworkManager-pptp.git/commit/?h=private-jklimes-el6&id=304b4bbf36b860151b637c396c20e30e8b4b5272