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

Sébastien Luttringer seblu at archlinux.org
Mon Jan 22 00:07:24 UTC 2018


    Date: Monday, January 22, 2018 @ 00:07:20
  Author: seblu
Revision: 315224

archrelease: copy trunk to extra-x86_64

Added:
  bird/repos/extra-x86_64/01-fix-leak.patch
    (from rev 315223, bird/trunk/01-fix-leak.patch)
  bird/repos/extra-x86_64/PKGBUILD
    (from rev 315223, bird/trunk/PKGBUILD)
  bird/repos/extra-x86_64/bird.service
    (from rev 315223, 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 |   76 +++++++++++++++----------------
 PKGBUILD          |  127 ++++++++++++++++++++++++++--------------------------
 bird.service      |   24 ++++-----
 3 files changed, 114 insertions(+), 113 deletions(-)

Deleted: 01-fix-leak.patch
===================================================================
--- 01-fix-leak.patch	2018-01-22 00:07:10 UTC (rev 315223)
+++ 01-fix-leak.patch	2018-01-22 00:07:20 UTC (rev 315224)
@@ -1,38 +0,0 @@
-From 3013fc57bdc97b0031c4f4250b9bdd172f4c0f4e Mon Sep 17 00:00:00 2001
-From: "Ondrej Zajicek (work)" <santiago at crfreenet.org>
-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]);

Copied: bird/repos/extra-x86_64/01-fix-leak.patch (from rev 315223, bird/trunk/01-fix-leak.patch)
===================================================================
--- 01-fix-leak.patch	                        (rev 0)
+++ 01-fix-leak.patch	2018-01-22 00:07:20 UTC (rev 315224)
@@ -0,0 +1,38 @@
+From 3013fc57bdc97b0031c4f4250b9bdd172f4c0f4e Mon Sep 17 00:00:00 2001
+From: "Ondrej Zajicek (work)" <santiago at crfreenet.org>
+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
===================================================================
--- PKGBUILD	2018-01-22 00:07:10 UTC (rev 315223)
+++ PKGBUILD	2018-01-22 00:07:20 UTC (rev 315224)
@@ -1,63 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-
-pkgname=bird
-pkgver=2.0.0
-pkgrel=3
-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'
-        '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" \
-    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 315223, bird/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-01-22 00:07:20 UTC (rev 315224)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+
+pkgname=bird
+pkgver=2.0.1
+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=('a7d6249cf5706fcca9fcd2e5a4ca8626'
+         '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:

Deleted: bird.service
===================================================================
--- bird.service	2018-01-22 00:07:10 UTC (rev 315223)
+++ bird.service	2018-01-22 00:07:20 UTC (rev 315224)
@@ -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 315223, bird/trunk/bird.service)
===================================================================
--- bird.service	                        (rev 0)
+++ bird.service	2018-01-22 00:07:20 UTC (rev 315224)
@@ -0,0 +1,12 @@
+[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



More information about the arch-commits mailing list