lists.arthurdejong.org
RSS feed

nss-pam-ldapd branch master updated. 0.9.11-21-g70819ae

[Date Prev][Date Next] [Thread Prev][Thread Next]

nss-pam-ldapd branch master updated. 0.9.11-21-g70819ae

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nss-pam-ldapd".

The branch, master has been updated
       via  70819ae3d1736783472a747d542cef2052a4fc28 (commit)
       via  7b2a7fe2112e93e7ea4fa424b9c440c12a2c1beb (commit)
      from  9edf95cea9173afab850d05c07a0fa58efa55065 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://arthurdejong.org/git/nss-pam-ldapd/commit/?id=70819ae3d1736783472a747d542cef2052a4fc28

commit 70819ae3d1736783472a747d542cef2052a4fc28
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Mon Nov 15 20:39:17 2021 +0100

    Fix internal assertion function detection on Solaris

diff --git a/configure.ac b/configure.ac
index bb12619..27dbb7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2006 Luke Howard
 # Copyright (C) 2006 West Consulting
-# Copyright (C) 2006-2019 Arthur de Jong
+# Copyright (C) 2006-2021 Arthur de Jong
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -351,7 +351,7 @@ AC_ARG_WITH(nss-maps,
             [ with_nss_maps="all" ])
 
 # checks for availability of header files
-AC_CHECK_HEADERS([ctype.h strings.h pthread.h pthread_np.h fcntl.h limits.h])
+AC_CHECK_HEADERS([ctype.h strings.h pthread.h pthread_np.h fcntl.h limits.h 
assert.h])
 AC_CHECK_HEADERS([nss.h nss_common.h grp.h shadow.h aliases.h netdb.h 
rpc/rpcent.h])
 AC_CHECK_HEADERS([netinet/ether.h arpa/inet.h netinet/in.h])
 AC_CHECK_HEADERS([nsswitch.h nss_dbdefs.h])
@@ -368,7 +368,7 @@ AC_SEARCH_LIBS(socket, socket)
 AC_CHECK_FUNCS([strcasecmp strncasecmp strchr strcspn strspn strtol strtoul 
strtoull strndup])
 AC_CHECK_FUNCS([malloc realloc atexit])
 AC_FUNC_FORK
-AC_CHECK_FUNCS(__assert_fail)
+AC_CHECK_FUNCS([__assert_fail __assert __assert_c99])
 AC_SEARCH_LIBS(clock_gettime, rt)
 AC_CHECK_FUNCS([setusershell getusershell endusershell getgrouplist])
 AC_CHECK_DECLS([setusershell, getusershell, endusershell])
diff --git a/tests/common.h b/tests/common.h
index fb6ca8f..f66a48f 100644
--- a/tests/common.h
+++ b/tests/common.h
@@ -2,7 +2,7 @@
    common.h - common test routines
    This file is part of the nss-pam-ldapd library.
 
-   Copyright (C) 2011, 2012 Arthur de Jong
+   Copyright (C) 2011-2021 Arthur de Jong
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -24,6 +24,7 @@
 #define TEST__COMMON_H 1
 
 #include <errno.h>
+#include <assert.h>
 
 #ifndef __ASSERT_FUNCTION
 #define __ASSERT_FUNCTION ""
@@ -33,9 +34,14 @@
 #ifndef HAVE___ASSERT_FAIL
 /* for Solaris: */
 #ifdef sun
+#if defined(HAVE___ASSERT_C99)
+#define __assert_fail(assertion, file, line, function)                      \
+  __assert_c99(assertion, file, line, function)
+#elif defined(HAVE___ASSERT)
 #define __assert_fail(assertion, file, line, function)                      \
   __assert(assertion, file, line)
-#endif
+#endif /* HAVE___ASSERT_C99 or HAVE___ASSERT */
+#endif /* sun */
 /* for FreeBSD: */
 #ifdef __FreeBSD__
 #define __assert_fail(assertion, file, line, function)                      \

https://arthurdejong.org/git/nss-pam-ldapd/commit/?id=7b2a7fe2112e93e7ea4fa424b9c440c12a2c1beb

commit 7b2a7fe2112e93e7ea4fa424b9c440c12a2c1beb
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Mon Nov 15 20:30:47 2021 +0100

    Update files from latest automake

diff --git a/INSTALL b/INSTALL
index 8865734..e82fd21 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-   Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software
-Foundation, Inc.
+   Copyright (C) 1994-1996, 1999-2002, 2004-2017, 2020-2021 Free
+Software Foundation, Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -225,7 +225,7 @@ order to use an ANSI C compiler:
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
-   HP-UX 'make' updates targets which have the same time stamps as their
+   HP-UX 'make' updates targets which have the same timestamps as their
 prerequisites, which makes it generally unusable when shipped generated
 files such as 'configure' are involved.  Use GNU 'make' instead.
 
diff --git a/ar-lib b/ar-lib
index 1e9388e..c349042 100755
--- a/ar-lib
+++ b/ar-lib
@@ -4,7 +4,7 @@
 me=ar-lib
 scriptversion=2019-07-04.01; # UTC
 
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 Free Software Foundation, Inc.
 # Written by Peter Rosin <peda@lysator.liu.se>.
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/compile b/compile
index 23fcba0..df363c8 100755
--- a/compile
+++ b/compile
@@ -3,7 +3,7 @@
 
 scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/depcomp b/depcomp
index 6b39162..715e343 100755
--- a/depcomp
+++ b/depcomp
@@ -3,7 +3,7 @@
 
 scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/missing b/missing
index 8d0eaad..1fe1611 100755
--- a/missing
+++ b/missing
@@ -3,7 +3,7 @@
 
 scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
diff --git a/py-compile b/py-compile
index e56d98d..81b122b 100755
--- a/py-compile
+++ b/py-compile
@@ -1,9 +1,9 @@
 #!/bin/sh
 # py-compile - Compile a Python program
 
-scriptversion=2020-02-19.23; # UTC
+scriptversion=2021-02-27.01; # UTC
 
-# Copyright (C) 2000-2020 Free Software Foundation, Inc.
+# Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@ scriptversion=2020-02-19.23; # UTC
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.
 
-if [ -z "$PYTHON" ]; then
+if test -z "$PYTHON"; then
   PYTHON=python
 fi
 
@@ -96,26 +96,26 @@ done
 
 files=$*
 if test -z "$files"; then
-    usage_error "no files given"
+  usage_error "no files given"
 fi
 
 # if basedir was given, then it should be prepended to filenames before
 # byte compilation.
-if [ -z "$basedir" ]; then
-    pathtrans="path = file"
+if test -z "$basedir"; then
+  pathtrans="path = file"
 else
-    pathtrans="path = os.path.join('$basedir', file)"
+  pathtrans="path = os.path.join('$basedir', file)"
 fi
 
 # if destdir was given, then it needs to be prepended to the filename to
 # byte compile but not go into the compiled file.
-if [ -z "$destdir" ]; then
-    filetrans="filepath = path"
+if test -z "$destdir"; then
+  filetrans="filepath = path"
 else
-    filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)"
+  filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)"
 fi
 
-python_major=$($PYTHON -V 2>&1 | sed -e 's/.* //;s/\..*$//;1q')
+python_major=`$PYTHON -V 2>&1 | sed -e 's/.* //;s/\..*$//;1q'`
 if test -z "$python_major"; then
   echo "$me: could not determine $PYTHON major version, guessing 3" >&2
   python_major=3
@@ -176,7 +176,7 @@ for file in files.split():
         py_compile.compile(filepath, $import_call(filepath$import_arg2), path)
     else:
         py_compile.compile(filepath, filepath + 'o', path)
-sys.stdout.write('\n')" 2>/dev/null || :
+sys.stdout.write('\n')" 2>/dev/null || exit $?
 
 # Local Variables:
 # mode: shell-script
diff --git a/test-driver b/test-driver
index 9759384..be73b80 100755
--- a/test-driver
+++ b/test-driver
@@ -3,7 +3,7 @@
 
 scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -105,8 +105,11 @@ trap "st=130; $do_exit" 2
 trap "st=141; $do_exit" 13
 trap "st=143; $do_exit" 15
 
-# Test script is run here.
-"$@" >$log_file 2>&1
+# Test script is run here. We create the file first, then append to it,
+# to ameliorate tests themselves also writing to the log file. Our tests
+# don't, but others can (automake bug#35762).
+: >"$log_file"
+"$@" >>"$log_file" 2>&1
 estatus=$?
 
 if test $enable_hard_errors = no && test $estatus -eq 99; then
@@ -128,7 +131,7 @@ esac
 # know whether the test passed or failed simply by looking at the '.log'
 # file, without the need of also peaking into the corresponding '.trs'
 # file (automake bug#11814).
-echo "$res $test_name (exit status: $estatus)" >>$log_file
+echo "$res $test_name (exit status: $estatus)" >>"$log_file"
 
 # Report outcome to console.
 echo "${col}${res}${std}: $test_name"

-----------------------------------------------------------------------

Summary of changes:
 INSTALL        |  6 +++---
 ar-lib         |  2 +-
 compile        |  2 +-
 configure.ac   |  6 +++---
 depcomp        |  2 +-
 missing        |  2 +-
 py-compile     | 24 ++++++++++++------------
 test-driver    | 11 +++++++----
 tests/common.h | 10 ++++++++--
 9 files changed, 37 insertions(+), 28 deletions(-)


hooks/post-receive
-- 
nss-pam-ldapd