From: Nicolas Thill <nico@openwrt.org>
Date: Fri, 18 Nov 2011 20:57:46 +0000 (+0000)
Subject: [backfire] packages/xl2tpd: merge r28012 (update to 1.3.0)
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=5788fdd4adb009c100c36d4ab9f25a66d4c70d19

[backfire] packages/xl2tpd: merge r28012 (update to 1.3.0)


SVN-Revision: 29245
---

diff --git a/net/xl2tpd/Makefile b/net/xl2tpd/Makefile
index cc4bc5d3fa..467efb99ec 100644
--- a/net/xl2tpd/Makefile
+++ b/net/xl2tpd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xl2tpd
-PKG_VERSION:=1.2.8
+PKG_VERSION:=1.3.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.xelerance.com/xl2tpd/
-PKG_MD5SUM:=8748ac5e2f5289963d9a908eede546b5
+PKG_MD5SUM:=28264284552c442b24cf421755a2bb48
 
 PKG_INSTALL:=1
 
@@ -22,7 +22,6 @@ include $(INCLUDE_DIR)/package.mk
 define Package/xl2tpd
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=
   TITLE:=An L2TP (Layer 2 Tunneling Protocol) daemon
   URL:=http://www.xelerance.com/software/xl2tpd/
   SUBMENU:=VPN
diff --git a/net/xl2tpd/patches/110-makefile_dont_build_pfc.patch b/net/xl2tpd/patches/110-makefile_dont_build_pfc.patch
index ca9207c4ff..90b320f2ed 100644
--- a/net/xl2tpd/patches/110-makefile_dont_build_pfc.patch
+++ b/net/xl2tpd/patches/110-makefile_dont_build_pfc.patch
@@ -1,18 +1,21 @@
---- a/Makefile
-+++ b/Makefile
-@@ -104,22 +104,18 @@ BINDIR?=$(DESTDIR)${PREFIX}/bin
+--- a/Makefile	2011-08-16 20:28:19.968069040 +0200
++++ b/Makefile	2011-08-16 20:27:57.968069032 +0200
+@@ -106,10 +106,10 @@
  MANDIR?=$(DESTDIR)${PREFIX}/share/man
  
  
--all: $(EXEC) pfc
-+all: $(EXEC)
+-all: $(EXEC) pfc $(CONTROL_EXEC)
++all: $(EXEC) $(CONTROL_EXEC)
  
  clean:
--	rm -f $(OBJS) $(EXEC) pfc.o pfc
-+	rm -f $(OBJS) $(EXEC)
+-	rm -f $(OBJS) $(EXEC) pfc.o pfc $(CONTROL_EXEC)
++	rm -f $(OBJS) $(EXEC) $(CONTROL_EXEC)
  
  $(EXEC): $(OBJS) $(HDRS)
  	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS)
+@@ -117,14 +117,10 @@
+ $(CONTROL_EXEC): $(CONTROL_SRCS)
+ 	$(CC) $(CONTROL_SRCS) -o $@
  
 -pfc:
 -	$(CC) $(CFLAGS) -c contrib/pfc.c
@@ -21,12 +24,12 @@
  romfs:
  	$(ROMFSINST) /bin/$(EXEC)
  
--install: ${EXEC} pfc
-+install: ${EXEC}
+-install: ${EXEC} pfc ${CONTROL_EXEC}
++install: ${EXEC} ${CONTROL_EXEC}
  	install -d -m 0755 ${SBINDIR}
  	install -m 0755 $(EXEC) ${SBINDIR}/$(EXEC)
  	install -d -m 0755 ${MANDIR}/man5
-@@ -127,11 +123,6 @@ install: ${EXEC} pfc
+@@ -132,11 +128,6 @@
  	install -m 0644 doc/xl2tpd.8 ${MANDIR}/man8/
  	install -m 0644 doc/xl2tpd.conf.5 doc/l2tp-secrets.5 \
  		 ${MANDIR}/man5/
@@ -35,6 +38,6 @@
 -	install -m 0755 pfc ${BINDIR}/pfc
 -	install -d -m 0755 ${MANDIR}/man1
 -	install -m 0644 contrib/pfc.1 ${MANDIR}/man1/
- 
- # openbsd
- #	install -d -m 0755 /var/run/xl2tpd
+ 	# control exec
+ 	install -d -m 0755 ${SBINDIR}
+ 	install -m 0755 $(CONTROL_EXEC) ${SBINDIR}/$(CONTROL_EXEC)