README

@@ -10,9 +10,7 @@ See the man page for details.
 After releasing, please also release a signed tarball:
 
     $ VERSION=FIXME
-
     $ git archive --format=tar --prefix=disorderfs-${VERSION}/ ${VERSION} | bzip2 -9 > disorderfs-${VERSION}.tar.bz2
-
     $ gpg --detach-sig --armor --output=disorderfs-${VERSION}.tar.bz2.asc < disorderfs-${VERSION}.tar.bz2
 
-    $ scp disorderfs-${VERSION}* alioth.debian.org:/home/groups/reproducible/htdocs/releases/disorderfs
+And commit them to our LFS repository at https://salsa.debian.org/reproducible-builds/reproducible-lfs

debian/changelog

-disorderfs (0.5.3-3) UNRELEASED; urgency=medium
+disorderfs (0.5.4-1) unstable; urgency=medium
 
-  * WIP: Empty entry to avoid changelog-empty-entry Lintian warning.
+  [ Bernhard M. Wiedemann ]
+  * Use sys/xattr.h from glibc; libattr-2.4.48 dropped its own xattr.h.
 
- -- Holger Levsen <holger@debian.org>  Wed, 26 Sep 2018 03:32:35 +0200
+  [ Chris Lamb ]
+  * Rewrite call to readdir_r(3) to use readdir(3) instead as the former has
+    been deprecated in glibc 2.24. This silences a -Wdeprecated-declarations
+    GCC warning.
+
+  [ Mattia Rizzolo ]
+  * Update README with updated instructions on how to release the tarball.
+
+ -- Chris Lamb <lamby@debian.org>  Wed, 26 Sep 2018 21:14:08 +0100
 
 disorderfs (0.5.3-2) unstable; urgency=medium
 

disorderfs.cpp

@@ -37,13 +37,13 @@ extern "C" {
 #include <vector>
 #include <random>
 #include <algorithm>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
 #include <sys/types.h>
 #include <sys/syscall.h>
 #include <sys/file.h>
 #include <stddef.h>
 
-#define DISORDERFS_VERSION "0.5.3"
+#define DISORDERFS_VERSION "0.5.4"
 
 namespace {
 	std::vector<std::string>	bare_arguments;
@@ -425,12 +425,14 @@ int	main (int argc, char** argv)
 		if (!d) {
 			return -errno;
 		}
-		struct dirent	dirent_storage;
 		struct dirent*	dirent_p;
-		int		res;
-		while ((res = readdir_r(d, &dirent_storage, &dirent_p)) == 0 && dirent_p) {
+		errno = 0;
+		while ((dirent_p = readdir(d)) != NULL) {
 			dirents->emplace_back(std::make_pair(dirent_p->d_name, dirent_p->d_ino));
 		}
+		if (errno != 0) {
+			return -errno;
+		}
 		if (config.sort_dirents) {
 			std::sort(dirents->begin(), dirents->end());
 		}
@@ -438,8 +440,8 @@ int	main (int argc, char** argv)
 			std::reverse(dirents->begin(), dirents->end());
 		}
 		closedir(d);
-		if (res != 0) {
-			return -res;
+		if (errno != 0) {
+			return -errno;
 		}
 
 		set_fuse_data<Dirents*>(info, dirents.release());