commit progress for openSUSE:Factory

1 Nov 2023

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package progress for openSUSE:Factory checked in at 2023-11-01 22:09:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/progress (Old)
 and      /work/SRC/openSUSE:Factory/.progress.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "progress"

Wed Nov  1 22:09:56 2023 rev:6 rq:1121495 version:0.17

Changes:
--------

--- /work/SRC/openSUSE:Factory/progress/progress.changes	2021-04-27 21:34:40.075984358 +0200
+++ /work/SRC/openSUSE:Factory/.progress.new.17445/progress.changes	2023-11-01 22:10:42.349279614 +0100
@@ -1,0 +2,10 @@
+Mon Oct 30 16:21:15 UTC 2023 - Andrea Manzini <andrea.manzini@suse.com>
+
+- Update to 0.17:
+  * bump MAX_PIDS and MAX_RESULTS to 128
+  * support for zsh completion
+
+- dropped no more needed patch progress-fix_ncurses_without_pkgconfig.patch 
+- provide separate subpackage for zsh completion
+
+-------------------------------------------------------------------

Old:
----
  progress-0.16.tar.gz
  progress-fix_ncurses_without_pkgconfig.patch

New:
----
  progress-0.17.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ progress.spec ++++++
--- /var/tmp/diff_new_pack.xDiX1H/_old	2023-11-01 22:10:43.953339036 +0100
+++ /var/tmp/diff_new_pack.xDiX1H/_new	2023-11-01 22:10:43.957339184 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package progress
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,14 +17,13 @@
 
 
 Name:           progress
-Version:        0.16
+Version:        0.17
 Release:        0
 Summary:        Coreutils Viewer
 License:        GPL-3.0-or-later
 Group:          System/Console
 URL:            https://github.com/Xfennec/progress
 Source0:        https://github.com/Xfennec/progress/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Patch1:         progress-fix_ncurses_without_pkgconfig.patch
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(form)
 BuildRequires:  pkgconfig(formw)
@@ -48,9 +47,22 @@
 
 It can now also display an estimated throughput (using -w flag).
 
+%package zsh-completion
+Summary:        ZSH Completion for %{name}
+Group:          Development/Tools/Other
+Requires:       %{name} = %{version}
+%if 0%{?suse_version} == 1315
+Supplements:    packageand(progress:zsh)
+%else
+Supplements:    (progress and zsh)
+%endif
+BuildArch:      noarch
+
+%description zsh-completion
+ZSH command line completion support for %{name}.
+
 %prep
-%setup -q
-%patch1
+%autosetup
 
 %build
 %make_build CFLAGS="-g -Wall -D_FILE_OFFSET_BITS=64 %{optflags}"
@@ -64,3 +76,8 @@
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1%{?ext_man}
 
+%files zsh-completion
+%{_datadir}/zsh/
+%{_datadir}/zsh/site-functions/
+%{_datadir}/zsh/site-functions/_progress
+

++++++ progress-0.16.tar.gz -> progress-0.17.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/progress-0.16/.travis.yml new/progress-0.17/.travis.yml
--- old/progress-0.16/.travis.yml	2021-03-04 11:26:40.000000000 +0100
+++ new/progress-0.17/.travis.yml	1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-os:
-  - linux
-  - osx
-
-language: c
-
-compiler:
-  - gcc
-  - clang
-
-script: make
-
-notifications:
-  email:
-    on_success: never
-    on_failure: always
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/progress-0.16/Makefile new/progress-0.17/Makefile
--- old/progress-0.16/Makefile	2021-03-04 11:26:40.000000000 +0100
+++ new/progress-0.17/Makefile	2023-10-13 10:45:36.000000000 +0200
@@ -8,10 +8,10 @@
     ifeq (, $(shell which $(PKG_CONFIG) 2> /dev/null))
     $(error "pkg-config command not found")
     endif
-    ifeq (, $(shell $(PKG_CONFIG) ncurses --libs 2> /dev/null))
+    ifeq (, $(shell $(PKG_CONFIG) ncursesw --libs 2> /dev/null))
     $(error "ncurses package not found")
     endif
-    override LDFLAGS += $(shell $(PKG_CONFIG) ncurses --libs)
+    override LDFLAGS += $(shell $(PKG_CONFIG) ncursesw --libs)
 endif
 ifeq ($(UNAME), Darwin)
     override LDFLAGS += -lncurses
@@ -22,6 +22,7 @@
 PREFIX ?= /usr/local
 BINDIR = $(PREFIX)/bin
 MANDIR = $(PREFIX)/share/man/man1
+ZSHDIR = $(PREFIX)/share/zsh/site-functions
 
 $(OBJ) : progress.o sizes.o hlist.o
 	$(CC) -Wall $^ -o $@ $(LDFLAGS)
@@ -38,6 +39,10 @@
 	@mkdir -p $(DESTDIR)$(MANDIR)
 	@install -pm0644 $(OBJ).1 $(DESTDIR)$(MANDIR)/ || \
 	echo "Failed. Try "make PREFIX=~ install" ?"
+	@echo "Installing zsh completion to $(DESTDIR)$(ZSHDIR) ..."
+	@install -Dpm0644 _$(OBJ) -t $(DESTDIR)$(ZSHDIR)/ || \
+	echo "Failed. Try "make PREFIX=~ install" ?"
 uninstall :
 	@rm -f $(DESTDIR)$(BINDIR)/$(OBJ)
 	@rm -f $(DESTDIR)$(MANDIR)/$(OBJ).1
+	@rm -f $(DESTDIR)$(ZSHDIR)/_$(OBJ)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/progress-0.16/README.md new/progress-0.17/README.md
--- old/progress-0.16/README.md	2021-03-04 11:26:40.000000000 +0100
+++ new/progress-0.17/README.md	2023-10-13 10:45:36.000000000 +0200
@@ -1,10 +1,10 @@
-progress - Coreutils Progress Viewer [![Build Status](https://travis-ci.org/Xfennec/progress.svg?branch=master)](https://travis-ci.org/Xfennec/progress)
+progress - Coreutils Progress Viewer
 =====================
 
 What is it
 ----------
 
-This tool can be described as a **Tiny**, Dirty C command
+This tool can be described as a **tiny**, dirty C command
 that looks for coreutils basic commands (cp, mv, dd, tar, gzip/gunzip,
 cat, etc.) currently running on your system and displays the
 **percentage** of copied data. It can also show **estimated time** and **throughput**,
@@ -25,9 +25,17 @@
 
     apt install progress
 
-On rpm-based systems (Red Hat, CentOS, SUSE, etc.), run:
+On Arch Linux, run:
 
-    yum install progress
+    pacman -S progress
+
+On Fedora, run:
+
+    dnf install progress
+
+On openSUSE, run:
+
+    zypper install progress
 
 On macOS, with homebrew, run:
 
@@ -44,7 +52,7 @@
 
 On FreeBSD, substitute `make` with `gmake`.
 
-It depends on library ncurses, you may have to install corresponding packages (may be something like 'libncurses5-dev' or 'ncurses-devel').
+It depends on the library ncurses, you may have to install corresponding packages (maybe something like 'libncurses5-dev', 'libncursesw6' or 'ncurses-devel').
 
 How do you run it
 -----------------
@@ -65,7 +73,7 @@
 
         watch progress -wc firefox
 
-* look at your Web server activity:
+* look at your web server activity:
 
         progress -c httpd
 
@@ -78,8 +86,10 @@
 How does it work
 ----------------
 
-It simply scans `/proc` for interesting commands, and then looks at
+It simply scans `/proc` for interesting commands*, and then looks at
 directories `fd` and `fdinfo` to find opened files and seek positions,
 and reports status for the largest file.
 
-It's very light, and compatible with virtually any command.
+It's very light and compatible with virtually any command.
+
+<em>(*) on macOS, it does the same thing using libproc</em>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/progress-0.16/_progress new/progress-0.17/_progress
--- old/progress-0.16/_progress	1970-01-01 01:00:00.000000000 +0100
+++ new/progress-0.17/_progress	2023-10-13 10:45:36.000000000 +0200
@@ -0,0 +1,25 @@
+#compdef progress
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  zsh completion script for progress
+#
+# ------------------------------------------------------------------------------
+
+local options=(
+  {-q,--quiet}'[hides all messages]'
+  {-d,--debug}'[shows all warning/error messages]'
+  {-w,--wait}'[estimate I/O throughput and ETA (slower display)]'
+  '(-w)'{-W,--wait-delay}'[wait 'secs' seconds for I/O estimation (implies -w, default=1.0)]:secs'
+  {-m,--monitor}'[loop while monitored processes are still running]'
+  {-M,--monitor-continuously}'[like monitor but never stop (similar to watch progress)]'
+  {-a,--additional-command}'[add additional command to default command list]: :{_command_names -e}'
+  {-c,--command}'[monitor only this command name (ex: firefox)]: :{_command_names -e}'
+  {-p,--pid}'[monitor only this process ID (ex: $(pidof firefox))]: :_ps'
+  {-i,--ignore-file}'[do not report process if using file]: :_files'
+  {-o,--open-mode}'[report only files opened for read or write]:rw:(r w)'
+  '(- : *)'{-v,--version}'[show program version and exit]'
+  '(- : *)'{-h,--help}'[display this help and exit]'
+)
+_arguments -s -S $options
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/progress-0.16/progress.c new/progress-0.17/progress.c
--- old/progress-0.16/progress.c	2021-03-04 11:26:40.000000000 +0100
+++ new/progress-0.17/progress.c	2023-10-13 10:45:36.000000000 +0200
@@ -72,7 +72,7 @@
 static int proc_names_cnt;
 static char **proc_names;
 char *default_proc_names[] = {"cp", "mv", "dd", "tar", "bsdtar", "cat", "rsync", "scp",
-    "grep", "fgrep", "egrep", "cut", "sort", "md5sum", "sha1sum",
+    "grep", "fgrep", "egrep", "cut", "sort", "cksum", "md5sum", "sha1sum",
     "sha224sum", "sha256sum", "sha384sum", "sha512sum",
 #ifdef __FreeBSD__
     "md5", "sha1", "sha224", "sha256", "sha512", "sha512t256", "rmd160",
@@ -797,7 +797,7 @@
             printf("  -c --command cmd             monitor only this command name (ex: firefox)\n");
             printf("  -p --pid id                  monitor only this process ID (ex: `pidof firefox`)\n");
             printf("  -i --ignore-file file        do not report process if using file\n");
-            printf("  -o --open-mode {r|w}         report only files opened for read or write\n");
+            printf("  -o --open-mode {r|w|u}       report only files opened for read, write, or read and write\n");
             printf("  -v --version                 show program version and exit\n");
             printf("  -h --help                    display this help and exit\n");
             printf("\n\n");
@@ -867,6 +867,8 @@
                 flag_open_mode = PM_READ;
             else if (!strcmp("w", optarg))
                 flag_open_mode = PM_WRITE;
+            else if (!strcmp("u", optarg))
+                flag_open_mode = PM_READWRITE;
             else {
                 fprintf(stderr,"Invalid --open-mode option value '%s'.\n", optarg);
                 exit(EXIT_FAILURE);
@@ -1035,9 +1037,8 @@
     for (j = 0 ; j < fd_count ; j++) {
         get_fdinfo(pidinfo_list[i].pid, fdnum_list[j], &fdinfo);
 
-        if (flag_open_mode == PM_READ && fdinfo.mode != PM_READ && fdinfo.mode != PM_READWRITE)
-            continue;
-        if (flag_open_mode == PM_WRITE && fdinfo.mode != PM_WRITE && fdinfo.mode != PM_READWRITE)
+        // only select files with specified open mode
+        if (flag_open_mode && flag_open_mode != fdinfo.mode)
             continue;
 
         if (fdinfo.size > max_size) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/progress-0.16/progress.h new/progress-0.17/progress.h
--- old/progress-0.16/progress.h	2021-03-04 11:26:40.000000000 +0100
+++ new/progress-0.17/progress.h	2023-10-13 10:45:36.000000000 +0200
@@ -25,11 +25,11 @@
 
 #include "hlist.h"
 
-#define PROGRESS_VERSION         "0.16"
+#define PROGRESS_VERSION         "0.17"
 
 #define PROC_PATH       "/proc"
-#define MAX_PIDS        32
-#define MAX_RESULTS     32
+#define MAX_PIDS        128
+#define MAX_RESULTS     128
 #define MAX_FD_PER_PID  512
 #define LINE_LEN        256

    

Source-Sync

tags

participants (1)