Commit 682b3afe authored by Axel Beckert's avatar Axel Beckert

Update dev_t.patch to make it work on GNU/Hurd, too.

Thanks Svante Signell!

Closes: #591386

Rewrite patch description to make it more clear and to mention
GNU/Hurd, too.
parent a5d1a996
......@@ -4,6 +4,9 @@ since (1.1-5) UNRELEASED; urgency=medium
* Output content of .since in case of test failure
* Merge changelog entry from impatient NMU by Anibal Monsalve Salazar
+ Ignore dev_t.patch from NMU, use my DEP-3 compliant variant
* Import updated dev_t.patch by Svante Signell to make it work on
GNU/Hurd, too. Thanks! (Closes: #591386)
+ Rewrite patch description to make it more clear and to mention Hurd.
-- Axel Beckert <abe@debian.org> Mon, 31 Mar 2014 02:35:15 +0200
......
Description: Fix malfunctioning on mips and mipsel
The cause of problem is that st_dev member of structure stat,
defined in /usr/include/mipsel-linux-gnu/bits/stat.h,
is expected to be of type dev_t.
But for mips/mipsel ABIO32 it is defined as 'unsigned long int'.
dev_t type is defined as 'unsigned long long int'.
Description: Fix malfunctioning on mips, mipsel and hurd-i386
The st_dev member of the structure stat, defined in
/usr/include/*-linux-gnu/bits/stat.h, is expected to be of type
dev_t. But for mips/mipsel ABIO32 it is defined as 'unsigned long
int' and for GNU/Hurd it's 'unsigned long long int'.
Author: Aleksandar Zlicic <Aleksandar.Zlicic@imgtec.com>
Author: Svante Signell <svante.signell@gmail.com>
Bug-Debian: https://bugs.debian.org/742940
Bug-Debian: https://bugs.debian.org/591386
Forwarded: yes
Index: since-1.1/since.c
===================================================================
--- since-1.1.orig/since.c 2014-04-03 14:01:50.000000000 +0000
+++ since-1.1/since.c 2014-04-07 15:32:15.000000000 +0000
@@ -52,7 +52,11 @@
@@ -52,7 +52,13 @@
struct data_file{
int d_fd;
char *d_name;
+#if defined (__mips__ ) && (_MIPS_SIM == _ABIO32)
+ unsigned long int d_dev;
+#elif defined(__GNU__)
+ unsigned long long int d_dev;
+#else
dev_t d_dev;
+#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment