Bug#630256: augeas FTBFS with linux kernel >2.6.29 (test-readlink failed)

[Dave Walker (Daviey)]

Package: augeas
Version: 0.8.1-1
Severity: serious
Tags: patch
Justification: fails to build from source
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch

In Ubuntu, the attached patch was applied to achieve the following:

  * debian/patches/test-readlink-errno.patch: On linux kernels >2.6.39
    one of the readlink tests fails with EINVAL, rather than the previous
    (expected) behaviour of ENOENT; causing FTBFS.  This patch accepts
    both behaviours resolving failure.  (LP: #796296)


Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers oneiric-updates
  APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500, 
'oneiric')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.39-3-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -Nru augeas-0.8.1/debian/patches/series augeas-0.8.1/debian/patches/series
--- augeas-0.8.1/debian/patches/series	2011-06-09 15:55:58.000000000 +0100
+++ augeas-0.8.1/debian/patches/series	2011-06-12 19:01:19.000000000 +0100
@@ -1 +1,2 @@
 debian-changes-0.8.1-1
+test-readlink-errno.patch
diff -Nru augeas-0.8.1/debian/patches/test-readlink-errno.patch augeas-0.8.1/debian/patches/test-readlink-errno.patch
--- augeas-0.8.1/debian/patches/test-readlink-errno.patch	1970-01-01 01:00:00.000000000 +0100
+++ augeas-0.8.1/debian/patches/test-readlink-errno.patch	2011-06-12 19:52:25.000000000 +0100
@@ -0,0 +1,17 @@
+Description: On linux kernels >2.6.39 one of the readlink tests fails with
+ EINVAL, rather than the previous (expected) behaviour of ENOENT; causing
+ FTBFS.  This patch accepts both behaviours resolving failure.
+Author: Dave Walker (Daviey) <davewal...@ubuntu.com>
+Bug-Ubuntu: https://launchpad.net/bugs/796296
+
+--- a/gnulib/tests/test-readlink.h
++++ b/gnulib/tests/test-readlink.h
+@@ -38,7 +38,7 @@
+   ASSERT (errno == ENOENT);
+   errno = 0;
+   ASSERT (func ("", buf, sizeof buf) == -1);
+-  ASSERT (errno == ENOENT);
++  ASSERT (errno == ENOENT || errno == EINVAL);
+   errno = 0;
+   ASSERT (func (".", buf, sizeof buf) == -1);
+   ASSERT (errno == EINVAL);