[xl2tpd] * rhbz#929447 - Fix ipparam so ipv6-up does not fail (Michal Bruncko)

[Paul Wouters]

commit f526fca0ad5c199024fc048f1f41970c8890802b
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Apr 1 13:28:34 2013 -0400

    * 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(-)
---
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 <jeffm at iglou.com>
 It was de-facto maintained by Jacco de Leeuw <jacco2 at dds.nl> 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 <pwouters at redhat.com> - 1.3.1-12
+- rhbz#929447 - Fix ipparam so ipv6-up does not fail (Michal Bruncko)
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild