From d3541a01cc239fb5a356a167ef8c245c041b6284 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Tue, 7 Aug 2012 13:20:29 -0500
Subject: ppp 2.4.5

---
 abs/core/ppp/PKGBUILD | 51 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/abs/core/ppp/PKGBUILD b/abs/core/ppp/PKGBUILD
index fcf8032..33c7ecc 100644
--- a/abs/core/ppp/PKGBUILD
+++ b/abs/core/ppp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 66522 2010-01-31 13:12:49Z thomas $
+# $Id: PKGBUILD 142987 2011-11-19 20:10:23Z thomas $
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 pkgname=ppp
 pkgver=2.4.5
-pkgrel=1
-pkgdesc="A daemon which implements the PPP protocol for dial-up networking"
-arch=('i686' 'x86_64') 
+pkgrel=3
+pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking"
+arch=(i686 x86_64) 
 url="http://www.samba.org/ppp/"
 license=('custom:GPL/BSD')
 groups=('base')
@@ -34,7 +34,7 @@ md5sums=('4621bc56167b6953ec4071043fe0ec57'
          '8d1be5af8e46393ba6eb273377831e38')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   # fix CFLAGS
   # -D_GNU_SOURCE is needed for IPv6 to work apparently
   export CFLAGS="$CFLAGS -D_GNU_SOURCE"
@@ -51,25 +51,30 @@ build() {
   # Enable Microsoft proprietary Callback Control Protocol
   sed -i "s:^#CBCP=y:CBCP=y:" pppd/Makefile.linux 
   
+  # Fix build error with recent kernels
+  rm include/linux/if_pppol2tp.h 
+
   ./configure --prefix=/usr
-  make || return 1
+  make 
 }
+
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir}/usr install || return 1
-  install -D -m644 ${srcdir}/options ${pkgdir}/etc/ppp/options || return 1
-  install -D -m755 ${srcdir}/ip-up ${pkgdir}/etc/ppp/ip-up || return 1
-  install -D -m755 ${srcdir}/ip-down ${pkgdir}/etc/ppp/ip-down || return 1
-  install -d -m755 ${pkgdir}/etc/ppp/ip-up.d || return 1
-  install -d -m755 ${pkgdir}/etc/ppp/ip-down.d || return 1
-  install -m755 ${srcdir}/ip-up.d.dns.sh ${pkgdir}/etc/ppp/ip-up.d/00-dns.sh || return 1
-  install -m755 ${srcdir}/ip-down.d.dns.sh ${pkgdir}/etc/ppp/ip-down.d/00-dns.sh || return 1
-  install -D -m755 ${srcdir}/pon ${pkgdir}/usr/bin/pon || return 1
-  install -D -m755 ${srcdir}/poff ${pkgdir}/usr/bin/poff || return 1
-  install -D -m755 ${srcdir}/plog ${pkgdir}/usr/sbin/plog || return 1
-  install -D -m600 etc.ppp/pap-secrets ${pkgdir}/etc/ppp/pap-secrets  || return 1
-  install -D -m600 etc.ppp/chap-secrets ${pkgdir}/etc/ppp/chap-secrets || return 1
-  install -D -m755 ${srcdir}/ppp ${pkgdir}/etc/rc.d/ppp  || return 1
-  install -D -m644 ${srcdir}/pon.1 ${pkgdir}/usr/share/man/man1/pon.1 || return 1
-  install -d -m755 ${pkgdir}/etc/ppp/peers || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}/usr" install 
+  install -D -m644 ../options "${pkgdir}/etc/ppp/options"
+  install -D -m755 ../ip-up   "${pkgdir}/etc/ppp/ip-up"
+  install -D -m755 ../ip-down "${pkgdir}/etc/ppp/ip-down"
+  install -d -m755 "${pkgdir}/etc/ppp/ip-up.d"
+  install -d -m755 "${pkgdir}/etc/ppp/ip-down.d"
+  install -m755 ../ip-up.d.dns.sh   "${pkgdir}/etc/ppp/ip-up.d/00-dns.sh"
+  install -m755 ../ip-down.d.dns.sh "${pkgdir}/etc/ppp/ip-down.d/00-dns.sh"
+  install -D -m755 ../pon  "${pkgdir}/usr/bin/pon"
+  install -D -m755 ../poff "${pkgdir}/usr/bin/poff"
+  install -D -m755 ../plog "${pkgdir}/usr/sbin/plog"
+  install -D -m600 etc.ppp/pap-secrets  "${pkgdir}/etc/ppp/pap-secrets"
+  install -D -m600 etc.ppp/chap-secrets "${pkgdir}/etc/ppp/chap-secrets"
+  install -D -m755 ${srcdir}/ppp "${pkgdir}/etc/rc.d/ppp"
+  install -D -m644 ${srcdir}/pon.1 "${pkgdir}/usr/share/man/man1/pon.1"
+  install -d -m755 "${pkgdir}/etc/ppp/peers" 
+  chmod 0755 "${pkgdir}/usr/lib/pppd/${pkgver}"/*.so
 }
-- 
cgit v0.12

