babeld: upgrade to 1.5

3 files changed, 91 insertions, 19 deletions

diff --git a/pcr/babeld/PKGBUILD b/pcr/babeld/PKGBUILD
index 3b0dd994a..08a82fbb3 100644
--- a/pcr/babeld/PKGBUILD
+++ b/pcr/babeld/PKGBUILD
@@ -1,32 +1,43 @@
-# Maintainer (AUR): Yann Lopez <arch at lonewulf dot net>
-# Maintainer: fauno <fauno@parabola.nu>
+# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
+# Contributor: Yann Lopez <arch at lonewulf dot net>
 pkgname=babeld
-pkgver=1.4.1
+pkgver=1.5.0
 pkgrel=1
-pkgdesc="Loop-free distance-vector routing protocol"
-arch=(i686 x86_64 mips64el)
-url="http://www.pps.jussieu.fr/~jch/software/babel/"
-license=('custom')
-depends=(glibc)
-source=(http://www.pps.jussieu.fr/~jch/software/files/$pkgname-$pkgver.tar.gz{,.asc})
-install=babeld.install
+pkgdesc="A loop-avoiding distance-vector routing protocol"
+arch=('i686' 'x86_64')
+url="http://www.pps.univ-paris-diderot.fr/~jch/software/babel/"
+license=('MIT')
+depends=('glibc')
+optdepends=('ahcpd: for autoconfiguration of addresses and other informations')
+backup=('etc/babeld.conf')
+source=("http://www.pps.univ-paris-diderot.fr/~jch/software/files/$pkgname-$pkgver.tar.gz"
+  "http://www.pps.univ-paris-diderot.fr/~jch/software/files/$pkgname-$pkgver.tar.gz.asc"
+  "babeld.conf"
+  "babeld.service")
+md5sums=('ac884beb644792bdb79f0042755820ee'
+         'SKIP'
+         'e51d49295075e6137679f6c70ed45f97'
+         'd6407e493f79aad1887394639ef5d50e')
+sha1sums=('9a1c19a8934a4437fa48e3c410c3a262d2e11c9f'
+          'SKIP'
+          '531cb04a793534a080885be0417db343239b8d51'
+          '864840cfafeeb3f29c0f91421bc210a8c1f4b245')
+sha256sums=('faa473b3bf58b568b8bcc24028bc0deb4bb7596eb6bb007c388b1cadf20ff552'
+            'SKIP'
+            '732ad2444013f3579bbfac2fd71934418f0c5298b0ca7365a44df2dbc7f858d5'
+            'fde7554e0d8a200d99b0766bd0ce23cbd7d14593c43d96de158e2fa2c379c1c5')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  sed -e "s,/man/,/share&,g" -i Makefile
-
-  make PREFIX=/usr CFLAGS="$CFLAGS"
+  make PREFIX="/usr"
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  make PREFIX=/usr TARGET=$pkgdir install
-
-  gzip -f $pkgdir/usr/share/man/man8/$pkgname.8
+  make PREFIX="/usr" TARGET="$pkgdir" install
 
-  install -Dm 644 LICENCE $pkgdir/usr/share/licenses/$pkgname/LICENCE
+  install -Dm644 ../babeld.conf "${pkgdir}"/etc/babeld.conf
+  install -Dm644 ../babeld.service "${pkgdir}"/usr/lib/systemd/system/babeld.service
 }
-md5sums=('406bbd940e3a9019d832d20e277266f2'
-         'SKIP')
diff --git a/pcr/babeld/babeld.conf b/pcr/babeld/babeld.conf
new file mode 100644
index 000000000..948671463
--- /dev/null
+++ b/pcr/babeld/babeld.conf
@@ -0,0 +1,49 @@
+# Configuration for babeld. See the man page babeld(8) for
+# details on the configuration format.
+
+# You must provide at least one interface for babeld to operate on.
+#interface eth0
+#interface wlan0
+
+# Global options you might want to set. There are many more, see the man page.
+#debug 1
+#local-port 33123
+#diversity true
+#random-id true
+
+# Per-interface configuration. Note that each interface referenced here
+# will be used by babeld.
+#interface eth1 rxcost 10
+#interface tun0 faraway true
+#interface wlan0 hello-interval 1
+
+# Since 1.4.2, you can also specify defaults for interface parameters, which
+# will be used for all interfaces except specified otherwise (see above).
+#default rxcost 42
+#default hello-interval 5
+
+# Since 1.5.0, you can use the RTT-based metric, most useful for a network
+# with tunnels (overlay network).
+#default enable-timestamps true
+#interface tun0 max-rtt-penalty 150
+#interface tun0 rtt-max 100
+
+
+# Filtering rules.
+
+# Only accept routes included in a specific prefix.
+#in ip 192.168.42.0/24 allow
+#in ip 2001:db8:cafe:cafe::/64 allow
+#in deny
+
+# Only redistribute addresses from a given prefix, to avoid redistributing
+# all local addresses
+#redistribute ip 192.168.1.0/24 local allow
+#redistribute ip 2001:db8:cafe:cafe::/64 local allow
+#redistribute local deny
+
+# Redistribute a default route obtained otherwise (here, through DHCP or
+# configured statically).
+# Note that babeld ignores kernel routes with proto 3 (boot) by default.
+#redistribute proto 3 ip 0.0.0.0/0 eq 0 metric 50
+#redistribute proto 3 ip ::/0 eq 0 metric 50
diff --git a/pcr/babeld/babeld.service b/pcr/babeld/babeld.service
new file mode 100644
index 000000000..bad1aff93
--- /dev/null
+++ b/pcr/babeld/babeld.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Babel routing daemon
+Documentation=man:babeld(8) http://www.pps.univ-paris-diderot.fr/~jch/software/babel/
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/babeld -D
+PIDFile=/var/run/babeld.pid
+
+[Install]
+WantedBy=multi-user.target