CVS commit: pkgsrc/security/sudo

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Mar  3 21:51:40 UTC 2025

Modified Files:
        pkgsrc/security/sudo: Makefile distinfo
        pkgsrc/security/sudo/patches: patch-configure

Log Message:
sudo: Build fixes for SunOS and OpenBSD.

Found via drecklypkg CI.


To generate a diff of this commit:
cvs rdiff -u -r1.205 -r1.206 pkgsrc/security/sudo/Makefile
cvs rdiff -u -r1.136 -r1.137 pkgsrc/security/sudo/distinfo
cvs rdiff -u -r1.11 -r1.12 pkgsrc/security/sudo/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/sudo/Makefile
diff -u pkgsrc/security/sudo/Makefile:1.205 pkgsrc/security/sudo/Makefile:1.206
--- pkgsrc/security/sudo/Makefile:1.205 Mon Jan 13 19:56:51 2025
+++ pkgsrc/security/sudo/Makefile       Mon Mar  3 21:51:40 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.205 2025/01/13 19:56:51 vins Exp $
+# $NetBSD: Makefile,v 1.206 2025/03/03 21:51:40 nia Exp $
 
 DISTNAME=      sudo-1.9.16p2
 CATEGORIES=    security
@@ -32,6 +32,8 @@ CONFIGURE_ENV+=               mansectsu=8
 CONFIGURE_ENV+=                mansectform=5
 TEST_TARGET=           check
 
+LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/sudo
+
 # Append ${PREFIX} directories to the default secure_path
 SUDO_SECURE_PATH_DIRS= /usr/local/sbin
 SUDO_SECURE_PATH_DIRS+=        /usr/local/bin

Index: pkgsrc/security/sudo/distinfo
diff -u pkgsrc/security/sudo/distinfo:1.136 pkgsrc/security/sudo/distinfo:1.137
--- pkgsrc/security/sudo/distinfo:1.136 Mon Jan 13 19:56:51 2025
+++ pkgsrc/security/sudo/distinfo       Mon Mar  3 21:51:40 2025
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.136 2025/01/13 19:56:51 vins Exp $
+$NetBSD: distinfo,v 1.137 2025/03/03 21:51:40 nia Exp $
 
 BLAKE2s (sudo-1.9.16p2.tar.gz) = 6e772f5372473d112e122f125cdf7da8db636de3c8c973f18232942fd98a51b1
 SHA512 (sudo-1.9.16p2.tar.gz) = 1e2ea762671890a03b0ea4b95b3849f2d3a4c301432db8767433e9d80c517efd8b7a68e0bbce1b178aff5857907600f1f5e0d889779cb27e38c2f602395f6f06
 Size (sudo-1.9.16p2.tar.gz) = 5398419 bytes
 SHA1 (patch-Makefile.in) = 1a83c55d27829013e2e23073046c5c39b020fafe
-SHA1 (patch-configure) = 824095fe7be5f8503434581a07e947c94552b0f7
+SHA1 (patch-configure) = 1e8eff2a823b0f687ef563a5050f43fb4bb9d72c
 SHA1 (patch-examples_Makefile.in) = a20967ecd88eb5e4a8b47e6a3b80bc18be713409
 SHA1 (patch-lib_logsrv_Makefile.in) = 301c317c806edeee8ce7b44a5431cd38defb3a54
 SHA1 (patch-lib_protobuf-c_Makefile.in) = 122e432fb0da36b998778a1b71130f0c3785f575

Index: pkgsrc/security/sudo/patches/patch-configure
diff -u pkgsrc/security/sudo/patches/patch-configure:1.11 pkgsrc/security/sudo/patches/patch-configure:1.12
--- pkgsrc/security/sudo/patches/patch-configure:1.11   Sun Aug 13 14:14:37 2023
+++ pkgsrc/security/sudo/patches/patch-configure        Mon Mar  3 21:51:40 2025
@@ -1,14 +1,15 @@
-$NetBSD: patch-configure,v 1.11 2023/08/13 14:14:37 taca Exp $
+$NetBSD: patch-configure,v 1.12 2025/03/03 21:51:40 nia Exp $
 
 * Add "--with-nbsdops" option, NetBSD standard options.
 * When specified "--with-kerb5" option, test existence of several functions
   even if there is krb5-config.  krb5-config dosen't give all definitions for
   functions (HAVE_KRB5_*).
 * Remove setting sysconfdir to "/etc".
+* Do not create links to localedir on SunOS.
 
---- configure.orig     2023-07-24 20:25:13.000000000 +0000
+--- configure.orig     2024-11-25 15:34:25.000000000 +0000
 +++ configure
-@@ -937,6 +937,7 @@ with_incpath
+@@ -942,6 +942,7 @@ with_incpath
  with_libpath
  with_libraries
  with_csops
@@ -16,7 +17,7 @@ $NetBSD: patch-configure,v 1.11 2023/08/
  with_passwd
  with_skey
  with_opie
-@@ -1676,7 +1677,7 @@ Fine tuning of the installation director
+@@ -1682,7 +1683,7 @@ Fine tuning of the installation director
    --bindir=DIR            user executables [EPREFIX/bin]
    --sbindir=DIR           system admin executables [EPREFIX/sbin]
    --libexecdir=DIR        program executables [EPREFIX/libexec]
@@ -25,7 +26,7 @@ $NetBSD: patch-configure,v 1.11 2023/08/
    --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
    --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
    --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
-@@ -1808,6 +1809,7 @@ Optional Packages:
+@@ -1812,6 +1813,7 @@ Optional Packages:
    --with-libpath          additional places to look for libraries
    --with-libraries        additional libraries to link with
    --with-csops            add CSOps standard options
@@ -33,7 +34,7 @@ $NetBSD: patch-configure,v 1.11 2023/08/
    --without-passwd        don't use passwd/shadow file for authentication
    --with-skey[=DIR]       enable S/Key support
    --with-opie[=DIR]       enable OPIE support
-@@ -5329,6 +5331,23 @@ fi
+@@ -5321,6 +5323,23 @@ fi
  
  
  
@@ -57,7 +58,7 @@ $NetBSD: patch-configure,v 1.11 2023/08/
  # Check whether --with-passwd was given.
  if test ${with_passwd+y}
  then :
-@@ -18263,7 +18282,7 @@ fi
+@@ -18312,7 +18331,7 @@ fi
                : ${mansectform='4'}
                : ${mansectmisc='5'}
                ;;
@@ -66,7 +67,18 @@ $NetBSD: patch-configure,v 1.11 2023/08/
                shadow_funcs="getspnam"
                test -z "$with_pam" && AUTH_EXCL_DEF="PAM"
                # Check for SECCOMP_MODE_FILTER in linux/seccomp.h
-@@ -29669,6 +29688,8 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -28316,10 +28335,6 @@ fi
+ 
+       if test "$sudo_cv_gettext" = "yes"; then
+           SUDO_NLS=enabled
+-          # For Solaris we need links from lang to lang.UTF-8 in localedir
+-          case "$host_os" in
+-              solaris2*) LOCALEDIR_SUFFIX=".UTF-8";;
+-          esac
+       elif test "$sudo_cv_gettext_lintl" = "yes"; then
+           SUDO_NLS=enabled
+           LIBINTL="-lintl"
+@@ -30049,6 +30064,8 @@ rm -f core conftest.err conftest.$ac_obj
       ;;
  esac
  fi
@@ -75,7 +87,7 @@ $NetBSD: patch-configure,v 1.11 2023/08/
      _LIBS="$LIBS"
      LIBS="${LIBS} ${SUDOERS_LIBS}"
      ac_fn_c_check_func "$LINENO" "krb5_verify_user" "ac_cv_func_krb5_verify_user"
-@@ -35634,7 +35655,6 @@ test X"$localedir" = X'${datarootdir}/lo
+@@ -36021,7 +36038,6 @@ test X"$localedir" = X'${datarootdir}/lo
  test X"$localstatedir" = X'${prefix}/var' && localstatedir='$(prefix)/var'
  test X"$runstatedir" = X'${localstatedir}/run' && runstatedir='$(localstatedir)/run'
  test X"$adminconfdir" = X'${prefix}/etc' && adminconfdir='$(prefix)/etc'