From d759c1a6f834cd8a8a7c264d159b9ceb246aec2a Mon Sep 17 00:00:00 2001
From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Fri, 9 Apr 2010 17:42:39 +0200
Subject: [PATCH] NEWS and version update.

---
 NEWS                  | 16 ++++++++++++++++
 doc/bird.conf.example | 12 ++++++------
 filter/test.conf      |  2 +-
 misc/bird.spec        |  2 +-
 sysdep/config.h       |  2 +-
 5 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/NEWS b/NEWS
index 4f9af7b9..44f9bfab 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,19 @@
+Version 1.2.2 (2010-04-10)
+  o Much better BSD kernel support (IPv6, alien routes, ...).
+  o Deep OSPF socket changes, fixes OSPFv2/v3 behavior on BSD.
+  o OSPFv2 in Linux now supports more non-stub IP prefixes
+    on one physical iface.
+  o Export of device routes to the kernel is more restricted.
+  o Routes with strange scope not allowed in BIRD routing tables.
+  o New filterable route attributes bgp_originator_id,
+    bgp_cluster_list and ospf_router_id.
+  o Restricted read-only CLI (option -r).
+  o Pattern matching for 'show protocols' command.
+  o BGP protocol details in 'show protocols all' command.
+  o Configurable syslog name (and default on IPv6 changed).
+  o Statistic counters for pipes were fixed.
+  o Many bugfixes in BGP, OSPF, filters, ...
+
 Version 1.2.1 (2010-02-11)
   o Option 'interpret communities' allows to override implicit handling
     of well-known communities.
diff --git a/doc/bird.conf.example b/doc/bird.conf.example
index c7105120..dc4d18b6 100644
--- a/doc/bird.conf.example
+++ b/doc/bird.conf.example
@@ -17,10 +17,10 @@
 #define '1a-a1' = (30+40);
 
 # Define a route filter...
-filter test_filter {
-	if net ~ 10.0.0.0/16 then accept;
-	else reject;
-}
+#filter test_filter {
+#	if net ~ 10.0.0.0/16 then accept;
+#	else reject;
+#}
 
 #filter sink { reject; }
 #filter okay { accept; }
@@ -34,9 +34,9 @@ filter test_filter {
 # The direct protocol automatically generates device routes to
 # all network interfaces. Can exist in as many instances as you wish
 # if you want to populate multiple routing tables with device routes.
-protocol direct {
+#protocol direct {
 #	interface "-eth*", "*";	# Restrict network interfaces it works with
-}
+#}
 
 # This pseudo-protocol performs synchronization between BIRD's routing
 # tables and the kernel. If your kernel supports multiple routing tables
diff --git a/filter/test.conf b/filter/test.conf
index 0483c3d9..aca049c9 100644
--- a/filter/test.conf
+++ b/filter/test.conf
@@ -75,7 +75,7 @@ clist l;
 	p2 = prepend( p2, 1 );
 	print "Should be true: ", p2 ~ pm1, " ", p2, " ", pm1;
 
-#	l = - empty -;
+	l = - empty -;
 	l = add( l, (1,2) );
 	l = add( l, (2,3) );
 	print "Community list (1,2) (2,3) ", l;
diff --git a/misc/bird.spec b/misc/bird.spec
index 81ddaf0b..7140e28f 100644
--- a/misc/bird.spec
+++ b/misc/bird.spec
@@ -1,6 +1,6 @@
 Summary: BIRD Internet Routing Daemon
 Name: bird
-Version: 1.2.1
+Version: 1.2.2
 Release: 1
 Copyright: GPL
 Group: Networking/Daemons
diff --git a/sysdep/config.h b/sysdep/config.h
index d4a6bf76..5e6f2f9f 100644
--- a/sysdep/config.h
+++ b/sysdep/config.h
@@ -7,7 +7,7 @@
 #define _BIRD_CONFIG_H_
 
 /* BIRD version */
-#define BIRD_VERSION "1.2.1"
+#define BIRD_VERSION "1.2.2"
 
 /* Include parameters determined by configure script */
 #include "sysdep/autoconf.h"