[m4] Temporarily fix readlink test to accept EINVAL also

vcrhonek vcrhonek at fedoraproject.org
Tue Sep 20 10:41:18 UTC 2011


commit 4e8ea6fed94ec479754f20696e1f1e479d4f5313
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date:   Tue Sep 20 12:41:00 2011 +0200

    Temporarily fix readlink test to accept EINVAL also

 m4-1.4.16-readlink-einval.patch |   12 ++++++++++++
 m4.spec                         |   10 +++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/m4-1.4.16-readlink-einval.patch b/m4-1.4.16-readlink-einval.patch
new file mode 100644
index 0000000..6a98751
--- /dev/null
+++ b/m4-1.4.16-readlink-einval.patch
@@ -0,0 +1,12 @@
+diff -up m4-1.4.16/tests/test-readlink.h.orig m4-1.4.16/tests/test-readlink.h
+--- m4-1.4.16/tests/test-readlink.h.orig	2011-09-19 12:44:58.745546826 +0200
++++ m4-1.4.16/tests/test-readlink.h	2011-09-19 12:46:00.079548410 +0200
+@@ -38,7 +38,7 @@ test_readlink (ssize_t (*func) (char con
+   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);
diff --git a/m4.spec b/m4.spec
index ff02399..c4c8602 100644
--- a/m4.spec
+++ b/m4.spec
@@ -1,12 +1,15 @@
 Summary: The GNU macro processor
 Name: m4
 Version: 1.4.16
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: Applications/Text
 Source0: http://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz
 Source1: http://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz.sig
 URL: http://www.gnu.org/software/m4/
+# Patch0: Temporary fix to avoid fails, already fixed in gnulib, this patch
+#         should be removed after updating m4 to newer gnulib
+Patch0: m4-1.4.16-readlink-einval.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -23,6 +26,7 @@ Install m4 if you need a macro processor.
 
 %prep
 %setup -q
+%patch0 -p1 -b .readlink-einval
 chmod 644 COPYING
 
 %build
@@ -60,6 +64,10 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep 20 2011 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.4.16-2
+- Temporarily fix readlink test to accept EINVAL also
+  Resolves: #739189
+
 * Wed Mar 02 2011 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.4.16-1
 - Update to m4-1.4.16
 


More information about the scm-commits mailing list