From cfb19d6dc88f959cc61a804ae155e30c3879bce6dad78025b3c02adfe8486e84 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 7 Nov 2018 12:19:59 +0000 Subject: [PATCH] - Update to new upstream release 2018.10.30 OBS-URL: https://build.opensuse.org/package/show/utilities/schily?expand=0&rev=40 --- schily-2018-05-25_star_lock.patch | 55 ------------------------------- schily-2018-08-24.tar.bz2 | 3 -- schily-2018-10-30.tar.bz2 | 3 ++ schily-linker.diff | 18 ++++++++++ schily.changes | 27 +++++++++++++++ schily.spec | 30 +++++++++-------- 6 files changed, 65 insertions(+), 71 deletions(-) delete mode 100644 schily-2018-05-25_star_lock.patch delete mode 100644 schily-2018-08-24.tar.bz2 create mode 100644 schily-2018-10-30.tar.bz2 create mode 100644 schily-linker.diff diff --git a/schily-2018-05-25_star_lock.patch b/schily-2018-05-25_star_lock.patch deleted file mode 100644 index 7bd8f0e..0000000 --- a/schily-2018-05-25_star_lock.patch +++ /dev/null @@ -1,55 +0,0 @@ -From: Kristyna Streitova -Date: Wed, 06 Jun 2018 14:51:57 +0000 -References: http://bugzilla.opensuse.org/414251 -X-Upstream: PATCH-FIX-SUSE - -Set read lock before using the semaphore wait on a pipe fd to avoid deadlock - -Index: schily-2018-05-25/star/fifo.c -=================================================================== ---- schily-2018-05-25.orig/star/fifo.c -+++ schily-2018-05-25/star/fifo.c -@@ -487,13 +487,42 @@ LOCAL int - swait(f) - int f; - { -- int ret; -+ int ret, err; - unsigned char c; -+ struct flock lock; -+ useconds_t wait; -+ -+ wait = 500000; -+ lock.l_type = F_RDLCK; -+ lock.l_whence = SEEK_CUR; -+ lock.l_start = 0; -+ lock.l_len = 0; -+ do { -+ err = fcntl(f, F_SETLK, &lock); -+ if (err < 0) { -+ err = geterrno(); -+ if (err == EINTR) -+ continue; -+ if ((err == EACCES || err == EAGAIN) && (wait > 0)) { -+ usleep(10000); -+ wait -= 10000; -+ continue; -+ } -+ errmsg("Can not get lock on semaphore wait for file descriptor\n"); -+ exprstats(-1); -+ } -+ } while (0); - - seterrno(0); - do { - ret = read(f, &c, 1); - } while (ret < 0 && geterrno() == EINTR); -+ -+ lock.l_type = F_UNLCK; -+ do { -+ err = fcntl(f, F_SETLK, &lock); -+ } while (err < 0 && geterrno() == EINTR); -+ - if (ret < 0 || (ret == 0 && pid)) { - /* - * If pid != 0, this is the foreground process diff --git a/schily-2018-08-24.tar.bz2 b/schily-2018-08-24.tar.bz2 deleted file mode 100644 index cda7a5a..0000000 --- a/schily-2018-08-24.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a294de340bb560d120180fd24408a74fe5d38a1d39a5061575dc78b99878fcda -size 4289504 diff --git a/schily-2018-10-30.tar.bz2 b/schily-2018-10-30.tar.bz2 new file mode 100644 index 0000000..36ef833 --- /dev/null +++ b/schily-2018-10-30.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71e3d6176272df882e0b0c5527b8538931024fabbcec44eef873e512df558966 +size 4311065 diff --git a/schily-linker.diff b/schily-linker.diff new file mode 100644 index 0000000..5d1902d --- /dev/null +++ b/schily-linker.diff @@ -0,0 +1,18 @@ +Work around GNU ld shortcoming that version entities must always come in ascending order. +--- + RULES/i586-linux-gcc.rul | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: schily-2018-10-30/RULES/i586-linux-gcc.rul +=================================================================== +--- schily-2018-10-30.orig/RULES/i586-linux-gcc.rul ++++ schily-2018-10-30/RULES/i586-linux-gcc.rul +@@ -50,7 +50,7 @@ MAPVERS= $(_MAPVERS) # This enables to u + # files for symbol versioning. The following command reverses the order of + # the version names in the linker map file. + # +-MAPFILE_POST= | sed 's/^SCHILY/+SCHILY/' | tr '\012' '@' | tr '+' '\012' | sort -t. -k1,1 -k2,2n -k3,3n | tr '@' '\012' ++MAPFILE_POST= | sed 's/^SCHILY/+SCHILY/' | tr '\012' '@' | tr '+' '\012' | sort -V | tr '@' '\012' + + #LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%) + # diff --git a/schily.changes b/schily.changes index 84adec1..4f73fd1 100644 --- a/schily.changes +++ b/schily.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Tue Nov 6 16:33:45 UTC 2018 - Jan Engelhardt + +- Update to new upstream release 2018.10.30 + * bsh/Bourne Shell/star: a very long path name could cause a + core dump with a "chdir()" operation in some cases. + * star: "star -c H=exustar -pax-o binary" now correctly results in + unencoded strings for uname/gname/path/linkpath. + * star: a new option -no-secure-links allows to disable the secure + default behavior. + * Changes to libfind options like -mount/-xdev and -perm; + for details, see the AN-* files in the documentation directory. + * New libfind primaries -chatime, -chctime, -chfile, -chown, etc. + see AN-* for details. + * star: Added "volatile" to a selection of struct members in + struct m_head. This should help to avoid specific + optimization from newer compilers that could cause problems + with the synchronization of the fifo. + * star: make sure that "star -c" results in a non-zero exit + code if it is interupted by Ctrl-C. + * star: Added new code to allow to debug a hanging FIFO. + * star: the path name length and the link name length are now + set from the POSIX 2001 extended tar headers in case that a + name appears in that extended meta data. +- Removed schily-2018-05-25_star_lock.patch (no longer needed) +- Added schily-linker.diff + ------------------------------------------------------------------- Wed Aug 29 07:57:23 UTC 2018 - jengelh@inai.de diff --git a/schily.spec b/schily.spec index a6321cf..2d888d8 100644 --- a/schily.spec +++ b/schily.spec @@ -12,19 +12,20 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # # See schily-%rver/AN-%rver for changelog and when subprogram versions might change -%global box_version 2018.08.24 +%global box_version 2018.10.30 %global cdr_version 3.02~a10 %global smake_version 1.3 %global star_version 1.5.4 -%define rver 2018-08-24 +%global libfind_version 1.7 +%define rver 2018-10-30 Name: schily -Version: 2018.08.24 +Version: 2018.10.30 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 @@ -36,7 +37,7 @@ Source: https://downloads.sf.net/schilytools/%name-%rver.tar.bz2 Source1: README-FIRST Patch1: iconv-name.diff Patch2: schily-2018-05-25_star_configuration.patch -Patch4: schily-2018-05-25_star_lock.patch +Patch3: schily-linker.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 @@ -158,6 +159,8 @@ similar to file/libmagic1. Summary: A library for /usr/bin/find-like functionality License: CDDL-1.0 Group: System/Libraries +Version: %libfind_version +Release: 0 %description -n libfind3_0 libfind allows to be used for adding find(1)-like command-line features @@ -239,12 +242,12 @@ Group: System/Libraries %description -n libscgcmd1_0 A library to create and parse SCSI commands (at the byte level). -%package -n libschily1_0 +%package -n libschily2_0 Summary: Support library for utilities from the Schily toolbox License: CDDL-1.0 Group: System/Libraries -%description -n libschily1_0 +%description -n libschily2_0 libschily contains many OS abstraction functions used by the Schily tools. @@ -259,7 +262,7 @@ Requires: libedc_ecc_dec1_0 = %cdr_version Requires: libfile1_0 = %box_version Requires: libfind3_0 = %box_version Requires: librmt1_0 = %box_version -Requires: libschily1_0 = %box_version +Requires: libschily2_0 = %box_version Requires: libxtermcap1_0 = %box_version %description -n libschily-devel @@ -405,7 +408,7 @@ Features: %prep %setup -qn %name-%rver -%patch -P 1 -P 2 -P 4 -p1 +%patch -P 1 -P 2 -P 3 -p1 find . "(" -type d -o -type f ")" -exec chmod u+w "{}" "+" cp %{SOURCE1} . @@ -708,8 +711,8 @@ fi %postun -n libscg1_0 -p /sbin/ldconfig %post -n libscgcmd1_0 -p /sbin/ldconfig %postun -n libscgcmd1_0 -p /sbin/ldconfig -%post -n libschily1_0 -p /sbin/ldconfig -%postun -n libschily1_0 -p /sbin/ldconfig +%post -n libschily2_0 -p /sbin/ldconfig +%postun -n libschily2_0 -p /sbin/ldconfig %post -n libxtermcap1_0 -p /sbin/ldconfig %postun -n libxtermcap1_0 -p /sbin/ldconfig @@ -823,9 +826,9 @@ fi %_libdir/libscg.so %_libdir/libscgcmd.so -%files -n libschily1_0 +%files -n libschily2_0 %license CDDL.Schily.txt -%_libdir/libschily.so.1.0 +%_libdir/libschily.so.2.0 %files -n libschily-devel %_includedir/schily/ @@ -964,6 +967,7 @@ fi %files -n star %license CDDL.Schily.txt +%doc AN-* %config(noreplace) %_sysconfdir/default/star %_bindir/star %_bindir/tartest