From: Nicolas Thill Date: Fri, 7 Sep 2007 19:27:03 +0000 (+0000) Subject: update xl2tpd to 1.1.11, fix opt flags, rename ppp related config files, cleanup X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=ce3636900beade8de3d59e7fcbd094147b2b559f update xl2tpd to 1.1.11, fix opt flags, rename ppp related config files, cleanup SVN-Revision: 8676 --- diff --git a/net/xl2tpd/Makefile b/net/xl2tpd/Makefile index 007dc02e7f..8ed30a7c41 100644 --- a/net/xl2tpd/Makefile +++ b/net/xl2tpd/Makefile @@ -9,15 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xl2tpd -PKG_VERSION:=1.1.09 -PKG_RELEASE:=1.0 +PKG_VERSION:=1.1.11 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.xelerance.com/software/xl2tpd -PKG_CAT:=zcat - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install +PKG_MD5SUM:=ab5656eb5a3d1973f7f69b039675332e include $(INCLUDE_DIR)/package.mk @@ -25,36 +22,36 @@ define Package/xl2tpd SECTION:=net CATEGORY:=Network TITLE:=An L2TP (Layer 2 Tunneling Protocol) daemon - DESCRIPTION:=\ - l2tpd is the open source implementation of the L2TP tunneling \\\ - protocol (RFC2661). It does implement both LAC and LNS role \\\ - in a L2TP networking architecture. The main goal of this protocol is \\\ - to tunnel PPP frame trough an ip network. URL:=http://www.xelerance.com/software/xl2tpd endef -define Package/xl2tpd/conffiles -/etc/xl2tpd/xl2tpd.conf +define Package/xl2tpd/description + l2tpd is the open source implementation of the L2TP tunneling protocol + (RFC2661). It does implement both LAC and LNS role in a L2TP networking + architecture. The main goal of this protocol is to tunnel PPP frame trough + an ip network. endef -define Build/Compile - $(call Build/Compile/Default, \ - CFLAGS="$(TARGET_CFLAGS) -I. -DLINUX -DSANITY -DIP_ALLOCATION" \ - ) +# XXX: CFLAGS are already set by Build/Compile/Default +MAKE_FLAGS+= \ + OFLAGS="" + +define Package/xl2tpd/conffiles +/etc/xl2tpd/ppp.options +/etc/xl2tpd/ppp.secrets +/etc/xl2tpd/xl2tpd.conf endef define Package/xl2tpd/install $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ - $(INSTALL_DIR) $(1)/etc/xl2tpd - $(INSTALL_DATA) ./files/xl2tpd.conf $(1)/etc/xl2tpd/ - $(INSTALL_DATA) ./files/l2tp-secrets $(1)/etc/xl2tpd/ - $(INSTALL_DATA) ./files/options.l2tp $(1)/etc/xl2tpd/ -# $(INSTALL_DIR) $(1)/etc/ppp -# $(INSTALL_DATA) ./files/options.l2tpd $(1)/etc/ppp/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/xl2tpd $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/xl2tpd.init $(1)/etc/init.d/xl2tpd + $(INSTALL_DIR) $(1)/etc/xl2tpd + $(INSTALL_DATA) ./files/ppp.options $(1)/etc/xl2tpd/ + $(INSTALL_DATA) ./files/ppp.secrets $(1)/etc/xl2tpd/ + $(INSTALL_DATA) ./files/xl2tpd.conf $(1)/etc/xl2tpd/ + chmod 0600 $(1)/etc/xl2tpd/ppp.secrets endef $(eval $(call BuildPackage,xl2tpd)) - diff --git a/net/xl2tpd/files/l2tp-secrets b/net/xl2tpd/files/l2tp-secrets deleted file mode 100644 index 26ec689de6..0000000000 --- a/net/xl2tpd/files/l2tp-secrets +++ /dev/null @@ -1,4 +0,0 @@ -uthenticating l2tp tunnels -# us them secret -mia zidler abcd1234 - diff --git a/net/xl2tpd/files/options.l2tp b/net/xl2tpd/files/options.l2tp deleted file mode 100644 index 5eaf4b055e..0000000000 --- a/net/xl2tpd/files/options.l2tp +++ /dev/null @@ -1,15 +0,0 @@ -# - -lock -noauth -debug -dump -logfd 2 -logfile /var/log/l2tpd.log -noccp -novj -novjccomp -nopcomp -noaccomp - - diff --git a/net/xl2tpd/files/ppp.options b/net/xl2tpd/files/ppp.options new file mode 100644 index 0000000000..818549ae1e --- /dev/null +++ b/net/xl2tpd/files/ppp.options @@ -0,0 +1,15 @@ +# + +lock +noauth +debug +dump +logfd 2 +logfile /var/log/xl2tpd.log +noccp +novj +novjccomp +nopcomp +noaccomp + + diff --git a/net/xl2tpd/files/ppp.secrets b/net/xl2tpd/files/ppp.secrets new file mode 100644 index 0000000000..26ec689de6 --- /dev/null +++ b/net/xl2tpd/files/ppp.secrets @@ -0,0 +1,4 @@ +uthenticating l2tp tunnels +# us them secret +mia zidler abcd1234 + diff --git a/net/xl2tpd/files/xl2tpd.conf b/net/xl2tpd/files/xl2tpd.conf index 9ad769d73a..289e96772e 100644 --- a/net/xl2tpd/files/xl2tpd.conf +++ b/net/xl2tpd/files/xl2tpd.conf @@ -1,6 +1,6 @@ [global] port = 1701 -auth file = /etc/xl2tpd/l2tp-secrets +auth file = /etc/xl2tpd/ppp.secrets access control = no ; rand source = dev @@ -19,7 +19,7 @@ refuse authentication = yes ;unix authentication = no name = VersaLink ppp debug = yes -pppoptfile = /etc/xl2tpd/options.l2tp +pppoptfile = /etc/xl2tpd/ppp.options ; call rws = 10 ; tunnel rws = 4 ; flow bit = yes @@ -44,8 +44,7 @@ refuse authentication = yes ; require authentication = yes name = VersaLink ppp debug = yes -; pppoptfile = /etc/ppp/options -pppoptfile = /etc/xl2tpd/options.l2tp +pppoptfile = /etc/xl2tpd/ppp.options ; call rws = 10 ; tunnel rws = 4 ; flow bit = yes diff --git a/net/xl2tpd/patches/001-opt_flags.patch b/net/xl2tpd/patches/001-opt_flags.patch new file mode 100644 index 0000000000..8612151ec0 --- /dev/null +++ b/net/xl2tpd/patches/001-opt_flags.patch @@ -0,0 +1,13 @@ +diff -ruN xl2tpd-1.1.11-old/Makefile xl2tpd-1.1.11-new/Makefile +--- xl2tpd-1.1.11-old/Makefile 2007-06-26 19:53:07.000000000 +0200 ++++ xl2tpd-1.1.11-new/Makefile 2007-09-04 21:55:56.000000000 +0200 +@@ -67,7 +67,8 @@ + + FFLAGS= -DIP_ALLOCATION + +-CFLAGS+= $(DFLAGS) -O2 -fno-builtin -Wall -DSANITY $(OSFLAGS) $(FFLAGS) ++OFLAGS=-O2 ++CFLAGS+= $(DFLAGS) $(OFLAGS) -fno-builtin -Wall -DSANITY $(OSFLAGS) $(FFLAGS) + 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}