packages: bird/bird.spec, bird/bird-allowalien.patch (NEW) - Added alien bc...

[brushek]

Author: brushek                      Date: Sat Apr  9 22:59:04 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Added alien bcond to allow import openvz routes to bird's routing table
  Details: http://www.mail-archive.com/bird-users@atrey.karlin.mff.cuni.cz/msg01069.html

---- Files affected:
packages/bird:
   bird.spec (1.46 -> 1.47) , bird-allowalien.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/bird/bird.spec
diff -u packages/bird/bird.spec:1.46 packages/bird/bird.spec:1.47
--- packages/bird/bird.spec:1.46	Thu Mar 31 11:52:20 2011
+++ packages/bird/bird.spec	Sun Apr 10 00:58:58 2011
@@ -5,6 +5,7 @@
 # Conditional build:
 %bcond_without	ipv6	# disable IPv6 support (and building bird-ipv6 package)
 %bcond_without	ipv4	# disable IPv4 support (and building bird-ipv4 package)
+%bcond_with	alien # enable possibility to import 'alien' routes import into bird's routing table
 #
 Summary:	The BIRD Internet Routing Daemon
 Summary(pl.UTF-8):	Demon BIRD Internetowego Routingu Dynamicznego
@@ -22,6 +23,7 @@
 Source5:	ftp://bird.network.cz/pub/bird/%{name}-doc-%{version}.tar.gz
 # Source5-md5:	c99c927430a4ccb07d3317614520caf2
 Patch0:		%{name}-tinfo.patch
+%{?with_alien:Patch1:		%{name}-allowalien.patch}
 URL:		http://bird.network.cz/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -105,6 +107,9 @@
 %prep
 %setup -q -a 5
 %patch0 -p1
+%if %{with alien}
+%patch1 -p1
+%endif
 
 %build
 cp -f /usr/share/automake/config.* tools
@@ -208,6 +213,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47  2011/04/09 22:58:58  brushek
+- Added alien bcond to allow import openvz routes to bird's routing table
+  Details: http://www.mail-archive.com/bird-users@atrey.karlin.mff.cuni.cz/msg01069.html
+
 Revision 1.46  2011/03/31 09:52:20  arekm
 - up to 1.3.0
 

================================================================
Index: packages/bird/bird-allowalien.patch
diff -u /dev/null packages/bird/bird-allowalien.patch:1.1
--- /dev/null	Sun Apr 10 00:59:04 2011
+++ packages/bird/bird-allowalien.patch	Sun Apr 10 00:58:58 2011
@@ -0,0 +1,14 @@
+diff -ru bird-1.3.0.orig/sysdep/linux/netlink/netlink.c bird-1.3.0/sysdep/linux/netlink/netlink.c
+--- bird-1.3.0.orig/sysdep/linux/netlink/netlink.c	2011-03-31 10:29:42.000000000 +0200
++++ bird-1.3.0/sysdep/linux/netlink/netlink.c	2011-04-10 00:51:11.000000000 +0200
+@@ -851,8 +851,9 @@
+ 	   * for their 'alien' routes.
+ 	   */
+ 
+-	  if (i->rtm_protocol == RTPROT_BOOT)
++	/*  if (i->rtm_protocol == RTPROT_BOOT)
+ 	    src = KRT_SRC_KERNEL;
++	 */
+ 	}
+ 
+       break;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bird/bird.spec?r1=1.46&r2=1.47&f=u