From e0d111cb755de01f8c3ec98b1e75e53ed49aa38849268d7fc2c386fcaaec12a1 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 23 Nov 2018 20:15:19 +0000 Subject: [PATCH 1/3] - Update to new upstream release 2018.11.22 OBS-URL: https://build.opensuse.org/package/show/utilities/schily?expand=0&rev=45 --- schily-2018-10-30.tar.bz2 | 3 --- schily-2018-11-22.tar.bz2 | 3 +++ schily-linker.diff | 18 ------------------ schily.changes | 13 +++++++++++++ schily.spec | 16 ++++++++++------ 5 files changed, 26 insertions(+), 27 deletions(-) delete mode 100644 schily-2018-10-30.tar.bz2 create mode 100644 schily-2018-11-22.tar.bz2 delete mode 100644 schily-linker.diff diff --git a/schily-2018-10-30.tar.bz2 b/schily-2018-10-30.tar.bz2 deleted file mode 100644 index 36ef833..0000000 --- a/schily-2018-10-30.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:71e3d6176272df882e0b0c5527b8538931024fabbcec44eef873e512df558966 -size 4311065 diff --git a/schily-2018-11-22.tar.bz2 b/schily-2018-11-22.tar.bz2 new file mode 100644 index 0000000..2ff219a --- /dev/null +++ b/schily-2018-11-22.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13cb5d9075474f0944c317fb56b3d46578f9653b64fb56815f6afa1830286d19 +size 4309542 diff --git a/schily-linker.diff b/schily-linker.diff deleted file mode 100644 index 5d1902d..0000000 --- a/schily-linker.diff +++ /dev/null @@ -1,18 +0,0 @@ -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 8939b58..3e024e8 100644 --- a/schily.changes +++ b/schily.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Nov 23 19:09:47 UTC 2018 - Jan Engelhardt + +- Update to new upstream release 2018.11.22 + * include/schily/getopt.h: A new include file has been created + for our libgetopt that includes an enhanced getopt() + implementation. + * libschily: resolvenpath() did not work as expected when some + path names do not exist. A stat() call that should check + whether we already reached the "/" directory caused a return + (-1) even with (flags & RSPF_EXIST) == 0. This bug caused + star to classify more symlinks as dangerous than needed. + ------------------------------------------------------------------- Thu Nov 8 09:32:40 UTC 2018 - Jan Engelhardt diff --git a/schily.spec b/schily.spec index 010c8e8..a97480f 100644 --- a/schily.spec +++ b/schily.spec @@ -16,16 +16,17 @@ # -# See schily-%rver/AN-%rver for changelog and when subprogram versions might change -%global box_version 2018.10.30 +# grep -r define.VERSION (sometimes also noted down in schily-%rver/AN-%rver) +%global box_version 2018.11.22 %global cdr_version 3.02~a10 %global smake_version 1.3 %global star_version 1.5.4 %global libfind_version 1.7 -%define rver 2018-10-30 +%global ved_version 1.7 +%define rver 2018-11-22 Name: schily -Version: 2018.10.30 +Version: 2018.11.22 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 @@ -37,7 +38,6 @@ 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 -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 @@ -422,6 +422,8 @@ Features: Summary: The Visual Editor License: CDDL-1.0 Group: Productivity/Editors/Other +Version: %ved_version +Release: 0 %description -n ved Ved (visual editor) is a screen-oriented editor that implements a @@ -431,7 +433,7 @@ GB). %prep %setup -qn %name-%rver -%patch -P 1 -P 2 -P 3 -p1 +%patch -P 1 -P 2 -p1 find . "(" -type d -o -type f ")" -exec chmod u+w "{}" "+" cp %{SOURCE1} . @@ -516,6 +518,7 @@ ls -l "$b/%_mandir"/man*/*mt* find "$b/usr/share/doc" -type f -name "*big*" -print -delete # deal with this another time +find "$b" rm -Rfv "$b/usr/ccs" "$b/usr/xpg4" "$b/%_bindir/sccs" rm -f \ $b/etc/sformat.dat \ @@ -652,6 +655,7 @@ rm -f \ $b/usr/share/man/man1/val.1 \ $b/usr/share/man/man1/vc.1 \ $b/usr/share/man/man1/what.1 \ + $b/usr/share/man/man3/getopt.3 \ $b/usr/share/man/man5/changeset.5 \ $b/usr/share/man/man5/makefiles.5 \ $b/usr/share/man/man5/makerules.5 \ From fa24708c0cc10ad55e25ab7ccdd37b805bd48bedc0f5de38d24a3b43fb2b7efb Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 25 Nov 2018 16:42:42 +0000 Subject: [PATCH 2/3] - Package bsh, pfbsh symlinks. OBS-URL: https://build.opensuse.org/package/show/utilities/schily?expand=0&rev=46 --- schily.changes | 5 +++++ schily.spec | 8 +++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/schily.changes b/schily.changes index 3e024e8..99e036f 100644 --- a/schily.changes +++ b/schily.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Nov 25 16:42:28 UTC 2018 - Jan Engelhardt + +- Package bsh, pfbsh symlinks. + ------------------------------------------------------------------- Fri Nov 23 19:09:47 UTC 2018 - Jan Engelhardt diff --git a/schily.spec b/schily.spec index a97480f..49d2094 100644 --- a/schily.spec +++ b/schily.spec @@ -523,7 +523,6 @@ rm -Rfv "$b/usr/ccs" "$b/usr/xpg4" "$b/%_bindir/sccs" rm -f \ $b/etc/sformat.dat \ $b/usr/bin/Cstyle \ - $b/usr/bin/bsh \ $b/usr/bin/calc \ $b/usr/bin/calltree \ $b/usr/bin/change \ @@ -541,9 +540,7 @@ rm -f \ $b/usr/bin/mdigest \ $b/usr/bin/od \ $b/usr/bin/opatch \ - $b/usr/bin/osh \ $b/usr/bin/p \ - $b/usr/bin/pfbsh \ $b/usr/bin/printf \ $b/usr/bin/pxupgrade \ $b/usr/bin/scgcheck \ @@ -604,10 +601,8 @@ rm -f \ $b/usr/share/man/man1/mountcd.1 \ $b/usr/share/man/man1/od.1 \ $b/usr/share/man/man1/opatch.1 \ - $b/usr/share/man/man1/osh.1 \ $b/usr/share/man/man1/p.1 \ $b/usr/share/man/man1/patch.1 \ - $b/usr/share/man/man1/pfbsh.1 \ $b/usr/share/man/man1/printf.1 \ $b/usr/share/man/man1/prs.1 \ $b/usr/share/man/man1/prt.1 \ @@ -739,15 +734,18 @@ fi %files -n bosh %license CDDL.Schily.txt +%_bindir/bsh %_bindir/bosh %_bindir/jsh %_bindir/obosh %_bindir/pbosh +%_bindir/pfbsh %_bindir/pfsh %_mandir/man1/bosh.1* %_mandir/man1/jsh.1* %_mandir/man1/obosh.1* %_mandir/man1/pbosh.1* +%_mandir/man1/pfbsh.1* %_mandir/man1/pfsh.1* %files -n btcflash From ca6c23219c47c9f2c584e9f126a616d22e83d8375406aa6f8f1b5d58730f348c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 4 Dec 2018 09:53:31 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/utilities/schily?expand=0&rev=47 --- schily.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/schily.changes b/schily.changes index 99e036f..d6b530b 100644 --- a/schily.changes +++ b/schily.changes @@ -15,6 +15,7 @@ Fri Nov 23 19:09:47 UTC 2018 - Jan Engelhardt whether we already reached the "/" directory caused a return (-1) even with (flags & RSPF_EXIST) == 0. This bug caused star to classify more symlinks as dangerous than needed. +- Remove schily-linker.diff (resolved upstream) ------------------------------------------------------------------- Thu Nov 8 09:32:40 UTC 2018 - Jan Engelhardt