From: Bdale Garbee <bdale@gag.com>
Date: Wed, 9 Feb 2011 18:31:37 +0000 (-0700)
Subject: patch from Svante Signell to fix build problem on GNU/Hurd, closes: #611290
X-Git-Tag: debian/1.7.4p6-1~2
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=17ae6a1c4916c8a5ef7ca8a4e2acfd7e2954e360;p=debian%2Fsudo

patch from Svante Signell to fix build problem on GNU/Hurd, closes: #611290
---

diff --git a/debian/patches/hurd-have-getutid.diff b/debian/patches/hurd-have-getutid.diff
new file mode 100644
index 0000000..f6968dc
--- /dev/null
+++ b/debian/patches/hurd-have-getutid.diff
@@ -0,0 +1,35 @@
+diff --git a/boottime.c b/boottime.c
+index f75af3e..843aeca 100644
+--- a/boottime.c
++++ b/boottime.c
+@@ -47,6 +47,14 @@
+ # include <sys/sysctl.h>
+ #endif
+ 
++/* Must be included above "compat.h"!!  */
++#if defined(HAVE_GETUTXID)
++#include <utmpx.h>
++#elif defined(HAVE_GETUTID)
++#include <utmp.h>
++#else
++#endif
++
+ #include "compat.h"
+ #include "missing.h"
+ 
+@@ -102,7 +110,6 @@ get_boottime(tv)
+ 
+ #elif defined(HAVE_GETUTXID)
+ 
+-#include <utmpx.h>
+ int
+ get_boottime(tv)
+     struct timeval *tv;
+@@ -121,7 +128,6 @@ get_boottime(tv)
+ 
+ #elif defined(HAVE_GETUTID)
+ 
+-#include <utmp.h>
+ int
+ get_boottime(tv)
+     struct timeval *tv;
diff --git a/debian/patches/series b/debian/patches/series
index 178a4c4..ba3c21b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 typo-in-classic-insults.diff
 env.c-safety.diff
 paths-in-samples.diff
+hurd-have-getutid.diff