More merging from OE

git-svn-id: https://svn.o-hand.com/repos/poky@172 311d38ba-8fff-0310-9ca6-ca027cbcb966

4 files changed, 24 insertions, 1 deletions

diff --git a/openembedded/packages/gdb/gdb_6.3.bb b/openembedded/packages/gdb/gdb_6.3.bb
index fcabfdc5f3..98825500f6 100644
--- a/openembedded/packages/gdb/gdb_6.3.bb
+++ b/openembedded/packages/gdb/gdb_6.3.bb
@@ -6,6 +6,7 @@ PRIORITY = "optional"
 MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
 DEPENDS = "ncurses readline"
 RDEPENDS_openmn = "libthread-db1"
+PR = "r2"
 
 PACKAGES =+ 'gdbserver '
 FILES_gdbserver = '${bindir}/gdbserver'
diff --git a/openembedded/packages/ppp/ppp-2.4.3/enable-ipv6.patch b/openembedded/packages/ppp/ppp-2.4.3/enable-ipv6.patch
new file mode 100644
index 0000000000..7b8acb2dd0
--- /dev/null
+++ b/openembedded/packages/ppp/ppp-2.4.3/enable-ipv6.patch
@@ -0,0 +1,11 @@
+--- ppp-2.4.3/pppd/Makefile.linux.orig  2005-10-28 21:07:40.396359250 +0100
++++ ppp-2.4.3/pppd/Makefile.linux       2005-10-28 21:07:54.217223000 +0100
+@@ -62,7 +62,7 @@
+ 
+ HAS_SHADOW=y
+ #USE_PAM=y
+-#HAVE_INET6=y
++HAVE_INET6=y
+ 
+ # Enable plugins
+ PLUGIN=y
diff --git a/openembedded/packages/ppp/ppp-2.4.3/pppoatm-makefile.patch b/openembedded/packages/ppp/ppp-2.4.3/pppoatm-makefile.patch
new file mode 100644
index 0000000000..5601f593d0
--- /dev/null
+++ b/openembedded/packages/ppp/ppp-2.4.3/pppoatm-makefile.patch
@@ -0,0 +1,7 @@
+--- ppp-2.4.3/pppd/plugins/pppoatm/Makefile.linux.orig  2005-10-26 20:38:50.990298750 +0100
++++ ppp-2.4.3/pppd/plugins/pppoatm/Makefile.linux       2005-10-26 20:39:05.583210750 +0100
+@@ -1,4 +1,3 @@
+-CC     = gcc
+ COPTS  = -O2 -g
+ CFLAGS = $(COPTS) -I../.. -I../../../include -fPIC
+ LDFLAGS        = -shared
diff --git a/openembedded/packages/ppp/ppp_2.4.3.bb b/openembedded/packages/ppp/ppp_2.4.3.bb
index 29ce2b520d..8701efc556 100644
--- a/openembedded/packages/ppp/ppp_2.4.3.bb
+++ b/openembedded/packages/ppp/ppp_2.4.3.bb
@@ -10,6 +10,8 @@ SRC_URI = "ftp://ftp.samba.org/pub/ppp/ppp-${PV}.tar.gz \
         file://cifdefroute.patch;patch=1 \
         file://pppd-resolv-varrun.patch;patch=1 \
         file://plugins-fix-CC.patch;patch=1 \
+        file://pppoatm-makefile.patch;patch=1 \
+        file://enable-ipv6.patch;patch=1 \
         file://pon \
         file://poff \
         file://init \
@@ -40,14 +42,16 @@ do_install_append () {
 }
 
 CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options"
-PACKAGES += "ppp-oe ppp-radius ppp-winbind ppp-minconn ppp-password ppp-tools"
+PACKAGES += "ppp-oa ppp-oe ppp-radius ppp-winbind ppp-minconn ppp-password ppp-tools"
 FILES_${PN}        = "/etc /usr/bin /usr/sbin/chat /usr/sbin/pppd"
+FILES_ppp-oa       = "/usr/lib/pppd/2.4.3/pppoatm.so"
 FILES_ppp-oe       = "/usr/sbin/pppoe-discovery /usr/lib/pppd/2.4.3/rp-pppoe.so"
 FILES_ppp-radius   = "/usr/lib/pppd/2.4.3/radius.so /usr/lib/pppd/2.4.3/radattr.so /usr/lib/pppd/2.4.3/radrealms.so"
 FILES_ppp-winbind  = "/usr/lib/pppd/2.4.3/winbind.so"
 FILES_ppp-minconn  = "/usr/lib/pppd/2.4.3/minconn.so"
 FILES_ppp-password = "/usr/lib/pppd/2.4.3/pass*.so"
 FILES_ppp-tools    = "/usr/sbin/pppstats /usr/sbin/pppdump"
+DESCRIPTION_ppp-oa       = "Plugin for PPP needed for PPP-over-ATM"
 DESCRIPTION_ppp-oe       = "Plugin for PPP needed for PPP-over-Ethernet"
 DESCRIPTION_ppp-radius   = "Plugin for PPP that are related to RADIUS"
 DESCRIPTION_ppp-winbind  = "Plugin for PPP to authenticate against Samba or Windows"