[packages] xl2tpd: update to v1.2.8, refresh patches (#9030)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@26040 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/net/xl2tpd/Makefile b/net/xl2tpd/Makefile
index d071f38..cc4bc5d 100644 (file)
--- a/net/xl2tpd/Makefile
+++ b/net/xl2tpd/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xl2tpd
-PKG_VERSION:=1.2.5
+PKG_VERSION:=1.2.8
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.xelerance.com/xl2tpd/
-PKG_MD5SUM:=40404ea230edd9ebdd0d53f07c832520
+PKG_MD5SUM:=8748ac5e2f5289963d9a908eede546b5
 
 PKG_INSTALL:=1
 

diff --git a/net/xl2tpd/patches/100-makefile_opt_flags.patch b/net/xl2tpd/patches/100-makefile_opt_flags.patch
index f056319..400bdf1 100644 (file)
--- a/net/xl2tpd/patches/100-makefile_opt_flags.patch
+++ b/net/xl2tpd/patches/100-makefile_opt_flags.patch
@@ -2,11 +2,11 @@
 +++ b/Makefile
 @@ -90,7 +90,8 @@ OSFLAGS?= -DLINUX -I$(KERNELSRC)/include
  
- FFLAGS= -DIP_ALLOCATION
+ IPFLAGS?= -DIP_ALLOCATION
  
--CFLAGS+= $(DFLAGS) -O2 -fno-builtin -Wall -DSANITY $(OSFLAGS) $(FFLAGS)
+-CFLAGS+= $(DFLAGS) -O2 -fno-builtin -Wall -DSANITY $(OSFLAGS) $(IPFLAGS)
 +OFLAGS=-O2
-+CFLAGS+= $(DFLAGS) $(OFLAGS) -fno-builtin -Wall -DSANITY $(OSFLAGS) $(FFLAGS)
++CFLAGS+= $(DFLAGS) $(OFLAGS) -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}

diff --git a/net/xl2tpd/patches/110-makefile_dont_build_pfc.patch b/net/xl2tpd/patches/110-makefile_dont_build_pfc.patch
index 256865f..ca9207c 100644 (file)
--- a/net/xl2tpd/patches/110-makefile_dont_build_pfc.patch
+++ b/net/xl2tpd/patches/110-makefile_dont_build_pfc.patch
@@ -16,7 +16,7 @@
  
 -pfc:
 -      $(CC) $(CFLAGS) -c contrib/pfc.c
--      $(CC) $(LDFLAGS) -lpcap $(LDLIBS) -o pfc pfc.o
+-      $(CC) $(LDFLAGS) -o pfc pfc.o -lpcap $(LDLIBS)
 -
  romfs:
        $(ROMFSINST) /bin/$(EXEC)