sudo: fix unportable test(1) operators

4 files changed, 48 insertions, 6 deletions

diff --git a/security/sudo/distinfo b/security/sudo/distinfo
index 02c97641988..a6796f1dac3 100644
--- a/security/sudo/distinfo
+++ b/security/sudo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.120 2022/05/14 05:41:00 adam Exp $
+$NetBSD: distinfo,v 1.121 2022/06/03 07:58:34 wiz Exp $
 
 BLAKE2s (sudo-1.9.10.tar.gz) = ebb57832c11e2ebc608ba5f293c1df59228e0bca2ddc2b79ffdb46ae19dc5426
 SHA512 (sudo-1.9.10.tar.gz) = 65cf92b67b64413cb807da8b9602fc90b75e5b30dd1402d682ca36f276a3d6209a8a59c14e463898abc9856bc56263e5ba4bb6d44774f56a2885a9eea4a35375
@@ -6,6 +6,8 @@ Size (sudo-1.9.10.tar.gz) = 4516568 bytes
 SHA1 (patch-Makefile.in) = 1a83c55d27829013e2e23073046c5c39b020fafe
 SHA1 (patch-configure) = f8ca2d1902ff5878a219ec754cf5e608e00c5ef3
 SHA1 (patch-examples_Makefile.in) = a20967ecd88eb5e4a8b47e6a3b80bc18be713409
+SHA1 (patch-lib_logsrv_Makefile.in) = 301c317c806edeee8ce7b44a5431cd38defb3a54
+SHA1 (patch-lib_protobuf-c_Makefile.in) = 122e432fb0da36b998778a1b71130f0c3785f575
 SHA1 (patch-logsrvd_Makefile.in) = b3672406368384dfbfe7ef3e6fcd141d43cbc026
 SHA1 (patch-plugins_sudoers_Makefile.in) = d2981bb9841f6bb4b1c80f5c2f2727fbf9579501
-SHA1 (patch-src_Makefile.in) = 8959049bc428f592f84de1cad1a898c07c6e6b39
+SHA1 (patch-src_Makefile.in) = 0642684c2d4b3a89259f7d27908f5ec8070969ec
diff --git a/security/sudo/patches/patch-lib_logsrv_Makefile.in b/security/sudo/patches/patch-lib_logsrv_Makefile.in
new file mode 100644
index 00000000000..ebd48502ec2
--- /dev/null
+++ b/security/sudo/patches/patch-lib_logsrv_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_logsrv_Makefile.in,v 1.1 2022/06/03 07:58:34 wiz Exp $
+
+* fix unportable test(1) operator
+
+--- lib/logsrv/Makefile.in.orig	2022-03-03 18:29:40.000000000 +0000
++++ lib/logsrv/Makefile.in
+@@ -116,7 +116,7 @@ $(devdir)/log_server.pb-c.c: $(srcdir)/l
+ 	    echo "$$cmd"; eval $$cmd; \
+ 	    cmd='$(scriptdir)/unanon $(devdir)/log_server.pb-c.h $(devdir)/log_server.pb-c.c'; \
+ 	    echo "$$cmd"; eval $$cmd; \
+-	    if [ "$(devdir)" == "$(srcdir)" ]; then \
++	    if [ "$(devdir)" = "$(srcdir)" ]; then \
+ 		cmd='mv -f $(devdir)/log_server.pb-c.h $(incdir)/log_server.pb-c.h'; \
+ 	    else \
+ 		cmd='mv -f $(devdir)/log_server.pb-c.h $(top_builddir)/log_server.pb-c.h'; \
diff --git a/security/sudo/patches/patch-lib_protobuf-c_Makefile.in b/security/sudo/patches/patch-lib_protobuf-c_Makefile.in
new file mode 100644
index 00000000000..6c5ede3c3e9
--- /dev/null
+++ b/security/sudo/patches/patch-lib_protobuf-c_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_protobuf-c_Makefile.in,v 1.1 2022/06/03 07:58:34 wiz Exp $
+
+* fix unportable test(1) operator
+
+--- lib/protobuf-c/Makefile.in.orig	2022-03-03 18:29:40.000000000 +0000
++++ lib/protobuf-c/Makefile.in
+@@ -111,7 +111,7 @@ $(devdir)/log_server.pb-c.c: $(srcdir)/l
+ 	    echo "$$cmd"; eval $$cmd; \
+ 	    cmd='$(scriptdir)/unanon $(devdir)/log_server.pb-c.h $(devdir)/log_server.pb-c.c'; \
+ 	    echo "$$cmd"; eval $$cmd; \
+-	    if [ "$(devdir)" == "$(srcdir)" ]; then \
++	    if [ "$(devdir)" = "$(srcdir)" ]; then \
+ 		cmd='mv -f $(devdir)/log_server.pb-c.h $(incdir)/log_server.pb-c.h'; \
+ 	    else \
+ 		cmd='mv -f $(devdir)/log_server.pb-c.h $(top_builddir)/log_server.pb-c.h'; \
diff --git a/security/sudo/patches/patch-src_Makefile.in b/security/sudo/patches/patch-src_Makefile.in
index 9cad3fef3d2..34b19519d25 100644
--- a/security/sudo/patches/patch-src_Makefile.in
+++ b/security/sudo/patches/patch-src_Makefile.in
@@ -1,10 +1,20 @@
-$NetBSD: patch-src_Makefile.in,v 1.4 2019/12/28 20:43:56 kim Exp $
+$NetBSD: patch-src_Makefile.in,v 1.5 2022/06/03 07:58:34 wiz Exp $
 
+* fix unportable test(1) operator
 * install the suid sudo without write-bits
 
---- src/Makefile.in.orig	2019-12-10 15:11:46.000000000 +0200
-+++ src/Makefile.in	2019-12-28 21:51:27.794734242 +0200
-@@ -219,7 +219,7 @@
+--- src/Makefile.in.orig	2022-03-03 18:29:40.000000000 +0000
++++ src/Makefile.in
+@@ -200,7 +200,7 @@ $(devdir)/intercept.pb-c.c: $(srcdir)/in
+ 	    echo "$$cmd"; eval $$cmd; \
+ 	    cmd='$(scriptdir)/unanon $(devdir)/intercept.pb-c.h $(devdir)/intercept.pb-c.c'; \
+ 	    echo "$$cmd"; eval $$cmd; \
+-	    if [ "$(devdir)" == "$(srcdir)" ]; then \
++	    if [ "$(devdir)" = "$(srcdir)" ]; then \
+ 		cmd='mv -f $(devdir)/intercept.pb-c.h $(incdir)/intercept.pb-c.h'; \
+ 	    else \
+ 		cmd='mv -f $(devdir)/intercept.pb-c.h $(top_builddir)/intercept.pb-c.h'; \
+@@ -267,7 +267,7 @@ install-rc: install-dirs
  	fi
  
  install-binaries: install-dirs $(PROGS)