From e9f8b939ddb56df49b0ae2fad05b44ffea1b2c41fc4915596b9b0c176881eeb8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 28 May 2018 13:32:56 +0000 Subject: [PATCH] - Update to new upstream release 2018.05.25 - Remove gccwarns.diff (fixed upstream), gcc48wa.diff (we no longer have gcc-4.8) OBS-URL: https://build.opensuse.org/package/show/utilities/schily?expand=0&rev=26 --- gcc48wa.diff | 87 --------------------------------------- gccwarns.diff | 39 ------------------ schily-2018-05-17.tar.bz2 | 3 -- schily-2018-05-25.tar.bz2 | 3 ++ schily.changes | 11 +++++ schily.spec | 13 +++--- 6 files changed, 20 insertions(+), 136 deletions(-) delete mode 100644 gcc48wa.diff delete mode 100644 gccwarns.diff delete mode 100644 schily-2018-05-17.tar.bz2 create mode 100644 schily-2018-05-25.tar.bz2 diff --git a/gcc48wa.diff b/gcc48wa.diff deleted file mode 100644 index edd1a07..0000000 --- a/gcc48wa.diff +++ /dev/null @@ -1,87 +0,0 @@ -From: Jan Engelhardt -Date: 2013-11-14 02:36:58.866260522 +0100 -References: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59125 - -build: workaround a gcc-4.8 bug - -Add memset to clear the entire buffer beforehand. Then, use memcpy, -which is equally good given that the size of all strings is known. - ---- - cdrecord/scsi_cdr.c | 21 ++++++++++----------- - 1 file changed, 10 insertions(+), 11 deletions(-) - -Index: cdrtools-3.01/cdrecord/scsi_cdr.c -=================================================================== ---- cdrtools-3.01.orig/cdrecord/scsi_cdr.c -+++ cdrtools-3.01/cdrecord/scsi_cdr.c -@@ -2282,14 +2282,13 @@ getdev(scgp, print) - printf("\n"); - } - -+ memset(vendor_info, '\0', sizeof(vendor_info)); -+ memset(prod_ident, '\0', sizeof(prod_ident)); -+ memset(prod_revision, '\0', sizeof(prod_revision)); - strncpy(vendor_info, inq->inq_vendor_info, sizeof (inq->inq_vendor_info)); - strncpy(prod_ident, inq->inq_prod_ident, sizeof (inq->inq_prod_ident)); - strncpy(prod_revision, inq->inq_prod_revision, sizeof (inq->inq_prod_revision)); - -- vendor_info[sizeof (inq->inq_vendor_info)] = '\0'; -- prod_ident[sizeof (inq->inq_prod_ident)] = '\0'; -- prod_revision[sizeof (inq->inq_prod_revision)] = '\0'; -- - switch (inq->type) { - - case INQ_DASD: -@@ -2316,29 +2315,29 @@ getdev(scgp, print) - if (inq->add_len == 0) { - if (scgp->dev == DEV_UNKNOWN && got_inquiry) { - scgp->dev = DEV_ACB5500; -- strncpy(inq->inq_info_space, -+ memcpy(inq->inq_info_space, - "ADAPTEC ACB-5500 FAKE", - sizeof (inq->inq_info_space)); - - } else switch (scgp->dev) { - - case DEV_ACB40X0: -- strncpy(inq->inq_info_space, -+ memcpy(inq->inq_info_space, - "ADAPTEC ACB-40X0 FAKE", - sizeof (inq->inq_info_space)); - break; - case DEV_ACB4000: -- strncpy(inq->inq_info_space, -+ memcpy(inq->inq_info_space, - "ADAPTEC ACB-4000 FAKE", - sizeof (inq->inq_info_space)); - break; - case DEV_ACB4010: -- strncpy(inq->inq_info_space, -+ memcpy(inq->inq_info_space, - "ADAPTEC ACB-4010 FAKE", - sizeof (inq->inq_info_space)); - break; - case DEV_ACB4070: -- strncpy(inq->inq_info_space, -+ memcpy(inq->inq_info_space, - "ADAPTEC ACB-4070 FAKE", - sizeof (inq->inq_info_space)); - break; -@@ -2370,14 +2369,14 @@ getdev(scgp, print) - - case INQ_SEQD: - if (scgp->dev == DEV_SC4000) { -- strncpy(inq->inq_info_space, -+ memcpy(inq->inq_info_space, - "SYSGEN SC4000 FAKE", - sizeof (inq->inq_info_space)); - } else if (inq->add_len == 0 && - inq->removable && - inq->ansi_version == 1) { - scgp->dev = DEV_MT02; -- strncpy(inq->inq_info_space, -+ memcpy(inq->inq_info_space, - "EMULEX MT02 FAKE", - sizeof (inq->inq_info_space)); - } diff --git a/gccwarns.diff b/gccwarns.diff deleted file mode 100644 index 0fdb244..0000000 --- a/gccwarns.diff +++ /dev/null @@ -1,39 +0,0 @@ -From: Jan Engelhardt -Date: 2018-05-17 22:26:23.600238551 +0200 - -Repair some cases of UB that might be responsible for gcc8 failures. - -[ 191s] searchinpath.c: In function 'searchonefile': -[ 191s] searchinpath.c:221:5: warning: implicit declaration of function 'eaccess'; did you mean 'access'? [-Wimplicit-function-declaration] -[ 191s] (eaccess(nbuf, mode) >= 0)) { -[ 836s] create.c: In function 'flush_link': -[ 836s] create.c:1099:16: warning: 'finfo.f_flags' is used uninitialized in this function [-Wuninitialized] -[ 836s] finfo.f_flags &= ~F_TCB_BUF; - ---- - libschily/searchinpath.c | 1 + - star/create.c | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -Index: schily-2018-03-16/libschily/searchinpath.c -=================================================================== ---- schily-2018-03-16.orig/libschily/searchinpath.c -+++ schily-2018-03-16/libschily/searchinpath.c -@@ -1,3 +1,4 @@ -+#define _GNU_SOURCE 1 /* eaccess */ - /* @(#)searchinpath.c 1.6 18/02/04 Copyright 1999-2018 J. Schilling */ - #include - #ifndef lint -Index: schily-2018-03-16/star/create.c -=================================================================== ---- schily-2018-03-16.orig/star/create.c -+++ schily-2018-03-16/star/create.c -@@ -1090,7 +1090,7 @@ flush_link(lp) - { - TCB tb; - TCB *ptb; -- FINFO finfo; -+ FINFO finfo = {}; - register LNAME *ln; - int fd = 1; - BOOL did_stat; diff --git a/schily-2018-05-17.tar.bz2 b/schily-2018-05-17.tar.bz2 deleted file mode 100644 index a2a1d93..0000000 --- a/schily-2018-05-17.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:08d9fa3c83417aaceb227d57fbcb8cb9bc1202f382072d9ca4c348d44be9a60f -size 4225794 diff --git a/schily-2018-05-25.tar.bz2 b/schily-2018-05-25.tar.bz2 new file mode 100644 index 0000000..3ddb30d --- /dev/null +++ b/schily-2018-05-25.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:802afdae0db164d384a13d705606860f5f80960217cb59057261c0e24452d95a +size 4233820 diff --git a/schily.changes b/schily.changes index 527cd7d..ce65ac5 100644 --- a/schily.changes +++ b/schily.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon May 28 12:20:09 UTC 2018 - jengelh@inai.de + +- Update to new upstream release 2018.05.25 + * star: user name, group name, path and linkpath are now + automatically added to the POSIX.1-2001 extended header in + case that they include non-ASCII characters (outside the + 7-bit range). +- Remove gccwarns.diff (fixed upstream), gcc48wa.diff (we no + longer have gcc-4.8) + ------------------------------------------------------------------- Thu May 17 14:06:18 UTC 2018 - jengelh@inai.de diff --git a/schily.spec b/schily.spec index 27f1001..926c648 100644 --- a/schily.spec +++ b/schily.spec @@ -16,14 +16,15 @@ # -%global box_version 2018.05.17 +# See schily-%rver/AN-%rver for changelog and when subprogram versions might change +%global box_version 2018.05.25 %global cdr_version 3.02~a10 %global smake_version 1.3 %global star_version 1.5.4 -%define rver 2018-05-17 +%define rver 2018-05-25 Name: schily -Version: 2018.05.17 +Version: 2018.05.25 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 @@ -32,9 +33,7 @@ Url: http://cdrtools.sourceforge.net/private/cdrecord.html #Freshcode-Url: http://freshcode.club/projects/schily Source: https://downloads.sf.net/schilytools/%name-%rver.tar.bz2 -Patch1: gcc48wa.diff -Patch2: iconv-name.diff -Patch3: gccwarns.diff +Patch1: iconv-name.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 @@ -400,7 +399,7 @@ Features: %prep %setup -qn %name-%rver -%patch -P 1 -P 2 -P 3 -p1 +%patch -P 1 -p1 find . "(" -type d -o -type f ")" -exec chmod u+w "{}" "+" %build