Tarsnap 1.0.32

Changes since version 1.0.31:
* A bug affecting the handling of the --nodump option on Linux (and in
  most cases rendering it inoperative) is fixed.
* A workaround has been added for a compiler bug in OS X 10.7 (Lion).
* The NetBSD "kernfs" and "ptyfs" filesystems are now excluded from
  archival by default.

lib/util/getfstype.c

@@ -171,6 +171,8 @@ const char * synthetic_filesystems[] = {
 	"usbdevfs",		/* Linux */
 	"securityfs",		/* Linux */
 	"selinux",		/* Linux */
+	"kernfs",		/* NetBSD */
+	"ptyfs",		/* NetBSD */
 	"dev",			/* Solaris */
 	"ctfs",			/* Solaris */
 	"mntfs",		/* Solaris */

libarchive/archive_read_open_filename.c

@@ -94,6 +94,7 @@ archive_read_open_filename(struct archive *a, const char *filename,
 	}
 	if (fstat(fd, &st) != 0) {
 		archive_set_error(a, errno, "Can't stat '%s'", filename);
+		close(fd);
 		return (ARCHIVE_FATAL);
 	}
 

pkg/README

@@ -39,7 +39,8 @@ There is a SlackBuild for tarsnap (possibly an earlier version) at
 for VER = 12.2 and 13.1 (and possibly other versions by the time
 you read this).
 
-FreeBSD
--------
+FreeBSD, OpenBSD, and pkgsrc
+----------------------------
 
-Tarsnap is in the FreeBSD ports tree as sysutils/tarsnap.
+Tarsnap is in the FreeBSD ports tree, the OpenBSD ports tree, and
+the pkgsrc tree as sysutils/tarsnap.

pkg/debian/changelog

@@ -1,3 +1,9 @@
+tarsnap (1.0.32) unstable; urgency=low
+
+  * New version of tarsnap fixes a bug which made the --nodump option
+    inoperative.
+
+ -- Colin Percival <[email protected]>  Sun, 12 Feb 2012 02:18:25 +0000
 tarsnap (1.0.31) unstable; urgency=low
 
   * New version of tarsnap fixes security vulnerabilities relating to key

tar-version

@@ -1 +1 @@
-1.0.31
+1.0.32

tar/multitape/chunkify.c

@@ -67,7 +67,7 @@ isprime(uint32_t n)
 static uint32_t
 nextprime(uint32_t n)
 {
-	uint32_t p;
+	volatile uint32_t p;
 
 	for (p = n; p != 0; p++)
 		if (isprime(p))

tar/write.c

@@ -850,7 +850,8 @@ write_hierarchy(struct bsdtar *bsdtar, struct archive *a, const char *path)
 #if defined(EXT2_IOC_GETFLAGS) && defined(EXT2_NODUMP_FL)
 		/* Linux uses ioctl to read flags. */
 		if (bsdtar->option_honor_nodump) {
-			int fd = open(name, O_RDONLY | O_NONBLOCK);
+			int fd = open(tree_current_access_path(tree),
+			    O_RDONLY | O_NONBLOCK);
 			if (fd >= 0) {
 				unsigned long fflags;
 				int r = ioctl(fd, EXT2_IOC_GETFLAGS, &fflags);