BSD Commit Log Search

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

Conflicts:
        share/man/man5/src.conf.5 (unresolved)

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)

Remove svnlite.

Reviewed by:    bcr, imp, emaste
Differential Revision:  https://reviews.freebsd.org/D30737

Merge branch 'hardened/current/master' into hardened/current/uninit-autoinit

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)

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

* freebsd/12-stable/master:
  Update Subversion and dependencies to 1.14.0 LTS.

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]

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]

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]

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

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)

Update Subversion to 1.14.0 LTS. See contrib/subversion/CHANGES for a
summary of changes, or for a more thorough overview:

https://subversion.apache.org/docs/release-notes/1.14

NOTE: there is no need to dump and reload repositories, and the working
copy format is still the same as Subversion 1.8 through 1.13.

Relnotes:       yes
MFC after:      2 weeks
X-MFC-With:     r361677

Update Subversion to 1.14.0 LTS. See contrib/subversion/CHANGES for a
summary of changes, or for a more thorough overview:

https://subversion.apache.org/docs/release-notes/1.14

NOTE: there is no need to dump and reload repositories, and the working
copy format is still the same as Subversion 1.8 through 1.13.

Relnotes:       yes
MFC after:      2 weeks
X-MFC-With:     r361677

Merge remote-tracking branch 'upstream/hardened/current/master' into hardened/current/safestack-arm64

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

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

* origin/hardened/current/master:
  Update svn/svnlite from 1.9.7 to 1.10.0
  Update private sqlite from sqlite3-3.20.0 to sqlite3-3.23.1
  Update private sqlite from sqlite3-3.20.0 to sqlite3-3.23.1
  Import Subversion-1.10.0
  Import subversion-1.9.7
  Import subversion-1.9.5. This includes a security fix for a component that we do not build, and two potentially useful client side fixes for reintegrate merges and tree conflict handling.  See CHANGES for full details.
  Vendor import of subversion-1.9.4.

Merge branch 'freebsd/current/master' into hardened/current/master

* freebsd/current/master:
  Update svn/svnlite from 1.9.7 to 1.10.0
  Update private sqlite from sqlite3-3.20.0 to sqlite3-3.23.1
  Update private sqlite from sqlite3-3.20.0 to sqlite3-3.23.1
  Import Subversion-1.10.0
  Import subversion-1.9.7
  Import subversion-1.9.5. This includes a security fix for a component that we do not build, and two potentially useful client side fixes for reintegrate merges and tree conflict handling.  See CHANGES for full details.
  Vendor import of subversion-1.9.4.

Update svn-1.9.7 to 1.10.0.

Update svn-1.9.7 to 1.10.0.

Create branch for bhyve graphics import.

Merge remote-tracking branch 'hbsd/hardened/10-stable/master-libressl' into hardened/10-stable/libressl

Merge remote-tracking branch 'origin/hardened/10-stable/master' into hardened/10-stable/unstable

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

MFC r275385 (by bapt):
  Sync the svn template with the one from ports

MFC r289180 (by peter):
  Update from svn-1.8.14 to 1.9.2.

  Formal release notes are available:
    https://subversion.apache.org/docs/release-notes/1.9.html

  Of particular note, the client checkout format has *not* changed so
  upgrades should *not* be required.

  When reading a repository (file:// or running as a local server), an
  improved fsfs version 7 is available with significant performance
  improvements.  An optional upgrade is possible to use the new features.
  Without the upgrade, this is fully read/write compatible with the
  version 6 fsfs as in svn-1.8.

MFC r298845:

    [17 lines not shown]

Merge from head

Sponsored by:   Gandi.net

Merge from head

Sponsored by:   Gandi.net

MFH to r289370

Sponsored by:   The FreeBSD Foundation

MFH to r289370

Sponsored by:   The FreeBSD Foundation

Merge from head

Merge from head