From 7a345adff4f416c4e2b69c2b6ad23ddae3a4ffcd Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Mon, 18 Mar 2013 19:00:20 -0300
Subject: rp-pppoe-libre-3.11-2: updating revision

* Fix kmode https://bugs.archlinux.org/task/33824
---
 libre/rp-pppoe-libre/PKGBUILD    | 14 +++++++-------
 libre/rp-pppoe-libre/kmode.patch | 19 +++++++++++++++++++
 2 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 libre/rp-pppoe-libre/kmode.patch

(limited to 'libre')

diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD
index f418684b5..c70ed76de 100644
--- a/libre/rp-pppoe-libre/PKGBUILD
+++ b/libre/rp-pppoe-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 166893 2012-09-20 23:56:51Z eric $
+# $Id: PKGBUILD 178747 2013-02-26 16:32:57Z tpowa $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: orelien <aurelien.foret@wanadoo.fr>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,8 +6,8 @@
 _pkgname=rp-pppoe
 pkgname=rp-pppoe-libre
 pkgver=3.11
-pkgrel=1
-pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client. Unfree software recommendation removed."
+pkgrel=2
+pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client (without nonfree ServPoET recommendation)"
 arch=('i686' 'x86_64')
 url="http://www.roaringpenguin.com/pppoe/"
 license=('GPL')
@@ -20,21 +20,21 @@ replaces=('rp-pppoe')
 conflicts=('rp-pppoe')
 install=rp-pppoe.install
 source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.sig}
-        adsl adsl.service $pkgname.patch)
+        adsl adsl.service kmode.patch $pkgname.patch)
 md5sums=('13b5900c56bd602df6cc526e5e520722'
          '8fc724aa146dba52ef7b3fbe5b8784c6'
          'adace1ad441aa88dcb3db52fb7f9c97f'
          'af234125f956f3a356ab0d0fcaa9e8a2'
+         'd38a903a247d689ff0323d7b6caa1c6b'
          '3c53d550ac408608abb0b6cd6b76b6c2')
 
 build() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$_pkgname-$pkgver/src"
+  patch -Np2 -i ../../kmode.patch
   
   ## Adding patch to remove unfree software recommendation (ServPoET)
   patch -Np1 -i "$srcdir/rp-pppoe-libre.patch"
 
-  cd ./src
-
   ./configure --prefix=/usr --enable-plugin
   make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so
 }
diff --git a/libre/rp-pppoe-libre/kmode.patch b/libre/rp-pppoe-libre/kmode.patch
new file mode 100644
index 000000000..37eef58f7
--- /dev/null
+++ b/libre/rp-pppoe-libre/kmode.patch
@@ -0,0 +1,19 @@
+diff -up rp-pppoe-3.11/src/configure.orig rp-pppoe-3.11/src/configure
+--- rp-pppoe-3.11/src/configure.orig	2012-08-17 12:31:25.000000000 -0600
++++ rp-pppoe-3.11/src/configure	2013-02-11 14:23:05.000000000 -0700
+@@ -3679,6 +3679,7 @@ do :
+ #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" = x""yes; then :
+@@ -4525,6 +4526,7 @@ else
+ #include <net/ethernet.h>
+ #include <linux/if.h>
+ #include <linux/in.h>
++#include <linux/in6.h>
+ #include <linux/if_pppox.h>
+ int main()
+ {
-- 
cgit v1.2.3