From ffa01ceb6917ac801db73305895c0077341d9af9 Mon Sep 17 00:00:00 2001
From: mb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 1 Nov 2010 15:10:47 +0000
Subject: [PATCH] openl2tp: Fix some internal dependencies

git-svn-id: svn://svn.openwrt.org/openwrt/packages@23764 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 net/openl2tp/patches/001-makefile.patch | 38 +++++++++++++++++++++----
 net/openl2tp/patches/010-ppp_unix.patch |  6 ++--
 2 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/net/openl2tp/patches/001-makefile.patch b/net/openl2tp/patches/001-makefile.patch
index 81e973ab8..8fc0b10ad 100644
--- a/net/openl2tp/patches/001-makefile.patch
+++ b/net/openl2tp/patches/001-makefile.patch
@@ -1,5 +1,7 @@
---- orig/Makefile	2010-03-18 14:04:47.000000000 +0500
-+++ new/Makefile	2010-10-28 07:30:10.673418106 +0600
+Index: openl2tp-1.7/Makefile
+===================================================================
+--- openl2tp-1.7.orig/Makefile	2010-03-18 10:04:47.000000000 +0100
++++ openl2tp-1.7/Makefile	2010-11-01 15:59:00.279999805 +0100
 @@ -8,7 +8,7 @@
  L2TP_FEATURE_LAOC_SUPPORT=	y
  L2TP_FEATURE_LNIC_SUPPORT=	y
@@ -63,8 +65,30 @@
  
  OPT_CFLAGS?=		-O
  
---- orig/cli/Makefile	2008-02-03 19:55:30.000000000 +0500
-+++ new/cli/Makefile	2010-10-28 07:15:39.000000000 +0600
+@@ -189,7 +189,7 @@
+ 
+ .PHONY:			$(SUBDIRS:%=subdir-%)
+ 
+-$(SUBDIRS:%=subdir-%):	FORCE
++$(SUBDIRS:%=subdir-%):	FORCE generated-files
+ 			$(MAKE) -C $(@:subdir-%=%) $(MFLAGS) EXTRA_CFLAGS="$(CPPFLAGS)"
+ 
+ ifeq ($(L2TP_FEATURE_LOCAL_CONF_FILE),y)
+@@ -260,8 +260,8 @@
+ openl2tpd:		$(L2TPD_SRCS.o)
+ 			$(CC) -o $@ $^ $(LDFLAGS.l2tpd)
+ 
+-l2tpconfig:		$(L2TPCONFIG_SRCS.o)
+-			$(CC) -o $@ $^ $(LDFLAGS.l2tpconfig)
++l2tpconfig:		generated-files $(L2TPCONFIG_SRCS.o)
++			$(CC) -o $@ $(L2TPCONFIG_SRCS.o) $(LDFLAGS.l2tpconfig)
+ 
+ %.o:	%.c
+ 			$(CC) -c $(CFLAGS) $< -o $@
+Index: openl2tp-1.7/cli/Makefile
+===================================================================
+--- openl2tp-1.7.orig/cli/Makefile	2008-02-03 15:55:30.000000000 +0100
++++ openl2tp-1.7/cli/Makefile	2010-11-01 15:56:22.938000001 +0100
 @@ -7,7 +7,7 @@
  
  LDFLAGS.cli_test=	-L.. -L. $(READLINE_LDFLAGS) -lcli -lusl -lreadline -lcurses -lc
@@ -74,8 +98,10 @@
  
  .PHONY:			all test clean
  
---- orig/usl/Makefile	2008-02-24 16:52:50.000000000 +0500
-+++ new/usl/Makefile	2010-10-28 07:15:39.000000000 +0600
+Index: openl2tp-1.7/usl/Makefile
+===================================================================
+--- openl2tp-1.7.orig/usl/Makefile	2008-02-24 12:52:50.000000000 +0100
++++ openl2tp-1.7/usl/Makefile	2010-11-01 15:56:22.938000001 +0100
 @@ -14,7 +14,7 @@
  endif
  
diff --git a/net/openl2tp/patches/010-ppp_unix.patch b/net/openl2tp/patches/010-ppp_unix.patch
index a3ec3432d..2417cac33 100644
--- a/net/openl2tp/patches/010-ppp_unix.patch
+++ b/net/openl2tp/patches/010-ppp_unix.patch
@@ -1,7 +1,7 @@
-Index: openl2tp-1.6/plugins/ppp_unix.c
+Index: openl2tp-1.7/plugins/ppp_unix.c
 ===================================================================
---- openl2tp-1.6.orig/plugins/ppp_unix.c
-+++ openl2tp-1.6/plugins/ppp_unix.c
+--- openl2tp-1.7.orig/plugins/ppp_unix.c	2010-11-01 15:56:52.150001215 +0100
++++ openl2tp-1.7/plugins/ppp_unix.c	2010-11-01 15:59:28.011000001 +0100
 @@ -643,6 +643,8 @@
  
  		if (ppp->ppp_profile_data->proxy_arp) {