Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (a1403a1a52765f7b6500c69ee493509c93688bcb)

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 master grimoire by Vlad Glagolev (a1403a1a52765f7b6500c69ee493509c93688bcb)
  • Date: Tue, 4 Jan 2011 16:17:19 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

net/ppp/BUILD | 10 +++-------
net/ppp/HISTORY | 6 ++++++
net/ppp/PRE_BUILD | 15 +++++++++++++--
net/ppp/l2tp.patch | 23 +++++++++++++++++++++++
4 files changed, 45 insertions(+), 9 deletions(-)

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

ppp: fixed compilation with 2.6.35 headers, made use of optimization flags

diff --git a/net/ppp/BUILD b/net/ppp/BUILD
index 0fd11ae..a5db5a4 100755
--- a/net/ppp/BUILD
+++ b/net/ppp/BUILD
@@ -1,10 +1,6 @@
create_group ppp &&

-sedit 's:net/bpf.h:pcap-bpf.h:' pppd/demand.c &&
-sedit 's:net/bpf.h:pcap-bpf.h:' pppd/sys-linux.c &&
-sedit 's:/usr/man:/usr/share/man:' linux/Makefile.top &&
-if [ "$HAVE_CBCP" == "y" ]; then
- sedit 's:#CBCP=y:CBCP=y:' pppd/Makefile.linux
-fi &&
+./configure --prefix="$INSTALL_ROOT/usr" \
+ --sysconfdir="$INSTALL_ROOT/etc" &&

-default_build
+make COPTS="$CFLAGS"
diff --git a/net/ppp/HISTORY b/net/ppp/HISTORY
index 0a5bb19..e88366b 100644
--- a/net/ppp/HISTORY
+++ b/net/ppp/HISTORY
@@ -1,3 +1,9 @@
+2011-01-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: leave group-creation only here; moved all source
modifications
+ to PRE_BUILD; use CFLAGS
+ * PRE_BUILD: apply the patch
+ * l2tp.patch: added, to fix compilation with 2.6.35 headers
+
2010-02-14 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.4.5; quoting paths

diff --git a/net/ppp/PRE_BUILD b/net/ppp/PRE_BUILD
index 491b985..56fd526 100755
--- a/net/ppp/PRE_BUILD
+++ b/net/ppp/PRE_BUILD
@@ -1,2 +1,13 @@
-default_pre_build &&
-create_group ppp
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+# fixes use of 2.6.35 headers
+patch -p0 < "$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 &&
+sedit 's:/usr/man:/usr/share/man:' linux/Makefile.top &&
+
+if [ "$HAVE_CBCP" == "y" ]; then
+ sedit 's:#CBCP=y:CBCP=y:' pppd/Makefile.linux
+fi
diff --git a/net/ppp/l2tp.patch b/net/ppp/l2tp.patch
new file mode 100644
index 0000000..c9b345e
--- /dev/null
+++ b/net/ppp/l2tp.patch
@@ -0,0 +1,23 @@
+--- include/linux/if_pppol2tp.h.orig
++++ include/linux/if_pppol2tp.h
+@@ -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



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (a1403a1a52765f7b6500c69ee493509c93688bcb), Vlad Glagolev, 01/04/2011

Archive powered by MHonArc 2.6.24.

Top of Page