diff --git a/fix_junk_in_partition.patch b/fix_junk_in_partition.patch deleted file mode 100644 index b526a18..0000000 --- a/fix_junk_in_partition.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Adam Majer -Date: 2020-11-20 17:31+0000 - -There is some uninitialized memory. For testing, you can reproduce -partition with - - mkdir empty - valgrind --malloc-fill=0xba --track-origins=yes \ - mkisofs -o test.iso -chrp-boot -part empty - hexdump -C test.iso - -Index: cdrtools-3.02/libhfs_iso/internal.h -=================================================================== ---- cdrtools-3.02.orig/libhfs_iso/internal.h -+++ cdrtools-3.02/libhfs_iso/internal.h -@@ -26,7 +26,7 @@ - # define ERROR(code, str) (hfs_error = (str), errno = (code)) - - # define SIZE(type, n) ((size_t) (sizeof(type) * (n))) --# define ALLOC(type, n) ((type *) malloc(SIZE(type, n))) -+# define ALLOC(type, n) ((type *) calloc(sizeof(type), n)) - # define ALLOCX(type, n) ((n) ? ALLOC(type, n) : (type *) 0) - # define FREE(ptr) {if (ptr) free((void *) ptr) ;} - diff --git a/schily-2020-11-04.tar.bz2 b/schily-2020-11-04.tar.bz2 deleted file mode 100644 index 716a388..0000000 --- a/schily-2020-11-04.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca3ebf65554d9356a33a6641a1796971aabf4915262f92b71f923bf5fc98356e -size 4842782 diff --git a/schily-2020-11-25.tar.bz2 b/schily-2020-11-25.tar.bz2 new file mode 100644 index 0000000..0df20b5 --- /dev/null +++ b/schily-2020-11-25.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32aee7498f4c6dabef04107fe9b6d597688be90f4b4fae057b10776567ae4eeb +size 4899985 diff --git a/schily.changes b/schily.changes index f68dd0f..f89199a 100644 --- a/schily.changes +++ b/schily.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Nov 26 10:34:41 UTC 2020 - Jan Engelhardt + +- Update to release 2020.11.25 + * libhfs_iso: changed malloc() to calloc() to avoid + uninitialized data. + * ved: A new colon command (ESC : vhelp) has been added. +- Remove fix_junk_in_partition.patch (upstreamed) + ------------------------------------------------------------------- Fri Nov 20 16:38:12 UTC 2020 - Adam Majer diff --git a/schily.spec b/schily.spec index e0def01..5efc763 100644 --- a/schily.spec +++ b/schily.spec @@ -17,14 +17,14 @@ # grep -Pir 'define\s+VERSION|strvers' -%global box_version 2020.11.04 +%global box_version 2020.11.25 %global cdr_version 3.02~a10 %global sccs_version 5.09 %global smake_version 1.3 %global star_version 1.6.1 %global libfind_version 1.8 %global ved_version 1.8 -%define rver 2020-11-04 +%define rver 2020-11-25 Name: schily Version: %box_version @@ -41,7 +41,6 @@ Source1: README-FIRST # and submit patches upstream FIRST (cc to the bspkg maintainer perhaps). Patch1: iconv-name.diff Patch2: schily-2018-05-25_star_configuration.patch -Patch3: fix_junk_in_partition.patch BuildRequires: autoconf BuildRequires: fdupes BuildRequires: gcc-c++