ppp: upgrade to 2.4.6

(From OE-Core rev: d05b1d06b5b8b84c2a40639ad28e31cd683f89a4)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/0001-ppp-Fix-compilation-errors-in-Makefile.patch b/meta/recipes-connectivity/ppp/ppp/0001-ppp-Fix-compilation-errors-in-Makefile.patch
similarity index 100%
rename from meta/recipes-connectivity/ppp/ppp-2.4.5/0001-ppp-Fix-compilation-errors-in-Makefile.patch
rename to meta/recipes-connectivity/ppp/ppp/0001-ppp-Fix-compilation-errors-in-Makefile.patch

diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/08setupdns b/meta/recipes-connectivity/ppp/ppp/08setupdns
similarity index 100%
rename from meta/recipes-connectivity/ppp/ppp-2.4.5/08setupdns
rename to meta/recipes-connectivity/ppp/ppp/08setupdns

diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/92removedns b/meta/recipes-connectivity/ppp/ppp/92removedns
similarity index 100%
rename from meta/recipes-connectivity/ppp/ppp-2.4.5/92removedns
rename to meta/recipes-connectivity/ppp/ppp/92removedns

diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/cifdefroute.patch b/meta/recipes-connectivity/ppp/ppp/cifdefroute.patch
similarity index 100%
rename from meta/recipes-connectivity/ppp/ppp-2.4.5/cifdefroute.patch
rename to meta/recipes-connectivity/ppp/ppp/cifdefroute.patch

diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/copts.patch b/meta/recipes-connectivity/ppp/ppp/copts.patch
similarity index 100%
rename from meta/recipes-connectivity/ppp/ppp-2.4.5/copts.patch
rename to meta/recipes-connectivity/ppp/ppp/copts.patch

diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/init b/meta/recipes-connectivity/ppp/ppp/init
similarity index 100%
rename from meta/recipes-connectivity/ppp/ppp-2.4.5/init
rename to meta/recipes-connectivity/ppp/ppp/init

diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/ip-down b/meta/recipes-connectivity/ppp/ppp/ip-down
similarity index 100%
rename from meta/recipes-connectivity/ppp/ppp-2.4.5/ip-down
rename to meta/recipes-connectivity/ppp/ppp/ip-down

diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/ip-up b/meta/recipes-connectivity/ppp/ppp/ip-up
similarity index 100%
rename from meta/recipes-connectivity/ppp/ppp-2.4.5/ip-up
rename to meta/recipes-connectivity/ppp/ppp/ip-up

diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch b/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch
similarity index 100%
rename from meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch
rename to meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch

diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile.patch b/meta/recipes-connectivity/ppp/ppp/makefile.patch
similarity index 100%
rename from meta/recipes-connectivity/ppp/ppp-2.4.5/makefile.patch
rename to meta/recipes-connectivity/ppp/ppp/makefile.patch

diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/pap b/meta/recipes-connectivity/ppp/ppp/pap
similarity index 100%
rename from meta/recipes-connectivity/ppp/ppp-2.4.5/pap
rename to meta/recipes-connectivity/ppp/ppp/pap

diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/poff b/meta/recipes-connectivity/ppp/ppp/poff
similarity index 100%
rename from meta/recipes-connectivity/ppp/ppp-2.4.5/poff
rename to meta/recipes-connectivity/ppp/ppp/poff

diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/pon b/meta/recipes-connectivity/ppp/ppp/pon
similarity index 100%
rename from meta/recipes-connectivity/ppp/ppp-2.4.5/pon
rename to meta/recipes-connectivity/ppp/ppp/pon

diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/ppp_on_boot b/meta/recipes-connectivity/ppp/ppp/ppp_on_boot
similarity index 100%
rename from meta/recipes-connectivity/ppp/ppp-2.4.5/ppp_on_boot
rename to meta/recipes-connectivity/ppp/ppp/ppp_on_boot

diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/pppd-resolv-varrun.patch b/meta/recipes-connectivity/ppp/ppp/pppd-resolv-varrun.patch
similarity index 100%
rename from meta/recipes-connectivity/ppp/ppp-2.4.5/pppd-resolv-varrun.patch
rename to meta/recipes-connectivity/ppp/ppp/pppd-resolv-varrun.patch

diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/provider b/meta/recipes-connectivity/ppp/ppp/provider
similarity index 100%
rename from meta/recipes-connectivity/ppp/ppp-2.4.5/provider
rename to meta/recipes-connectivity/ppp/ppp/provider

diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb b/meta/recipes-connectivity/ppp/ppp_2.4.6.bb
similarity index 93%
rename from meta/recipes-connectivity/ppp/ppp_2.4.5.bb
rename to meta/recipes-connectivity/ppp/ppp_2.4.6.bb
index 15ee3ff..b98abec 100644 (file)
--- a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
+++ b/meta/recipes-connectivity/ppp/ppp_2.4.6.bb
@@ -10,15 +10,12 @@ LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77
                     file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \
                     file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \
                     file://chat/chat.c;beginline=1;endline=15;md5=0d374b8545ee5c62d7aff1acbd38add2"
-PR = "r6"
 
 SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
            file://makefile.patch \
            file://cifdefroute.patch \
            file://pppd-resolv-varrun.patch \
-           file://enable-ipv6.patch \
            file://makefile-remove-hard-usr-reference.patch \
-           file://update_if_pppol2tp.patch \
            file://pon \
            file://poff \
            file://init \
@@ -30,12 +27,11 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
            file://pap \
            file://ppp_on_boot \
            file://provider \
-           file://0001-ppp-Add-two-structures-in-if_pppol2tp.h.patch \
            file://0001-ppp-Fix-compilation-errors-in-Makefile.patch \
 "
 
-SRC_URI[md5sum] = "4621bc56167b6953ec4071043fe0ec57"
-SRC_URI[sha256sum] = "43317afec9299f9920b96f840414c977f0385410202d48e56d2fdb8230003505"
+SRC_URI[md5sum] = "3434d2cc9327167a0723aaaa8670083b"
+SRC_URI[sha256sum] = "1b33181a03962c8a092c055fb9980e9722728a8d98a4bb7ec7acda17c1b1b49d"
 
 inherit autotools-brokensep