rpms/evolution-data-server/devel evolution-data-server-2.21.91-netdb-breakage.patch, NONE, 1.1 evolution-data-server.spec, 1.203, 1.204

[Matthew Barnes (mbarnes)]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20510

Modified Files:
	evolution-data-server.spec 
Added Files:
	evolution-data-server-2.21.91-netdb-breakage.patch 
Log Message:

* Mon Feb 11 2008 Matthew Barnes <mbarnes at redhat.com> - 2.21.91-1.fc9
- Update to 2.21.91
- Add patch for GNOME bug #516074 (latest glibc breaks Camel).


evolution-data-server-2.21.91-netdb-breakage.patch:

--- NEW FILE evolution-data-server-2.21.91-netdb-breakage.patch ---
diff -up evolution-data-server-2.21.91/camel/camel-net-utils.c.netdb-breakage evolution-data-server-2.21.91/camel/camel-net-utils.c
--- evolution-data-server-2.21.91/camel/camel-net-utils.c.netdb-breakage	2008-01-23 06:16:25.000000000 -0500
+++ evolution-data-server-2.21.91/camel/camel-net-utils.c	2008-02-12 13:25:56.000000000 -0500
@@ -44,6 +44,14 @@
 
 #define d(x)
 
+/* These are GNU extensions */
+#ifndef NI_MAXHOST
+#define NI_MAXHOST	1025
+#endif
+#ifndef NI_MAXSERV
+#define NI_MAXSERV	32
+#endif
+
 #ifdef G_OS_WIN32
 
 typedef short in_port_t;
diff -up evolution-data-server-2.21.91/camel/camel-net-utils.h.netdb-breakage evolution-data-server-2.21.91/camel/camel-net-utils.h
--- evolution-data-server-2.21.91/camel/camel-net-utils.h.netdb-breakage	2007-11-29 07:53:44.000000000 -0500
+++ evolution-data-server-2.21.91/camel/camel-net-utils.h	2008-02-12 13:25:56.000000000 -0500
@@ -77,9 +77,6 @@ struct addrinfo {
 #define EAI_SYSTEM	  -11	/* System error returned in `errno'.  */
 #define EAI_OVERFLOW	  -12	/* Argument buffer overflow.  */
 
-#define NI_MAXHOST      1025
-#define NI_MAXSERV      32
-
 #define NI_NUMERICHOST	1	/* Don't try to look up hostname.  */
 #define NI_NUMERICSERV	2	/* Don't convert port number to name.  */
 #define NI_NOFQDN	4	/* Only return nodename portion.  */
diff -up evolution-data-server-2.21.91/configure.in.netdb-breakage evolution-data-server-2.21.91/configure.in
--- evolution-data-server-2.21.91/configure.in.netdb-breakage	2008-02-10 10:19:14.000000000 -0500
+++ evolution-data-server-2.21.91/configure.in	2008-02-12 13:25:56.000000000 -0500
@@ -878,6 +878,14 @@ AC_CACHE_CHECK([if system supports getad
 		#include <stddef.h>
 
 	],[
+		#ifndef NI_MAXHOST
+		#define NI_MAXHOST	1025
+		#endif
+
+		#ifndef NI_MAXSERV
+		#define NI_MAXSERV	32
+		#endif
+
 		struct addrinfo hints, *res;
 		struct sockaddr_in6 sin6;
 		int af = AF_INET6;


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- evolution-data-server.spec	11 Feb 2008 16:05:16 -0000	1.203
+++ evolution-data-server.spec	12 Feb 2008 18:29:55 -0000	1.204
@@ -54,6 +54,9 @@
 # RH bug #243296
 Patch15: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
+# GNOME bug #516074
+Patch16: evolution-data-server-2.21.91-netdb-breakage.patch
+
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
@@ -132,6 +135,7 @@
 %patch13 -p1 -b .fix-ldap-query
 %patch14 -p1 -b .camel-folder-summary-crash
 %patch15 -p1 -b .fix-64bit-acinclude
+%patch16 -p1 -b .netdb-breakage
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -376,6 +380,7 @@
 %changelog
 * Mon Feb 11 2008 Matthew Barnes <mbarnes at redhat.com> - 2.21.91-1.fc9
 - Update to 2.21.91
+- Add patch for GNOME bug #516074 (latest glibc breaks Camel).
 
 * Mon Jan 28 2008 Matthew Barnes <mbarnes at redhat.com> - 2.21.90-1.fc9
 - Update to 2.21.90