[arch-commits] Commit in bird/repos/extra-x86_64 (5 files)

2019-05-21 Thread Sébastien Luttringer via arch-commits
Date: Tuesday, May 21, 2019 @ 13:47:03
  Author: seblu
Revision: 353718

archrelease: copy trunk to extra-x86_64

Added:
  bird/repos/extra-x86_64/PKGBUILD
(from rev 353717, bird/trunk/PKGBUILD)
  bird/repos/extra-x86_64/bird.service
(from rev 353717, bird/trunk/bird.service)
Deleted:
  bird/repos/extra-x86_64/01-fix-leak.patch
  bird/repos/extra-x86_64/PKGBUILD
  bird/repos/extra-x86_64/bird.service

---+
 01-fix-leak.patch |   38 ---
 PKGBUILD  |  126 ++--
 bird.service  |   24 -
 3 files changed, 75 insertions(+), 113 deletions(-)

Deleted: 01-fix-leak.patch
===
--- 01-fix-leak.patch   2019-05-21 13:46:58 UTC (rev 353717)
+++ 01-fix-leak.patch   2019-05-21 13:47:03 UTC (rev 353718)
@@ -1,38 +0,0 @@
-From 3013fc57bdc97b0031c4f4250b9bdd172f4c0f4e Mon Sep 17 00:00:00 2001
-From: "Ondrej Zajicek (work)" 
-Date: Sat, 16 Dec 2017 00:42:56 +0100
-Subject: [PATCH] Netlink: Fix memory leak
-

- sysdep/linux/netlink.c | 11 ---
- 1 file changed, 11 deletions(-)
-
-diff --git a/sysdep/linux/netlink.c b/sysdep/linux/netlink.c
-index 72ff13fa..4cb51519 100644
 a/sysdep/linux/netlink.c
-+++ b/sysdep/linux/netlink.c
-@@ -1666,14 +1666,6 @@ nl_parse_route(struct nl_parse_state *s, struct 
nlmsghdr *h)
- ra->nh.labels = labels;
- #endif
- 
--  rte *e = rte_get_temp(ra);
--  e->net = net;
--  e->u.krt.src = src;
--  e->u.krt.proto = i->rtm_protocol;
--  e->u.krt.seen = 0;
--  e->u.krt.best = 0;
--  e->u.krt.metric = 0;
--
-   if (i->rtm_scope != def_scope)
- {
-   ea_list *ea = lp_alloc(s->pool, sizeof(ea_list) + sizeof(eattr));
-@@ -1687,9 +1679,6 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr 
*h)
-   ea->attrs[0].u.data = i->rtm_scope;
- }
- 
--  if (a[RTA_PRIORITY])
--e->u.krt.metric = rta_get_u32(a[RTA_PRIORITY]);
--
-   if (a[RTA_PREFSRC])
- {
-   ip_addr ps = rta_get_ipa(a[RTA_PREFSRC]);

Deleted: PKGBUILD
===
--- PKGBUILD2019-05-21 13:46:58 UTC (rev 353717)
+++ PKGBUILD2019-05-21 13:47:03 UTC (rev 353718)
@@ -1,63 +0,0 @@
-# Maintainer: Sébastien Luttringer
-
-pkgname=bird
-pkgver=2.0.3
-pkgrel=1
-pkgdesc='RIP, OSPF, BGP, MPLS, BFD, Babbel routing daemon'
-arch=('x86_64')
-url='http://bird.network.cz/'
-license=('GPL2')
-backup=('etc/bird.conf')
-depends=('glibc' 'readline' 'ncurses' 'libssh')
-replaces=('bird6')
-source=("ftp://bird.network.cz/pub/bird/$pkgname-$pkgver.tar.gz;
-'bird.service')
-md5sums=('c1d869c5ed680dad18cd8a1044b89d62'
- '69221e063a3f07dcad519d5eeacaae75')
-
-prepare() {
-  cd $pkgname-$pkgver
-  # apply patch from the source array (should be a pacman feature)
-  local filename
-  for filename in "${source[@]}"; do
-if [[ "$filename" =~ \.patch$ ]]; then
-  msg2 "Applying patch ${filename##*/}"
-  patch -p1 -N -i "$srcdir/${filename##*/}"
-fi
-  done
-  :
-}
-
-build() {
-  cd $pkgbase-$pkgver
-  ./configure \
---prefix=/usr \
---sbindir=/usr/bin \
---sysconfdir=/etc \
---localstatedir=/var \
---docdir=/usr/share/doc/$pkgname
-  make
-}
-
-package () {
-
-  cd $pkgbase-$pkgver
-  make \
-prefix="$pkgdir/usr" \
-sysconfdir="$pkgdir/etc" \
-sbindir="$pkgdir/usr/bin" \
-localstatedir="$pkgdir/var" \
-docdir="$pkgdir/usr/share/doc/$pkgname" \
-install
-
-  # no /var inside pkg
-  rm -r "$pkgdir/var"
-
-  # systemd
-  install -D -m 644 "$srcdir/bird.service" 
"$pkgdir/usr/lib/systemd/system/bird.service"
-
-  # overwrite invalid default config file (see FS#57096)
-  install -D -m 644 doc/bird.conf.example2 "$pkgdir/etc/bird.conf"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: bird/repos/extra-x86_64/PKGBUILD (from rev 353717, bird/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2019-05-21 13:47:03 UTC (rev 353718)
@@ -0,0 +1,63 @@
+# Maintainer: Sébastien Luttringer
+
+pkgname=bird
+pkgver=2.0.4
+pkgrel=1
+pkgdesc='RIP, OSPF, BGP, MPLS, BFD, Babbel routing daemon'
+arch=('x86_64')
+url='https://bird.network.cz/'
+license=('GPL2')
+backup=('etc/bird.conf')
+depends=('glibc' 'readline' 'ncurses' 'libssh')
+replaces=('bird6')
+source=("ftp://bird.network.cz/pub/bird/$pkgname-$pkgver.tar.gz;
+'bird.service')
+md5sums=('f0d0db5c6325437be66a6165ea29e5f9'
+ '69221e063a3f07dcad519d5eeacaae75')
+
+prepare() {
+  cd $pkgname-$pkgver
+  # apply patch from the source array (should be a pacman feature)
+  local filename
+  for filename in "${source[@]}"; do
+if [[ "$filename" =~ \.patch$ ]]; then
+  msg2 "Applying patch ${filename##*/}"
+  patch -p1 -N -i "$srcdir/${filename##*/}"
+fi
+  done
+  :
+}
+
+build() {
+  cd $pkgbase-$pkgver
+  ./configure \
+--prefix=/usr \
+--sbindir=/usr/bin \
+

[arch-commits] Commit in bird/repos/extra-x86_64 (5 files)

2017-12-29 Thread Sébastien Luttringer via arch-commits
Date: Friday, December 29, 2017 @ 12:51:19
  Author: seblu
Revision: 313759

archrelease: copy trunk to extra-x86_64

Added:
  bird/repos/extra-x86_64/01-fix-leak.patch
(from rev 313758, bird/trunk/01-fix-leak.patch)
  bird/repos/extra-x86_64/PKGBUILD
(from rev 313758, bird/trunk/PKGBUILD)
  bird/repos/extra-x86_64/bird.service
(from rev 313758, bird/trunk/bird.service)
Deleted:
  bird/repos/extra-x86_64/PKGBUILD
  bird/repos/extra-x86_64/bird.service

---+
 01-fix-leak.patch |   38 +
 PKGBUILD  |  111 +---
 bird.service  |   24 +--
 3 files changed, 113 insertions(+), 60 deletions(-)

Copied: bird/repos/extra-x86_64/01-fix-leak.patch (from rev 313758, 
bird/trunk/01-fix-leak.patch)
===
--- 01-fix-leak.patch   (rev 0)
+++ 01-fix-leak.patch   2017-12-29 12:51:19 UTC (rev 313759)
@@ -0,0 +1,38 @@
+From 3013fc57bdc97b0031c4f4250b9bdd172f4c0f4e Mon Sep 17 00:00:00 2001
+From: "Ondrej Zajicek (work)" 
+Date: Sat, 16 Dec 2017 00:42:56 +0100
+Subject: [PATCH] Netlink: Fix memory leak
+
+---
+ sysdep/linux/netlink.c | 11 ---
+ 1 file changed, 11 deletions(-)
+
+diff --git a/sysdep/linux/netlink.c b/sysdep/linux/netlink.c
+index 72ff13fa..4cb51519 100644
+--- a/sysdep/linux/netlink.c
 b/sysdep/linux/netlink.c
+@@ -1666,14 +1666,6 @@ nl_parse_route(struct nl_parse_state *s, struct 
nlmsghdr *h)
+ ra->nh.labels = labels;
+ #endif
+ 
+-  rte *e = rte_get_temp(ra);
+-  e->net = net;
+-  e->u.krt.src = src;
+-  e->u.krt.proto = i->rtm_protocol;
+-  e->u.krt.seen = 0;
+-  e->u.krt.best = 0;
+-  e->u.krt.metric = 0;
+-
+   if (i->rtm_scope != def_scope)
+ {
+   ea_list *ea = lp_alloc(s->pool, sizeof(ea_list) + sizeof(eattr));
+@@ -1687,9 +1679,6 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr 
*h)
+   ea->attrs[0].u.data = i->rtm_scope;
+ }
+ 
+-  if (a[RTA_PRIORITY])
+-e->u.krt.metric = rta_get_u32(a[RTA_PRIORITY]);
+-
+   if (a[RTA_PREFSRC])
+ {
+   ip_addr ps = rta_get_ipa(a[RTA_PREFSRC]);

Deleted: PKGBUILD
===
--- PKGBUILD2017-12-29 12:51:07 UTC (rev 313758)
+++ PKGBUILD2017-12-29 12:51:19 UTC (rev 313759)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-
-pkgname=bird
-pkgver=2.0.0
-pkgrel=1
-pkgdesc='RIP, OSPF, BGP, MPLS, BFD, Babbel routing daemon'
-arch=('x86_64')
-url='http://bird.network.cz/'
-license=('GPL2')
-backup=('etc/bird.conf')
-depends=('glibc' 'readline' 'ncurses')
-replaces=('bird6')
-source=("ftp://bird.network.cz/pub/bird/$pkgname-$pkgver.tar.gz;
-'bird.service')
-md5sums=('31cbd40f493d6e946e7cdf3158c4923a'
- '69221e063a3f07dcad519d5eeacaae75')
-
-build() {
-  cd $pkgbase-$pkgver
-  ./configure \
---prefix=/usr \
---sbindir=/usr/bin \
---sysconfdir=/etc \
---localstatedir=/var \
---docdir=/usr/share/doc/$pkgname
-  make
-}
-
-package () {
-
-  cd $pkgbase-$pkgver
-  make \
-prefix="$pkgdir/usr" \
-sysconfdir="$pkgdir/etc" \
-sbindir="$pkgdir/usr/bin" \
-localstatedir="$pkgdir/var" \
-docdir="$pkgdir/usr/share/doc/$pkgname" \
-install
-
-  # no /var inside pkg
-  rm -r "$pkgdir/var"
-
-  # systemd
-  install -D -m 644 "$srcdir/bird.service" 
"$pkgdir/usr/lib/systemd/system/bird.service"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: bird/repos/extra-x86_64/PKGBUILD (from rev 313758, bird/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2017-12-29 12:51:19 UTC (rev 313759)
@@ -0,0 +1,63 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+
+pkgname=bird
+pkgver=2.0.0
+pkgrel=2
+pkgdesc='RIP, OSPF, BGP, MPLS, BFD, Babbel routing daemon'
+arch=('x86_64')
+url='http://bird.network.cz/'
+license=('GPL2')
+backup=('etc/bird.conf')
+depends=('glibc' 'readline' 'ncurses')
+replaces=('bird6')
+source=("ftp://bird.network.cz/pub/bird/$pkgname-$pkgver.tar.gz;
+'bird.service'
+'01-fix-leak.patch')
+md5sums=('31cbd40f493d6e946e7cdf3158c4923a'
+ '69221e063a3f07dcad519d5eeacaae75'
+ '4936f7eb7a66014e2ad358d94a9ea1a9')
+
+prepare() {
+  cd $pkgname-$pkgver
+  # apply patch from the source array (should be a pacman feature)
+  local filename
+  for filename in "${source[@]}"; do
+if [[ "$filename" =~ \.patch$ ]]; then
+  msg2 "Applying patch ${filename##*/}"
+  patch -p1 -N -i "$srcdir/${filename##*/}"
+fi
+  done
+  :
+}
+
+build() {
+  cd $pkgbase-$pkgver
+  ./configure \
+--prefix=/usr \
+--sbindir=/usr/bin \
+--sysconfdir=/etc \
+--localstatedir=/var \
+--docdir=/usr/share/doc/$pkgname
+  make
+}
+
+package () {
+
+  cd $pkgbase-$pkgver
+  make \
+prefix="$pkgdir/usr" \
+sysconfdir="$pkgdir/etc" \
+sbindir="$pkgdir/usr/bin" \
+ 

[arch-commits] Commit in bird/repos/extra-x86_64 (5 files)

2017-12-17 Thread Sébastien Luttringer via arch-commits
Date: Sunday, December 17, 2017 @ 17:03:52
  Author: seblu
Revision: 313257

archrelease: copy trunk to extra-x86_64

Added:
  bird/repos/extra-x86_64/PKGBUILD
(from rev 313256, bird/trunk/PKGBUILD)
  bird/repos/extra-x86_64/bird.service
(from rev 313256, bird/trunk/bird.service)
Deleted:
  bird/repos/extra-x86_64/PKGBUILD
  bird/repos/extra-x86_64/bird.service
  bird/repos/extra-x86_64/bird6.service

---+
 PKGBUILD  |  137 +++-
 bird.service  |   24 -
 bird6.service |   12 
 3 files changed, 60 insertions(+), 113 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2017-12-17 17:03:44 UTC (rev 313256)
+++ PKGBUILD2017-12-17 17:03:52 UTC (rev 313257)
@@ -1,89 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-
-pkgbase=bird
-pkgname=('bird' 'bird6')
-pkgver=1.6.3
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://bird.network.cz/'
-license=('GPL2')
-depends=('readline' 'ncurses')
-source=("ftp://bird.network.cz/pub/bird/${pkgname}-${pkgver}.tar.gz;
-'bird.service'
-'bird6.service')
-md5sums=('63dd93a7a23c274fc5b7f2e37664bfb7'
- '69221e063a3f07dcad519d5eeacaae75'
- '5b172bd052b523efd95ee018e891e181')
-
-build() {
-  cd $pkgbase-$pkgver
-  [[ -e _build4 ]] && rm -rf _build4
-  [[ -e _build6 ]] && rm -rf _build6
-  mkdir _build4 _build6
-
-  # build ipv4 bird
-  cd _build4
-  ../configure \
---prefix=/usr \
---sbindir=/usr/bin \
---sysconfdir=/etc \
---localstatedir=/var \
---docdir=/usr/share/doc/$pkgname
-  make
-
-  # build ipv6 bird
-  cd ../_build6
-  ../configure \
---prefix=/usr \
---sbindir=/usr/bin \
---sysconfdir=/etc \
---localstatedir=/var \
---docdir=/usr/share/doc/$pkgname \
---enable-ipv6
-  make
-}
-
-package_bird () {
-  pkgdesc='RIP, OSPFv2 and BGP daemon (ipv4 version)'
-  backup=('etc/bird.conf')
-
-  cd $pkgbase-$pkgver/_build4
-  make \
-prefix="$pkgdir/usr" \
-sysconfdir="$pkgdir/etc" \
-sbindir="$pkgdir/usr/bin" \
-localstatedir="$pkgdir/var" \
-docdir="$pkgdir/usr/share/doc/$pkgname" \
-install
-  #make docdir="$pkgdir/usr/share/doc/$pkgname" install-docs
-
-  # no /var inside pkg
-  rm -r "$pkgdir/var"
-
-  # systemd
-  install -D -m 644 "$srcdir/bird.service" 
"$pkgdir/usr/lib/systemd/system/bird.service"
-}
-
-package_bird6 () {
-  pkgdesc='RIP, OSPFv3, RADV and BGP daemon (ipv6 version)'
-  backup=('etc/bird6.conf')
-
-  cd $pkgbase-$pkgver/_build6
-  make \
-prefix="$pkgdir/usr" \
-sysconfdir="$pkgdir/etc" \
-sbindir="$pkgdir/usr/bin" \
-localstatedir="$pkgdir/var" \
-docdir="$pkgdir/usr/share/doc/$pkgname" \
-install
-  #make docdir="$pkgdir/usr/share/doc/$pkgname" install-docs
-
-  # no /var inside pkg
-  rm -r "$pkgdir/var"
-
-  # systemd
-  install -D -m 644 "$srcdir/bird6.service" 
"$pkgdir/usr/lib/systemd/system/bird6.service"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: bird/repos/extra-x86_64/PKGBUILD (from rev 313256, bird/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2017-12-17 17:03:52 UTC (rev 313257)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+
+pkgname=bird
+pkgver=2.0.0
+pkgrel=1
+pkgdesc='RIP, OSPF, BGP, MPLS, BFD, Babbel routing daemon'
+arch=('x86_64')
+url='http://bird.network.cz/'
+license=('GPL2')
+backup=('etc/bird.conf')
+depends=('glibc' 'readline' 'ncurses')
+replaces=('bird6')
+source=("ftp://bird.network.cz/pub/bird/$pkgname-$pkgver.tar.gz;
+'bird.service')
+md5sums=('31cbd40f493d6e946e7cdf3158c4923a'
+ '69221e063a3f07dcad519d5eeacaae75')
+
+build() {
+  cd $pkgbase-$pkgver
+  ./configure \
+--prefix=/usr \
+--sbindir=/usr/bin \
+--sysconfdir=/etc \
+--localstatedir=/var \
+--docdir=/usr/share/doc/$pkgname
+  make
+}
+
+package () {
+
+  cd $pkgbase-$pkgver
+  make \
+prefix="$pkgdir/usr" \
+sysconfdir="$pkgdir/etc" \
+sbindir="$pkgdir/usr/bin" \
+localstatedir="$pkgdir/var" \
+docdir="$pkgdir/usr/share/doc/$pkgname" \
+install
+
+  # no /var inside pkg
+  rm -r "$pkgdir/var"
+
+  # systemd
+  install -D -m 644 "$srcdir/bird.service" 
"$pkgdir/usr/lib/systemd/system/bird.service"
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: bird.service
===
--- bird.service2017-12-17 17:03:44 UTC (rev 313256)
+++ bird.service2017-12-17 17:03:52 UTC (rev 313257)
@@ -1,12 +0,0 @@
-[Unit]
-Description=BIRD routing daemon
-After=network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/bird
-ExecReload=/usr/bin/birdc configure
-ExecStop=/usr/bin/birdc down
-
-[Install]
-WantedBy=multi-user.target

Copied: bird/repos/extra-x86_64/bird.service (from rev 313256, 
bird/trunk/bird.service)