[xl2tpd/f16] * Thu Apr 05 2012 Paul Wouters <pwouters at redhat.com> - 1.3.1-4 - Fix parse error on lines > 80 chars

[Paul Wouters]

commit d7daa26a3b0de019f7c69cee9e96403cf1b88adf
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Apr 5 13:22:35 2012 -0400

    * Thu Apr 05 2012 Paul Wouters <pwouters at redhat.com> - 1.3.1-4
    - Fix parse error on lines > 80 chars, rhbz#806963
    
    Conflicts:
    
    	xl2tpd.spec

 xl2tpd-bz80693.patch |   22 ++++++++++++++++++++++
 xl2tpd.spec          |    6 +++++-
 2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/xl2tpd-bz80693.patch b/xl2tpd-bz80693.patch
new file mode 100644
index 0000000..e86f8da
--- /dev/null
+++ b/xl2tpd-bz80693.patch
@@ -0,0 +1,22 @@
+diff --git a/file.c b/file.c
+index 289aee6..d710e30 100644
+--- a/file.c
++++ b/file.c
+@@ -1229,7 +1229,7 @@ int parse_config (FILE * f)
+     /* Read in the configuration file handed to us */
+     /* FIXME: I should check for incompatible options */
+     int context = 0;
+-    char buf[STRLEN];
++    char buf[1024]; 
+     char *s, *d, *t;
+     int linenum = 0;
+     int def = 0;
+@@ -1395,7 +1395,7 @@ int parse_config (FILE * f)
+             }
+             if (!(t = strchr (s, '=')))
+             {
+-                l2tp_log (LOG_WARNING, "parse_config: line %d: no '=' in data\n",
++                l2tp_log (LOG_WARNING, "parse_config: line %d: line too long or no '=' in data\n",
+                      linenum);
+                 return -1;
+             }
diff --git a/xl2tpd.spec b/xl2tpd.spec
index 28ca025..09cc127 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: 3%{?dist}
+Release: 4%{?dist}
 License: GPL+
 Url: http://www.xelerance.com/software/xl2tpd/
 Group: System Environment/Daemons
@@ -9,6 +9,7 @@ Source0: http://www.xelerance.com/software/xl2tpd/xl2tpd-%{version}.tar.gz
 Source1: xl2tpd.service
 Source2: tmpfiles-xl2tpd.conf
 Patch1: xl2tpd-1.3.1-Wunused.patch
+Patch2: xl2tpd-bz80693.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: ppp 
 BuildRequires: libpcap-devel
@@ -46,6 +47,7 @@ It was de-facto maintained by Jacco de Leeuw <jacco2 at dds.nl> in 2002 and 2003.
 %prep
 %setup -q
 %patch1 -p1 
+%patch2 -p1
 
 %build
 #make 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"
@@ -111,6 +113,8 @@ fi
 %ghost %attr(0600,root,root) %{_localstatedir}/run/xl2tpd/l2tp-control
 
 %changelog
+* Thu Apr 05 2012 Paul Wouters <pwouters at redhat.com> - 1.3.1-4
+- Fix parse error on lines > 80 chars, rhbz#806963
 
 * Tue Feb 28 2012 Paul Wouters <pwouters at redhat.com> - 1.3.1-3
 - Converted to systemd