[pve-devel] [PATCH tar 3/5] Remove fix-sparse-archive patches

Emmanuel Kasper e.kasper at proxmox.com
Mon Apr 18 10:08:43 CEST 2016


This was fixed in tar 1.27.1
---
 Makefile                  |  1 -
 README                    |  7 -------
 fix-sparse-archives.patch | 18 ------------------
 3 files changed, 26 deletions(-)
 delete mode 100644 README
 delete mode 100644 fix-sparse-archives.patch

diff --git a/Makefile b/Makefile
index c6e0b6b..2b9f655 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,6 @@ deb ${DEB}: ${TARSRC}
 	echo "debian/SOURCE" >>${TARDIR}/debian/docs
 	mv ${TARDIR}/debian/changelog ${TARDIR}/debian/changelog.org
 	cat changelog ${TARDIR}/debian/changelog.org >${TARDIR}/debian/changelog
-	cd ${TARDIR}; patch -p1 <../fix-sparse-archives.patch
 	cd ${TARDIR}; dpkg-buildpackage -b -uc -us -R"$(MAKE) --no-print-directory -f debian/rules"
 
 .PHONY: upload
diff --git a/README b/README
deleted file mode 100644
index 6b00738..0000000
--- a/README
+++ /dev/null
@@ -1,7 +0,0 @@
-We recompile tar ourselfs to fix bug:
-
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=737226
-
-Turned out this is now fixed upsteream because testing with
-ST_IS_SPARSE() avoids to trigger the faulty code. So this
-workaround is no longer required.
\ No newline at end of file
diff --git a/fix-sparse-archives.patch b/fix-sparse-archives.patch
deleted file mode 100644
index 8ac6066..0000000
--- a/fix-sparse-archives.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-See https://bugzilla.redhat.com/show_bug.cgi?id=1024268
-
---- old/src/sparse.c	2013-03-14 16:18:10.000000000 -0400
-+++ new/src/sparse.c	2013-10-28 16:50:20.966528811 -0400
-@@ -221,9 +221,13 @@ sparse_scan_file (struct tar_sparse_file
- 
-   st->archive_file_size = 0;
- 
-+#if 0
-+  /* this shortcut is not safe because some filesystems such as Netapp
-+     can hold small files without allocating any blocks. */
-   if (ST_NBLOCKS (st->stat) == 0)
-     offset = st->stat.st_size;
-   else
-+#endif
-     {
-       if (!tar_sparse_scan (file, scan_begin, NULL))
- 	return false;
-- 
2.1.4





More information about the pve-devel mailing list