Hello community, here is the log from the commit of package sluice for openSUSE:Factory checked in at 2020-03-08 22:24:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sluice (Old) and /work/SRC/openSUSE:Factory/.sluice.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sluice" Sun Mar 8 22:24:42 2020 rev:5 rq:782689 version:0.02.11 Changes: -------- --- /work/SRC/openSUSE:Factory/sluice/sluice.changes 2018-07-12 09:21:32.854618474 +0200 +++ /work/SRC/openSUSE:Factory/.sluice.new.26092/sluice.changes 2020-03-08 22:24:55.096106371 +0100 @@ -1,0 +2,32 @@ +Sun Mar 8 13:22:05 UTC 2020 - Martin Hauke <[email protected]> + +- Supplement against bash-completion, not bash + +------------------------------------------------------------------- +Sun Mar 8 12:54:01 UTC 2020 - Martin Hauke <[email protected]> + +- Drop SLE12 compat ifdef + +------------------------------------------------------------------- +Wed Feb 26 18:59:42 UTC 2020 - Martin Hauke <[email protected]> + +- Update to version 0.02.11 + * Add bash completion script + +------------------------------------------------------------------- +Tue Aug 27 09:43:57 UTC 2019 - Martin Hauke <[email protected]> + +- Update to version 0.02.10 + * No funcional changes + +------------------------------------------------------------------- +Fri Jul 12 18:24:52 UTC 2019 - Martin Hauke <[email protected]> + +- Update to version 0.02.09 + * Makefile: bump version + * Use DOUBLE_CMP to compare with zero + * Rename FLOAT_CMP to DOUBLE_CMP as it compares doubles + * Makefile: add .travis.yml to dist rule + * Update copyright year + +------------------------------------------------------------------- Old: ---- sluice-0.02.08.tar.gz New: ---- sluice-0.02.11.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sluice.spec ++++++ --- /var/tmp/diff_new_pack.u3UQd3/_old 2020-03-08 22:24:56.348107143 +0100 +++ /var/tmp/diff_new_pack.u3UQd3/_new 2020-03-08 22:24:56.348107143 +0100 @@ -1,7 +1,7 @@ # # spec file for package sluice # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2017, Martin Hauke <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -13,30 +13,41 @@ # 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/ # Name: sluice -Version: 0.02.08 +Version: 0.02.11 Release: 0 Summary: Rate limiting data piping tool License: GPL-2.0-or-later Group: System/Monitoring -URL: http://kernel.ubuntu.com/~cking/sluice/ -Source: http://kernel.ubuntu.com/~cking/tarballs/%{name}/%{name}-%{version}.tar.gz +URL: https://kernel.ubuntu.com/~cking/sluice/ +Source: https://kernel.ubuntu.com/~cking/tarballs/%{name}/%{name}-%{version}.tar.gz %description Sluice reads from standard input and write to standard output at a specified data rate. This can be useful for benchmarking and exercising I/O streaming at desired throughput rates. +%package bash-completion +Summary: Bash Completion for %{name} +Group: System/Benchmark +Requires: %{name} = %{version} +Requires: bash-completion +Supplements: (sluice and bash-completion) +BuildArch: noarch + +%description bash-completion +Bash completion script for %{name}. + %prep %setup -q %build export CFLAGS="%{optflags}" -make %{?_smp_mflags} +%make_build %install %make_install @@ -46,4 +57,7 @@ %{_bindir}/sluice %{_mandir}/man1/sluice.1%{?ext_man} +%files bash-completion +%{_datadir}/bash-completion/completions/%{name} + %changelog ++++++ sluice-0.02.08.tar.gz -> sluice-0.02.11.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sluice-0.02.08/.travis.yml new/sluice-0.02.11/.travis.yml --- old/sluice-0.02.08/.travis.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/sluice-0.02.11/.travis.yml 2020-02-26 17:50:16.000000000 +0100 @@ -0,0 +1,15 @@ +dist: bionic +sudo: required + +matrix: + include: + - env: PEDANTIC=1 + +before_install: + - sudo apt-get update -q + - sudo apt-get install build-essential + +language: c + +script: +- make -j2 PEDANTIC=$PEDANTIC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sluice-0.02.08/Makefile new/sluice-0.02.11/Makefile --- old/sluice-0.02.08/Makefile 2018-06-16 21:42:45.000000000 +0200 +++ new/sluice-0.02.11/Makefile 2020-02-26 17:50:16.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2018 Canonical, Ltd. +# Copyright (C) 2014-2020 Canonical, Ltd. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -VERSION=0.02.08 +VERSION=0.02.11 CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 @@ -31,6 +31,7 @@ BINDIR=/usr/bin MANDIR=/usr/share/man/man1 +BASHDIR=/usr/share/bash-completion/completions sluice: sluice.o $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS) @@ -41,7 +42,8 @@ dist: rm -rf sluice-$(VERSION) mkdir sluice-$(VERSION) - cp -rp Makefile sluice.c sluice.1 COPYING snapcraft sluice-$(VERSION) + cp -rp Makefile sluice.c sluice.1 COPYING snap \ + .travis.yml bash-completion sluice-$(VERSION) tar -zcf sluice-$(VERSION).tar.gz sluice-$(VERSION) rm -rf sluice-$(VERSION) @@ -54,3 +56,5 @@ cp sluice ${DESTDIR}${BINDIR} mkdir -p ${DESTDIR}${MANDIR} cp sluice.1.gz ${DESTDIR}${MANDIR} + mkdir -p ${DESTDIR}${BASHDIR} + cp bash-completion/sluice ${DESTDIR}${BASHDIR} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sluice-0.02.08/bash-completion/sluice new/sluice-0.02.11/bash-completion/sluice --- old/sluice-0.02.08/bash-completion/sluice 1970-01-01 01:00:00.000000000 +0100 +++ new/sluice-0.02.11/bash-completion/sluice 2020-02-26 17:50:16.000000000 +0100 @@ -0,0 +1,77 @@ +# sluice tab completion for bash. +# +# Copyright (C) 2020 Canonical +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +_sluice() +{ + local cur prev words cword + _init_completion || return + + case "$prev" in + '-p') COMPREPLY=( $(compgen -W '$(command ps axo pid | sed 1d) ' $cur ) ) + return 0 + ;; + '-c') COMPREPLY=( $(compgen -W "delay" -- $cur) ) + return 0 + ;; + '-f') COMPREPLY=( $(compgen -W "freq" -- $cur) ) + return 0 + ;; + '-i') COMPREPLY=( $(compgen -W "iosize" -- $cur) ) + return 0 + ;; + '-I') _filedir + return 0 + ;; + '-m') COMPREPLY=( $(compgen -W "maxsize" -- $cur) ) + return 0 + ;; + '-O') _filedir + return 0 + ;; + '-P') _filedir + return 0 + ;; + '-r') COMPREPLY=( $(compgen -W "rate" -- $cur) ) + return 0 + ;; + '-s') COMPREPLY=( $(compgen -W "shift" -- $cur) ) + return 0 + ;; + '-t') _filedir + return 0 + ;; + '-T') COMPREPLY=( $(compgen -W "seconds" -- $cur) ) + return 0 + ;; + '-x') COMPREPLY=( $(compgen -W "xfersize" -- $cur) ) + return 0 + ;; + esac + + case "$cur" in + -*) + OPTS="-a -c -d -D -e -f -h -i -I -m -n -o -O -p -P -r -R -s -S -t -T -u -v -V -w -x -z" + COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) ) + return 0 + ;; + esac + return 0 +} + +# load the completion +complete -F _sluice sluice diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sluice-0.02.08/sluice.1 new/sluice-0.02.11/sluice.1 --- old/sluice-0.02.08/sluice.1 2018-06-16 21:42:45.000000000 +0200 +++ new/sluice-0.02.11/sluice.1 2020-02-26 17:50:16.000000000 +0100 @@ -233,7 +233,7 @@ This manual page was written by Colin King <[email protected]>, for the Ubuntu project (but may be used by others). .SH COPYRIGHT -Copyright \(co 2014-2018 Canonical Ltd. +Copyright \(co 2014-2020 Canonical Ltd. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sluice-0.02.08/sluice.c new/sluice-0.02.11/sluice.c --- old/sluice-0.02.08/sluice.c 2018-06-16 21:42:45.000000000 +0200 +++ new/sluice-0.02.11/sluice.c 2020-02-26 17:50:16.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014-2018 Canonical + * Copyright (C) 2014-2020 Canonical * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -126,8 +126,8 @@ #define DELAY_SET_ACTION(a1, a2, a3) ((a1 << 0) | (a2 << 1) | (a3 << 2)) #define DELAY_GET_ACTION(n, action) ((1 << n) & action) -#define FLOAT_TINY (0.0000001) -#define FLOAT_CMP(a, b) (fabs((a) - (b)) < FLOAT_TINY) +#define DOUBLE_TINY (0.0000001) +#define DOUBLE_CMP(a, b) (fabs((a) - (b)) < DOUBLE_TINY) typedef struct { double divisor; /* delay divisor */ @@ -535,10 +535,10 @@ stats->overruns + stats->perfect; (void)fprintf(stderr, "Overruns: %6.2f%%\n", - FLOAT_CMP(total, 0.0) ? + DOUBLE_CMP(total, 0.0) ? 100.0 * (double)stats->underruns / total : 0.0); (void)fprintf(stderr, "Underruns: %6.2f%%\n", - FLOAT_CMP(total, 0.0) ? + DOUBLE_CMP(total, 0.0) ? 100.0 * (double)stats->overruns / total : 0.0); (void)fprintf(stderr, "\nDrift from target rate: (%%)\n"); @@ -912,7 +912,7 @@ (void)fprintf(stderr, "Data rate too high.\n"); exit(EXIT_BAD_OPTION); } - if (data_rate == 0.0) + if (DOUBLE_CMP(data_rate, 0.0)) opt_flags |= OPT_NO_RATE_CONTROL; else opt_flags |= OPT_GOT_RATE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sluice-0.02.08/snap/Makefile new/sluice-0.02.11/snap/Makefile --- old/sluice-0.02.08/snap/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ new/sluice-0.02.11/snap/Makefile 2020-02-26 17:50:16.000000000 +0100 @@ -0,0 +1,6 @@ +all: + snapcraft + +clean: + rm -rf setup *.snap + snapcraft clean diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sluice-0.02.08/snap/snapcraft.yaml new/sluice-0.02.11/snap/snapcraft.yaml --- old/sluice-0.02.08/snap/snapcraft.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/sluice-0.02.11/snap/snapcraft.yaml 2020-02-26 17:50:16.000000000 +0100 @@ -0,0 +1,22 @@ +name: sluice +version: git +version-script: | + echo $(git describe --tags) +summary: rate limiting data piping tool +description: Sluice reads from standard input and write to standard output at a specified data rate. This can be useful for benchmarking and exercising I/O streaming at desired throughput rates. +confinement: strict +type: app +grade: stable + +parts: + sluice: + plugin: make + source: git://kernel.ubuntu.com/cking/sluice + build-packages: + - gcc + - make + +apps: + sluice: + command: usr/bin/sluice + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sluice-0.02.08/snapcraft/Makefile new/sluice-0.02.11/snapcraft/Makefile --- old/sluice-0.02.08/snapcraft/Makefile 2018-06-16 21:42:45.000000000 +0200 +++ new/sluice-0.02.11/snapcraft/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -VERSION=$(shell git tag | tail -1 | cut -c2-) -COMMITS=$(shell git log --oneline | wc -l) -SHA=$(shell git log -1 --oneline | cut -d' ' -f1) -DATE=$(shell date +'%Y%m%d') -V=$(VERSION)-$(DATE)-$(COMMITS)-$(SHA) - -all: set_version - snapcraft - -set_version: - cat snapcraft.yaml | sed 's/version: .*/version: $(V)/' > snapcraft-tmp.yaml - mv snapcraft-tmp.yaml snapcraft.yaml - -clean: - rm -rf setup *.snap - snapcraft clean - cat snapcraft.yaml | sed 's/version: .*/version: 0/' > snapcraft-tmp.yaml - mv snapcraft-tmp.yaml snapcraft.yaml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sluice-0.02.08/snapcraft/snapcraft.yaml new/sluice-0.02.11/snapcraft/snapcraft.yaml --- old/sluice-0.02.08/snapcraft/snapcraft.yaml 2018-06-16 21:42:45.000000000 +0200 +++ new/sluice-0.02.11/snapcraft/snapcraft.yaml 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -name: sluice -version: 0.02.06-20170425-189-bc33e23 -summary: rate limiting data piping tool -description: Sluice reads from standard input and write to standard output at a specified data rate. This can be useful for benchmarking and exercising I/O streaming at desired throughput rates. -confinement: strict -type: app -grade: stable - -parts: - sluice: - plugin: make - source: git://kernel.ubuntu.com/cking/sluice - build-packages: - - gcc - - make - -apps: - sluice: - command: usr/bin/sluice -
