aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Watson <urchlay@slackware.uk>2024-02-08 16:42:49 -0500
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2024-02-10 16:17:26 +0700
commit24efacfbe5618c485fcb75df9ee27aefb08dabfc (patch)
treee65e01e7b641fb8dc674b10e662b07eba3ccd53f
parent5f132e8d5d343c34c05e5933df5f5e7e8647fb1c (diff)
misc/grc: Minor bugfix from Debian.
Signed-off-by: B. Watson <urchlay@slackware.uk> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--misc/grc/grc.SlackBuild9
-rw-r--r--misc/grc/ipaddr.diff11
2 files changed, 19 insertions, 1 deletions
diff --git a/misc/grc/grc.SlackBuild b/misc/grc/grc.SlackBuild
index dd048f848260e..8aaf9b6546cc3 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 0000000000000..2596c5dd2e4aa
--- /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