From: Peter Pentchev <roam@ringlet.net>
Date: Sat, 16 Oct 2010 15:58:16 +0000 (+0300)
Subject: Really fix the build on the GNU Hurd.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=550ccf755fa2c249a61e0fd431ffef7f50a40178;p=people%2Fms%2Fdma.git

Really fix the build on the GNU Hurd.
---

diff --git a/changelog b/changelog
index 6c2d4c1..f65a4b7 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+dma (0.0.2010.06.17-6) UNRELEASED; urgency=low
+
+  * Add the 37-gnu-hurd patch to really fix the FTBFS on GNU/Hurd.
+
+ -- Peter Pentchev <roam@ringlet.net>  Sat, 16 Oct 2010 18:54:54 +0300
+
 dma (0.0.2010.06.17-5) unstable; urgency=low
 
   * Only use SA_NOCLDWAIT if available to fix the Hurd FTBFS.
diff --git a/patches/37-gnu-hurd.patch b/patches/37-gnu-hurd.patch
new file mode 100644
index 0000000..2a9c0d9
--- /dev/null
+++ b/patches/37-gnu-hurd.patch
@@ -0,0 +1,42 @@
+Description: Further fixes to the build on the GNU Hurd
+ - include <sys/file.h> for LOCK_EX
+ - define MAXHOSTNAMELEN if absent
+Forwarded: no
+Author: Peter Pentchev <roam@ringlet.net>
+Last-Update: 2010-10-16
+
+--- a/spool.c
++++ b/spool.c
+@@ -32,6 +32,7 @@
+  * SUCH DAMAGE.
+  */
+ 
++#include <sys/file.h>
+ #include <sys/stat.h>
+ 
+ #include <ctype.h>
+--- a/util.c
++++ b/util.c
+@@ -33,6 +33,7 @@
+  */
+ 
+ #include <sys/param.h>
++#include <sys/file.h>
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <netdb.h>
+@@ -43,6 +44,14 @@
+ 
+ #include "dma.h"
+ 
++/**
++ * A quick'n'dirty hack to get dma to build on the GNU Hurd.
++ * A real fix would dynamically allocate the hostname array.
++ */
++#ifndef MAXHOSTNAMELEN
++#define MAXHOSTNAMELEN	1024
++#endif
++
+ const char *
+ hostname(void)
+ {
diff --git a/patches/series b/patches/series
index 63f6e9b..efed742 100644
--- a/patches/series
+++ b/patches/series
@@ -19,3 +19,4 @@
 34-manpage-defaults.patch
 35-delivery-retry.patch
 36-sa_nocldwait.patch
+37-gnu-hurd.patch