From 4c030e05b7bc939b97cca5023032af2879eb9ae8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Mon, 21 Nov 2016 17:34:26 +0100
Subject: [PATCH] Autoloaded nf_conntrack_pptp kernel module

  Resolves: rhbz#1373689
- Removed some f14 artifacts
---
 modules-load.conf |  2 ++
 pptp.spec         | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 modules-load.conf

diff --git a/modules-load.conf b/modules-load.conf
new file mode 100644
index 0000000..c5a8d01
--- /dev/null
+++ b/modules-load.conf
@@ -0,0 +1,2 @@
+# Load nf_conntrack_pptp.ko at boot
+nf_conntrack_pptp
diff --git a/pptp.spec b/pptp.spec
index 6d286a6..aa6d072 100644
--- a/pptp.spec
+++ b/pptp.spec
@@ -1,12 +1,13 @@
 Name:		pptp
 Version:	1.8.0
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	Point-to-Point Tunneling Protocol (PPTP) Client
 Group:		Applications/Internet
 License:	GPLv2+
 URL:		http://pptpclient.sourceforge.net/
 Source0:	http://downloads.sf.net/pptpclient/pptp-%{version}.tar.gz
 Source1:	pptp-tmpfs.conf
+Source2:	modules-load.conf
 Patch0:		pptp-1.7.2-pptpsetup-mppe.patch
 # patch from upstream
 Patch1:		pptp-1.8.0-vector-remove-fix.patch
@@ -15,9 +16,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildRequires:	/usr/bin/pod2man
 BuildRequires:	perl-generators
 Requires:	ppp >= 2.4.2, /sbin/ip
-%if 0%{?fedora} > 14
 Requires:	systemd-units
-%endif
 
 %description
 Client for the proprietary Microsoft Point-to-Point Tunneling
@@ -55,12 +54,10 @@ rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 install -d -m 750 %{buildroot}%{_localstatedir}/run/pptp
 
-# Make sure /var/run/pptp exists at boot time for systems
-# with /var/run on tmpfs (#656672)
-%if 0%{?fedora} > 14
+
 install -d -m 755 %{buildroot}%{_prefix}/lib/tmpfiles.d
 install -p -m 644 %{SOURCE1} %{buildroot}%{_prefix}/lib/tmpfiles.d/pptp.conf
-%endif
+install -Dpm 0644 %{SOURCE2} %{buildroot}%{_usr}/lib/modules-load.d/pptp.conf
 
 %clean
 rm -rf %{buildroot}
@@ -69,10 +66,9 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING DEVELOPERS NEWS README TODO USING
 %doc ChangeLog Documentation/DESIGN.PPTP PROTOCOL-SECURITY
-%if 0%{?fedora} > 14
 %{_prefix}/lib/tmpfiles.d/pptp.conf
-%endif
 %{_sbindir}/pptp
+%{_usr}/lib/modules-load.d/pptp.conf
 %{_mandir}/man8/pptp.8*
 %dir %attr(750,root,root) %{_localstatedir}/run/pptp/
 %config(noreplace) %{_sysconfdir}/ppp/options.pptp
@@ -83,6 +79,11 @@ rm -rf %{buildroot}
 %{_mandir}/man8/pptpsetup.8*
 
 %changelog
+* Mon Nov 21 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 1.8.0-9
+- Autoloaded nf_conntrack_pptp kernel module
+  Resolves: rhbz#1373689
+- Removed some f14 artifacts
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild