Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (d5d526b5a7f473f36b040e2679f7afbebe6f5eca)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (d5d526b5a7f473f36b040e2679f7afbebe6f5eca)
  • Date: Tue, 24 Mar 2015 14:50:31 -0500

GIT changes to stable-0.62 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

net/ppp/HISTORY | 8 ++++++--
net/ppp/PRE_BUILD | 4 ++--
net/ppp/l2tp.patch | 32 +++++++++++++++++++++++++++++---
3 files changed, 37 insertions(+), 7 deletions(-)

New commits:
commit d5d526b5a7f473f36b040e2679f7afbebe6f5eca
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

fixed build of pppol2tp.so with recent glibc

(cherry picked from commit f231f89d291709d3eb369dea69f995408218a0c3)

diff --git a/net/ppp/HISTORY b/net/ppp/HISTORY
index 63cf18d..e6e16fc 100644
--- a/net/ppp/HISTORY
+++ b/net/ppp/HISTORY
@@ -1,5 +1,9 @@
-2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: openssl => SSL
+2015-03-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: apply new patch
+ * l2tp.patch: updated, to fix build with recent glibc
+
+2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: openssl => SSL

2013-05-21 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
diff --git a/net/ppp/PRE_BUILD b/net/ppp/PRE_BUILD
index fcd5997..0894b0b 100755
--- a/net/ppp/PRE_BUILD
+++ b/net/ppp/PRE_BUILD
@@ -4,8 +4,8 @@ cd "$SOURCE_DIRECTORY" &&
# include mppe.h into build
patch -p0 < "$SPELL_DIRECTORY/mppe-header.patch" &&

-# fixes use of 2.6.35 headers
-patch -p0 < "$SPELL_DIRECTORY/l2tp.patch" &&
+# fixes use of >3.5 headers
+patch -p1 < "$SPELL_DIRECTORY/l2tp.patch" &&

sedit 's:net/bpf.h:pcap-bpf.h:' pppd/demand.c &&
sedit 's:net/bpf.h:pcap-bpf.h:' pppd/sys-linux.c &&
diff --git a/net/ppp/l2tp.patch b/net/ppp/l2tp.patch
index c9b345e..e99d479 100644
--- a/net/ppp/l2tp.patch
+++ b/net/ppp/l2tp.patch
@@ -1,9 +1,23 @@
---- include/linux/if_pppol2tp.h.orig
-+++ include/linux/if_pppol2tp.h
-@@ -32,6 +32,20 @@
+--- 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,45 @@
__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.
+ */
@@ -18,6 +32,18 @@
+ __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
+



  • [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (d5d526b5a7f473f36b040e2679f7afbebe6f5eca), Vlad Glagolev, 03/24/2015

Archive powered by MHonArc 2.6.24.

Top of Page