diff -Nru libeatmydata-82/debian/changelog libeatmydata-82/debian/changelog --- libeatmydata-82/debian/changelog 2014-10-15 20:25:18.000000000 +0200 +++ libeatmydata-82/debian/changelog 2014-11-09 22:36:54.000000000 +0100 @@ -1,3 +1,15 @@ +libeatmydata (82-3) unstable; urgency=low + + * debian/patches/bug-702711.patch: + + [c95e942] fix the bug #702711 also for 32 bit arches (Closes: #765738). + + [0167220] update headers. + * [3fabf6f] debian/control: build-depend on strace only on non hurd and non + kfreebsd systems, where it is unavailable. + + * Upload sponsored by Petter Reinholdtsen. + + -- Mattia Rizzolo Sun, 09 Nov 2014 22:16:51 +0100 + libeatmydata (82-2) unstable; urgency=medium * Upload to unstable. diff -Nru libeatmydata-82/debian/control libeatmydata-82/debian/control --- libeatmydata-82/debian/control 2014-10-03 20:45:30.000000000 +0200 +++ libeatmydata-82/debian/control 2014-11-09 12:06:58.000000000 +0100 @@ -6,7 +6,7 @@ Standards-Version: 3.9.6 Build-Depends: autotools-dev, debhelper (>=9), - strace + strace [!hurd-any !kfreebsd-any] Homepage: https://launchpad.net/libeatmydata Vcs-Git: git://anonscm.debian.org/collab-maint/libeatmydata.git Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/libeatmydata.git diff -Nru libeatmydata-82/debian/patches/bug-702711.patch libeatmydata-82/debian/patches/bug-702711.patch --- libeatmydata-82/debian/patches/bug-702711.patch 2014-10-03 21:00:09.000000000 +0200 +++ libeatmydata-82/debian/patches/bug-702711.patch 2014-11-09 22:12:41.000000000 +0100 @@ -3,10 +3,12 @@ called by ctors, do not return an unexpected error. Author: Roland Stigge Reviewed-By: Petter Reinholdtsen +Reviewed-By: Mattia Rizzolo Bug: https://launchpad.net/bugs/1374862 Bug-Debian: https://bugs.debian.org/702711 +Bug-Debian: https://bugs.debian.org/765738 Forwarded: https://launchpad.net/bugs/1374862 -Last-Update: 2014-10-03 +Last-Update: 2014-10-29 --- a/libeatmydata/libeatmydata.c +++ b/libeatmydata/libeatmydata.c @@ -40,4 +42,13 @@ + if (initing) { errno = EFAULT; return -1; + } +@@ -171,7 +174,7 @@ + + /* In pthread environments the dlsym() may call our open(). */ + /* We simply ignore it because libc is already loaded */ +- if (!libc_open64) { ++ if (initing) { + errno = EFAULT; + return -1; }