#define PATH_MAX _POSIX_PATH_MAX. (Fixed in upstream hg, though differently.)

diff --git a/debian/changelog b/debian/changelog
index fb63205f86e49b374b0062ca3cca67c21137db7f..3b33062e82e408e53b81c9a81eeebaf90d22a50e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ mutt (1.5.20-9~unrel) UNRELEASED; urgency=low
 
   * hurd-i386 fixes:
     + Use libgdbm-dev for this arch until libtokyocabinet-dev is available.
 
   * hurd-i386 fixes:
     + Use libgdbm-dev for this arch until libtokyocabinet-dev is available.

+    + #define PATH_MAX _POSIX_PATH_MAX. (Fixed in upstream hg, though
+      differently.)

   * /usr/bin/mutt is an alternative now, instead of a diversion in
     mutt-patched.
 
   * /usr/bin/mutt is an alternative now, instead of a diversion in
     mutt-patched.
 

diff --git a/debian/patches/series b/debian/patches/series
index e704e4d9a0ef5cb272f1ef24f67b965184fc0c0b..d25714b3d60ae029365be7135d06853e4d0fbf00 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -61,6 +61,7 @@ upstream/311296-rand-mktemp.patch
 upstream/573823-imap_internal_date
 upstream/542344-dont_fold_From_
 
 upstream/573823-imap_internal_date
 upstream/542344-dont_fold_From_
 

+upstream/path_max

 misc/hyphen-as-minus.patch
 #misc/manpage-typos.patch
 misc/smime_keys-manpage.patch
 misc/hyphen-as-minus.patch
 #misc/manpage-typos.patch
 misc/smime_keys-manpage.patch

diff --git a/debian/patches/upstream/path_max b/debian/patches/upstream/path_max
new file mode 100644 (file)
index 0000000..7cb34d5
--- /dev/null
+++ b/debian/patches/upstream/path_max
@@ -0,0 +1,16 @@
+Fixed in hg around 5354:d4ea7f571f10; remove as soon as there's no PATH_MAX in the code anymore.
+
+--- a/mutt.h
++++ b/mutt.h
+@@ -52,6 +52,11 @@
+ #include <limits.h>
+ #endif
+ 
++/* PATH_MAX is undefined on the hurd */
++#ifndef PATH_MAX
++#define PATH_MAX _POSIX_PATH_MAX
++#endif
++
+ #include <pwd.h>
+ #include <grp.h>
+