CVS commit: [pkgsrc-2020Q4] pkgsrc/security/sudo

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Thu Feb  4 15:22:21 UTC 2021

Modified Files:
        pkgsrc/security/sudo [pkgsrc-2020Q4]: Makefile distinfo
        pkgsrc/security/sudo/patches [pkgsrc-2020Q4]: patch-configure

Log Message:
Pullup ticket #6416 - requested by spz
security/sudo: NetBSD build fix

Revisions pulled up:
- security/sudo/Makefile                                        1.183
- security/sudo/distinfo                                        1.114
- security/sudo/patches/patch-configure                         1.5

---
   Module Name: pkgsrc
   Committed By:        spz
   Date:                Sat Jan 30 11:06:45 UTC 2021

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

   Log Message:
   security/sudo: build fix for netbsdelf systems


To generate a diff of this commit:
cvs rdiff -u -r1.180.4.1 -r1.180.4.2 pkgsrc/security/sudo/Makefile
cvs rdiff -u -r1.111.4.1 -r1.111.4.2 pkgsrc/security/sudo/distinfo
cvs rdiff -u -r1.3.4.1 -r1.3.4.2 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.180.4.1 pkgsrc/security/sudo/Makefile:1.180.4.2
--- pkgsrc/security/sudo/Makefile:1.180.4.1     Thu Jan 28 08:09:40 2021
+++ pkgsrc/security/sudo/Makefile       Thu Feb  4 15:22:21 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.180.4.1 2021/01/28 08:09:40 bsiegert Exp $
+# $NetBSD: Makefile,v 1.180.4.2 2021/02/04 15:22:21 bsiegert Exp $
 
 DISTNAME=      sudo-1.9.5p2
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  https://www.sudo.ws/dist/
 MASTER_SITES+= ftp://ftp.sudo.ws/pub/sudo/

Index: pkgsrc/security/sudo/distinfo
diff -u pkgsrc/security/sudo/distinfo:1.111.4.1 pkgsrc/security/sudo/distinfo:1.111.4.2
--- pkgsrc/security/sudo/distinfo:1.111.4.1     Thu Jan 28 08:09:40 2021
+++ pkgsrc/security/sudo/distinfo       Thu Feb  4 15:22:21 2021
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.111.4.1 2021/01/28 08:09:40 bsiegert Exp $
+$NetBSD: distinfo,v 1.111.4.2 2021/02/04 15:22:21 bsiegert Exp $
 
 SHA1 (sudo-1.9.5p2.tar.gz) = 08bde247a1e08bc881eec43e09733f7ca06408f5
 RMD160 (sudo-1.9.5p2.tar.gz) = 5952aafd4e777196eb8af81c4cdc420e3d688684
 SHA512 (sudo-1.9.5p2.tar.gz) = f0fe914963c31a6f8ab6c86847ff6cdd125bd5a839b27f46dcae03963f4fc413b3d4cca54c1979feb825c8479b44c7df0642c07345c941eecf6f9f1e03ea0e27
 Size (sudo-1.9.5p2.tar.gz) = 4012277 bytes
 SHA1 (patch-Makefile.in) = e8813e1aa208d9ef6304038328504a5402341560
-SHA1 (patch-configure) = 4db043c7384cdeb4701ccd2f455dfad2dc17c663
+SHA1 (patch-configure) = 0dd4c9bc64fb0ecaf496874eb8d0b649330db1f2
 SHA1 (patch-examples_Makefile.in) = a20967ecd88eb5e4a8b47e6a3b80bc18be713409
 SHA1 (patch-logsrvd_Makefile.in) = c460b868e09560a80f632d1332fc7d7c3d1822cf
 SHA1 (patch-plugins_sudoers_Makefile.in) = efc0fb726c23dcb2d6a006524fd561800d6d7924

Index: pkgsrc/security/sudo/patches/patch-configure
diff -u pkgsrc/security/sudo/patches/patch-configure:1.3.4.1 pkgsrc/security/sudo/patches/patch-configure:1.3.4.2
--- pkgsrc/security/sudo/patches/patch-configure:1.3.4.1        Thu Jan 28 08:09:40 2021
+++ pkgsrc/security/sudo/patches/patch-configure        Thu Feb  4 15:22:21 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.3.4.1 2021/01/28 08:09:40 bsiegert Exp $
+$NetBSD: patch-configure,v 1.3.4.2 2021/02/04 15:22:21 bsiegert Exp $
 
 * Add "--with-nbsdops" option, NetBSD standard options.
 * Link with util(3) in the case of DragonFly, too.
@@ -7,8 +7,8 @@ $NetBSD: patch-configure,v 1.3.4.1 2021/
   functions (HAVE_KRB5_*).
 * Remove setting sysconfdir to "/etc".
 
---- configure.orig     2021-01-09 20:12:16.000000000 +0000
-+++ configure
+--- configure.orig     2021-01-23 16:45:11.000000000 +0100
++++ configure  2021-01-30 12:31:20.802349535 +0100
 @@ -892,6 +892,7 @@ with_libpath
  with_libraries
  with_efence
@@ -30,7 +30,7 @@ $NetBSD: patch-configure,v 1.3.4.1 2021/
    --with-libraries        additional libraries to link with
    --with-efence           link with -lefence for malloc() debugging
    --with-csops            add CSOps standard options
-+  --with-nbsdops          add NetBSD standard opt ions
++  --with-nbsdops          add NetBSD standard options
    --without-passwd        don't use passwd/shadow file for authentication
    --with-skey[=DIR]       enable S/Key support
    --with-opie[=DIR]       enable OPIE support
@@ -72,7 +72,7 @@ $NetBSD: patch-configure,v 1.3.4.1 2021/
   LOGINCAP_USAGE='[-c class] '; LCMAN=1
        case "$OS" in
 -          freebsd|netbsd)
-+          dragonfly*|freebsd|netbsd)
++          dragonfly*|freebsd|netbsd*)
                SUDO_LIBS="${SUDO_LIBS} -lutil"
                SUDOERS_LIBS="${SUDOERS_LIBS} -lutil"
                ;;
@@ -122,6 +122,15 @@ $NetBSD: patch-configure,v 1.3.4.1 2021/
      _LIBS="$LIBS"
      LIBS="${LIBS} ${SUDOERS_LIBS}"
      for ac_func in krb5_verify_user krb5_init_secure_context
+@@ -27120,7 +27139,7 @@ fi
+ fi
+ 
+ case "$OS" in
+-    netbsd)
++    netbsd*)
+       ;;
+     *)
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,--enable-new-dtags" >&5
 @@ -28297,7 +28316,6 @@ test "$docdir" = '${datarootdir}/doc/${P
  test "$localedir" = '${datarootdir}/locale' && localedir='$(datarootdir)/locale'
  test "$localstatedir" = '${prefix}/var' && localstatedir='$(prefix)/var'