[arch-commits] Commit in bird/trunk (PKGBUILD bird6.service)

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

upgpkg: bird 2.0.0-1

Modified:
  bird/trunk/PKGBUILD
Deleted:
  bird/trunk/bird6.service

---+
 PKGBUILD  |   67 ++--
 bird6.service |   12 --
 2 files changed, 13 insertions(+), 66 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-17 16:05:37 UTC (rev 313255)
+++ PKGBUILD2017-12-17 17:03:44 UTC (rev 313256)
@@ -1,30 +1,24 @@
 # $Id$
 # Maintainer: Sébastien Luttringer
 
-pkgbase=bird
-pkgname=('bird' 'bird6')
-pkgver=1.6.3
+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')
-depends=('readline' 'ncurses')
-source=("ftp://bird.network.cz/pub/bird/${pkgname}-${pkgver}.tar.gz;
-'bird.service'
-'bird6.service')
-md5sums=('63dd93a7a23c274fc5b7f2e37664bfb7'
- '69221e063a3f07dcad519d5eeacaae75'
- '5b172bd052b523efd95ee018e891e181')
+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
-  [[ -e _build4 ]] && rm -rf _build4
-  [[ -e _build6 ]] && rm -rf _build6
-  mkdir _build4 _build6
-
-  # build ipv4 bird
-  cd _build4
-  ../configure \
+  ./configure \
 --prefix=/usr \
 --sbindir=/usr/bin \
 --sysconfdir=/etc \
@@ -31,24 +25,11 @@
 --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')
+package () {
 
-  cd $pkgbase-$pkgver/_build4
+  cd $pkgbase-$pkgver
   make \
 prefix="$pkgdir/usr" \
 sysconfdir="$pkgdir/etc" \
@@ -56,7 +37,6 @@
 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"
@@ -65,25 +45,4 @@
   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:

Deleted: bird6.service
===
--- bird6.service   2017-12-17 16:05:37 UTC (rev 313255)
+++ bird6.service   2017-12-17 17:03:44 UTC (rev 313256)
@@ -1,12 +0,0 @@
-[Unit]
-Description=BIRD IPv6 routing daemon
-After=network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/bird6
-ExecReload=/usr/bin/birdc6 configure
-ExecStop=/usr/bin/birdc6 down
-
-[Install]
-WantedBy=multi-user.target


[arch-commits] Commit in bird/trunk (PKGBUILD bird6.service)

2013-05-14 Thread Sébastien Luttringer
Date: Tuesday, May 14, 2013 @ 12:22:14
  Author: seblu
Revision: 90815

upgpkg: bird 1.3.10-3

- fix FS#35261
- fix FS#35260
- remove docs

Modified:
  bird/trunk/PKGBUILD
  bird/trunk/bird6.service

---+
 PKGBUILD  |   25 +++--
 bird6.service |2 +-
 2 files changed, 20 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-14 09:02:17 UTC (rev 90814)
+++ PKGBUILD2013-05-14 10:22:14 UTC (rev 90815)
@@ -4,7 +4,7 @@
 pkgbase=bird
 pkgname=('bird' 'bird6')
 pkgver=1.3.10
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://bird.network.cz/'
 license=('GPL2')
@@ -14,7 +14,7 @@
 'bird6.service')
 md5sums=('553c331b32bca9e926519cb2f67d68be'
  '01360e3b71ff2ed2223e87a3176e0659'
- '13a5f066a39f82136291f1461458651c')
+ 'e03f7c51293d81ad260fd47176ea5765')
 
 build() {
   cd $pkgbase-$pkgver
@@ -24,12 +24,23 @@
 
   # build ipv4 bird
   cd _build4
-  ../configure
+  ../configure \
+--prefix=/usr \
+--sbindir=/usr/bin \
+--sysconfdir=/etc \
+--localstatedir=/var \
+--docdir=/usr/share/doc/$pkgname
   make
 
   # build ipv6 bird
   cd ../_build6
-  ../configure --enable-ipv6
+  ../configure \
+--prefix=/usr \
+--sbindir=/usr/bin \
+--sysconfdir=/etc \
+--localstatedir=/var \
+--docdir=/usr/share/doc/$pkgname \
+--enable-ipv6
   make
 }
 
@@ -43,8 +54,9 @@
 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
+  #make docdir=$pkgdir/usr/share/doc/$pkgname install-docs
 
   # no /var inside pkg
   rm -r $pkgdir/var
@@ -63,8 +75,9 @@
 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
+  #make docdir=$pkgdir/usr/share/doc/$pkgname install-docs
 
   # no /var inside pkg
   rm -r $pkgdir/var

Modified: bird6.service
===
--- bird6.service   2013-05-14 09:02:17 UTC (rev 90814)
+++ bird6.service   2013-05-14 10:22:14 UTC (rev 90815)
@@ -4,7 +4,7 @@
 
 [Service]
 ExecStart=/usr/bin/bird6 -d
-ExecReload=/usr/bin/bird6c configure
+ExecReload=/usr/bin/birdc6 configure
 ExecStop=/usr/bin/bird6c down
 
 [Install]



[arch-commits] Commit in bird/trunk (PKGBUILD bird6.service)

2013-05-14 Thread Sébastien Luttringer
Date: Tuesday, May 14, 2013 @ 19:49:33
  Author: seblu
Revision: 90842

upgpkg: bird 1.3.10-4

Modified:
  bird/trunk/PKGBUILD
  bird/trunk/bird6.service

---+
 PKGBUILD  |4 ++--
 bird6.service |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-14 13:28:51 UTC (rev 90841)
+++ PKGBUILD2013-05-14 17:49:33 UTC (rev 90842)
@@ -4,7 +4,7 @@
 pkgbase=bird
 pkgname=('bird' 'bird6')
 pkgver=1.3.10
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://bird.network.cz/'
 license=('GPL2')
@@ -14,7 +14,7 @@
 'bird6.service')
 md5sums=('553c331b32bca9e926519cb2f67d68be'
  '01360e3b71ff2ed2223e87a3176e0659'
- 'e03f7c51293d81ad260fd47176ea5765')
+ 'b895b473cbc98cfd54751f737536eb1e')
 
 build() {
   cd $pkgbase-$pkgver

Modified: bird6.service
===
--- bird6.service   2013-05-14 13:28:51 UTC (rev 90841)
+++ bird6.service   2013-05-14 17:49:33 UTC (rev 90842)
@@ -5,7 +5,7 @@
 [Service]
 ExecStart=/usr/bin/bird6 -d
 ExecReload=/usr/bin/birdc6 configure
-ExecStop=/usr/bin/bird6c down
+ExecStop=/usr/bin/birdc6 down
 
 [Install]
 WantedBy=multi-user.target