From 31b45a8c72b365c09100a7cb99c82c8e63d1b479 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 23 Sep 2012 02:51:00 +0000 Subject: xl2tp: bump to version 1.3.1 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/xl2tp/xl2tp-1.2.7-legacy.patch | 17 ------------- package/xl2tp/xl2tp-1.2.7-makefile-flags.patch | 33 -------------------------- package/xl2tp/xl2tp-legacy.patch | 17 +++++++++++++ package/xl2tp/xl2tp.mk | 21 ++++------------ 4 files changed, 21 insertions(+), 67 deletions(-) delete mode 100644 package/xl2tp/xl2tp-1.2.7-legacy.patch delete mode 100644 package/xl2tp/xl2tp-1.2.7-makefile-flags.patch create mode 100644 package/xl2tp/xl2tp-legacy.patch diff --git a/package/xl2tp/xl2tp-1.2.7-legacy.patch b/package/xl2tp/xl2tp-1.2.7-legacy.patch deleted file mode 100644 index 5279fd707..000000000 --- a/package/xl2tp/xl2tp-1.2.7-legacy.patch +++ /dev/null @@ -1,17 +0,0 @@ -Replace SUSV3-specific functions index, bcopy, bzero and bcmp by their -POSIX variants. - ---- l2tpd-0.70-pre20031121.oorig/osport.h 2004-07-08 22:47:52.000000000 +0200 -+++ l2tpd-0.70-pre20031121/osport.h 2006-12-28 15:32:50.000000000 +0100 -@@ -37,4 +37,11 @@ - - #endif /* defined(SOLARIS) */ - -+#if defined __UCLIBC__ && !defined UCLIBC_SUSV3_LEGACY_MACROS -+# define index(x, y) strchr(x, y) -+# define bcopy(S1, S2, LEN) ((void)memmove(S2, S1, LEN)) -+# define bzero(S1, LEN) ((void)memset(S1, 0, LEN)) -+# define bcmp(S1,S2,LEN) ((memcmp(S2, S1, LEN)==0)?0:1) -+#endif /* defined __UCLIBC__ && !defined UCLIBC_SUSV3_LEGACY_MACROS */ -+ - #endif /* _OSPORT_H_ */ diff --git a/package/xl2tp/xl2tp-1.2.7-makefile-flags.patch b/package/xl2tp/xl2tp-1.2.7-makefile-flags.patch deleted file mode 100644 index 68a56a60b..000000000 --- a/package/xl2tp/xl2tp-1.2.7-makefile-flags.patch +++ /dev/null @@ -1,33 +0,0 @@ -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: diff --git a/package/xl2tp/xl2tp-legacy.patch b/package/xl2tp/xl2tp-legacy.patch new file mode 100644 index 000000000..5279fd707 --- /dev/null +++ b/package/xl2tp/xl2tp-legacy.patch @@ -0,0 +1,17 @@ +Replace SUSV3-specific functions index, bcopy, bzero and bcmp by their +POSIX variants. + +--- l2tpd-0.70-pre20031121.oorig/osport.h 2004-07-08 22:47:52.000000000 +0200 ++++ l2tpd-0.70-pre20031121/osport.h 2006-12-28 15:32:50.000000000 +0100 +@@ -37,4 +37,11 @@ + + #endif /* defined(SOLARIS) */ + ++#if defined __UCLIBC__ && !defined UCLIBC_SUSV3_LEGACY_MACROS ++# define index(x, y) strchr(x, y) ++# define bcopy(S1, S2, LEN) ((void)memmove(S2, S1, LEN)) ++# define bzero(S1, LEN) ((void)memset(S1, 0, LEN)) ++# define bcmp(S1,S2,LEN) ((memcmp(S2, S1, LEN)==0)?0:1) ++#endif /* defined __UCLIBC__ && !defined UCLIBC_SUSV3_LEGACY_MACROS */ ++ + #endif /* _OSPORT_H_ */ diff --git a/package/xl2tp/xl2tp.mk b/package/xl2tp/xl2tp.mk index 768e6ec9a..cf0576de6 100644 --- a/package/xl2tp/xl2tp.mk +++ b/package/xl2tp/xl2tp.mk @@ -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)) -- cgit v1.2.3