From 5b1e3114bddd41beb8948153f13e4c4bc9d6a920 Mon Sep 17 00:00:00 2001
From: Paul Wouters <pwouters@redhat.com>
Date: Thu, 3 Sep 2020 16:59:45 -0400
Subject: [PATCH] * Thu Sep 03 2020 Paul Wouters <pwouters@redhat.com> -
 1.3.15-1 - Resolves: rhbz#1761700 xl2tpd-1.3.15 is available - Resolves:
 rhbz#1875262 Unsupported options 'crtscts' and 'lock' in
 /etc/ppp/options.xl2tpd - Resolves: rhbz#1869420 xl2tpd.service:8: PIDFile=
 references a path below legacy directory /var/run/

---
 .gitignore     |  1 +
 sources        |  2 +-
 xl2tpd.service |  2 +-
 xl2tpd.spec    | 12 ++++++++++--
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index ae0ec2f..9193a59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ xl2tpd-1.3.1.tar.gz
 /xl2tpd-5619e1771048e74b729804e8602f409af0f3faea.tar.gz
 /xl2tpd-1.3.8.tar.gz
 /xl2tpd-1.3.14.tar.gz
+/xl2tpd-1.3.15.tar.gz
diff --git a/sources b/sources
index 31efa93..a97e39a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xl2tpd-1.3.14.tar.gz) = a0c007b5a2d45f4c73d8651c8ca2525cd46b779e4b8cfabebd2c7905770d128f25edea5665c25828c53788083fda73896faccb49f4da9a38a2042b5f957a3327
+SHA512 (xl2tpd-1.3.15.tar.gz) = f65c7f2f1c03728d825b8857baa0c2297e9d5dbd97a2375484a32851326db5951deb9bf3598cbec860f0787d1bb577b4f0a47372e3244fd92c8bad7ce684889b
diff --git a/xl2tpd.service b/xl2tpd.service
index 082b4ff..145dc0e 100644
--- a/xl2tpd.service
+++ b/xl2tpd.service
@@ -7,7 +7,7 @@ After=ipsec.service
 
 [Service]
 Type=simple
-PIDFile=/var/run/xl2tpd/xl2tpd.pid
+PIDFile=/run/xl2tpd/xl2tpd.pid
 ExecStartPre=/sbin/modprobe -q l2tp_ppp
 ExecStart=/usr/sbin/xl2tpd -D
 Restart=on-abort
diff --git a/xl2tpd.spec b/xl2tpd.spec
index 51325ba..8e08c23 100644
--- a/xl2tpd.spec
+++ b/xl2tpd.spec
@@ -2,8 +2,8 @@
 
 Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661)
 Name: xl2tpd
-Version: 1.3.14
-Release: 3%{?dist}
+Version: 1.3.15
+Release: 1%{?dist}
 License: GPL+
 Url: https://github.com/xelerance/xl2tpd/
 # upstream isn't using proper names, we manually rename v-VERSION.tar.gz to xl2tpd-VERSION.tar.gz
@@ -62,6 +62,9 @@ It was de-facto maintained by Jacco de Leeuw <jacco2@dds.nl> in 2002 and 2003.
 export CFLAGS="$CFLAGS -fPIC -Wall -DTRUST_PPPD_TO_DIE"
 export DFLAGS="$RPM_OPT_FLAGS -g "
 export LDFLAGS="$LDFLAGS -pie -Wl,-z,relro -Wl,-z,now"
+# fixup for obsoleted pppd options
+sed -i "s/crtscts/#obsolete: crtscts/" examples/ppp-options.xl2tpd
+sed -i "s/lock/#obsolete: lock/" examples/ppp-options.xl2tpd
 # if extra debugging is needed, use:
 # %make_build DFLAGS="$RPM_OPT_FLAGS -g -DDEBUG_HELLO -DDEBUG_CLOSE -DDEBUG_FLOW -DDEBUG_PAYLOAD -DDEBUG_CONTROL -DDEBUG_CONTROL_XMIT -DDEBUG_FLOW_MORE -DDEBUG_MAGIC -DDEBUG_ENTROPY -DDEBUG_HIDDEN -DDEBUG_PPPD -DDEBUG_AAA -DDEBUG_FILE -DDEBUG_FLOW -DDEBUG_HELLO -DDEBUG_CLOSE -DDEBUG_ZLB -DDEBUG_AUTH"
 %make_build
@@ -114,6 +117,11 @@ install -p -D -m755 -d %{buildroot}%{_rundir}/xl2tpd
 %ghost %attr(0600,root,root) %{_rundir}/xl2tpd/l2tp-control
 
 %changelog
+* Thu Sep 03 2020 Paul Wouters <pwouters@redhat.com> - 1.3.15-1
+- Resolves: rhbz#1761700 xl2tpd-1.3.15 is available
+- Resolves: rhbz#1875262 Unsupported options 'crtscts' and 'lock' in /etc/ppp/options.xl2tpd
+- Resolves: rhbz#1869420 xl2tpd.service:8: PIDFile= references a path below legacy directory /var/run/
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.14-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild