← Back to branch summary

~ubuntu-branches/ubuntu/vivid/oss4/vivid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/203_hurd_no_EBADE.patch

  • Committer: Package Import Robot
  • Author(s): Sebastien NOEL
  • Date: 2012-11-19 11:47:24 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20121119114724-svu8mq7x3pk64nez
Tags: 4.2-build2007-1
http://bugs.debian.org/630737
http://bugs.debian.org/687086
http://bugs.debian.org/628876
http://bugs.debian.org/675933
http://bugs.debian.org/693657
http://bugs.debian.org/693657
http://bugs.debian.org/587191
http://bugs.debian.org/653374
* New upstream release.
* Acknowledge NMU, thanks Michael Gilbert.
* Add debian/patches/110_ld-as-needed.patch: Rearrange order of linker
  arguments to fix building with "ld --as-needed" (closes: #630737).
* Add missing dependency on dpkg-dev to oss4-dkms and oss4-source
  (closes: #687086).
* Fix typo in the changelog (closes: #628876, #675933)
* Add debian/patches/002_fix-linux-oss_native_word.patch (closes: #693657).
  Thanks to Ben Hutchings.
* Add debian/patches/003_linux-error-logging-fixes.patch (closes: #693657).
  Thanks to Ben Hutchings.
* check for /lib/modules/${kernelver}/build in addition of
  /lib/modules/${kernelver}/source (closes: #587191).
* oss4-dkms.dkms.in: fix 'CLEAN' rules (closes: #653374).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/203_hurd_no_EBADE.patch
 
1
GNU/Hurd doesn't have EBADE.  Report EGRATUITOUS there for now (or EIO on any
 
2
other system which doesn't have EBADE either).
 
3
 
 
4
Index: oss4-4.2-build2004/lib/libsalsa/seq_output.c
 
5
===================================================================
 
6
--- oss4-4.2-build2004.orig/lib/libsalsa/seq_output.c   2011-06-14 11:33:24.000000000 -0500
 
7
+++ oss4-4.2-build2004/lib/libsalsa/seq_output.c        2011-06-14 11:33:24.000000000 -0500
 
8
@@ -40,7 +40,13 @@
 
9
       if (l == -1)
 
10
        return -errno;
 
11
 
 
12
+#ifdef EBADE
 
13
       return -EBADE;           /* Randomly selected error */
 
14
+#elif defined(EGRATUITOUS)
 
15
+      return -EGRATUITOUS;     /* Randomly selected error */
 
16
+#else
 
17
+      return -EIO;             /* Randomly selected error */
 
18
+#endif
 
19
     }
 
20
 
 
21
   return 0;
 
22
@@ -65,7 +71,13 @@
 
23
       if (l == -1)
 
24
        return -errno;
 
25
 
 
26
+#ifdef EBADE
 
27
       return -EBADE;           /* Randomly selected error */
 
28
+#elif defined(EGRATUITOUS)
 
29
+      return -EGRATUITOUS;     /* Randomly selected error */
 
30
+#else
 
31
+      return -EIO;             /* Randomly selected error */
 
32
+#endif
 
33
     }
 
34
 
 
35
   return 0;