[arch-commits] Commit in rp-pppoe/trunk (PKGBUILD adsl.service)

[Eric Bélanger]

    Date: Thursday, September 20, 2012 @ 19:56:51
  Author: eric
Revision: 166893

upgpkg: rp-pppoe 3.11-1

Upstream update, Add systemd unit file (close FS#31308), Clean up PKGBUILD

Added:
  rp-pppoe/trunk/adsl.service
Modified:
  rp-pppoe/trunk/PKGBUILD

--------------+
 PKGBUILD     |   35 ++++++++++++++++-------------------
 adsl.service |   10 ++++++++++
 2 files changed, 26 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-09-20 22:54:41 UTC (rev 166892)
+++ PKGBUILD	2012-09-20 23:56:51 UTC (rev 166893)
@@ -3,37 +3,34 @@
 # Contributor: orelien <aurelien.foret at wanadoo.fr>
 
 pkgname=rp-pppoe
-pkgver=3.10
-pkgrel=7
+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/"
 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://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz adsl)
 install=rp-pppoe.install
-md5sums=('d58a13cc4185bca6121a606ff456dec0'
-         'adace1ad441aa88dcb3db52fb7f9c97f')
+source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.sig} 
+        adsl adsl.service)
+md5sums=('13b5900c56bd602df6cc526e5e520722'
+         '8fc724aa146dba52ef7b3fbe5b8784c6'
+         'adace1ad441aa88dcb3db52fb7f9c97f'
+         'af234125f956f3a356ab0d0fcaa9e8a2')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver/src
+  cd "$srcdir/$pkgname-$pkgver/src"
   ./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"
 }

Added: adsl.service
===================================================================
--- adsl.service	                        (rev 0)
+++ adsl.service	2012-09-20 23:56:51 UTC (rev 166893)
@@ -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