[arch-commits] Commit in babeld/repos/community-x86_64 (7 files)

[Baptiste Jonglez via arch-commits]

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 157e44a4a507786f5626070d9b1f3e371389 Mon Sep 17 00:00:00 2001
-From: Juliusz Chroboczek 
-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
===
--- PKGBUILD2018-05-12 22:34:32 UTC (rev 321437)
+++ PKGBUILD2018-05-12 22:34:53 UTC (rev 321438)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan 
-# Maintainer: Baptiste Jonglez 
-# Contributor: Yann Lopez 
-
-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=('ffc6907ae2762ae772da5582a8cd9edb942f57b77ba87d551bf8ec42b61a4413971618d47fc5cca3466198623d1cc4192153b5f7656003e47f23b4683a1c'
-'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)
+++ PKGBUILD2018-05-12 22:34:53 UTC (rev 321438)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Maintainer: Baptiste 

[arch-commits] Commit in babeld/repos/community-x86_64 (7 files)

[Baptiste Jonglez via arch-commits]

Date: Friday, May 11, 2018 @ 21:54:06
  Author: zorun
Revision: 320908

archrelease: copy trunk to community-x86_64

Added:
  
babeld/repos/community-x86_64/0001-Fix-parsing-of-source-length-in-filters.patch
(from rev 320907, 
babeld/trunk/0001-Fix-parsing-of-source-length-in-filters.patch)
  babeld/repos/community-x86_64/PKGBUILD
(from rev 320907, babeld/trunk/PKGBUILD)
  babeld/repos/community-x86_64/babeld.conf
(from rev 320907, babeld/trunk/babeld.conf)
  babeld/repos/community-x86_64/babeld.service
(from rev 320907, babeld/trunk/babeld.service)
Deleted:
  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, 146 insertions(+), 101 deletions(-)

Copied: 
babeld/repos/community-x86_64/0001-Fix-parsing-of-source-length-in-filters.patch
 (from rev 320907, 
babeld/trunk/0001-Fix-parsing-of-source-length-in-filters.patch)
===
--- 0001-Fix-parsing-of-source-length-in-filters.patch  
(rev 0)
+++ 0001-Fix-parsing-of-source-length-in-filters.patch  2018-05-11 21:54:06 UTC 
(rev 320908)
@@ -0,0 +1,38 @@
+From 157e44a4a507786f5626070d9b1f3e371389 Mon Sep 17 00:00:00 2001
+From: Juliusz Chroboczek 
+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
===
--- PKGBUILD2018-05-11 21:53:53 UTC (rev 320907)
+++ PKGBUILD2018-05-11 21:54:06 UTC (rev 320908)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan 
-# Maintainer: Baptiste Jonglez 
-# Contributor: Yann Lopez 
-
-pkgname=babeld
-pkgver=1.8.1
-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=('ffc6907ae2762ae772da5582a8cd9edb942f57b77ba87d551bf8ec42b61a4413971618d47fc5cca3466198623d1cc4192153b5f7656003e47f23b4683a1c'
-'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
-}

Copied: babeld/repos/community-x86_64/PKGBUILD (from rev 320907, 
babeld/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2018-05-11 21:54:06 UTC (rev 320908)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Maintainer: Baptiste Jonglez 
+# Contributor: Yann Lopez 
+
+pkgname=babeld
+pkgver=1.8.1
+pkgrel=2
+pkgdesc="A loop-avoiding distance-vector routing