| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | doc/.gitignore | 2 | ||||
| m--------- | gnulib | 0 | ||||
| -rw-r--r-- | gnulib.modules | 1 | ||||
| -rw-r--r-- | src/copyin.c | 5 |
6 files changed, 10 insertions, 8 deletions
@@ -1,10 +1,12 @@ -GNU cpio NEWS -- history of user-visible changes. 2019-11-06 +GNU cpio NEWS -- history of user-visible changes. 2021-01-08 Copyright (C) 2003-2007, 2009-2010, 2014-2015, 2017, 2020-2021 Free Software Foundation, Inc. See the end of file for copying conditions. Please send cpio bug reports to <bug-cpio@gnu.org>. +Version 2.13.90 (git) + Version 2.13 - Sergey Poznyakoff, 2019-11-06 * Fix CVE-2015-1197 diff --git a/configure.ac b/configure.ac index bdf37e8..0a35e4c 100644 --- a/configure.ac +++ b/configure.ac @@ -15,13 +15,13 @@ dnl dnl You should have received a copy of the GNU General Public License dnl along with this program. If not, see <http://www.gnu.org/licenses/>. -AC_INIT([GNU cpio], [2.13], [bug-cpio@gnu.org],, +AC_INIT([GNU cpio], [2.13.90], [bug-cpio@gnu.org],, [http://www.gnu.org/software/cpio]) AC_CONFIG_SRCDIR(src/cpio.h) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) -AC_PREREQ([2.63]) -AM_INIT_AUTOMAKE([1.11.1 gnits tar-ustar dist-bzip2 std-options silent-rules]) +AC_PREREQ([2.64]) +AM_INIT_AUTOMAKE([1.15 gnits tar-ustar dist-bzip2 std-options silent-rules]) # Enable silent rules by default: AM_SILENT_RULES([yes]) diff --git a/doc/.gitignore b/doc/.gitignore index 9c9eece..cf3a127 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -21,7 +21,7 @@ cpio.vr genfile.texi getdate.texi manual -parse-datetime.texi rmt.8 stamp-vti version.texi +/parse-datetime.texi diff --git a/gnulib b/gnulib -Subproject e210a3cbaec0ee82a67ff8fc427e21bdd64dba1 +Subproject bdae9a5d4b2cedfaef23f8c55982ba5432dd69e diff --git a/gnulib.modules b/gnulib.modules index f165870..1181bcd 100644 --- a/gnulib.modules +++ b/gnulib.modules @@ -11,7 +11,6 @@ fileblocks fnmatch-gnu full-write getline -getopt gettext-h gitlog-to-changelog hash diff --git a/src/copyin.c b/src/copyin.c index 9217a63..c8ea278 100644 --- a/src/copyin.c +++ b/src/copyin.c @@ -758,8 +758,9 @@ long_format (struct cpio_file_stat *file_hdr, char const *link_name) if ((file_hdr->c_mode & CP_IFMT) == CP_IFCHR || (file_hdr->c_mode & CP_IFMT) == CP_IFBLK) - printf ("%3lu, %3lu ", file_hdr->c_rdev_maj, - file_hdr->c_rdev_min); + printf ("%3lu, %3lu ", + (unsigned long) file_hdr->c_rdev_maj, + (unsigned long) file_hdr->c_rdev_min); else printf ("%8"PRIuMAX" ", (uintmax_t) file_hdr->c_filesize); |