Commit 31b45a8c authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

xl2tp: bump to version 1.3.1 



Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 52679e66

package/xl2tp/xl2tp-1.2.7-makefile-flags.patch

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
Make sure that the CFLAGS passed on the command line are taken into

account.



--- xl2tp-1.2.7/Makefile-orig	2010-08-05 15:33:46.000000000 -0700

+++ xl2tp-1.2.7/Makefile	2010-09-30 22:34:54.000000000 -0700

@@ -90,7 +90,7 @@ OSFLAGS?= -DLINUX -I$(KERNELSRC)/include

 

 IPFLAGS?= -DIP_ALLOCATION

 

-CFLAGS+= $(DFLAGS) -O2 -fno-builtin -Wall -DSANITY $(OSFLAGS) $(IPFLAGS)

+COMPILE_FLAGS+= $(DFLAGS) -fno-builtin -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}

@@ -105,6 +105,9 @@ MANDIR?=$(DESTDIR)${PREFIX}/share/man

 

 all: $(EXEC) pfc

 

+%.o: %.c

+	$(CC) $(COMPILE_FLAGS) $(CFLAGS) -c -o $@ -shared $<

+

 clean:

 	rm -f $(OBJS) $(EXEC) pfc.o pfc

 

@@ -112,7 +115,7 @@ $(EXEC): $(OBJS) $(HDRS)

 	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS)

 

 pfc:

-	$(CC) $(CFLAGS) -c contrib/pfc.c

+	$(CC) $(COMPILE_FLAGS) $(CFLAGS) -c contrib/pfc.c

 	$(CC) $(LDFLAGS) -lpcap $(LDLIBS) -o pfc pfc.o

 

 romfs:

package/xl2tp/xl2tp.mk

+4 −17
Original line number Diff line number Diff line
@@ -3,31 +3,18 @@ 
# xl2tp

#

#############################################################

XL2TP_VERSION = 1.2.7

XL2TP_SOURCE = xl2tpd-$(XL2TP_VERSION).tar.gz

XL2TP_SITE = ftp://ftp.xelerance.com/xl2tpd/



XL2TP_VERSION = v1.3.1

XL2TP_SITE = http://github.com/xelerance/xl2tpd/tarball/$(XL2TP_VERSION)

XL2TP_DEPENDENCIES = libpcap



define XL2TP_BUILD_CMDS

	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)

	$(SED) 's/ -O2 //' $(@D)/Makefile

	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)

endef



define XL2TP_INSTALL_TARGET_CMDS

	$(MAKE) DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(@D) install

endef



define XL2TP_UNINSTALL_TARGET_CMDS

	rm -f $(TARGET_DIR)/usr/bin/pfc

	rm -f $(TARGET_DIR)/usr/sbin/xl2tpd

	rm -f $(TARGET_DIR)/usr/share/man/man1/pfc.1

	rm -f $(TARGET_DIR)/usr/share/man/man8/xl2tpd.8

	rm -f $(TARGET_DIR)/usr/share/man/man5/xl2tpd.conf.5

	rm -f $(TARGET_DIR)/usr/share/man/man5/l2tp-secrets.5

endef



define XL2TP_CLEAN_CMDS

	-$(MAKE) -C $(@D) clean

endef



$(eval $(generic-package))