ppp: upgrade to 2.4.6

PATCH New Hongxu Jia 1 participant 4 messages Mar 3, 2014

lore

Share & tools

lore

Hongxu Jia

author

2014-03-03 08:27 UTC #0 lore raw

cover ppp: upgrade to 2.4.6

The following changes since commit 54c2e993ec129563c7ae9f3fdee74ab60da28698:

bsps: update H/W reference boards to v3.10.32 (2014-03-02 17:25:30 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib hongxu/ppp
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/ppp

Hongxu Jia (3):
ppp: upgrade to 2.4.6
ppp: drop enable-ipv6.patch
ppp: drop if_pppol2tp.h patches

 ...1-ppp-Add-two-structures-in-if_pppol2tp.h.patch | 60 ----------------------
 .../ppp/ppp-2.4.5/enable-ipv6.patch                | 15 ------
 .../ppp/ppp-2.4.5/update_if_pppol2tp.patch         | 54 -------------------
 ...01-ppp-Fix-compilation-errors-in-Makefile.patch |  0
 .../ppp/{ppp-2.4.5 => ppp}/08setupdns              |  0
 .../ppp/{ppp-2.4.5 => ppp}/92removedns             |  0
 .../ppp/{ppp-2.4.5 => ppp}/cifdefroute.patch       |  0
 .../ppp/{ppp-2.4.5 => ppp}/copts.patch             |  0
 .../ppp/{ppp-2.4.5 => ppp}/init                    |  0
 .../ppp/{ppp-2.4.5 => ppp}/ip-down                 |  0
 .../ppp/{ppp-2.4.5 => ppp}/ip-up                   |  0
 .../makefile-remove-hard-usr-reference.patch       |  0
 .../ppp/{ppp-2.4.5 => ppp}/makefile.patch          |  0
 .../ppp/{ppp-2.4.5 => ppp}/pap                     |  0
 .../ppp/{ppp-2.4.5 => ppp}/poff                    |  0
 .../ppp/{ppp-2.4.5 => ppp}/pon                     |  0
 .../ppp/{ppp-2.4.5 => ppp}/ppp_on_boot             |  0
 .../{ppp-2.4.5 => ppp}/pppd-resolv-varrun.patch    |  0
 .../ppp/{ppp-2.4.5 => ppp}/provider                |  0
 .../ppp/{ppp_2.4.5.bb => ppp_2.4.6.bb}             |  8 +--
 20 files changed, 2 insertions(+), 135 deletions(-)
 delete mode 100644 meta/recipes-connectivity/ppp/ppp-2.4.5/0001-ppp-Add-two-structures-in-if_pppol2tp.h.patch
 delete mode 100644 meta/recipes-connectivity/ppp/ppp-2.4.5/enable-ipv6.patch
 delete mode 100644 meta/recipes-connectivity/ppp/ppp-2.4.5/update_if_pppol2tp.patch
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/0001-ppp-Fix-compilation-errors-in-Makefile.patch (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/08setupdns (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/92removedns (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/cifdefroute.patch (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/copts.patch (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/init (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/ip-down (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/ip-up (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/makefile-remove-hard-usr-reference.patch (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/makefile.patch (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/pap (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/poff (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/pon (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/ppp_on_boot (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/pppd-resolv-varrun.patch (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/provider (100%)
 rename meta/recipes-connectivity/ppp/{ppp_2.4.5.bb => ppp_2.4.6.bb} (93%)

Signature · 1 line

1.8.1.2

Hongxu Jia

author

2014-03-03 08:27 UTC #1 lore raw

PATCH 1/3 ppp: upgrade to 2.4.6

Signed-off-by Hongxu Jia <[email protected]>

---
 .../0001-ppp-Fix-compilation-errors-in-Makefile.patch             | 0
 meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/08setupdns       | 0
 meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/92removedns      | 0
 .../recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/cifdefroute.patch | 0
 meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/copts.patch      | 0
 meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/init             | 0
 meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/ip-down          | 0
 meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/ip-up            | 0
 .../{ppp-2.4.5 => ppp}/makefile-remove-hard-usr-reference.patch   | 0
 meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/makefile.patch   | 0
 meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/pap              | 0
 meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/poff             | 0
 meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/pon              | 0
 meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/ppp_on_boot      | 0
 .../ppp/{ppp-2.4.5 => ppp}/pppd-resolv-varrun.patch               | 0
 meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/provider         | 0
 meta/recipes-connectivity/ppp/{ppp_2.4.5.bb => ppp_2.4.6.bb}      | 8 ++------
 17 files changed, 2 insertions(+), 6 deletions(-)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/0001-ppp-Fix-compilation-errors-in-Makefile.patch (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/08setupdns (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/92removedns (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/cifdefroute.patch (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/copts.patch (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/init (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/ip-down (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/ip-up (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/makefile-remove-hard-usr-reference.patch (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/makefile.patch (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/pap (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/poff (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/pon (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/ppp_on_boot (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/pppd-resolv-varrun.patch (100%)
 rename meta/recipes-connectivity/ppp/{ppp-2.4.5 => ppp}/provider (100%)
 rename meta/recipes-connectivity/ppp/{ppp_2.4.5.bb => ppp_2.4.6.bb} (93%)

meta/recipes-connectivity/ppp/ppp/0001-ppp-Fix-compilation-errors-in-Makefile.patch renamed from meta/recipes-connectivity/ppp/ppp-2.4.5/0001-ppp-Fix-compilation-errors-in-Makefile.patch +0 -0

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

meta/recipes-connectivity/ppp/ppp/08setupdns renamed from meta/recipes-connectivity/ppp/ppp-2.4.5/08setupdns +0 -0

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

meta/recipes-connectivity/ppp/ppp/92removedns renamed from meta/recipes-connectivity/ppp/ppp-2.4.5/92removedns +0 -0

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

meta/recipes-connectivity/ppp/ppp/cifdefroute.patch renamed from meta/recipes-connectivity/ppp/ppp-2.4.5/cifdefroute.patch +0 -0

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

meta/recipes-connectivity/ppp/ppp/copts.patch renamed from meta/recipes-connectivity/ppp/ppp-2.4.5/copts.patch +0 -0

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

meta/recipes-connectivity/ppp/ppp/init renamed from meta/recipes-connectivity/ppp/ppp-2.4.5/init +0 -0

similarity index 100%
rename from meta/recipes-connectivity/ppp/ppp-2.4.5/init
rename to meta/recipes-connectivity/ppp/ppp/init

meta/recipes-connectivity/ppp/ppp/ip-down renamed from meta/recipes-connectivity/ppp/ppp-2.4.5/ip-down +0 -0

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

meta/recipes-connectivity/ppp/ppp/ip-up renamed from meta/recipes-connectivity/ppp/ppp-2.4.5/ip-up +0 -0

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

meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch renamed from meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch +0 -0

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

meta/recipes-connectivity/ppp/ppp/makefile.patch renamed from meta/recipes-connectivity/ppp/ppp-2.4.5/makefile.patch +0 -0

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

meta/recipes-connectivity/ppp/ppp/pap renamed from meta/recipes-connectivity/ppp/ppp-2.4.5/pap +0 -0

similarity index 100%
rename from meta/recipes-connectivity/ppp/ppp-2.4.5/pap
rename to meta/recipes-connectivity/ppp/ppp/pap

meta/recipes-connectivity/ppp/ppp/poff renamed from meta/recipes-connectivity/ppp/ppp-2.4.5/poff +0 -0

similarity index 100%
rename from meta/recipes-connectivity/ppp/ppp-2.4.5/poff
rename to meta/recipes-connectivity/ppp/ppp/poff

meta/recipes-connectivity/ppp/ppp/pon renamed from meta/recipes-connectivity/ppp/ppp-2.4.5/pon +0 -0

similarity index 100%
rename from meta/recipes-connectivity/ppp/ppp-2.4.5/pon
rename to meta/recipes-connectivity/ppp/ppp/pon

meta/recipes-connectivity/ppp/ppp/ppp_on_boot renamed from meta/recipes-connectivity/ppp/ppp-2.4.5/ppp_on_boot +0 -0

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

meta/recipes-connectivity/ppp/ppp/pppd-resolv-varrun.patch renamed from meta/recipes-connectivity/ppp/ppp-2.4.5/pppd-resolv-varrun.patch +0 -0

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

meta/recipes-connectivity/ppp/ppp/provider renamed from meta/recipes-connectivity/ppp/ppp-2.4.5/provider +0 -0

similarity index 100%
rename from meta/recipes-connectivity/ppp/ppp-2.4.5/provider
rename to meta/recipes-connectivity/ppp/ppp/provider

meta/recipes-connectivity/ppp/ppp_2.4.6.bb renamed from meta/recipes-connectivity/ppp/ppp_2.4.5.bb +2 -6

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
@@ -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

Signature · 1 line

1.8.1.2

Hongxu Jia

author

2014-03-03 08:27 UTC #2 lore raw

PATCH 2/3 ppp: drop enable-ipv6.patch

In reply to Hongxu Jia

IPV6 has been enabled by default in 2.4.6

Signed-off-by Hongxu Jia <[email protected]>

---
 meta/recipes-connectivity/ppp/ppp-2.4.5/enable-ipv6.patch | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 meta/recipes-connectivity/ppp/ppp-2.4.5/enable-ipv6.patch

meta/recipes-connectivity/ppp/ppp-2.4.5/enable-ipv6.patch deleted +0 ~~-15~~

deleted file mode 100644
index e5fc3f4..0000000
@@ -1,15 +0,0 @@
-The patch comes from OpenEmbedded
-
-Upstream-Status: Inappropriate [enable feature]
-
---- 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

Signature · 1 line

1.8.1.2

Hongxu Jia

author

2014-03-03 08:27 UTC #3 lore raw

PATCH 3/3 ppp: drop if_pppol2tp.h patches

In reply to Hongxu Jia

The old version of Linux if_pppol2tp.h was removed, so droped the related patches.

Here is the commit from git://github.com/paulusmack/ppp.git
...
commit c41092dd4c49267f232f6cba3d31c6c68bfdf68d

Author: Paul Mackerras <[email protected]>
Date:   Sun May 20 16:48:17 2012 +1000

Remove old version of Linux if_pppol2tp.h

This has been in the Linux kernel source now for long enough that we can rely on getting a usable version from /usr/include on all distributions that we care about. The version we have here had started to lag behind what is in the Linux kernel, causing compilation errors due to struct pppol2tpv3_addr being undefined. Removing our local version means we will use what is in /usr/include instead.
...

Signed-off-by Hongxu Jia <[email protected]>

---
 ...1-ppp-Add-two-structures-in-if_pppol2tp.h.patch | 60 ----------------------
 .../ppp/ppp-2.4.5/update_if_pppol2tp.patch         | 54 -------------------
 2 files changed, 114 deletions(-)
 delete mode 100644 meta/recipes-connectivity/ppp/ppp-2.4.5/0001-ppp-Add-two-structures-in-if_pppol2tp.h.patch
 delete mode 100644 meta/recipes-connectivity/ppp/ppp-2.4.5/update_if_pppol2tp.patch

meta/recipes-connectivity/ppp/ppp-2.4.5/0001-ppp-Add-two-structures-in-if_pppol2tp.h.patch deleted +0 ~~-60~~

deleted file mode 100644
index 33b200a..0000000
@@ -1,60 +0,0 @@
-From 17ffc69db08c809c069e73aa2f2ed2ce02df5fa8 Mon Sep 17 00:00:00 2001
-From: Lu Chong <[email protected]>
-Date: Sat, 2 Nov 2013 14:34:24 +0800
-Subject: [PATCH] ppp: Add two structures in if_pppol2tp.h
-
-Some further structure definitions are needed in include/linux/if_pppol2tp.h for IPv6 support.
-
-Upstream-Status: Pending
-
-Signed-off-by: Lu Chong <[email protected]>
----
- include/linux/if_pppol2tp.h |   25 +++++++++++++++++++++++++
- 1 file changed, 25 insertions(+)
-
-diff --git a/include/linux/if_pppol2tp.h b/include/linux/if_pppol2tp.h
-index 7ee86b2..9d626d1 100644
---- a/include/linux/if_pppol2tp.h
-+++ b/include/linux/if_pppol2tp.h
-@@ -32,6 +32,20 @@ struct pppol2tp_addr {
- 	__u16 d_tunnel, d_session;	/* For sending outgoing packets */
- };
- 
-+/* Structure used to connect() the socket to a particular tunnel UDP
-+ * socket over IPv6.
-+ */
-+struct pppol2tpin6_addr {
-+        __kernel_pid_t  pid;            /* pid that owns the fd.
-+                                         * 0 => current */
-+        int     fd;                     /* FD of UDP socket to use */
-+
-+        __u16 s_tunnel, s_session;      /* For matching incoming packets */
-+        __u16 d_tunnel, d_session;      /* For sending outgoing packets */
-+
-+        struct sockaddr_in6 addr;       /* IP address and port to send to */
-+};
-+
- /* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
-  * bits. So we need a different sockaddr structure.
-  */
-@@ -46,6 +60,17 @@ struct pppol2tpv3_addr {
- 	__u32 d_tunnel, d_session;	/* For sending outgoing packets */
- };
- 
-+struct pppol2tpv3in6_addr {
-+        __kernel_pid_t  pid;            /* pid that owns the fd.
-+                                         * 0 => current */
-+        int     fd;                     /* FD of UDP or IP socket to use */
-+
-+        __u32 s_tunnel, s_session;      /* For matching incoming packets */
-+        __u32 d_tunnel, d_session;      /* For sending outgoing packets */
-+
-+        struct sockaddr_in6 addr;       /* IP address and port to send to */
-+};
-+
- /* Socket options:
-  * DEBUG	- bitmask of debug message categories
-  * SENDSEQ	- 0 => don't send packets with sequence numbers
--- 
-1.7.9.5
-

meta/recipes-connectivity/ppp/ppp-2.4.5/update_if_pppol2tp.patch deleted +0 ~~-54~~

54 lines not on this page · raw message

Signature · 1 line

1.8.1.2