head	1.4;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.2
	OPENPKG_E1_MP:1.2
	OPENPKG_E1_MP_2_STABLE:1.2.2.2
	OPENPKG_E1_FP:1.2.2.2
	OPENPKG_2_STABLE_MP:1.2
	OPENPKG_2_STABLE_20061018:1.2.2.2
	OPENPKG_2_STABLE:1.2.0.2
	OPENPKG_CW_FP:1.2;
locks; strict;
comment	@# @;


1.4
date	2009.05.27.20.01.15;	author rse;	state Exp;
branches;
next	1.3;
commitid	5IU6DgDR1Prg4yPt;

1.3
date	2009.04.28.18.10.48;	author rse;	state Exp;
branches;
next	1.2;
commitid	cvLdaRbnxgvboOLt;

1.2
date	2005.01.24.13.53.43;	author rse;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	2004.07.16.14.11.41;	author rse;	state Exp;
branches;
next	;

1.2.2.1
date	2005.01.24.13.53.43;	author rse;	state dead;
branches;
next	1.2.2.2;
commitid	iZxwRSmmWscPXUQr;

1.2.2.2
date	2006.10.16.14.48.31;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.4
log
@upgrading package: bird 1.0.14 -> 1.0.15
@
text
@Index: sysdep/unix/krt.c
--- sysdep/unix/krt.c.orig	2009-05-11 00:11:46 +0200
+++ sysdep/unix/krt.c	2009-05-27 21:55:43 +0200
@@@@ -645,6 +645,7 @@@@
 	  return;
 	}
 #endif
+      break;
     }
   rte_free(e);
 }
@


1.3
log
@upgrading package: bird 1.0.11 -> 1.0.14
@
text
@a0 21
Index: sysdep/unix/io.c
--- sysdep/unix/io.c.orig	2009-04-28 11:51:54 +0200
+++ sysdep/unix/io.c	2009-04-28 19:25:59 +0200
@@@@ -743,6 +743,7 @@@@
 static int
 sk_set_md5_auth_int(sock *s, sockaddr *sa, char *passwd)
 {
+#ifdef TCP_MD5SIG
   struct tcp_md5sig md5;
 
   memset(&md5, 0, sizeof(md5));
@@@@ -773,6 +774,9 @@@@
     }
 
   return rv;
+#else
+  return 0;
+#endif
 }
 
 /**
d2 2
a3 2
--- sysdep/unix/krt.c.orig	2009-04-28 11:51:54 +0200
+++ sysdep/unix/krt.c	2009-04-28 19:11:57 +0200
@


1.2
log
@fix building under new Flex world order
@
text
@d1 9
a9 5
Index: conf/Makefile
--- conf/Makefile.orig	2000-03-13 00:04:04 +0100
+++ conf/Makefile	2005-01-24 14:52:40 +0100
@@@@ -24,6 +24,6 @@@@
 	$(M4) -P $(conf-src)/gen_commands.m4 $(srcdir)/client/cmds.m4 $(conf-fragments) | sort >commands.h
d11 9
a19 3
 cf-lex.c: cf-lex.l
-	$(FLEX) $(FLEX_DEBUG) -sB8 -ocf-lex.c -Pcf_ cf-lex.l
+	$(FLEX) $(FLEX_DEBUG) -s -B -8 -ocf-lex.c -Pcf_ cf-lex.l
d21 1
a21 1
 depend: keywords.h commands.h cf-parse.tab.c cf-lex.c
d23 3
a25 3
--- sysdep/unix/krt.c.orig	2004-06-07 18:51:23 +0200
+++ sysdep/unix/krt.c	2005-01-24 14:51:23 +0100
@@@@ -639,6 +639,7 @@@@
@


1.2.2.1
log
@file bird.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:48:31 +0000
@
text
@d1 22
@


1.2.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 22
Index: conf/Makefile
--- conf/Makefile.orig	2000-03-13 00:04:04 +0100
+++ conf/Makefile	2005-01-24 14:52:40 +0100
@@@@ -24,6 +24,6 @@@@
 	$(M4) -P $(conf-src)/gen_commands.m4 $(srcdir)/client/cmds.m4 $(conf-fragments) | sort >commands.h
 
 cf-lex.c: cf-lex.l
-	$(FLEX) $(FLEX_DEBUG) -sB8 -ocf-lex.c -Pcf_ cf-lex.l
+	$(FLEX) $(FLEX_DEBUG) -s -B -8 -ocf-lex.c -Pcf_ cf-lex.l
 
 depend: keywords.h commands.h cf-parse.tab.c cf-lex.c
Index: sysdep/unix/krt.c
--- sysdep/unix/krt.c.orig	2004-06-07 18:51:23 +0200
+++ sysdep/unix/krt.c	2005-01-24 14:51:23 +0100
@@@@ -639,6 +639,7 @@@@
 	  return;
 	}
 #endif
+      break;
     }
   rte_free(e);
 }
@


1.1
log
@new package: bird 1.0.9 (BIRD Internet Routing Daemon)
@
text
@d1 11
d13 3
a15 3
--- sysdep/unix/krt.c.orig	2004-06-07 14:54:26 +0200
+++ sysdep/unix/krt.c	2004-06-07 20:14:47 +0200
@@@@ -643,6 +643,7 @@@@
@