Mon Feb 20 13:36:42 2023 UTC ()
security/sudo: update to 1.9.13p1

pkgsrc change: avoid use empty in options.mk.

What's new in Sudo 1.9.13 (2023-02-14)

 * Fixed a bug running relative commands via sudo when "log_subcmds"
   is enabled.  GitHub issue #194.
 * Fixed a signal handling bug when running sudo commands in a shell
   script.  Signals were not being forwarded to the command when
   the sudo process was not run in its own process group.
 * Fixed a bug in cvtsudoers' LDIF parsing when the file ends without
   a newline and a backslash is the last character of the file.
 * Fixed a potential use-after-free bug with cvtsudoers filtering.
   GitHub issue #198.
 * Added a reminder to the default lecture that the password will
   not echo. This line is only displayed when the pwfeedback option
   is disabled. GitHub issue #195.
 * Fixed potential memory leaks in error paths.  GitHub issues #199,
   #202.
 * Fixed potential NULL dereferences on memory allocation failure.
   GitHub issues #204, #211.
 * Sudo now uses C23-style attributes in function prototypes instead
   of gcc-style attributes if supported.
 * Added a new "list" pseudo-command in sudoers to allow a user to
   list another user's privileges.  Previously, only root or a user
   with the ability to run any command as either root or the target
   user on the current host could use the -U option.  This also
   includes a fix to the log entry when a user lacks permission to
   run "sudo -U otheruser -l command".  Previously, the logs would
   indicate that the user tried to run the actual command, now the
   log entry includes the list operation.
 * JSON logging now escapes control characters if they happen to
   appear in the command or environment.
 * New Albanian translation from translationproject.org.
 * Regular expressions in sudoers or logsrvd.conf may no longer
   contain consecutive repetition operators.  This is implementation-
   specific behavior according to POSIX, but some implementations
   will allocate excessive amounts of memory.  This mainly affects
   the fuzzers.
 * Sudo now builds AIX-style shared libraries and dynamic shared
   objects by default instead of svr4-style. This means that the
   default sudo plugins are now .a (archive) files that contain a
   .so shared object file instead of bare .so files.  This was done
   to improve compatibility with the AIX Freeware ecosystem,
   specifically, the AIX Freeware build of OpenSSL.  Sudo will still
   load svr4-style .so plugins and if a .so file is requested,
   either via sudo.conf or the sudoers file, and only the .a file
   is present, sudo will convert the path from plugin.so to
   plugin.a(plugin.so) when loading it.  This ensures compatibility
   with existing configurations.  To restore the old, pre-1.9.13
   behavior, run configure using the --with-aix-soname=svr4 option.
 * Sudo no longer checks the ownership and mode of the plugins that
   it loads.  Plugins are configured via either the sudo.conf or
   sudoers file which are trusted configuration files.  These checks
   suffered from time-of-check vs. time-of-use race conditions and
   complicate loading plugins that are not simple paths.  Ownership
   and mode checks are still performed when loading the sudo.conf
   and sudoers files, which do not suffer from race conditions.
   The sudo.conf "developer_mode" setting is no longer used.
 * Control characters in sudo log messages and "sudoreplay -l"
   output are now escaped in octal format.  Space characters in the
   command path are also escaped.  Command line arguments that
   contain spaces are surrounded by single quotes and any literal
   single quote or backslash characters are escaped with a backslash.
   This makes it possible to distinguish multiple command line
   arguments from a single argument that contains spaces.
 * Improved support for DragonFly BSD which uses a different struct
   procinfo than either FreeBSD or 4.4BSD.
 * Fixed a compilation error on Linux arm systems running older
   kernels that may not define EM_ARM in linux/elf-em.h.
   GitHub issue #232.
 * Fixed a compilation error when LDFLAGS contains -Wl,--no-undefined.
   Sudo will now link using -Wl,--no-undefined by default if possible.
   GitHub issue #234.
 * Fixed a bug executing a command with a very long argument vector
   when "log_subcmds" or "intercept" is enabled on a system where
   "intercept_type" is set to "trace".  GitHub issue #194.
 * When sudo is configured to run a command in a pseudo-terminal
   but the standard input is not connected to a terminal, the command
   will now be run as a background process.  This works around a
   problem running sudo commands in the background from a shell
   script where changing the terminal to raw mode could interfere
   with the interactive shell that ran the script.
   GitHub issue #237.
 * A missing include file in sudoers is no longer a fatal error
   unless the error_recovery plugin argument has been set to false.

What's new in Sudo 1.9.13p1 (2023-02-17)

 * Fixed a typo in the configure script that resulted in a line
   like "]: command not found" in the output.  GitHub issue #238.
 * Corrected the order of the C23 [[noreturn]] attribute in function
   prototypes.  This fixes a build error with GCC 13.  GitHub issue
   #239.
 * The "check" make target misbehaved when there was more than
   one version of the UTF-8 C locale in the output of "locale -a".
   GitHub issue #241.
 * Removed a dependency on the AC_SYS_YEAR2038 macro in configure.ac.
   This was added in autoconf 2.72 but sudo's configure.ac only
   required autoconf 2.70.
 * Relaxed the autoconf version requirement to version 2.69.


(taca)
diff -r1.194 -r1.195 pkgsrc/security/sudo/Makefile
diff -r1.23 -r1.24 pkgsrc/security/sudo/PLIST
diff -r1.23 -r1.24 pkgsrc/security/sudo/options.mk
diff -r1.126 -r1.127 pkgsrc/security/sudo/distinfo
diff -r1.9 -r1.10 pkgsrc/security/sudo/patches/patch-configure

cvs diff -r1.194 -r1.195 pkgsrc/security/sudo/Makefile (expand / switch to unified diff)

--- pkgsrc/security/sudo/Makefile 2023/02/06 14:35:32 1.194
+++ pkgsrc/security/sudo/Makefile 2023/02/20 13:36:42 1.195
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.194 2023/02/06 14:35:32 taca Exp $ 1# $NetBSD: Makefile,v 1.195 2023/02/20 13:36:42 taca Exp $
2 2
3DISTNAME= sudo-1.9.12p2 3DISTNAME= sudo-1.9.13p1
4CATEGORIES= security 4CATEGORIES= security
5MASTER_SITES= https://www.sudo.ws/dist/ 5MASTER_SITES= https://www.sudo.ws/dist/
6MASTER_SITES+= ftp://ftp.sudo.ws/pub/sudo/ 6MASTER_SITES+= ftp://ftp.sudo.ws/pub/sudo/
7MASTER_SITES+= ftp://ftp.uwsg.indiana.edu/pub/security/sudo/ 7MASTER_SITES+= ftp://ftp.uwsg.indiana.edu/pub/security/sudo/
8MASTER_SITES+= http://ftp.twaren.net/Unix/Security/Sudo/ 8MASTER_SITES+= http://ftp.twaren.net/Unix/Security/Sudo/
9MASTER_SITES+= http://ftp.tux.org/pub/security/sudo/ 9MASTER_SITES+= http://ftp.tux.org/pub/security/sudo/
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://www.sudo.ws/ 12HOMEPAGE= https://www.sudo.ws/
13COMMENT= Allow others to run commands as root 13COMMENT= Allow others to run commands as root
14LICENSE= isc AND modified-bsd 14LICENSE= isc AND modified-bsd
15 15
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes

cvs diff -r1.23 -r1.24 pkgsrc/security/sudo/PLIST (expand / switch to unified diff)

--- pkgsrc/security/sudo/PLIST 2022/10/24 10:29:19 1.23
+++ pkgsrc/security/sudo/PLIST 2023/02/20 13:36:42 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.23 2022/10/24 10:29:19 adam Exp $ 1@comment $NetBSD: PLIST,v 1.24 2023/02/20 13:36:42 taca Exp $
2bin/cvtsudoers 2bin/cvtsudoers
3bin/sudo 3bin/sudo
4bin/sudoedit 4bin/sudoedit
5bin/sudoreplay 5bin/sudoreplay
6include/sudo_plugin.h 6include/sudo_plugin.h
7lib/sudo/audit_json.la 7lib/sudo/audit_json.la
8lib/sudo/group_file.la 8lib/sudo/group_file.la
9lib/sudo/libsudo_util.la 9lib/sudo/libsudo_util.la
10${PLIST.noexec}lib/sudo/sudo_noexec.la 10${PLIST.noexec}lib/sudo/sudo_noexec.la
11lib/sudo/sudoers.la 11lib/sudo/sudoers.la
12lib/sudo/system_group.la 12lib/sudo/system_group.la
13man/man1/cvtsudoers.1 13man/man1/cvtsudoers.1
14man/man5/sudo.conf.5 14man/man5/sudo.conf.5
@@ -72,48 +72,50 @@ ${PLIST.nls}share/locale/fr/LC_MESSAGES/ @@ -72,48 +72,50 @@ ${PLIST.nls}share/locale/fr/LC_MESSAGES/
72${PLIST.nls}share/locale/fr/LC_MESSAGES/sudoers.mo 72${PLIST.nls}share/locale/fr/LC_MESSAGES/sudoers.mo
73${PLIST.nls}share/locale/fur/LC_MESSAGES/sudo.mo 73${PLIST.nls}share/locale/fur/LC_MESSAGES/sudo.mo
74${PLIST.nls}share/locale/fur/LC_MESSAGES/sudoers.mo 74${PLIST.nls}share/locale/fur/LC_MESSAGES/sudoers.mo
75${PLIST.nls}share/locale/gl/LC_MESSAGES/sudo.mo 75${PLIST.nls}share/locale/gl/LC_MESSAGES/sudo.mo
76${PLIST.nls}share/locale/hr/LC_MESSAGES/sudo.mo 76${PLIST.nls}share/locale/hr/LC_MESSAGES/sudo.mo
77${PLIST.nls}share/locale/hr/LC_MESSAGES/sudoers.mo 77${PLIST.nls}share/locale/hr/LC_MESSAGES/sudoers.mo
78${PLIST.nls}share/locale/hu/LC_MESSAGES/sudo.mo 78${PLIST.nls}share/locale/hu/LC_MESSAGES/sudo.mo
79${PLIST.nls}share/locale/hu/LC_MESSAGES/sudoers.mo 79${PLIST.nls}share/locale/hu/LC_MESSAGES/sudoers.mo
80${PLIST.nls}share/locale/it/LC_MESSAGES/sudo.mo 80${PLIST.nls}share/locale/it/LC_MESSAGES/sudo.mo
81${PLIST.nls}share/locale/it/LC_MESSAGES/sudoers.mo 81${PLIST.nls}share/locale/it/LC_MESSAGES/sudoers.mo
82${PLIST.nls}share/locale/ja/LC_MESSAGES/sudo.mo 82${PLIST.nls}share/locale/ja/LC_MESSAGES/sudo.mo
83${PLIST.nls}share/locale/ja/LC_MESSAGES/sudoers.mo 83${PLIST.nls}share/locale/ja/LC_MESSAGES/sudoers.mo
84${PLIST.nls}share/locale/ka/LC_MESSAGES/sudo.mo 84${PLIST.nls}share/locale/ka/LC_MESSAGES/sudo.mo
 85${PLIST.nls}share/locale/ka/LC_MESSAGES/sudoers.mo
85${PLIST.nls}share/locale/ko/LC_MESSAGES/sudo.mo 86${PLIST.nls}share/locale/ko/LC_MESSAGES/sudo.mo
86${PLIST.nls}share/locale/ko/LC_MESSAGES/sudoers.mo 87${PLIST.nls}share/locale/ko/LC_MESSAGES/sudoers.mo
87${PLIST.nls}share/locale/lt/LC_MESSAGES/sudoers.mo 88${PLIST.nls}share/locale/lt/LC_MESSAGES/sudoers.mo
88${PLIST.nls}share/locale/nb/LC_MESSAGES/sudo.mo 89${PLIST.nls}share/locale/nb/LC_MESSAGES/sudo.mo
89${PLIST.nls}share/locale/nb/LC_MESSAGES/sudoers.mo 90${PLIST.nls}share/locale/nb/LC_MESSAGES/sudoers.mo
90${PLIST.nls}share/locale/nl/LC_MESSAGES/sudo.mo 91${PLIST.nls}share/locale/nl/LC_MESSAGES/sudo.mo
91${PLIST.nls}share/locale/nl/LC_MESSAGES/sudoers.mo 92${PLIST.nls}share/locale/nl/LC_MESSAGES/sudoers.mo
92${PLIST.nls}share/locale/nn/LC_MESSAGES/sudo.mo 93${PLIST.nls}share/locale/nn/LC_MESSAGES/sudo.mo
93${PLIST.nls}share/locale/pl/LC_MESSAGES/sudo.mo 94${PLIST.nls}share/locale/pl/LC_MESSAGES/sudo.mo
94${PLIST.nls}share/locale/pl/LC_MESSAGES/sudoers.mo 95${PLIST.nls}share/locale/pl/LC_MESSAGES/sudoers.mo
95${PLIST.nls}share/locale/pt/LC_MESSAGES/sudo.mo 96${PLIST.nls}share/locale/pt/LC_MESSAGES/sudo.mo
96${PLIST.nls}share/locale/pt/LC_MESSAGES/sudoers.mo 97${PLIST.nls}share/locale/pt/LC_MESSAGES/sudoers.mo
97${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/sudo.mo 98${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/sudo.mo
98${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/sudoers.mo 99${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/sudoers.mo
99${PLIST.nls}share/locale/ro/LC_MESSAGES/sudo.mo 100${PLIST.nls}share/locale/ro/LC_MESSAGES/sudo.mo
100${PLIST.nls}share/locale/ro/LC_MESSAGES/sudoers.mo 101${PLIST.nls}share/locale/ro/LC_MESSAGES/sudoers.mo
101${PLIST.nls}share/locale/ru/LC_MESSAGES/sudo.mo 102${PLIST.nls}share/locale/ru/LC_MESSAGES/sudo.mo
102${PLIST.nls}share/locale/ru/LC_MESSAGES/sudoers.mo 103${PLIST.nls}share/locale/ru/LC_MESSAGES/sudoers.mo
103${PLIST.nls}share/locale/sk/LC_MESSAGES/sudo.mo 104${PLIST.nls}share/locale/sk/LC_MESSAGES/sudo.mo
104${PLIST.nls}share/locale/sk/LC_MESSAGES/sudoers.mo 105${PLIST.nls}share/locale/sk/LC_MESSAGES/sudoers.mo
105${PLIST.nls}share/locale/sl/LC_MESSAGES/sudo.mo 106${PLIST.nls}share/locale/sl/LC_MESSAGES/sudo.mo
106${PLIST.nls}share/locale/sl/LC_MESSAGES/sudoers.mo 107${PLIST.nls}share/locale/sl/LC_MESSAGES/sudoers.mo
 108${PLIST.nls}share/locale/sq/LC_MESSAGES/sudo.mo
107${PLIST.nls}share/locale/sr/LC_MESSAGES/sudo.mo 109${PLIST.nls}share/locale/sr/LC_MESSAGES/sudo.mo
108${PLIST.nls}share/locale/sr/LC_MESSAGES/sudoers.mo 110${PLIST.nls}share/locale/sr/LC_MESSAGES/sudoers.mo
109${PLIST.nls}share/locale/sv/LC_MESSAGES/sudo.mo 111${PLIST.nls}share/locale/sv/LC_MESSAGES/sudo.mo
110${PLIST.nls}share/locale/sv/LC_MESSAGES/sudoers.mo 112${PLIST.nls}share/locale/sv/LC_MESSAGES/sudoers.mo
111${PLIST.nls}share/locale/tr/LC_MESSAGES/sudo.mo 113${PLIST.nls}share/locale/tr/LC_MESSAGES/sudo.mo
112${PLIST.nls}share/locale/tr/LC_MESSAGES/sudoers.mo 114${PLIST.nls}share/locale/tr/LC_MESSAGES/sudoers.mo
113${PLIST.nls}share/locale/uk/LC_MESSAGES/sudo.mo 115${PLIST.nls}share/locale/uk/LC_MESSAGES/sudo.mo
114${PLIST.nls}share/locale/uk/LC_MESSAGES/sudoers.mo 116${PLIST.nls}share/locale/uk/LC_MESSAGES/sudoers.mo
115${PLIST.nls}share/locale/vi/LC_MESSAGES/sudo.mo 117${PLIST.nls}share/locale/vi/LC_MESSAGES/sudo.mo
116${PLIST.nls}share/locale/vi/LC_MESSAGES/sudoers.mo 118${PLIST.nls}share/locale/vi/LC_MESSAGES/sudoers.mo
117${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/sudo.mo 119${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/sudo.mo
118${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/sudoers.mo 120${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/sudoers.mo
119${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/sudo.mo 121${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/sudo.mo

cvs diff -r1.23 -r1.24 pkgsrc/security/sudo/options.mk (expand / switch to unified diff)

--- pkgsrc/security/sudo/options.mk 2019/11/04 21:13:03 1.23
+++ pkgsrc/security/sudo/options.mk 2023/02/20 13:36:42 1.24
@@ -1,55 +1,55 @@ @@ -1,55 +1,55 @@
1# $NetBSD: options.mk,v 1.23 2019/11/04 21:13:03 rillig Exp $ 1# $NetBSD: options.mk,v 1.24 2023/02/20 13:36:42 taca Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.sudo 3PKG_OPTIONS_VAR= PKG_OPTIONS.sudo
4PKG_SUPPORTED_OPTIONS= ldap nls 4PKG_SUPPORTED_OPTIONS= ldap nls
5PKG_OPTIONS_OPTIONAL_GROUPS= auth 5PKG_OPTIONS_OPTIONAL_GROUPS= auth
6PKG_OPTIONS_GROUP.auth= kerberos pam skey 6PKG_OPTIONS_GROUP.auth= kerberos pam skey
7 7
8.if ${OPSYS} == "NetBSD" && exists(/usr/include/skey.h) 8.if ${OPSYS} == "NetBSD" && exists(/usr/include/skey.h)
9PKG_SUGGESTED_OPTIONS= skey 9PKG_SUGGESTED_OPTIONS= skey
10.endif 10.endif
11 11
12PKG_SUGGESTED_OPTIONS.Darwin= pam 12PKG_SUGGESTED_OPTIONS.Darwin= pam
13 13
14.include "../../mk/bsd.options.mk" 14.include "../../mk/bsd.options.mk"
15 15
16PLIST_VARS+= ldap nls 16PLIST_VARS+= ldap nls
17 17
18.if !empty(PKG_OPTIONS:Mnls) 18.if ${PKG_OPTIONS:Mnls}
19. include "../../devel/gettext-lib/buildlink3.mk" 19. include "../../devel/gettext-lib/buildlink3.mk"
20CONFIGURE_ARGS+= --enable-nls 20CONFIGURE_ARGS+= --enable-nls
21PLIST.nls= yes 21PLIST.nls= yes
22.else 22.else
23CONFIGURE_ARGS+= --disable-nls 23CONFIGURE_ARGS+= --disable-nls
24.endif 24.endif
25 25
26.if !empty(PKG_OPTIONS:Mpam) 26.if ${PKG_OPTIONS:Mpam}
27. include "../../mk/pam.buildlink3.mk" 27. include "../../mk/pam.buildlink3.mk"
28DL_AUTO_VARS= yes 28DL_AUTO_VARS= yes
29CONFIGURE_ARGS+= --with-pam 29CONFIGURE_ARGS+= --with-pam
30.else 30.else
31CONFIGURE_ARGS+= --without-pam 31CONFIGURE_ARGS+= --without-pam
32.endif 32.endif
33 33
34.if !empty(PKG_OPTIONS:Mkerberos) 34.if ${PKG_OPTIONS:Mkerberos}
35. include "../../mk/krb5.buildlink3.mk" 35. include "../../mk/krb5.buildlink3.mk"
36CONFIGURE_ARGS+= --without-kerb4 36CONFIGURE_ARGS+= --without-kerb4
37CONFIGURE_ARGS+= --with-kerb5 37CONFIGURE_ARGS+= --with-kerb5
38.else 38.else
39CONFIGURE_ARGS+= --without-kerb5 39CONFIGURE_ARGS+= --without-kerb5
40.endif 40.endif
41 41
42.if !empty(PKG_OPTIONS:Mldap) 42.if ${PKG_OPTIONS:Mldap}
43. include "../../databases/openldap-client/buildlink3.mk" 43. include "../../databases/openldap-client/buildlink3.mk"
44. include "../../security/cyrus-sasl/buildlink3.mk" 44. include "../../security/cyrus-sasl/buildlink3.mk"
45DL_AUTO_VARS= yes 45DL_AUTO_VARS= yes
46CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap-client} 46CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap-client}
47CONFIGURE_ARGS+= --with-ldap-conf-file=${PKG_SYSCONFDIR}/ldap.conf 47CONFIGURE_ARGS+= --with-ldap-conf-file=${PKG_SYSCONFDIR}/ldap.conf
48PLIST.ldap= yes 48PLIST.ldap= yes
49.endif 49.endif
50 50
51.if !empty(PKG_OPTIONS:Mskey) 51.if ${PKG_OPTIONS:Mskey}
52CONFIGURE_ARGS+= --with-skey 52CONFIGURE_ARGS+= --with-skey
53.else 53.else
54CONFIGURE_ARGS+= --without-skey 54CONFIGURE_ARGS+= --without-skey
55.endif 55.endif

cvs diff -r1.126 -r1.127 pkgsrc/security/sudo/distinfo (expand / switch to unified diff)

--- pkgsrc/security/sudo/distinfo 2023/02/06 14:35:32 1.126
+++ pkgsrc/security/sudo/distinfo 2023/02/20 13:36:42 1.127
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.126 2023/02/06 14:35:32 taca Exp $ 1$NetBSD: distinfo,v 1.127 2023/02/20 13:36:42 taca Exp $
2 2
3BLAKE2s (sudo-1.9.12p2.tar.gz) = cb2f434ec3754978898471bba89a2f4ffa8e342ab9d8ad4b8a32995fb0c53f37 3BLAKE2s (sudo-1.9.13p1.tar.gz) = 86072cd188bf529e089ebb53d491179b6c6521b5d0fea0c3c9fc0bb965b831af
4SHA512 (sudo-1.9.12p2.tar.gz) = 5e035246137d5820691f7ddfc13faec3886e3cf1563ed56633667d86ab4f1306f34cc0e27808f56790b6c6a4614826e54c5b7e47b31eb009b96dde3e52170c45 4SHA512 (sudo-1.9.13p1.tar.gz) = 4d19f06c4a592dac9a1a7feca6cc751093151af32313d9d579e2485fc6530a4340ec29cc2892b29dedf2a6aca3e91fb0bbf94bbfb6530f249c58430b83139044
5Size (sudo-1.9.12p2.tar.gz) = 4909431 bytes 5Size (sudo-1.9.13p1.tar.gz) = 5096455 bytes
6SHA1 (patch-Makefile.in) = 1a83c55d27829013e2e23073046c5c39b020fafe 6SHA1 (patch-Makefile.in) = 1a83c55d27829013e2e23073046c5c39b020fafe
7SHA1 (patch-configure) = da1f0d89f7dc5d56734fc69f190189ccdfc8b043 7SHA1 (patch-configure) = 0f73f860ae4fd9a0031aa8b0c22a93df776e7ad6
8SHA1 (patch-examples_Makefile.in) = a20967ecd88eb5e4a8b47e6a3b80bc18be713409 8SHA1 (patch-examples_Makefile.in) = a20967ecd88eb5e4a8b47e6a3b80bc18be713409
9SHA1 (patch-lib_logsrv_Makefile.in) = 301c317c806edeee8ce7b44a5431cd38defb3a54 9SHA1 (patch-lib_logsrv_Makefile.in) = 301c317c806edeee8ce7b44a5431cd38defb3a54
10SHA1 (patch-lib_protobuf-c_Makefile.in) = 122e432fb0da36b998778a1b71130f0c3785f575 10SHA1 (patch-lib_protobuf-c_Makefile.in) = 122e432fb0da36b998778a1b71130f0c3785f575
11SHA1 (patch-plugins_sudoers_Makefile.in) = d2981bb9841f6bb4b1c80f5c2f2727fbf9579501 11SHA1 (patch-plugins_sudoers_Makefile.in) = d2981bb9841f6bb4b1c80f5c2f2727fbf9579501
12SHA1 (patch-src_Makefile.in) = 0642684c2d4b3a89259f7d27908f5ec8070969ec 12SHA1 (patch-src_Makefile.in) = 0642684c2d4b3a89259f7d27908f5ec8070969ec

cvs diff -r1.9 -r1.10 pkgsrc/security/sudo/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/security/sudo/patches/patch-configure 2022/07/05 11:01:38 1.9
+++ pkgsrc/security/sudo/patches/patch-configure 2023/02/20 13:36:42 1.10
@@ -1,95 +1,85 @@ @@ -1,95 +1,85 @@
1$NetBSD: patch-configure,v 1.9 2022/07/05 11:01:38 adam Exp $ 1$NetBSD: patch-configure,v 1.10 2023/02/20 13:36:42 taca Exp $
2 2
3* Add "--with-nbsdops" option, NetBSD standard options. 3* Add "--with-nbsdops" option, NetBSD standard options.
4* Link with util(3) in the case of DragonFly, too. 
5* When specified "--with-kerb5" option, test existence of several functions 4* When specified "--with-kerb5" option, test existence of several functions
6 even if there is krb5-config. krb5-config dosen't give all definitions for 5 even if there is krb5-config. krb5-config dosen't give all definitions for
7 functions (HAVE_KRB5_*). 6 functions (HAVE_KRB5_*).
8* Remove setting sysconfdir to "/etc". 7* Remove setting sysconfdir to "/etc".
9 8
10--- configure.orig 2022-06-20 22:58:38.000000000 +0000 9--- configure.orig 2023-02-16 18:43:30.000000000 +0000
11+++ configure 10+++ configure
12@@ -940,6 +940,7 @@ with_incpath 11@@ -935,6 +935,7 @@ with_incpath
13 with_libpath 12 with_libpath
14 with_libraries 13 with_libraries
15 with_csops 14 with_csops
16+with_nbsdops 15+with_nbsdops
17 with_passwd 16 with_passwd
18 with_skey 17 with_skey
19 with_opie 18 with_opie
20@@ -1677,7 +1678,7 @@ Fine tuning of the installation director 19@@ -1673,7 +1674,7 @@ Fine tuning of the installation director
21 --bindir=DIR user executables [EPREFIX/bin] 20 --bindir=DIR user executables [EPREFIX/bin]
22 --sbindir=DIR system admin executables [EPREFIX/sbin] 21 --sbindir=DIR system admin executables [EPREFIX/sbin]
23 --libexecdir=DIR program executables [EPREFIX/libexec] 22 --libexecdir=DIR program executables [EPREFIX/libexec]
24- --sysconfdir=DIR read-only single-machine data [/etc] 23- --sysconfdir=DIR read-only single-machine data [/etc]
25+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] 24+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
26 --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] 25 --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
27 --localstatedir=DIR modifiable single-machine data [PREFIX/var] 26 --localstatedir=DIR modifiable single-machine data [PREFIX/var]
28 --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] 27 --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
29@@ -1805,6 +1806,7 @@ Optional Packages: 28@@ -1802,6 +1803,7 @@ Optional Packages:
30 --with-libpath additional places to look for libraries 29 --with-libpath additional places to look for libraries
31 --with-libraries additional libraries to link with 30 --with-libraries additional libraries to link with
32 --with-csops add CSOps standard options 31 --with-csops add CSOps standard options
33+ --with-nbsdops add NetBSD standard options 32+ --with-nbsdops add NetBSD standard options
34 --without-passwd don't use passwd/shadow file for authentication 33 --without-passwd don't use passwd/shadow file for authentication
35 --with-skey[=DIR] enable S/Key support 34 --with-skey[=DIR] enable S/Key support
36 --with-opie[=DIR] enable OPIE support 35 --with-opie[=DIR] enable OPIE support
37@@ -5230,6 +5232,23 @@ fi 36@@ -5290,6 +5292,23 @@ fi
38  37
39  38
40  39
41+# Check whether --with-nbsdops was given. 40+# Check whether --with-nbsdops was given.
42+if test "${with_nbsdops+set}" = set; then : 41+if test "${with_nbsdops+set}" = set; then :
43+ withval=$with_nbsdops; case $with_nbsdops in 42+ withval=$with_nbsdops; case $with_nbsdops in
44+ yes) echo 'Adding NetBSD standard options' 43+ yes) echo 'Adding NetBSD standard options'
45+ CHECKSIA=false 44+ CHECKSIA=false
46+ with_ignore_dot=yes 45+ with_ignore_dot=yes
47+ with_env_editor=yes 46+ with_env_editor=yes
48+ with_tty_tickets=yes 47+ with_tty_tickets=yes
49+ ;; 48+ ;;
50+ no) ;; 49+ no) ;;
51+ *) echo "Ignoring unknown argument to --with-nbsdops: $with_nbsdops" 50+ *) echo "Ignoring unknown argument to --with-nbsdops: $with_nbsdops"
52+ ;; 51+ ;;
53+esac 52+esac
54+fi 53+fi
55+ 54+
56+ 55+
57+ 56+
58 # Check whether --with-passwd was given. 57 # Check whether --with-passwd was given.
59 if test ${with_passwd+y} 58 if test ${with_passwd+y}
60 then : 59 then :
61@@ -17818,7 +17837,7 @@ fi 60@@ -18196,7 +18215,7 @@ fi
62 : ${mansectform='4'} 61 : ${mansectform='4'}
63 : ${mansectmisc='5'} 62 : ${mansectmisc='5'}
64 ;; 63 ;;
65- *-*-linux*|*-*-k*bsd*-gnu) 64- *-*-linux*|*-*-k*bsd*-gnu)
66+ *-*-linux*|*-*-k*bsd*-gnu|*-*-gnukfreebsd) 65+ *-*-linux*|*-*-k*bsd*-gnu|*-*-gnukfreebsd)
67 shadow_funcs="getspnam" 66 shadow_funcs="getspnam"
68 test -z "$with_pam" && AUTH_EXCL_DEF="PAM" 67 test -z "$with_pam" && AUTH_EXCL_DEF="PAM"
69 # Check for SECCOMP_MODE_FILTER in linux/seccomp.h 68 # Check for SECCOMP_MODE_FILTER in linux/seccomp.h
70@@ -19760,7 +19779,7 @@ then : 69@@ -29486,6 +29505,8 @@ rm -f core conftest.err conftest.$ac_obj
71 LOGINCAP_USAGE='[-c class] '; LCMAN=1 70 ;;
72 with_logincap=yes 71 esac
73 case "$OS" in 72 fi
74- freebsd*|netbsd*) 
75+ dragonfly*|freebsd*|netbsd*) 
76 SUDO_LIBS="${SUDO_LIBS} -lutil" 
77 SUDOERS_LIBS="${SUDOERS_LIBS} -lutil" 
78 ;; 
79@@ -27964,6 +27983,8 @@ fi 
80 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext 
81 AUTH_OBJS="$AUTH_OBJS kerb5.lo" 
82 fi 
83+fi 73+fi
84+if test ${with_kerb5-'no'} != "no"; then 74+if test ${with_kerb5-'no'} != "no"; then
85 _LIBS="$LIBS" 75 _LIBS="$LIBS"
86 LIBS="${LIBS} ${SUDOERS_LIBS}" 76 LIBS="${LIBS} ${SUDOERS_LIBS}"
87 ac_fn_c_check_func "$LINENO" "krb5_verify_user" "ac_cv_func_krb5_verify_user" 77 ac_fn_c_check_func "$LINENO" "krb5_verify_user" "ac_cv_func_krb5_verify_user"
88@@ -32536,7 +32557,6 @@ test "$docdir" = '${datarootdir}/doc/${P 78@@ -35492,7 +35513,6 @@ test "$docdir" = '${datarootdir}/doc/${P
89 test "$localedir" = '${datarootdir}/locale' && localedir='$(datarootdir)/locale' 79 test "$localedir" = '${datarootdir}/locale' && localedir='$(datarootdir)/locale'
90 test "$localstatedir" = '${prefix}/var' && localstatedir='$(prefix)/var' 80 test "$localstatedir" = '${prefix}/var' && localstatedir='$(prefix)/var'
91 test "$runstatedir" = '${localstatedir}/run' && runstatedir='$(localstatedir)/run' 81 test "$runstatedir" = '${localstatedir}/run' && runstatedir='$(localstatedir)/run'
92-test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc' 82-test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc'
93  83
94 if test X"$INIT_SCRIPT" != X""; then 84 if test X"$INIT_SCRIPT" != X""
95 ac_config_files="$ac_config_files etc/init.d/$INIT_SCRIPT" 85 then :