From 9011892775a5f93fa738d08584fc9376cd93f7481b042e301a9a0c522ff8a237 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 16 May 2018 17:04:40 +0000 Subject: [PATCH] - Update to new upstream release 2018.05.02 OBS-URL: https://build.opensuse.org/package/show/utilities/schily?expand=0&rev=16 --- mkisofs-j-crash.diff | 50 --------------------------------------- schily-2018-03-16.tar.bz2 | 3 --- schily-2018-05-02.tar.bz2 | 3 +++ schily.changes | 13 +++++++++- schily.spec | 27 ++++++++++----------- 5 files changed, 28 insertions(+), 68 deletions(-) delete mode 100644 mkisofs-j-crash.diff delete mode 100644 schily-2018-03-16.tar.bz2 create mode 100644 schily-2018-05-02.tar.bz2 diff --git a/mkisofs-j-crash.diff b/mkisofs-j-crash.diff deleted file mode 100644 index 378b139..0000000 --- a/mkisofs-j-crash.diff +++ /dev/null @@ -1,50 +0,0 @@ -From: Joerg Schilling -Date: Wed, 4 Apr 2018 14:23:49 +0200 -Message-Id: <5ac4c3d5.KoDNJ6KE385qa01k%Joerg.Schilling@fokus.fraunhofer.de> - - --- /tmp/sccs.qiaqyV 2018-01-25 20:32:44.873172000 +0100 - +++ joliet.c 2018-04-04 14:17:50.101534000 +0200 - -From: Jan Engelhardt -Date: Wed, 4 Apr 2018 14:08:35 +0200 (CEST) -Message-ID: - -Can't call strlen(source) when source==NULL. -Shouldn't call strlen(source) before checking source==NULL. - ---- - mkisofs/joliet.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -Index: schily-2018-03-16/mkisofs/joliet.c -=================================================================== ---- schily-2018-03-16.orig/mkisofs/joliet.c -+++ schily-2018-03-16/mkisofs/joliet.c -@@ -258,13 +258,6 @@ convert_to_unicode(buffer, size, source, - int jsize; - - /* -- * joliet_strlen() behaves the same way: Stop at the first nul byte. -- * Note: we cannot have 16 bit character representations in the source -- * encoding, if we like strlen() to work correctly. -- */ -- jsize = strlen(source); -- -- /* - * If we get a NULL pointer for the source, it means we have an - * inplace copy, and we need to make a temporary working copy first. - */ -@@ -276,6 +269,13 @@ convert_to_unicode(buffer, size, source, - } - - /* -+ * joliet_strlen() behaves the same way: Stop at the first nul byte. -+ * Note: we cannot have 16 bit character representations in the source -+ * encoding, if we like strlen() to work correctly. -+ */ -+ jsize = strlen(tmpbuf); -+ -+ /* - * Now start copying characters. If the size was specified to be 0, - * then assume the input was 0 terminated. - */ diff --git a/schily-2018-03-16.tar.bz2 b/schily-2018-03-16.tar.bz2 deleted file mode 100644 index b9e5ba3..0000000 --- a/schily-2018-03-16.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3b92bfe7aa587514aaea28e063564433ecd68df051b9acd9fa3e4d5c52d4794a -size 4210963 diff --git a/schily-2018-05-02.tar.bz2 b/schily-2018-05-02.tar.bz2 new file mode 100644 index 0000000..f1b4050 --- /dev/null +++ b/schily-2018-05-02.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d7de8c7bdadc91bee15e64a3c707d1b87c354adadce8779744c79daf590b061 +size 4218317 diff --git a/schily.changes b/schily.changes index 6ea619d..0129d96 100644 --- a/schily.changes +++ b/schily.changes @@ -1,6 +1,17 @@ ------------------------------------------------------------------- -Wed May 16 13:50:57 UTC 2018 - jengelh@inai.de +Wed May 16 16:38:42 UTC 2018 - jengelh@inai.de +- Update to new upstream release 2018.05.02 + * bsh: fixed a NULL deref when the file content was "#!" + * bsh: Avoid a coredump from expressions like + "$2222222222222222222" that cause an integer overflow while + converting the number. + * mkisofs: fixed crash during Joliet info creation + * Better support for Address Sanitizer + * (s)patch: CVE-2018-1000156 was fixed + * star: star -diff is now able to compare nanoseconds in + timestamps. +- Drop mkisofs-j-crash.diff (fixed upstream) - Add gccwarns.diff to address some undefined behavior. ------------------------------------------------------------------- diff --git a/schily.spec b/schily.spec index 496ed8c..2b3b82c 100644 --- a/schily.spec +++ b/schily.spec @@ -16,12 +16,12 @@ # -%global box_version 2018.03.16 +%global box_version 2018.05.02 %global cdr_version 3.02~a09 -%define rver 2018-03-16 +%define rver 2018-05-02 Name: schily -Version: 2018.03.16 +Version: 2018.05.02 Release: 0 Summary: A collection of command-line utilities maintained by J.Schilling License: CDDL-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND BSD-2-Clause AND BSD-3-Clause AND HPND AND ISC @@ -31,9 +31,8 @@ Url: http://cdrtools.sourceforge.net/private/cdrecord.html Source: https://downloads.sf.net/schilytools/%name-%rver.tar.bz2 Patch1: gcc48wa.diff -Patch2: mkisofs-j-crash.diff -Patch3: iconv-name.diff -Patch4: gccwarns.diff +Patch2: iconv-name.diff +Patch3: gccwarns.diff # Honor https://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Upstream_policy # and submit patches upstream FIRST (cc to the bspkg maintainer perhaps). BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -148,12 +147,12 @@ Group: System/Libraries The library implements a heuristic file type determinator, similar to file/libmagic1. -%package -n libfind1_0 +%package -n libfind2_0 Summary: A library for /usr/bin/find-like functionality License: CDDL-1.0 Group: System/Libraries -%description -n libfind1_0 +%description -n libfind2_0 libfind allows to be used for adding find(1)-like command-line features to programs. @@ -251,7 +250,7 @@ Requires: libdeflt1_0 = %box_version Requires: libedc_ecc1_0 = %cdr_version Requires: libedc_ecc_dec1_0 = %cdr_version Requires: libfile1_0 = %box_version -Requires: libfind1_0 = %box_version +Requires: libfind2_0 = %box_version Requires: librmt1_0 = %box_version Requires: libschily1_0 = %box_version Requires: libxtermcap1_0 = %box_version @@ -397,7 +396,7 @@ Features: %prep %setup -qn %name-%rver -%patch -P 1 -P 2 -P 3 -P 4 -p1 +%patch -P 1 -P 2 -P 3 -p1 find . "(" -type d -o -type f ")" -exec chmod u+w "{}" "+" %build @@ -678,8 +677,8 @@ fi %postun -n libedc_ecc_dec1_0 -p /sbin/ldconfig %post -n libfile1_0 -p /sbin/ldconfig %postun -n libfile1_0 -p /sbin/ldconfig -%post -n libfind1_0 -p /sbin/ldconfig -%postun -n libfind1_0 -p /sbin/ldconfig +%post -n libfind2_0 -p /sbin/ldconfig +%postun -n libfind2_0 -p /sbin/ldconfig %post -n libparanoia1_0 -p /sbin/ldconfig %postun -n libparanoia1_0 -p /sbin/ldconfig %post -n librmt1_0 -p /sbin/ldconfig @@ -765,9 +764,9 @@ fi %license libfile/LEGAL.NOTICE %_libdir/libfile.so.1.0 -%files -n libfind1_0 +%files -n libfind2_0 %license CDDL.Schily.txt -%_libdir/libfind.so.1.0 +%_libdir/libfind.so.2.0 %files -n libparanoia1_0 %license libparanoia/LICENSE