jengelh/schily
SHA256
1
0
Fork 0
forked from pool/schily
Code Pull Requests Activity

Accepting request 648728 from utilities

Browse Source 
- Update to new upstream release 2018.10.30

OBS-URL: https://build.opensuse.org/request/show/648728
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/schily?expand=0&rev=6
This commit is contained in:
Dominique Leuenberger 2018-11-18 22:21:37 +00:00 committed by Git OBS Bridge
commit bf87c5a31b
7 changed files with 145 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
schily-2018-05-25_star_configuration.patch
View File

@ -15,13 +15,13 @@ Some default values for configuration/compilation
rmt/rmt.dfl | 16 +++++++---------
star/all.mk | 2 +-
star/pax.mk | 2 +-
star/star.mk | 7 ++++---
11 files changed, 26 insertions(+), 29 deletions(-)
star/star.mk | 4 ++--
11 files changed, 24 insertions(+), 28 deletions(-)
Index: schily-2018-08-24/DEFAULTS/Defaults.linux
Index: schily-2018-10-30/DEFAULTS/Defaults.linux
===================================================================
--- schily-2018-08-24.orig/DEFAULTS/Defaults.linux
+++ schily-2018-08-24/DEFAULTS/Defaults.linux
--- schily-2018-10-30.orig/DEFAULTS/Defaults.linux
+++ schily-2018-10-30/DEFAULTS/Defaults.linux
@@ -26,7 +26,7 @@ DEFLINKMODE= static
# If the next line is uncommented, compilation is done with minimal warnings
#
@ -59,10 +59,10 @@ Index: schily-2018-08-24/DEFAULTS/Defaults.linux
DEFINSMODEX= 755
DEFINSUSR= root
DEFINSGRP= bin
Index: schily-2018-08-24/include/schily/schily.h
Index: schily-2018-10-30/include/schily/schily.h
===================================================================
--- schily-2018-08-24.orig/include/schily/schily.h
+++ schily-2018-08-24/include/schily/schily.h
--- schily-2018-10-30.orig/include/schily/schily.h
+++ schily-2018-10-30/include/schily/schily.h
@@ -431,7 +431,7 @@ extern int _comerr __PR((FILE *, int, i
#endif /* EOF */
@ -72,10 +72,10 @@ Index: schily-2018-08-24/include/schily/schily.h
/*PRINTFLIKE1*/
extern int gterror __PR((const char *, ...)) __printflike__(1, 2);
Index: schily-2018-08-24/man/Makefile
Index: schily-2018-10-30/man/Makefile
===================================================================
--- schily-2018-08-24.orig/man/Makefile
+++ schily-2018-08-24/man/Makefile
--- schily-2018-10-30.orig/man/Makefile
+++ schily-2018-10-30/man/Makefile
@@ -7,7 +7,7 @@ RULESDIR= RULES
include $(SRCROOT)/$(RULESDIR)/rules.top
###########################################################################
@ -85,10 +85,10 @@ Index: schily-2018-08-24/man/Makefile
###########################################################################
include $(SRCROOT)/$(RULESDIR)/rules.dir
Index: schily-2018-08-24/mt/Makefile
Index: schily-2018-10-30/mt/Makefile
===================================================================
--- schily-2018-08-24.orig/mt/Makefile
+++ schily-2018-08-24/mt/Makefile
--- schily-2018-10-30.orig/mt/Makefile
+++ schily-2018-10-30/mt/Makefile
@@ -7,7 +7,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to
INSDIR= bin
@ -107,10 +107,10 @@ Index: schily-2018-08-24/mt/Makefile
###########################################################################
include $(SRCROOT)/$(RULESDIR)/rules.cmd
Index: schily-2018-08-24/rmt/Makefile
Index: schily-2018-10-30/rmt/Makefile
===================================================================
--- schily-2018-08-24.orig/rmt/Makefile
+++ schily-2018-08-24/rmt/Makefile
--- schily-2018-10-30.orig/rmt/Makefile
+++ schily-2018-10-30/rmt/Makefile
@@ -5,8 +5,8 @@ RULESDIR= RULES
include $(SRCROOT)/$(RULESDIR)/rules.top
###########################################################################
@ -122,10 +122,10 @@ Index: schily-2018-08-24/rmt/Makefile
CPPOPTS += -DUSE_REMOTE
CPPOPTS += -DUSE_LARGEFILES
CFILES= rmt.c
Index: schily-2018-08-24/rmt/Makefile.man
Index: schily-2018-10-30/rmt/Makefile.man
===================================================================
--- schily-2018-08-24.orig/rmt/Makefile.man
+++ schily-2018-08-24/rmt/Makefile.man
--- schily-2018-10-30.orig/rmt/Makefile.man
+++ schily-2018-10-30/rmt/Makefile.man
@@ -8,7 +8,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to
###########################################################################
@ -135,10 +135,10 @@ Index: schily-2018-08-24/rmt/Makefile.man
MANSECT= $(MANSECT_CMD)
MANSUFFIX= $(MANSUFF_CMD)
MANFILE= rmt.1
Index: schily-2018-08-24/rmt/rmt.1
Index: schily-2018-10-30/rmt/rmt.1
===================================================================
--- schily-2018-08-24.orig/rmt/rmt.1
+++ schily-2018-08-24/rmt/rmt.1
--- schily-2018-10-30.orig/rmt/rmt.1
+++ schily-2018-10-30/rmt/rmt.1
@@ -17,9 +17,8 @@
.SH NAME
rmt \- remote magnetic tape protocol server
@ -150,10 +150,10 @@ Index: schily-2018-08-24/rmt/rmt.1
.SH DESCRIPTION
.IX "rmt command" "" "\fLrmt\fP \(em remote magnetic tape protocol server"
Index: schily-2018-08-24/rmt/rmt.dfl
Index: schily-2018-10-30/rmt/rmt.dfl
===================================================================
--- schily-2018-08-24.orig/rmt/rmt.dfl
+++ schily-2018-08-24/rmt/rmt.dfl
--- schily-2018-10-30.orig/rmt/rmt.dfl
+++ schily-2018-10-30/rmt/rmt.dfl
@@ -18,15 +18,13 @@
# Each USER= entry adds the listed user to the users who may run rmt
#
@ -186,10 +186,10 @@ Index: schily-2018-08-24/rmt/rmt.dfl
-ACCESS=* * /dev/zero
+#ACCESS=* * /dev/zero
#ACCESS=* * *
Index: schily-2018-08-24/star/all.mk
Index: schily-2018-10-30/star/all.mk
===================================================================
--- schily-2018-08-24.orig/star/all.mk
+++ schily-2018-08-24/star/all.mk
--- schily-2018-10-30.orig/star/all.mk
+++ schily-2018-10-30/star/all.mk
@@ -12,7 +12,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to
# and copy star_fat.mk to Makefile.
#
@ -199,10 +199,10 @@ Index: schily-2018-08-24/star/all.mk
###########################################################################
include $(SRCROOT)/$(RULESDIR)/rules.mks
Index: schily-2018-08-24/star/pax.mk
Index: schily-2018-10-30/star/pax.mk
===================================================================
--- schily-2018-08-24.orig/star/pax.mk
+++ schily-2018-08-24/star/pax.mk
--- schily-2018-10-30.orig/star/pax.mk
+++ schily-2018-10-30/star/pax.mk
@@ -8,7 +8,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to
INSDIR= bin
@ -212,10 +212,10 @@ Index: schily-2018-08-24/star/pax.mk
CPPOPTS += -D__STAR__
CPPOPTS += -DSET_CTIME -DFIFO -DUSE_MMAP -DUSE_REMOTE -DUSE_RCMD_RSH
#CPPOPTS += -DSET_CTIME -DFIFO -DUSE_MMAP
Index: schily-2018-08-24/star/star.mk
Index: schily-2018-10-30/star/star.mk
===================================================================
--- schily-2018-08-24.orig/star/star.mk
+++ schily-2018-08-24/star/star.mk
--- schily-2018-10-30.orig/star/star.mk
+++ schily-2018-10-30/star/star.mk
@@ -8,7 +8,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to
INSDIR= bin
@ -225,21 +225,11 @@ Index: schily-2018-08-24/star/star.mk
CPPOPTS += -D__STAR__
CPPOPTS += -DSET_CTIME -DFIFO -DUSE_MMAP -DUSE_REMOTE -DUSE_RCMD_RSH
#CPPOPTS += -DSET_CTIME -DFIFO -DUSE_MMAP
@@ -23,6 +23,7 @@ CPPOPTS += -DCOPY_LINKS_DELAYED
CPPOPTS += -DUSE_NLS
CPPOPTS += -DTEXT_DOMAIN=\"SCHILY_utils\"
CPPOPTS += -DSCHILY_PRINT
+CPPOPTS += -DWITH_SELINUX
CFILES= star.c header.c cpiohdr.c xheader.c xattr.c \
list.c extract.c create.c append.c diff.c restore.c \
remove.c star_unix.c acl_unix.c acltext.c fflags.c \
@@ -37,8 +38,8 @@ CFILES= star.c header.c cpiohdr.c xhead
HFILES= star.h starsubs.h dirtime.h xtab.h xutimes.h \
@@ -38,7 +38,7 @@ HFILES= star.h starsubs.h dirtime.h xta
movearch.h table.h props.h fifo.h diff.h restore.h \
checkerr.h dumpdate.h bitstring.h
-LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL)
LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL)
-XMK_FILE= Makefile.man starformatman.mk
+LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_SELINUX)
+XMK_FILE= Makefile.man
###########################################################################

55
schily-2018-05-25_star_lock.patch
View File

@ -1,55 +0,0 @@
From: Kristyna Streitova <kstreitova@suse.com>
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

3
schily-2018-08-24.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a294de340bb560d120180fd24408a74fe5d38a1d39a5061575dc78b99878fcda
size 4289504

3
schily-2018-10-30.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:71e3d6176272df882e0b0c5527b8538931024fabbcec44eef873e512df558966
size 4311065

18
schily-linker.diff Normal file
View File

@ -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%)
#

34
schily.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Thu Nov 8 09:32:40 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
- Trim SELINUX from schily-2018-05-25_star_configuration.patch,
it is already determined by %configure now.
-------------------------------------------------------------------
Tue Nov 6 16:33:45 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
- 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.
- Add smake and ved subpackages.
-------------------------------------------------------------------
Wed Aug 29 07:57:23 UTC 2018 - jengelh@inai.de

83
schily.spec
View File

@ -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.
@ -257,9 +260,9 @@ Requires: libdeflt1_0 = %box_version
Requires: libedc_ecc1_0 = %cdr_version
Requires: libedc_ecc_dec1_0 = %cdr_version
Requires: libfile1_0 = %box_version
Requires: libfind3_0 = %box_version
Requires: libfind3_0 = %libfind_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
@ -369,6 +372,18 @@ interprocess communication connection.
A tape client would launch something like ssh for the actual
connection, and through that, have the rmt program executed.
%package -n smake
Summary: The Schily "make" program
License: CDDL-1.0
Group: Development/Tools/Building
%description -n smake
Smake executes command sequences based on relations of modification
dates of files. The command sequences are taken from a set of rules
found in a makefile or in the set of implicit rules. The argument
target is typically a program that is to be built from the known
rules.
%package -n spax
Summary: Portable Archive Exchange
License: CDDL-1.0
@ -403,9 +418,20 @@ Features:
* Stores and restores all 3 file times (even creation time). With POSIX.1-2001,
the times are in nanosecond granularity.
%package -n ved
Summary: The Visual Editor
License: CDDL-1.0
Group: Productivity/Editors/Other
%description -n ved
Ved (visual editor) is a screen-oriented editor that implements a
user interface somewhere between vi and emacs. It has almost no
limitations on file size and supports to edit large files (files >2
GB).
%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} .
@ -490,7 +516,7 @@ ls -l "$b/%_mandir"/man*/*mt*
find "$b/usr/share/doc" -type f -name "*big*" -print -delete
# deal with this another time
rm -Rf "$b/usr/ccs" "$b/usr/xpg4" "$b/%_bindir/sccs"
rm -Rfv "$b/usr/ccs" "$b/usr/xpg4" "$b/%_bindir/sccs"
rm -f \
$b/etc/sformat.dat \
$b/usr/bin/Cstyle \
@ -526,16 +552,12 @@ rm -f \
$b/usr/bin/sformat \
$b/usr/bin/sgrow \
$b/usr/bin/sh \
$b/usr/bin/smake \
$b/usr/bin/spaste \
$b/usr/bin/spatch \
$b/usr/bin/strar \
$b/usr/bin/termcap \
$b/usr/bin/translit \
$b/usr/bin/udiff \
$b/usr/bin/ved \
$b/usr/bin/ved-e \
$b/usr/bin/ved-w \
$b/usr/lib*/cpp \
$b/usr/lib*/libmakestate.so \
$b/usr/lib*/libmakestate.so.1.0 \
@ -549,14 +571,7 @@ rm -f \
$b/usr/share/doc/packages/libparanoia/README.interface \
$b/usr/share/doc/packages/libparanoia/README.paranoia \
$b/usr/share/doc/packages/schilyutils/dotfiles.tar.bz2 \
$b/usr/share/doc/packages/ved/dotfiles.tar.bz2 \
$b/usr/share/doc/packages/ved/vedsheet.ps \
$b/usr/share/doc/packages/ved/vedsheet.tr \
$b/usr/share/lib/make/make.rules \
$b/usr/share/lib/make/svr4.make.rules \
$b/usr/share/lib/smake/defaults.smk \
$b/usr/share/man/de/man1/sdd.1 \
$b/usr/share/man/help/ved.help \
$b/usr/share/man/man1/admin.1 \
$b/usr/share/man/man1/bdiff.1 \
$b/usr/share/man/man1/bsh.1 \
@ -625,7 +640,6 @@ rm -f \
$b/usr/share/man/man1/sdd.1 \
$b/usr/share/man/man1/sfind.1 \
$b/usr/share/man/man1/sgrow.1 \
$b/usr/share/man/man1/smake.1 \
$b/usr/share/man/man1/spaste.1 \
$b/usr/share/man/man1/spatch.1 \
$b/usr/share/man/man1/strar.1 \
@ -637,9 +651,6 @@ rm -f \
$b/usr/share/man/man1/unget.1 \
$b/usr/share/man/man1/val.1 \
$b/usr/share/man/man1/vc.1 \
$b/usr/share/man/man1/ved-e.1 \
$b/usr/share/man/man1/ved-w.1 \
$b/usr/share/man/man1/ved.1 \
$b/usr/share/man/man1/what.1 \
$b/usr/share/man/man5/changeset.5 \
$b/usr/share/man/man5/makefiles.5 \
@ -708,8 +719,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 +834,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/
@ -956,6 +967,11 @@ fi
%ghost %_sysconfdir/alternatives/rmt.1%ext_man
%ghost %_mandir/man1/rmt.1%ext_man
%files -n smake
%_bindir/smake
%_datadir/lib/
%_mandir/man1/smake.1*
%files -n spax
%license CDDL.Schily.txt
%_bindir/pax
@ -964,6 +980,7 @@ fi
%files -n star
%license CDDL.Schily.txt
%doc AN-*
%config(noreplace) %_sysconfdir/default/star
%_bindir/star
%_bindir/tartest
@ -973,4 +990,10 @@ fi
%_mandir/man1/ustar.1*
%_mandir/man5/star.5*
%files -n ved
%_bindir/ved*
%_mandir/help/
%_mandir/man1/ved*.1*
%_docdir/ved/
%changelog