head	1.7;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.7
	OPENPKG_E1_MP:1.7
	OPENPKG_E1_MP_2_STABLE:1.6.2.1
	OPENPKG_E1_FP:1.6.2.1
	OPENPKG_2_STABLE_MP:1.7
	OPENPKG_2_STABLE_20061018:1.6.2.1
	OPENPKG_2_STABLE_20060622:1.6
	OPENPKG_2_STABLE:1.6.0.2
	OPENPKG_2_STABLE_BP:1.6
	OPENPKG_2_5_SOLID:1.4.0.6
	OPENPKG_2_5_SOLID_BP:1.4
	OPENPKG_2_4_RELEASE:1.4
	OPENPKG_2_4_SOLID:1.4.0.4
	OPENPKG_2_4_SOLID_BP:1.4
	OPENPKG_2_3_RELEASE:1.4
	OPENPKG_2_3_SOLID:1.4.0.2
	OPENPKG_2_3_SOLID_BP:1.4
	OPENPKG_2_2_RELEASE:1.1
	OPENPKG_2_2_SOLID:1.1.0.2
	OPENPKG_2_2_SOLID_BP:1.1;
locks; strict;
comment	@# @;


1.7
date	2006.08.28.07.05.37;	author rse;	state Exp;
branches;
next	1.6;
commitid	rBxZ8O4m2V941AKr;

1.6
date	2006.05.11.07.50.38;	author rse;	state Exp;
branches
	1.6.2.1;
next	1.5;
commitid	ts3T5iMdQmGJLzwr;

1.5
date	2006.02.11.08.24.50;	author rse;	state Exp;
branches;
next	1.4;
commitid	2rO29HSzgf6QO8lr;

1.4
date	2005.01.06.09.34.24;	author rse;	state dead;
branches;
next	1.3;

1.3
date	2004.12.24.11.06.56;	author rse;	state Exp;
branches;
next	1.2;

1.2
date	2004.10.23.09.58.35;	author rse;	state Exp;
branches;
next	1.1;

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

1.6.2.1
date	2006.10.16.14.55.24;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.7
log
@upgrading package: quagga 0.99.4 -> 0.99.5
@
text
@Index: lib/buffer.c
--- lib/buffer.c.orig	2005-12-02 12:02:17 +0100
+++ lib/buffer.c	2006-08-28 08:57:49 +0200
@@@@ -53,7 +53,7 @@@@
   size_t sp;
 
   /* Actual data stream (variable length). */
-  unsigned char data[];  /* real dimension is buffer->size */
+  unsigned char data[0];  /* real dimension is buffer->size */
 };
 
 /* It should always be true that: 0 <= sp <= cp <= size */
Index: ospfd/ospf_api.c
--- ospfd/ospf_api.c.orig	2005-12-02 12:02:18 +0100
+++ ospfd/ospf_api.c	2006-08-28 08:57:49 +0200
@@@@ -68,7 +68,7 @@@@
   struct opaque_lsa
   {
     struct lsa_header header;
-    u_char mydata[];
+    u_char mydata[0];
   };
 
   struct opaque_lsa *olsa;
@


1.6
log
@upgrading package: quagga 0.99.3 -> 0.99.4
@
text
@d3 1
a3 1
+++ lib/buffer.c	2006-05-11 08:58:39 +0200
a12 12
Index: lib/memory.c
--- lib/memory.c.orig	2006-03-30 15:47:38 +0200
+++ lib/memory.c	2006-05-11 09:04:02 +0200
@@@@ -21,7 +21,7 @@@@
  */
 
 #include <zebra.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 #include "log.h"
 #include "memory.h"
d15 1
a15 1
+++ ospfd/ospf_api.c	2006-05-11 08:58:39 +0200
@


1.6.2.1
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@d3 1
a3 1
+++ lib/buffer.c	2006-08-28 08:57:49 +0200
d13 12
d27 1
a27 1
+++ ospfd/ospf_api.c	2006-08-28 08:57:49 +0200
@


1.5
log
@upgrading package: quagga 0.98.5 -> 0.99.3
@
text
@d2 2
a3 2
--- lib/buffer.c.orig	2005-11-24 18:02:26 +0100
+++ lib/buffer.c	2006-02-11 09:17:42 +0100
d13 12
d26 2
a27 2
--- ospfd/ospf_api.c.orig	2005-11-24 17:51:16 +0100
+++ ospfd/ospf_api.c	2006-02-11 09:17:42 +0100
@


1.4
log
@upgrading package: quagga 0.97.4 -> 0.97.5
@
text
@d1 5
a5 6
Index: watchquagga/watchquagga.c
--- watchquagga/watchquagga.c.orig	2004-12-23 20:35:56 +0100
+++ watchquagga/watchquagga.c	2004-12-24 11:56:22 +0100
@@@@ -40,6 +40,7 @@@@
 #include "config.h"
 #endif
d7 18
a24 4
+#include <zebra.h>
 #include <thread.h>
 #include <log.h>
 #include <sigevent.h>
@


1.3
log
@upgrading package: quagga 0.97.3 -> 0.97.4
@
text
@@


1.2
log
@upgrading package: quagga 0.97.1 -> 0.97.2
@
text
@d1 6
a6 19
Index: lib/sockopt.h
--- lib/sockopt.h.orig	2004-10-22 15:14:35 +0200
+++ lib/sockopt.h	2004-10-23 11:46:59 +0200
@@@@ -60,9 +60,15 @@@@
 
 #if defined (SUNOS_5)
 #define SOPT_SIZE_CMSG_RECVIF_IPV4()  (sizeof (uint_t))
-#else
+#elif defined (CMSG_ALIGN)
+#define SOPT_SIZE_CMSG_IFINDEX_IPV4()	\
+	CMSG_ALIGN((sizeof (struct sockaddr_dl)))
+#elif defined (__CMSG_ALIGN)
 #define SOPT_SIZE_CMSG_RECVIF_IPV4()	\
 	__CMSG_ALIGN((sizeof (struct sockaddr_dl)))
+#elif defined (_ALIGN)
+#define SOPT_SIZE_CMSG_IFINDEX_IPV4()	\
+	_ALIGN((sizeof (struct sockaddr_dl)))
 #endif /* SUNOS_5 */
 #endif /* IP_RECVIF */
d8 4
@


1.1
log
@upgrading package: quagga 0.96.5 -> 0.97.0
@
text
@d2 3
a4 3
--- lib/sockopt.h.orig	2004-10-07 02:40:25 +0200
+++ lib/sockopt.h	2004-10-08 09:33:11 +0200
@@@@ -62,9 +62,16 @@@@
d7 1
a7 1
 #define SOPT_SIZE_CMSG_IFINDEX_IPV4()  (sizeof (uint_t))
d13 1
a13 1
 #define SOPT_SIZE_CMSG_IFINDEX_IPV4()	\
a17 1
+#else
d19 1
a20 1
 #endif
@