From 24efacfbe5618c485fcb75df9ee27aefb08dabfc Mon Sep 17 00:00:00 2001
From: B. Watson
Date: Thu, 8 Feb 2024 16:42:49 -0500
Subject: misc/grc: Minor bugfix from Debian.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 misc/grc/grc.SlackBuild |  9 ++++++++-
 misc/grc/ipaddr.diff    | 11 +++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 misc/grc/ipaddr.diff

(limited to 'misc')

diff --git a/misc/grc/grc.SlackBuild b/misc/grc/grc.SlackBuild
index dd048f8482..8aaf9b6546 100644
--- a/misc/grc/grc.SlackBuild
+++ b/misc/grc/grc.SlackBuild
@@ -24,6 +24,11 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20240208 bkw: BUILD=2
+# - add fix from Debian, for 'ip addr' highlighting. for some reason,
+#   they call this version 1.13.1, though upstream has not released
+#   such a version.
+
 # 20230806 bkw:
 # - take over maintenance.
 # - ARCH=noarch since it's just python.
@@ -36,7 +41,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM="grc"
 VERSION=${VERSION:-1.13}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 ARCH=noarch
@@ -62,6 +67,8 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
+patch -p1 < $CWD/ipaddr.diff
+
 # Hardcoded man path sucks...
 sed -i 's,/share/man,/man,' install.sh
 
diff --git a/misc/grc/ipaddr.diff b/misc/grc/ipaddr.diff
new file mode 100644
index 0000000000..2596c5dd2e
--- /dev/null
+++ b/misc/grc/ipaddr.diff
@@ -0,0 +1,11 @@
+--- grc-1.13/colourfiles/conf.ipaddr	2021-08-07 11:44:43.000000000 -0400
++++ grc-1.13.1/colourfiles/conf.ipaddr	2021-08-22 07:38:08.000000000 -0400
+@@ -3,7 +3,7 @@
+ colours=default,bold yellow,bold magenta
+ =====
+ # broadcast
+-regexp=brd\s([^}s]+)
++regexp=brd\s([^}\s]+)
+ colours=default,dark cyan
+ =====
+ # dynamic
-- 
cgit v1.2.3