Changeset 20276


Ignore:
Timestamp:
2010-03-18T17:01:35+01:00 (8 years ago)
Author:
thepeople
Message:

this patch updates xl2tpd to 1.2.5. From the changelog:

  • Fix initscript for

https://bugzilla.redhat.com/show_bug.cgi%3Fid%3D247100

  • Fix for two Windows machines behind the same NAT with the same number of l2tp connection attempts since boot [Shinichi Furuso]

Changes in this patch:

  • use PKG_INSTALL:=1
  • use standard config file names like in other major distributions
  • new patch to disable building pfc (which was not installed anyway), removes dependency to libpcap
  • include a commented sample config file
  • use INSTALL_CONF instead of INSTALL_DATA + chmod 0600

-Raphael

Location:
packages/net/xl2tpd
Files:
5 added
3 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • packages/net/xl2tpd/Makefile

    r18772 r20276  
    11# 
    2 # Copyright (C) 2006 OpenWrt.org 
     2# Copyright (C) 2006-2010 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    99 
    1010PKG_NAME:=xl2tpd 
    11 PKG_VERSION:=1.2.4 
     11PKG_VERSION:=1.2.5 
    1212PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    15 PKG_SOURCE_URL:=http://www.xelerance.com/software/xl2tpd 
    16 PKG_MD5SUM:=d94fc8a13596f12a561240dfcea9f977 
     15PKG_SOURCE_URL:=ftp://ftp.xelerance.com/xl2tpd/ 
     16PKG_MD5SUM:=40404ea230edd9ebdd0d53f07c832520 
     17 
     18PKG_INSTALL:=1 
    1719 
    1820include $(INCLUDE_DIR)/package.mk 
     
    2123  SECTION:=net 
    2224  CATEGORY:=Network 
    23   DEPENDS:=+libpcap 
     25  DEPENDS:= 
    2426  TITLE:=An L2TP (Layer 2 Tunneling Protocol) daemon 
    25   URL:=http://www.xelerance.com/software/xl2tpd 
     27  URL:=http://www.xelerance.com/software/xl2tpd/ 
    2628  SUBMENU:=VPN 
    2729endef 
    2830 
    2931define Package/xl2tpd/description 
    30  l2tpd is the open source implementation of the L2TP tunneling protocol 
    31  (RFC2661). It does implement both LAC and LNS role in a L2TP networking 
    32  architecture. The main goal of this protocol is to tunnel PPP frame trough 
    33  an ip network. 
     32l2tpd is the open source implementation of the L2TP tunneling protocol (RFC2661). 
     33It does implement both LAC and LNS role in a L2TP networking architecture. The 
     34main goal of this protocol is to tunnel PPP frame trough an IP network. 
    3435endef 
    3536 
     
    3940 
    4041define Package/xl2tpd/conffiles 
    41 /etc/xl2tpd/ppp.options 
    42 /etc/xl2tpd/ppp.secrets 
    4342/etc/xl2tpd/xl2tpd.conf 
     43/etc/xl2tpd/xl2tp-secrets 
     44/etc/ppp/options.xl2tpd 
    4445endef 
    4546 
    4647define Package/xl2tpd/install 
    4748        $(INSTALL_DIR) $(1)/usr/sbin 
    48         $(INSTALL_BIN) $(PKG_BUILD_DIR)/xl2tpd $(1)/usr/sbin/ 
     49        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/sbin/xl2tpd $(1)/usr/sbin/ 
     50 
    4951        $(INSTALL_DIR) $(1)/etc/init.d 
    5052        $(INSTALL_BIN) ./files/xl2tpd.init $(1)/etc/init.d/xl2tpd 
     53 
    5154        $(INSTALL_DIR) $(1)/etc/xl2tpd 
    52         $(INSTALL_DATA) ./files/ppp.options $(1)/etc/xl2tpd/ 
    53         $(INSTALL_DATA) ./files/ppp.secrets $(1)/etc/xl2tpd/ 
    5455        $(INSTALL_DATA) ./files/xl2tpd.conf $(1)/etc/xl2tpd/ 
    55         chmod 0600 $(1)/etc/xl2tpd/ppp.secrets 
     56        $(INSTALL_CONF) ./files/xl2tp-secrets $(1)/etc/xl2tpd/ 
     57 
     58        $(INSTALL_DIR) $(1)/etc/ppp 
     59        $(INSTALL_DATA) ./files/options.xl2tpd $(1)/etc/ppp/ 
    5660endef 
    5761 
  • packages/net/xl2tpd/files/xl2tpd.conf

    r8676 r20276  
    11[global] 
    22port = 1701 
    3 auth file = /etc/xl2tpd/ppp.secrets 
     3auth file = /etc/xl2tpd/xl2tp-secrets 
    44access control = no 
    5 ; rand source = dev 
    65 
    76[lns default] 
     
    1312length bit = yes 
    1413refuse authentication = yes 
    15 ;require chap = yes 
    16 ;refuse pap = yes 
    17 ;refuse chap = no 
    18 ;require authentication = yes 
    19 ;unix authentication = no 
    2014name = VersaLink 
    2115ppp debug = yes 
    22 pppoptfile = /etc/xl2tpd/ppp.options 
    23 ; call rws = 10 
    24 ; tunnel rws = 4 
    25 ; flow bit = yes 
    26 ; challenge = yes 
    27 ; 
     16pppoptfile = /etc/ppp/options.xl2tpd 
    2817 
    2918[lac left] 
    3019lns = 10.0.1.2 
    31 ; lns = lns2.marko.net 
    32 ; redial = yes 
    33 ; redial timeout = 15 
    34 ; max redials = 5 
    35 ; hidden bit = yes 
    36 ; local ip = 192.168.1.1 
    37 ; remote ip = 192.168.1.2 
    38 ; length bit = no 
    3920refuse authentication = yes 
    40 ; require pap = no 
    41 ; require chap = yes 
    42 ; refuse pap = yes 
    43 ; refuse chap = no 
    44 ; require authentication = yes 
    4521name = VersaLink 
    4622ppp debug = yes 
    47 pppoptfile = /etc/xl2tpd/ppp.options 
    48 ; call rws = 10 
    49 ; tunnel rws = 4 
    50 ; flow bit = yes 
    51 ; challenge = yes 
    52 ; 
    53 ; [lac cisco] 
    54 ; lns = cisco.marko.net 
    55 ; require authentication = yes 
     23pppoptfile = /etc/ppp/options.xl2tpd 
  • packages/net/xl2tpd/files/xl2tpd.init

    r7082 r20276  
    11#!/bin/sh /etc/rc.common 
    2 # Copyright (C) 2006 OpenWrt.org 
     2# Copyright (C) 2006-2010 OpenWrt.org 
    33 
    44START=60 
     
    1717        [ -f $PID_F ] && kill $(cat $PID_F) 
    1818} 
    19  
Note: See TracChangeset for help on using the changeset viewer.