cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to xl2tpd-1.3.14

Browse Source
This commit is contained in:
sthen 2019-04-18 17:30:45 +00:00
parent 9ce80e2082
commit 97983be85a
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/xl2tpd/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.18 2018/09/09 13:19:15 sthen Exp $
# $OpenBSD: Makefile,v 1.19 2019/04/18 17:30:45 sthen Exp $
COMMENT= l2tp client/server
GH_ACCOUNT= xelerance
GH_PROJECT= xl2tpd
GH_TAGNAME= v1.3.12
GH_TAGNAME= v1.3.14
CATEGORIES= net

4
net/xl2tpd/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (xl2tpd-1.3.12.tar.gz) = bwrFCnZQDVzFamdFG2Hl9WGzMJNXF2s53quxcF6HRf0=
SIZE (xl2tpd-1.3.12.tar.gz) = 513173
SHA256 (xl2tpd-1.3.14.tar.gz) = /1oIBv7MWMe5y8YlEXpFIcBUZSKl9ZUf+27r2rmYYQ8=
SIZE (xl2tpd-1.3.14.tar.gz) = 523992

19
net/xl2tpd/patches/patch-Makefile
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-Makefile,v 1.3 2016/11/14 09:35:38 landry Exp $
--- Makefile.orig Fri Aug 12 02:56:53 2016
+++ Makefile Thu Nov 10 16:39:51 2016
@@ -53,8 +53,8 @@ DFLAGS?= -DDEBUG_PPPD -DTRUST_PPPD_TO_DIE
$OpenBSD: patch-Makefile,v 1.4 2019/04/18 17:30:45 sthen Exp $
Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -56,8 +56,8 @@ DFLAGS?= -DDEBUG_PPPD -DTRUST_PPPD_TO_DIE
# but we use a local copy if we don't find it.
#
#KERNELSRC=/lib/modules/`uname -r`/build/
@ -12,7 +13,7 @@ $OpenBSD: patch-Makefile,v 1.3 2016/11/14 09:35:38 landry Exp $
#
# Uncomment the following to use the kernel interface under Linux
# This requires the pppol2tp-linux-2.4.27.patch patch from contrib
@@ -62,7 +62,7 @@ OSFLAGS?= -DLINUX -I$(KERNELSRC)/include/
@@ -65,7 +65,7 @@ OSFLAGS?= -DLINUX -I$(KERNELSRC)/include/
# are packages seperately (eg kernel-headers on Fedora)
# Note: 2.6.23+ support still needs some changes in the xl2tpd source
#
@ -21,7 +22,7 @@ $OpenBSD: patch-Makefile,v 1.3 2016/11/14 09:35:38 landry Exp $
#
#
# Uncomment the next line for FreeBSD
@@ -87,8 +87,8 @@ OSFLAGS+= -DUSE_KERNEL
@@ -90,8 +90,8 @@ OSFLAGS+= -DUSE_KERNEL
# Uncomment the next two lines for OpenBSD
#
@ -32,12 +33,12 @@ $OpenBSD: patch-Makefile,v 1.3 2016/11/14 09:35:38 landry Exp $
# Feature flags
#
@@ -97,7 +97,7 @@ OSFLAGS+= -DUSE_KERNEL
@@ -100,7 +100,7 @@ OSFLAGS+= -DUSE_KERNEL
IPFLAGS?= -DIP_ALLOCATION
-CFLAGS+= $(DFLAGS) -Os -Wall -DSANITY $(OSFLAGS) $(IPFLAGS)
+CFLAGS+= $(DFLAGS) -Wall -DSANITY $(OSFLAGS) $(IPFLAGS)
-CFLAGS+= $(DFLAGS) -Os -Wall -Wextra -DSANITY $(OSFLAGS) $(IPFLAGS)
+CFLAGS+= $(DFLAGS) -Wall -Wextra -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}

4
net/xl2tpd/patches/patch-control_c
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-control_c,v 1.1 2017/11/23 16:41:06 landry Exp $
$OpenBSD: patch-control_c,v 1.2 2019/04/18 17:30:45 sthen Exp $
Disable flow control as it's broken - https://github.com/xelerance/xl2tpd/issues/133
Index: control.c
--- control.c.orig
+++ control.c
@@ -1503,7 +1503,7 @@ static inline int expand_payload (struct buffer *buf,
@@ -1506,7 +1506,7 @@ static inline int expand_payload (struct buffer *buf,
l2tp_log (LOG_DEBUG, "%s: payload, cid = %d, Ns = %d, Nr = %d\n", __FUNCTION__,
c->cid, new_hdr->Ns, new_hdr->Nr);
#endif