diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-05-28 19:12:29 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 23:39:35 +0200 |
commit | 646a5c1cbfd95873950a87b5f75d52073a967023 (patch) | |
tree | b8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/n/rp-pppoe/rp-pppoe-3.12-bz1469960-new-kernel-header.patch | |
parent | d31c50870d0bee042ce660e445c9294a59a3a65b (diff) | |
download | current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.xz |
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt.
installpkg: default line length for --terselength is the number of columns.
removepkg: added --terse mode.
upgradepkg: default line length for --terselength is the number of columns.
upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz: Upgraded.
d/bison-3.0.5-x86_64-1.txz: Upgraded.
e/emacs-26.1-x86_64-1.txz: Upgraded.
kde/kopete-4.14.3-x86_64-8.txz: Rebuilt.
Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz: Upgraded.
n/links-2.16-x86_64-2.txz: Rebuilt.
Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded.
n/nftables-0.8.5-x86_64-1.txz: Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz: Upgraded.
n/ulogd-2.0.7-x86_64-1.txz: Upgraded.
n/whois-5.3.1-x86_64-1.txz: Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/n/rp-pppoe/rp-pppoe-3.12-bz1469960-new-kernel-header.patch')
-rw-r--r-- | source/n/rp-pppoe/rp-pppoe-3.12-bz1469960-new-kernel-header.patch | 100 |
1 files changed, 100 insertions, 0 deletions
diff --git a/source/n/rp-pppoe/rp-pppoe-3.12-bz1469960-new-kernel-header.patch b/source/n/rp-pppoe/rp-pppoe-3.12-bz1469960-new-kernel-header.patch new file mode 100644 index 000000000..2b26edac7 --- /dev/null +++ b/source/n/rp-pppoe/rp-pppoe-3.12-bz1469960-new-kernel-header.patch @@ -0,0 +1,100 @@ +diff -up rp-pppoe-3.12/src/if.c.than rp-pppoe-3.12/src/if.c +--- rp-pppoe-3.12/src/if.c.than 2017-07-25 11:04:53.780466912 +0200 ++++ rp-pppoe-3.12/src/if.c 2017-07-25 11:05:35.951885962 +0200 +@@ -20,6 +20,12 @@ static char const RCSID[] = + + #include "pppoe.h" + ++#if defined(HAVE_LINUX_IF_H) ++#include <linux/if.h> ++#elif defined(HAVE_NET_IF_H) ++#include <net/if.h> ++#endif ++ + #ifdef HAVE_UNISTD_H + #include <unistd.h> + #endif +diff -up rp-pppoe-3.12/src/plugin.c.than rp-pppoe-3.12/src/plugin.c +--- rp-pppoe-3.12/src/plugin.c.than 2017-07-25 11:05:50.145353868 +0200 ++++ rp-pppoe-3.12/src/plugin.c 2017-07-25 11:07:00.068732535 +0200 +@@ -49,6 +49,11 @@ static char const RCSID[] = + #include <unistd.h> + #include <fcntl.h> + #include <signal.h> ++#if defined(HAVE_LINUX_IF_H) ++#include <linux/if.h> ++#elif defined(HAVE_NET_IF_H) ++#include <net/if.h> ++#endif + #include <net/ethernet.h> + #include <net/if_arp.h> + #include <linux/ppp_defs.h> +diff -up rp-pppoe-3.12/src/pppoe.h.than rp-pppoe-3.12/src/pppoe.h +--- rp-pppoe-3.12/src/pppoe.h.than 2017-07-25 11:07:38.141305245 +0200 ++++ rp-pppoe-3.12/src/pppoe.h 2017-07-25 11:08:34.409195838 +0200 +@@ -51,13 +51,6 @@ extern int IsSetID; + #include <sys/socket.h> + #endif + +-/* Ugly header files on some Linux boxes... */ +-#if defined(HAVE_LINUX_IF_H) +-#include <linux/if.h> +-#elif defined(HAVE_NET_IF_H) +-#include <net/if.h> +-#endif +- + #ifdef HAVE_NET_IF_TYPES_H + #include <net/if_types.h> + #endif +@@ -136,9 +129,6 @@ typedef unsigned long UINT32_t; + #ifdef HAVE_NETINET_IF_ETHER_H + #include <sys/types.h> + +-#ifdef HAVE_SYS_SOCKET_H +-#include <sys/socket.h> +-#endif + #ifndef HAVE_SYS_DLPI_H + #include <netinet/if_ether.h> + #endif +diff -up rp-pppoe-3.12/src/pppoe-server.c.than rp-pppoe-3.12/src/pppoe-server.c +--- rp-pppoe-3.12/src/pppoe-server.c.than 2017-07-25 11:08:51.505554918 +0200 ++++ rp-pppoe-3.12/src/pppoe-server.c 2017-07-25 11:09:59.230016098 +0200 +@@ -26,6 +26,13 @@ static char const RCSID[] = + + #define _BSD_SOURCE 1 /* for gethostname */ + ++#include <sys/socket.h> ++#if defined(HAVE_LINUX_IF_H) ++#include <linux/if.h> ++#elif defined(HAVE_NET_IF_H) ++#include <net/if.h> ++#endif ++ + #include "pppoe-server.h" + #include "md5.h" + +diff -up rp-pppoe-3.12/src/relay.c.than rp-pppoe-3.12/src/relay.c +--- rp-pppoe-3.12/src/relay.c.than 2017-07-25 11:10:13.863467871 +0200 ++++ rp-pppoe-3.12/src/relay.c 2017-07-25 11:11:17.747074537 +0200 +@@ -18,11 +18,19 @@ static char const RCSID[] = + "$Id$"; + + #define _GNU_SOURCE 1 /* For SA_RESTART */ +- +-#include "relay.h" ++#include "config.h" + + #include <signal.h> + ++#include <sys/socket.h> ++#if defined(HAVE_LINUX_IF_H) ++#include <linux/if.h> ++#elif defined(HAVE_NET_IF_H) ++#include <net/if.h> ++#endif ++ ++#include "relay.h" ++ + #ifdef HAVE_SYSLOG_H + #include <syslog.h> + #endif |