Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yast2-printer for openSUSE:Factory checked in at 2022-09-10 20:17:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-printer (Old) and /work/SRC/openSUSE:Factory/.yast2-printer.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-printer" Sat Sep 10 20:17:08 2022 rev:153 rq:1002294 version:4.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-printer/yast2-printer.changes 2022-07-21 11:32:46.598916222 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-printer.new.2083/yast2-printer.changes 2022-09-10 20:17:13.960819921 +0200 @@ -1,0 +2,7 @@ +Fri Sep 9 08:24:35 UTC 2022 - Michal Filka <[email protected]> + +- bsc#1203227 + - Replaced egrep with grep -E. +- 4.5.2 + +------------------------------------------------------------------- Old: ---- yast2-printer-4.5.1.tar.bz2 New: ---- yast2-printer-4.5.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-printer.spec ++++++ --- /var/tmp/diff_new_pack.EikPst/_old 2022-09-10 20:17:14.488821279 +0200 +++ /var/tmp/diff_new_pack.EikPst/_new 2022-09-10 20:17:14.492821289 +0200 @@ -17,7 +17,7 @@ Name: yast2-printer -Version: 4.5.1 +Version: 4.5.2 Release: 0 Summary: YaST2 - Printer Configuration License: GPL-2.0-only ++++++ yast2-printer-4.5.1.tar.bz2 -> yast2-printer-4.5.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-4.5.1/package/yast2-printer.changes new/yast2-printer-4.5.2/package/yast2-printer.changes --- old/yast2-printer-4.5.1/package/yast2-printer.changes 2022-07-19 14:30:43.000000000 +0200 +++ new/yast2-printer-4.5.2/package/yast2-printer.changes 2022-09-09 13:21:11.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Sep 9 08:24:35 UTC 2022 - Michal Filka <[email protected]> + +- bsc#1203227 + - Replaced egrep with grep -E. +- 4.5.2 + +------------------------------------------------------------------- Tue Jul 19 11:03:57 UTC 2022 - Ladislav Slez??k <[email protected]> - Removed the libX11 dependency (bsc#1201641) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-4.5.1/package/yast2-printer.spec new/yast2-printer-4.5.2/package/yast2-printer.spec --- old/yast2-printer-4.5.1/package/yast2-printer.spec 2022-07-19 14:30:43.000000000 +0200 +++ new/yast2-printer-4.5.2/package/yast2-printer.spec 2022-09-09 13:21:11.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-printer -Version: 4.5.1 +Version: 4.5.2 Release: 0 Summary: YaST2 - Printer Configuration License: GPL-2.0-only diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-4.5.1/src/include/printer/connectionwizard.rb new/yast2-printer-4.5.2/src/include/printer/connectionwizard.rb --- old/yast2-printer-4.5.1/src/include/printer/connectionwizard.rb 2022-07-19 14:30:43.000000000 +0200 +++ new/yast2-printer-4.5.2/src/include/printer/connectionwizard.rb 2022-09-09 13:21:11.000000000 +0200 @@ -299,7 +299,7 @@ ) # Let the whole pipe fail if any of its commands fail (requires bash): grepcommand = "set -o pipefail" - grepcommand += " ; egrep '^DeviceURI '" + scheme.shellescape + grepcommand += " ; grep -E '^DeviceURI '" + scheme.shellescape if "lpd" == scheme # to describe who requested a print job in the form lpd://username@ip-address-or-hostname/... # (i.e. grep only for "username@" instead of the usual "username:password@"): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-4.5.1/src/include/printer/overview.rb new/yast2-printer-4.5.2/src/include/printer/overview.rb --- old/yast2-printer-4.5.1/src/include/printer/overview.rb 2022-07-19 14:30:43.000000000 +0200 +++ new/yast2-printer-4.5.2/src/include/printer/overview.rb 2022-09-09 13:21:11.000000000 +0200 @@ -716,7 +716,7 @@ if Printerlib.ExecuteBashCommand( "/usr/bin/lpstat -h localhost" + " -o " + queue_name.shellescape + - " | egrep -q '^'" + queue_name.shellescape + "'-[0-9]+'" + " | grep -E -q '^'" + queue_name.shellescape + "'-[0-9]+'" ) pending_job_info = _( "There are pending print jobs which might be deleted before the testpage is printed." @@ -855,7 +855,7 @@ if Printerlib.ExecuteBashCommand( "/usr/bin/lpstat -h localhost" + " -o " + queue_name.shellescape + - " | egrep -q '^'" + queue_name.shellescape + "'-[0-9]+'" + " | grep -E -q '^'" + queue_name.shellescape + "'-[0-9]+'" ) pending_job_info = _( "There are pending print jobs which might be deleted now." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-4.5.1/src/modules/Printer.rb new/yast2-printer-4.5.2/src/modules/Printer.rb --- old/yast2-printer-4.5.1/src/modules/Printer.rb 2022-07-19 14:30:43.000000000 +0200 +++ new/yast2-printer-4.5.2/src/modules/Printer.rb 2022-09-09 13:21:11.000000000 +0200 @@ -845,9 +845,9 @@ # It is crucial to take whatever (trailing) character in the model series into account # to be on the safe side to distinguish different models # (e.g. "HP LaserJet 4" versus "HP LaserJet 4/4M" or "Kyocera FS-1000" versus "Kyocera FS-1000+"). - # For example as egrep regular expression: + # For example as grep -E regular expression: # lpinfo -m | cut -d' ' -f2- - # | egrep -o '^[[:alpha:]]+[[:space:]]+([[:alpha:]-]+[[:space:]]+){0,2}[[:alpha:]-]*[[:digit:]][^[:space:]]*' + # | grep -E -o '^[[:alpha:]]+[[:space:]]+([[:alpha:]-]+[[:space:]]+){0,2}[[:alpha:]-]*[[:digit:]][^[:space:]]*' # Of course this best-guess is not 100% correct because it would result for example # that "ACME FunPrinter 1000" and "ACME FunPrinter 1000 XL" # are considered to be the same model "ACME FunPrinter 1000" @@ -1715,9 +1715,9 @@ # It is crucial to take whatever (trailing) character in the model series into account # to be on the safe side to distinguish different models # (e.g. "HP LaserJet 4" versus "HP LaserJet 4/4M" or "Kyocera FS-1000" versus "Kyocera FS-1000+"). - # For example as egrep regular expression: + # For example as grep -E regular expression: # lpinfo -m | cut -d' ' -f2- - # | egrep -o '^[[:alpha:]]+[[:space:]]+([[:alpha:]-]+[[:space:]]+){0,2}[[:alpha:]-]*[[:digit:]][^[:space:]]*' + # | grep -E -o '^[[:alpha:]]+[[:space:]]+([[:alpha:]-]+[[:space:]]+){0,2}[[:alpha:]-]*[[:digit:]][^[:space:]]*' # Of course this best-guess is not 100% correct because it would result for example # that "ACME FunPrinter 1000" and "ACME FunPrinter 1000 XL" are considered to be the same model # but "ACME FunPrinter 1000XL" and "ACME FunPrinter 1000 XL" are considered to be different models. @@ -1729,7 +1729,7 @@ # when the driver_items list is short so that the user can easily survey the whole list. # For example the PPDs in openSUSE 10.2 # lpinfo -m | cut -d' ' -f2- - # | egrep -o '^[[:alpha:]]+[[:space:]]+([[:alpha:]-]+[[:space:]]+){0,2}[[:alpha:]-]*[[:digit:]][^[:space:]]*' + # | grep -E -o '^[[:alpha:]]+[[:space:]]+([[:alpha:]-]+[[:space:]]+){0,2}[[:alpha:]-]*[[:digit:]][^[:space:]]*' # | sort -f | uniq -i -c | sort -n # results that the maximum lenght of the driver_items list for the same model is 13 # (in openSUSE 10.2 the 13 entries are for the "Kyocera FS-600"). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-4.5.1/src/modules/Printerlib.rb new/yast2-printer-4.5.2/src/modules/Printerlib.rb --- old/yast2-printer-4.5.1/src/modules/Printerlib.rb 2022-07-19 14:30:43.000000000 +0200 +++ new/yast2-printer-4.5.2/src/modules/Printerlib.rb 2022-09-09 13:21:11.000000000 +0200 @@ -670,15 +670,15 @@ end # Determine if any kind of firewall seems to be active by calling - # "iptables -n -L | egrep -q 'DROP|REJECT'" + # "iptables -n -L | grep -E -q 'DROP|REJECT'" # to find out if there are currently dropping or rejecting packet filter rules. # One might use a more specific test via - # "iptables -n -L | grep -v '^LOG' | egrep -q '^DROP|^REJECT'" + # "iptables -n -L | grep -v '^LOG' | grep -E -q '^DROP|^REJECT'" # to match only for DROP and REJECT targets and exclude LOG targets # but it does not cause real problems when there is a false positive result here # because all what happens it that then a needless firewall info popup would be shown. def FirewallSeemsToBeActive - if ExecuteBashCommand("iptables -n -L | egrep -q 'DROP|REJECT'") + if ExecuteBashCommand("iptables -n -L | grep -E -q 'DROP|REJECT'") Builtins.y2milestone("A firewall seems to be active.") return true end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-4.5.1/tools/autodetect_printers new/yast2-printer-4.5.2/tools/autodetect_printers --- old/yast2-printer-4.5.1/tools/autodetect_printers 2022-07-19 14:30:43.000000000 +0200 +++ new/yast2-printer-4.5.2/tools/autodetect_printers 2022-09-09 13:21:11.000000000 +0200 @@ -77,7 +77,7 @@ # Process the data: echo 'Got the raw data.' >>$PROGRESS # Extract what is needed, quotation marks " are replaced by ' : -tr '"' "'" <$TMP_DATA_RAW | egrep '^Device:|uri =|make-and-model =|device-id =|info =|class =' >$TMP_DATA +tr '"' "'" <$TMP_DATA_RAW | grep -E '^Device:|uri =|make-and-model =|device-id =|info =|class =' >$TMP_DATA # Have "^Device:" on a seperated "Device" line and convert " = " to a single space: sed -i -e 's/^Device:/Device\n/' \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-4.5.1/tools/create_printer_ppd_database new/yast2-printer-4.5.2/tools/create_printer_ppd_database --- old/yast2-printer-4.5.1/tools/create_printer_ppd_database 2022-07-19 14:30:43.000000000 +0200 +++ new/yast2-printer-4.5.2/tools/create_printer_ppd_database 2022-09-09 13:21:11.000000000 +0200 @@ -84,7 +84,7 @@ # Process the data: echo 'Got the raw data.' >>$PROGRESS # Extract what is needed, quotation marks " are replaced by ' : -tr '"' "'" <$TMP_DATA_RAW | egrep '^Model:|name =|make-and-model =|device-id =|natural_language =' >$TMP_DATA +tr '"' "'" <$TMP_DATA_RAW | grep -E '^Model:|name =|make-and-model =|device-id =|natural_language =' >$TMP_DATA # Have "^Model:" on a seperated "Model" line and convert " = " to a single space: sed -i -e 's/^Model:/Model\n/' \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-4.5.1/tools/modify_cupsd_conf new/yast2-printer-4.5.2/tools/modify_cupsd_conf --- old/yast2-printer-4.5.1/tools/modify_cupsd_conf 2022-07-19 14:30:43.000000000 +0200 +++ new/yast2-printer-4.5.2/tools/modify_cupsd_conf 2022-09-09 13:21:11.000000000 +0200 @@ -336,7 +336,7 @@ # see https://bugs.linuxfoundation.org/show_bug.cgi?id=1204 # and https://bugs.linuxfoundation.org/show_bug.cgi?id=1205 for V in $VALUE - do if ! echo "$V" | egrep -q '^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' + do if ! echo "$V" | grep -E -q '^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' then echo "For cups-browsed a BrowseAllow value must be either an IPv4 host address (e.g. 192.168.1.12)" 1>&2 echo "or an IPv4 network address plus netmask (e.g. 192.168.1.0/255.255.255.0 or 192.168.1.0/24)." 1>&2 exit 6 @@ -672,7 +672,7 @@ # in the root location are found if there is more than one which is allowed. # Remove leading spaces (to cut the right part). # Remove trailing spaces (needed for the test below). - RESULT="$( sed -n -e '/[[:space:]]*<[[:space:]]*Location[[:space:]]*\/[[:space:]]*>/,/[[:space:]]*<[[:space:]]*\/[[:space:]]*Location[[:space:]]*>/p' $CUPSDCONF | grep -i "^[[:space:]]*$KEY[[:space:]]" | egrep -v '127.0.0.2' | sed -e 's/from//I' | tr -s '[:blank:]' ' ' | sed -e 's/^ *//' | cut -s -d ' ' -f2 | tr -s '\n' ' ' | sed -e 's/ *$//' )" + RESULT="$( sed -n -e '/[[:space:]]*<[[:space:]]*Location[[:space:]]*\/[[:space:]]*>/,/[[:space:]]*<[[:space:]]*\/[[:space:]]*Location[[:space:]]*>/p' $CUPSDCONF | grep -i "^[[:space:]]*$KEY[[:space:]]" | grep -E -v '127.0.0.2' | sed -e 's/from//I' | tr -s '[:blank:]' ' ' | sed -e 's/^ *//' | cut -s -d ' ' -f2 | tr -s '\n' ' ' | sed -e 's/ *$//' )" echo -n "$RESULT" # For a nicer output on a terminal where stdout and stderr is mixed up, # output a '\n' on stderr to get subsequent stuff (e.g. the shell prompt
