From patchwork Tue Nov 20 10:43:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Varnin X-Patchwork-Id: 200306 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 0A2322C0091 for ; Tue, 20 Nov 2012 22:35:32 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 33D24A00FA; Tue, 20 Nov 2012 11:35:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GLSmBmkwTOLe; Tue, 20 Nov 2012 11:35:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 72715A00CB; Tue, 20 Nov 2012 11:35:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id D63B88F74A for ; Tue, 20 Nov 2012 11:35:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 55DCB8A02F for ; Tue, 20 Nov 2012 11:35:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 44j5joNs9+4j for ; Tue, 20 Nov 2012 11:35:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from fallback6.mail.ru (fallback6.mail.ru [94.100.176.134]) by whitealder.osuosl.org (Postfix) with ESMTP id 795208A04F for ; Tue, 20 Nov 2012 11:35:19 +0000 (UTC) Received: from smtp39.i.mail.ru (smtp39.i.mail.ru [94.100.177.99]) by fallback6.mail.ru (mPOP.Fallback_MX) with ESMTP id B57A99B0F401 for ; Tue, 20 Nov 2012 14:43:11 +0400 (MSK) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mail.ru; s=mail; h=Message-Id:Date:Subject:Cc:To:From; bh=ViO1f9DZ9rwlqwVc3nSOc6pMVaLDa83O740KkHsU5TI=; b=Xlb9PEr+IsMK2/S3kU2WUic6qxttggcLaHIOuE8Hhi3L69WDo/VCobSX0k+DnEZ3d+1ZHLa/gIL+mjmiqM9zcpjjX7eLkAAyw1O6bhC0DEiICPNW5b5QnefUKtlW/PNS; Received: from [46.28.89.34] (port=58616 helo=localhost) by smtp39.i.mail.ru with esmtpa (envelope-from ) id 1TalI9-0006lD-1z; Tue, 20 Nov 2012 14:42:57 +0400 From: Alexander Varnin To: buildroot@busybox.net Date: Tue, 20 Nov 2012 14:43:42 +0400 Message-Id: <1353408222-4111-1-git-send-email-fenixk19@mail.ru> X-Mailer: git-send-email 1.7.2.5 X-Spam: Not detected X-Mras: Ok Subject: [Buildroot] [PATCH] pppd: ol2tpv* patch updated from 2.6.35 header to 3.6 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net pppd-2.4.5 doesn't build anymore with v3.6 headers installed. This patch replaces the old one, for 2.6.35 header, and makes it to build correctly. Signed-off-by: Alexander Varnin --- package/pppd/pppd-2.4.5-ol2tp-v3.6.patch | 99 ++++++++++++++++++++++++++ package/pppd/pppd-2.4.5-ol2tpv3-2.6.35.patch | 24 ------ 2 files changed, 99 insertions(+), 24 deletions(-) create mode 100644 package/pppd/pppd-2.4.5-ol2tp-v3.6.patch delete mode 100644 package/pppd/pppd-2.4.5-ol2tpv3-2.6.35.patch diff --git a/package/pppd/pppd-2.4.5-ol2tp-v3.6.patch b/package/pppd/pppd-2.4.5-ol2tp-v3.6.patch new file mode 100644 index 0000000..b9936eb --- /dev/null +++ b/package/pppd/pppd-2.4.5-ol2tp-v3.6.patch @@ -0,0 +1,99 @@ +diff -rp ppp-2.4.5-old/include/linux/if_pppol2tp.h ppp-2.4.5-new/include/linux/if_pppol2tp.h +*** ppp-2.4.5-old/include/linux/if_pppol2tp.h 2009-11-17 01:26:07.000000000 +0300 +--- ppp-2.4.5-new/include/linux/if_pppol2tp.h 2012-11-08 20:16:38.000000000 +0400 +*************** +*** 2,8 **** + * Linux PPP over L2TP (PPPoL2TP) Socket Implementation (RFC 2661) + * + * This file supplies definitions required by the PPP over L2TP driver +! * (pppol2tp.c). All version information wrt this file is located in pppol2tp.c + * + * License: + * This program is free software; you can redistribute it and/or +--- 2,8 ---- + * Linux PPP over L2TP (PPPoL2TP) Socket Implementation (RFC 2661) + * + * This file supplies definitions required by the PPP over L2TP driver +! * (l2tp_ppp.c). All version information wrt this file is located in l2tp_ppp.c + * + * License: + * This program is free software; you can redistribute it and/or +*************** +*** 15,28 **** + #ifndef __LINUX_IF_PPPOL2TP_H + #define __LINUX_IF_PPPOL2TP_H + +! #include + + /* Structure used to connect() the socket to a particular tunnel UDP +! * socket. + */ +! struct pppol2tp_addr +! { +! pid_t pid; /* pid that owns the fd. + * 0 => current */ + int fd; /* FD of UDP socket to use */ + +--- 15,28 ---- + #ifndef __LINUX_IF_PPPOL2TP_H + #define __LINUX_IF_PPPOL2TP_H + +! #include +! + + /* Structure used to connect() the socket to a particular tunnel UDP +! * socket over IPv4. + */ +! struct pppol2tp_addr { +! __kernel_pid_t pid; /* pid that owns the fd. + * 0 => current */ + int fd; /* FD of UDP socket to use */ + +*************** struct pppol2tp_addr +*** 32,37 **** +--- 32,76 ---- + __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. ++ */ ++ struct pppol2tpv3_addr { ++ __kernel_pid_t pid; /* pid that owns the fd. ++ * 0 => current */ ++ int fd; /* FD of UDP or IP socket to use */ ++ ++ struct sockaddr_in addr; /* IP address and port to send to */ ++ ++ __u32 s_tunnel, s_session; /* For matching incoming packets */ ++ __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 diff --git a/package/pppd/pppd-2.4.5-ol2tpv3-2.6.35.patch b/package/pppd/pppd-2.4.5-ol2tpv3-2.6.35.patch deleted file mode 100644 index 0e71e24..0000000 --- a/package/pppd/pppd-2.4.5-ol2tpv3-2.6.35.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- ppp-2.4.5/include/linux/if_pppol2tp.h 2009-11-16 22:26:07.000000000 +0000 -+++ ppp-2.4.5/include/linux/if_pppol2tp.h 2010-07-16 22:35:22.000000000 +0100 -@@ -32,6 +32,20 @@ - __u16 d_tunnel, d_session; /* For sending outgoing packets */ - }; - -+/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32 -+ * bits. So we need a different sockaddr structure. -+ */ -+struct pppol2tpv3_addr { -+ pid_t pid; /* pid that owns the fd. -+ * 0 => current */ -+ int fd; /* FD of UDP or IP socket to use */ -+ -+ struct sockaddr_in addr; /* IP address and port to send to */ -+ -+ __u32 s_tunnel, s_session; /* For matching incoming packets */ -+ __u32 d_tunnel, d_session; /* For sending outgoing packets */ -+}; -+ - /* Socket options: - * DEBUG - bitmask of debug message categories - * SENDSEQ - 0 => don't send packets with sequence numbers -