From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Fri, 2 May 2014 16:27:40 +0000 (+0200)
Subject: Merge commit '538fec7b1b7dd729eadf1c933e27f59080cd3576' into integrated
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f6bfbbf1c0dbc645a34ea79a132a64e7d35934f;p=thirdparty%2Fbird.git

Merge commit '538fec7b1b7dd729eadf1c933e27f59080cd3576' into integrated
---

3f6bfbbf1c0dbc645a34ea79a132a64e7d35934f
diff --cc proto/ospf/config.Y
index 40b14c4fa,90f289d08..99031c0b2
--- a/proto/ospf/config.Y
+++ b/proto/ospf/config.Y
@@@ -373,12 -383,13 +373,16 @@@ ospf_iface_start
  
  ospf_instance_id:
     /* empty */
 - | INSTANCE expr { set_instance_id($2); }
 + | INSTANCE expr {
 +     if (ospf_cfg_is_v2()) cf_error("Instance ID requires OSPFv3");
 +     OSPF_PATT->instance_id = $2;
 +   }
   ;
  
+ ospf_iface_patt_list:
+    iface_patt_list { if (OSPF_VERSION == 3) iface_patt_check(); } ospf_instance_id
+  ; 
+ 
  ospf_iface_opts:
     /* empty */
   | ospf_iface_opts ospf_iface_item ';'
diff --cc sysdep/config.h
index 2b668d0c7,b4aa75281..a32f6cfa9
--- a/sysdep/config.h
+++ b/sysdep/config.h
@@@ -7,11 -7,8 +7,11 @@@
  #define _BIRD_CONFIG_H_
  
  /* BIRD version */
- #define BIRD_VERSION "1.4.0"
+ #define BIRD_VERSION "1.4.2"
  
 +// XXXX temporary define
 +#define IPV1 1
 +
  /* Include parameters determined by configure script */
  #include "sysdep/autoconf.h"