From 25572e6ef7f7ad2620d4a1da88e9a516d50489f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <fauno@endefensadelsl.org>
Date: Sun, 14 Feb 2016 19:31:33 -0300
Subject: babeld: 1.7.1 and merge from aur4

---
 pcr/babeld/PKGBUILD       | 12 ++++++------
 pcr/babeld/babeld.conf    |  3 +++
 pcr/babeld/babeld.service |  8 +++++---
 3 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'pcr/babeld')

diff --git a/pcr/babeld/PKGBUILD b/pcr/babeld/PKGBUILD
index 5a7a0b122..07eb52ec4 100644
--- a/pcr/babeld/PKGBUILD
+++ b/pcr/babeld/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
 # Contributor: Yann Lopez <arch at lonewulf dot net>
 pkgname=babeld
-pkgver=1.7.0
+pkgver=1.7.1
 pkgrel=1
 pkgdesc="A loop-avoiding distance-vector routing protocol"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,11 +15,15 @@ source=("http://www.pps.univ-paris-diderot.fr/~jch/software/files/$pkgname-$pkgv
   "babeld.conf"
   "babeld.service")
 validpgpkeys=(F8E70AAD74D32CAC27B9AFD62652C881EADB5526)
+sha512sums=('7df028ab56a82717664ac8763bfa07684118ba7bc384e8d3d3c0ecb1b7c0e9c486ccfc18a2c761c96ac8e3aa5f66e20e609f91334ae8470dde0662d102cc69a8'
+            'SKIP'
+            '1232684447b4409d6e3813041f4ab1158faa844b5ac65441b5f299f1e353f48679aacbce9cc79e6714e9a3e1b17d2cfa4963c1388dba225ee342ea3cdb7f1194'
+            '01e69d19a6176a6bf26ee703939c5bdea3f1245464ed5d3863dc5867a76b8b6a6fc7324912aee17458a0c6275ccdfa5abe63b88f7503c8d4dfd37d3f15f42700')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  make PREFIX="/usr" CFLAGS="${CFLAGS}"
+  make PREFIX="/usr" CFLAGS="$CFLAGS"
 }
 
 package() {
@@ -30,7 +34,3 @@ package() {
   install -Dm644 ../babeld.conf "${pkgdir}"/etc/babeld.conf
   install -Dm644 ../babeld.service "${pkgdir}"/usr/lib/systemd/system/babeld.service
 }
-sha512sums=('f6babe4c4f7932f20b249fbb990a29298bfde7dbfbc8a6374e2f04e7298effa40e41c12ca935d7aea8e1f7601130ba69f0eda362dca3756014b6853aed8a06fd'
-            'SKIP'
-            'a3bc8280bcd2127ec0d2f2450ef94f3a1b59ba246b8d2050187b33befedb4589c8a4a08ae8d0ad050c8d219d5822f1daf9a25e561216105017d77a9884718836'
-            '2b91aeca8470cf3247bee7b89f4052e20fe254f4150f13533a6967d8440ab0c4581aad3da109e2c0ba25d53ce223187d68c55f9756baff3e9f221896ab009c39')
diff --git a/pcr/babeld/babeld.conf b/pcr/babeld/babeld.conf
index 948671463..278297ef1 100644
--- a/pcr/babeld/babeld.conf
+++ b/pcr/babeld/babeld.conf
@@ -1,6 +1,9 @@
 # Configuration for babeld. See the man page babeld(8) for
 # details on the configuration format.
 
+# Works on Linux > 3.11
+ipv6-subtrees true
+
 # You must provide at least one interface for babeld to operate on.
 #interface eth0
 #interface wlan0
diff --git a/pcr/babeld/babeld.service b/pcr/babeld/babeld.service
index bad1aff93..f3c1d284c 100644
--- a/pcr/babeld/babeld.service
+++ b/pcr/babeld/babeld.service
@@ -4,9 +4,11 @@ Documentation=man:babeld(8) http://www.pps.univ-paris-diderot.fr/~jch/software/b
 After=network.target
 
 [Service]
-Type=forking
-ExecStart=/usr/bin/babeld -D
-PIDFile=/var/run/babeld.pid
+Type=simple
+# Don't write a PID file, since it prevents babeld from starting again
+# in case of crash.
+ExecStart=/usr/bin/babeld -I ''
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target
-- 
cgit v1.2.2