d22396fdab
Most of our patches merged upstream, and while here remove a -Os from CFLAGS (spotted by jca@). With this update, i've (finally!) been able to connect to an OpenBSD VPN running isakmpd with psk/npppd. ok sthen@ (MAINTAINER)
44 lines
1.4 KiB
Plaintext
44 lines
1.4 KiB
Plaintext
$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
|
|
# but we use a local copy if we don't find it.
|
|
#
|
|
#KERNELSRC=/lib/modules/`uname -r`/build/
|
|
-KERNELSRC?=./linux
|
|
-OSFLAGS?= -DLINUX -I$(KERNELSRC)/include/
|
|
+#KERNELSRC?=./linux
|
|
+#OSFLAGS?= -DLINUX -I$(KERNELSRC)/include/
|
|
#
|
|
# 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/
|
|
# are packages seperately (eg kernel-headers on Fedora)
|
|
# Note: 2.6.23+ support still needs some changes in the xl2tpd source
|
|
#
|
|
-OSFLAGS+= -DUSE_KERNEL
|
|
+#OSFLAGS+= -DUSE_KERNEL
|
|
#
|
|
#
|
|
# Uncomment the next line for FreeBSD
|
|
@@ -87,8 +87,8 @@ OSFLAGS+= -DUSE_KERNEL
|
|
|
|
# Uncomment the next two lines for OpenBSD
|
|
#
|
|
-#OSFLAGS?= -DOPENBSD
|
|
-#LDLIBS?= -lutil
|
|
+OSFLAGS?= -DOPENBSD
|
|
+LDLIBS?= -lutil
|
|
|
|
# Feature flags
|
|
#
|
|
@@ -97,7 +97,7 @@ OSFLAGS+= -DUSE_KERNEL
|
|
|
|
IPFLAGS?= -DIP_ALLOCATION
|
|
|
|
-CFLAGS+= $(DFLAGS) -Os -Wall -DSANITY $(OSFLAGS) $(IPFLAGS)
|
|
+CFLAGS+= $(DFLAGS) -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}
|