Control: tags 898483 + patch
Control: tags 898483 + pending
Dear maintainer,
I've prepared an NMU for libphysfs (versioned as 3.0.1-1.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.
Regards.
Gianfranco
diff -Nru libphysfs-3.0.1/debian/changelog libphysfs-3.0.1/debian/changelog
--- libphysfs-3.0.1/debian/changelog 2017-11-07 10:37:53.000000000 +0100
+++ libphysfs-3.0.1/debian/changelog 2018-05-30 16:26:06.000000000 +0200
@@ -1,3 +1,12 @@
+libphysfs (3.0.1-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * debian/patches/a29fef4a20fd.patch:
+ - cherry-pick upstream fix for PHYSFS_setWriteDir error
+ (Closes: #898483)
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org> Wed, 30 May 2018 16:26:06 +0200
+
libphysfs (3.0.1-1) unstable; urgency=medium
* New upstream release.
diff -Nru libphysfs-3.0.1/debian/patches/a29fef4a20fd.patch libphysfs-3.0.1/debian/patches/a29fef4a20fd.patch
--- libphysfs-3.0.1/debian/patches/a29fef4a20fd.patch 1970-01-01 01:00:00.000000000 +0100
+++ libphysfs-3.0.1/debian/patches/a29fef4a20fd.patch 2018-05-30 16:26:06.000000000 +0200
@@ -0,0 +1,41 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+
+# HG changeset patch
+# User Ryan C. Gordon <iccu...@icculus.org>
+# Date 1526514891 14400
+# Node ID a29fef4a20fd79ead82998c91dc4828ed5061cb5
+# Parent db8f944df5c56f0244229813203fb5b24e8d9968
+PHYSFS_setWriteDir() shouldn't create an empty file if the dir doesn't exist.
+(transplanted from 2653b3bc19c9ba7d1e6bf53566719e4e30935382)
+
+diff -r db8f944df5c5 -r a29fef4a20fd src/physfs.c
+--- a/src/physfs.c Thu Apr 19 10:06:38 2018 -0400
++++ b/src/physfs.c Wed May 16 19:54:51 2018 -0400
+@@ -879,13 +879,20 @@
+
+ if (io == NULL)
+ {
++ /* file doesn't exist, etc? Just fail out. */
++ PHYSFS_Stat statbuf;
++ BAIL_IF_ERRPASS(!__PHYSFS_platformStat(d, &statbuf, 1), NULL);
++
+ /* DIR gets first shot (unlike the rest, it doesn't deal with files). */
+- retval = tryOpenDir(io, &__PHYSFS_Archiver_DIR, d, forWriting, &claimed);
+- if (retval || claimed)
+- return retval;
++ if (statbuf.filetype == PHYSFS_FILETYPE_DIRECTORY)
++ {
++ retval = tryOpenDir(io, &__PHYSFS_Archiver_DIR, d, forWriting, &claimed);
++ if (retval || claimed)
++ return retval;
++ } /* if */
+
+ io = __PHYSFS_createNativeIo(d, forWriting ? 'w' : 'r');
+- BAIL_IF_ERRPASS(!io, 0);
++ BAIL_IF_ERRPASS(!io, NULL);
+ created_io = 1;
+ } /* if */
+
+
diff -Nru libphysfs-3.0.1/debian/patches/series libphysfs-3.0.1/debian/patches/series
--- libphysfs-3.0.1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ libphysfs-3.0.1/debian/patches/series 2018-05-30 16:26:06.000000000 +0200
@@ -0,0 +1 @@
+a29fef4a20fd.patch
