diff --git a/glibc-rh966259.patch b/glibc-rh966259.patch new file mode 100644 index 0000000..b48abbf --- /dev/null +++ b/glibc-rh966259.patch @@ -0,0 +1,55 @@ +commit 96945714ec61951cc748da2b4b8a80cf02127ee9 +Author: Jeff Law +Date: Thu May 23 13:28:00 2013 -0600 + + [BZ #14256] + * manual/errno.texi (ESTALE): Update to account for more than + just NFS file systems. + * sysdeps/gnu/errlist.c: Regenerated. + +diff --git a/manual/errno.texi b/manual/errno.texi +index 2a3c004..6c9fa86 100644 +--- a/manual/errno.texi ++++ b/manual/errno.texi +@@ -739,13 +739,14 @@ The user's disk quota was exceeded. + @end deftypevr + + @comment errno.h +-@comment BSD: Stale NFS file handle ++@comment BSD: Stale file handle + @deftypevr Macro int ESTALE + @comment errno 70 @c DO NOT REMOVE +-Stale NFS file handle. This indicates an internal confusion in the NFS +-system which is due to file system rearrangements on the server host. +-Repairing this condition usually requires unmounting and remounting +-the NFS file system on the local host. ++Stale file handle. This indicates an internal confusion in the ++file system which is due to file system rearrangements on the server host ++for NFS file systems or corruption in other file systems. ++Repairing this condition usually requires unmounting, possibly repairing ++and remounting the file system. + @end deftypevr + + @comment errno.h +diff --git a/sysdeps/gnu/errlist.c b/sysdeps/gnu/errlist.c +index e3d2faf..bbd45f2 100644 +--- a/sysdeps/gnu/errlist.c ++++ b/sysdeps/gnu/errlist.c +@@ -780,11 +780,12 @@ TRANS The user's disk quota was exceeded. */ + #endif + #ifdef ESTALE + /* +-TRANS Stale NFS file handle. This indicates an internal confusion in the NFS +-TRANS system which is due to file system rearrangements on the server host. +-TRANS Repairing this condition usually requires unmounting and remounting +-TRANS the NFS file system on the local host. */ +- [ERR_REMAP (ESTALE)] = N_("Stale NFS file handle"), ++TRANS Stale file handle. This indicates an internal confusion in the ++TRANS file system which is due to file system rearrangements on the server host ++TRANS for NFS file systems or corruption in other file systems. ++TRANS Repairing this condition usually requires unmounting, possibly repairing ++TRANS and remounting the file system. */ ++ [ERR_REMAP (ESTALE)] = N_("Stale file handle"), + # if ESTALE > ERR_MAX + # undef ERR_MAX + # define ERR_MAX ESTALE diff --git a/glibc.spec b/glibc.spec index 9c8dc72..76796c6 100644 --- a/glibc.spec +++ b/glibc.spec @@ -27,7 +27,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 7%{?dist} +Release: 8%{?dist} # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries. # Things that are linked directly into dynamically linked programs # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional @@ -146,6 +146,9 @@ Patch2027: %{name}-rh819430.patch # Upstream BZ 15006 Patch2028: %{name}-rh905184.patch +# Upstream BZ 14256 +Patch2039: glibc-rh966259.patch + Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: glibc-profile < 2.4 Obsoletes: nss_db @@ -409,6 +412,7 @@ package or when debugging this package. %patch0037 -p1 %patch1000 -p1 %patch0038 -p1 +%patch2039 -p1 # On powerpc32, hp timing is only available in power4/power6 # libs, not in base, so pre-power4 dynamic linker is incompatible @@ -1204,6 +1208,9 @@ rm -f *.filelist* %endif %changelog +* Tue Jun 4 2013 Jeff Law - 2.17-8 + - Fix ESTALE error message (#966259) + * Sun May 5 2013 Patsy Franklin - 2.17-7 - Fix _nl_find_msg malloc failure case, and callers. (#959034).