diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-22 10:52:18 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-22 10:52:18 -0400 |
| commit | 908d987dd1dcd4899f8f7f0878514c22ca8048b7 (patch) | |
| tree | 29bf5986774207c3453044e1f370fb98d2431265 /libre/rp-pppoe-libre | |
| parent | 308bfb446305a96dffce945b6c4fb82b10d1b91b (diff) | |
| parent | 8351d69e64a40d68fa32cfeea227b6fcf7afe974 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre/rp-pppoe-libre')
| -rw-r--r-- | libre/rp-pppoe-libre/PKGBUILD | 34 | ||||
| -rw-r--r-- | libre/rp-pppoe-libre/kmode.patch | 19 |
2 files changed, 39 insertions, 14 deletions
diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD index f418684b5..2a45f0310 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 182649 2013-04-12 07:08:42Z 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=3 +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') @@ -19,22 +19,23 @@ provides=("rp-pppoe=$pkgver") 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) -md5sums=('13b5900c56bd602df6cc526e5e520722' - '8fc724aa146dba52ef7b3fbe5b8784c6' - 'adace1ad441aa88dcb3db52fb7f9c97f' - 'af234125f956f3a356ab0d0fcaa9e8a2' - '3c53d550ac408608abb0b6cd6b76b6c2') +source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.sig} + adsl.service + kmode.patch + $pkgname.patch) -build() { +prepare() { cd "$srcdir/$_pkgname-$pkgver" ## Adding patch to remove unfree software recommendation (ServPoET) patch -Np1 -i "$srcdir/rp-pppoe-libre.patch" - cd ./src + cd "$srcdir/$_pkgname-$pkgver/src" + patch -Np2 -i ../../kmode.patch +} +build() { + cd "$srcdir/$pkgname-$pkgver/src" ./configure --prefix=/usr --enable-plugin make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so } @@ -43,6 +44,11 @@ package() { cd "$srcdir/$_pkgname-$pkgver/src" make PLUGIN_DIR="/usr/lib/rp-pppoe" DESTDIR="$pkgdir" install - install -Dm755 "$srcdir/adsl" "$pkgdir/etc/rc.d/adsl" - install -Dm755 "$srcdir/adsl.service" "$pkgdir/usr/lib/systemd/system/adsl.service" + #install -Dm755 "$srcdir/adsl" "$pkgdir/etc/rc.d/adsl" + install -Dm644 "$srcdir/adsl.service" "$pkgdir/usr/lib/systemd/system/adsl.service" } +md5sums=('13b5900c56bd602df6cc526e5e520722' + 'SKIP' + 'af234125f956f3a356ab0d0fcaa9e8a2' + 'd38a903a247d689ff0323d7b6caa1c6b' + '3c53d550ac408608abb0b6cd6b76b6c2') 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() + { |