From a14462b49dc9f0a3642497c8aea0f9c7a8093b8c6315f47727f53ad47eddf1e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=98=D0=BD=D0=B4=D0=B8=D0=B3?= =?UTF-8?q?=D0=BE?= Date: Sun, 4 Sep 2022 21:13:48 +0000 Subject: [PATCH] Accepting request 1001140 from home:AndreasStieger:branches:network - convert usage of egrep to grep -E (boo#1203092) OBS-URL: https://build.opensuse.org/request/show/1001140 OBS-URL: https://build.opensuse.org/package/show/network/rp-pppoe?expand=0&rev=35 --- pppoe-connect | 4 ++-- pppoe-setup | 8 ++++---- pppoe-start | 4 ++-- pppoe-status | 4 ++-- pppoe-stop | 4 ++-- rp-pppoe.changes | 5 +++++ rp-pppoe.spec | 4 ++-- 7 files changed, 19 insertions(+), 14 deletions(-) diff --git a/pppoe-connect b/pppoe-connect index 9b69eee..240a8ff 100644 --- a/pppoe-connect +++ b/pppoe-connect @@ -43,8 +43,8 @@ get_device() { fi cd $NETWORKDIR - interfaces=$($LS ifcfg-ppp* 2>/dev/null | egrep -v '(~|\.bak)$' | \ - egrep -v '(rpmsave|rpmorig|rpmnew)' | sed 's/^ifcfg-//g') + interfaces=$($LS ifcfg-ppp* 2>/dev/null | grep -E -v '(~|\.bak)$' | \ + grep -E -v '(rpmsave|rpmorig|rpmnew)' | sed 's/^ifcfg-//g') for i in $interfaces ; do test -f ifcfg-$i && . ifcfg-$i 2>/dev/null diff --git a/pppoe-setup b/pppoe-setup index 57e8bd3..b8deb00 100644 --- a/pppoe-setup +++ b/pppoe-setup @@ -46,8 +46,8 @@ get_device() { fi cd $NETWORKDIR - interfaces=$($LS ifcfg-ppp* 2>/dev/null | egrep -v '(~|\.bak)$' | \ - egrep -v '(rpmsave|rpmorig|rpmnew)' | sed 's/^ifcfg-//g') + interfaces=$($LS ifcfg-ppp* 2>/dev/null | grep -E -v '(~|\.bak)$' | \ + grep -E -v '(rpmsave|rpmorig|rpmnew)' | sed 's/^ifcfg-//g') for i in $interfaces ; do test -f ifcfg-$i && . ifcfg-$i 2>/dev/null @@ -466,9 +466,9 @@ else cp /dev/null $CHAPFILE.bak fi -egrep -v "^$USER|^\"$USER\"" $PAPFILE.bak > $PAPFILE +grep -E -v "^$USER|^\"$USER\"" $PAPFILE.bak > $PAPFILE $ECHO "\"$USER\" * \"$PWD1\"" >> $PAPFILE -egrep -v "^$USER|^\"$USER\"" $CHAPFILE.bak > $CHAPFILE +grep -E -v "^$USER|^\"$USER\"" $CHAPFILE.bak > $CHAPFILE $ECHO "\"$USER\" * \"$PWD1\"" >> $CHAPFILE $ECHO "" diff --git a/pppoe-start b/pppoe-start index 35b298a..349e2c6 100644 --- a/pppoe-start +++ b/pppoe-start @@ -40,8 +40,8 @@ get_device() { fi cd $NETWORKDIR - interfaces=$($LS ifcfg-ppp* 2>/dev/null | egrep -v '(~|\.bak)$' | \ - egrep -v '(rpmsave|rpmorig|rpmnew)' | sed 's/^ifcfg-//g') + interfaces=$($LS ifcfg-ppp* 2>/dev/null | grep -E -v '(~|\.bak)$' | \ + grep -E -v '(rpmsave|rpmorig|rpmnew)' | sed 's/^ifcfg-//g') for i in $interfaces ; do test -f ifcfg-$i && . ifcfg-$i 2>/dev/null diff --git a/pppoe-status b/pppoe-status index a55eec9..f401854 100644 --- a/pppoe-status +++ b/pppoe-status @@ -32,8 +32,8 @@ get_device() { fi cd $NETWORKDIR - interfaces=$($LS ifcfg-ppp* 2>/dev/null | egrep -v '(~|\.bak)$' | \ - egrep -v '(rpmsave|rpmorig|rpmnew)' | sed 's/^ifcfg-//g') + interfaces=$($LS ifcfg-ppp* 2>/dev/null | grep -E -v '(~|\.bak)$' | \ + grep -E -v '(rpmsave|rpmorig|rpmnew)' | sed 's/^ifcfg-//g') for i in $interfaces ; do test -f ifcfg-$i && . ifcfg-$i 2>/dev/null diff --git a/pppoe-stop b/pppoe-stop index 4c73a61..6788809 100644 --- a/pppoe-stop +++ b/pppoe-stop @@ -38,8 +38,8 @@ get_device() { fi cd $NETWORKDIR - interfaces=$($LS ifcfg-ppp* 2>/dev/null | egrep -v '(~|\.bak)$' | \ - egrep -v '(rpmsave|rpmorig|rpmnew)' | sed 's/^ifcfg-//g') + interfaces=$($LS ifcfg-ppp* 2>/dev/null | grep -E -v '(~|\.bak)$' | \ + grep -E -v '(rpmsave|rpmorig|rpmnew)' | sed 's/^ifcfg-//g') for i in $interfaces ; do test -f ifcfg-$i && . ifcfg-$i 2>/dev/null diff --git a/rp-pppoe.changes b/rp-pppoe.changes index 40166b3..d720174 100644 --- a/rp-pppoe.changes +++ b/rp-pppoe.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Sep 4 17:53:20 UTC 2022 - Andreas Stieger + +- convert usage of egrep to grep -E (boo#1203092) + ------------------------------------------------------------------- Thu Mar 10 13:47:22 UTC 2022 - Илья Индиго diff --git a/rp-pppoe.spec b/rp-pppoe.spec index a61ae39..66e4126 100644 --- a/rp-pppoe.spec +++ b/rp-pppoe.spec @@ -1,5 +1,5 @@ # -# spec file for package rp-pppoe +# spec file # # Copyright (c) 2022 SUSE LLC # @@ -43,9 +43,9 @@ Patch7: %{name}-3.14-strip.patch BuildRequires: pkgconfig BuildRequires: ppp BuildRequires: pkgconfig(systemd) -Requires: group(%{_group}) Requires: iproute2 Requires: ppp +Requires: group(%{_group}) Requires(post): permissions Requires(pre): group(%{_group})