diff --git a/.gitignore b/.gitignore index 9193a59..8d592f9 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,10 @@ xl2tpd-1.2.7.tar.gz xl2tpd-1.2.8.tar.gz xl2tpd-1.3.0.tar.gz xl2tpd-1.3.1.tar.gz -/xl2tpd-5619e1771048e74b729804e8602f409af0f3faea.tar.gz +xl2tpd-5619e1771048e74b729804e8602f409af0f3faea.tar.gz +/xl2tpd-1.3.6.tar.gz +/xl2tpd-1.3.8.tar.gz +/xl2tpd-1.3.14.tar.gz /xl2tpd-1.3.8.tar.gz /xl2tpd-1.3.14.tar.gz /xl2tpd-1.3.15.tar.gz diff --git a/xl2tpd.service b/xl2tpd.service index 145dc0e..534cdc2 100644 --- a/xl2tpd.service +++ b/xl2tpd.service @@ -1,6 +1,7 @@ [Unit] Description=Level 2 Tunnel Protocol Daemon (L2TP) -After=network.target +Wants=network-online.target +After=network-online.target After=ipsec.service # Some ISPs in Russia use l2tp without IPsec, so don't insist anymore #Wants=ipsec.service @@ -10,7 +11,7 @@ Type=simple PIDFile=/run/xl2tpd/xl2tpd.pid ExecStartPre=/sbin/modprobe -q l2tp_ppp ExecStart=/usr/sbin/xl2tpd -D -Restart=on-abort +Restart=always [Install] WantedBy=multi-user.target diff --git a/xl2tpd.spec b/xl2tpd.spec index 8e08c23..5e5e121 100644 --- a/xl2tpd.spec +++ b/xl2tpd.spec @@ -1,5 +1,3 @@ -%global commit 5619e1771048e74b729804e8602f409af0f3faea - Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661) Name: xl2tpd Version: 1.3.15 @@ -14,7 +12,7 @@ Patch1: xl2tpd-1.3.14-conf.patch Patch2: xl2tpd-1.3.14-md5-fips.patch Patch3: xl2tpd-1.3.14-kernelmode.patch -Requires: ppp >= 2.4.5-18, kmod(l2tp_ppp.ko) +Requires: ppp >= 2.4.5-18 # If you want to authenticate against a Microsoft PDC/Active Directory # Requires: samba-winbind BuildRequires: gcc @@ -24,8 +22,6 @@ BuildRequires: openssl-devel Requires(post): systemd Requires(preun): systemd Requires(postun): systemd -# dnf resolving prefers kernel-debug-modules-extra over kernel-modules-extra -Suggests: kernel-modules-extra %description xl2tpd is an implementation of the Layer 2 Tunnelling Protocol (RFC 2661). @@ -35,7 +31,7 @@ servers. Another important application is Virtual Private Networks where the IPsec protocol is used to secure the L2TP connection (L2TP/IPsec, RFC 3193). The L2TP/IPsec protocol is mainly used by Windows and Mac OS X clients. On Linux, xl2tpd can be used in combination with IPsec -implementations such as Openswan. +implementations such as Libreswan. Example configuration files for such a setup are included in this RPM. xl2tpd works by opening a pseudo-tty for communicating with pppd. @@ -122,61 +118,28 @@ install -p -D -m755 -d %{buildroot}%{_rundir}/xl2tpd - 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 - 1.3.14-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 1.3.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - * Wed Sep 25 2019 Paul Wouters - 1.3.14-1 - Resolves: rhbz#1322190 Updated to 1.3.14 - Resolves: rhbz#1722121 Use proper /run directory - Resolves: rhbz#1399648 Review Request: xl2tpd -* Sat Jul 27 2019 Fedora Release Engineering - 1.3.8-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.3.8-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 1.3.8-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sun Apr 01 2018 Paul Wouters - 1.3.8-7 +* Sun Apr 01 2018 Paul Wouters - 1.3.8-3 - Resolves: rhbz#1562512 kernels 4.15 and 4.16 break xl2tpd -* Fri Feb 09 2018 Fedora Release Engineering - 1.3.8-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1.3.8-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.3.8-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.3.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sun Jan 15 2017 Paul Wouters - 1.3.8-2 -- Very reluctantly add a Suggests: tag to work around dnf/kernel bug -- Resolves: rhbz#1192189 Both kernel-debug-core and kernel-core are installed +* Wed Dec 21 2016 Paul Wouters - 1.3.8-2 +- Do not use kmod for EPEL/RHEL * Wed Aug 24 2016 Paul Wouters - 1.3.8-1 - Upgraded to 1.3.8 and updated existing patches still required - Fix kernel mode breaking the closing tunnels -* Fri Feb 05 2016 Fedora Release Engineering - 1.3.6-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 1.3.6-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - * Tue Mar 31 2015 Paul Wouters - 1.3.6-8 -- Bump EVR - -* Tue Mar 31 2015 Paul Wouters - 1.3.6-7 - Rebuild with -DTRUST_PPPD_TO_DIE so pppd will execute its down script +* Fri Oct 31 2014 Paul Wouters - 1.3.6-7 +- Remove kmod require, not recognised and l2tp_ppp.ko is in core kernel package now +- Update service file to use Restart=always and require network-online.target + * Thu Aug 21 2014 Kevin Fenzi - 1.3.6-6 - Rebuild for rpm bug 1131960 @@ -341,7 +304,7 @@ install -p -D -m755 -d %{buildroot}%{_rundir}/xl2tpd - Upgraded to 1.1.07 - Added /var/run/xl2tpd to the spec file so this pacakge owns /var/run/xl2tpd - + * Thu Dec 7 2006 Paul Wouters 1.1.06-5 - Changed space/tab replacing method @@ -383,10 +346,10 @@ install -p -D -m755 -d %{buildroot}%{_rundir}/xl2tpd * Sat Jun 4 2005 Jacco de Leeuw - l2tpd.org has been hijacked. Project moved back to SourceForge: - http://l2tpd.sourceforge.net + http://l2tpd.sourceforge.net * Tue May 3 2005 Jacco de Leeuw -- Small Makefile fixes. Explicitly use gcc instead of cc. +- Small Makefile fixes. Explicitly use gcc instead of cc. Network services library was not linked on Solaris due to typo. * Thu Mar 17 2005 Jacco de Leeuw 0.69-11jdl @@ -395,7 +358,7 @@ install -p -D -m755 -d %{buildroot}%{_rundir}/xl2tpd * Fri Feb 4 2005 Jacco de Leeuw - Added code from Roaring Penguin (rp-l2tp) to support SysV-style ptys. - Requires the N_HDLC kernel module. + Requires the N_HDLC kernel module. * Fri Nov 26 2004 Jacco de Leeuw - Updated the README. @@ -451,7 +414,7 @@ install -p -D -m755 -d %{buildroot}%{_rundir}/xl2tpd - Renamed the example Openswan .conf files to better reflect the situation. There are two variants using different portselectors. Previously I thought Windows 2000/XP used portselector 17/0 - and the rest used 17/1701. But with the release of an updated + and the rest used 17/1701. But with the release of an updated IPsec client by Microsoft, it turns out that 17/0 must have been a mistake: the updated client now also uses 17/1701. @@ -465,7 +428,7 @@ install -p -D -m755 -d %{buildroot}%{_rundir}/xl2tpd * Thu Mar 6 2003 Jacco de Leeuw 0.69-5jdl - Replaced Dominique's patch by Damion de Soto's, which does not - depend on the N_HDLC kernel module. + depend on the N_HDLC kernel module. * Wed Feb 26 2003 Jacco de Leeuw 0.69-4jdl - Seperate example config files for Win9x (MSL2TP) and Win2K/XP @@ -499,7 +462,7 @@ install -p -D -m755 -d %{buildroot}%{_rundir}/xl2tpd - Specfile adapted from Mandrake Cooker. The original RPM can be retrieved through: http://www.rpmfind.net/linux/rpm2html/search.php?query=l2tpd -- Config path changed from /etc/l2tp/ to /etc/l2tpd/ +- Config path changed from /etc/l2tp/ to /etc/l2tpd/ (Seems more logical and rp-l2tp already uses /etc/l2tp/). - Do not run at boot or install. The original RPM uses a config file which is completely commented out, but it still starts l2tpd on all