summaryrefslogtreecommitdiff
path: root/package/ppp
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-07-07 02:16:43 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-07-07 02:16:43 +0200
commit52ee190f6bbbf0bf0c3d354f0370c409aed14506 (patch)
tree4cce29e6f802e8e1f2aa7b85746a979633a4c282 /package/ppp
parent1879491b2b6e799b20ac06d1b510726eb200944f (diff)
more runtime fixes, update of some packages.
- update busybox, dnsmasq, ppp and libusb - add timezone and hostname configuration for target via menu - fix resolv.conf creation for dhcp client - fix usb for alix boards - enable lsusb and lspci by default
Diffstat (limited to 'package/ppp')
-rw-r--r--package/ppp/Makefile8
-rwxr-xr-xpackage/ppp/files/etc/ppp/ip-down2
-rwxr-xr-xpackage/ppp/files/etc/ppp/ip-up2
-rwxr-xr-xpackage/ppp/files/ppp.pre-up3
-rw-r--r--package/ppp/patches/patch-pppd_plugins_rp-pppoe_Makefile_linux23
-rw-r--r--package/ppp/patches/patch-pppd_plugins_rp-pppoe_discovery_c27
6 files changed, 7 insertions, 58 deletions
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 2d38f6a96..88f7826a1 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= ppp
-PKG_VERSION:= 2.4.4
-PKG_RELEASE:= 18
-PKG_MD5SUM:= 183800762e266132218b204dfb428d29
+PKG_VERSION:= 2.4.5
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 4621bc56167b6953ec4071043fe0ec57
PKG_DESCR:= Point-to-Point Protocol software
PKG_SECTION:= net
PKG_MULTI:= 1
@@ -64,7 +64,7 @@ post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
${INSTALL_DIR} ${IDIR_PPP}/etc/ppp/peers
$(INSTALL_DIR) ${IDIR_PPP}/etc/network/if-pre-up.d
$(INSTALL_BIN) ./files/ppp.pre-up \
- ${IDIR_PPP}/etc/network/if-pre-up.d/ppp
+ ${IDIR_PPP}/etc/network/if-pre-up.d/05-ppp
mod-radius-install:
${INSTALL_DIR} ${IDIR_PPP_MOD_RADIUS}/etc/radiusclient
diff --git a/package/ppp/files/etc/ppp/ip-down b/package/ppp/files/etc/ppp/ip-down
index 334bcb885..a4756b768 100755
--- a/package/ppp/files/etc/ppp/ip-down
+++ b/package/ppp/files/etc/ppp/ip-down
@@ -1,6 +1,4 @@
#!/bin/sh
-[ -z "$6" ] || env -i ACTION="ifdown" INTERFACE="$6" PROTO=ppp /sbin/hotplug "iface"
-
[ -d /etc/ppp/ip-down.d ] && {
for SCRIPT in /etc/ppp/ip-down.d/*
do
diff --git a/package/ppp/files/etc/ppp/ip-up b/package/ppp/files/etc/ppp/ip-up
index 34b4b50e1..2ccefc01c 100755
--- a/package/ppp/files/etc/ppp/ip-up
+++ b/package/ppp/files/etc/ppp/ip-up
@@ -1,6 +1,4 @@
#!/bin/sh
-[ -z "$6" ] || env -i ACTION="ifup" INTERFACE="$6" PROTO=ppp /sbin/hotplug "iface"
-
[ -d /etc/ppp/ip-up.d ] && {
for SCRIPT in /etc/ppp/ip-up.d/*
do
diff --git a/package/ppp/files/ppp.pre-up b/package/ppp/files/ppp.pre-up
index 9f82aa98c..79fb063ba 100755
--- a/package/ppp/files/ppp.pre-up
+++ b/package/ppp/files/ppp.pre-up
@@ -37,6 +37,9 @@ REPLACE="
sed "$REPLACE" < /etc/ppp/templates/$IF_USE_TEMPLATE > /etc/ppp/peers/$IF_PROVIDER
case "$IF_PPP_DEVICE" in
+eth*)
+ ip link set up dev $IF_PPP_DEVICE
+ ;;
nas*)
[ "$IF_PPP_ENCAPS" ] || encap=0
[ "$IF_PPP_PAYLOAD" ] || payload=1
diff --git a/package/ppp/patches/patch-pppd_plugins_rp-pppoe_Makefile_linux b/package/ppp/patches/patch-pppd_plugins_rp-pppoe_Makefile_linux
deleted file mode 100644
index 3a7439ce7..000000000
--- a/package/ppp/patches/patch-pppd_plugins_rp-pppoe_Makefile_linux
+++ /dev/null
@@ -1,23 +0,0 @@
---- ppp-2.4.4.orig/pppd/plugins/rp-pppoe/Makefile.linux 2006-06-04 07:07:46.000000000 +0200
-+++ ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux 2009-06-05 19:12:00.000000000 +0200
-@@ -39,9 +39,9 @@ rp-pppoe.so: libplugin.a plugin.o
-
- install: all
- $(INSTALL) -d -m 755 $(LIBDIR)
-- $(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR)
-+ $(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR)
- $(INSTALL) -d -m 755 $(BINDIR)
-- $(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR)
-+ $(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
-
- clean:
- rm -f *.o *.so
-@@ -50,7 +50,7 @@ plugin.o: plugin.c
- $(CC) '-DRP_VERSION="$(VERSION)"' $(CFLAGS) -I../../.. -c -o plugin.o -fPIC plugin.c
-
- libplugin.a: discovery.o if.o common.o debug.o
-- $(AR) -rc $@ $^
-+ $(TARGET_AR) -rcs $@ $^
-
- discovery.o: discovery.c
- $(CC) $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o discovery.o -fPIC discovery.c
diff --git a/package/ppp/patches/patch-pppd_plugins_rp-pppoe_discovery_c b/package/ppp/patches/patch-pppd_plugins_rp-pppoe_discovery_c
deleted file mode 100644
index ee40108d5..000000000
--- a/package/ppp/patches/patch-pppd_plugins_rp-pppoe_discovery_c
+++ /dev/null
@@ -1,27 +0,0 @@
---- ppp-2.4.4.orig/pppd/plugins/rp-pppoe/discovery.c 2005-03-22 11:22:32.000000000 +0100
-+++ ppp-2.4.4/pppd/plugins/rp-pppoe/discovery.c 2009-06-05 19:12:00.000000000 +0200
-@@ -607,12 +607,14 @@ discovery(PPPoEConnection *conn)
- conn->discoveryState = STATE_SENT_PADI;
- waitForPADO(conn, timeout);
-
-+#if 0
- /* If we're just probing for access concentrators, don't do
- exponential backoff. This reduces the time for an unsuccessful
- probe to 15 seconds. */
- if (!conn->printACNames) {
- timeout *= 2;
- }
-+#endif
- if (conn->printACNames && conn->numPADOs) {
- break;
- }
-@@ -635,7 +637,9 @@ discovery(PPPoEConnection *conn)
- sendPADR(conn);
- conn->discoveryState = STATE_SENT_PADR;
- waitForPADS(conn, timeout);
-+#if 0
- timeout *= 2;
-+#endif
- } while (conn->discoveryState == STATE_SENT_PADR);
-
- /* We're done. */