Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package grc for openSUSE:Factory checked in at 2021-08-25 20:58:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grc (Old) and /work/SRC/openSUSE:Factory/.grc.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grc" Wed Aug 25 20:58:20 2021 rev:7 rq:914172 version:1.13 Changes: -------- --- /work/SRC/openSUSE:Factory/grc/grc.changes 2021-03-02 14:14:29.261199322 +0100 +++ /work/SRC/openSUSE:Factory/.grc.new.1899/grc.changes 2021-08-25 20:59:51.409031331 +0200 @@ -1,0 +2,8 @@ +Mon Aug 16 13:37:35 UTC 2021 - Michael Vetter <[email protected]> + +- Update to 1.13: + * do not automatically create command aliases, unless explicitly + specified (for bash) + * several minor improvements + +------------------------------------------------------------------- Old: ---- v1.12.tar.gz New: ---- v1.13.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grc.spec ++++++ --- /var/tmp/diff_new_pack.y3uyCB/_old 2021-08-25 20:59:51.873030721 +0200 +++ /var/tmp/diff_new_pack.y3uyCB/_new 2021-08-25 20:59:51.873030721 +0200 @@ -17,7 +17,7 @@ Name: grc -Version: 1.12 +Version: 1.13 Release: 0 Summary: Generic colouriser for everything License: GPL-2.0-or-later ++++++ v1.12.tar.gz -> v1.13.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.12/INSTALL new/grc-1.13/INSTALL --- old/grc-1.12/INSTALL 2021-03-01 10:26:14.000000000 +0100 +++ new/grc-1.13/INSTALL 2021-08-07 17:44:43.000000000 +0200 @@ -33,3 +33,4 @@ If you're on OS X and using Homebrew, brew install grc + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.12/README.markdown new/grc-1.13/README.markdown --- old/grc-1.12/README.markdown 2021-03-01 10:26:14.000000000 +0100 +++ new/grc-1.13/README.markdown 2021-08-07 17:44:43.000000000 +0200 @@ -161,9 +161,9 @@ will display pathnames in bold blinking green -## Python 3 compatibility +## Python 2 & 3 compatibility -There is some preliminary python3 support, meaning that both grc and grcat will run under both python2 and python3. However, all the regular expressions are strings, and grcat works on string input (not bytes). Therefore it will miserably fail if fed input with invalid UTF-8 characters. +both grc and grcat are targetted towards python3 now; there is an attempt at python2 compatibility, meaning that both grc and grcat will run under both python2 and python3. However, all the regular expressions are strings, and grcat works on string input (not bytes). ## Hints @@ -179,13 +179,16 @@ ## Automatic aliases -You can start using grc automatically with supported commands. The following assumes that `grc.<sh|zsh|fish>` is in `/etc`. The location may differ (i. e. `/usr/local/etc` when installed with [homebrew](https://formulae.brew.sh/formula/grc)). +You can start using grc automatically with supported commands. The following assumes that `grc.<sh|zsh|fish>` is in `/etc`. The location may differ (i. e. `/usr/local/etc` when installed with [homebrew](https://formulae.brew.sh/formula/grc)); or the `grc.sh` can be placed into `/etc/profile.d/` (this is in fact the default). Be aware this is somewhat invasive and better test it before deploying. ### Bash To set aliases for supported commands, append to your `~/.bashrc`: - [[ -s "/etc/grc.sh" ]] && source /etc/grc.sh + GRC_ALIASES=true + [[ -s "/etc/profile.d/grc.sh" ]] && source /etc/grc.sh + +If the file `/etc/default/grc` exists, it is sourced first, therefore you can place a line saying `GRC_ALIASES=true` there. ### ZSH diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.12/colourfiles/conf.free new/grc-1.13/colourfiles/conf.free --- old/grc-1.12/colourfiles/conf.free 2021-03-01 10:26:14.000000000 +0100 +++ new/grc-1.13/colourfiles/conf.free 2021-08-07 17:44:43.000000000 +0200 @@ -1,17 +1,17 @@ # Size 'K' -regexp=\s\d*[.,]?\dKi? +regexp=\s\d*[.,]?\dKi?|\b\d{1,3}\b colours=green ====== # Size 'M' -regexp=\s\d*[.,]?\dMi? +regexp=\s\d*[.,]?\dMi?|\b\d{4,6}\b colours=yellow ====== # Size 'G' -regexp=\s\d*[.,]?\dGi? +regexp=\s\d*[.,]?\dGi?|\b\d{7,9}\b colours=red ====== # Size 'T' -regexp=\s\d*[.,]?\dTi? +regexp=\s\d*[.,]?\dTi?|\b\d{10,12}\b colours=bold red ====== # Mem diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.12/colourfiles/conf.log new/grc-1.13/colourfiles/conf.log --- old/grc-1.12/colourfiles/conf.log 2021-03-01 10:26:14.000000000 +0100 +++ new/grc-1.13/colourfiles/conf.log 2021-08-07 17:44:43.000000000 +0200 @@ -58,7 +58,7 @@ count=more ====== # IPv6 -regexp=\d(([0-9a-fA-F]{1,4})?\:\:?[0-9a-fA-F]{1,4})+ +regexp=(([0-9a-fA-F]{1,4})?\:\:?[0-9a-fA-F]{1,4})+ colours=bold yellow ======= # Email address diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.12/debian/changelog new/grc-1.13/debian/changelog --- old/grc-1.12/debian/changelog 2021-03-01 10:26:14.000000000 +0100 +++ new/grc-1.13/debian/changelog 2021-08-07 17:44:43.000000000 +0200 @@ -1,3 +1,11 @@ +grc (1.13-1) unstable; urgency=low + + * do not add sh aliases unless explicitly allowed in /etc/default/grc + (closes: #984629) + * several minor improvements + + -- Radovan Garab??k <[email protected]> Sat, 07 Aug 2021 17:37:55 +0200 + grc (1.12-1) unstable; urgency=low * add new configurations diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.12/debian/compat new/grc-1.13/debian/compat --- old/grc-1.12/debian/compat 2021-03-01 10:26:14.000000000 +0100 +++ new/grc-1.13/debian/compat 2021-08-07 17:44:43.000000000 +0200 @@ -1 +1 @@ -9 +10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.12/debian/control new/grc-1.13/debian/control --- old/grc-1.12/debian/control 2021-03-01 10:26:14.000000000 +0100 +++ new/grc-1.13/debian/control 2021-08-07 17:44:43.000000000 +0200 @@ -2,7 +2,7 @@ Section: text Priority: optional Maintainer: Radovan Garab??k <[email protected]> -Standards-Version: 3.9.6 +Standards-Version: 4.5.1 Build-Depends: debhelper (>=9), python3, dh-python Package: grc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.12/debian/grc.default new/grc-1.13/debian/grc.default --- old/grc-1.12/debian/grc.default 1970-01-01 01:00:00.000000000 +0100 +++ new/grc-1.13/debian/grc.default 2021-08-07 17:44:43.000000000 +0200 @@ -0,0 +1,9 @@ +# add colourifying aliases for sh and bash shells +# true or false +# +# since this is rather invasive, it defaults to false +# +# changing it makes your shell source /etc/profile.d/grc + +GRC_ALIASES=false + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.12/debian/rules new/grc-1.13/debian/rules --- old/grc-1.12/debian/rules 2021-03-01 10:26:14.000000000 +0100 +++ new/grc-1.13/debian/rules 2021-08-07 17:44:43.000000000 +0200 @@ -37,18 +37,18 @@ dh_testroot # dh_installdebconf dh_installdocs - dh_installexamples - dh_installmenu +# dh_installexamples +# dh_installmenu # dh_installemacsen # dh_installpam -# dh_installinit - dh_installcron + dh_installinit +# dh_installcron dh_installman grc.1 grcat.1 - dh_installinfo +# dh_installinfo # dh_undocumented dh_installchangelogs dh_link - dh_strip +# dh_strip dh_compress dh_fixperms # You may want to make some executables suid here. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.12/grc new/grc-1.13/grc --- old/grc-1.12/grc 2021-03-01 10:26:14.000000000 +0100 +++ new/grc-1.13/grc 2021-08-07 17:44:43.000000000 +0200 @@ -6,11 +6,11 @@ def version(): - print ("Generic Colouriser 1.12") + print ("Generic Colouriser 1.13") sys.exit() def help(): - print("""Generic Colouriser 1.12 + print("""Generic Colouriser 1.13 grc [options] command [args] Options: -e --stderr redirect stderr. If this option is selected, @@ -26,7 +26,6 @@ def catch_signal(signum, frame): "catch signal sent to grc and forward it to the original application" global pidp -# print('signal') try: os.kill(pidp, signum) except OSError: # if the subprocess already died diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.12/grc.sh new/grc-1.13/grc.sh --- old/grc-1.12/grc.sh 2021-03-01 10:26:14.000000000 +0100 +++ new/grc-1.13/grc.sh 2021-08-07 17:44:43.000000000 +0200 @@ -1,5 +1,15 @@ +# aliases for grc(1) + +# this will execute only if there is a line with +# GRC_ALIASES=true +# in /etc/default/grc or you export GRC_ALIASES=true prior to sourcing this + +[ -f /etc/default/grc ] && . /etc/default/grc + +[ x$GRC_ALIASES = xtrue ] || return 0 + GRC="$(which grc)" -if [ "$TERM" != dumb ] && [ -n "$GRC" ]; then +if tty -s && [ -n "$TERM" ] && [ "$TERM" != dumb ] && [ -n "$GRC" ]; then alias colourify="$GRC -es" alias blkid='colourify blkid' alias configure='colourify ./configure' @@ -9,7 +19,7 @@ alias docker-compose='colourify docker-compose' alias docker-machine='colourify docker-machine' alias du='colourify du' - alias env='colourify env' +# alias env='colourify env' alias free='colourify free' alias fdisk='colourify fdisk' alias findmnt='colourify findmnt' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.12/grc.zsh new/grc-1.13/grc.zsh --- old/grc-1.12/grc.zsh 2021-03-01 10:26:14.000000000 +0100 +++ new/grc-1.13/grc.zsh 2021-08-07 17:44:43.000000000 +0200 @@ -1,6 +1,6 @@ #!/usr/bin/env zsh -if [ "$TERM" = dumb ] || (( ! $+commands[grc] )) +if ! tty -s || [ ! -n "$TERM" ] || [ "$TERM" = dumb ] || (( ! $+commands[grc] )) then return fi
