Control: tags 805593 + patch
Control: tags 805593 + pending
Control: tags 915997 + pending
Control: tags 916117 + patch
Control: tags 916117 + pending
Dear maintainer,
I've prepared an NMU for unyaffs (versioned as 0.9.7-0.1) and uploaded
it to DELAYED/14. Please feel free to tell me if I should cancel it.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
diff -Nru unyaffs-0.9.6/debian/changelog unyaffs-0.9.7/debian/changelog
--- unyaffs-0.9.6/debian/changelog 2013-04-09 17:50:32.000000000 +0300
+++ unyaffs-0.9.7/debian/changelog 2019-01-06 23:30:37.000000000 +0200
@@ -1,3 +1,15 @@
+unyaffs (0.9.7-0.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * New upstream release.
+ - Fixes FTBFS with glibc 2.28. (Closes: #915997)
+ * Build with default CFLAGS for non-empty -dbgsym.
+ * Use the upstream manpage. (Closes: #805593)
+ * Remove incorrect Vcs-Git and Vcs-Browser fields. (Closes: #916117)
+ * Priority: extra -> optional
+
+ -- Adrian Bunk <b...@debian.org> Sun, 06 Jan 2019 23:30:37 +0200
+
unyaffs (0.9.6-1) unstable; urgency=low
* Initial packaging (Closes: #703816)
diff -Nru unyaffs-0.9.6/debian/control unyaffs-0.9.7/debian/control
--- unyaffs-0.9.6/debian/control 2013-03-30 06:29:46.000000000 +0200
+++ unyaffs-0.9.7/debian/control 2019-01-06 23:30:37.000000000 +0200
@@ -1,12 +1,10 @@
Source: unyaffs
Section: devel
-Priority: extra
+Priority: optional
Maintainer: Matthew Fischer <matthew.fisc...@ubuntu.com>
Build-Depends: debhelper (>= 9.0.0)
Standards-Version: 3.9.4
Homepage: https://github.com/ehlers/unyaffs
-Vcs-Git: git://github.com/ehlers/unyaffs.git
-Vcs-Browser: https://github.com/ehlers/unyaffs
Package: unyaffs
Architecture: any
diff -Nru unyaffs-0.9.6/debian/manpages unyaffs-0.9.7/debian/manpages
--- unyaffs-0.9.6/debian/manpages 2013-03-30 06:29:46.000000000 +0200
+++ unyaffs-0.9.7/debian/manpages 2019-01-06 23:30:37.000000000 +0200
@@ -1 +1 @@
-debian/unyaffs.1
+unyaffs.1
diff -Nru unyaffs-0.9.6/debian/rules unyaffs-0.9.7/debian/rules
--- unyaffs-0.9.6/debian/rules 2013-04-06 00:46:15.000000000 +0300
+++ unyaffs-0.9.7/debian/rules 2019-01-06 23:30:37.000000000 +0200
@@ -1,7 +1,4 @@
#!/usr/bin/make -f
-override_dh_auto_build:
- CFLAGS=-D_FORTIFY_SOURCE=2 dh_auto_build
-
%:
dh $@
diff -Nru unyaffs-0.9.6/debian/unyaffs.1 unyaffs-0.9.7/debian/unyaffs.1
--- unyaffs-0.9.6/debian/unyaffs.1 2013-03-30 06:29:46.000000000 +0200
+++ unyaffs-0.9.7/debian/unyaffs.1 1970-01-01 02:00:00.000000000 +0200
@@ -1,31 +0,0 @@
-.\" (C) Copyright 2013 Matthew Fischer <matthew.fisc...@ubuntu.com>,
-.TH UNYAFFS 1 "March 23, 2013"
-.SH NAME
-unyaffs \- extract files from a YAFFS2 file system image
-.SH SYNOPSIS
-.B unyaffs
-.RI [ options ] <image_file_name> [<extract_directory>]
-.SH DESCRIPTION
-.B unyaffs
-extracts files from a YAFFS2 file system image that was created with
-mkyaffs2image.
-.PP
-.SH OPTIONS
-.TP
-.B \-d
-detect of flash layout, no extraction
-.TP
-.B \-b
-spare contains bad block information
-.B \-c <chunk size>
-get chunk size in KByte (default: autodetect, max: 16)
-.B \-s <spare size>
-set spare size in Byte (default: autodetect, max: 512)
-.B \-t
-list image contents
-.B \-v
-verbose output
-.B \-V
-print version information
-.sp
-.LP
diff -Nru unyaffs-0.9.6/README unyaffs-0.9.7/README
--- unyaffs-0.9.6/README 2013-04-09 12:59:56.000000000 +0300
+++ unyaffs-0.9.7/README 2018-03-29 18:31:44.000000000 +0300
@@ -30,7 +30,7 @@
------------
Unyaffs should run on most unix-like operating systems.
- A C compiler environment and make is neccessary to compile it.
+ A C compiler environment and make is necessary to compile it.
Compiling
diff -Nru unyaffs-0.9.6/unyaffs.c unyaffs-0.9.7/unyaffs.c
--- unyaffs-0.9.6/unyaffs.c 2013-04-09 12:59:56.000000000 +0300
+++ unyaffs-0.9.7/unyaffs.c 2018-03-29 18:31:44.000000000 +0300
@@ -41,26 +41,32 @@
* Bug in verifying the -s (spare) parameter
* V0.9.6 2013-04-09
* Added man page
+ * V0.9.7 2018-03-29
+ * Directory creation doesn't fail, if it already exists
+ * Fix compiler warnings for newer GCC
*/
-#define VERSION "0.9.6"
+#define VERSION "0.9.7"
/* check if lutimes is available */
#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || (defined(__APPLE__) && defined(__MACH__))
#define HAS_LUTIMES 1
#endif
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
#include <stdio.h>
-#include <string.h>
+#include <unistd.h>
#include <stdlib.h>
#include <stddef.h>
#include <stdarg.h>
+#include <string.h>
#include <time.h>
#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#if defined(__linux__) || defined(__GLIBC__)
+#include <sys/sysmacros.h>
+#endif
#ifdef HAS_LUTIMES
#include <sys/time.h>
#else
@@ -203,9 +209,11 @@
}
free(buf);
- if (mkdir(name, mode) < 0 &&
- (stat(name, &st) < 0 || !S_ISDIR(st.st_mode)))
- return -1;
+ if (mkdir(name, mode) < 0) {
+ if (stat(name, &st) < 0 || !S_ISDIR(st.st_mode))
+ return -1;
+ chmod(name, mode);
+ }
return 0;
}
@@ -522,7 +530,7 @@
break;
case YAFFS_OBJECT_TYPE_DIRECTORY:
if (pt->t.objectId != YAFFS_OBJECTID_ROOT &&
- mkdir(obj->path_name, oh.yst_mode & STD_PERMS) < 0)
+ mkdirpath(obj->path_name, oh.yst_mode & STD_PERMS) < 0)
prt_err(1, errno, "Can't create directory %s", obj->path_name);
safe_lchown(obj->path_name, oh.yst_uid, oh.yst_gid);
if ((pt->t.objectId == YAFFS_OBJECTID_ROOT ||
