[arch-commits] Commit in babeld/repos/community-x86_64 (7 files)
Baptiste Jonglez
zorun at archlinux.org
Sat May 12 22:34:53 UTC 2018
Date: Saturday, May 12, 2018 @ 22:34:53
Author: zorun
Revision: 321438
archrelease: copy trunk to community-x86_64
Added:
babeld/repos/community-x86_64/PKGBUILD
(from rev 321437, babeld/trunk/PKGBUILD)
babeld/repos/community-x86_64/babeld.conf
(from rev 321437, babeld/trunk/babeld.conf)
babeld/repos/community-x86_64/babeld.service
(from rev 321437, babeld/trunk/babeld.service)
Deleted:
babeld/repos/community-x86_64/0001-Fix-parsing-of-source-length-in-filters.patch
babeld/repos/community-x86_64/PKGBUILD
babeld/repos/community-x86_64/babeld.conf
babeld/repos/community-x86_64/babeld.service
----------------------------------------------------+
0001-Fix-parsing-of-source-length-in-filters.patch | 38 ------
PKGBUILD | 77 ++++++--------
babeld.conf | 104 +++++++++----------
babeld.service | 28 ++---
4 files changed, 101 insertions(+), 146 deletions(-)
Deleted: 0001-Fix-parsing-of-source-length-in-filters.patch
===================================================================
--- 0001-Fix-parsing-of-source-length-in-filters.patch 2018-05-12 22:34:32 UTC (rev 321437)
+++ 0001-Fix-parsing-of-source-length-in-filters.patch 2018-05-12 22:34:53 UTC (rev 321438)
@@ -1,38 +0,0 @@
-From 1ffff57e44a4a507786f5626070d9b1f3e371389 Mon Sep 17 00:00:00 2001
-From: Juliusz Chroboczek <jch at irif.fr>
-Date: Fri, 11 May 2018 14:13:06 +0200
-Subject: [PATCH] Fix parsing of source length in filters.
-
-This fixes a bug that was introduced in commit 4f4e3cb, and prevented
-non-source-specific IPv4 routes from being redistributed. Thanks
-to Niklas Yann Wettengel for the detective work.
----
- configuration.c | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/configuration.c b/configuration.c
-index 449e580..5f52ecb 100644
---- a/configuration.c
-+++ b/configuration.c
-@@ -479,10 +479,14 @@ parse_filter(int c, gnc_t gnc, void *closure, struct filter **filter_return)
- filter->src_plen_le < 128 || filter->src_plen_ge > 0)
- filter->af = AF_INET6;
- } else if(filter->af == AF_INET) {
-- filter->plen_le += 96;
-- filter->plen_ge += 96;
-- filter->src_plen_le += 96;
-- filter->src_plen_ge += 96;
-+ if(filter->plen_le < 128)
-+ filter->plen_le += 96;
-+ if(filter->plen_ge > 0)
-+ filter->plen_ge += 96;
-+ if(filter->src_plen_le < 128)
-+ filter->src_plen_le += 96;
-+ if(filter->src_plen_ge > 0)
-+ filter->src_plen_ge += 96;
- }
- *filter_return = filter;
- return c;
---
-2.17.0
-
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-05-12 22:34:32 UTC (rev 321437)
+++ PKGBUILD 2018-05-12 22:34:53 UTC (rev 321438)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
-# Contributor: Yann Lopez <arch at lonewulf dot net>
-
-pkgname=babeld
-pkgver=1.8.1
-pkgrel=2
-pkgdesc="A loop-avoiding distance-vector routing protocol"
-arch=('x86_64')
-url="https://www.irif.fr/~jch/software/babel/"
-license=('MIT')
-depends=('glibc')
-backup=('etc/babeld.conf')
-source=("https://www.irif.fr/~jch/software/files/$pkgname-$pkgver.tar.gz"{,.asc}
- 'babeld.conf' 'babeld.service'
- '0001-Fix-parsing-of-source-length-in-filters.patch')
-validpgpkeys=('F8E70AAD74D32CAC27B9AFD62652C881EADB5526')
-sha512sums=('ffc6907ae2762ae772da5582a8cd9edb942f57b77ba87d551bf8ec42b61a4413971618d47fc5cca3466198623d1cc41cccc92153b5f7656003e47f23b4683a1c'
- 'SKIP'
- '1232684447b4409d6e3813041f4ab1158faa844b5ac65441b5f299f1e353f48679aacbce9cc79e6714e9a3e1b17d2cfa4963c1388dba225ee342ea3cdb7f1194'
- '01e69d19a6176a6bf26ee703939c5bdea3f1245464ed5d3863dc5867a76b8b6a6fc7324912aee17458a0c6275ccdfa5abe63b88f7503c8d4dfd37d3f15f42700'
- 'a1043a5b0d46759fd41ef2c970d28e67b0aa8db83cf9d760d1168cc0ad64bfbf56a69ba08c920ef200b7910e28b6b8a4441eb8c6b156c2c58d2edbcba97a3cf8')
-
-prepare() {
- cd "$pkgname-$pkgver"
- patch -p1 < "$srcdir"/0001-Fix-parsing-of-source-length-in-filters.patch
-}
-
-build() {
- cd "$pkgname-$pkgver"
- make PREFIX="/usr"
-}
-
-package() {
- cd "$pkgname-$pkgver"
- make PREFIX="/usr" TARGET="$pkgdir" install
-
- install -Dm644 ../babeld.conf "$pkgdir"/etc/babeld.conf
- install -Dm644 ../babeld.service "$pkgdir"/usr/lib/systemd/system/babeld.service
- install -D -m644 LICENCE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
Copied: babeld/repos/community-x86_64/PKGBUILD (from rev 321437, babeld/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-05-12 22:34:53 UTC (rev 321438)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
+# Contributor: Yann Lopez <arch at lonewulf dot net>
+
+pkgname=babeld
+pkgver=1.8.2
+pkgrel=1
+pkgdesc="A loop-avoiding distance-vector routing protocol"
+arch=('x86_64')
+url="https://www.irif.fr/~jch/software/babel/"
+license=('MIT')
+depends=('glibc')
+backup=('etc/babeld.conf')
+source=("https://www.irif.fr/~jch/software/files/$pkgname-$pkgver.tar.gz"{,.asc}
+ 'babeld.conf' 'babeld.service')
+validpgpkeys=('F8E70AAD74D32CAC27B9AFD62652C881EADB5526')
+sha512sums=('08ef0747a672e7a3f2e06d4082da0d021378cea94633fdddf7de38178552bc5a587852fdb5c8bfdeeb6897ba4fd61c78e6ee4d19523a6c3e60d0e3c150418319'
+ 'SKIP'
+ '1232684447b4409d6e3813041f4ab1158faa844b5ac65441b5f299f1e353f48679aacbce9cc79e6714e9a3e1b17d2cfa4963c1388dba225ee342ea3cdb7f1194'
+ '01e69d19a6176a6bf26ee703939c5bdea3f1245464ed5d3863dc5867a76b8b6a6fc7324912aee17458a0c6275ccdfa5abe63b88f7503c8d4dfd37d3f15f42700')
+
+build() {
+ cd "$pkgname-$pkgver"
+ make PREFIX="/usr"
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make PREFIX="/usr" TARGET="$pkgdir" install
+
+ install -Dm644 ../babeld.conf "$pkgdir"/etc/babeld.conf
+ install -Dm644 ../babeld.service "$pkgdir"/usr/lib/systemd/system/babeld.service
+ install -D -m644 LICENCE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
Deleted: babeld.conf
===================================================================
--- babeld.conf 2018-05-12 22:34:32 UTC (rev 321437)
+++ babeld.conf 2018-05-12 22:34:53 UTC (rev 321438)
@@ -1,52 +0,0 @@
-# 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
-
-# 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
Copied: babeld/repos/community-x86_64/babeld.conf (from rev 321437, babeld/trunk/babeld.conf)
===================================================================
--- babeld.conf (rev 0)
+++ babeld.conf 2018-05-12 22:34:53 UTC (rev 321438)
@@ -0,0 +1,52 @@
+# 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
+
+# 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
Deleted: babeld.service
===================================================================
--- babeld.service 2018-05-12 22:34:32 UTC (rev 321437)
+++ babeld.service 2018-05-12 22:34:53 UTC (rev 321438)
@@ -1,14 +0,0 @@
-[Unit]
-Description=Babel routing daemon
-Documentation=man:babeld(8) http://www.pps.univ-paris-diderot.fr/~jch/software/babel/
-After=network.target
-
-[Service]
-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
Copied: babeld/repos/community-x86_64/babeld.service (from rev 321437, babeld/trunk/babeld.service)
===================================================================
--- babeld.service (rev 0)
+++ babeld.service 2018-05-12 22:34:53 UTC (rev 321438)
@@ -0,0 +1,14 @@
+[Unit]
+Description=Babel routing daemon
+Documentation=man:babeld(8) http://www.pps.univ-paris-diderot.fr/~jch/software/babel/
+After=network.target
+
+[Service]
+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
More information about the arch-commits
mailing list