From 4eecd219e11b9df652f18e864209128820bb4238 Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Tue, 8 May 2018 04:54:36 +0000 Subject: Update svn/svnlite from 1.9.7 to 1.10.0 --- usr.bin/svn/lib/libsvn_client/Makefile | 15 ++++++++------- usr.bin/svn/lib/libsvn_delta/Makefile | 6 ++++-- usr.bin/svn/lib/libsvn_fs_x/Makefile | 3 ++- usr.bin/svn/lib/libsvn_ra_serf/Makefile | 7 ++++--- usr.bin/svn/lib/libsvn_ra_svn/Makefile | 2 +- usr.bin/svn/lib/libsvn_repos/Makefile | 5 +++-- usr.bin/svn/lib/libsvn_subr/Makefile | 12 +++++++----- usr.bin/svn/svn/Makefile | 3 ++- usr.bin/svn/svn_private_config.h | 10 ++++++++-- 9 files changed, 39 insertions(+), 24 deletions(-) (limited to 'usr.bin/svn') diff --git a/usr.bin/svn/lib/libsvn_client/Makefile b/usr.bin/svn/lib/libsvn_client/Makefile index 437ca7a2c29f..fd3eb6635962 100644 --- a/usr.bin/svn/lib/libsvn_client/Makefile +++ b/usr.bin/svn/lib/libsvn_client/Makefile @@ -8,13 +8,14 @@ INTERNALLIB= yes LIB= svn_client SRCS= add.c blame.c cat.c changelist.c checkout.c cleanup.c \ - cmdline.c commit.c commit_util.c compat_providers.c copy.c \ - copy_foreign.c ctx.c delete.c deprecated.c diff.c \ - diff_local.c diff_summarize.c export.c externals.c import.c \ - info.c iprops.c list.c locking_commands.c log.c merge.c \ - mergeinfo.c mtcc.c patch.c prop_commands.c \ - ra.c relocate.c repos_diff.c resolved.c revert.c revisions.c \ - status.c switch.c update.c upgrade.c url.c util.c version.c + cmdline.c commit_util.c commit.c compat_providers.c \ + conflicts.c copy_foreign.c copy.c ctx.c delete.c deprecated.c \ + diff_local.c diff_summarize.c diff.c export.c externals.c \ + import.c info.c iprops.c list.c locking_commands.c log.c \ + merge_elements.c merge.c mergeinfo.c mtcc.c patch.c \ + prop_commands.c ra.c relocate.c repos_diff.c resolved.c \ + revert.c revisions.c shelve.c status.c switch.c update.c \ + upgrade.c url.c util.c version.c CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ diff --git a/usr.bin/svn/lib/libsvn_delta/Makefile b/usr.bin/svn/lib/libsvn_delta/Makefile index 5be164495be9..fb510df3d1ff 100644 --- a/usr.bin/svn/lib/libsvn_delta/Makefile +++ b/usr.bin/svn/lib/libsvn_delta/Makefile @@ -7,8 +7,10 @@ INTERNALLIB= yes LIB= svn_delta -SRCS= cancel.c compat.c compose_delta.c debug_editor.c \ - default_editor.c deprecated.c depth_filter_editor.c editor.c \ +SRCS= branch.c branch_compat.c branch_migrate.c branch_nested.c \ + branch_repos.c cancel.c compat.c compose_delta.c \ + debug_editor.c default_editor.c deprecated.c \ + depth_filter_editor.c editor.c element.c \ path_driver.c svndiff.c text_delta.c version.c xdelta.c CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ diff --git a/usr.bin/svn/lib/libsvn_fs_x/Makefile b/usr.bin/svn/lib/libsvn_fs_x/Makefile index d4b06d2b59db..354ebd22c348 100644 --- a/usr.bin/svn/lib/libsvn_fs_x/Makefile +++ b/usr.bin/svn/lib/libsvn_fs_x/Makefile @@ -7,7 +7,8 @@ INTERNALLIB= yes LIB= svn_fs_x -SRCS= cached_data.c caching.c changes.c dag.c fs.c fs_id.c fs_x.c \ +SRCS= batch_fsync.c cached_data.c caching.c changes.c \ + dag_cache.c dag.c fs.c fs_id.c fs_x.c \ hotcopy.c id.c index.c lock.c low_level.c noderevs.c pack.c \ recovery.c rep-cache.c reps.c rev_file.c revprops.c \ string_table.c temp_serializer.c transaction.c tree.c \ diff --git a/usr.bin/svn/lib/libsvn_ra_serf/Makefile b/usr.bin/svn/lib/libsvn_ra_serf/Makefile index 74d95574deef..f89bec182370 100644 --- a/usr.bin/svn/lib/libsvn_ra_serf/Makefile +++ b/usr.bin/svn/lib/libsvn_ra_serf/Makefile @@ -10,9 +10,10 @@ LIB= svn_ra_serf SRCS= blame.c blncache.c commit.c eagain_bucket.c \ get_deleted_rev.c get_file.c get_lock.c getdate.c \ getlocations.c getlocationsegments.c getlocks.c \ - inherited_props.c lock.c log.c merge.c mergeinfo.c \ - multistatus.c options.c property.c replay.c sb_bucket.c \ - serf.c stat.c update.c util.c util_error.c xml.c + inherited_props.c list.c lock.c log.c merge.c mergeinfo.c \ + multistatus.c options.c property.c replay.c \ + request_body.c sb_bucket.c serf.c stat.c stream_bucket.c \ + update.c util.c util_error.c xml.c CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ diff --git a/usr.bin/svn/lib/libsvn_ra_svn/Makefile b/usr.bin/svn/lib/libsvn_ra_svn/Makefile index a3c9dbee1d79..756e7591c7d4 100644 --- a/usr.bin/svn/lib/libsvn_ra_svn/Makefile +++ b/usr.bin/svn/lib/libsvn_ra_svn/Makefile @@ -8,7 +8,7 @@ INTERNALLIB= yes LIB= svn_ra_svn SRCS= client.c cram.c cyrus_auth.c deprecated.c editorp.c \ - internal_auth.c marshal.c streams.c version.c + internal_auth.c marshal.c streams.c wrapped_sasl.c version.c CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ diff --git a/usr.bin/svn/lib/libsvn_repos/Makefile b/usr.bin/svn/lib/libsvn_repos/Makefile index 474a293331c4..6bea94d09997 100644 --- a/usr.bin/svn/lib/libsvn_repos/Makefile +++ b/usr.bin/svn/lib/libsvn_repos/Makefile @@ -7,9 +7,10 @@ INTERNALLIB= yes LIB= svn_repos -SRCS= authz.c authz_pool.c config_pool.c commit.c delta.c \ +SRCS= authz.c authz_info.c authz_parse.c \ + config_pool.c commit.c compat.c config_file.c delta.c \ deprecated.c dump.c fs-wrap.c hooks.c load-fs-vtable.c \ - load.c log.c node_tree.c notify.c replay.c reporter.c \ + list.c load.c log.c node_tree.c notify.c replay.c reporter.c \ repos.c rev_hunt.c CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ diff --git a/usr.bin/svn/lib/libsvn_subr/Makefile b/usr.bin/svn/lib/libsvn_subr/Makefile index 0ec200c9b187..ca90bbd06cf1 100644 --- a/usr.bin/svn/lib/libsvn_subr/Makefile +++ b/usr.bin/svn/lib/libsvn_subr/Makefile @@ -2,18 +2,20 @@ .include "${.CURDIR}/../Makefile.inc" -.PATH: ${SVNDIR}/libsvn_subr +.PATH: ${SVNDIR}/libsvn_subr ${SVNDIR}/libsvn_subr/lz4 INTERNALLIB= yes LIB= svn_subr SRCS= adler32.c atomic.c auth.c base64.c bit_array.c \ cache-inprocess.c cache-membuffer.c cache-memcache.c \ - cache.c cache_config.c checksum.c cmdline.c compat.c \ - compress.c config.c config_auth.c config_file.c \ + cache.c cache-null.c cache_config.c checksum.c cmdline.c \ + compat.c compress_lz4.c compress_zlib.c \ + config.c config_auth.c config_file.c \ config_win.c crypto.c ctype.c date.c debug.c \ - deprecated.c dirent_uri.c dso.c eol.c error.c fnv1a.c \ - gpg_agent.c hash.c io.c iter.c lock.c log.c \ + deprecated.c dirent_uri.c dso.c \ + encode.c eol.c error.c fnv1a.c \ + gpg_agent.c hash.c io.c iter.c lock.c log.c lz4.c \ macos_keychain.c magic.c md5.c mergeinfo.c mutex.c nls.c \ object_pool.c opt.c packed_data.c path.c \ pool.c prefix_string.c prompt.c properties.c quoprint.c \ diff --git a/usr.bin/svn/svn/Makefile b/usr.bin/svn/svn/Makefile index 9591914d9656..261ed25f606f 100644 --- a/usr.bin/svn/svn/Makefile +++ b/usr.bin/svn/svn/Makefile @@ -14,7 +14,8 @@ SRCS= add-cmd.c auth-cmd.c blame-cmd.c cat-cmd.c changelist-cmd.c \ mergeinfo-cmd.c mkdir-cmd.c move-cmd.c notify.c patch-cmd.c \ propdel-cmd.c propedit-cmd.c propget-cmd.c proplist-cmd.c \ props.c propset-cmd.c relocate-cmd.c resolve-cmd.c \ - resolved-cmd.c revert-cmd.c status-cmd.c similarity.c status.c \ + resolved-cmd.c revert-cmd.c \ + shelve-cmd.c status-cmd.c similarity.c status.c \ svn.c switch-cmd.c unlock-cmd.c update-cmd.c upgrade-cmd.c util.c CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ diff --git a/usr.bin/svn/svn_private_config.h b/usr.bin/svn/svn_private_config.h index 4907e98e9c44..7fbaa1f9ef1f 100644 --- a/usr.bin/svn/svn_private_config.h +++ b/usr.bin/svn/svn_private_config.h @@ -52,6 +52,12 @@ /* Define to 1 if you have the header file. */ #define HAVE_SERF_H 1 +/* Define to use internal LZ4 code */ +#define SVN_INTERNAL_LZ4 1 + +/* Define to use internal UTF8PROC code */ +#define SVN_INTERNAL_UTF8PROC 1 + /* Define to 1 if you have the header file. */ #define HAVE_STDBOOL_H 1 @@ -110,7 +116,7 @@ #define PACKAGE_NAME "subversion" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "subversion 1.9.4" +#define PACKAGE_STRING "subversion 1.10.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "subversion" @@ -119,7 +125,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.9.4" +#define PACKAGE_VERSION "1.10.0" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 -- cgit v1.2.3