Control: tags -1 patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
- debian/control: Add Build-Depend on ppp-dev.
- debian/rules: Specify "--enable-plugin" to get kernel PPPoE support.
- debian/patches/09_remove-ppp-plugin-path.patch: Remove plugin path so
that pppoe-server uses ppp's plugin directory.
- debian/patches/10_fix-in6.h-include.patch: Fix in6.h include to get
kernel PPPoE support.
* debian/patches/11_reorder-includes.patch: Reorder includes in src/rpppoe.h
to fix FTBFS.
Thanks for considering the patch.
Logan Rosen
-- System Information:
Debian Release: buster/sid
APT prefers cosmic-updates
APT policy: (500, 'cosmic-updates'), (500, 'cosmic-security'), (500,
'cosmic'), (400, 'cosmic-proposed'), (100, 'cosmic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.18.0-13-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru rp-pppoe-3.12/debian/control rp-pppoe-3.12/debian/control
--- rp-pppoe-3.12/debian/control 2016-12-25 05:07:18.000000000 -0500
+++ rp-pppoe-3.12/debian/control 2019-01-15 22:02:09.000000000 -0500
@@ -3,7 +3,7 @@
Standards-Version: 3.9.8
Section: net
Priority: optional
-Build-Depends: debhelper (>= 9)
+Build-Depends: debhelper (>= 9), ppp-dev
Uploaders: Lee Garrett <lgarr...@rocketjump.eu>
Package: pppoe
diff -Nru rp-pppoe-3.12/debian/patches/09_remove-ppp-plugin-path.patch
rp-pppoe-3.12/debian/patches/09_remove-ppp-plugin-path.patch
--- rp-pppoe-3.12/debian/patches/09_remove-ppp-plugin-path.patch
1969-12-31 19:00:00.000000000 -0500
+++ rp-pppoe-3.12/debian/patches/09_remove-ppp-plugin-path.patch
2013-02-05 08:20:32.000000000 -0500
@@ -0,0 +1,11 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -49,7 +49,7 @@
+
+ # Kernel-mode plugin gets installed here.
+ PLUGIN_DIR=/etc/ppp/plugins
+-PLUGIN_PATH=$(PLUGIN_DIR)/rp-pppoe.so
++PLUGIN_PATH=rp-pppoe.so
+
+ # Configuration file paths
+ PPPOESERVER_PPPD_OPTIONS=/etc/ppp/pppoe-server-options
diff -Nru rp-pppoe-3.12/debian/patches/10_fix-in6.h-include.patch
rp-pppoe-3.12/debian/patches/10_fix-in6.h-include.patch
--- rp-pppoe-3.12/debian/patches/10_fix-in6.h-include.patch 1969-12-31
19:00:00.000000000 -0500
+++ rp-pppoe-3.12/debian/patches/10_fix-in6.h-include.patch 2019-01-15
22:01:50.000000000 -0500
@@ -0,0 +1,10 @@
+--- a/src/configure
++++ b/src/configure
+@@ -3709,6 +3709,7 @@
+ #include<net/ethernet.h>
+ #include<linux/if.h>
+ #include<linux/in.h>
++#include<linux/in6.h>
+
+ "
+ if test "x$ac_cv_header_linux_if_pppox_h" = xyes; then :
diff -Nru rp-pppoe-3.12/debian/patches/11_reorder-includes.patch
rp-pppoe-3.12/debian/patches/11_reorder-includes.patch
--- rp-pppoe-3.12/debian/patches/11_reorder-includes.patch 1969-12-31
19:00:00.000000000 -0500
+++ rp-pppoe-3.12/debian/patches/11_reorder-includes.patch 2019-01-15
22:02:09.000000000 -0500
@@ -0,0 +1,22 @@
+--- a/src/pppoe.h
++++ b/src/pppoe.h
+@@ -51,6 +51,10 @@
+ #include <sys/socket.h>
+ #endif
+
++/* This has to be included before Linux 4.8's linux/in.h
++ * gets dragged in. */
++#include <netinet/in.h>
++
+ /* Ugly header files on some Linux boxes... */
+ #if defined(HAVE_LINUX_IF_H)
+ #include <linux/if.h>
+@@ -131,8 +135,6 @@
+ #include <linux/if_ether.h>
+ #endif
+
+-#include <netinet/in.h>
+-
+ #ifdef HAVE_NETINET_IF_ETHER_H
+ #include <sys/types.h>
+
diff -Nru rp-pppoe-3.12/debian/patches/series
rp-pppoe-3.12/debian/patches/series
--- rp-pppoe-3.12/debian/patches/series 2018-12-02 10:24:34.000000000 -0500
+++ rp-pppoe-3.12/debian/patches/series 2019-01-15 22:02:09.000000000 -0500
@@ -1,3 +1,4 @@
+11_reorder-includes.patch
01_auto_ifup.patch
02_change_mac_option.patch
03_man_pages.patch
@@ -5,3 +6,6 @@
05_change_default_timeout.patch
06_typo_fixes.patch
07_pppoestart-echo.patch
+09_remove-ppp-plugin-path.patch
+10_fix-in6.h-include.patch
diff -Nru rp-pppoe-3.12/debian/rules rp-pppoe-3.12/debian/rules
--- rp-pppoe-3.12/debian/rules 2016-12-25 05:08:49.000000000 -0500
+++ rp-pppoe-3.12/debian/rules 2019-01-15 21:58:11.000000000 -0500
@@ -11,7 +11,7 @@
build-indep: build-stamp
build-stamp:
dh_testdir
- test -f src/Makefile || (cd src && PPPD=/usr/sbin/pppd ./configure)
+ test -f src/Makefile || (cd src && PPPD=/usr/sbin/pppd ./configure
--enable-plugin)
$(MAKE) -C src
touch build-stamp
