Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package grml-zsh-config for openSUSE:Factory
checked in at 2025-06-24 20:49:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grml-zsh-config (Old)
and /work/SRC/openSUSE:Factory/.grml-zsh-config.new.7067 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grml-zsh-config"
Tue Jun 24 20:49:59 2025 rev:17 rq:1288176 version:0.19.22
Changes:
--------
--- /work/SRC/openSUSE:Factory/grml-zsh-config/grml-zsh-config.changes
2025-06-23 15:07:04.090227463 +0200
+++
/work/SRC/openSUSE:Factory/.grml-zsh-config.new.7067/grml-zsh-config.changes
2025-06-24 20:51:52.266996275 +0200
@@ -1,0 +2,9 @@
+Tue Jun 24 07:39:40 UTC 2025 - Michael Vetter <mvet...@suse.com>
+
+- Update tp 0.19.22:
+ * Remove iso2utf/utf2iso and term2iso/term2utf
+ * doc: remove "j" alias
+ * merge grml-scripts-core
+ * cpu-screen: fix max freq
+
+-------------------------------------------------------------------
Old:
----
v0.19.21.tar.gz
New:
----
v0.19.22.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grml-zsh-config.spec ++++++
--- /var/tmp/diff_new_pack.KCGtWe/_old 2025-06-24 20:51:52.951024267 +0200
+++ /var/tmp/diff_new_pack.KCGtWe/_new 2025-06-24 20:51:52.951024267 +0200
@@ -17,7 +17,7 @@
Name: grml-zsh-config
-Version: 0.19.21
+Version: 0.19.22
Release: 0
Summary: Zsh config ujed by grml
License: GPL-2.0-only
++++++ v0.19.21.tar.gz -> v0.19.22.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grml-etc-core-0.19.21/debian/.gitignore
new/grml-etc-core-0.19.22/debian/.gitignore
--- old/grml-etc-core-0.19.21/debian/.gitignore 1970-01-01 01:00:00.000000000
+0100
+++ new/grml-etc-core-0.19.22/debian/.gitignore 2025-06-23 17:30:28.000000000
+0200
@@ -0,0 +1,4 @@
+files
+grml-scripts-core.debhelper.log
+grml-scripts-core.substvars
+grml-scripts-core
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grml-etc-core-0.19.21/debian/changelog
new/grml-etc-core-0.19.22/debian/changelog
--- old/grml-etc-core-0.19.21/debian/changelog 2025-06-20 13:48:35.000000000
+0200
+++ new/grml-etc-core-0.19.22/debian/changelog 2025-06-23 17:30:28.000000000
+0200
@@ -1,3 +1,15 @@
+grml-etc-core (0.19.22) grml-testing; urgency=medium
+
+ [ Chris Hofstaedtler ]
+ * [844b60e] Remove iso2utf/utf2iso and term2iso/term2utf
+ * [23ff405] doc: remove "j" alias
+ * [5c1ca32] merge grml-scripts-core
+
+ [ Christopher Bock ]
+ * [bd8fcbb] cpu-screen: fix max freq
+
+ -- Chris Hofstaedtler <c...@grml.org> Mon, 23 Jun 2025 17:27:47 +0200
+
grml-etc-core (0.19.21) grml-testing; urgency=medium
[ Christopher Bock ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grml-etc-core-0.19.21/debian/control
new/grml-etc-core-0.19.22/debian/control
--- old/grml-etc-core-0.19.21/debian/control 2025-06-20 13:48:35.000000000
+0200
+++ new/grml-etc-core-0.19.22/debian/control 2025-06-23 17:30:28.000000000
+0200
@@ -5,7 +5,7 @@
Build-Depends:
asciidoctor,
debhelper-compat (= 12),
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
Rules-Requires-Root: no
Homepage: https://github.com/grml/grml-etc-core
Vcs-Git: https://github.com/grml/grml-etc-core.git
@@ -21,13 +21,16 @@
grml-autoconfig (<< 0.5-7),
grml-etc (<< 0.8-11),
grml-scripts (<< 0.8-27),
+ grml-scripts-core (<< 2.1.5~),
Replaces:
+ grml-scripts-core (<< 2.1.5~),
vim-common,
+Provides:
+ grml-scripts-core
Depends:
${misc:Depends},
+ perl-base | perl,
vim | nvi | editor,
-Recommends:
- grml-scripts-core,
Pre-Depends:
${misc:Pre-Depends},
zsh,
@@ -37,3 +40,5 @@
meant for use on Grml systems this package can be
used on plain Debian (stable/testing/unstable)
systems as well.
+ This package also includes cpu-screen and ip-screen,
+ as they are used by the included screen configuration.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grml-etc-core-0.19.21/debian/grml-etc-core.links
new/grml-etc-core-0.19.22/debian/grml-etc-core.links
--- old/grml-etc-core-0.19.21/debian/grml-etc-core.links 1970-01-01
01:00:00.000000000 +0100
+++ new/grml-etc-core-0.19.22/debian/grml-etc-core.links 2025-06-23
17:30:28.000000000 +0200
@@ -0,0 +1,2 @@
+/usr/share/man/man1/grml-scripts-core.1.gz /usr/share/man/man1/cpu-screen.1.gz
+/usr/share/man/man1/grml-scripts-core.1.gz /usr/share/man/man1/ip-screen.1.gz
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grml-etc-core-0.19.21/debian/grml-etc-core.manpages
new/grml-etc-core-0.19.22/debian/grml-etc-core.manpages
--- old/grml-etc-core-0.19.21/debian/grml-etc-core.manpages 1970-01-01
01:00:00.000000000 +0100
+++ new/grml-etc-core-0.19.22/debian/grml-etc-core.manpages 2025-06-23
17:30:28.000000000 +0200
@@ -0,0 +1 @@
+manpages/*.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grml-etc-core-0.19.21/debian/install
new/grml-etc-core-0.19.22/debian/install
--- old/grml-etc-core-0.19.21/debian/install 2025-06-20 13:48:35.000000000
+0200
+++ new/grml-etc-core-0.19.22/debian/install 2025-06-23 17:30:28.000000000
+0200
@@ -1,2 +1,3 @@
etc
+usr_bin/* usr/bin/
usr_share_grml/* usr/share/grml/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grml-etc-core-0.19.21/debian/rules
new/grml-etc-core-0.19.22/debian/rules
--- old/grml-etc-core-0.19.21/debian/rules 2025-06-20 13:48:35.000000000
+0200
+++ new/grml-etc-core-0.19.22/debian/rules 2025-06-23 17:30:28.000000000
+0200
@@ -4,10 +4,8 @@
%:
dh $@
-
after_dh_auto_clean:
$(MAKE) -C doc clean
override_dh_auto_build:
$(MAKE) -C doc all
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grml-etc-core-0.19.21/doc/grmlzshrc.adoc
new/grml-etc-core-0.19.22/doc/grmlzshrc.adoc
--- old/grml-etc-core-0.19.21/doc/grmlzshrc.adoc 2025-06-20
13:48:35.000000000 +0200
+++ new/grml-etc-core-0.19.22/doc/grmlzshrc.adoc 2025-06-23
17:30:28.000000000 +0200
@@ -748,10 +748,6 @@
*islinux()*::
Returns true, if running on Linux, else false.
-*iso2utf()*::
-Changes every occurrence of the string iso885915 or ISO885915 in
-environment variables to UTF-8.
-
*isopenbsd()*::
Returns true, if running on OpenBSD, else false.
@@ -827,10 +823,6 @@
*uchange()*::
Shows upstreams changelog of a given package in $PAGER.
-*utf2iso()*::
-Changes every occurrence of the string UTF-8 or utf-8 in environment
-variables to iso885915.
-
*vim()*::
Wrapper for vim(1). It tries to set the title and hands vim the environment
variable VIM_OPTIONS on the command line. So the user may define command
@@ -960,9 +952,6 @@
*help-zshglob* (_H-Glob()_)::
Runs the function H-Glob() to expand or explain wildcards.
-*j* (_jobs -l_)::
-Prints status of jobs in the current shell session in long format.
-
*l* (_ls -l --color=auto_)::
Lists files in long output format with indicator for filetype appended
to filename. If the terminal supports it, with colored output.
@@ -1051,14 +1040,6 @@
If user is running a Grml live system, don't ask for any password, if she
wants a root shell.
-*term2iso* (_echo 'Setting terminal to iso mode' ; print -n '\e%@'_)::
-Sets mode from UTF-8 to ISO 2022 (See:
-http://www.cl.cam.ac.uk/~mgk25/unicode.html#term[What are the issues related
to UTF-8 terminal emulators?]).
-
-*term2utf* (_echo 'Setting terminal to utf-8 mode'; print -n '\e%G'_)::
-Sets mode from ISO 2022 to UTF-8 (See:
-http://www.cl.cam.ac.uk/~mgk25/unicode.html#term[What are the issues related
to UTF-8 terminal emulators?]).
-
*tlog* (_tail --follow=name /var/log/syslog_)::
Prints syslog continuously (See tail(1)).
@@ -1281,4 +1262,3 @@
Most parts of grml's zshrc are distributed under the terms of GPL v2, too,
except for *accept-line()* which are distributed under the same conditions
as zsh itself (which is BSD-like).
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grml-etc-core-0.19.21/etc/zsh/zshrc
new/grml-etc-core-0.19.22/etc/zsh/zshrc
--- old/grml-etc-core-0.19.21/etc/zsh/zshrc 2025-06-20 13:48:35.000000000
+0200
+++ new/grml-etc-core-0.19.22/etc/zsh/zshrc 2025-06-23 17:30:28.000000000
+0200
@@ -2478,32 +2478,6 @@
alias "$(uname -r)-reboot"="kexec -l --initrd=/boot/initrd.img-"$(uname
-r)" --command-line=\"$(cat /proc/cmdline)\" /boot/vmlinuz-"$(uname -r)""
fi
-# see http://www.cl.cam.ac.uk/~mgk25/unicode.html#term for details
-alias term2iso="echo 'Setting terminal to iso mode' ; print -n '\e%@'"
-alias term2utf="echo 'Setting terminal to utf-8 mode'; print -n '\e%G'"
-
-# make sure it is not assigned yet
-[[ -n ${aliases[utf2iso]} ]] && unalias utf2iso
-function utf2iso () {
- if isutfenv ; then
- local ENV
- for ENV in $(env | command grep -i '.utf') ; do
- eval export "$(echo $ENV | sed 's/UTF-8/iso885915/ ;
s/utf8/iso885915/')"
- done
- fi
-}
-
-# make sure it is not assigned yet
-[[ -n ${aliases[iso2utf]} ]] && unalias iso2utf
-function iso2utf () {
- if ! isutfenv ; then
- local ENV
- for ENV in $(env | command grep -i '\.iso') ; do
- eval export "$(echo $ENV | sed 's/iso.*/UTF-8/ ; s/ISO.*/UTF-8/')"
- done
- fi
-}
-
# especially for roadwarriors using GNU screen and ssh:
if ! check_com asc &>/dev/null ; then
function asc () { autossh -t "$@" 'screen -RdU' }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grml-etc-core-0.19.21/manpages/grml-scripts-core.1
new/grml-etc-core-0.19.22/manpages/grml-scripts-core.1
--- old/grml-etc-core-0.19.21/manpages/grml-scripts-core.1 1970-01-01
01:00:00.000000000 +0100
+++ new/grml-etc-core-0.19.22/manpages/grml-scripts-core.1 2025-06-23
17:30:28.000000000 +0200
@@ -0,0 +1,36 @@
+.\" Filename: grml-scripts-core.1
+.\" Purpose: man page for grml-scripts-core
+.\" Authors: grml-team (grml.org), (c) Michael Prokop <m...@grml.org>
+.\" Bug-Reports: see https://grml.org/bugs/
+.\" License: This file is licensed under the GPL v2.
+.\"###############################################################################
+
+.\"###############################################################
+.TH grml\-scripts\-core 1 "grml-scripts-core"
+.SH "NAME"
+grml\-scripts\-core \- core script collection for the Grml distribution
+.\"#######################################################
+.SH "SCRIPTS"
+
+.SS cpu-screen
+output current / available cpu frequencies
+(useful for integration into GNU screen)
+.SS ip-screen
+print ip address (IPv4 only) of configured network interfaces to stdout
+(useful for integration into GNU screen)
+
+.SH "BUGS"
+Probably. Please report any bugs you find and report
+feedback and suggestions to the Grml team.
+See https://grml.org/bugs/ for further information.
+Thank you!
+
+.SH "SEE ALSO"
+screen(1), grml-scripts(8)
+
+.SH "COPYRIGHT"
+This man page is copyright \(co 2004-2024 by the Grml team.
+Included scripts are under various copyrights, please see
+the sources.
+.\"###### END OF FILE
##########################################################
+.\" vim:tw=60
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grml-etc-core-0.19.21/usr_bin/cpu-screen
new/grml-etc-core-0.19.22/usr_bin/cpu-screen
--- old/grml-etc-core-0.19.21/usr_bin/cpu-screen 1970-01-01
01:00:00.000000000 +0100
+++ new/grml-etc-core-0.19.22/usr_bin/cpu-screen 2025-06-23
17:30:28.000000000 +0200
@@ -0,0 +1,62 @@
+#!/usr/bin/perl
+# Filename: cpu-screen
+# Purpose: output current / available cpu frequence (useful for
integration into GNU screen)
+# Authors: grml-team (grml.org), (c) Chris Hofstaedtler <c...@grml.org>
+# Bug-Reports: see http://grml.org/bugs/
+# License: This file is licensed under the GPL v2.
+#******************************************************************************
+
+
+use strict;
+use warnings;
+
+sub read_cpu_freq_file {
+ my ($file) = @_;
+ open my $fh, '<', $file or return 0;
+ my $cpu_freq = <$fh>;
+ $cpu_freq = int($cpu_freq) / 1000;
+ close $fh;
+ return $cpu_freq;
+}
+
+sub cpu_cur_frequency() {
+ return
read_cpu_freq_file('/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq');
+}
+
+sub cpu_max_frequency() {
+ return
read_cpu_freq_file('/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq');
+}
+
+sub count_cpus() {
+ # assume "1" cpu if we can't count it
+ open my $fh, '<', "/proc/stat" or return 1;
+
+ my $count = 0;
+ while (my $line = <$fh>) {
+ $count += 1 if $line =~ /^cpu\d/;
+ }
+ close $fh;
+ return $count;
+}
+
+
+my $cpu_count = count_cpus();
+my $cpu_freq = cpu_cur_frequency();
+
+if ($cpu_freq == 0) {
+ print("$cpu_count\n");
+} elsif ($cpu_count == 1) {
+ my $max_cpu_freq = cpu_max_frequency();
+ if ($cpu_freq == $max_cpu_freq) {
+ printf("$cpu_freq\n");
+ } else {
+ printf("$cpu_freq / $max_cpu_freq\n");
+ }
+} else {
+ my $max_cpu_freq = cpu_max_frequency();
+ if ($cpu_freq == $max_cpu_freq) {
+ printf("$cpu_count * $cpu_freq\n");
+ } else {
+ printf("$cpu_count * $cpu_freq / $max_cpu_freq\n");
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grml-etc-core-0.19.21/usr_bin/ip-screen
new/grml-etc-core-0.19.22/usr_bin/ip-screen
--- old/grml-etc-core-0.19.21/usr_bin/ip-screen 1970-01-01 01:00:00.000000000
+0100
+++ new/grml-etc-core-0.19.22/usr_bin/ip-screen 2025-06-23 17:30:28.000000000
+0200
@@ -0,0 +1,9 @@
+#!/bin/sh
+# Filename: ip-screen
+# Purpose: output ip address (IPv4 only) of configured network
interfaces (useful for integration into GNU screen)
+# Authors: grml-team (grml.org), (c) Darshaka Pathirana <d...@grml.org>
+# Bug-Reports: see http://grml.org/bugs/
+# License: This file is licensed under the GPL v2.
+#******************************************************************************
+
+hostname -I | sed -e 's/ [^ ]*:.*$//;s/ / | /g;s/ | $//'
