[arch-commits] Commit in rp-pppoe/trunk (PKGBUILD rp-pppoe-linux-headers.patch)

[Antonio Rojas]

    Date: Thursday, June 7, 2018 @ 07:51:07
  Author: arojas
Revision: 326189

BUILDINFO rebuild

Added:
  rp-pppoe/trunk/rp-pppoe-linux-headers.patch
Modified:
  rp-pppoe/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |   16 +++++++++-------
 rp-pppoe-linux-headers.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-07 07:47:18 UTC (rev 326188)
+++ PKGBUILD	2018-06-07 07:51:07 UTC (rev 326189)
@@ -4,7 +4,7 @@
 
 pkgname=rp-pppoe
 pkgver=3.12
-pkgrel=1
+pkgrel=3
 pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client"
 arch=('x86_64')
 url="https://www.roaringpenguin.com/products/pppoe"
@@ -16,22 +16,23 @@
 install=rp-pppoe.install
 source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.sig} 
        adsl.service 
-       kmode.patch)
+       kmode.patch rp-pppoe-linux-headers.patch)
 validpgpkeys=('FC2E9B645468698FD7B21655C1842E2A126F42E0') # Dianne Skoll
 
 prepare() {
-  cd "$srcdir/$pkgname-$pkgver/src"
-  patch -Np2 -i ../../kmode.patch
+  cd $pkgname-$pkgver
+  patch -p1 -i ../kmode.patch
+  patch -p1 -i ../rp-pppoe-linux-headers.patch # Gentoo patch
 }
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver/src"
+  cd $pkgname-$pkgver/src
   ./configure --prefix=/usr --sbindir=/usr/bin --enable-plugin
   make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver/src"
+  cd $pkgname-$pkgver/src
   make PLUGIN_DIR="/usr/lib/rp-pppoe" DESTDIR="$pkgdir" install
 
   #install -Dm755 "$srcdir/adsl" "$pkgdir/etc/rc.d/adsl"
@@ -40,4 +41,5 @@
 md5sums=('216eb52b69062b92a64ee37fd71f4b66'
          'SKIP'
          '926b00aa2a0c0d3a21970acde9695e47'
-         '8df35e67558b6b4567d1ab24c9202898')
+         '8df35e67558b6b4567d1ab24c9202898'
+         'e78dfb8f459784ff3e1cc4cd56b63a8c')

Added: rp-pppoe-linux-headers.patch
===================================================================
--- rp-pppoe-linux-headers.patch	                        (rev 0)
+++ rp-pppoe-linux-headers.patch	2018-06-07 07:51:07 UTC (rev 326189)
@@ -0,0 +1,28 @@
+the linux headers have started adding shims to not define types or structs
+when C lib headers are active, but in order to work, the C lib headers have
+to be included before the linux headers.
+
+move the netinet/in.h include up above the linux/ includes.
+
+Mike Frysinger <vapier at gentoo.org>
+
+--- a/src/pppoe.h
++++ b/src/pppoe.h
+@@ -47,6 +47,8 @@
+ #include <sys/socket.h>
+ #endif
+ 
++#include <netinet/in.h>
++
+ /* Ugly header files on some Linux boxes... */
+ #if defined(HAVE_LINUX_IF_H)
+ #include <linux/if.h>
+@@ -84,8 +86,6 @@ typedef unsigned long UINT32_t;
+ #include <linux/if_ether.h>
+ #endif
+ 
+-#include <netinet/in.h>
+-
+ #ifdef HAVE_NETINET_IF_ETHER_H
+ #include <sys/types.h>
+