Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/07 19:30:59+01:00 dyndns.org!reenoo
Merge oe-devel@oe-devel.bkbits.net:openembedded
into sugarcube.dyndns.org:/home2/oe/bakery/openembedded

2005/01/07 19:30:19+01:00 dyndns.org!reenoo
vlc-gpe: s/faad/faad2/ in DEPENDS

2005/01/07 18:58:21+01:00 (none)!br1
ppp-dsl: activate replacedefaultroute

2005/01/07 18:55:17+01:00 (none)!br1
ppp: add "replacedefaultroute" (cifdefroute.dif) patch

BKrev: 41ded787DDaUtSAyr6c7FIuwHOenjg

4 files changed, 74 insertions, 2 deletions

diff --git a/packages/ppp-dsl/dsl-provider b/packages/ppp-dsl/dsl-provider
index e69de29bb2..6feaf55752 100644
--- a/packages/ppp-dsl/dsl-provider
+++ b/packages/ppp-dsl/dsl-provider
@@ -0,0 +1,71 @@
+# Configuration file for PPP, using PPP over Ethernet 
+# to connect to a DSL provider.
+#
+# See the manual page pppd(8) for information on all the options.
+
+##
+# Section 1
+#
+# Stuff to configure...
+
+# MUST CHANGE: Uncomment the following line, replacing the user@provider.net
+# by the DSL user name given to your by your DSL provider.
+# (There should be a matching entry in /etc/ppp/pap-secrets with the password.)
+#
+# maybe helpful for germany:
+# T-DSL business  PAP     "t-online-com/111111111111@t-online-com.de"
+# T-DSL t-online  PAP     "[ANSCHLUSSKENNUNG][T_ONLINE_NUMMER]#[MITBENUTZER]@t-online.de"
+# hansenet        CHAP    "net0815@hansenet.de"
+#
+#user ""
+
+# Use the pppoe program to send the ppp packets over the Ethernet link
+# This line should work fine if this computer is the only one accessing
+# the Internet through this DSL connection. This is the right line to use
+# for most people.
+pty "/usr/sbin/pppoe -I eth0 -T 80 -m 1452"
+
+# If the computer connected to the Internet using pppoe is not being used
+# by other computers as a gateway to the Internet, you can try the following
+# line instead, for a small gain in speed:
+#pty "/usr/sbin/pppoe -I eth0 -T 80"
+
+# An even more conservative version of the previous line, if things
+# don't work using -m 1452... 
+#pty "/usr/sbin/pppoe -I eth0 -T 80 -m 1412"
+
+
+# The following two options should work fine for most DSL users.
+
+# Assumes that your IP address is allocated dynamically
+# by your DSL provider...
+noipdefault
+# Comment out if you already have the correct default route installed
+defaultroute
+replacedefaultroute
+usepeerdns
+
+##
+# Section 2
+#
+# Uncomment if your DSL provider charges by minute connected
+# and you want to use demand-dialing. 
+#
+# Disconnect after 300 seconds (5 minutes) of idle time.
+
+#demand
+#idle 300
+
+##
+# Section 3
+#
+# You shouldn't need to change these options...
+
+hide-password
+lcp-echo-interval 20
+lcp-echo-failure 3
+# Override any connect script that may have been set in /etc/ppp/options.
+connect /bin/true
+noauth
+persist
+mtu 1492
diff --git a/packages/ppp/ppp-2.4.1/cifdefroute.dif b/packages/ppp/ppp-2.4.1/cifdefroute.dif
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ppp/ppp-2.4.1/cifdefroute.dif
diff --git a/packages/ppp/ppp_2.4.1.bb b/packages/ppp/ppp_2.4.1.bb
index 7f4e58e107..44d99f588a 100644
--- a/packages/ppp/ppp_2.4.1.bb
+++ b/packages/ppp/ppp_2.4.1.bb
@@ -2,11 +2,12 @@ SECTION = "console/network"
 DESCRIPTION = "Point-to-Point Protocol (PPP) daemon"
 HOMEPAGE = "http://samba.org/ppp/"
 LICENSE = "BSD GPLv2"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "ftp://ftp.samba.org/pub/ppp/ppp-2.4.1.tar.gz \
 	file://pppd.patch;patch=1 \
 	file://man.patch;patch=1 \
+	file://cifdefroute.dif;patch=1 \
 	file://pon \
 	file://poff \
 	file://init \
diff --git a/packages/vlc/vlc-gpe_0.7.2.bb b/packages/vlc/vlc-gpe_0.7.2.bb
index b97fad879a..77e48aa0f2 100644
--- a/packages/vlc/vlc-gpe_0.7.2.bb
+++ b/packages/vlc/vlc-gpe_0.7.2.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "gpe"
 PR = "r1"
 
-DEPENDS = "faad ffmpeg flac liba52 libid3tag libmad mpeg2dec"
+DEPENDS = "faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec"
 
 SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.gz"
 S = "${WORKDIR}/vlc-${PV}"