HardenedBSD/src d429ecacontrib/apr configure, contrib/apr-util configure

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        share/man/man5/src.conf.5 (unresolved)
DeltaFile
+0-32,465contrib/apr/configure
+31,999-0contrib/arm-optimized-routines/math/test/traces/sincosf.txt
+0-30,335contrib/subversion/configure
+0-25,340contrib/apr-util/configure
+0-16,709contrib/subversion/subversion/libsvn_wc/wc_db.c
+16,000-0contrib/arm-optimized-routines/math/test/traces/exp.txt
+47,999-104,84910,834 files not shown
+702,320-1,092,88210,840 files

HardenedBSD/src 93edb77contrib/apr configure, contrib/apr-util configure

Merge remote-tracking branch 'origin/freebsd/current/main' into hardened/current/master

Conflicts:
        share/man/man5/src.conf.5 (unresolved)
        share/mk/src.opts.mk (unresolved)
        sys/modules/Makefile (unresolved)
        usr.bin/svn/Makefile.inc (deleted)
        usr.bin/svn/svn/Makefile (deleted)
        usr.sbin/bsdinstall/scripts/jail (unresolved)
DeltaFile
+0-32,465contrib/apr/configure
+0-30,335contrib/subversion/configure
+0-25,340contrib/apr-util/configure
+0-16,709contrib/subversion/subversion/libsvn_wc/wc_db.c
+0-14,391contrib/subversion/subversion/libsvn_subr/utf8proc/utf8proc_data.c
+0-13,527contrib/subversion/subversion/libsvn_client/conflicts.c
+0-132,7671,317 files not shown
+2,991-836,9691,323 files

HardenedBSD/src 0333fadcontrib/apr configure, contrib/apr-util configure

Remove svnlite.

Reviewed by:    bcr, imp, emaste
Differential Revision:  https://reviews.freebsd.org/D30737
DeltaFile
+0-32,465contrib/apr/configure
+0-30,335contrib/subversion/configure
+0-25,340contrib/apr-util/configure
+0-16,709contrib/subversion/subversion/libsvn_wc/wc_db.c
+0-14,391contrib/subversion/subversion/libsvn_subr/utf8proc/utf8proc_data.c
+0-13,527contrib/subversion/subversion/libsvn_client/conflicts.c
+0-132,7671,267 files not shown
+25-828,1871,273 files

HardenedBSD/src c7ce6b0contrib/libstdc++ configure, lib/clang/liblldb LLDBWrapLua.cpp

Merge branch 'hardened/current/master' into hardened/current/uninit-autoinit
DeltaFile
+0-111,817contrib/libstdc++/configure
+72,183-0lib/clang/liblldb/LLDBWrapLua.cpp
+71,590-432tools/tools/locale/etc/final-maps/widths.txt
+31,726-39,305share/ctypedef/ja_JP.eucJP.src
+59,521-0sys/contrib/dev/iwm/iwm-9000-34.fw.uu
+59,517-0sys/contrib/dev/iwm/iwm-9260-34.fw.uu
+294,537-151,55460,534 files not shown
+10,288,584-10,879,88160,540 files

HardenedBSD/src dd034b6contrib/sqlite3 sqlite3.c, contrib/subversion/subversion/libsvn_subr/utf8proc utf8proc_data.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        Makefile.inc1 (unresolved)
        lib/csu/amd64/Makefile (unresolved)
        lib/csu/i386/Makefile (unresolved)
        share/man/man5/src.conf.5 (unresolved)
DeltaFile
+31,726-39,305share/ctypedef/ja_JP.eucJP.src
+11,659-6,934contrib/sqlite3/sqlite3.c
+7,544-7,544contrib/subversion/subversion/libsvn_subr/utf8proc/utf8proc_data.c
+9,480-0sys/dev/ice/ice_hw_autogen.h
+8,000-0sys/dev/ice/ice_lib.c
+5,910-1,341sys/netinet/tcp_stacks/rack.c
+74,319-55,1245,522 files not shown
+530,662-214,3455,528 files

HardenedBSD/src bdb3e05contrib/apr configure, contrib/subversion configure build-outputs.mk

Merge branch 'freebsd/12-stable/master' into hardened/12-stable/master

* freebsd/12-stable/master:
  Update Subversion and dependencies to 1.14.0 LTS.
DeltaFile
+7,544-7,544contrib/subversion/subversion/libsvn_subr/utf8proc/utf8proc_data.c
+3,099-779contrib/subversion/subversion/libsvn_client/conflicts.c
+2,691-1,104contrib/apr/configure
+1,769-798contrib/subversion/configure
+2,124-0contrib/subversion/subversion/libsvn_client/shelf2.c
+914-979contrib/subversion/build-outputs.mk
+18,141-11,204486 files not shown
+55,030-25,890492 files

HardenedBSD/src 5425b5bcontrib/apr configure, contrib/subversion configure

Update Subversion and dependencies to 1.14.0 LTS.

MFC r323365 (by jonathan):

Remove redundant source and object files.

Reviewed by:    bdrewery, ngie
Sponsored by:   DARPA, AFRL
Differential Revision:  https://reviews.freebsd.org/D12208

MFC r327739 (by asomers):

Add Pull Request to the Subversion commit template

Reviewed by:    emaste
Differential Revision:  https://reviews.freebsd.org/D13178

MFC r333354 (by peter):


    [88 lines not shown]
DeltaFile
+14,235-13,232contrib/subversion/subversion/libsvn_subr/utf8proc/utf8proc_data.c
+13,527-0contrib/subversion/subversion/libsvn_client/conflicts.c
+2,691-1,104contrib/apr/configure
+2,236-631contrib/subversion/configure
+1,609-945contrib/subversion/subversion/libsvn_repos/authz.c
+1,560-635contrib/subversion/subversion/svn/conflict-callbacks.c
+35,858-16,547750 files not shown
+124,994-49,481756 files

HardenedBSD/src f959831contrib/apr configure, contrib/subversion configure build-outputs.mk

Update Subversion and dependencies to 1.14.0 LTS.

MFC r344438 (by emaste):

svn: support building with WITH_PIE

Subversion builds and links against its own .a archives using local
rules, so did not benefit from with the WITH_PIE library support added
in r344179.  Apply the same _pie suffix locally.

Reviewed by:    cem
Differential Revision:  https://reviews.freebsd.org/D19246

MFC r352156 (by imp):

Remove directory empty after r266735

MFC r357299 (by cem):


    [63 lines not shown]
DeltaFile
+7,544-7,544contrib/subversion/subversion/libsvn_subr/utf8proc/utf8proc_data.c
+3,099-779contrib/subversion/subversion/libsvn_client/conflicts.c
+2,691-1,104contrib/apr/configure
+1,769-798contrib/subversion/configure
+2,124-0contrib/subversion/subversion/libsvn_client/shelf2.c
+914-979contrib/subversion/build-outputs.mk
+18,141-11,204486 files not shown
+55,030-25,892492 files

HardenedBSD/src 2db3fd0 (r362180)contrib/apr configure, contrib/subversion configure build-outputs.mk

Update Subversion and dependencies to 1.14.0 LTS.

MFC r344438 (by emaste):

svn: support building with WITH_PIE

Subversion builds and links against its own .a archives using local
rules, so did not benefit from with the WITH_PIE library support added
in r344179.  Apply the same _pie suffix locally.

Reviewed by:    cem
Differential Revision:  https://reviews.freebsd.org/D19246

MFC r352156 (by imp):

Remove directory empty after r266735

MFC r357299 (by cem):


    [63 lines not shown]
DeltaFile
+7,544-7,544contrib/subversion/subversion/libsvn_subr/utf8proc/utf8proc_data.c
+3,099-779contrib/subversion/subversion/libsvn_client/conflicts.c
+2,691-1,104contrib/apr/configure
+1,769-798contrib/subversion/configure
+2,124-0contrib/subversion/subversion/libsvn_client/shelf2.c
+914-979contrib/subversion/build-outputs.mk
+18,141-11,204486 files not shown
+55,030-25,892492 files

HardenedBSD/src 7bd80ffcontrib/apr configure, contrib/sqlite3 sqlite3.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/tmpfs_extattr
DeltaFile
+7,544-7,544contrib/subversion/subversion/libsvn_subr/utf8proc/utf8proc_data.c
+2,937-1,772contrib/sqlite3/sqlite3.c
+3,099-779contrib/subversion/subversion/libsvn_client/conflicts.c
+2,691-1,104contrib/apr/configure
+1,769-798contrib/subversion/configure
+621-1,654sys/contrib/edk2/Include/Library/BaseLib.h
+18,661-13,6511,617 files not shown
+98,710-45,7421,623 files

HardenedBSD/src 9267149contrib/apr configure, contrib/subversion configure build-outputs.mk

Merge remote-tracking branch 'origin/freebsd/current/master' into hardened/current/master

Conflicts:
        share/mk/bsd.prog.mk (unresolved)
        stand/lua/drawer.lua (unresolved)
        usr.bin/svn/svn/Makefile (unresolved)
        usr.bin/svn/svnadmin/Makefile (unresolved)
        usr.bin/svn/svnbench/Makefile (unresolved)
        usr.bin/svn/svndumpfilter/Makefile (unresolved)
        usr.bin/svn/svnfsfs/Makefile (unresolved)
        usr.bin/svn/svnlook/Makefile (unresolved)
        usr.bin/svn/svnmucc/Makefile (unresolved)
        usr.bin/svn/svnrdump/Makefile (unresolved)
        usr.bin/svn/svnserve/Makefile (unresolved)
        usr.bin/svn/svnsync/Makefile (unresolved)
        usr.bin/svn/svnversion/Makefile (unresolved)
DeltaFile
+7,544-7,544contrib/subversion/subversion/libsvn_subr/utf8proc/utf8proc_data.c
+3,099-779contrib/subversion/subversion/libsvn_client/conflicts.c
+2,691-1,104contrib/apr/configure
+1,769-798contrib/subversion/configure
+2,124-0contrib/subversion/subversion/libsvn_client/shelf2.c
+914-979contrib/subversion/build-outputs.mk
+18,141-11,204559 files not shown
+56,023-25,564565 files

HardenedBSD/src 674baa3 (r361692)contrib/apr-util configure, contrib/apr-util/crypto apr_crypto_commoncrypto.c

Update apr-util to 1.6.1. See contrib/apr-util/CHANGES for a summary of
changes.

MFC after:      2 weeks
X-MFC-With:     r361677
DeltaFile
+1,548-0contrib/apr-util/redis/apr_redis.c
+517-849contrib/apr-util/configure
+784-127contrib/apr-util/test/testcrypto.c
+906-0contrib/apr-util/crypto/apr_crypto_commoncrypto.c
+809-0contrib/apr-util/dbd/unsupported/apr_dbd_freetds.c
+0-805contrib/apr-util/dbd/apr_dbd_freetds.c
+4,564-1,78156 files not shown
+8,514-2,68762 files

HardenedBSD/src 6de59a0contrib/apr-util configure, contrib/apr-util/crypto apr_crypto_commoncrypto.c

Update apr-util to 1.6.1. See contrib/apr-util/CHANGES for a summary of
changes.

MFC after:      2 weeks
X-MFC-With:     r361677
DeltaFile
+1,548-0contrib/apr-util/redis/apr_redis.c
+517-849contrib/apr-util/configure
+784-127contrib/apr-util/test/testcrypto.c
+906-0contrib/apr-util/crypto/apr_crypto_commoncrypto.c
+809-0contrib/apr-util/dbd/unsupported/apr_dbd_freetds.c
+0-805contrib/apr-util/dbd/apr_dbd_freetds.c
+4,564-1,78156 files not shown
+8,514-2,68762 files