Changeset 8676


Ignore:
Timestamp:
2007-09-07T21:27:03+02:00 (10 years ago)
Author:
nico
Message:

update xl2tpd to 1.1.11, fix opt flags, rename ppp related config files, cleanup

Location:
packages/net/xl2tpd
Files:
1 added
2 edited
2 moved

Legend:

Unmodified
Added
Removed
  • packages/net/xl2tpd/Makefile

    • Property svn:copyright set to Copyright (C) 2007 OpenWrt.org
    r7845 r8676  
    1010 
    1111PKG_NAME:=xl2tpd 
    12 PKG_VERSION:=1.1.09 
    13 PKG_RELEASE:=1.0 
     12PKG_VERSION:=1.1.11 
     13PKG_RELEASE:=1 
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1616PKG_SOURCE_URL:=http://www.xelerance.com/software/xl2tpd 
    17 PKG_CAT:=zcat 
    18  
    19 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) 
    20 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install 
     17PKG_MD5SUM:=ab5656eb5a3d1973f7f69b039675332e 
    2118 
    2219include $(INCLUDE_DIR)/package.mk 
     
    2623  CATEGORY:=Network 
    2724  TITLE:=An L2TP (Layer 2 Tunneling Protocol) daemon 
    28   DESCRIPTION:=\ 
    29         l2tpd is the open source implementation of the L2TP tunneling \\\ 
    30         protocol (RFC2661). It does implement both LAC and LNS role \\\ 
    31         in a L2TP networking architecture. The main goal of this protocol is \\\ 
    32         to tunnel PPP frame trough an ip network. 
    3325  URL:=http://www.xelerance.com/software/xl2tpd 
    3426endef 
    3527 
    36 define Package/xl2tpd/conffiles 
    37 /etc/xl2tpd/xl2tpd.conf 
     28define Package/xl2tpd/description 
     29 l2tpd is the open source implementation of the L2TP tunneling protocol  
     30 (RFC2661). It does implement both LAC and LNS role in a L2TP networking  
     31 architecture. The main goal of this protocol is to tunnel PPP frame trough  
     32 an ip network. 
    3833endef 
    3934 
    40 define Build/Compile 
    41         $(call Build/Compile/Default, \ 
    42                 CFLAGS="$(TARGET_CFLAGS) -I. -DLINUX -DSANITY -DIP_ALLOCATION" \ 
    43         ) 
     35# XXX: CFLAGS are already set by Build/Compile/Default 
     36MAKE_FLAGS+= \ 
     37        OFLAGS="" 
     38 
     39define Package/xl2tpd/conffiles 
     40/etc/xl2tpd/ppp.options 
     41/etc/xl2tpd/ppp.secrets 
     42/etc/xl2tpd/xl2tpd.conf 
    4443endef 
    4544 
    4645define Package/xl2tpd/install    
    4746        $(INSTALL_DIR) $(1)/usr/sbin 
    48         $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ 
    49         $(INSTALL_DIR) $(1)/etc/xl2tpd 
    50         $(INSTALL_DATA) ./files/xl2tpd.conf $(1)/etc/xl2tpd/ 
    51         $(INSTALL_DATA) ./files/l2tp-secrets $(1)/etc/xl2tpd/ 
    52         $(INSTALL_DATA) ./files/options.l2tp $(1)/etc/xl2tpd/ 
    53 #       $(INSTALL_DIR) $(1)/etc/ppp 
    54 #       $(INSTALL_DATA) ./files/options.l2tpd $(1)/etc/ppp/ 
     47        $(INSTALL_BIN) $(PKG_BUILD_DIR)/xl2tpd $(1)/usr/sbin/ 
    5548        $(INSTALL_DIR) $(1)/etc/init.d 
    5649        $(INSTALL_BIN) ./files/xl2tpd.init $(1)/etc/init.d/xl2tpd 
     50        $(INSTALL_DIR) $(1)/etc/xl2tpd 
     51        $(INSTALL_DATA) ./files/ppp.options $(1)/etc/xl2tpd/ 
     52        $(INSTALL_DATA) ./files/ppp.secrets $(1)/etc/xl2tpd/ 
     53        $(INSTALL_DATA) ./files/xl2tpd.conf $(1)/etc/xl2tpd/ 
     54        chmod 0600 $(1)/etc/xl2tpd/ppp.secrets 
    5755endef 
    5856 
    5957$(eval $(call BuildPackage,xl2tpd)) 
    60  
  • packages/net/xl2tpd/files/ppp.options

    r8640 r8676  
    66dump          
    77logfd 2       
    8 logfile /var/log/l2tpd.log   
     8logfile /var/log/xl2tpd.log   
    99noccp  
    1010novj  
  • packages/net/xl2tpd/files/xl2tpd.conf

    r7082 r8676  
    11[global] 
    22port = 1701 
    3 auth file = /etc/xl2tpd/l2tp-secrets 
     3auth file = /etc/xl2tpd/ppp.secrets 
    44access control = no 
    55; rand source = dev 
     
    2020name = VersaLink 
    2121ppp debug = yes 
    22 pppoptfile = /etc/xl2tpd/options.l2tp 
     22pppoptfile = /etc/xl2tpd/ppp.options 
    2323; call rws = 10 
    2424; tunnel rws = 4 
     
    4545name = VersaLink 
    4646ppp debug = yes 
    47 ; pppoptfile = /etc/ppp/options 
    48 pppoptfile = /etc/xl2tpd/options.l2tp 
     47pppoptfile = /etc/xl2tpd/ppp.options 
    4948; call rws = 10 
    5049; tunnel rws = 4 
Note: See TracChangeset for help on using the changeset viewer.