r1876 - in /unstable/evolution-data-server/debian: changelog patches/01_fix-path_max-hurd.patch

[corsac at users.alioth.debian.org]

Author: corsac
Date: Sun Mar 27 19:01:10 2011
New Revision: 1876

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1876
Log:
* debian/patches:
  - 01_fix-path_max-hurd refreshed, previous patch wasn't sufficient, thanks
    to Emilio Pozuelo Monfort.

Modified:
    unstable/evolution-data-server/debian/changelog
    unstable/evolution-data-server/debian/patches/01_fix-path_max-hurd.patch

Modified: unstable/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/changelog?rev=1876&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/changelog (original)
+++ unstable/evolution-data-server/debian/changelog Sun Mar 27 19:01:10 2011
@@ -1,3 +1,11 @@
+evolution-data-server (2.32.2-4) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 01_fix-path_max-hurd refreshed, previous patch wasn't sufficient, thanks
+      to Emilio Pozuelo Monfort.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 27 Mar 2011 20:59:51 +0200
+
 evolution-data-server (2.32.2-3) unstable; urgency=low
 
   * debian/patches:

Modified: unstable/evolution-data-server/debian/patches/01_fix-path_max-hurd.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/01_fix-path_max-hurd.patch?rev=1876&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/01_fix-path_max-hurd.patch (original)
+++ unstable/evolution-data-server/debian/patches/01_fix-path_max-hurd.patch Sun Mar 27 19:01:10 2011
@@ -1,59 +1,78 @@
-From 7086de11546c8484376e2761de6a84850f180311 Mon Sep 17 00:00:00 2001
+From d0de670fa60142ea756675520f547740aeec7602 Mon Sep 17 00:00:00 2001
 From: Emilio Pozuelo Monfort <pochu27 at gmail.com>
-Date: Sat, 19 Feb 2011 22:45:13 +0000
-Subject: [PATCH] Don't use PATH_MAX for buffers
-
-Since that's not portable. Use dynamic allocation instead.
+Date: Mon, 28 Feb 2011 18:59:18 +0000
+Subject: [PATCH] Fix build when PATH_MAX is undefined
 
 https://bugzilla.gnome.org/show_bug.cgi?id=642783
 ---
- camel/providers/local/camel-local-folder.c |   13 +++----------
- 1 files changed, 3 insertions(+), 10 deletions(-)
+ camel/providers/local/camel-local-folder.c |   11 +++++++++++
+ libedataserverui/e-passwords.c             |   15 ++++++++++++---
+ 2 files changed, 23 insertions(+), 3 deletions(-)
 
 diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c
-index 3b7443c..afc9e16 100644
+index 3b7443c..59990a5 100644
 --- a/camel/providers/local/camel-local-folder.c
 +++ b/camel/providers/local/camel-local-folder.c
-@@ -36,10 +36,6 @@
- #include <glib/gi18n-lib.h>
- #include <glib/gstdio.h>
- 
--#if !defined (G_OS_WIN32) && !defined (_POSIX_PATH_MAX)
--#include <posix1_lim.h>
--#endif
--
- #include "camel-local-folder.h"
- #include "camel-local-private.h"
- #include "camel-local-store.h"
-@@ -47,10 +43,6 @@
- 
- #define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/
- 
--#ifndef PATH_MAX
--#define PATH_MAX _POSIX_PATH_MAX
--#endif
--
- #define CAMEL_LOCAL_FOLDER_GET_PRIVATE(obj) \
- 	(G_TYPE_INSTANCE_GET_PRIVATE \
- 	((obj), CAMEL_TYPE_LOCAL_FOLDER, CamelLocalFolderPrivate))
-@@ -302,7 +294,7 @@ camel_local_folder_construct(CamelLocalFolder *lf, guint32 flags, GError **error
+@@ -302,7 +302,11 @@ camel_local_folder_construct(CamelLocalFolder *lf, guint32 flags, GError **error
  	const gchar *root_dir_path;
  	gchar *tmp, *statepath;
  #ifndef G_OS_WIN32
--	gchar folder_path[PATH_MAX];
++#ifdef __GLIBC__
 +	gchar *folder_path;
++#else
+ 	gchar folder_path[PATH_MAX];
++#endif
  	struct stat st;
  #endif
  	gint forceindex, len;
-@@ -346,9 +338,10 @@ camel_local_folder_construct(CamelLocalFolder *lf, guint32 flags, GError **error
+@@ -346,9 +350,16 @@ camel_local_folder_construct(CamelLocalFolder *lf, guint32 flags, GError **error
  #ifndef G_OS_WIN32
  	/* follow any symlinks to the mailbox */
  	if (g_lstat (lf->folder_path, &st) != -1 && S_ISLNK (st.st_mode) &&
--	    realpath (lf->folder_path, folder_path) != NULL) {
++#ifdef __GLIBC__
 +	    (folder_path = realpath (lf->folder_path, NULL)) != NULL) {
++#else
+ 	    realpath (lf->folder_path, folder_path) != NULL) {
++#endif
  		g_free (lf->folder_path);
  		lf->folder_path = g_strdup (folder_path);
++#ifdef __GLIBC__
 +		free (folder_path);
++#endif
  	}
  #endif
  	lf->changes = camel_folder_change_info_new();
+diff --git a/libedataserverui/e-passwords.c b/libedataserverui/e-passwords.c
+index bd2ea7e..1e71ec0 100644
+--- a/libedataserverui/e-passwords.c
++++ b/libedataserverui/e-passwords.c
+@@ -122,14 +122,23 @@ ep_key_file_get_filename (void)
+ 
+ 	override = g_getenv ("GNOME22_USER_DIR");
+ 	if (override != NULL) {
++#ifdef __GLIBC__
++		gchar *resolved_path = realpath (override, NULL);
++#else
+ 		gchar resolved_path[PATH_MAX];
+-
++		realpath (override, resolved_path);
++#endif
++		gchar *ret;
+ 		/* Use realpath() to canonicalize the path, which
+ 		 * strips off any trailing directory separators so
+ 		 * we can safely tack on "_private". */
+-		return g_strdup_printf (
++		ret = g_strdup_printf (
+ 			"%s_private" G_DIR_SEPARATOR_S "Evolution",
+-			realpath (override, resolved_path));
++			resolved_path);
++#if __GLIBC__
++		free (resolved_path);
++#endif
++		return ret;
+ 	}
+ #endif
+ 	return g_build_filename (
+-- 
+1.7.4.1
+