tags 707538 + patch
tags 707538 + pending
thanks
Dear maintainer,
I've prepared an NMU for ppp (versioned as 2.4.5-5.2) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards,
Chris
diff -u ppp-2.4.5/debian/changelog ppp-2.4.5/debian/changelog
--- ppp-2.4.5/debian/changelog
+++ ppp-2.4.5/debian/changelog
@@ -1,3 +1,12 @@
+ppp (2.4.5-5.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Replace patch update_if_pppol2tp with
+ remove-old-version-of-Linux-if_pppol2tp-h.patch to fix build failures with
+ kernels since wheezy. (Closes: #707538)
+
+ -- Chris Boot <bo...@bootc.net> Tue, 28 May 2013 15:56:31 +0100
+
ppp (2.4.5-5.1) unstable; urgency=low
* Non-maintainer upload.
reverted:
--- ppp-2.4.5/debian/patches/update_if_pppol2tp
+++ ppp-2.4.5.orig/debian/patches/update_if_pppol2tp
@@ -1,53 +0,0 @@
-diff --git a/include/linux/if_pppol2tp.h b/include/linux/if_pppol2tp.h
-index 4113d6a..7ee86b2 100644
---- a/include/linux/if_pppol2tp.h
-+++ b/include/linux/if_pppol2tp.h
-@@ -2,7 +2,7 @@
- * 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
-+ * (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,14 +15,14 @@
- #ifndef __LINUX_IF_PPPOL2TP_H
- #define __LINUX_IF_PPPOL2TP_H
-
--#include <asm/types.h>
-+#include <linux/types.h>
-+
-
- /* Structure used to connect() the socket to a particular tunnel UDP
- * socket.
- */
--struct pppol2tp_addr
--{
-- pid_t pid; /* pid that owns the fd.
-+struct pppol2tp_addr {
-+ __kernel_pid_t pid; /* pid that owns the fd.
- * 0 => current */
- int fd; /* FD of UDP socket to use */
-
-@@ -32,6 +32,20 @@ struct pppol2tp_addr
- __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
diff -u ppp-2.4.5/debian/patches/series ppp-2.4.5/debian/patches/series
--- ppp-2.4.5/debian/patches/series
+++ ppp-2.4.5/debian/patches/series
@@ -5,7 +5,6 @@
pppoatm_no_modprobe
adaptive_echos
use_system_logwtmp
-update_if_pppol2tp
dont-exit-pado-timeout
fix_warnings
man_syntax_errors
@@ -42,0 +42,2 @@
+# pulled from upstream
+remove-old-version-of-Linux-if_pppol2tp-h.patch
only in patch2:
unchanged:
---
ppp-2.4.5.orig/debian/patches/remove-old-version-of-Linux-if_pppol2tp-h.patch
+++ ppp-2.4.5/debian/patches/remove-old-version-of-Linux-if_pppol2tp-h.patch
@@ -0,0 +1,93 @@
+Description: 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.
+
+Origin: upstream,
http://git.ozlabs.org/?p=ppp.git;a=commit;h=c41092dd4c49267f232f6cba3d31c6c68bfdf68d
+Author: Paul Mackerras <pau...@samba.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=707538
+Reviewed-by: Chris Boot <bo...@bootc.net>
+Last-Update: 2013-05-28
+---
+ include/linux/if_pppol2tp.h | 65 -------------------------------------------
+ 1 file changed, 65 deletions(-)
+ delete mode 100644 include/linux/if_pppol2tp.h
+
+diff --git a/include/linux/if_pppol2tp.h b/include/linux/if_pppol2tp.h
+deleted file mode 100644
+index 4113d6a..0000000
+--- a/include/linux/if_pppol2tp.h
++++ /dev/null
+@@ -1,65 +0,0 @@
+-/***************************************************************************
+- * 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
+- * modify it under the terms of the GNU General Public License
+- * as published by the Free Software Foundation; either version
+- * 2 of the License, or (at your option) any later version.
+- *
+- */
+-
+-#ifndef __LINUX_IF_PPPOL2TP_H
+-#define __LINUX_IF_PPPOL2TP_H
+-
+-#include <asm/types.h>
+-
+-/* 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 */
+-
+- struct sockaddr_in addr; /* IP address and port to send to */
+-
+- __u16 s_tunnel, s_session; /* For matching incoming packets */
+- __u16 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
+- * 1 => send packets with sequence numbers
+- * RECVSEQ - 0 => receive packet sequence numbers are optional
+- * 1 => drop receive packets without sequence numbers
+- * LNSMODE - 0 => act as LAC.
+- * 1 => act as LNS.
+- * REORDERTO - reorder timeout (in millisecs). If 0, don't try to reorder.
+- */
+-enum {
+- PPPOL2TP_SO_DEBUG = 1,
+- PPPOL2TP_SO_RECVSEQ = 2,
+- PPPOL2TP_SO_SENDSEQ = 3,
+- PPPOL2TP_SO_LNSMODE = 4,
+- PPPOL2TP_SO_REORDERTO = 5,
+-};
+-
+-/* Debug message categories for the DEBUG socket option */
+-enum {
+- PPPOL2TP_MSG_DEBUG = (1 << 0), /* verbose debug (if
+- * compiled in) */
+- PPPOL2TP_MSG_CONTROL = (1 << 1), /* userspace - kernel
+- * interface */
+- PPPOL2TP_MSG_SEQ = (1 << 2), /* sequence numbers */
+- PPPOL2TP_MSG_DATA = (1 << 3), /* data packets */
+-};
+-
+-
+-
+-#endif
+--
+1.7.10.4
+
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
