Update to 1.9.0-8

4 files changed, 7 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bd76d0b97a1d..c96a4546f280 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by makepkg 4.2.1
-# Tue Jun  9 09:13:05 UTC 2015
 pkgbase = accel-ppp
 	pkgdesc = High performance PPTP/L2TP/PPPoE/IPoE server
 	pkgver = 1.9.0
-	pkgrel = 7
+	pkgrel = 8
 	url = http://sourceforge.net/apps/trac/accel-ppp/
 	install = accel-ppp.install
 	arch = i686
@@ -25,7 +23,6 @@ pkgbase = accel-ppp
 	backup = etc/accel-ppp.lua
 	backup = etc/snmp/accel-ppp.conf
 	source = http://sourceforge.net/projects/accel-ppp/files/accel-ppp-1.9.0.tar.bz2
-	source = accel-ppp-default
 	source = accel-ppp.logrotate
 	source = accel-ppp.lua
 	source = accel-ppp.tmpfiles
@@ -33,11 +30,10 @@ pkgbase = accel-ppp
 	source = dictionary.accel_ipoe
 	source = dictionary.ppp
 	md5sums = 9b02c5c42ad939ea393811f97e844f54
-	md5sums = bb3e20c8808000f4efe52230c13a13f3
 	md5sums = 0536dd60960e76cf5a6cdbf0518782d8
 	md5sums = 816dd5ea9534a077dfd63b6cd529738a
 	md5sums = 5be7d42b434b74d7e692b19a9e3c4297
-	md5sums = e5dec17bd405052fc647a805db5dd449
+	md5sums = e13fc55329910cd4dd0a9ee0b43bad97
 	md5sums = 7b94e1ab23db6c849dac3cb86246007d
 	md5sums = 4e0d4fc5975ea8794ea286e8fbfa56cd
 
diff --git a/PKGBUILD b/PKGBUILD
index 9f38558df5f3..1c7eddfc1fae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Alexandr Boiko <brdcom@ya.ru>
 pkgname=accel-ppp
 pkgver=1.9.0
-pkgrel=7
+pkgrel=8
 pkgdesc="High performance PPTP/L2TP/PPPoE/IPoE server"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/apps/trac/accel-ppp/"
@@ -15,7 +15,6 @@ install='accel-ppp.install'
 options=('docs')
 backup=('etc/accel-ppp.conf' 'etc/accel-ppp.lua' 'etc/snmp/accel-ppp.conf')
 source=(http://sourceforge.net/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2
-	accel-ppp-default
 	accel-ppp.logrotate
 	accel-ppp.lua
 	accel-ppp.tmpfiles
@@ -23,11 +22,10 @@ source=(http://sourceforge.net/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2
 	dictionary.accel_ipoe
 	dictionary.ppp)
 md5sums=('9b02c5c42ad939ea393811f97e844f54'
-         'bb3e20c8808000f4efe52230c13a13f3'
          '0536dd60960e76cf5a6cdbf0518782d8'
          '816dd5ea9534a077dfd63b6cd529738a'
          '5be7d42b434b74d7e692b19a9e3c4297'
-         'e5dec17bd405052fc647a805db5dd449'
+         'e13fc55329910cd4dd0a9ee0b43bad97'
          '7b94e1ab23db6c849dac3cb86246007d'
          '4e0d4fc5975ea8794ea286e8fbfa56cd')
 
@@ -68,7 +66,6 @@ package() {
 	install -dm0755 "$pkgdir/etc/snmp/"
 	install -dm0755 "$pkgdir/var/lib/accel-ppp"
 	touch "$pkgdir/etc/snmp/$pkgname.conf"
-	install -Dm0644 "$srcdir/$pkgname-default" "$pkgdir/etc/conf.d/accel-pppd"
 	install -Dm0644 "$srcdir/$pkgname-$pkgver/README" "$pkgdir/usr/share/doc/$pkgname/README"
 	install -Dm0644 "$srcdir/accel-pppd.service" "$pkgdir/usr/lib/systemd/system/accel-pppd.service"
 	install -Dm0644 "$srcdir/$pkgname.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
diff --git a/accel-ppp-default b/accel-ppp-default
deleted file mode 100644
index 01ce1571b4ce..000000000000
--- a/accel-ppp-default
+++ /dev/null
@@ -1,4 +0,0 @@
-# Any extra options you want to pass to aceel-pppd
-# on start-up should be put here.
-ARGS="-c /etc/accel-ppp.conf"
-PIDFILE="/run/accel-pppd.pid"
diff --git a/accel-pppd.service b/accel-pppd.service
index bce17574b79a..0eb5cf663909 100644
--- a/accel-pppd.service
+++ b/accel-pppd.service
@@ -1,12 +1,11 @@
 [Unit]
 Description=Accel-PPPD Daemon
 Conflicts=pptpd.service
-After=network.target
+After=network-online.target
 
 [Service]
-EnvironmentFile=/etc/conf.d/accel-pppd
-ExecStart=/usr/bin/accel-pppd -d -p $PIDFILE $ARGS
-ExecReload=/usr/bin/kill -SIGUSR1 $MAINPID
+ExecStart=/usr/bin/accel-pppd -d -p /run/accel-pppd.pid -c /etc/accel-ppp.conf
+ExecReload=/usr/bin/kill -SIGUSR1 -p /run/accel-pppd.pid
 PIDFile=/run/accel-pppd.pid
 Type=forking