Merge sudo 1.9.10 from tip.

--HG--
branch : 1.9

Author: millert

.circleci/config.yml

@@ -1,8 +1,8 @@
 version: 2.1
 
 jobs:
-  build:
-    description: Configure, build and package sudo
+  build_linux:
+    description: Configure, build and package sudo (Linux)
     parameters:
       ldap:
         description: if true, build sudo's LDAP support
@@ -30,15 +30,15 @@ jobs:
     steps:
       - checkout
       - run:
-          name: "Building and packaging sudo"
+          name: "Building and packaging sudo (Linux)"
           command: ./scripts/mkpkg <<# parameters.ldap >>--flavor=ldap --with-sssd --with-sssd-lib=/usr/lib/x86_64-linux-gnu <</ parameters.ldap >><<# parameters.wolfssl >>--enable-wolfssl <</ parameters.wolfssl >><<^ parameters.logsrvd >>--disable-log-server --disable-log-client <</ parameters.logsrvd >><<^ parameters.intercept >>--disable-intercept <</ parameters.intercept >><<# parameters.static_sudoers >>--enable-static-sudoers <</ parameters.static_sudoers >>--enable-warnings --enable-werror --enable-sanitizer
       # Save workspace for subsequent jobs (i.e. test)
       - persist_to_workspace:
           root: .
           paths:
             - .
-  test:
-    description: run sudo tests in a pre-built workspace
+  test_linux:
+    description: run sudo tests in a pre-built workspace (Linux)
     docker:
       - image: docker.io/sudoproject/ubuntu:latest
         user: build
@@ -47,64 +47,99 @@ jobs:
       - attach_workspace:
           at: .
       - run:
-          name: "Running tests"
+          name: "Running tests (Linux)"
           command: make check
           environment:
               # Leak sanitizer requires ptrace, disable it
               ASAN_OPTIONS: detect_leaks=0
 
+  build_macos:
+    description: Configure, build and package sudo (macOS)
+    macos:
+      xcode: 13.2.1 # indicate our selected version of Xcode
+    steps:
+      - checkout
+      - run:
+          name: "Building and packaging sudo (macOS)"
+          command: ./scripts/mkpkg --enable-warnings
+      # Save workspace for subsequent jobs (i.e. test)
+      - persist_to_workspace:
+          root: .
+          paths:
+            - .
+  test_macos:
+    description: run sudo tests in a pre-built workspace (macOS)
+    macos:
+      xcode: 13.2.1 # indicate our selected version of Xcode
+    steps:
+      # Reuse the workspace from the build job
+      - attach_workspace:
+          at: .
+      - run:
+          name: "Running tests (macOS)"
+          command: make check
+
 # Orchestrate our job run sequence
 workflows:
   version: 2
   build_and_test:
     jobs:
-      - build:
-          name: build-ldap
+      - build_linux:
+          name: build-linux-ldap
           ldap: true
           filters:
             branches:
               only: main
-      - build:
-          name: build-wolfssl
+      - build_linux:
+          name: build-linux-wolfssl
           wolfssl: true
           filters:
             branches:
               only: main
-      - build:
-          name: build-static-sudoers
+      - build_linux:
+          name: build-linux-static-sudoers
           static_sudoers: true
           filters:
             branches:
               only: main
-      - build:
-          name: build-nologsrvd
+      - build_linux:
+          name: build-linux-nologsrvd
           logsrvd: false
           filters:
             branches:
               only: main
-      - build:
-          name: build-nointercept
+      - build_linux:
+          name: build-linux-nointercept
           logsrvd: false
           filters:
             branches:
               only: main
-      - test:
-          name: test-ldap
+      - build_macos:
+          name: build-macos
+          filters:
+            branches:
+              only: main
+      - test_linux:
+          name: test-linux-ldap
+          requires:
+            - build-linux-ldap
+      - test_linux:
+          name: test-linux-wolfssl
           requires:
-            - build-ldap
-      - test:
-          name: test-wolfssl
+            - build-linux-wolfssl
+      - test_linux:
+          name: test-linux-static-sudoers
           requires:
-            - build-wolfssl
-      - test:
-          name: test-static-sudoers
+            - build-linux-static-sudoers
+      - test_linux:
+          name: test-linux-nologsrvd
           requires:
-            - build-static-sudoers
-      - test:
-          name: test-nologsrvd
+            - build-linux-nologsrvd
+      - test_linux:
+          name: test-linux-nointercept
           requires:
-            - build-nologsrvd
-      - test:
-          name: test-nointercept
+            - build-linux-nointercept
+      - test_macos:
+          name: test-macos
           requires:
-            - build-nointercept
+            - build-macos

.gitignore

@@ -31,6 +31,9 @@ docs/*.mdoc
 docs/fixman.sed
 
 examples/sudo.conf
+examples/sudo_logsrvd.conf
+examples/sudoers
+examples/syslog.conf
 
 etc/init.d/sudo.conf
 
@@ -64,6 +67,7 @@ lib/util/[a-z]*_test
 lib/util/fuzz_[a-z]*
 lib/util/regress/**/*.out
 lib/util/regress/**/*.err
+lib/util/regress/harness
 
 logsrvd/sudo_logsrvd
 logsrvd/sudo_sendlog
@@ -85,6 +89,7 @@ plugins/sudoers/regress/**/*.json
 plugins/sudoers/regress/**/*.ldif
 plugins/sudoers/regress/**/*.sudo
 plugins/sudoers/regress/**/*.ldif2sudo
+plugins/sudoers/regress/harness
 plugins/sudoers/regress/iolog_plugin/iolog
 plugins/sudoers/regress/testsudoers/test3.d/root
 

.hgignore

@@ -29,6 +29,9 @@ Makefile$
 ^etc/init\.d/sudo\.conf$
 
 ^examples/sudo\.conf$
+^examples/sudo_logsrvd\.conf$
+^examples/sudoers$
+^examples/syslog\.conf$
 
 ^init\.d/.*\.sh$
 ^init\.d/sudo\.conf$
@@ -57,6 +60,7 @@ Makefile$
 ^lib/util/util\.exp$
 ^lib/util/[a-z0-9_]+_test$
 ^lib/util/fuzz_sudo_conf$
+^lib/util/regress/harness
 ^lib/util/regress/.*\.(out|err)$
 
 ^logsrvd/sudo_(logsrvd|sendlog)$
@@ -65,6 +69,7 @@ Makefile$
 ^plugins/sudoers/(cvtsudoers|sudoers|sudoreplay|testsudoers|tsdump|visudo|prologue|check_[a-z0-9_]+)$
 ^plugins/sudoers/fuzz_(policy|sudoers(_ldif)?)$
 ^plugins/sudoers/.*\.(out|toke|err|json|ldif|sudo|ldif2sudo)$
+^plugins/sudoers/regress/harness
 ^plugins/sudoers/regress/iolog_plugin/iolog$
 ^plugins/sudoers/regress/testsudoers/test3\.d/root$
 

ABOUT-NLS

@@ -110,7 +110,7 @@ people who like their own language and write it well, and who are also
 able to synergize with other translators speaking the same language.
 Each translation team has its own mailing list.  The up-to-date list of
 teams can be found at the Free Translation Project's homepage,
-'http://translationproject.org/', in the "Teams" area.
+'https://translationproject.org/', in the "Teams" area.
 
    If you'd like to volunteer to _work_ at translating messages, you
 should become a member of the translating team for your own language.
@@ -1385,7 +1385,7 @@ mere existence a PO file and its wide availability in a distribution.
    If Jun 2014 seems to be old, you may fetch a more recent copy of this
 'ABOUT-NLS' file on most GNU archive sites.  The most up-to-date matrix
 with full percentage details can be found at
-'http://translationproject.org/extra/matrix.html'.
+'https://translationproject.org/extra/matrix.html'.
 
 1.5 Using 'gettext' in new packages
 ===================================