From 1bb4ebb873e63fc602be0a2bab1180a44036c8f9 Mon Sep 17 00:00:00 2001
From: Michael <michael.haesel@gmail.com>
Date: Sun, 21 Oct 2012 15:53:41 +0000
Subject: [PATCH] rp-pppoe: new version, added systemd service file

---
 rp-pppoe/PKGBUILD     | 36 +++++++++++++++---------------------
 rp-pppoe/adsl         | 35 -----------------------------------
 rp-pppoe/adsl.service | 10 ++++++++++
 3 files changed, 25 insertions(+), 56 deletions(-)
 delete mode 100755 rp-pppoe/adsl
 create mode 100644 rp-pppoe/adsl.service

diff --git a/rp-pppoe/PKGBUILD b/rp-pppoe/PKGBUILD
index befab476e..149b3a682 100644
--- a/rp-pppoe/PKGBUILD
+++ b/rp-pppoe/PKGBUILD
@@ -3,8 +3,8 @@
 # Maintainer:
 
 pkgname=rp-pppoe
-pkgver=3.10
-pkgrel=6
+pkgver=3.11
+pkgrel=1
 pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client"
 arch=('i686' 'x86_64')
 url="http://www.roaringpenguin.com/pppoe/"
@@ -12,29 +12,23 @@ license=('GPL')
 groups=('base')
 depends=('ppp>=2.4.5' 'sh')
 options=('!makeflags')
-backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq etc/ppp/pppoe-server-options)
-source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz adsl)
-install=rp-pppoe.install
-md5sums=('d58a13cc4185bca6121a606ff456dec0'
-         'adace1ad441aa88dcb3db52fb7f9c97f')
+backup=(etc/ppp/{pppoe.conf,firewall-standalone,firewall-masq,pppoe-server-options})
+source=("http://www.roaringpenguin.com/files/download/rp-pppoe-${pkgver}.tar.gz"
+        'adsl.service')
+install=${pkgname}.install
+sha256sums=('86a1a4d92fcea74fa6dd45516c5975933fa978b36fafe71f76ea70b4b4747720'
+            '0247cd38b933da5033cf5229e695b29514dfc13f4c65ebd8ba03da65f4b2cff0')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver/src
-  ./configure --prefix=/usr --enable-plugin=/ppp-2.4.4
-  make || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}/src"
+  ./configure --prefix=/usr \
+              --enable-plugin
+  make
 }
 
 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.service" "${pkgdir}/usr/lib/systemd/system/adsl.service"
 }
diff --git a/rp-pppoe/adsl b/rp-pppoe/adsl
deleted file mode 100755
index 33bd91839..000000000
--- a/rp-pppoe/adsl
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting ADSL Connection"
-    /usr/sbin/pppoe-start &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon adsl
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping ADSL Connection"
-    /usr/sbin/pppoe-stop &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon adsl
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/rp-pppoe/adsl.service b/rp-pppoe/adsl.service
new file mode 100644
index 000000000..9f27fdf19
--- /dev/null
+++ b/rp-pppoe/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