* Thu Apr 05 2012 Paul Wouters <pwouters@redhat.com> - 1.3.1-4

- Fix parse error on lines > 80 chars, rhbz#806963
epel9
Paul Wouters 13 years ago
parent 21a192bf3f
commit bd5a80d261

@ -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;
}

@ -1,7 +1,7 @@
Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661)
Name: xl2tpd
Version: 1.3.1
Release: 3%{?dist}
Release: 4%{?dist}
# No version specified.
License: GPL+
Url: http://www.xelerance.com/software/xl2tpd/
@ -10,6 +10,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
@ -47,6 +48,7 @@ It was de-facto maintained by Jacco de Leeuw <jacco2@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"
@ -112,6 +114,9 @@ fi
%ghost %attr(0600,root,root) %{_localstatedir}/run/xl2tpd/l2tp-control
%changelog
* Thu Apr 05 2012 Paul Wouters <pwouters@redhat.com> - 1.3.1-4
- Fix parse error on lines > 80 chars, rhbz#806963
* Tue Feb 28 2012 Paul Wouters <pwouters@redhat.com> - 1.3.1-3
- Converted to systemd
- Added -Wunused patch to fix two minor warnings

Loading…
Cancel
Save