[arch-commits] Commit in miredo/trunk (PKGBUILD miredo.install miredo.service)

[Sergej Pupykin]

    Date: Thursday, August 4, 2016 @ 15:02:48
  Author: spupykin
Revision: 185057

upgpkg: miredo 1.2.6-4

upd

Modified:
  miredo/trunk/PKGBUILD
  miredo/trunk/miredo.service
Deleted:
  miredo/trunk/miredo.install

----------------+
 PKGBUILD       |   14 +++-----------
 miredo.install |    8 --------
 miredo.service |    7 ++++---
 3 files changed, 7 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-04 14:50:13 UTC (rev 185056)
+++ PKGBUILD	2016-08-04 15:02:48 UTC (rev 185057)
@@ -3,7 +3,7 @@
 
 pkgname=miredo
 pkgver=1.2.6
-pkgrel=3
+pkgrel=4
 pkgdesc="Teredo client and server."
 arch=('i686' 'x86_64')
 url="http://www.remlab.net/miredo/"
@@ -12,15 +12,12 @@
 backup=('etc/miredo/miredo.conf'
         'etc/miredo/client-hook')
 source=(http://www.remlab.net/files/${pkgname}/${pkgname}-${pkgver}.tar.xz
-	miredo.install
 	miredo.service)
 md5sums=('5bcdbaced54f40b6cb1e9c9a8dbac411'
-         'd1b655d7a851cdb46c91c3418ed1962f'
-         'fd6d5b355b2356426eeefd6047f6bb7c')
+         'f8a8ebbd5531e074816e009e50a2fb68')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-
   ./configure \
 	--prefix=/usr \
 	--sysconfdir=/etc \
@@ -34,13 +31,8 @@
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-
   make DESTDIR="$pkgdir" install
-
-  sed -i 's#/sbin/ip#/usr/sbin/ip#' $pkgdir/etc/miredo/client-hook
-
-  # avoid conflict with filesystem>=2012.06
+  sed -i 's#/sbin/ip#/usr/bin/ip#' $pkgdir/etc/miredo/client-hook
   rmdir "$pkgdir/var/run" "$pkgdir/var"
-
   install -Dm644 "$srcdir/miredo.service" "$pkgdir/usr/lib/systemd/system/miredo.service"
 }

Deleted: miredo.install
===================================================================
--- miredo.install	2016-08-04 14:50:13 UTC (rev 185056)
+++ miredo.install	2016-08-04 15:02:48 UTC (rev 185057)
@@ -1,8 +0,0 @@
-post_remove() {
-
-  # clean up just in case
-  rm -f /var/run/miredo.pid
-  rm -f /var/run/miredo-server.pid
-  rm -f /var/run/isatapd.pid
-}
-

Modified: miredo.service
===================================================================
--- miredo.service	2016-08-04 14:50:13 UTC (rev 185056)
+++ miredo.service	2016-08-04 15:02:48 UTC (rev 185057)
@@ -3,8 +3,9 @@
 After=network.target
 
 [Service]
-ExecStart=/usr/bin/miredo -f
-ExecReload=/bin/kill -HUP $MAINPID
+Type=forking
+PIDFile=/run/miredo.pid
+ExecStart=/usr/bin/miredo -c /etc/miredo/miredo.conf -p /run/miredo.pid
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target