c5e3d07b62
- Update to 2.14:
* New option --ignore-dirnlink
Valid in copy-out mode, it instructs cpio to ignore the actual number of
links reported for each directory member and always store 2 instead.
* Changes in --reproducible option
The --reproducible option implies --ignore-dirlink. In other words, it is
equivalent to --ignore-devno --ignore-dirnlink --renumber-inodes.
* Use GNU ls algorithm for deciding timestamp format in -tv mode
* Fix cpio header verification.
* Fix handling of device numbers on copy out.
* Fix calculation of CRC in copy-out mode.
* Rewrite the fix for CVE-2015-1197.
* Fix combination of --create --append --directory.
* Fix appending to archives bigger than 2G.
- Refresh patches:
* cpio-open_nonblock.patch
* cpio-dev_number.patch
* cpio-default_tape_dev.patch
* cpio-pattern-file-sigsegv.patch
- Remove patches:
* cpio-revert-CVE-2015-1197-fix.patch
* fix-CVE-2021-38185.patch
* fix-CVE-2021-38185_2.patch
* fix-CVE-2021-38185_3.patch
OBS-URL: https://build.opensuse.org/request/show/1094882
OBS-URL: https://build.opensuse.org/package/show/Archiving/cpio?expand=0&rev=91
25 lines
1.1 KiB
Diff
25 lines
1.1 KiB
Diff
Index: src/copyin.c
|
|
===================================================================
|
|
--- src/copyin.c.orig
|
|
+++ src/copyin.c
|
|
@@ -1287,15 +1287,15 @@ read_in_binary (struct cpio_file_stat *f
|
|
swab_array ((char *) short_hdr, 13);
|
|
}
|
|
|
|
- file_hdr->c_dev_maj = major (short_hdr->c_dev);
|
|
- file_hdr->c_dev_min = minor (short_hdr->c_dev);
|
|
+ file_hdr->c_dev_maj = major ((unsigned short)short_hdr->c_dev);
|
|
+ file_hdr->c_dev_min = minor ((unsigned short)short_hdr->c_dev);
|
|
file_hdr->c_ino = short_hdr->c_ino;
|
|
file_hdr->c_mode = short_hdr->c_mode;
|
|
file_hdr->c_uid = short_hdr->c_uid;
|
|
file_hdr->c_gid = short_hdr->c_gid;
|
|
file_hdr->c_nlink = short_hdr->c_nlink;
|
|
- file_hdr->c_rdev_maj = major (short_hdr->c_rdev);
|
|
- file_hdr->c_rdev_min = minor (short_hdr->c_rdev);
|
|
+ file_hdr->c_rdev_maj = major ((unsigned short)short_hdr->c_rdev);
|
|
+ file_hdr->c_rdev_min = minor ((unsigned short)short_hdr->c_rdev);
|
|
file_hdr->c_mtime = (unsigned long) short_hdr->c_mtimes[0] << 16
|
|
| short_hdr->c_mtimes[1];
|
|
file_hdr->c_filesize = (unsigned long) short_hdr->c_filesizes[0] << 16
|