Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/openldap merge conflicts



details:   https://anonhg.NetBSD.org/src/rev/a1969b3a9a54
branches:  trunk
changeset: 1012828:a1969b3a9a54
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Aug 11 13:15:33 2020 +0000

description:
merge conflicts

diffstat:

 external/bsd/openldap/Makefile                                                   |     4 +-
 external/bsd/openldap/dist/build/config.guess                                    |   873 +-
 external/bsd/openldap/dist/build/config.sub                                      |  2749 ++++-----
 external/bsd/openldap/dist/build/mkversion                                       |     6 +-
 external/bsd/openldap/dist/build/version.h                                       |     2 +-
 external/bsd/openldap/dist/clients/tools/common.c                                |    13 +-
 external/bsd/openldap/dist/clients/tools/common.h                                |     2 +-
 external/bsd/openldap/dist/clients/tools/ldapcompare.c                           |     4 +-
 external/bsd/openldap/dist/clients/tools/ldapdelete.c                            |     4 +-
 external/bsd/openldap/dist/clients/tools/ldapexop.c                              |     4 +-
 external/bsd/openldap/dist/clients/tools/ldapmodify.c                            |     4 +-
 external/bsd/openldap/dist/clients/tools/ldapmodrdn.c                            |     4 +-
 external/bsd/openldap/dist/clients/tools/ldappasswd.c                            |     4 +-
 external/bsd/openldap/dist/clients/tools/ldapsearch.c                            |     4 +-
 external/bsd/openldap/dist/clients/tools/ldapurl.c                               |     4 +-
 external/bsd/openldap/dist/clients/tools/ldapwhoami.c                            |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/config.guess                          |   873 +-
 external/bsd/openldap/dist/contrib/ldapc++/config.sub                            |  2749 ++++-----
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPAddRequest.h                  |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPAsynConnection.h              |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPAttrType.h                    |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPAttribute.h                   |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPAttributeList.h               |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPBindRequest.h                 |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPCompareRequest.h              |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPConnection.h                  |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPConstraints.h                 |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPControl.h                     |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPControlSet.h                  |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPDeleteRequest.h               |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPEntry.h                       |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPEntryList.h                   |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPException.h                   |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPExtRequest.h                  |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPExtResult.h                   |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPMessage.h                     |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPMessageQueue.h                |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPModDNRequest.h                |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPModList.h                     |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPModification.h                |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPModifyRequest.h               |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPObjClass.h                    |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPRebind.h                      |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPRebindAuth.h                  |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPReferenceList.h               |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPRequest.h                     |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPResult.h                      |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPSaslBindResult.h              |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPSchema.h                      |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPSearchReference.h             |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPSearchRequest.h               |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPSearchResult.h                |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPSearchResults.h               |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPUrl.h                         |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPUrlList.h                     |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LdifReader.h                      |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LdifWriter.h                      |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/SaslInteraction.h                 |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/SaslInteractionHandler.h          |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/StringList.h                      |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/TlsOptions.h                      |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/ac/time.h                         |     2 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/debug.h                           |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/acl/posixgroup.c                |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/addpartial/addpartial-overlay.c |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/allop/allop.c                   |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/allowed/allowed.c               |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/autogroup/autogroup.c           |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/cloak/cloak.c                   |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/denyop/denyop.c                 |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/dsaschema/dsaschema.c           |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/dupent/dupent.c                 |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/kinit/kinit.c                   |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/lastmod/lastmod.c               |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/noopsrch/noopsrch.c             |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nops/nops.c                     |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/alias.c                   |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/ether.c                   |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/group.c                   |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/host.c                    |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/netgroup.c                |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/network.c                 |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/nssov.c                   |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/nssov.h                   |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/pam.c                     |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/passwd.c                  |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/protocol.c                |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/rpc.c                     |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/service.c                 |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/shadow.c                  |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/passwd/argon2/pw-argon2.c       |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/passwd/kerberos.c               |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/passwd/netscape.c               |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/passwd/pbkdf2/pw-pbkdf2.c       |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/passwd/radius.c                 |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/passwd/sha2/slapd-sha2.c        |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/proxyOld/proxyOld.c             |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/samba4/pguid.c                  |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/samba4/rdnval.c                 |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/samba4/vernum.c                 |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/smbk5pwd/smbk5pwd.c             |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/trace/trace.c                   |     4 +-
 external/bsd/openldap/dist/contrib/slapi-plugins/addrdnvalues/addrdnvalues.c     |     2 +-
 external/bsd/openldap/dist/include/Makefile.in                                   |     2 +-
 external/bsd/openldap/dist/include/ac/alloca.h                                   |     2 +-
 external/bsd/openldap/dist/include/ac/assert.h                                   |     2 +-
 external/bsd/openldap/dist/include/ac/bytes.h                                    |     2 +-
 external/bsd/openldap/dist/include/ac/crypt.h                                    |     2 +-
 external/bsd/openldap/dist/include/ac/ctype.h                                    |     2 +-
 external/bsd/openldap/dist/include/ac/dirent.h                                   |     2 +-
 external/bsd/openldap/dist/include/ac/errno.h                                    |     2 +-
 external/bsd/openldap/dist/include/ac/fdset.h                                    |     2 +-
 external/bsd/openldap/dist/include/ac/localize.h                                 |     2 +-
 external/bsd/openldap/dist/include/ac/param.h                                    |     2 +-
 external/bsd/openldap/dist/include/ac/regex.h                                    |     2 +-
 external/bsd/openldap/dist/include/ac/setproctitle.h                             |     2 +-
 external/bsd/openldap/dist/include/ac/signal.h                                   |     2 +-
 external/bsd/openldap/dist/include/ac/socket.h                                   |     2 +-
 external/bsd/openldap/dist/include/ac/stdarg.h                                   |     2 +-
 external/bsd/openldap/dist/include/ac/stdlib.h                                   |     2 +-
 external/bsd/openldap/dist/include/ac/string.h                                   |     2 +-
 external/bsd/openldap/dist/include/ac/sysexits.h                                 |     2 +-
 external/bsd/openldap/dist/include/ac/syslog.h                                   |     2 +-
 external/bsd/openldap/dist/include/ac/termios.h                                  |     2 +-
 external/bsd/openldap/dist/include/ac/time.h                                     |     2 +-
 external/bsd/openldap/dist/include/ac/unistd.h                                   |     2 +-
 external/bsd/openldap/dist/include/ac/wait.h                                     |     2 +-
 external/bsd/openldap/dist/include/avl.h                                         |     2 +-
 external/bsd/openldap/dist/include/getopt-compat.h                               |     2 +-
 external/bsd/openldap/dist/include/lber.h                                        |     2 +-
 external/bsd/openldap/dist/include/lber_pvt.h                                    |     2 +-
 external/bsd/openldap/dist/include/ldap.h                                        |     2 +-
 external/bsd/openldap/dist/include/ldap_cdefs.h                                  |     2 +-
 external/bsd/openldap/dist/include/ldap_defaults.h                               |     2 +-
 external/bsd/openldap/dist/include/ldap_int_thread.h                             |     2 +-
 external/bsd/openldap/dist/include/ldap_log.h                                    |     2 +-
 external/bsd/openldap/dist/include/ldap_pvt.h                                    |     4 +-
 external/bsd/openldap/dist/include/ldap_pvt_thread.h                             |     2 +-
 external/bsd/openldap/dist/include/ldap_pvt_uc.h                                 |     2 +-
 external/bsd/openldap/dist/include/ldap_queue.h                                  |     4 +-
 external/bsd/openldap/dist/include/ldap_rq.h                                     |     2 +-
 external/bsd/openldap/dist/include/ldap_schema.h                                 |     2 +-
 external/bsd/openldap/dist/include/ldap_utf8.h                                   |     2 +-
 external/bsd/openldap/dist/include/ldif.h                                        |     2 +-
 external/bsd/openldap/dist/include/lutil.h                                       |     2 +-
 external/bsd/openldap/dist/include/lutil_hash.h                                  |     2 +-
 external/bsd/openldap/dist/include/lutil_ldap.h                                  |     2 +-
 external/bsd/openldap/dist/include/lutil_lockf.h                                 |     2 +-
 external/bsd/openldap/dist/include/lutil_md5.h                                   |     2 +-
 external/bsd/openldap/dist/include/lutil_sha1.h                                  |     2 +-
 external/bsd/openldap/dist/include/openldap.h                                    |     2 +-
 external/bsd/openldap/dist/include/portable.hin                                  |     8 +-
 external/bsd/openldap/dist/include/rewrite.h                                     |     2 +-
 external/bsd/openldap/dist/include/slapi-plugin.h                                |     2 +-
 external/bsd/openldap/dist/include/sysexits-compat.h                             |     2 +-
 external/bsd/openldap/dist/libraries/liblber/assert.c                            |     4 +-
 external/bsd/openldap/dist/libraries/liblber/bprint.c                            |     4 +-
 external/bsd/openldap/dist/libraries/liblber/debug.c                             |     4 +-
 external/bsd/openldap/dist/libraries/liblber/decode.c                            |     4 +-
 external/bsd/openldap/dist/libraries/liblber/dtest.c                             |     4 +-
 external/bsd/openldap/dist/libraries/liblber/encode.c                            |     4 +-
 external/bsd/openldap/dist/libraries/liblber/etest.c                             |     4 +-
 external/bsd/openldap/dist/libraries/liblber/idtest.c                            |     4 +-
 external/bsd/openldap/dist/libraries/liblber/io.c                                |     4 +-
 external/bsd/openldap/dist/libraries/liblber/lber-int.h                          |     2 +-
 external/bsd/openldap/dist/libraries/liblber/memory.c                            |     4 +-
 external/bsd/openldap/dist/libraries/liblber/nt_err.c                            |     4 +-
 external/bsd/openldap/dist/libraries/liblber/options.c                           |     4 +-
 external/bsd/openldap/dist/libraries/liblber/sockbuf.c                           |     4 +-
 external/bsd/openldap/dist/libraries/liblber/stdio.c                             |     4 +-
 external/bsd/openldap/dist/libraries/libldap/abandon.c                           |     4 +-
 external/bsd/openldap/dist/libraries/libldap/add.c                               |     4 +-
 external/bsd/openldap/dist/libraries/libldap/addentry.c                          |     4 +-
 external/bsd/openldap/dist/libraries/libldap/apitest.c                           |     4 +-
 external/bsd/openldap/dist/libraries/libldap/assertion.c                         |     4 +-
 external/bsd/openldap/dist/libraries/libldap/bind.c                              |     4 +-
 external/bsd/openldap/dist/libraries/libldap/cancel.c                            |     4 +-
 external/bsd/openldap/dist/libraries/libldap/charray.c                           |     4 +-
 external/bsd/openldap/dist/libraries/libldap/compare.c                           |     4 +-
 external/bsd/openldap/dist/libraries/libldap/controls.c                          |     4 +-
 external/bsd/openldap/dist/libraries/libldap/cyrus.c                             |     4 +-
 external/bsd/openldap/dist/libraries/libldap/dds.c                               |     4 +-
 external/bsd/openldap/dist/libraries/libldap/delete.c                            |     4 +-
 external/bsd/openldap/dist/libraries/libldap/deref.c                             |     4 +-
 external/bsd/openldap/dist/libraries/libldap/dnssrv.c                            |     4 +-
 external/bsd/openldap/dist/libraries/libldap/dntest.c                            |     4 +-
 external/bsd/openldap/dist/libraries/libldap/error.c                             |     4 +-
 external/bsd/openldap/dist/libraries/libldap/extended.c                          |     4 +-
 external/bsd/openldap/dist/libraries/libldap/fetch.c                             |     4 +-
 external/bsd/openldap/dist/libraries/libldap/filter.c                            |     4 +-
 external/bsd/openldap/dist/libraries/libldap/free.c                              |     4 +-
 external/bsd/openldap/dist/libraries/libldap/ftest.c                             |     4 +-
 external/bsd/openldap/dist/libraries/libldap/getattr.c                           |     4 +-
 external/bsd/openldap/dist/libraries/libldap/getdn.c                             |     4 +-
 external/bsd/openldap/dist/libraries/libldap/getentry.c                          |     4 +-
 external/bsd/openldap/dist/libraries/libldap/getvalues.c                         |     4 +-
 external/bsd/openldap/dist/libraries/libldap/gssapi.c                            |     4 +-
 external/bsd/openldap/dist/libraries/libldap/init.c                              |     4 +-
 external/bsd/openldap/dist/libraries/libldap/ldap-int.h                          |     2 +-
 external/bsd/openldap/dist/libraries/libldap/ldap-tls.h                          |     2 +-
 external/bsd/openldap/dist/libraries/libldap/ldap_sync.c                         |     4 +-
 external/bsd/openldap/dist/libraries/libldap/ldif.c                              |     4 +-
 external/bsd/openldap/dist/libraries/libldap/messages.c                          |     4 +-
 external/bsd/openldap/dist/libraries/libldap/modify.c                            |     4 +-
 external/bsd/openldap/dist/libraries/libldap/modrdn.c                            |     4 +-
 external/bsd/openldap/dist/libraries/libldap/open.c                              |     4 +-
 external/bsd/openldap/dist/libraries/libldap/options.c                           |     4 +-
 external/bsd/openldap/dist/libraries/libldap/os-ip.c                             |     6 +-
 external/bsd/openldap/dist/libraries/libldap/os-local.c                          |     6 +-
 external/bsd/openldap/dist/libraries/libldap/pagectrl.c                          |     4 +-
 external/bsd/openldap/dist/libraries/libldap/passwd.c                            |     4 +-
 external/bsd/openldap/dist/libraries/libldap/ppolicy.c                           |     4 +-
 external/bsd/openldap/dist/libraries/libldap/print.c                             |     4 +-
 external/bsd/openldap/dist/libraries/libldap/references.c                        |     4 +-
 external/bsd/openldap/dist/libraries/libldap/request.c                           |     4 +-
 external/bsd/openldap/dist/libraries/libldap/result.c                            |     4 +-
 external/bsd/openldap/dist/libraries/libldap/sasl.c                              |     4 +-
 external/bsd/openldap/dist/libraries/libldap/sbind.c                             |     4 +-
 external/bsd/openldap/dist/libraries/libldap/schema.c                            |     4 +-
 external/bsd/openldap/dist/libraries/libldap/search.c                            |     4 +-
 external/bsd/openldap/dist/libraries/libldap/sort.c                              |     4 +-
 external/bsd/openldap/dist/libraries/libldap/sortctrl.c                          |     4 +-
 external/bsd/openldap/dist/libraries/libldap/stctrl.c                            |     4 +-
 external/bsd/openldap/dist/libraries/libldap/string.c                            |     4 +-
 external/bsd/openldap/dist/libraries/libldap/t61.c                               |     4 +-
 external/bsd/openldap/dist/libraries/libldap/test.c                              |     4 +-
 external/bsd/openldap/dist/libraries/libldap/tls2.c                              |     4 +-
 external/bsd/openldap/dist/libraries/libldap/tls_g.c                             |     4 +-
 external/bsd/openldap/dist/libraries/libldap/tls_m.c                             |     4 +-
 external/bsd/openldap/dist/libraries/libldap/tls_o.c                             |     6 +-
 external/bsd/openldap/dist/libraries/libldap/turn.c                              |     4 +-
 external/bsd/openldap/dist/libraries/libldap/txn.c                               |     4 +-
 external/bsd/openldap/dist/libraries/libldap/unbind.c                            |     4 +-
 external/bsd/openldap/dist/libraries/libldap/url.c                               |     4 +-
 external/bsd/openldap/dist/libraries/libldap/urltest.c                           |     4 +-
 external/bsd/openldap/dist/libraries/libldap/utf-8-conv.c                        |     4 +-
 external/bsd/openldap/dist/libraries/libldap/utf-8.c                             |     4 +-
 external/bsd/openldap/dist/libraries/libldap/util-int.c                          |     4 +-
 external/bsd/openldap/dist/libraries/libldap/vlvctrl.c                           |     4 +-
 external/bsd/openldap/dist/libraries/libldap/whoami.c                            |     4 +-
 external/bsd/openldap/dist/libraries/libldap_r/ldap_thr_debug.h                  |     2 +-
 external/bsd/openldap/dist/libraries/libldap_r/rdwr.c                            |     4 +-
 external/bsd/openldap/dist/libraries/libldap_r/rmutex.c                          |     4 +-
 external/bsd/openldap/dist/libraries/libldap_r/rq.c                              |     4 +-
 external/bsd/openldap/dist/libraries/libldap_r/thr_cthreads.c                    |     4 +-
 external/bsd/openldap/dist/libraries/libldap_r/thr_debug.c                       |     4 +-
 external/bsd/openldap/dist/libraries/libldap_r/thr_nt.c                          |     4 +-
 external/bsd/openldap/dist/libraries/libldap_r/thr_posix.c                       |     4 +-
 external/bsd/openldap/dist/libraries/libldap_r/thr_pth.c                         |     4 +-
 external/bsd/openldap/dist/libraries/libldap_r/thr_stub.c                        |     4 +-
 external/bsd/openldap/dist/libraries/libldap_r/thr_thr.c                         |     4 +-
 external/bsd/openldap/dist/libraries/libldap_r/threads.c                         |     4 +-
 external/bsd/openldap/dist/libraries/libldap_r/tpool.c                           |     4 +-
 external/bsd/openldap/dist/libraries/liblmdb/lmdb.h                              |     2 +-
 external/bsd/openldap/dist/libraries/liblmdb/mdb.c                               |     2 +-
 external/bsd/openldap/dist/libraries/liblmdb/mdb_copy.c                          |     2 +-
 external/bsd/openldap/dist/libraries/liblmdb/mdb_dump.c                          |     2 +-
 external/bsd/openldap/dist/libraries/liblmdb/mdb_load.c                          |     2 +-
 external/bsd/openldap/dist/libraries/liblmdb/mdb_stat.c                          |     2 +-
 external/bsd/openldap/dist/libraries/liblmdb/midl.c                              |     2 +-
 external/bsd/openldap/dist/libraries/liblmdb/midl.h                              |     2 +-
 external/bsd/openldap/dist/libraries/liblmdb/mtest.c                             |     2 +-
 external/bsd/openldap/dist/libraries/liblmdb/mtest2.c                            |     2 +-
 external/bsd/openldap/dist/libraries/liblmdb/mtest3.c                            |     2 +-
 external/bsd/openldap/dist/libraries/liblmdb/mtest4.c                            |     2 +-
 external/bsd/openldap/dist/libraries/liblmdb/mtest5.c                            |     2 +-
 external/bsd/openldap/dist/libraries/liblmdb/mtest6.c                            |     2 +-
 external/bsd/openldap/dist/libraries/liblunicode/ucdata/ucdata.c                 |     4 +-
 external/bsd/openldap/dist/libraries/liblunicode/ucdata/ucdata.h                 |     2 +-
 external/bsd/openldap/dist/libraries/liblunicode/ucdata/ucgendat.c               |     4 +-
 external/bsd/openldap/dist/libraries/liblunicode/ucdata/ucpgba.c                 |     4 +-
 external/bsd/openldap/dist/libraries/liblunicode/ucdata/ucpgba.h                 |     4 +-
 external/bsd/openldap/dist/libraries/liblunicode/ucstr.c                         |     4 +-
 external/bsd/openldap/dist/libraries/liblunicode/ure/ure.c                       |     4 +-
 external/bsd/openldap/dist/libraries/liblunicode/ure/ure.h                       |     4 +-
 external/bsd/openldap/dist/libraries/liblunicode/ure/urestubs.c                  |     4 +-
 external/bsd/openldap/dist/libraries/liblunicode/utbm/utbm.c                     |     2 +-
 external/bsd/openldap/dist/libraries/liblunicode/utbm/utbm.h                     |     4 +-
 external/bsd/openldap/dist/libraries/liblunicode/utbm/utbmstub.c                 |     2 +-
 external/bsd/openldap/dist/libraries/liblutil/avl.c                              |     4 +-
 external/bsd/openldap/dist/libraries/liblutil/base64.c                           |     4 +-
 external/bsd/openldap/dist/libraries/liblutil/detach.c                           |     6 +-
 external/bsd/openldap/dist/libraries/liblutil/entropy.c                          |     4 +-
 external/bsd/openldap/dist/libraries/liblutil/getopt.c                           |     4 +-
 external/bsd/openldap/dist/libraries/liblutil/getpass.c                          |     4 +-
 external/bsd/openldap/dist/libraries/liblutil/getpeereid.c                       |     4 +-
 external/bsd/openldap/dist/libraries/liblutil/hash.c                             |     4 +-
 external/bsd/openldap/dist/libraries/liblutil/lockf.c                            |     4 +-
 external/bsd/openldap/dist/libraries/liblutil/md5.c                              |     6 +-
 external/bsd/openldap/dist/libraries/liblutil/memcmp.c                           |     4 +-
 external/bsd/openldap/dist/libraries/liblutil/ntservice.c                        |     4 +-
 external/bsd/openldap/dist/libraries/liblutil/passfile.c                         |     4 +-
 external/bsd/openldap/dist/libraries/liblutil/passwd.c                           |     6 +-
 external/bsd/openldap/dist/libraries/liblutil/ptest.c                            |     4 +-
 external/bsd/openldap/dist/libraries/liblutil/sasl.c                             |     4 +-
 external/bsd/openldap/dist/libraries/liblutil/setproctitle.c                     |     4 +-
 external/bsd/openldap/dist/libraries/liblutil/sha1.c                             |     4 +-
 external/bsd/openldap/dist/libraries/liblutil/signal.c                           |     4 +-
 external/bsd/openldap/dist/libraries/liblutil/sockpair.c                         |     4 +-
 external/bsd/openldap/dist/libraries/liblutil/tavl.c                             |     4 +-
 external/bsd/openldap/dist/libraries/liblutil/testavl.c                          |     4 +-
 external/bsd/openldap/dist/libraries/liblutil/testtavl.c                         |     4 +-
 external/bsd/openldap/dist/libraries/liblutil/utils.c                            |     4 +-
 external/bsd/openldap/dist/libraries/liblutil/uuid.c                             |     4 +-
 external/bsd/openldap/dist/libraries/librewrite/config.c                         |     2 +-
 external/bsd/openldap/dist/libraries/librewrite/context.c                        |     2 +-
 external/bsd/openldap/dist/libraries/librewrite/info.c                           |     2 +-
 external/bsd/openldap/dist/libraries/librewrite/ldapmap.c                        |     2 +-
 external/bsd/openldap/dist/libraries/librewrite/map.c                            |     2 +-
 external/bsd/openldap/dist/libraries/librewrite/params.c                         |     2 +-
 external/bsd/openldap/dist/libraries/librewrite/parse.c                          |     2 +-
 external/bsd/openldap/dist/libraries/librewrite/rewrite-int.h                    |     2 +-
 external/bsd/openldap/dist/libraries/librewrite/rewrite-map.h                    |     2 +-
 external/bsd/openldap/dist/libraries/librewrite/rewrite.c                        |     2 +-
 external/bsd/openldap/dist/libraries/librewrite/rule.c                           |     2 +-
 external/bsd/openldap/dist/libraries/librewrite/session.c                        |     4 +-
 external/bsd/openldap/dist/libraries/librewrite/subst.c                          |     2 +-
 external/bsd/openldap/dist/libraries/librewrite/var.c                            |     2 +-
 external/bsd/openldap/dist/libraries/librewrite/xmap.c                           |     2 +-
 external/bsd/openldap/dist/servers/slapd/abandon.c                               |     4 +-
 external/bsd/openldap/dist/servers/slapd/aci.c                                   |     4 +-
 external/bsd/openldap/dist/servers/slapd/acl.c                                   |     4 +-
 external/bsd/openldap/dist/servers/slapd/aclparse.c                              |     4 +-
 external/bsd/openldap/dist/servers/slapd/ad.c                                    |     4 +-
 external/bsd/openldap/dist/servers/slapd/add.c                                   |     4 +-
 external/bsd/openldap/dist/servers/slapd/alock.c                                 |     4 +-
 external/bsd/openldap/dist/servers/slapd/alock.h                                 |     4 +-
 external/bsd/openldap/dist/servers/slapd/at.c                                    |     4 +-
 external/bsd/openldap/dist/servers/slapd/attr.c                                  |     4 +-
 external/bsd/openldap/dist/servers/slapd/ava.c                                   |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/add.c                          |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/attr.c                         |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/back-bdb.h                     |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/bind.c                         |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/cache.c                        |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/compare.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/config.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/dbcache.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/delete.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/dn2entry.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/dn2id.c                        |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/error.c                        |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/extended.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/filterindex.c                  |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/id2entry.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/idl.c                          |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/idl.h                          |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/index.c                        |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/init.c                         |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/key.c                          |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/modify.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/modrdn.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/monitor.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/nextid.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/operational.c                  |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/proto-bdb.h                    |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/referral.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/search.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/tools.c                        |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/trans.c                        |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-dnssrv/bind.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-dnssrv/compare.c                   |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-dnssrv/config.c                    |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-dnssrv/init.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-dnssrv/proto-dnssrv.h              |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-dnssrv/referral.c                  |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-dnssrv/search.c                    |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-hdb/back-bdb.h                     |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/add.c                         |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/back-ldap.h                   |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/bind.c                        |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/chain.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/compare.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/config.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/delete.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/distproc.c                    |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/extended.c                    |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/init.c                        |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/modify.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/modrdn.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/monitor.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/pbind.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/proto-ldap.h                  |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/search.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/unbind.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-ldif/ldif.c                        |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/add.c                          |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/attr.c                         |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/back-mdb.h                     |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/bind.c                         |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/compare.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/config.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/delete.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/dn2entry.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/dn2id.c                        |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/extended.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/filterindex.c                  |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/id2entry.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/idl.c                          |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/idl.h                          |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/index.c                        |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/init.c                         |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/key.c                          |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/modify.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/modrdn.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/monitor.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/nextid.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/operational.c                  |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/proto-mdb.h                    |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/referral.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/search.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/tools.c                        |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/add.c                         |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/back-meta.h                   |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/bind.c                        |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/candidates.c                  |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/compare.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/config.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/conn.c                        |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/delete.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/dncache.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/init.c                        |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/map.c                         |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/modify.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/modrdn.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/proto-meta.h                  |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/search.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/suffixmassage.c               |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/unbind.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/back-monitor.h             |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/backend.c                  |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/bind.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/cache.c                    |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/compare.c                  |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/conn.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/database.c                 |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/entry.c                    |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/init.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/listener.c                 |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/log.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/modify.c                   |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/operation.c                |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/operational.c              |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/overlay.c                  |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/proto-back-monitor.h       |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/rww.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/search.c                   |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/sent.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/thread.c                   |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/time.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-ndb/back-ndb.h                     |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-ndb/proto-ndb.h                    |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-null/null.c                        |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-passwd/back-passwd.h               |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-passwd/config.c                    |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-passwd/init.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-passwd/proto-passwd.h              |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-passwd/search.c                    |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-perl/add.c                         |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-perl/asperl_undefs.h               |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-perl/bind.c                        |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-perl/close.c                       |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-perl/compare.c                     |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-perl/config.c                      |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-perl/delete.c                      |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-perl/init.c                        |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-perl/modify.c                      |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-perl/modrdn.c                      |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-perl/perl_back.h                   |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-perl/proto-perl.h                  |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-perl/search.c                      |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-relay/back-relay.h                 |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-relay/init.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-relay/op.c                         |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-relay/proto-back-relay.h           |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-shell/add.c                        |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-shell/bind.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-shell/compare.c                    |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-shell/config.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-shell/delete.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-shell/fork.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-shell/init.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-shell/modify.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-shell/modrdn.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-shell/proto-shell.h                |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-shell/result.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-shell/search.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-shell/shell.h                      |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-shell/unbind.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sock/add.c                         |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sock/back-sock.h                   |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-sock/bind.c                        |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sock/compare.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sock/config.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sock/delete.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sock/extended.c                    |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sock/init.c                        |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sock/modify.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sock/modrdn.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sock/opensock.c                    |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sock/proto-sock.h                  |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-sock/result.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sock/search.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sock/unbind.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/add.c                          |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/api.c                          |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/back-sql.h                     |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/bind.c                         |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/compare.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/config.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/delete.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/entry-id.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/init.c                         |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/modify.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/modrdn.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/operational.c                  |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/proto-sql.h                    |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/schema-map.c                   |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/search.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/sql-wrap.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/util.c                         |     4 +-
 external/bsd/openldap/dist/servers/slapd/backend.c                               |     4 +-
 external/bsd/openldap/dist/servers/slapd/backglue.c                              |     4 +-
 external/bsd/openldap/dist/servers/slapd/backover.c                              |     4 +-
 external/bsd/openldap/dist/servers/slapd/bconfig.c                               |     4 +-
 external/bsd/openldap/dist/servers/slapd/bind.c                                  |     4 +-
 external/bsd/openldap/dist/servers/slapd/cancel.c                                |     4 +-
 external/bsd/openldap/dist/servers/slapd/ch_malloc.c                             |     4 +-
 external/bsd/openldap/dist/servers/slapd/compare.c                               |     4 +-
 external/bsd/openldap/dist/servers/slapd/component.c                             |     4 +-
 external/bsd/openldap/dist/servers/slapd/component.h                             |     4 +-
 external/bsd/openldap/dist/servers/slapd/config.c                                |     4 +-
 external/bsd/openldap/dist/servers/slapd/config.h                                |     2 +-
 external/bsd/openldap/dist/servers/slapd/connection.c                            |     4 +-
 external/bsd/openldap/dist/servers/slapd/controls.c                              |     4 +-
 external/bsd/openldap/dist/servers/slapd/cr.c                                    |     4 +-
 external/bsd/openldap/dist/servers/slapd/ctxcsn.c                                |     4 +-
 external/bsd/openldap/dist/servers/slapd/daemon.c                                |     4 +-
 external/bsd/openldap/dist/servers/slapd/delete.c                                |     4 +-
 external/bsd/openldap/dist/servers/slapd/dn.c                                    |     4 +-
 external/bsd/openldap/dist/servers/slapd/entry.c                                 |     4 +-
 external/bsd/openldap/dist/servers/slapd/extended.c                              |     4 +-
 external/bsd/openldap/dist/servers/slapd/filter.c                                |    47 +-
 external/bsd/openldap/dist/servers/slapd/filterentry.c                           |     4 +-
 external/bsd/openldap/dist/servers/slapd/frontend.c                              |     4 +-
 external/bsd/openldap/dist/servers/slapd/globals.c                               |     4 +-
 external/bsd/openldap/dist/servers/slapd/index.c                                 |     4 +-
 external/bsd/openldap/dist/servers/slapd/init.c                                  |     4 +-
 external/bsd/openldap/dist/servers/slapd/ldapsync.c                              |     4 +-
 external/bsd/openldap/dist/servers/slapd/limits.c                                |     4 +-
 external/bsd/openldap/dist/servers/slapd/lock.c                                  |     4 +-
 external/bsd/openldap/dist/servers/slapd/main.c                                  |     4 +-
 external/bsd/openldap/dist/servers/slapd/matchedValues.c                         |     4 +-
 external/bsd/openldap/dist/servers/slapd/modify.c                                |     4 +-
 external/bsd/openldap/dist/servers/slapd/modrdn.c                                |     4 +-
 external/bsd/openldap/dist/servers/slapd/mods.c                                  |     4 +-
 external/bsd/openldap/dist/servers/slapd/module.c                                |     4 +-
 external/bsd/openldap/dist/servers/slapd/mr.c                                    |     4 +-
 external/bsd/openldap/dist/servers/slapd/mra.c                                   |     4 +-
 external/bsd/openldap/dist/servers/slapd/nt_svc.c                                |     4 +-
 external/bsd/openldap/dist/servers/slapd/oc.c                                    |     4 +-
 external/bsd/openldap/dist/servers/slapd/oidm.c                                  |     4 +-
 external/bsd/openldap/dist/servers/slapd/operation.c                             |     4 +-
 external/bsd/openldap/dist/servers/slapd/operational.c                           |     4 +-
 external/bsd/openldap/dist/servers/slapd/overlays/accesslog.c                    |     4 +-
 external/bsd/openldap/dist/servers/slapd/overlays/auditlog.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/overlays/collect.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/overlays/constraint.c                   |     4 +-
 external/bsd/openldap/dist/servers/slapd/overlays/dds.c                          |     4 +-
 external/bsd/openldap/dist/servers/slapd/overlays/deref.c                        |     6 +-
 external/bsd/openldap/dist/servers/slapd/overlays/dyngroup.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/overlays/dynlist.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/overlays/overlays.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/overlays/pcache.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/overlays/ppolicy.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/overlays/refint.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/overlays/retcode.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/overlays/rwm.c                          |     4 +-
 external/bsd/openldap/dist/servers/slapd/overlays/rwm.h                          |     2 +-
 external/bsd/openldap/dist/servers/slapd/overlays/rwmconf.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/overlays/rwmdn.c                        |     4 +-
 external/bsd/openldap/dist/servers/slapd/overlays/rwmmap.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/overlays/seqmod.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/overlays/sssvlv.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/overlays/syncprov.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/overlays/translucent.c                  |     4 +-
 external/bsd/openldap/dist/servers/slapd/overlays/unique.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/overlays/valsort.c                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/passwd.c                                |     4 +-
 external/bsd/openldap/dist/servers/slapd/phonetic.c                              |     4 +-
 external/bsd/openldap/dist/servers/slapd/proto-slap.h                            |     2 +-
 external/bsd/openldap/dist/servers/slapd/referral.c                              |     4 +-
 external/bsd/openldap/dist/servers/slapd/result.c                                |     4 +-
 external/bsd/openldap/dist/servers/slapd/root_dse.c                              |     4 +-
 external/bsd/openldap/dist/servers/slapd/sasl.c                                  |     4 +-
 external/bsd/openldap/dist/servers/slapd/saslauthz.c                             |     4 +-
 external/bsd/openldap/dist/servers/slapd/schema.c                                |     4 +-
 external/bsd/openldap/dist/servers/slapd/schema_check.c                          |     4 +-
 external/bsd/openldap/dist/servers/slapd/schema_init.c                           |     4 +-
 external/bsd/openldap/dist/servers/slapd/schema_prep.c                           |     4 +-
 external/bsd/openldap/dist/servers/slapd/schemaparse.c                           |     4 +-
 external/bsd/openldap/dist/servers/slapd/search.c                                |     4 +-
 external/bsd/openldap/dist/servers/slapd/sets.c                                  |     4 +-
 external/bsd/openldap/dist/servers/slapd/sets.h                                  |     2 +-
 external/bsd/openldap/dist/servers/slapd/shell-backends/passwd-shell.c           |     4 +-
 external/bsd/openldap/dist/servers/slapd/shell-backends/shellutil.c              |     4 +-
 external/bsd/openldap/dist/servers/slapd/shell-backends/shellutil.h              |     2 +-
 external/bsd/openldap/dist/servers/slapd/sl_malloc.c                             |     4 +-
 external/bsd/openldap/dist/servers/slapd/slap.h                                  |     2 +-
 external/bsd/openldap/dist/servers/slapd/slapacl.c                               |     4 +-
 external/bsd/openldap/dist/servers/slapd/slapadd.c                               |     4 +-
 external/bsd/openldap/dist/servers/slapd/slapauth.c                              |     4 +-
 external/bsd/openldap/dist/servers/slapd/slapcat.c                               |     4 +-
 external/bsd/openldap/dist/servers/slapd/slapcommon.c                            |     4 +-
 external/bsd/openldap/dist/servers/slapd/slapcommon.h                            |     2 +-
 external/bsd/openldap/dist/servers/slapd/slapdn.c                                |     4 +-
 external/bsd/openldap/dist/servers/slapd/slapi/plugin.c                          |     4 +-
 external/bsd/openldap/dist/servers/slapd/slapi/printmsg.c                        |     2 +-
 external/bsd/openldap/dist/servers/slapd/slapi/proto-slapi.h                     |     2 +-
 external/bsd/openldap/dist/servers/slapd/slapi/slapi.h                           |     2 +-
 external/bsd/openldap/dist/servers/slapd/slapi/slapi_dn.c                        |     4 +-
 external/bsd/openldap/dist/servers/slapd/slapi/slapi_ext.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/slapi/slapi_ops.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/slapi/slapi_overlay.c                   |     4 +-
 external/bsd/openldap/dist/servers/slapd/slapi/slapi_pblock.c                    |     4 +-
 external/bsd/openldap/dist/servers/slapd/slapi/slapi_utils.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/slapindex.c                             |     4 +-
 external/bsd/openldap/dist/servers/slapd/slappasswd.c                            |     4 +-
 external/bsd/openldap/dist/servers/slapd/slapschema.c                            |     4 +-
 external/bsd/openldap/dist/servers/slapd/slaptest.c                              |     4 +-
 external/bsd/openldap/dist/servers/slapd/starttls.c                              |     4 +-
 external/bsd/openldap/dist/servers/slapd/str2filter.c                            |     4 +-
 external/bsd/openldap/dist/servers/slapd/syncrepl.c                              |     4 +-
 external/bsd/openldap/dist/servers/slapd/syntax.c                                |     4 +-
 external/bsd/openldap/dist/servers/slapd/txn.c                                   |     4 +-
 external/bsd/openldap/dist/servers/slapd/unbind.c                                |     4 +-
 external/bsd/openldap/dist/servers/slapd/user.c                                  |     4 +-
 external/bsd/openldap/dist/servers/slapd/value.c                                 |     4 +-
 external/bsd/openldap/dist/servers/slapd/zn_malloc.c                             |     4 +-
 external/bsd/openldap/dist/tests/progs/ldif-filter.c                             |     4 +-
 external/bsd/openldap/dist/tests/progs/slapd-addel.c                             |     4 +-
 external/bsd/openldap/dist/tests/progs/slapd-bind.c                              |     4 +-
 external/bsd/openldap/dist/tests/progs/slapd-common.c                            |     4 +-
 external/bsd/openldap/dist/tests/progs/slapd-common.h                            |     2 +-
 external/bsd/openldap/dist/tests/progs/slapd-modify.c                            |     4 +-
 external/bsd/openldap/dist/tests/progs/slapd-modrdn.c                            |     4 +-
 external/bsd/openldap/dist/tests/progs/slapd-mtread.c                            |     4 +-
 external/bsd/openldap/dist/tests/progs/slapd-read.c                              |     4 +-
 external/bsd/openldap/dist/tests/progs/slapd-search.c                            |     4 +-
 external/bsd/openldap/dist/tests/progs/slapd-tester.c                            |     4 +-
 external/bsd/openldap/include/Makefile                                           |     4 +-
 external/bsd/openldap/include/lber_types.h                                       |     2 +-
 external/bsd/openldap/include/ldap_config.h                                      |     4 +-
 external/bsd/openldap/include/ldap_features.h                                    |     6 +-
 external/bsd/openldap/include/portable.h                                         |    18 +-
 external/bsd/openldap/man/lber-decode.3                                          |     6 +-
 external/bsd/openldap/man/lber-encode.3                                          |     8 +-
 external/bsd/openldap/man/lber-memory.3                                          |     6 +-
 external/bsd/openldap/man/lber-sockbuf.3                                         |     6 +-
 external/bsd/openldap/man/lber-types.3                                           |     6 +-
 external/bsd/openldap/man/ldap.3                                                 |     6 +-
 external/bsd/openldap/man/ldap.conf.5                                            |    22 +-
 external/bsd/openldap/man/ldap_abandon.3                                         |     6 +-
 external/bsd/openldap/man/ldap_add.3                                             |     6 +-
 external/bsd/openldap/man/ldap_bind.3                                            |    14 +-
 external/bsd/openldap/man/ldap_compare.3                                         |     6 +-
 external/bsd/openldap/man/ldap_controls.3                                        |     6 +-
 external/bsd/openldap/man/ldap_delete.3                                          |     6 +-
 external/bsd/openldap/man/ldap_dup.3                                             |     6 +-
 external/bsd/openldap/man/ldap_error.3                                           |     6 +-
 external/bsd/openldap/man/ldap_extended_operation.3                              |     6 +-
 external/bsd/openldap/man/ldap_first_attribute.3                                 |     6 +-
 external/bsd/openldap/man/ldap_first_entry.3                                     |     6 +-
 external/bsd/openldap/man/ldap_first_message.3                                   |     6 +-
 external/bsd/openldap/man/ldap_first_reference.3                                 |     6 +-
 external/bsd/openldap/man/ldap_get_dn.3                                          |    10 +-
 external/bsd/openldap/man/ldap_get_option.3                                      |    30 +-
 external/bsd/openldap/man/ldap_get_values.3                                      |     6 +-
 external/bsd/openldap/man/ldap_memory.3                                          |     6 +-
 external/bsd/openldap/man/ldap_modify.3                                          |     6 +-
 external/bsd/openldap/man/ldap_modrdn.3                                          |     6 +-
 external/bsd/openldap/man/ldap_open.3                                            |     8 +-
 external/bsd/openldap/man/ldap_parse_reference.3                                 |     6 +-
 external/bsd/openldap/man/ldap_parse_result.3                                    |     6 +-
 external/bsd/openldap/man/ldap_parse_sort_control.3                              |     6 +-
 external/bsd/openldap/man/ldap_parse_vlv_control.3                               |     6 +-
 external/bsd/openldap/man/ldap_rename.3                                          |     6 +-
 external/bsd/openldap/man/ldap_result.3                                          |     6 +-
 external/bsd/openldap/man/ldap_schema.3                                          |     6 +-
 external/bsd/openldap/man/ldap_search.3                                          |     6 +-
 external/bsd/openldap/man/ldap_sort.3                                            |     6 +-
 external/bsd/openldap/man/ldap_sync.3                                            |     4 +-
 external/bsd/openldap/man/ldap_tls.3                                             |     6 +-
 external/bsd/openldap/man/ldap_url.3                                             |     6 +-
 external/bsd/openldap/man/ldapcompare.1                                          |     6 +-
 external/bsd/openldap/man/ldapdelete.1                                           |     6 +-
 external/bsd/openldap/man/ldapexop.1                                             |     2 +-
 external/bsd/openldap/man/ldapmodify.1                                           |     6 +-
 external/bsd/openldap/man/ldapmodrdn.1                                           |     6 +-
 external/bsd/openldap/man/ldappasswd.1                                           |     6 +-
 external/bsd/openldap/man/ldapsearch.1                                           |    11 +-
 external/bsd/openldap/man/ldapurl.1                                              |     8 +-
 external/bsd/openldap/man/ldapwhoami.1                                           |     6 +-
 external/bsd/openldap/man/ldif.5                                                 |     6 +-
 external/bsd/openldap/man/slapacl.8                                              |     6 +-
 external/bsd/openldap/man/slapadd.8                                              |     8 +-
 external/bsd/openldap/man/slapauth.8                                             |     6 +-
 external/bsd/openldap/man/slapcat.8                                              |    13 +-
 external/bsd/openldap/man/slapd-bdb.5                                            |    15 +-
 external/bsd/openldap/man/slapd-config.5                                         |    74 +-
 external/bsd/openldap/man/slapd-dnssrv.5                                         |     4 +-
 external/bsd/openldap/man/slapd-ldap.5                                           |    51 +-
 external/bsd/openldap/man/slapd-ldif.5                                           |     4 +-
 external/bsd/openldap/man/slapd-mdb.5                                            |    24 +-
 external/bsd/openldap/man/slapd-meta.5                                           |    39 +-
 external/bsd/openldap/man/slapd-monitor.5                                        |     6 +-
 external/bsd/openldap/man/slapd-ndb.5                                            |     4 +-
 external/bsd/openldap/man/slapd-null.5                                           |     9 +-
 external/bsd/openldap/man/slapd-passwd.5                                         |     4 +-
 external/bsd/openldap/man/slapd-perl.5                                           |     2 +-
 external/bsd/openldap/man/slapd-relay.5                                          |     6 +-
 external/bsd/openldap/man/slapd-shell.5                                          |     4 +-
 external/bsd/openldap/man/slapd-sock.5                                           |    32 +-
 external/bsd/openldap/man/slapd-sql.5                                            |     4 +-
 external/bsd/openldap/man/slapd.8                                                |    10 +-
 external/bsd/openldap/man/slapd.access.5                                         |    10 +-
 external/bsd/openldap/man/slapd.backends.5                                       |    17 +-
 external/bsd/openldap/man/slapd.conf.5                                           |    80 +-
 external/bsd/openldap/man/slapd.overlays.5                                       |     6 +-
 external/bsd/openldap/man/slapd.plugin.5                                         |     6 +-
 external/bsd/openldap/man/slapdn.8                                               |     6 +-
 external/bsd/openldap/man/slapindex.8                                            |    11 +-
 external/bsd/openldap/man/slapo-accesslog.5                                      |     4 +-
 external/bsd/openldap/man/slapo-auditlog.5                                       |     6 +-
 external/bsd/openldap/man/slapo-chain.5                                          |     4 +-
 external/bsd/openldap/man/slapo-collect.5                                        |     6 +-
 external/bsd/openldap/man/slapo-constraint.5                                     |    10 +-
 external/bsd/openldap/man/slapo-dds.5                                            |    12 +-
 external/bsd/openldap/man/slapo-dyngroup.5                                       |     4 +-
 external/bsd/openldap/man/slapo-dynlist.5                                        |     4 +-
 external/bsd/openldap/man/slapo-memberof.5                                       |     9 +-
 external/bsd/openldap/man/slapo-pbind.5                                          |     4 +-
 external/bsd/openldap/man/slapo-pcache.5                                         |     6 +-
 external/bsd/openldap/man/slapo-ppolicy.5                                        |    36 +-
 external/bsd/openldap/man/slapo-refint.5                                         |     6 +-
 external/bsd/openldap/man/slapo-retcode.5                                        |     6 +-
 external/bsd/openldap/man/slapo-rwm.5                                            |    10 +-
 external/bsd/openldap/man/slapo-sssvlv.5                                         |     4 +-
 external/bsd/openldap/man/slapo-syncprov.5                                       |    18 +-
 external/bsd/openldap/man/slapo-translucent.5                                    |     4 +-
 external/bsd/openldap/man/slapo-unique.5                                         |     6 +-
 external/bsd/openldap/man/slapo-valsort.5                                        |     6 +-
 external/bsd/openldap/man/slappasswd.8                                           |     6 +-
 external/bsd/openldap/man/slapschema.8                                           |     6 +-
 external/bsd/openldap/man/slaptest.8                                             |     6 +-
 external/bsd/openldap/openldap2netbsd                                            |    15 +-
 756 files changed, 5524 insertions(+), 5018 deletions(-)

diffs (truncated from 22741 to 300 lines):

diff -r bcc71781c112 -r a1969b3a9a54 external/bsd/openldap/Makefile
--- a/external/bsd/openldap/Makefile    Tue Aug 11 13:12:00 2020 +0000
+++ b/external/bsd/openldap/Makefile    Tue Aug 11 13:15:33 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2018/05/01 19:59:43 christos Exp $
+#      $NetBSD: Makefile,v 1.4 2020/08/11 13:15:33 christos Exp $
 
 .include "openldap.mk"
 
@@ -30,6 +30,8 @@
 CONFIGURE_ARGS+=       --localstatedir=${LDAP_RUNDIR}
 
 CONFIGURE_ARGS+=       --enable-dynamic
+CONFIGURE_ARGS+=       --disable-bdb
+CONFIGURE_ARGS+=       --disable-hdb
 CONFIGURE_ARGS+=       --disable-slapd
 CONFIGURE_ARGS+=       --with-tls=openssl
 CONFIGURE_ARGS+=       --with-threads
diff -r bcc71781c112 -r a1969b3a9a54 external/bsd/openldap/dist/build/config.guess
--- a/external/bsd/openldap/dist/build/config.guess     Tue Aug 11 13:12:00 2020 +0000
+++ b/external/bsd/openldap/dist/build/config.guess     Tue Aug 11 13:15:33 2020 +0000
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2017 Free Software Foundation, Inc.
+#   Copyright 1992-2020 Free Software Foundation, Inc.
 
-timestamp='2017-01-01'
+timestamp='2020-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -27,7 +27,7 @@
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 #
 # Please send patches to <config-patches%gnu.org@localhost>.
 
@@ -39,7 +39,7 @@
 
 Output the configuration name of the system \`$me' is run on.
 
-Operation modes:
+Options:
   -h, --help         print this help, then exit
   -t, --time-stamp   print date of last modification, then exit
   -v, --version      print version number, then exit
@@ -50,7 +50,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2017 Free Software Foundation, Inc.
+Copyright 1992-2020 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -84,8 +84,6 @@
   exit 1
 fi
 
-trap 'exit 1' 1 2 15
-
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
 # temporary files to be created and, as you can see below, it is a
@@ -96,34 +94,40 @@
 
 # Portable tmp directory creation inspired by the Autoconf team.
 
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-       for c in cc gcc c89 c99 ; do
-         if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-            CC_FOR_BUILD="$c"; break ;
-         fi ;
-       done ;
-       if test x"$CC_FOR_BUILD" = x ; then
-         CC_FOR_BUILD=no_compiler_found ;
-       fi
-       ;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+tmp=
+# shellcheck disable=SC2172
+trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
+
+set_cc_for_build() {
+    # prevent multiple calls if $tmp is already set
+    test "$tmp" && return 0
+    : "${TMPDIR=/tmp}"
+    # shellcheck disable=SC2039
+    { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+       { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
+       { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+       { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
+    dummy=$tmp/dummy
+    case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
+       ,,)    echo "int x;" > "$dummy.c"
+              for driver in cc gcc c89 c99 ; do
+                  if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+                      CC_FOR_BUILD="$driver"
+                      break
+                  fi
+              done
+              if test x"$CC_FOR_BUILD" = x ; then
+                  CC_FOR_BUILD=no_compiler_found
+              fi
+              ;;
+       ,,*)   CC_FOR_BUILD=$CC ;;
+       ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+    esac
+}
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi%noc.rutgers.edu@localhost 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+if test -f /.attbin/uname ; then
        PATH=$PATH:/.attbin ; export PATH
 fi
 
@@ -132,14 +136,14 @@
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-case "${UNAME_SYSTEM}" in
+case "$UNAME_SYSTEM" in
 Linux|GNU|GNU/*)
        # If the system lacks a compiler, then just pick glibc.
        # We could probably try harder.
        LIBC=gnu
 
-       eval $set_cc_for_build
-       cat <<-EOF > $dummy.c
+       set_cc_for_build
+       cat <<-EOF > "$dummy.c"
        #include <features.h>
        #if defined(__UCLIBC__)
        LIBC=uclibc
@@ -149,13 +153,20 @@
        LIBC=gnu
        #endif
        EOF
-       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+       eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
+
+       # If ldd exists, use it to detect musl libc.
+       if command -v ldd >/dev/null && \
+               ldd --version 2>&1 | grep -q ^musl
+       then
+           LIBC=musl
+       fi
        ;;
 esac
 
 # Note: order is significant - the case branches are not exclusive.
 
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
     *:NetBSD:*:*)
        # NetBSD (nbsd) targets should (where applicable) match one or
        # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
@@ -169,30 +180,30 @@
        # portion of the name.  We always set it to "unknown".
        sysctl="sysctl -n hw.machine_arch"
        UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
-           /sbin/$sysctl 2>/dev/null || \
-           /usr/sbin/$sysctl 2>/dev/null || \
+           "/sbin/$sysctl" 2>/dev/null || \
+           "/usr/sbin/$sysctl" 2>/dev/null || \
            echo unknown)`
-       case "${UNAME_MACHINE_ARCH}" in
+       case "$UNAME_MACHINE_ARCH" in
            armeb) machine=armeb-unknown ;;
            arm*) machine=arm-unknown ;;
            sh3el) machine=shl-unknown ;;
            sh3eb) machine=sh-unknown ;;
            sh5el) machine=sh5le-unknown ;;
            earmv*)
-               arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
-               endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
-               machine=${arch}${endian}-unknown
+               arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+               endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
+               machine="${arch}${endian}"-unknown
                ;;
-           *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+           *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
        esac
        # The Operating System including object format, if it has switched
        # to ELF recently (or will in the future) and ABI.
-       case "${UNAME_MACHINE_ARCH}" in
+       case "$UNAME_MACHINE_ARCH" in
            earm*)
                os=netbsdelf
                ;;
            arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-               eval $set_cc_for_build
+               set_cc_for_build
                if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
                        | grep -q __ELF__
                then
@@ -208,10 +219,10 @@
                ;;
        esac
        # Determine ABI tags.
-       case "${UNAME_MACHINE_ARCH}" in
+       case "$UNAME_MACHINE_ARCH" in
            earm*)
                expr='s/^earmv[0-9]/-eabi/;s/eb$//'
-               abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+               abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
                ;;
        esac
        # The OS release
@@ -219,45 +230,60 @@
        # thus, need a distinct triplet. However, they do not need
        # kernel version information, so it can be replaced with a
        # suitable tag, in the style of linux-gnu.
-       case "${UNAME_VERSION}" in
+       case "$UNAME_VERSION" in
            Debian*)
                release='-gnu'
                ;;
            *)
-               release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
+               release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
                ;;
        esac
        # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
        # contains redundant information, the shorter form:
        # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-       echo "${machine}-${os}${release}${abi}"
+       echo "$machine-${os}${release}${abi-}"
        exit ;;
     *:Bitrig:*:*)
        UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-       echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+       echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
        exit ;;
     *:OpenBSD:*:*)
        UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-       echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+       echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
        exit ;;
     *:LibertyBSD:*:*)
        UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
-       echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
+       echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
+       exit ;;
+    *:MidnightBSD:*:*)
+       echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
        exit ;;
     *:ekkoBSD:*:*)
-       echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+       echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
        exit ;;
     *:SolidBSD:*:*)
-       echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+       echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
+       exit ;;
+    *:OS108:*:*)
+       echo "$UNAME_MACHINE"-unknown-os108_"$UNAME_RELEASE"
        exit ;;
     macppc:MirBSD:*:*)
-       echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+       echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
        exit ;;
     *:MirBSD:*:*)
-       echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+       echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
        exit ;;
     *:Sortix:*:*)
-       echo ${UNAME_MACHINE}-unknown-sortix
+       echo "$UNAME_MACHINE"-unknown-sortix
+       exit ;;
+    *:Twizzler:*:*)
+       echo "$UNAME_MACHINE"-unknown-twizzler



Home | Main Index | Thread Index | Old Index