- updated to 1.3.11

- updated build_flags,control_crash patches

diff --git a/xl2tpd-build_flags.patch b/xl2tpd-build_flags.patch
index 5eeb7fa1cd949ace4ee7d64eedf409fd4508d096..686d30f9d004ff6576c2fc8448f3cc527eb081c2 100644 (file)
--- a/xl2tpd-build_flags.patch
+++ b/xl2tpd-build_flags.patch
@@ -1,21 +1,11 @@
-diff -dur xl2tpd-1.3.0.orig/Makefile xl2tpd-1.3.0/Makefile
---- xl2tpd-1.3.0.orig/Makefile 2011-07-24 02:13:59.000000000 +0200
-+++ xl2tpd-1.3.0/Makefile      2011-11-10 20:27:32.000000000 +0100
-@@ -90,7 +90,7 @@
+--- xl2tpd-1.3.11/Makefile.orig        2018-04-13 22:48:29.861171012 +0200
++++ xl2tpd-1.3.11/Makefile     2018-04-13 22:49:54.947836737 +0200
+@@ -97,7 +97,7 @@
  
  IPFLAGS?= -DIP_ALLOCATION
  
--CFLAGS+= $(DFLAGS) -O2 -fno-builtin -Wall -DSANITY $(OSFLAGS) $(IPFLAGS)
-+CFLAGS+= $(DFLAGS) $(RPMCFLAGS) -fno-builtin -Wall -DSANITY $(OSFLAGS) $(IPFLAGS)
+-CFLAGS+= $(DFLAGS) -Os -Wall -DSANITY $(OSFLAGS) $(IPFLAGS)
++CFLAGS+= $(DFLAGS) $(OPTFLAGS) -Wall -DSANITY $(OSFLAGS) $(IPFLAGS)
  HDRS=l2tp.h avp.h misc.h control.h call.h scheduler.h file.h aaa.h md5.h
  OBJS=xl2tpd.o pty.o misc.o control.o avp.o call.o network.o avpsend.o scheduler.o file.o aaa.o md5.o
  SRCS=${OBJS:.o=.c} ${HDRS}
-@@ -114,7 +114,7 @@
-       $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS)
- 
- $(CONTROL_EXEC): $(CONTROL_SRCS)
--      $(CC) $(CONTROL_SRCS) -o $@
-+      $(CC) $(RPMCFLAGS) $(LDFLAGS) $(CONTROL_SRCS) -o $@
- 
- pfc:
-       $(CC) $(CFLAGS) -c contrib/pfc.c

diff --git a/xl2tpd-control_crash.patch b/xl2tpd-control_crash.patch
index 7042c8218b838b9e71eba0546d0ea2c73b6906cd..1fb4480d383bd45994e893a45c3a56702b3cb01d 100644 (file)
--- a/xl2tpd-control_crash.patch
+++ b/xl2tpd-control_crash.patch
@@ -1,12 +1,11 @@
-diff -dur xl2tpd-1.3.0.orig/xl2tpd-control.c xl2tpd-1.3.0/xl2tpd-control.c
---- xl2tpd-1.3.0.orig/xl2tpd-control.c 2011-07-24 02:13:59.000000000 +0200
-+++ xl2tpd-1.3.0/xl2tpd-control.c      2011-11-10 20:30:35.000000000 +0100
-@@ -96,7 +96,7 @@
+--- xl2tpd-1.3.11/xl2tpd-control.c.orig        2018-04-13 22:50:18.501169772 +0200
++++ xl2tpd-1.3.11/xl2tpd-control.c     2018-04-13 22:51:25.761169005 +0200
+@@ -162,7 +162,7 @@
      struct command_t* command = NULL;    
      int i; /* argv iterator */
  
--    if (!strncmp (argv[1], "--help", 6))
-+    if (argc < 2 || !strncmp (argv[1], "--help", 6))
+-    if (argv[1] && !strncmp (argv[1], "--help", 6))
++    if ((argc < 2) || (argv[1] && !strncmp (argv[1], "--help", 6)))
      {
          help();
          return 0;

diff --git a/xl2tpd.spec b/xl2tpd.spec
index d08269defefe46104130d2582fc0918dabb800ab..b4dbcade038279273ffaa21f0e08e8f985cbb3f1 100644 (file)
--- a/xl2tpd.spec
+++ b/xl2tpd.spec
@@ -1,21 +1,21 @@
 Summary:       Layer 2 Tunnelling Protocol Daemon (RFC 2661)
 Summary(pl.UTF-8):     Demon protokołu tunelowania warstwy 2 (L2TP, RFC 2661)
 Name:          xl2tpd
-Version:       1.3.0
-Release:       2
+Version:       1.3.11
+Release:       1
 License:       GPL v2
 Group:         Networking/Daemons
-#Source0Download: http://www.xelerance.com/services/software/xl2tpd/
-Source0:       http://www.xelerance.com/wp-content/uploads/software/xl2tpd/%{name}-%{version}.tar.gz
-# Source0-md5: 28264284552c442b24cf421755a2bb48
+#Source0Download: https://github.com/xelerance/xl2tpd/releases
+Source0:       https://github.com/xelerance/xl2tpd/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 46a881855ce928e86cda5ed1c8909c93
 Source1:       %{name}.sysconfig
 Source2:       %{name}.init
 Source3:       %{name}.tmpfiles
 Patch0:                %{name}-build_flags.patch
 Patch1:                %{name}-control_crash.patch
 URL:           http://www.xelerance.com/software/xl2tpd/
-BuildRequires: rpmbuild(macros) >= 1.228
-BuildRequires:  libpcap-devel
+BuildRequires: libpcap-devel
+BuildRequires: rpmbuild(macros) >= 1.644
 Requires(post,preun):  /sbin/chkconfig
 Requires:      rc-scripts
 Requires:      ppp
@@ -51,7 +51,7 @@ implementacjami IPsec, takimi jak Openswan.
 %build
 %{__make} \
        CC="%{__cc}" \
-       RPMCFLAGS="%{rpmcflags}" \
+       OPTFLAGS="%{rpmcflags}" \
        LDFLAGS="%{rpmldflags}" \
        PREFIX=%{_prefix}
 
@@ -71,7 +71,7 @@ install doc/l2tpd.conf.sample $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/xl2tpd.conf
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-install %{SOURCE3} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+install %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -97,10 +97,11 @@ fi
 %{_mandir}/man5/l2tp-secrets.5*
 %{_mandir}/man5/xl2tpd.conf.5*
 %{_mandir}/man8/xl2tpd.8*
+%{_mandir}/man8/xl2tpd-control.8*
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/l2tp-secrets
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
-/usr/lib/tmpfiles.d/%{name}.conf
+%{systemdtmpfilesdir}/%{name}.conf
 %dir /var/run/%{name}