From 322b8a74108a59c11330cc0123cafa2670d4db97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Thu, 4 Oct 2012 14:20:05 -0300
Subject: rp-pppoe-libre-3.11-1: updating version

---
 libre/rp-pppoe-libre/PKGBUILD     | 63 ++++++++++++++++-----------------------
 libre/rp-pppoe-libre/adsl.service | 10 +++++++
 2 files changed, 35 insertions(+), 38 deletions(-)
 create mode 100644 libre/rp-pppoe-libre/adsl.service

(limited to 'libre/rp-pppoe-libre')

diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD
index a360e113e..e319b4ce2 100755
--- a/libre/rp-pppoe-libre/PKGBUILD
+++ b/libre/rp-pppoe-libre/PKGBUILD
@@ -1,59 +1,46 @@
-# $Id: PKGBUILD 119995 2011-04-18 07:09:47Z daniel $
+# $Id: PKGBUILD 166893 2012-09-20 23:56:51Z eric $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: orelien <aurelien.foret@wanadoo.fr>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
+_pkgname=rp-pppoe
 pkgname=rp-pppoe-libre
-pkgver=3.10
-pkgrel=7
+pkgver=3.11
+pkgrel=1
 pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client. Unfree software recommendation removed."
 arch=('i686' 'x86_64')
 url="http://www.roaringpenguin.com/pppoe/"
 license=('GPL')
 depends=('ppp>=2.4.5' 'sh' 'net-tools')
+backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq 
+        etc/ppp/pppoe-server-options)
 options=('!makeflags')
-backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq etc/ppp/pppoe-server-options)
-source=(http://repo.parabolagnulinux.org/other/$pkgname-$pkgver.tar.gz adsl
-        $pkgname.patch)
-install=rp-pppoe.install
 provides=("rp-pppoe=$pkgver")
 replaces=('rp-pppoe')
 conflicts=('rp-pppoe')
-
-mksource() {
-    wget http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz \
-         -O - | tar xzf -
-
-    pushd rp-pppoe-$pkgver >/dev/null
-
-    patch -Np1 -i ../rp-pppoe-libre.patch
-
-    popd >/dev/null
-
-    mv -v rp-pppoe-$pkgver $pkgname-$pkgver
-
-    tar czvf $pkgname-$pkgver.tar.gz $pkgname-$pkgver/
-}
+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'
+         '9f0d49c3a550c5ad76bb70d65c9d97b2')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver/src
+  cd "$srcdir/$_pkgname-$pkgver/src"
+  
+  ## Adding patch to remove unfree software recommendation (ServPoET)
+  patch -Np1 -i ../rp-pppoe-libre.patch
+
   ./configure --prefix=/usr --enable-plugin
-  make PLUGIN_DIR="/usr/lib/rp-pppoe"
+  make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver/src
-  make DESTDIR=$pkgdir install
+  cd "$srcdir/$_pkgname-$pkgver/src"
+  make PLUGIN_DIR="/usr/lib/rp-pppoe" DESTDIR="$pkgdir" install
 
-  #moving .so files to /usr/lib according to FS#13876
-  mkdir -p ${pkgdir}/usr/lib/rp-pppoe
-  mv ${pkgdir}/etc/ppp/plugins/rp-pppoe.so ${pkgdir}/usr/lib/rp-pppoe/
-  #not necessary after moving the plugin
-  rm -rf ${pkgdir}/etc/ppp/plugins
-  #changing config to the new path
-  #sed -i 's/LINUX_PLUGIN=/LINUX_PLUGIN=\/usr\/lib\/rp-pppoe\/rp-pppoe.so/g' ${pkgdir}/etc/ppp/pppoe.conf
-
-  install -Dm755 $srcdir/adsl $pkgdir/etc/rc.d/adsl
+  install -Dm755 "$srcdir/adsl" "$pkgdir/etc/rc.d/adsl"
+  install -Dm755 "$srcdir/adsl.service" "$pkgdir/usr/lib/systemd/system/adsl.service"
 }
-md5sums=('2c4a678fa684269ff4579bb639674198'
-         'adace1ad441aa88dcb3db52fb7f9c97f'
-         '9f0d49c3a550c5ad76bb70d65c9d97b2')
diff --git a/libre/rp-pppoe-libre/adsl.service b/libre/rp-pppoe-libre/adsl.service
new file mode 100644
index 000000000..324164943
--- /dev/null
+++ b/libre/rp-pppoe-libre/adsl.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=ADSL Deamon
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/pppoe-start
+ExecStop=/usr/sbin/pppoe-stop
+
+[Install]
+WantedBy=multi-user.target
-- 
cgit v1.2.2