Update of /cvsroot/leaf/src/bering-uclibc4/source/ppp
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv18387
Modified Files:
buildtool.cfg buildtool.mk
Added Files:
plugins_2.6.35.patch
Removed Files:
pppol2tp.patch.gz
Log Message:
Removed unneeded l2tp patch (in pppd-2.4.5 l2tp already present); patched
rp-pppoe to compile under 2.6.35
--- NEW FILE: plugins_2.6.35.patch ---
diff -aur ppp-2.4.5.orig/pppd/plugins/pppol2tp/Makefile.linux
ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux
--- ppp-2.4.5.orig/pppd/plugins/pppol2tp/Makefile.linux 2009-11-17
00:26:07.000000000 +0200
+++ ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux 2010-08-07
01:14:57.149239004 +0300
@@ -1,6 +1,6 @@
#CC = gcc
COPTS = -O2 -g
-CFLAGS = $(COPTS) -I. -I../.. -I../../../include -fPIC
+CFLAGS = $(COPTS) -I. -I../.. -I$(INCLUDEDIR) -fPIC
LDFLAGS = -shared
INSTALL = install
diff -aur ppp-2.4.5.orig/pppd/plugins/rp-pppoe/config.h
ppp-2.4.5/pppd/plugins/rp-pppoe/config.h
--- ppp-2.4.5.orig/pppd/plugins/rp-pppoe/config.h 2009-11-17
00:26:07.000000000 +0200
+++ ppp-2.4.5/pppd/plugins/rp-pppoe/config.h 2010-08-07 01:14:57.150238823
+0300
@@ -84,7 +84,7 @@
#define HAVE_NET_IF_H 1
/* Define if you have the <linux/if.h> header file. */
-#define HAVE_LINUX_IF_H 1
+/* #undef HAVE_LINUX_IF_H */
/* Define if you have the <net/if_dl.h> header file. */
/* #undef HAVE_NET_IF_DL_H */
diff -aur ppp-2.4.5.orig/pppd/plugins/rp-pppoe/Makefile.linux
ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux
--- ppp-2.4.5.orig/pppd/plugins/rp-pppoe/Makefile.linux 2009-11-17
00:26:07.000000000 +0200
+++ ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux 2010-08-07
01:14:57.151238641 +0300
@@ -26,7 +26,7 @@
RP_VERSION=3.8p
COPTS=-O2 -g
-CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"'
+CFLAGS=$(COPTS) -I$(INCLUDEDIR) '-DRP_VERSION="$(RP_VERSION)"'
all: rp-pppoe.so pppoe-discovery
pppoe-discovery: pppoe-discovery.o debug.o
diff -aur ppp-2.4.5.orig/pppd/plugins/rp-pppoe/plugin.c
ppp-2.4.5/pppd/plugins/rp-pppoe/plugin.c
--- ppp-2.4.5.orig/pppd/plugins/rp-pppoe/plugin.c 2009-11-17
00:26:07.000000000 +0200
+++ ppp-2.4.5/pppd/plugins/rp-pppoe/plugin.c 2010-08-07 01:15:36.129138153
+0300
@@ -49,6 +49,10 @@
#include <net/ethernet.h>
#include <net/if_arp.h>
#include <linux/ppp_defs.h>
+#ifndef aligned_u64
+/* should be defined in sys/types.h */
+#define aligned_u64 uint64_t __attribute__((aligned(8)))
+#endif
#include <linux/if_ppp.h>
#include <linux/if_pppox.h>
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/ppp/buildtool.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** buildtool.mk 12 Jun 2010 07:52:08 -0000 1.2
--- buildtool.mk 6 Aug 2010 22:23:38 -0000 1.3
***************
*** 11,15 ****
cat $(PPP_PATCH3) | patch -d $(PPP_DIR) -p1
cat $(PPP_PATCH4) | patch -d $(PPP_DIR) -p1
! zcat $(PPP_PATCH5) | patch -d $(PPP_DIR) -p1
cat $(PPP_PATCH6) | patch -d $(PPP_DIR) -p1
cat $(PPP_PATCH7) | patch -d $(PPP_DIR) -p1
--- 11,15 ----
cat $(PPP_PATCH3) | patch -d $(PPP_DIR) -p1
cat $(PPP_PATCH4) | patch -d $(PPP_DIR) -p1
! cat $(PPP_PATCH5) | patch -d $(PPP_DIR) -p1
cat $(PPP_PATCH6) | patch -d $(PPP_DIR) -p1
cat $(PPP_PATCH7) | patch -d $(PPP_DIR) -p1
***************
*** 33,37 ****
mkdir -p $(PPP_TARGET_DIR)/usr/lib/pppd
$(MAKE) -C $(PPP_DIR) clean
! make CC=$(TARGET_CC) -C $(PPP_DIR) COPTS="-Os -pipe -Wall -g" FILTER=
HAVE_INET6=y CBCP=
-$(BT_STRIP) -s --remove-section=.note --remove-section=.comment
$(PPP_DIR)/pppd/pppd
-$(BT_STRIP) -s --remove-section=.note --remove-section=.comment
$(PPP_DIR)/pppstats/pppstats
--- 33,37 ----
mkdir -p $(PPP_TARGET_DIR)/usr/lib/pppd
$(MAKE) -C $(PPP_DIR) clean
! make CC=$(TARGET_CC) INCLUDEDIR="$(BT_STAGING_DIR)/include" -C
$(PPP_DIR) COPTS="-Os -pipe -Wall -g" FILTER= HAVE_INET6=y CBCP=
-$(BT_STRIP) -s --remove-section=.note --remove-section=.comment
$(PPP_DIR)/pppd/pppd
-$(BT_STRIP) -s --remove-section=.note --remove-section=.comment
$(PPP_DIR)/pppstats/pppstats
***************
*** 40,43 ****
--- 40,44 ----
-$(BT_STRIP) -s --strip-unneeded
$(PPP_DIR)/pppd/plugins/rp-pppoe/rp-pppoe.so
-$(BT_STRIP) -s --strip-unneeded $(PPP_DIR)/pppd/plugins/radius/*.so
+ -$(BT_STRIP) -s --strip-unneeded $(PPP_DIR)/pppd/plugins/pppol2tp/*.so
-$(BT_STRIP) -s --strip-unneeded $(PPP_DIR)/pppd/plugins/*.so
cp -a poff $(PPP_TARGET_DIR)/usr/bin
***************
*** 50,54 ****
cp -a $(PPP_DIR)/pppd/plugins/rp-pppoe/rp-pppoe.so
$(PPP_TARGET_DIR)/usr/lib/pppd
cp -a $(PPP_DIR)/pppd/plugins/radius/*.so $(PPP_TARGET_DIR)/usr/lib/pppd
! cp -a $(PPP_DIR)/pppd/plugins/pppol2tp.so $(PPP_TARGET_DIR)/usr/lib/pppd
cp -a $(PPP_DIR)/etc.ppp/chap-secrets $(PPP_TARGET_DIR)/etc/ppp
cp -a options $(PPP_TARGET_DIR)/etc/ppp
--- 51,55 ----
cp -a $(PPP_DIR)/pppd/plugins/rp-pppoe/rp-pppoe.so
$(PPP_TARGET_DIR)/usr/lib/pppd
cp -a $(PPP_DIR)/pppd/plugins/radius/*.so $(PPP_TARGET_DIR)/usr/lib/pppd
! cp -a $(PPP_DIR)/pppd/plugins/pppol2tp/*.so
$(PPP_TARGET_DIR)/usr/lib/pppd
cp -a $(PPP_DIR)/etc.ppp/chap-secrets $(PPP_TARGET_DIR)/etc/ppp
cp -a options $(PPP_TARGET_DIR)/etc/ppp
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/ppp/buildtool.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** buildtool.cfg 12 Jun 2010 07:52:08 -0000 1.3
--- buildtool.cfg 6 Aug 2010 22:23:38 -0000 1.4
***************
*** 46,50 ****
</File>
! <File pppol2tp.patch.gz>
Server = cvs4-sourceforge
Revision = HEAD
--- 46,50 ----
</File>
! <File plugins_2.6.35.patch>
Server = cvs4-sourceforge
Revision = HEAD
--- pppol2tp.patch.gz DELETED ---
------------------------------------------------------------------------------
This SF.net email is sponsored by
Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
