From e64160bdaaf8d9e6033e072b666c475f5cd5aa8b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 21:46:36 -0600 Subject: [PATCH 1/3] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- xl2tpd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xl2tpd.spec b/xl2tpd.spec index 133f4ed..138eb16 100644 --- a/xl2tpd.spec +++ b/xl2tpd.spec @@ -1,7 +1,7 @@ Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661) Name: xl2tpd Version: 1.3.1 -Release: 10%{?dist} +Release: 11%{?dist} License: GPL+ Url: http://www.xelerance.com/software/xl2tpd/ Group: System Environment/Daemons @@ -122,6 +122,9 @@ fi %ghost %attr(0600,root,root) %{_localstatedir}/run/xl2tpd/l2tp-control %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 1.3.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Jul 19 2012 Paul Wouters - 1.3.1-10 - Updated comments in config files on how to authenticate against a Windows PDC / Active Directory From f526fca0ad5c199024fc048f1f41970c8890802b Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Mon, 1 Apr 2013 13:28:34 -0400 Subject: [PATCH 2/3] * rhbz#929447 - Fix ipparam so ipv6-up does not fail (Michal Bruncko) --- xl2tpd-1.3.1-ipparam-to-remotenumber.patch | 29 ++++++++++++++++++++++ xl2tpd.spec | 18 ++++++++++++-- 2 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 xl2tpd-1.3.1-ipparam-to-remotenumber.patch diff --git a/xl2tpd-1.3.1-ipparam-to-remotenumber.patch b/xl2tpd-1.3.1-ipparam-to-remotenumber.patch new file mode 100644 index 0000000..02bf50a --- /dev/null +++ b/xl2tpd-1.3.1-ipparam-to-remotenumber.patch @@ -0,0 +1,29 @@ +--- xl2tpd-1.3.1-orig/control.c 2011-10-06 21:22:05.000000000 +0200 ++++ xl2tpd-1.3.1/control.c 2013-03-30 21:45:04.641605756 +0100 +@@ -898,7 +898,7 @@ + po = add_opt (po, c->lac->pppoptfile); + } + }; +- po = add_opt (po, "ipparam"); ++ po = add_opt (po, "remotenumber"); + po = add_opt (po, IPADDY (t->peer.sin_addr)); + start_pppd (c, po); + opt_destroy (po); +@@ -974,7 +974,7 @@ + po = add_opt (po, "file"); + po = add_opt (po, c->lns->pppoptfile); + } +- po = add_opt (po, "ipparam"); ++ po = add_opt (po, "remotenumber"); + po = add_opt (po, IPADDY (t->peer.sin_addr)); + start_pppd (c, po); + opt_destroy (po); +@@ -1034,7 +1034,7 @@ + po = add_opt (po, c->lac->pppoptfile); + } + }; +- po = add_opt (po, "ipparam"); ++ po = add_opt (po, "remotenumber"); + po = add_opt (po, IPADDY (t->peer.sin_addr)); + start_pppd (c, po); + diff --git a/xl2tpd.spec b/xl2tpd.spec index 138eb16..853ebbd 100644 --- a/xl2tpd.spec +++ b/xl2tpd.spec @@ -1,11 +1,17 @@ +# upstream is switching to github, but has not released a new tar ball there yet +%global commit 3be48f8b7fc0e8de8cef7675a9861484b8b68c52 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661) Name: xl2tpd Version: 1.3.1 -Release: 11%{?dist} +Release: 12%{?dist} License: GPL+ -Url: http://www.xelerance.com/software/xl2tpd/ +Url: https://github.com/xelerance/xl2tpd Group: System Environment/Daemons Source0: http://www.xelerance.com/software/xl2tpd/xl2tpd-%{version}.tar.gz +#Source0: https://github.com/xelerance/%{name}/archive/v%{version}.tar.gz +#Source0: https://github.com/xelerance/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz Source1: xl2tpd.service Source2: tmpfiles-xl2tpd.conf Patch1: xl2tpd-1.3.1-Wunused.patch @@ -13,6 +19,7 @@ Patch2: xl2tpd-bz80693.patch Patch3: xl2tpd-1.3.1-kernelmode.patch Patch4: xl2tpd-1.3.1-conf.patch Patch5: xl2tpd-1.3.1-pty.patch +Patch6: xl2tpd-1.3.1-ipparam-to-remotenumber.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ppp >= 2.4.5-18, kernel-modules-extra # If you want to authenticate against a Microsoft PDC/Active Directory @@ -50,12 +57,16 @@ Xl2tpd is based on the 0.69 L2TP by Jeff McAdams It was de-facto maintained by Jacco de Leeuw in 2002 and 2003. %prep +# for git version +#% setup -qn %{name}-%{commit} %setup -q %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 + rm linux/include/linux/if_pppol2tp.h %build @@ -122,6 +133,9 @@ fi %ghost %attr(0600,root,root) %{_localstatedir}/run/xl2tpd/l2tp-control %changelog +* Mon Apr 01 2013 Paul Wouters - 1.3.1-12 +- rhbz#929447 - Fix ipparam so ipv6-up does not fail (Michal Bruncko) + * Fri Feb 15 2013 Fedora Release Engineering - 1.3.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From d374fe85ac46298faf76ff2f3c6369b5f45f5e33 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Mon, 1 Apr 2013 13:49:58 -0400 Subject: [PATCH 3/3] * Introduce new systemd-rpm macros in xl2tpd spec file --- xl2tpd.spec | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/xl2tpd.spec b/xl2tpd.spec index 853ebbd..200154b 100644 --- a/xl2tpd.spec +++ b/xl2tpd.spec @@ -20,16 +20,14 @@ Patch3: xl2tpd-1.3.1-kernelmode.patch Patch4: xl2tpd-1.3.1-conf.patch Patch5: xl2tpd-1.3.1-pty.patch Patch6: xl2tpd-1.3.1-ipparam-to-remotenumber.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ppp >= 2.4.5-18, kernel-modules-extra # If you want to authenticate against a Microsoft PDC/Active Directory # Requires: samba-winbind BuildRequires: libpcap-devel BuildRequires: systemd-units -Requires(post): systemd-sysv -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd %description xl2tpd is an implementation of the Layer 2 Tunnelling Protocol (RFC 2661). @@ -88,24 +86,13 @@ install -p -D -m600 doc/l2tp-secrets.sample %{buildroot}%{_sysconfdir}/xl2tpd/l2 install -p -D -m600 examples/chapsecrets.sample %{buildroot}%{_sysconfdir}/ppp/chap-secrets.sample install -p -D -m755 -d %{buildroot}%{_localstatedir}/run/xl2tpd - -%clean -rm -rf %{buildroot} - - %preun -if [ $1 -eq 0 ]; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable xl2tpd.service > /dev/null 2>&1 || : - /bin/systemctl stop xl2tpd.service > /dev/null 2>&1 || : -fi +%systemd_preun xl2tpd.service +%post +%systemd_post xl2tpd.service %postun -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart xl2tpd.service >/dev/null 2>&1 || : -fi +%systemd_postun_with_restart xl2tpd.service %triggerun -- xl2td < 1.3.1-3 # Save the current service runlevel info @@ -117,7 +104,6 @@ fi /bin/systemctl try-restart xl2tpd.service >/dev/null 2>&1 || : %files -%defattr(-,root,root) %doc BUGS CHANGES CREDITS LICENSE README.* TODO doc/rfc2661.txt %doc doc/README.patents examples/chapsecrets.sample %{_sbindir}/xl2tpd @@ -135,6 +121,7 @@ fi %changelog * Mon Apr 01 2013 Paul Wouters - 1.3.1-12 - rhbz#929447 - Fix ipparam so ipv6-up does not fail (Michal Bruncko) +- rhbz#850372 - Introduce new systemd-rpm macros in xl2tpd spec file * Fri Feb 15 2013 Fedora Release Engineering - 1.3.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild