rp-pppoe 3.12-3.parabola1: rebuild

3 files changed, 43 insertions, 36 deletions

diff --git a/libre/rp-pppoe/PKGBUILD b/libre/rp-pppoe/PKGBUILD
index d7b786050..7931e0d54 100644
--- a/libre/rp-pppoe/PKGBUILD
+++ b/libre/rp-pppoe/PKGBUILD
@@ -6,10 +6,10 @@
 
 pkgname=rp-pppoe
 pkgver=3.12
-pkgrel=1.parabola2
+pkgrel=3.parabola1
 pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client, without nonfree ServPoET recommendation"
 arch=('i686' 'x86_64' 'armv7h')
-url="http://www.roaringpenguin.com/pppoe/"
+url="https://www.roaringpenguin.com/products/pppoe"
 license=('GPL')
 depends=('ppp=2.4.7' 'sh' 'net-tools')
 backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq 
@@ -21,38 +21,37 @@ install=rp-pppoe.install
 source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.sig} 
        adsl.service 
        kmode.patch
-       rp-pppoe-3.12-linux-headers.patch
+       rp-pppoe-linux-headers.patch
        libre.patch)
 validpgpkeys=('FC2E9B645468698FD7B21655C1842E2A126F42E0') # Dianne Skoll
 
 prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   
   ## remove nonfree software recommendation (ServPoET)
   rm -v SERVPOET
-  patch -Np1 -i "$srcdir/libre.patch"
+  patch -Np1 -i ../libre.patch
 
-  cd "$srcdir/$pkgname-$pkgver/src"
-  patch -Np2 -i ../../kmode.patch
-  patch -Np2 -i ../../rp-pppoe-3.12-linux-headers.patch
+  patch -Np1 -i ../kmode.patch
+  patch -Np1 -i ../rp-pppoe-linux-headers.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"
   install -Dm644 "$srcdir/adsl.service" "$pkgdir/usr/lib/systemd/system/adsl.service"
 }
-md5sums=('216eb52b69062b92a64ee37fd71f4b66'
-         'SKIP'
-         '926b00aa2a0c0d3a21970acde9695e47'
-         '8df35e67558b6b4567d1ab24c9202898'
-         'b9ab60a822b185f4cf8f46e6cc71e3a4'
-         '40586f5bc2729d3a56b2fe1aa6bb683a')
+sha256sums=('00794e04031546b0e9b8cf286f2a6d1ccfc4a621b2a3abb2d7ef2a7ab7cc86c2'
+            'SKIP'
+            '6593ca054834a6d3bc046456b127ba3652b6203e287ef0f6a57f8db27059f6d2'
+            'c690186ba48a3ee78b87e655801a8ac5bb1b21a67ded9aa7942eb3514e98505f'
+            '99761e5f84535d02e2004000567cab009ef49ed96f0534a5937e63d15dbed184'
+            'd3810c2c8d6f4b606a073922a6afdf0eb6e38441de68e918f198afa6e020150e')
diff --git a/libre/rp-pppoe/rp-pppoe-3.12-linux-headers.patch b/libre/rp-pppoe/rp-pppoe-3.12-linux-headers.patch
deleted file mode 100644
index 376061aee..000000000
--- a/libre/rp-pppoe/rp-pppoe-3.12-linux-headers.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/pppoe.h	2015-11-11 10:10:04.000000000 -0500
-+++ b/src/pppoe.h	2018-02-04 19:07:00.581864484 -0500
-@@ -51,6 +51,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>
-@@ -131,8 +133,6 @@
- #include <linux/if_ether.h>
- #endif
- 
--#include <netinet/in.h>
--
- #ifdef HAVE_NETINET_IF_ETHER_H
- #include <sys/types.h>
- 
diff --git a/libre/rp-pppoe/rp-pppoe-linux-headers.patch b/libre/rp-pppoe/rp-pppoe-linux-headers.patch
new file mode 100644
index 000000000..961eba396
--- /dev/null
+++ b/libre/rp-pppoe/rp-pppoe-linux-headers.patch
@@ -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@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>
+