svn commit: r361685 - head/sys/kern

[Peter Wemm]

Author: peter
Date: Mon Jun  1 03:37:58 2020
New Revision: 361685
URL: https://svnweb.freebsd.org/changeset/base/361685

Log:
  Clarify which hints file is the source of an error message.
  
  PR:   246688
  Submitted by: Ashish Gupta 
  MFC after:1 week

Modified:
  head/sys/kern/kern_linker.c

Modified: head/sys/kern/kern_linker.c
==
--- head/sys/kern/kern_linker.c Mon Jun  1 02:54:10 2020(r361684)
+++ head/sys/kern/kern_linker.c Mon Jun  1 03:37:58 2020(r361685)
@@ -1870,7 +1870,7 @@ linker_hints_lookup(const char *path, int pathlen, con
 * XXX: we need to limit this number to some reasonable value
 */
if (vattr.va_size > LINKER_HINTS_MAX) {
-   printf("hints file too large %ld\n", (long)vattr.va_size);
+   printf("linker.hints file too large %ld\n", 
(long)vattr.va_size);
goto bad;
}
hints = malloc(vattr.va_size, M_TEMP, M_WAITOK);
@@ -1888,7 +1888,7 @@ linker_hints_lookup(const char *path, int pathlen, con
intp = (int *)hints;
ival = *intp++;
if (ival != LINKER_HINTS_VERSION) {
-   printf("hints file version mismatch %d\n", ival);
+   printf("linker.hints file version mismatch %d\n", ival);
goto bad;
}
bufend = hints + vattr.va_size;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r339234 - vendor/subversion/dist/subversion/libsvn_client

[Peter Wemm]

Author: peter
Date: Mon Oct  8 08:44:01 2018
New Revision: 339234
URL: https://svnweb.freebsd.org/changeset/base/339234

Log:
  Pull upstream r1839662
  
  "Don't scan for moves for 'local missing' conflicts unless a YCA is known.
  
  Prevent the resolver from embarking on an endless search in case of
  a 'incoming edit vs. local missing' conflict where no YCA can be
  found which would cap our search through history."
  
  Requested by: des

Modified:
  vendor/subversion/dist/subversion/libsvn_client/conflicts.c

Modified: vendor/subversion/dist/subversion/libsvn_client/conflicts.c
==
--- vendor/subversion/dist/subversion/libsvn_client/conflicts.c Mon Oct  8 
08:35:44 2018(r339233)
+++ vendor/subversion/dist/subversion/libsvn_client/conflicts.c Mon Oct  8 
08:44:01 2018(r339234)
@@ -1059,6 +1059,9 @@ find_deleted_rev(void *baton,
 {
   apr_array_header_t *moves;
 
+  if (b->moves_table == NULL)
+return SVN_NO_ERROR;
+
   moves = apr_hash_get(b->moves_table, _entry->revision,
sizeof(svn_revnum_t));
   if (moves)
@@ -2223,8 +2226,8 @@ find_operative_moves(apr_array_header_t **moves,
  * If the node was replaced rather than deleted, set *REPLACING_NODE_KIND to
  * the node kind of the replacing node. Else, set it to svn_node_unknown.
  * Only request the log for revisions up to END_REV from the server.
- * If the deleted node was moved, provide heads of move chains in *MOVES.
- * If the node was not moved,set *MOVES to NULL.
+ * If MOVES it not NULL, and the deleted node was moved, provide heads of
+ * move chains in *MOVES, or, if the node was not moved, set *MOVES to NULL.
  */
 static svn_error_t *
 find_revision_for_suspected_deletion(svn_revnum_t *deleted_rev,
@@ -2261,10 +2264,11 @@ find_revision_for_suspected_deletion(svn_revnum_t *del
  scratch_pool));
   victim_abspath = svn_client_conflict_get_local_abspath(conflict);
 
-  SVN_ERR(find_moves_in_revision_range(_table, parent_repos_relpath,
-   repos_root_url, repos_uuid,
-   victim_abspath, start_rev, end_rev,
-   ctx, result_pool, scratch_pool));
+  if (moves)
+SVN_ERR(find_moves_in_revision_range(_table, parent_repos_relpath,
+ repos_root_url, repos_uuid,
+ victim_abspath, start_rev, end_rev,
+ ctx, result_pool, scratch_pool));
 
   url = svn_path_url_add_component2(repos_root_url, parent_repos_relpath,
 scratch_pool);
@@ -2289,7 +2293,8 @@ find_revision_for_suspected_deletion(svn_revnum_t *del
   b.repos_root_url = repos_root_url;
   b.repos_uuid = repos_uuid;
   b.ctx = ctx;
-  b.moves_table = moves_table;
+  if (moves)
+b.moves_table = moves_table;
   b.result_pool = result_pool;
   SVN_ERR(svn_ra__dup_session(_ra_session, ra_session, NULL,
   scratch_pool, scratch_pool));
@@ -2319,7 +2324,7 @@ find_revision_for_suspected_deletion(svn_revnum_t *del
 {
   struct repos_move_info *move = b.move;
 
-  if (move)
+  if (moves && move)
 {
   *deleted_rev = move->rev;
   *deleted_rev_author = move->rev_author;
@@ -2337,7 +2342,8 @@ find_revision_for_suspected_deletion(svn_revnum_t *del
   *deleted_rev = SVN_INVALID_REVNUM;
   *deleted_rev_author = NULL;
   *replacing_node_kind = svn_node_unknown;
-  *moves = NULL;
+  if (moves)
+*moves = NULL;
 }
   return SVN_NO_ERROR;
 }
@@ -2346,10 +2352,11 @@ find_revision_for_suspected_deletion(svn_revnum_t *del
   *deleted_rev = b.deleted_rev;
   *deleted_rev_author = b.deleted_rev_author;
   *replacing_node_kind = b.replacing_node_kind;
-  SVN_ERR(find_operative_moves(moves, moves_table,
-   b.deleted_repos_relpath, b.deleted_rev,
-   ra_session, repos_root_url,
-   result_pool, scratch_pool));
+  if (moves)
+SVN_ERR(find_operative_moves(moves, moves_table,
+ b.deleted_repos_relpath, b.deleted_rev,
+ ra_session, repos_root_url,
+ result_pool, scratch_pool));
 }
 
   return SVN_NO_ERROR;
@@ -2693,7 +2700,8 @@ conflict_tree_get_details_local_missing(svn_client_con
 end_rev = 0; /* ### We might walk through all of history... */
 
   SVN_ERR(find_revision_for_suspected_deletion(
-_rev, _rev_author, _node_kind, ,
+_rev, _rev_author, _node_kind,
+yca_loc ?  : NULL,
 conflict, deleted_basename, parent_repos_relpath,
 parent_peg_rev, 

svn commit: r339233 - vendor/subversion/subversion-1.10.2

[Peter Wemm]

Author: peter
Date: Mon Oct  8 08:35:44 2018
New Revision: 339233
URL: https://svnweb.freebsd.org/changeset/base/339233

Log:
  Tag svn-1.10.2 import

Added:
  vendor/subversion/subversion-1.10.2/
 - copied from r339232, vendor/subversion/dist/
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r339232 - in vendor/subversion/dist: . subversion/include subversion/libsvn_auth_gnome_keyring subversion/libsvn_client subversion/libsvn_fs_fs subversion/libsvn_repos subversion/libsvn...

[Peter Wemm]

Author: peter
Date: Mon Oct  8 08:34:55 2018
New Revision: 339232
URL: https://svnweb.freebsd.org/changeset/base/339232

Log:
  Vendor import svn-1.10.2

Modified:
  vendor/subversion/dist/CHANGES
  vendor/subversion/dist/COMMITTERS
  vendor/subversion/dist/build.conf
  vendor/subversion/dist/configure
  vendor/subversion/dist/configure.ac
  vendor/subversion/dist/subversion/include/svn_version.h
  vendor/subversion/dist/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
  
vendor/subversion/dist/subversion/libsvn_auth_gnome_keyring/libsvn_auth_gnome_keyring.pc.in
  vendor/subversion/dist/subversion/libsvn_client/conflicts.c
  vendor/subversion/dist/subversion/libsvn_client/update.c
  vendor/subversion/dist/subversion/libsvn_fs_fs/cached_data.c
  vendor/subversion/dist/subversion/libsvn_repos/authz_parse.c
  vendor/subversion/dist/subversion/libsvn_subr/io.c
  vendor/subversion/dist/subversion/libsvn_wc/wc-checks.h
  vendor/subversion/dist/subversion/libsvn_wc/wc-metadata.h
  vendor/subversion/dist/subversion/svn/help-cmd.c

Modified: vendor/subversion/dist/CHANGES
==
--- vendor/subversion/dist/CHANGES  Mon Oct  8 08:30:45 2018
(r339231)
+++ vendor/subversion/dist/CHANGES  Mon Oct  8 08:34:55 2018
(r339232)
@@ -1,5 +1,35 @@
+Version 1.10.2
+(20 Jul 2018, from /branches/1.10.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.10.2
+
+ User-visible changes:
+  - Client-side bugfixes:
+* Correctly claim to offer Gnome Keyring support with libsecret (r1831142)
+* Fix segfault using Gnome Keyring with libsecret (r1835782)
+* Fix JavaHL local refs capacity warning when unparsing externals 
(r1831143)
+* Since on Windows Subversion does not handle symlinks, never check for 
reparse points (r1835701)
+* Prune externals after 'update --set-depth=exclude' (r1835702)
+* Fix issue #4740, "conflict resolver searches too far back ..." (r1835703)
+  - Server-side bugfixes:
+* Fix regression issue #4741: authz group refers to multiple groups 
(r1831220)
+
+ Developer-visible changes:
+  - General:
+* Regression test and FSFS checksum test, part of issue #4722 (r1828043)
+* Explicit error on configure --without-lz4 or --without-utf8proc 
(r1831604)
+* configure.ac: Fix regression relating to path to 'rdoc' (r1833486)
+* Ensure consistent use of $PYTHON during build and test (r1833487)
+* Fix libsvn_auth_gnome_keyring.pc when built using libsecret (r1835781)
+  - Bindings:
+* Fix regression in use of pre-generated Swig bindings in release builds 
(r1833488)
+
+
+Version 1.10.1
+(Not released; see changes for 1.10.2.)
+
+
 Version 1.10.0
-(?? ??? 2018, from /branches/1.10.x)
+(13 Apr 2018, from /branches/1.10.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.10.0
 
 See the 1.10 release notes for a more verbose overview of the changes since
@@ -286,6 +316,41 @@ the 1.9 release:  https://subversion.apache.org/docs/r
 * Ruby: Detect versions up to 2.4 (r1806570)
 
 
+Version 1.9.9
+(20 Jul 2018, from /branches/1.9.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.9.9
+
+ User-visible changes:
+  - Client-side bugfixes:
+* Fix SEGV for 'svn export -rN WC' with relative externals (r1803755)
+* Fix issue #4677: 'svn up' after a directory replaced a file (r1814248)
+* Fix segfault when no home directory is available (r1819199)
+* Performance: Make 'svn info' fast on old repository revisions (r1827690)
+* Fix RA-serf problem with proxy username and password (r1833571)
+
+  - Server-side bugfixes:
+* svnadmin: Fix false errors on some valid LOCK_PATH arguments (r1803754)
+* Fix crash when exiting 'svnserve --config-file' (r1824405)
+* Fix issue #4722: false "filesystem is corrupt" error on commit (r1827688)
+* Reword confusing "nested" wording in an httpd.conf warning (r1835700)
+
+  - Bindings bugfixes:
+* swig-py: svn.core.Stream supports raw binary file-like objects (r1820620)
+* swig-rb: Don't crash if svn_md5_digest_to_cstring returns NULL (r1823805)
+
+ Developer-visible changes:
+  - General:
+* Fix CVE-2017-9800: Malicious server can execute arbitrary command on 
client (r1804698)
+* Fix test failure if compile- and run-time HTTPD versions differ 
(r1820523)
+
+  - API changes:
+(none)
+
+
+Version 1.9.8
+(Not released; see changes for 1.9.9.)
+
+
 Version 1.9.7
 (10 Aug 2017, from /branches/1.9.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.9.7
@@ -5720,7 +5785,7 @@ http://svn.apache.org/repos/asf/subversion/tags/0.28.2
   twice as slow and lose all concurrent-client scalability.
 
   This is a temporary fix for a larger design problem.  See issue
-  http://subversion.tigris.org/issues/show_bug.cgi?id=1499
+  https://issues.apache.org/jira/browse/SVN-1499
 
 
 Version 0.28.1

Modified: vendor/subversion/dist/COMMITTERS

svn commit: r339231 - vendor/apr-util/apr-util-1.6.1

[Peter Wemm]

Author: peter
Date: Mon Oct  8 08:30:45 2018
New Revision: 339231
URL: https://svnweb.freebsd.org/changeset/base/339231

Log:
  Tag apr-util-1.6.1 import

Added:
  vendor/apr-util/apr-util-1.6.1/
 - copied from r339230, vendor/apr-util/dist/
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r339230 - in vendor/apr-util/dist: . buckets crypto dbd dbd/unsupported dbm/sdbm include include/private memcache redis test xml

[Peter Wemm]

Author: peter
Date: Mon Oct  8 08:30:10 2018
New Revision: 339230
URL: https://svnweb.freebsd.org/changeset/base/339230

Log:
  Vendor import apr-util-1.6.1

Added:
  vendor/apr-util/dist/CMakeLists.txt   (contents, props changed)
  vendor/apr-util/dist/README.FREETDS
  vendor/apr-util/dist/README.cmake
  vendor/apr-util/dist/crypto/apr_crypto_commoncrypto.c   (contents, props 
changed)
  vendor/apr-util/dist/crypto/apr_siphash.c   (contents, props changed)
  vendor/apr-util/dist/dbd/unsupported/
  vendor/apr-util/dist/dbd/unsupported/NWGNUdbdfreetds
  vendor/apr-util/dist/dbd/unsupported/apr_dbd_freetds.c   (contents, props 
changed)
  vendor/apr-util/dist/include/apr_ldap.hwc
  vendor/apr-util/dist/include/apr_redis.h   (contents, props changed)
  vendor/apr-util/dist/include/apr_siphash.h   (contents, props changed)
  vendor/apr-util/dist/include/apu.hwc
  vendor/apr-util/dist/redis/
  vendor/apr-util/dist/redis/apr_redis.c   (contents, props changed)
  vendor/apr-util/dist/test/testredis.c   (contents, props changed)
  vendor/apr-util/dist/test/testsiphash.c   (contents, props changed)
Deleted:
  vendor/apr-util/dist/dbd/NWGNUdbdfreetds
  vendor/apr-util/dist/dbd/apr_dbd_freetds.c
Modified:
  vendor/apr-util/dist/CHANGES
  vendor/apr-util/dist/LICENSE
  vendor/apr-util/dist/Makefile.in
  vendor/apr-util/dist/Makefile.win
  vendor/apr-util/dist/NOTICE
  vendor/apr-util/dist/NWGNUmakefile
  vendor/apr-util/dist/README
  vendor/apr-util/dist/apr-util.spec
  vendor/apr-util/dist/aprutil.dsw
  vendor/apr-util/dist/apu-config.in
  vendor/apr-util/dist/buckets/apr_buckets_alloc.c
  vendor/apr-util/dist/buckets/apr_buckets_file.c
  vendor/apr-util/dist/build-outputs.mk
  vendor/apr-util/dist/build.conf
  vendor/apr-util/dist/buildconf
  vendor/apr-util/dist/configure
  vendor/apr-util/dist/configure.in
  vendor/apr-util/dist/crypto/apr_crypto.c
  vendor/apr-util/dist/crypto/apr_crypto_nss.c
  vendor/apr-util/dist/crypto/apr_crypto_openssl.c
  vendor/apr-util/dist/crypto/crypt_blowfish.c
  vendor/apr-util/dist/dbd/NWGNUmakefile
  vendor/apr-util/dist/dbd/apr_dbd.c
  vendor/apr-util/dist/dbm/sdbm/sdbm.c
  vendor/apr-util/dist/dbm/sdbm/sdbm_pair.c
  vendor/apr-util/dist/include/apr_buckets.h
  vendor/apr-util/dist/include/apr_crypto.h
  vendor/apr-util/dist/include/apr_dbd.h
  vendor/apr-util/dist/include/apr_xml.h
  vendor/apr-util/dist/include/apu.h.in
  vendor/apr-util/dist/include/apu.hnw
  vendor/apr-util/dist/include/apu.hw
  vendor/apr-util/dist/include/apu_version.h
  vendor/apr-util/dist/include/private/apr_crypto_internal.h
  vendor/apr-util/dist/include/private/apu_config.h.in
  vendor/apr-util/dist/memcache/apr_memcache.c
  vendor/apr-util/dist/test/Makefile.in
  vendor/apr-util/dist/test/Makefile.win
  vendor/apr-util/dist/test/NWGNUaputest
  vendor/apr-util/dist/test/abts_tests.h
  vendor/apr-util/dist/test/testall.dsw
  vendor/apr-util/dist/test/testcrypto.c
  vendor/apr-util/dist/test/testutil.h
  vendor/apr-util/dist/xml/apr_xml.c

Modified: vendor/apr-util/dist/CHANGES
==
--- vendor/apr-util/dist/CHANGESMon Oct  8 08:24:54 2018
(r339229)
+++ vendor/apr-util/dist/CHANGESMon Oct  8 08:30:10 2018
(r339230)
@@ -1,141 +1,62 @@
  -*- coding: utf-8 -*-
-Changes with APR-util 1.5.4
+Changes with APR-util 1.6.1
 
-  *) MySQL driver: Fix incorrect handling of bad parameter in the
- driver support for apr_dbd_transaction_end().  PR 56330.
- [Weiqiang Li ]
+  *) Win32: Add function exports from new apr_crypto API's missing in 1.6.0.
 
-  *) apr_crypto_get_driver(): Fix invalid storage reference on error path.
- [Philip Martin ]
+  *) Win32: Introduce XML_PARSER build-time variable to select the expat
+ library name to be linked to libaprutil-1.dll. See Makefile.win
 
-  *) Fix compile failure for Android.  PR 56627.  [Fredrik Fornwall 
- , Jeff Trawick]
+  *) Win32: Removed lingering xml/xml.dsp project forked from the expat
+ Project in the 1.9x era. Use expat's maintained build schema instead,
+ prior to building apr-util.
 
-  *) Fix to let ODBC driver build with MSVC6, which does not have intptr_t
- [Tom Donovan]
+  *) apr_crypto: Fix compatibility with LibreSSL.  PR 61596.
+ [Bernard Spil , Yann Ylavic]
 
-  *) Windows cmake build: Fix incompatiblities with Visual Studio
- generators with all cmake versions, and the NMake Makefile generator
- with cmake 2.8.12 and later.  PR 56616 and other bugs.  [Jeff Trawick,
- Bert Huijben]
+  *) sdbm: better database/page validation to fail cleanly when corrupted.
+ [Yann Ylavic]
 
-  *) Fix detection of Berkeley DB 6.0. PR 55277.
- [Lars Wendler ]
+Changes with APR-util 1.6.0
 
-  *) Improve platform detection for bundled expat by updating
- config.guess and config.sub. [Rainer Jung]
+  *) The expat dependency of apr-util is no longer built with 

svn commit: r339229 - vendor/apr/apr-1.6.5

[Peter Wemm]

Author: peter
Date: Mon Oct  8 08:24:54 2018
New Revision: 339229
URL: https://svnweb.freebsd.org/changeset/base/339229

Log:
  Tag apr-1.6.5 import

Added:
  vendor/apr/apr-1.6.5/
 - copied from r339228, vendor/apr/dist/
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r339228 - in vendor/apr/dist: . docs encoding file_io/unix include include/arch/unix locks/unix memory/unix misc/unix network_io/unix poll/unix shmem/unix strings tables threadproc/unix...

[Peter Wemm]

Author: peter
Date: Mon Oct  8 08:24:14 2018
New Revision: 339228
URL: https://svnweb.freebsd.org/changeset/base/339228

Log:
  Vendor import apr-1.6.5

Added:
  vendor/apr/dist/include/apr_cstr.h   (contents, props changed)
  vendor/apr/dist/include/apr_perms_set.h   (contents, props changed)
  vendor/apr/dist/poll/unix/wakeup.c   (contents, props changed)
  vendor/apr/dist/strings/apr_cstr.c   (contents, props changed)
Modified:
  vendor/apr/dist/CHANGES
  vendor/apr/dist/CMakeLists.txt
  vendor/apr/dist/Makefile.in
  vendor/apr/dist/Makefile.win
  vendor/apr/dist/NOTICE
  vendor/apr/dist/NWGNUmakefile
  vendor/apr/dist/apr.dsp
  vendor/apr/dist/apr.mak
  vendor/apr/dist/apr.spec
  vendor/apr/dist/build-outputs.mk
  vendor/apr/dist/config.layout
  vendor/apr/dist/configure
  vendor/apr/dist/configure.in
  vendor/apr/dist/docs/APRDesign.html
  vendor/apr/dist/docs/canonical_filenames.html
  vendor/apr/dist/docs/incomplete_types
  vendor/apr/dist/docs/pool-design.html
  vendor/apr/dist/encoding/apr_escape.c
  vendor/apr/dist/file_io/unix/copy.c
  vendor/apr/dist/file_io/unix/flock.c
  vendor/apr/dist/file_io/unix/pipe.c
  vendor/apr/dist/file_io/unix/readwrite.c
  vendor/apr/dist/file_io/unix/seek.c
  vendor/apr/dist/include/apr.h.in
  vendor/apr/dist/include/apr.hnw
  vendor/apr/dist/include/apr.hw
  vendor/apr/dist/include/apr.hwc
  vendor/apr/dist/include/apr_allocator.h
  vendor/apr/dist/include/apr_atomic.h
  vendor/apr/dist/include/apr_errno.h
  vendor/apr/dist/include/apr_escape.h
  vendor/apr/dist/include/apr_file_info.h
  vendor/apr/dist/include/apr_file_io.h
  vendor/apr/dist/include/apr_general.h
  vendor/apr/dist/include/apr_global_mutex.h
  vendor/apr/dist/include/apr_hash.h
  vendor/apr/dist/include/apr_network_io.h
  vendor/apr/dist/include/apr_poll.h
  vendor/apr/dist/include/apr_portable.h
  vendor/apr/dist/include/apr_proc_mutex.h
  vendor/apr/dist/include/apr_shm.h
  vendor/apr/dist/include/apr_skiplist.h
  vendor/apr/dist/include/apr_strings.h
  vendor/apr/dist/include/apr_tables.h
  vendor/apr/dist/include/apr_thread_proc.h
  vendor/apr/dist/include/apr_version.h
  vendor/apr/dist/include/arch/unix/apr_arch_networkio.h
  vendor/apr/dist/include/arch/unix/apr_arch_poll_private.h
  vendor/apr/dist/include/arch/unix/apr_arch_proc_mutex.h
  vendor/apr/dist/include/arch/unix/apr_arch_shm.h
  vendor/apr/dist/include/arch/unix/apr_arch_threadproc.h
  vendor/apr/dist/include/arch/unix/apr_private.h.in
  vendor/apr/dist/libapr.dsp
  vendor/apr/dist/libapr.mak
  vendor/apr/dist/locks/unix/global_mutex.c
  vendor/apr/dist/locks/unix/proc_mutex.c
  vendor/apr/dist/memory/unix/apr_pools.c
  vendor/apr/dist/misc/unix/errorcodes.c
  vendor/apr/dist/network_io/unix/multicast.c
  vendor/apr/dist/network_io/unix/sockaddr.c
  vendor/apr/dist/network_io/unix/sockets.c
  vendor/apr/dist/network_io/unix/sockopt.c
  vendor/apr/dist/poll/unix/epoll.c
  vendor/apr/dist/poll/unix/kqueue.c
  vendor/apr/dist/poll/unix/poll.c
  vendor/apr/dist/poll/unix/pollcb.c
  vendor/apr/dist/poll/unix/pollset.c
  vendor/apr/dist/poll/unix/port.c
  vendor/apr/dist/poll/unix/select.c
  vendor/apr/dist/poll/unix/z_asio.c
  vendor/apr/dist/shmem/unix/shm.c
  vendor/apr/dist/strings/apr_cpystrn.c
  vendor/apr/dist/strings/apr_fnmatch.c
  vendor/apr/dist/strings/apr_snprintf.c
  vendor/apr/dist/tables/apr_skiplist.c
  vendor/apr/dist/tables/apr_tables.c
  vendor/apr/dist/threadproc/unix/proc.c
  vendor/apr/dist/time/unix/time.c
  vendor/apr/dist/tools/gen_test_char.c

Modified: vendor/apr/dist/CHANGES
==
--- vendor/apr/dist/CHANGES Mon Oct  8 08:13:44 2018(r339227)
+++ vendor/apr/dist/CHANGES Mon Oct  8 08:24:14 2018(r339228)
@@ -1,179 +1,136 @@
  -*- coding: utf-8 -*-
-Changes for APR 1.5.2
+Changes for APR 1.6.5
 
-  *) SECURITY: CVE-2015-1829 (cve.mitre.org)
- APR applications using APR named pipe support on Windows can be 
- vulnerable to a pipe squatting attack from a local process; the extent
- of the vulnerability, when present, depends on the application.
- Initial analysis and report was provided by John Hernandez of Casaba 
- Security via HP SSRT Security Alert.  [Yann Ylavic]
+  *) Fix Win32 build breakage in apr_os_exp_time_put() in 1.6.4. [Rainer Jung]
+ 
+Changes for APR 1.6.4 (not released)
 
-  *) apr_atomic: Fix errors when building on Visual Studio 2013 while
- maintaining the ability to build on Visual Studio 6 with Windows
- Server 2003 R2 SDK. PR 57191. [Gregg Smith]
+  *) configure: Fix detection of  on OpenBSD.
+ PR 61976. [David Carlier , Yann Ylavic]
 
-  *) Switch to generic atomics for early/unpatched Solaris 10 not exporting
- some atomic functions.  PR 55418.  [Yann Ylavic]
+  *) Fix apr_parse_addr_port() regression in scope_id parsing introduced
+ in 1.6.3.  [Rainer Jung]
 
-  *) apr_file_mktemp() on HP-UX: 

svn commit: r339227 - vendor/serf/serf-1.3.9

[Peter Wemm]

Author: peter
Date: Mon Oct  8 08:13:44 2018
New Revision: 339227
URL: https://svnweb.freebsd.org/changeset/base/339227

Log:
  Tag serf-1.3.9 import

Added:
  vendor/serf/serf-1.3.9/
 - copied from r339226, vendor/serf/dist/
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r339226 - in vendor/serf/dist: . auth buckets build

[Peter Wemm]

Author: peter
Date: Mon Oct  8 08:12:28 2018
New Revision: 339226
URL: https://svnweb.freebsd.org/changeset/base/339226

Log:
  Vendor import serf-1.3.9 (now Apache serf)

Added:
  vendor/serf/dist/STATUS
Modified:
  vendor/serf/dist/CHANGES
  vendor/serf/dist/NOTICE
  vendor/serf/dist/README
  vendor/serf/dist/SConstruct
  vendor/serf/dist/auth/auth.c
  vendor/serf/dist/auth/auth.h
  vendor/serf/dist/auth/auth_basic.c
  vendor/serf/dist/auth/auth_digest.c
  vendor/serf/dist/auth/auth_spnego.c
  vendor/serf/dist/auth/auth_spnego.h
  vendor/serf/dist/auth/auth_spnego_gss.c
  vendor/serf/dist/auth/auth_spnego_sspi.c
  vendor/serf/dist/buckets/aggregate_buckets.c
  vendor/serf/dist/buckets/allocator.c
  vendor/serf/dist/buckets/barrier_buckets.c
  vendor/serf/dist/buckets/buckets.c
  vendor/serf/dist/buckets/bwtp_buckets.c
  vendor/serf/dist/buckets/chunk_buckets.c
  vendor/serf/dist/buckets/dechunk_buckets.c
  vendor/serf/dist/buckets/deflate_buckets.c
  vendor/serf/dist/buckets/file_buckets.c
  vendor/serf/dist/buckets/headers_buckets.c
  vendor/serf/dist/buckets/iovec_buckets.c
  vendor/serf/dist/buckets/limit_buckets.c
  vendor/serf/dist/buckets/mmap_buckets.c
  vendor/serf/dist/buckets/request_buckets.c
  vendor/serf/dist/buckets/response_body_buckets.c
  vendor/serf/dist/buckets/response_buckets.c
  vendor/serf/dist/buckets/simple_buckets.c
  vendor/serf/dist/buckets/socket_buckets.c
  vendor/serf/dist/buckets/ssl_buckets.c
  vendor/serf/dist/build/check.py
  vendor/serf/dist/build/gen_def.py
  vendor/serf/dist/context.c
  vendor/serf/dist/incoming.c
  vendor/serf/dist/outgoing.c
  vendor/serf/dist/serf.h
  vendor/serf/dist/serf_bucket_types.h
  vendor/serf/dist/serf_bucket_util.h
  vendor/serf/dist/serf_private.h
  vendor/serf/dist/ssltunnel.c

Modified: vendor/serf/dist/CHANGES
==
--- vendor/serf/dist/CHANGESMon Oct  8 01:28:46 2018(r339225)
+++ vendor/serf/dist/CHANGESMon Oct  8 08:12:28 2018(r339226)
@@ -1,7 +1,26 @@
-Serf 1.3.8 [2014-10-20, from /tags/1.3.8, r]
-Fix issue #152: CRC calculation error for gzipped http reponses > 4GB.
-Fix issue #153: SSPI CredHandle not freed when APR pool is destroyed.
-Fix issue #154: Disable SSLv2 and SSLv3 as both or broken.
+Apache Serf 1.3.9 [2016-09-01, from tags/1.3.9, r]
+  serf is now Apache Serf; apply header changes (r1700062)
+  Fix issue #151: SCons build broken when only one library in ENVPATH
+  Fix issue #153: avoid SSPI handle leak
+  Fix issue #167: Explicitly use the ANSI version of SSPI
+  Fix issue #170: Allow building with Microsoft Visual Studio 2015
+  Fix build of 'check' target when using VPATH-style builds (r1699858, ...)
+(builddir != srcdir).
+  Resolve a bucket (aka "memory") leak when a request bucket is
+destroyed before it is morphed into an aggregate bucket (r1699791)
+  Reset state variables when resetting connection (r1708849)
+  Fix types of passed, but unused batons (r1699986, r1699987)
+  Fix some usages of the openssl BIO api (r1699852)
+  Improve handling of bad data in the response state line. (r1699985)
+  Resolve several compiler issues with less common compilers
+  Support more overrides via SCons arguments (r1701836, ...)
+  Adapt to OpenSSL 1.1.x api (r1750819)
+
+
+Serf 1.3.8 [2014-10-20, from /tags/1.3.8, r2441]
+  Fix issue #152: CRC calculation error for gzipped http reponses > 4GB.
+  Fix issue #153: SSPI CredHandle not freed when APR pool is destroyed.
+  Fix issue #154: Disable SSLv2 and SSLv3 as both or broken.
 
 
 Serf 1.3.7 [2014-08-11, from /tags/1.3.7, r2411]

Modified: vendor/serf/dist/NOTICE
==
--- vendor/serf/dist/NOTICE Mon Oct  8 01:28:46 2018(r339225)
+++ vendor/serf/dist/NOTICE Mon Oct  8 08:12:28 2018(r339226)
@@ -1,2 +1,7 @@
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
+Apache Serf
+Copyright 2015 The Apache Software Foundation
+
+This product includes software developed by many people, and distributed
+under Contributor License Agreements to The Apache Software Foundation
+(http://www.apache.org/).  See the revision logs for an exact contribution
+history.

Modified: vendor/serf/dist/README
==
--- vendor/serf/dist/README Mon Oct  8 01:28:46 2018(r339225)
+++ vendor/serf/dist/README Mon Oct  8 08:12:28 2018(r339226)
@@ -1,15 +1,14 @@
-Welcome to serf, a high-performance asynchronous HTTP client library.
+Welcome to Apache Serf, a high-performance asynchronous HTTP client library.
 
-The serf library is a C-based HTTP client library built upon the Apache
+The Apache Serf library is a C-based HTTP client library built upon the Apache
 Portable Runtime (APR) library. It multiplexes connections, running the
 read/write communication 

Re: svn commit: r334617 - in head: . etc

[Peter Wemm]

On 6/6/18 4:06 PM, Ian Lepore wrote:


On Wed, 2018-06-06 at 11:33 -0700, Rodney W. Grimes wrote:


On Tue, Jun 5, 2018, at 1:28 PM, Konstantin Belousov wrote:

On Wed, Jun 06, 2018 at 01:39:00AM +0700, Eugene Grosbein wrote:

06.06.2018 1:26, Konstantin Belousov wrote:


I find it often very useful to do
  (cd src/etc/rc.d && make install)
Same for defaults and several other directories which in
fact
contains> > >>> non-editable content.  Is this planned to
keep working ?

The short answer is, no.  All rc.d scripts get moved to the
src
of the program they start.> > >>
That said, if there is a big need for this, we can see
about
options to keep them working.> > >>
What are you trying to accomplish when you do this?  Just
verify
the rc.d scripts match your src tree?> > >

I avoid mergemaster/etcupdate and whatever else. rc.d and
/etc/rc,> > > /etc/rc.subr /etc/rc.network are not suitable
to etc, they are
binaries> > > provided by the project not for the user
editing.

When upgrading the host, esp. on HEAD, i usually refresh
scripts
by this> > > procedure and avoid any editing and implied
conflict resolution
for real> > > configs.

Not being able to easily install clean copies of these
scripts
would> > > be very inconvenient and time consuming.

I found that "mergemaster -iFUP" deals with unchanged files
including mentioned rc* scripts just fine.> > That is, it
automatically refreshes unchanged files without any
silly questions just for change of $FreeBSD$.>

No, you missed the point.  Whatever nice is the handling of
unchanged files,> use of mergemaster forces me to handle changed
files, which is exactly> what I do not want/need to do.  Yes, I
update crashboxes very
often, and> I want to get all new code, including the startup
scripts, when
I update.

The startup scripts will be installed as part of installworld.

So each installworld would wipe over the top of any localmod
/etc/rc.d/ and other stuff
that mght exist?
One of the reasons that etc/Makefile is detached from Installword is
so that
/etc does not get perturbuted unless specifically requested.


I don't understand the drama over this.  rc.d startup scripts are
*binaries*. Users are not expected to modify the system installed
binaries, and if they do, it is expected that the next installworld
will replace them with the system binaries again.


This is not the case.  Example: /etc/rc.d/serial

Other random examples of things installed by etc/Makefile that are 
expected to be merged rather than spammed as part of an installworld:

etc/ttys
etc/inetd.conf
etc/dhclient.conf
etc/login.conf
etc/sysctl.conf

-Peter

___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r333387 - head/usr.bin/svn

[Peter Wemm]

Author: peter
Date: Tue May  8 21:01:04 2018
New Revision: 87
URL: https://svnweb.freebsd.org/changeset/base/87

Log:
  Update svn_private_config.h - I misread an autoconf change.
  SVN_LIBSVN_CLIENT_LINKS_RA_LOCAL -> SVN_LIBSVN_RA_LINKS_RA_LOCAL
  SVN_LIBSVN_CLIENT_LINKS_RA_SERF -> SVN_LIBSVN_RA_LINKS_RA_SERF
  SVN_LIBSVN_CLIENT_LINKS_RA_SVN -> SVN_LIBSVN_RA_LINKS_RA_SVN

Modified:
  head/usr.bin/svn/svn_private_config.h

Modified: head/usr.bin/svn/svn_private_config.h
==
--- head/usr.bin/svn/svn_private_config.h   Tue May  8 20:39:35 2018
(r86)
+++ head/usr.bin/svn/svn_private_config.h   Tue May  8 21:01:04 2018
(r87)
@@ -154,6 +154,9 @@
 /* Defined if plaintext password/passphrase storage is disabled */
 /* #undef SVN_DISABLE_PLAINTEXT_PASSWORD_STORAGE */
 
+/* Shared library file name suffix format */
+#undef SVN_DSO_SUFFIX_FMT
+
 /* The desired major version for the Berkeley DB */
 #define SVN_FS_WANT_DB_MAJOR 4
 
@@ -175,12 +178,18 @@
 /* Is Mac OS KeyChain support enabled? */
 /* #undef SVN_HAVE_KEYCHAIN_SERVICES */
 
+/* Defined if KF5 available */
+#undef SVN_HAVE_KF5
+
 /* Defined if KWallet support is enabled */
 /* #undef SVN_HAVE_KWALLET */
 
 /* Defined if libmagic support is enabled */
 #define SVN_HAVE_LIBMAGIC 1
 
+/* Is libsecret support enabled? */
+#undef SVN_HAVE_LIBSECRET
+
 /* Is Mach-O low-level _dyld API available? */
 /* #undef SVN_HAVE_MACHO_ITERATE */
 
@@ -199,15 +208,6 @@
 /* Defined if support for Serf is enabled */
 #define SVN_HAVE_SERF 1
 
-/* Defined if libsvn_client should link against libsvn_ra_local */
-#define SVN_LIBSVN_CLIENT_LINKS_RA_LOCAL 1
-
-/* Defined if libsvn_client should link against libsvn_ra_serf */
-#define SVN_LIBSVN_CLIENT_LINKS_RA_SERF 1
-
-/* Defined if libsvn_client should link against libsvn_ra_svn */
-#define SVN_LIBSVN_CLIENT_LINKS_RA_SVN 1
-
 /* Defined if libsvn_fs should link against libsvn_fs_base */
 /* #undef SVN_LIBSVN_FS_LINKS_FS_BASE */
 
@@ -216,6 +216,15 @@
 
 /* Defined if libsvn_fs should link against libsvn_fs_x */
 #define SVN_LIBSVN_FS_LINKS_FS_X 1
+
+/* Defined if libsvn_ra should link against libsvn_ra_local */
+#define SVN_LIBSVN_RA_LINKS_RA_LOCAL 1
+
+/* Defined if libsvn_ra should link against libsvn_ra_serf */
+#define SVN_LIBSVN_RA_LINKS_RA_SERF 1
+
+/* Defined if libsvn_ra should link against libsvn_ra_svn */
+#define SVN_LIBSVN_RA_LINKS_RA_SVN 1
 
 /* Defined to be the path to the installed locale dirs */
 #define SVN_LOCALE_DIR "NONE/share/locale"
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r333358 - head/lib/libsqlite3

[Peter Wemm]

Author: peter
Date: Tue May  8 06:09:49 2018
New Revision: 58
URL: https://svnweb.freebsd.org/changeset/base/58

Log:
  Revert r53 - FTS5 uses log(3) which currently breakes non-amd64 builds.
  
  Reported by:  lwhsu

Modified:
  head/lib/libsqlite3/Makefile

Modified: head/lib/libsqlite3/Makefile
==
--- head/lib/libsqlite3/MakefileTue May  8 05:11:06 2018
(r57)
+++ head/lib/libsqlite3/MakefileTue May  8 06:09:49 2018
(r58)
@@ -36,7 +36,6 @@ CFLAGS+=  -I${SQLITE} \
-DSQLITE_THREADSAFE=1 \
-DSQLITE_ENABLE_FTS3 \
-DSQLITE_ENABLE_FTS4 \
-   -DSQLITE_ENABLE_FTS5 \
-DSQLITE_ENABLE_RTREE
 
 .include 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r333355 - in head/usr.bin/svn: . lib/libsvn_client lib/libsvn_delta lib/libsvn_fs_x lib/libsvn_ra_serf lib/libsvn_ra_svn lib/libsvn_repos lib/libsvn_subr svn

[Peter Wemm]

Author: peter
Date: Tue May  8 04:54:36 2018
New Revision: 55
URL: https://svnweb.freebsd.org/changeset/base/55

Log:
  Update svn/svnlite from 1.9.7 to 1.10.0

Modified:
  head/usr.bin/svn/lib/libsvn_client/Makefile
  head/usr.bin/svn/lib/libsvn_delta/Makefile
  head/usr.bin/svn/lib/libsvn_fs_x/Makefile
  head/usr.bin/svn/lib/libsvn_ra_serf/Makefile
  head/usr.bin/svn/lib/libsvn_ra_svn/Makefile
  head/usr.bin/svn/lib/libsvn_repos/Makefile
  head/usr.bin/svn/lib/libsvn_subr/Makefile
  head/usr.bin/svn/svn/Makefile
  head/usr.bin/svn/svn_private_config.h

Modified: head/usr.bin/svn/lib/libsvn_client/Makefile
==
--- head/usr.bin/svn/lib/libsvn_client/Makefile Tue May  8 04:52:52 2018
(r54)
+++ head/usr.bin/svn/lib/libsvn_client/Makefile Tue May  8 04:54:36 2018
(r55)
@@ -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 \

Modified: head/usr.bin/svn/lib/libsvn_delta/Makefile
==
--- head/usr.bin/svn/lib/libsvn_delta/Makefile  Tue May  8 04:52:52 2018
(r54)
+++ head/usr.bin/svn/lib/libsvn_delta/Makefile  Tue May  8 04:54:36 2018
(r55)
@@ -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}/../.. \

Modified: head/usr.bin/svn/lib/libsvn_fs_x/Makefile
==
--- head/usr.bin/svn/lib/libsvn_fs_x/Makefile   Tue May  8 04:52:52 2018
(r54)
+++ head/usr.bin/svn/lib/libsvn_fs_x/Makefile   Tue May  8 04:54:36 2018
(r55)
@@ -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 \

Modified: head/usr.bin/svn/lib/libsvn_ra_serf/Makefile
==
--- head/usr.bin/svn/lib/libsvn_ra_serf/MakefileTue May  8 04:52:52 
2018(r54)
+++ head/usr.bin/svn/lib/libsvn_ra_serf/MakefileTue May  8 04:54:36 
2018(r55)
@@ -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
 
 

svn commit: r333354 - in head/contrib/subversion: . doc subversion subversion/include subversion/include/private subversion/libsvn_auth_gnome_keyring subversion/libsvn_auth_kwallet subversion/libsv...

[Peter Wemm]

Author: peter
Date: Tue May  8 04:52:52 2018
New Revision: 54
URL: https://svnweb.freebsd.org/changeset/base/54

Log:
  Update svn-1.9.7 to 1.10.0.

Added:
  head/contrib/subversion/.editorconfig
 - copied unchanged from r51, vendor/subversion/dist/.editorconfig
  head/contrib/subversion/subversion/include/private/ra_svn_wrapped_sasl.h
 - copied unchanged from r51, 
vendor/subversion/dist/subversion/include/private/ra_svn_wrapped_sasl.h
  head/contrib/subversion/subversion/include/private/svn_branch.h
 - copied unchanged from r51, 
vendor/subversion/dist/subversion/include/private/svn_branch.h
  head/contrib/subversion/subversion/include/private/svn_branch_compat.h
 - copied unchanged from r51, 
vendor/subversion/dist/subversion/include/private/svn_branch_compat.h
  head/contrib/subversion/subversion/include/private/svn_branch_impl.h
 - copied unchanged from r51, 
vendor/subversion/dist/subversion/include/private/svn_branch_impl.h
  head/contrib/subversion/subversion/include/private/svn_branch_nested.h
 - copied unchanged from r51, 
vendor/subversion/dist/subversion/include/private/svn_branch_nested.h
  head/contrib/subversion/subversion/include/private/svn_branch_repos.h
 - copied unchanged from r51, 
vendor/subversion/dist/subversion/include/private/svn_branch_repos.h
  head/contrib/subversion/subversion/include/private/svn_config_private.h
 - copied unchanged from r51, 
vendor/subversion/dist/subversion/include/private/svn_config_private.h
  head/contrib/subversion/subversion/include/private/svn_element.h
 - copied unchanged from r51, 
vendor/subversion/dist/subversion/include/private/svn_element.h
  head/contrib/subversion/subversion/libsvn_client/conflicts.c
 - copied unchanged from r51, 
vendor/subversion/dist/subversion/libsvn_client/conflicts.c
  head/contrib/subversion/subversion/libsvn_client/merge_elements.c
 - copied unchanged from r51, 
vendor/subversion/dist/subversion/libsvn_client/merge_elements.c
  head/contrib/subversion/subversion/libsvn_client/shelve.c
 - copied unchanged from r51, 
vendor/subversion/dist/subversion/libsvn_client/shelve.c
  head/contrib/subversion/subversion/libsvn_delta/branch.c
 - copied unchanged from r51, 
vendor/subversion/dist/subversion/libsvn_delta/branch.c
  head/contrib/subversion/subversion/libsvn_delta/branch_compat.c
 - copied unchanged from r51, 
vendor/subversion/dist/subversion/libsvn_delta/branch_compat.c
  head/contrib/subversion/subversion/libsvn_delta/branch_migrate.c
 - copied unchanged from r51, 
vendor/subversion/dist/subversion/libsvn_delta/branch_migrate.c
  head/contrib/subversion/subversion/libsvn_delta/branch_nested.c
 - copied unchanged from r51, 
vendor/subversion/dist/subversion/libsvn_delta/branch_nested.c
  head/contrib/subversion/subversion/libsvn_delta/branch_repos.c
 - copied unchanged from r51, 
vendor/subversion/dist/subversion/libsvn_delta/branch_repos.c
  head/contrib/subversion/subversion/libsvn_delta/element.c
 - copied unchanged from r51, 
vendor/subversion/dist/subversion/libsvn_delta/element.c
  head/contrib/subversion/subversion/libsvn_fs_base/fs_init.h
 - copied unchanged from r51, 
vendor/subversion/dist/subversion/libsvn_fs_base/fs_init.h
  head/contrib/subversion/subversion/libsvn_fs_fs/fs_init.h
 - copied unchanged from r51, 
vendor/subversion/dist/subversion/libsvn_fs_fs/fs_init.h
  head/contrib/subversion/subversion/libsvn_fs_x/batch_fsync.c
 - copied unchanged from r51, 
vendor/subversion/dist/subversion/libsvn_fs_x/batch_fsync.c
  head/contrib/subversion/subversion/libsvn_fs_x/batch_fsync.h
 - copied unchanged from r51, 
vendor/subversion/dist/subversion/libsvn_fs_x/batch_fsync.h
  head/contrib/subversion/subversion/libsvn_fs_x/dag_cache.c
 - copied unchanged from r51, 
vendor/subversion/dist/subversion/libsvn_fs_x/dag_cache.c
  head/contrib/subversion/subversion/libsvn_fs_x/dag_cache.h
 - copied unchanged from r51, 
vendor/subversion/dist/subversion/libsvn_fs_x/dag_cache.h
  head/contrib/subversion/subversion/libsvn_fs_x/fs_init.h
 - copied unchanged from r51, 
vendor/subversion/dist/subversion/libsvn_fs_x/fs_init.h
  head/contrib/subversion/subversion/libsvn_ra_serf/list.c
 - copied unchanged from r51, 
vendor/subversion/dist/subversion/libsvn_ra_serf/list.c
  head/contrib/subversion/subversion/libsvn_ra_serf/request_body.c
 - copied unchanged from r51, 
vendor/subversion/dist/subversion/libsvn_ra_serf/request_body.c
  head/contrib/subversion/subversion/libsvn_ra_serf/stream_bucket.c
 - copied unchanged from r51, 
vendor/subversion/dist/subversion/libsvn_ra_serf/stream_bucket.c
  head/contrib/subversion/subversion/libsvn_ra_svn/wrapped_sasl.c
 - copied unchanged from r51, 
vendor/subversion/dist/subversion/libsvn_ra_svn/wrapped_sasl.c
  

svn commit: r333353 - head/lib/libsqlite3

[Peter Wemm]

Author: peter
Date: Tue May  8 04:51:47 2018
New Revision: 53
URL: https://svnweb.freebsd.org/changeset/base/53

Log:
  Update private sqlite from sqlite3-3.20.0 to sqlite3-3.23.1

Modified:
  head/lib/libsqlite3/Makefile

Modified: head/lib/libsqlite3/Makefile
==
--- head/lib/libsqlite3/MakefileTue May  8 04:51:15 2018
(r52)
+++ head/lib/libsqlite3/MakefileTue May  8 04:51:47 2018
(r53)
@@ -36,6 +36,7 @@ CFLAGS+=  -I${SQLITE} \
-DSQLITE_THREADSAFE=1 \
-DSQLITE_ENABLE_FTS3 \
-DSQLITE_ENABLE_FTS4 \
+   -DSQLITE_ENABLE_FTS5 \
-DSQLITE_ENABLE_RTREE
 
 .include 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r333352 - in head/contrib/sqlite3: . tea

[Peter Wemm]

Author: peter
Date: Tue May  8 04:51:15 2018
New Revision: 52
URL: https://svnweb.freebsd.org/changeset/base/52

Log:
  Update private sqlite from sqlite3-3.20.0 to sqlite3-3.23.1

Deleted:
  head/contrib/sqlite3/tea/
Modified:
  head/contrib/sqlite3/Makefile.am
  head/contrib/sqlite3/Makefile.in
  head/contrib/sqlite3/Makefile.msc
  head/contrib/sqlite3/configure
  head/contrib/sqlite3/configure.ac
  head/contrib/sqlite3/shell.c
  head/contrib/sqlite3/sqlite3.c
  head/contrib/sqlite3/sqlite3.h
  head/contrib/sqlite3/sqlite3ext.h
Directory Properties:
  head/contrib/sqlite3/   (props changed)

Modified: head/contrib/sqlite3/Makefile.am
==
--- head/contrib/sqlite3/Makefile.amTue May  8 03:53:46 2018
(r51)
+++ head/contrib/sqlite3/Makefile.amTue May  8 04:51:15 2018
(r52)
@@ -1,5 +1,5 @@
 
-AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@ 
@JSON1_FLAGS@ @SESSION_FLAGS@ -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE
+AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@ 
@JSON1_FLAGS@ @ZLIB_FLAGS@ @SESSION_FLAGS@ -DSQLITE_ENABLE_FTS3 
-DSQLITE_ENABLE_RTREE
 
 lib_LTLIBRARIES = libsqlite3.la
 libsqlite3_la_SOURCES = sqlite3.c
@@ -10,7 +10,7 @@ sqlite3_SOURCES = shell.c sqlite3.h
 EXTRA_sqlite3_SOURCES = sqlite3.c
 sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@
 sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@
-sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS 
-DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_ENABLE_STMTVTAB 
-DSQLITE_ENABLE_DBSTAT_VTAB $(SHELL_CFLAGS)
 
 include_HEADERS = sqlite3.h sqlite3ext.h
 

Modified: head/contrib/sqlite3/Makefile.in
==
--- head/contrib/sqlite3/Makefile.inTue May  8 03:53:46 2018
(r51)
+++ head/contrib/sqlite3/Makefile.inTue May  8 04:51:15 2018
(r52)
@@ -308,9 +308,11 @@ SED = @SED@
 SESSION_FLAGS = @SESSION_FLAGS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SHELL_CFLAGS = @SHELL_CFLAGS@
 STRIP = @STRIP@
 THREADSAFE_FLAGS = @THREADSAFE_FLAGS@
 VERSION = @VERSION@
+ZLIB_FLAGS = @ZLIB_FLAGS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -363,7 +365,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@ 
@JSON1_FLAGS@ @SESSION_FLAGS@ -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE
+AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@ 
@JSON1_FLAGS@ @ZLIB_FLAGS@ @SESSION_FLAGS@ -DSQLITE_ENABLE_FTS3 
-DSQLITE_ENABLE_RTREE
 lib_LTLIBRARIES = libsqlite3.la
 libsqlite3_la_SOURCES = sqlite3.c
 libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
@@ -371,7 +373,7 @@ sqlite3_SOURCES = shell.c sqlite3.h
 EXTRA_sqlite3_SOURCES = sqlite3.c
 sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@
 sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@
-sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS 
-DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_ENABLE_STMTVTAB 
-DSQLITE_ENABLE_DBSTAT_VTAB $(SHELL_CFLAGS)
 include_HEADERS = sqlite3.h sqlite3ext.h
 EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc README.txt Replace.cs
 pkgconfigdir = ${libdir}/pkgconfig

Modified: head/contrib/sqlite3/Makefile.msc
==
--- head/contrib/sqlite3/Makefile.msc   Tue May  8 03:53:46 2018
(r51)
+++ head/contrib/sqlite3/Makefile.msc   Tue May  8 04:51:15 2018
(r52)
@@ -561,6 +561,7 @@ SHELL_CORE_DEP =
 !ENDIF
 !ENDIF
 
+
 # This is the core library that the shell executable should link with.
 #
 !IFNDEF SHELL_CORE_LIB
@@ -808,7 +809,7 @@ LTLINK = $(TCC) -Fe$@
 # If requested, link to the RPCRT4 library.
 #
 !IF $(USE_RPCRT4_LIB)!=0
-LTLINK = $(LTLINK) rpcrt4.lib
+LTLIBS = $(LTLIBS) rpcrt4.lib
 !ENDIF
 
 # If a platform was set, force the linker to target that.
@@ -927,15 +928,26 @@ LIBRESOBJS =
 # when the shell is not being dynamically linked.
 #
 !IF $(DYNAMIC_SHELL)==0 && $(FOR_WIN10)==0
-SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_SHELL_JSON1 
-DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_STMTVTAB
+SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_JSON1 
-DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_STMTVTAB
+SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_DBPAGE_VTAB 
-DSQLITE_ENABLE_DBSTAT_VTAB
+SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_OFFSET_SQL_FUNC 
-DSQLITE_INTROSPECTION_PRAGMAS
+SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_RTREE
 !ENDIF
 
 
 # This is the default Makefile target.  The objects listed here
 # are what get 

svn commit: r333350 - vendor/sqlite3/sqlite-3230100

[Peter Wemm]

Author: peter
Date: Tue May  8 03:52:26 2018
New Revision: 50
URL: https://svnweb.freebsd.org/changeset/base/50

Log:
  Tag sqlite3-3.23.1 import

Added:
  vendor/sqlite3/sqlite-3230100/
 - copied from r49, vendor/sqlite3/dist/
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r333349 - in vendor/sqlite3/dist: . tea

[Peter Wemm]

Author: peter
Date: Tue May  8 03:51:19 2018
New Revision: 49
URL: https://svnweb.freebsd.org/changeset/base/49

Log:
  Import sqlite3-3.23.1 (3230100)

Deleted:
  vendor/sqlite3/dist/tea/
Modified:
  vendor/sqlite3/dist/Makefile.am
  vendor/sqlite3/dist/Makefile.in
  vendor/sqlite3/dist/Makefile.msc
  vendor/sqlite3/dist/configure
  vendor/sqlite3/dist/configure.ac
  vendor/sqlite3/dist/shell.c
  vendor/sqlite3/dist/sqlite3.c
  vendor/sqlite3/dist/sqlite3.h
  vendor/sqlite3/dist/sqlite3ext.h

Modified: vendor/sqlite3/dist/Makefile.am
==
--- vendor/sqlite3/dist/Makefile.am Tue May  8 03:45:46 2018
(r48)
+++ vendor/sqlite3/dist/Makefile.am Tue May  8 03:51:19 2018
(r49)
@@ -1,5 +1,5 @@
 
-AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@ 
@JSON1_FLAGS@ @SESSION_FLAGS@ -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE
+AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@ 
@JSON1_FLAGS@ @ZLIB_FLAGS@ @SESSION_FLAGS@ -DSQLITE_ENABLE_FTS3 
-DSQLITE_ENABLE_RTREE
 
 lib_LTLIBRARIES = libsqlite3.la
 libsqlite3_la_SOURCES = sqlite3.c
@@ -10,7 +10,7 @@ sqlite3_SOURCES = shell.c sqlite3.h
 EXTRA_sqlite3_SOURCES = sqlite3.c
 sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@
 sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@
-sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS 
-DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_ENABLE_STMTVTAB 
-DSQLITE_ENABLE_DBSTAT_VTAB $(SHELL_CFLAGS)
 
 include_HEADERS = sqlite3.h sqlite3ext.h
 

Modified: vendor/sqlite3/dist/Makefile.in
==
--- vendor/sqlite3/dist/Makefile.in Tue May  8 03:45:46 2018
(r48)
+++ vendor/sqlite3/dist/Makefile.in Tue May  8 03:51:19 2018
(r49)
@@ -308,9 +308,11 @@ SED = @SED@
 SESSION_FLAGS = @SESSION_FLAGS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SHELL_CFLAGS = @SHELL_CFLAGS@
 STRIP = @STRIP@
 THREADSAFE_FLAGS = @THREADSAFE_FLAGS@
 VERSION = @VERSION@
+ZLIB_FLAGS = @ZLIB_FLAGS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -363,7 +365,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@ 
@JSON1_FLAGS@ @SESSION_FLAGS@ -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE
+AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@ 
@JSON1_FLAGS@ @ZLIB_FLAGS@ @SESSION_FLAGS@ -DSQLITE_ENABLE_FTS3 
-DSQLITE_ENABLE_RTREE
 lib_LTLIBRARIES = libsqlite3.la
 libsqlite3_la_SOURCES = sqlite3.c
 libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
@@ -371,7 +373,7 @@ sqlite3_SOURCES = shell.c sqlite3.h
 EXTRA_sqlite3_SOURCES = sqlite3.c
 sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@
 sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@
-sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS 
-DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_ENABLE_STMTVTAB 
-DSQLITE_ENABLE_DBSTAT_VTAB $(SHELL_CFLAGS)
 include_HEADERS = sqlite3.h sqlite3ext.h
 EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc README.txt Replace.cs
 pkgconfigdir = ${libdir}/pkgconfig

Modified: vendor/sqlite3/dist/Makefile.msc
==
--- vendor/sqlite3/dist/Makefile.mscTue May  8 03:45:46 2018
(r48)
+++ vendor/sqlite3/dist/Makefile.mscTue May  8 03:51:19 2018
(r49)
@@ -561,6 +561,7 @@ SHELL_CORE_DEP =
 !ENDIF
 !ENDIF
 
+
 # This is the core library that the shell executable should link with.
 #
 !IFNDEF SHELL_CORE_LIB
@@ -808,7 +809,7 @@ LTLINK = $(TCC) -Fe$@
 # If requested, link to the RPCRT4 library.
 #
 !IF $(USE_RPCRT4_LIB)!=0
-LTLINK = $(LTLINK) rpcrt4.lib
+LTLIBS = $(LTLIBS) rpcrt4.lib
 !ENDIF
 
 # If a platform was set, force the linker to target that.
@@ -927,15 +928,26 @@ LIBRESOBJS =
 # when the shell is not being dynamically linked.
 #
 !IF $(DYNAMIC_SHELL)==0 && $(FOR_WIN10)==0
-SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_SHELL_JSON1 
-DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_STMTVTAB
+SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_JSON1 
-DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_STMTVTAB
+SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_DBPAGE_VTAB 
-DSQLITE_ENABLE_DBSTAT_VTAB
+SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_OFFSET_SQL_FUNC 
-DSQLITE_INTROSPECTION_PRAGMAS
+SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_RTREE
 !ENDIF
 
 
 # This is the default Makefile target.  The objects listed here
 # are what get build when you type just "make" with no arguments.
 #
-all:   dll shell
+core:  dll shell
 
+# Targets 

svn commit: r333348 - vendor/subversion/subversion-1.10.0

[Peter Wemm]

Author: peter
Date: Tue May  8 03:45:46 2018
New Revision: 48
URL: https://svnweb.freebsd.org/changeset/base/48

Log:
  Tag subversion-1.10.0 import

Added:
  vendor/subversion/subversion-1.10.0/
 - copied from r47, vendor/subversion/dist/
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r333347 - in vendor/subversion: . dist dist/doc dist/subversion dist/subversion/include dist/subversion/include/private dist/subversion/libsvn_auth_gnome_keyring dist/subversion/libsvn_...

[Peter Wemm]

Author: peter
Date: Tue May  8 03:44:38 2018
New Revision: 47
URL: https://svnweb.freebsd.org/changeset/base/47

Log:
  Import Subversion-1.10.0

Added:
  vendor/subversion/dist/.editorconfig
  vendor/subversion/dist/subversion/include/private/ra_svn_wrapped_sasl.h   
(contents, props changed)
  vendor/subversion/dist/subversion/include/private/svn_branch.h   (contents, 
props changed)
  vendor/subversion/dist/subversion/include/private/svn_branch_compat.h   
(contents, props changed)
  vendor/subversion/dist/subversion/include/private/svn_branch_impl.h   
(contents, props changed)
  vendor/subversion/dist/subversion/include/private/svn_branch_nested.h   
(contents, props changed)
  vendor/subversion/dist/subversion/include/private/svn_branch_repos.h   
(contents, props changed)
  vendor/subversion/dist/subversion/include/private/svn_config_private.h   
(contents, props changed)
  vendor/subversion/dist/subversion/include/private/svn_element.h   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_client/conflicts.c   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_client/merge_elements.c   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_client/shelve.c   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_delta/branch.c   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_delta/branch_compat.c   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_delta/branch_migrate.c   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_delta/branch_nested.c   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_delta/branch_repos.c   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_delta/element.c   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_fs_base/fs_init.h   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_fs_fs/fs_init.h   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_fs_x/batch_fsync.c   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_fs_x/batch_fsync.h   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_fs_x/dag_cache.c   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_fs_x/dag_cache.h   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_fs_x/fs_init.h   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_ra_serf/list.c   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_ra_serf/request_body.c   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_ra_serf/stream_bucket.c   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_ra_svn/wrapped_sasl.c   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_repos/authz.h   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_repos/authz_info.c   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_repos/authz_parse.c   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_repos/compat.c   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_repos/config_file.c   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_repos/config_file.h   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_repos/list.c   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_subr/cache-null.c   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_subr/compress_lz4.c   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_subr/compress_zlib.c   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_subr/encode.c   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_subr/lz4/
  vendor/subversion/dist/subversion/libsvn_subr/lz4/LICENSE
  vendor/subversion/dist/subversion/libsvn_subr/lz4/lz4.c   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_subr/lz4/lz4internal.h   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_subr/pools.h   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_subr/utf8proc/LICENSE.md
  vendor/subversion/dist/subversion/libsvn_subr/utf8proc/NEWS.md
  vendor/subversion/dist/subversion/libsvn_subr/utf8proc/README.md
  vendor/subversion/dist/subversion/libsvn_subr/utf8proc/lump.md
  vendor/subversion/dist/subversion/libsvn_subr/utf8proc/utf8proc_internal.h   
(contents, props changed)
  vendor/subversion/dist/subversion/svn/shelve-cmd.c   (contents, props changed)
Deleted:
  vendor/subversion/dist/subversion/libsvn_delta/debug_editor.h
  vendor/subversion/dist/subversion/libsvn_ra_serf/README
  vendor/subversion/dist/subversion/libsvn_repos/authz_pool.c
  vendor/subversion/dist/subversion/libsvn_subr/compress.c
  vendor/subversion/dist/subversion/libsvn_subr/utf8proc/LICENSE
  

Re: svn commit: r325378 - head/sys/dev/ipmi

[Peter Wemm]

On Saturday, November 04, 2017 11:03:55 PM Warner Losh wrote:
> On Sat, Nov 4, 2017 at 10:50 PM, Peter Wemm <pe...@wemm.org> wrote:
> > On Saturday, November 04, 2017 03:01:58 AM Warner Losh wrote:
> > > Author: imp
> > > Date: Sat Nov  4 03:01:58 2017
> > > New Revision: 325378
> > > URL: https://svnweb.freebsd.org/changeset/base/325378
> > > 
> > > Log:
> > >   Make the startup timeout 0 seconds by default rathern than 420s.  This
> > >   makes the default fail safe when watchdogd is disabled (which is also
> > >   the default).
> > 
> > We're still getting unanticipated reboots.
> > 
> > I think what is happening is:
> > 1) orderly reboot initiated.
> > 2) By default, the watchdog code sets a 420 second timer, even with no
> > watchdogd.
> > 3) reboot complets, system comes up.
> > 4) A few minutes later, the pre-reboot 420 second timer expires and
> > *another*
> > reboot happens.
> > 
> > Setting hw.ipmi.on="0" in loader.conf stops this...
> > 
> > eg: reboot at 4:41:47.. system comes back up, and later:
> > ...
> > Uptime: 322 Sun Nov 5 04:48:45 UTC 2017
> > Uptime: 323 Sun Nov 5 04:48:46 UTC 2017
> > Uptime: 324 Sun Nov 5 04:48:47 UTC 2017
> > Stopping cron.
> > Waiting for PIDS: 1004.
> > Stopping sshd.
> > Waiting for PIDS: 994.
> > Stopping nginx.
> > ...
> > That's exactly 420 seconds after the original reboot which matches the
> > wd_shutdown_countdown timer that is still enabled.]
> 
> Good detective work.I suspect this will need to be opt-in as well... Though
> the other option is to disable the watchdog on attach if we're not enabling
> the early watchdog which would give us a watchdog when we hang on
> shutdown...  I need to think this through Fix it early with less
> protection by setting this to 0, or fix it later with more protection, but
> perhaps odd behavior for some edge cases like downgrade.
> 
> In the mean time hw.ipmi.wd_shutdown_countdown=0 should also fix it. Can
> you confirm that?
> 
> Warner

We have a number of obnoxious machines that take 5+ minutes in POST.  The 7 
minute timer is cutting it awfully close.

However, what I'm more worried about: what if you're going to boot something 
other than FreeBSD?  Or going into the BIOS to tweak something?   If I break 
into the loader to pause booting, it'll just silently reboot out from under me 
a few minutes later.   I don't see how this can be anything but opt-in by 
default.  As it's a timer initiated by an orderly shutdown/reboot there should 
be plenty of time for an approprate value to be safely set.

Yes, setting the sysctl after boot did prevent the spurious reboot after the 
next boot-up.
-- 
Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246

signature.asc
Description: This is a digitally signed message part.

svn commit: r325425 - head/sys/dev/ipmi

[Peter Wemm]

Author: peter
Date: Sun Nov  5 05:05:18 2017
New Revision: 325425
URL: https://svnweb.freebsd.org/changeset/base/325425

Log:
  As a follow-on to r325378, make the shutdown timer default to 0 as well.
  
  Otherwise an orderly shutdown will initiate a watchdog that will cause
  a 7 minute delayed reboot *by default*,  In the freebsd.org cluster's case
  this often worked out be a surprise reboot a minute or two after the
  machine came back up.

Modified:
  head/sys/dev/ipmi/ipmi.c

Modified: head/sys/dev/ipmi/ipmi.c
==
--- head/sys/dev/ipmi/ipmi.cSun Nov  5 04:28:05 2017(r325424)
+++ head/sys/dev/ipmi/ipmi.cSun Nov  5 05:05:18 2017(r325425)
@@ -83,7 +83,7 @@ int ipmi_attached = 0;
 static int on = 1;
 static bool wd_in_shutdown = false;
 static int wd_timer_actions = IPMI_SET_WD_ACTION_POWER_CYCLE;
-static int wd_shutdown_countdown = 420; /* sec */
+static int wd_shutdown_countdown = 0; /* sec */
 static int wd_startup_countdown = 0; /* sec */
 static int wd_pretimeout_countdown = 120; /* sec */
 static int cycle_wait = 10; /* sec */
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r325378 - head/sys/dev/ipmi

[Peter Wemm]

On Saturday, November 04, 2017 03:01:58 AM Warner Losh wrote:
> Author: imp
> Date: Sat Nov  4 03:01:58 2017
> New Revision: 325378
> URL: https://svnweb.freebsd.org/changeset/base/325378
> 
> Log:
>   Make the startup timeout 0 seconds by default rathern than 420s.  This
>   makes the default fail safe when watchdogd is disabled (which is also
>   the default).

We're still getting unanticipated reboots.

I think what is happening is:
1) orderly reboot initiated.
2) By default, the watchdog code sets a 420 second timer, even with no 
watchdogd.
3) reboot complets, system comes up. 
4) A few minutes later, the pre-reboot 420 second timer expires and *another* 
reboot happens.

Setting hw.ipmi.on="0" in loader.conf stops this...

eg: reboot at 4:41:47.. system comes back up, and later:
...
Uptime: 322 Sun Nov 5 04:48:45 UTC 2017
Uptime: 323 Sun Nov 5 04:48:46 UTC 2017
Uptime: 324 Sun Nov 5 04:48:47 UTC 2017
Stopping cron.
Waiting for PIDS: 1004.
Stopping sshd.
Waiting for PIDS: 994.
Stopping nginx.
...
That's exactly 420 seconds after the original reboot which matches the 
wd_shutdown_countdown timer that is still enabled.

-- 
Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246

signature.asc
Description: This is a digitally signed message part.

Re: svn commit: r325024 - in head/sys: dev/ipmi sys

[Peter Wemm]

On Thursday, October 26, 2017 10:52:51 PM Warner Losh wrote:

> Log:
>   Various IPMI watchdog timer improvements

How is this supposed to work?  Every 12.x machine in the freebsd.org cluster 
with ipmi on the motherboard now soft-reboots after exactly 420 seconds of 
uptime, without giving any clue as to why.

Setting hw.ipmi.on="0" in loader.conf 'solves' it, but that's not exactly 
ideal.  What are existing machines supposed to do?

-- 
Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246

signature.asc
Description: This is a digitally signed message part.

svn commit: r322444 - in stable/11/contrib/sqlite3: . tea tea/generic

[Peter Wemm]

Author: peter
Date: Sat Aug 12 22:14:09 2017
New Revision: 322444
URL: https://svnweb.freebsd.org/changeset/base/322444

Log:
  MFC: r322386 Update private sqlite3-3.14.1 to sqlite3-3.20.0.

Modified:
  stable/11/contrib/sqlite3/Makefile.msc
  stable/11/contrib/sqlite3/configure
  stable/11/contrib/sqlite3/configure.ac
  stable/11/contrib/sqlite3/shell.c
  stable/11/contrib/sqlite3/sqlite3.c
  stable/11/contrib/sqlite3/sqlite3.h
  stable/11/contrib/sqlite3/sqlite3ext.h
  stable/11/contrib/sqlite3/tea/configure
  stable/11/contrib/sqlite3/tea/configure.ac
  stable/11/contrib/sqlite3/tea/generic/tclsqlite3.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/contrib/sqlite3/Makefile.msc
==
--- stable/11/contrib/sqlite3/Makefile.msc  Sat Aug 12 22:13:06 2017
(r322443)
+++ stable/11/contrib/sqlite3/Makefile.msc  Sat Aug 12 22:14:09 2017
(r322444)
@@ -21,9 +21,16 @@ TOP = .
 # Set this non-0 to enable full warnings (-W4, etc) when compiling.
 #
 !IFNDEF USE_FULLWARN
-USE_FULLWARN = 0
+USE_FULLWARN = 1
 !ENDIF
 
+# Set this non-0 to enable treating warnings as errors (-WX, etc) when
+# compiling.
+#
+!IFNDEF USE_FATAL_WARN
+USE_FATAL_WARN = 0
+!ENDIF
+
 # Set this non-0 to enable full runtime error checks (-RTC1, etc).  This
 # has no effect if (any) optimizations are enabled.
 #
@@ -31,6 +38,13 @@ USE_FULLWARN = 0
 USE_RUNTIME_CHECKS = 0
 !ENDIF
 
+# Set this non-0 to create a SQLite amalgamation file that excludes the
+# various built-in extensions.
+#
+!IFNDEF MINIMAL_AMALGAMATION
+MINIMAL_AMALGAMATION = 0
+!ENDIF
+
 # Set this non-0 to use "stdcall" calling convention for the core library
 # and shell executable.
 #
@@ -255,12 +269,15 @@ SQLITE3EXEPDB = /pdb:sqlite3sh.pdb
 !ENDIF
 !ENDIF
 
+
 # These are the "standard" SQLite compilation options used when compiling for
 # the Windows platform.
 #
 !IFNDEF OPT_FEATURE_FLAGS
+!IF $(MINIMAL_AMALGAMATION)==0
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3=1
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RTREE=1
+!ENDIF
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
 !ENDIF
 
@@ -444,6 +461,12 @@ TCC = $(CC) -nologo -W4 -DINCLUDE_MSVC_H=1 $(CCOPTS) $
 TCC = $(CC) -nologo -W3 $(CCOPTS) $(TCCOPTS)
 !ENDIF
 
+# Check if warnings should be treated as errors when compiling.
+#
+!IF $(USE_FATAL_WARN)!=0
+TCC = $(TCC) -WX
+!ENDIF
+
 TCC = $(TCC) -DSQLITE_OS_WIN=1 -I. -I$(TOP) -fp:precise
 RCC = $(RC) -DSQLITE_OS_WIN=1 -I. -I$(TOP) $(RCOPTS) $(RCCOPTS)
 
@@ -622,7 +645,11 @@ RCC = $(RCC) -DSQLITE_ENABLE_API_ARMOR=1
 !IF $(DEBUG)>2
 TCC = $(TCC) -DSQLITE_DEBUG=1
 RCC = $(RCC) -DSQLITE_DEBUG=1
+!IF $(DYNAMIC_SHELL)==0
+TCC = $(TCC) -DSQLITE_ENABLE_WHERETRACE -DSQLITE_ENABLE_SELECTTRACE
+RCC = $(RCC) -DSQLITE_ENABLE_WHERETRACE -DSQLITE_ENABLE_SELECTTRACE
 !ENDIF
+!ENDIF
 
 !IF $(DEBUG)>4 || $(OSTRACE)!=0
 TCC = $(TCC) -DSQLITE_FORCE_OS_TRACE=1 -DSQLITE_DEBUG_OS_TRACE=1
@@ -900,7 +927,7 @@ LIBRESOBJS =
 # when the shell is not being dynamically linked.
 #
 !IF $(DYNAMIC_SHELL)==0 && $(FOR_WIN10)==0
-SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_SHELL_JSON1 
-DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_SHELL_JSON1 
-DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_STMTVTAB
 !ENDIF
 
 
@@ -927,7 +954,7 @@ Replace.exe:
 sqlite3.def:   Replace.exe $(LIBOBJ)
echo EXPORTS > sqlite3.def
dumpbin /all $(LIBOBJ) \
-   | .\Replace.exe 
"^\s+/EXPORT:_?(sqlite3_[^@,]*)(?:@\d+|,DATA)?$$" $$1 true \
+   | .\Replace.exe 
"^\s+/EXPORT:_?(sqlite3(?:session|changeset|changegroup)?_[^@,]*)(?:@\d+|,DATA)?$$"
 $$1 true \
| sort >> sqlite3.def
 
 $(SQLITE3EXE): $(TOP)\shell.c $(SHELL_CORE_DEP) $(LIBRESOBJS) 
$(SHELL_CORE_SRC) $(SQLITE3H)

Modified: stable/11/contrib/sqlite3/configure
==
--- stable/11/contrib/sqlite3/configure Sat Aug 12 22:13:06 2017
(r322443)
+++ stable/11/contrib/sqlite3/configure Sat Aug 12 22:14:09 2017
(r322444)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sqlite 3.14.1.
+# Generated by GNU Autoconf 2.69 for sqlite 3.20.0.
 #
 # Report bugs to .
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='sqlite'
 PACKAGE_TARNAME='sqlite'
-PACKAGE_VERSION='3.14.1'
-PACKAGE_STRING='sqlite 3.14.1'
+PACKAGE_VERSION='3.20.0'
+PACKAGE_STRING='sqlite 3.20.0'
 PACKAGE_BUGREPORT='http://www.sqlite.org'
 PACKAGE_URL=''
 
@@ -1330,7 +1330,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' 

svn commit: r322442 - in stable/11/contrib/subversion: . subversion/include subversion/libsvn_client subversion/libsvn_fs_fs subversion/libsvn_fs_x subversion/libsvn_ra_svn subversion/libsvn_repos ...

[Peter Wemm]

Author: peter
Date: Sat Aug 12 22:12:09 2017
New Revision: 322442
URL: https://svnweb.freebsd.org/changeset/base/322442

Log:
  MFC: r322380 Update subversion 1.9.5 -> 1.9.7

Modified:
  stable/11/contrib/subversion/CHANGES
  stable/11/contrib/subversion/NOTICE
  stable/11/contrib/subversion/build-outputs.mk
  stable/11/contrib/subversion/configure
  stable/11/contrib/subversion/subversion/include/svn_version.h
  stable/11/contrib/subversion/subversion/libsvn_client/copy.c
  stable/11/contrib/subversion/subversion/libsvn_client/merge.c
  stable/11/contrib/subversion/subversion/libsvn_fs_fs/cached_data.c
  stable/11/contrib/subversion/subversion/libsvn_fs_fs/cached_data.h
  stable/11/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h
  stable/11/contrib/subversion/subversion/libsvn_fs_fs/rep-cache.c
  stable/11/contrib/subversion/subversion/libsvn_fs_fs/transaction.c
  stable/11/contrib/subversion/subversion/libsvn_fs_x/rep-cache-db.h
  stable/11/contrib/subversion/subversion/libsvn_ra_svn/client.c
  stable/11/contrib/subversion/subversion/libsvn_repos/dump.c
  stable/11/contrib/subversion/subversion/libsvn_subr/config_file.c
  stable/11/contrib/subversion/subversion/libsvn_subr/internal_statements.h
  stable/11/contrib/subversion/subversion/libsvn_subr/io.c
  stable/11/contrib/subversion/subversion/libsvn_subr/version.c
  stable/11/contrib/subversion/subversion/libsvn_wc/wc-checks.h
  stable/11/contrib/subversion/subversion/libsvn_wc/wc-metadata.h
  stable/11/contrib/subversion/subversion/libsvn_wc/wc-queries.h
  stable/11/contrib/subversion/subversion/svnadmin/svnadmin.c
  stable/11/contrib/subversion/win-tests.py
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/contrib/subversion/CHANGES
==
--- stable/11/contrib/subversion/CHANGESSat Aug 12 21:26:46 2017
(r322441)
+++ stable/11/contrib/subversion/CHANGESSat Aug 12 22:12:09 2017
(r322442)
@@ -1,3 +1,63 @@
+Version 1.9.7
+(10 Aug 2017, from /branches/1.9.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.9.7
+
+ User-visible changes:
+  - Client-side bugfixes:
+* Fix arbitrary code execution vulnerability CVE-2017-9800
+See 
+for details.
+
+  - Server-side bugfixes:
+(none)
+
+  - Bindings bugfixes:
+(none)
+
+ Developer-visible changes:
+  - General:
+(none)
+
+  - API changes:
+(none)
+
+
+Version 1.9.6
+(5 Jul 2017, from /branches/1.9.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.9.6
+
+ User-visible changes:
+  - Client-side bugfixes:
+* cp/mv: improve error message when target is an unversioned dir (r1779948)
+* merge: reduce memory usage with large amounts of mergeinfo (issue #4667)
+
+  - Server-side bugfixes:
+* 'svnadmin freeze': document the purpose more clearly (r1774109)
+* dump: fix segfault when a revision has no revprops (r1781507)
+* fsfs: improve error message upon failure to open rep-cache (r1781655)
+* fsfs: never attempt to share directory representations (r1785053)
+* fsfs: make consistency independent of hash algorithms (r1785737 et al)
+   This change makes Subversion resilient to collision attacks, including
+   SHA-1 collision attacks such as .  See also our
+   documentation at  and
+   .
+
+  - Client-side and server-side bugfixes:
+* work around an APR bug related to file truncation (r1759116)
+
+  - Bindings bugfixes:
+* javahl: follow redirects when opening a connection (r1667738, r1796720)
+
+ Developer-visible changes:
+  - General:
+* win_tests.py: make the --bin option work, rather than abort (r1706432)
+  (regression introduced in 1.9.2)
+* windows: support building with 'zlibstat.lib' in install-layout 
(r1783704)
+
+  - API changes:
+(none)
+
+
 Version 1.9.5
 (29 Nov 2016, from /branches/1.9.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.9.5
@@ -19,7 +79,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.9.5
 * fsfs: fix "offset too large" error during pack (issue #4657)
 * svnserve: enable hook script environments (r1769152)
 * fsfs: fix possible data reconstruction error (issue #4658)
-* fix source of spurious 'incoming edit' tree conflicts (r1770108)
+* fix source of spurious 'incoming edit' tree conflicts (r1760570)
 * fsfs: improve caching for large directories (r1721285)
 * fsfs: fix crash when encountering all-zero checksums (r1759686)
 * fsfs: fix potential source of repository corruptions (r1756266)
@@ -34,19 +94,19 @@ http://svn.apache.org/repos/asf/subversion/tags/1.9.5
 
   - Bindings bugfixes:
 * swig-pl: do not corrupt "{DATE}" revision variable (r1767768)
-* javahl: fix temporary accepting SSL 

svn commit: r322387 - vendor/sqlite3/sqlite-3200000

[Peter Wemm]

Author: peter
Date: Fri Aug 11 00:01:22 2017
New Revision: 322387
URL: https://svnweb.freebsd.org/changeset/base/322387

Log:
  Tag import of sqlite-3.20.0

Added:
  vendor/sqlite3/sqlite-320/
 - copied from r322386, vendor/sqlite3/dist/
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322386 - in head/contrib/sqlite3: . tea tea/generic

[Peter Wemm]

Author: peter
Date: Fri Aug 11 00:00:01 2017
New Revision: 322386
URL: https://svnweb.freebsd.org/changeset/base/322386

Log:
  Update from sqlite3-3.14.1 to sqlite3-3.20.0.  This is a private lib.
  This fixes a possible client-side crash when parsing corrupt databases.

Modified:
  head/contrib/sqlite3/Makefile.msc
  head/contrib/sqlite3/configure
  head/contrib/sqlite3/configure.ac
  head/contrib/sqlite3/shell.c
  head/contrib/sqlite3/sqlite3.c
  head/contrib/sqlite3/sqlite3.h
  head/contrib/sqlite3/sqlite3ext.h
  head/contrib/sqlite3/tea/configure
  head/contrib/sqlite3/tea/configure.ac
  head/contrib/sqlite3/tea/generic/tclsqlite3.c
Directory Properties:
  head/contrib/sqlite3/   (props changed)

Modified: head/contrib/sqlite3/Makefile.msc
==
--- head/contrib/sqlite3/Makefile.msc   Thu Aug 10 23:45:32 2017
(r322385)
+++ head/contrib/sqlite3/Makefile.msc   Fri Aug 11 00:00:01 2017
(r322386)
@@ -21,9 +21,16 @@ TOP = .
 # Set this non-0 to enable full warnings (-W4, etc) when compiling.
 #
 !IFNDEF USE_FULLWARN
-USE_FULLWARN = 0
+USE_FULLWARN = 1
 !ENDIF
 
+# Set this non-0 to enable treating warnings as errors (-WX, etc) when
+# compiling.
+#
+!IFNDEF USE_FATAL_WARN
+USE_FATAL_WARN = 0
+!ENDIF
+
 # Set this non-0 to enable full runtime error checks (-RTC1, etc).  This
 # has no effect if (any) optimizations are enabled.
 #
@@ -31,6 +38,13 @@ USE_FULLWARN = 0
 USE_RUNTIME_CHECKS = 0
 !ENDIF
 
+# Set this non-0 to create a SQLite amalgamation file that excludes the
+# various built-in extensions.
+#
+!IFNDEF MINIMAL_AMALGAMATION
+MINIMAL_AMALGAMATION = 0
+!ENDIF
+
 # Set this non-0 to use "stdcall" calling convention for the core library
 # and shell executable.
 #
@@ -255,12 +269,15 @@ SQLITE3EXEPDB = /pdb:sqlite3sh.pdb
 !ENDIF
 !ENDIF
 
+
 # These are the "standard" SQLite compilation options used when compiling for
 # the Windows platform.
 #
 !IFNDEF OPT_FEATURE_FLAGS
+!IF $(MINIMAL_AMALGAMATION)==0
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3=1
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RTREE=1
+!ENDIF
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
 !ENDIF
 
@@ -444,6 +461,12 @@ TCC = $(CC) -nologo -W4 -DINCLUDE_MSVC_H=1 $(CCOPTS) $
 TCC = $(CC) -nologo -W3 $(CCOPTS) $(TCCOPTS)
 !ENDIF
 
+# Check if warnings should be treated as errors when compiling.
+#
+!IF $(USE_FATAL_WARN)!=0
+TCC = $(TCC) -WX
+!ENDIF
+
 TCC = $(TCC) -DSQLITE_OS_WIN=1 -I. -I$(TOP) -fp:precise
 RCC = $(RC) -DSQLITE_OS_WIN=1 -I. -I$(TOP) $(RCOPTS) $(RCCOPTS)
 
@@ -622,7 +645,11 @@ RCC = $(RCC) -DSQLITE_ENABLE_API_ARMOR=1
 !IF $(DEBUG)>2
 TCC = $(TCC) -DSQLITE_DEBUG=1
 RCC = $(RCC) -DSQLITE_DEBUG=1
+!IF $(DYNAMIC_SHELL)==0
+TCC = $(TCC) -DSQLITE_ENABLE_WHERETRACE -DSQLITE_ENABLE_SELECTTRACE
+RCC = $(RCC) -DSQLITE_ENABLE_WHERETRACE -DSQLITE_ENABLE_SELECTTRACE
 !ENDIF
+!ENDIF
 
 !IF $(DEBUG)>4 || $(OSTRACE)!=0
 TCC = $(TCC) -DSQLITE_FORCE_OS_TRACE=1 -DSQLITE_DEBUG_OS_TRACE=1
@@ -900,7 +927,7 @@ LIBRESOBJS =
 # when the shell is not being dynamically linked.
 #
 !IF $(DYNAMIC_SHELL)==0 && $(FOR_WIN10)==0
-SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_SHELL_JSON1 
-DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_SHELL_JSON1 
-DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_STMTVTAB
 !ENDIF
 
 
@@ -927,7 +954,7 @@ Replace.exe:
 sqlite3.def:   Replace.exe $(LIBOBJ)
echo EXPORTS > sqlite3.def
dumpbin /all $(LIBOBJ) \
-   | .\Replace.exe 
"^\s+/EXPORT:_?(sqlite3_[^@,]*)(?:@\d+|,DATA)?$$" $$1 true \
+   | .\Replace.exe 
"^\s+/EXPORT:_?(sqlite3(?:session|changeset|changegroup)?_[^@,]*)(?:@\d+|,DATA)?$$"
 $$1 true \
| sort >> sqlite3.def
 
 $(SQLITE3EXE): $(TOP)\shell.c $(SHELL_CORE_DEP) $(LIBRESOBJS) 
$(SHELL_CORE_SRC) $(SQLITE3H)

Modified: head/contrib/sqlite3/configure
==
--- head/contrib/sqlite3/configure  Thu Aug 10 23:45:32 2017
(r322385)
+++ head/contrib/sqlite3/configure  Fri Aug 11 00:00:01 2017
(r322386)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sqlite 3.14.1.
+# Generated by GNU Autoconf 2.69 for sqlite 3.20.0.
 #
 # Report bugs to .
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='sqlite'
 PACKAGE_TARNAME='sqlite'
-PACKAGE_VERSION='3.14.1'
-PACKAGE_STRING='sqlite 3.14.1'
+PACKAGE_VERSION='3.20.0'
+PACKAGE_STRING='sqlite 3.20.0'
 PACKAGE_BUGREPORT='http://www.sqlite.org'
 PACKAGE_URL=''
 
@@ -1330,7 +1330,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat 

svn commit: r322382 - in vendor/sqlite3/dist: . tea tea/generic

[Peter Wemm]

Author: peter
Date: Thu Aug 10 22:15:42 2017
New Revision: 322382
URL: https://svnweb.freebsd.org/changeset/base/322382

Log:
  Import sqlite3-3.20.0

Modified:
  vendor/sqlite3/dist/Makefile.msc
  vendor/sqlite3/dist/configure
  vendor/sqlite3/dist/configure.ac
  vendor/sqlite3/dist/shell.c
  vendor/sqlite3/dist/sqlite3.c
  vendor/sqlite3/dist/sqlite3.h
  vendor/sqlite3/dist/sqlite3ext.h
  vendor/sqlite3/dist/tea/configure
  vendor/sqlite3/dist/tea/configure.ac
  vendor/sqlite3/dist/tea/generic/tclsqlite3.c

Modified: vendor/sqlite3/dist/Makefile.msc
==
--- vendor/sqlite3/dist/Makefile.mscThu Aug 10 22:04:54 2017
(r322381)
+++ vendor/sqlite3/dist/Makefile.mscThu Aug 10 22:15:42 2017
(r322382)
@@ -21,9 +21,16 @@ TOP = .
 # Set this non-0 to enable full warnings (-W4, etc) when compiling.
 #
 !IFNDEF USE_FULLWARN
-USE_FULLWARN = 0
+USE_FULLWARN = 1
 !ENDIF
 
+# Set this non-0 to enable treating warnings as errors (-WX, etc) when
+# compiling.
+#
+!IFNDEF USE_FATAL_WARN
+USE_FATAL_WARN = 0
+!ENDIF
+
 # Set this non-0 to enable full runtime error checks (-RTC1, etc).  This
 # has no effect if (any) optimizations are enabled.
 #
@@ -31,6 +38,13 @@ USE_FULLWARN = 0
 USE_RUNTIME_CHECKS = 0
 !ENDIF
 
+# Set this non-0 to create a SQLite amalgamation file that excludes the
+# various built-in extensions.
+#
+!IFNDEF MINIMAL_AMALGAMATION
+MINIMAL_AMALGAMATION = 0
+!ENDIF
+
 # Set this non-0 to use "stdcall" calling convention for the core library
 # and shell executable.
 #
@@ -255,12 +269,15 @@ SQLITE3EXEPDB = /pdb:sqlite3sh.pdb
 !ENDIF
 !ENDIF
 
+
 # These are the "standard" SQLite compilation options used when compiling for
 # the Windows platform.
 #
 !IFNDEF OPT_FEATURE_FLAGS
+!IF $(MINIMAL_AMALGAMATION)==0
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3=1
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RTREE=1
+!ENDIF
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
 !ENDIF
 
@@ -444,6 +461,12 @@ TCC = $(CC) -nologo -W4 -DINCLUDE_MSVC_H=1 $(CCOPTS) $
 TCC = $(CC) -nologo -W3 $(CCOPTS) $(TCCOPTS)
 !ENDIF
 
+# Check if warnings should be treated as errors when compiling.
+#
+!IF $(USE_FATAL_WARN)!=0
+TCC = $(TCC) -WX
+!ENDIF
+
 TCC = $(TCC) -DSQLITE_OS_WIN=1 -I. -I$(TOP) -fp:precise
 RCC = $(RC) -DSQLITE_OS_WIN=1 -I. -I$(TOP) $(RCOPTS) $(RCCOPTS)
 
@@ -622,7 +645,11 @@ RCC = $(RCC) -DSQLITE_ENABLE_API_ARMOR=1
 !IF $(DEBUG)>2
 TCC = $(TCC) -DSQLITE_DEBUG=1
 RCC = $(RCC) -DSQLITE_DEBUG=1
+!IF $(DYNAMIC_SHELL)==0
+TCC = $(TCC) -DSQLITE_ENABLE_WHERETRACE -DSQLITE_ENABLE_SELECTTRACE
+RCC = $(RCC) -DSQLITE_ENABLE_WHERETRACE -DSQLITE_ENABLE_SELECTTRACE
 !ENDIF
+!ENDIF
 
 !IF $(DEBUG)>4 || $(OSTRACE)!=0
 TCC = $(TCC) -DSQLITE_FORCE_OS_TRACE=1 -DSQLITE_DEBUG_OS_TRACE=1
@@ -900,7 +927,7 @@ LIBRESOBJS =
 # when the shell is not being dynamically linked.
 #
 !IF $(DYNAMIC_SHELL)==0 && $(FOR_WIN10)==0
-SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_SHELL_JSON1 
-DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_SHELL_JSON1 
-DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_STMTVTAB
 !ENDIF
 
 
@@ -927,7 +954,7 @@ Replace.exe:
 sqlite3.def:   Replace.exe $(LIBOBJ)
echo EXPORTS > sqlite3.def
dumpbin /all $(LIBOBJ) \
-   | .\Replace.exe 
"^\s+/EXPORT:_?(sqlite3_[^@,]*)(?:@\d+|,DATA)?$$" $$1 true \
+   | .\Replace.exe 
"^\s+/EXPORT:_?(sqlite3(?:session|changeset|changegroup)?_[^@,]*)(?:@\d+|,DATA)?$$"
 $$1 true \
| sort >> sqlite3.def
 
 $(SQLITE3EXE): $(TOP)\shell.c $(SHELL_CORE_DEP) $(LIBRESOBJS) 
$(SHELL_CORE_SRC) $(SQLITE3H)

Modified: vendor/sqlite3/dist/configure
==
--- vendor/sqlite3/dist/configure   Thu Aug 10 22:04:54 2017
(r322381)
+++ vendor/sqlite3/dist/configure   Thu Aug 10 22:15:42 2017
(r322382)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sqlite 3.14.1.
+# Generated by GNU Autoconf 2.69 for sqlite 3.20.0.
 #
 # Report bugs to .
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='sqlite'
 PACKAGE_TARNAME='sqlite'
-PACKAGE_VERSION='3.14.1'
-PACKAGE_STRING='sqlite 3.14.1'
+PACKAGE_VERSION='3.20.0'
+PACKAGE_STRING='sqlite 3.20.0'
 PACKAGE_BUGREPORT='http://www.sqlite.org'
 PACKAGE_URL=''
 
@@ -1330,7 +1330,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures sqlite 3.14.1 to adapt to many kinds of systems.
+\`configure' configures sqlite 3.20.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ 

svn commit: r322381 - vendor/subversion/subversion-1.9.7

[Peter Wemm]

Author: peter
Date: Thu Aug 10 22:04:54 2017
New Revision: 322381
URL: https://svnweb.freebsd.org/changeset/base/322381

Log:
  Tag subversion-1.9.7 import.

Added:
  vendor/subversion/subversion-1.9.7/
 - copied from r322380, vendor/subversion/dist/
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r322380 - in head/contrib/subversion: . subversion/include subversion/libsvn_client subversion/libsvn_fs_fs subversion/libsvn_fs_x subversion/libsvn_ra_svn subversion/libsvn_repos subve...

[Peter Wemm]

Author: peter
Date: Thu Aug 10 22:03:26 2017
New Revision: 322380
URL: https://svnweb.freebsd.org/changeset/base/322380

Log:
  Update subversion 1.9.5 -> 1.9.7
  
  This includes a client-side fix for CVE-2017-9800.

Modified:
  head/contrib/subversion/CHANGES
  head/contrib/subversion/NOTICE
  head/contrib/subversion/build-outputs.mk
  head/contrib/subversion/configure
  head/contrib/subversion/subversion/include/svn_version.h
  head/contrib/subversion/subversion/libsvn_client/copy.c
  head/contrib/subversion/subversion/libsvn_client/merge.c
  head/contrib/subversion/subversion/libsvn_fs_fs/cached_data.c
  head/contrib/subversion/subversion/libsvn_fs_fs/cached_data.h
  head/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h
  head/contrib/subversion/subversion/libsvn_fs_fs/rep-cache.c
  head/contrib/subversion/subversion/libsvn_fs_fs/transaction.c
  head/contrib/subversion/subversion/libsvn_fs_x/rep-cache-db.h
  head/contrib/subversion/subversion/libsvn_ra_svn/client.c
  head/contrib/subversion/subversion/libsvn_repos/dump.c
  head/contrib/subversion/subversion/libsvn_subr/config_file.c
  head/contrib/subversion/subversion/libsvn_subr/internal_statements.h
  head/contrib/subversion/subversion/libsvn_subr/io.c
  head/contrib/subversion/subversion/libsvn_subr/version.c
  head/contrib/subversion/subversion/libsvn_wc/wc-checks.h
  head/contrib/subversion/subversion/libsvn_wc/wc-metadata.h
  head/contrib/subversion/subversion/libsvn_wc/wc-queries.h
  head/contrib/subversion/subversion/svnadmin/svnadmin.c
  head/contrib/subversion/win-tests.py
Directory Properties:
  head/contrib/subversion/   (props changed)

Modified: head/contrib/subversion/CHANGES
==
--- head/contrib/subversion/CHANGES Thu Aug 10 22:00:08 2017
(r322379)
+++ head/contrib/subversion/CHANGES Thu Aug 10 22:03:26 2017
(r322380)
@@ -1,3 +1,63 @@
+Version 1.9.7
+(10 Aug 2017, from /branches/1.9.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.9.7
+
+ User-visible changes:
+  - Client-side bugfixes:
+* Fix arbitrary code execution vulnerability CVE-2017-9800
+See 
+for details.
+
+  - Server-side bugfixes:
+(none)
+
+  - Bindings bugfixes:
+(none)
+
+ Developer-visible changes:
+  - General:
+(none)
+
+  - API changes:
+(none)
+
+
+Version 1.9.6
+(5 Jul 2017, from /branches/1.9.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.9.6
+
+ User-visible changes:
+  - Client-side bugfixes:
+* cp/mv: improve error message when target is an unversioned dir (r1779948)
+* merge: reduce memory usage with large amounts of mergeinfo (issue #4667)
+
+  - Server-side bugfixes:
+* 'svnadmin freeze': document the purpose more clearly (r1774109)
+* dump: fix segfault when a revision has no revprops (r1781507)
+* fsfs: improve error message upon failure to open rep-cache (r1781655)
+* fsfs: never attempt to share directory representations (r1785053)
+* fsfs: make consistency independent of hash algorithms (r1785737 et al)
+   This change makes Subversion resilient to collision attacks, including
+   SHA-1 collision attacks such as .  See also our
+   documentation at  and
+   .
+
+  - Client-side and server-side bugfixes:
+* work around an APR bug related to file truncation (r1759116)
+
+  - Bindings bugfixes:
+* javahl: follow redirects when opening a connection (r1667738, r1796720)
+
+ Developer-visible changes:
+  - General:
+* win_tests.py: make the --bin option work, rather than abort (r1706432)
+  (regression introduced in 1.9.2)
+* windows: support building with 'zlibstat.lib' in install-layout 
(r1783704)
+
+  - API changes:
+(none)
+
+
 Version 1.9.5
 (29 Nov 2016, from /branches/1.9.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.9.5
@@ -19,7 +79,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.9.5
 * fsfs: fix "offset too large" error during pack (issue #4657)
 * svnserve: enable hook script environments (r1769152)
 * fsfs: fix possible data reconstruction error (issue #4658)
-* fix source of spurious 'incoming edit' tree conflicts (r1770108)
+* fix source of spurious 'incoming edit' tree conflicts (r1760570)
 * fsfs: improve caching for large directories (r1721285)
 * fsfs: fix crash when encountering all-zero checksums (r1759686)
 * fsfs: fix potential source of repository corruptions (r1756266)
@@ -34,19 +94,19 @@ http://svn.apache.org/repos/asf/subversion/tags/1.9.5
 
   - Bindings bugfixes:
 * swig-pl: do not corrupt "{DATE}" revision variable (r1767768)
-* javahl: fix temporary accepting SSL server certificates (r1764851)
+* javahl: fix temporarily accepting SSL server 

svn commit: r322377 - in vendor/subversion/dist: . subversion/include subversion/libsvn_client subversion/libsvn_fs_fs subversion/libsvn_fs_x subversion/libsvn_ra_svn subversion/libsvn_repos subver...

[Peter Wemm]

Author: peter
Date: Thu Aug 10 21:48:34 2017
New Revision: 322377
URL: https://svnweb.freebsd.org/changeset/base/322377

Log:
  Import subversion-1.9.7

Modified:
  vendor/subversion/dist/CHANGES
  vendor/subversion/dist/NOTICE
  vendor/subversion/dist/build-outputs.mk
  vendor/subversion/dist/configure
  vendor/subversion/dist/subversion/include/svn_version.h
  vendor/subversion/dist/subversion/libsvn_client/copy.c
  vendor/subversion/dist/subversion/libsvn_client/merge.c
  vendor/subversion/dist/subversion/libsvn_fs_fs/cached_data.c
  vendor/subversion/dist/subversion/libsvn_fs_fs/cached_data.h
  vendor/subversion/dist/subversion/libsvn_fs_fs/rep-cache-db.h
  vendor/subversion/dist/subversion/libsvn_fs_fs/rep-cache.c
  vendor/subversion/dist/subversion/libsvn_fs_fs/transaction.c
  vendor/subversion/dist/subversion/libsvn_fs_x/rep-cache-db.h
  vendor/subversion/dist/subversion/libsvn_ra_svn/client.c
  vendor/subversion/dist/subversion/libsvn_repos/dump.c
  vendor/subversion/dist/subversion/libsvn_subr/config_file.c
  vendor/subversion/dist/subversion/libsvn_subr/internal_statements.h
  vendor/subversion/dist/subversion/libsvn_subr/io.c
  vendor/subversion/dist/subversion/libsvn_subr/version.c
  vendor/subversion/dist/subversion/libsvn_wc/wc-checks.h
  vendor/subversion/dist/subversion/libsvn_wc/wc-metadata.h
  vendor/subversion/dist/subversion/libsvn_wc/wc-queries.h
  vendor/subversion/dist/subversion/svnadmin/svnadmin.c
  vendor/subversion/dist/win-tests.py

Modified: vendor/subversion/dist/CHANGES
==
--- vendor/subversion/dist/CHANGES  Thu Aug 10 21:39:22 2017
(r322376)
+++ vendor/subversion/dist/CHANGES  Thu Aug 10 21:48:34 2017
(r322377)
@@ -1,3 +1,63 @@
+Version 1.9.7
+(10 Aug 2017, from /branches/1.9.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.9.7
+
+ User-visible changes:
+  - Client-side bugfixes:
+* Fix arbitrary code execution vulnerability CVE-2017-9800
+See 
+for details.
+
+  - Server-side bugfixes:
+(none)
+
+  - Bindings bugfixes:
+(none)
+
+ Developer-visible changes:
+  - General:
+(none)
+
+  - API changes:
+(none)
+
+
+Version 1.9.6
+(5 Jul 2017, from /branches/1.9.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.9.6
+
+ User-visible changes:
+  - Client-side bugfixes:
+* cp/mv: improve error message when target is an unversioned dir (r1779948)
+* merge: reduce memory usage with large amounts of mergeinfo (issue #4667)
+
+  - Server-side bugfixes:
+* 'svnadmin freeze': document the purpose more clearly (r1774109)
+* dump: fix segfault when a revision has no revprops (r1781507)
+* fsfs: improve error message upon failure to open rep-cache (r1781655)
+* fsfs: never attempt to share directory representations (r1785053)
+* fsfs: make consistency independent of hash algorithms (r1785737 et al)
+   This change makes Subversion resilient to collision attacks, including
+   SHA-1 collision attacks such as .  See also our
+   documentation at  and
+   .
+
+  - Client-side and server-side bugfixes:
+* work around an APR bug related to file truncation (r1759116)
+
+  - Bindings bugfixes:
+* javahl: follow redirects when opening a connection (r1667738, r1796720)
+
+ Developer-visible changes:
+  - General:
+* win_tests.py: make the --bin option work, rather than abort (r1706432)
+  (regression introduced in 1.9.2)
+* windows: support building with 'zlibstat.lib' in install-layout 
(r1783704)
+
+  - API changes:
+(none)
+
+
 Version 1.9.5
 (29 Nov 2016, from /branches/1.9.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.9.5
@@ -19,7 +79,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.9.5
 * fsfs: fix "offset too large" error during pack (issue #4657)
 * svnserve: enable hook script environments (r1769152)
 * fsfs: fix possible data reconstruction error (issue #4658)
-* fix source of spurious 'incoming edit' tree conflicts (r1770108)
+* fix source of spurious 'incoming edit' tree conflicts (r1760570)
 * fsfs: improve caching for large directories (r1721285)
 * fsfs: fix crash when encountering all-zero checksums (r1759686)
 * fsfs: fix potential source of repository corruptions (r1756266)
@@ -34,19 +94,19 @@ http://svn.apache.org/repos/asf/subversion/tags/1.9.5
 
   - Bindings bugfixes:
 * swig-pl: do not corrupt "{DATE}" revision variable (r1767768)
-* javahl: fix temporary accepting SSL server certificates (r1764851)
+* javahl: fix temporarily accepting SSL server certificates (r1764851)
 * swig-pl: fix possible stack corruption (r1683266, r1683267)
 
  Developer-visible changes:
   - General:
 * add zlib discovery 

Re: svn commit: r320452 - in head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys

[Peter Wemm]

On Tuesday, July 11, 2017 11:55:47 PM Peter Wemm wrote:
> On Tuesday, July 11, 2017 11:08:15 PM Peter Wemm wrote:
> > On Wednesday, June 28, 2017 01:59:20 PM Andriy Gapon wrote:
> > >   A side bonus of this change is that now a vdev zio has a pointer
> > >   to its corresponding bio while the zio is active.
> > 
> > fault virtual address   = 0x28
> > 
> > 
> > db> where
> > Tracing pid 0 tid 100471 td 0xf80005452000
> > vdev_geom_io_done() at vdev_geom_io_done+0x36/frame 0xfe0239f9eaa0
> > zio_vdev_io_done() at zio_vdev_io_done+0x176/frame 0xfe0239f9ead0
> > zio_execute() at zio_execute+0xac/frame 0xfe0239f9eb20
> 
> Oops, truncated.
> 
> 
> taskqueue_run_locked() at taskqueue_run_locked+0x127/frame
> 0xfe0239f9eb80 taskqueue_thread_loop() at
> taskqueue_thread_loop+0xc8/frame 0xfe0239f9ebb0 fork_exit() at
> fork_exit+0x85/frame 0xfe0239f9ebf0
> fork_trampoline() at fork_trampoline+0xe/frame 0xfe0239f9ebf0
> --- trap 0, rip = 0, rsp = 0, rbp = 0 ---

Likewise with a disk failing or being put offline.   eg: the explicit offlining 
case, making a vdev degrade:

r...@nope.ysv:/home/peter # zpool offline zroot mfid5p3

atal trap 12: page fault while in kernel mode
cpuid = 4; apic id = 04

Fatal trap 12: page fault while in kernel mode
fault virtual address   = 0x28
Fatal trap 12: page fault while in kernel mode

Fatal trap 12: page fault while in kernel mode
Fatal trap 12: page fault while in kernel mode
cpuid = 7; apic id = 07
cpuid = 1; apic id = 01
fault virtual address   = 0x28
fault code  = supervisor read data, page not present
cpuid = 3; cpuid = 5; apic id = 03
Fatal trap 12: page fault while in kernel mode
apic id = 05
fault virtual address   = 0x28
fault virtual address   = 0x28
fault code  = supervisor read data, page not present
instruction pointer = 0x20:0x803aab56
stack pointer   = 0x28:0xfe085fb3aa90
instruction pointer = 0x20:0x803aab56
fault code  = supervisor read data, page not present
cpuid = 6; fault virtual address= 0x28
Fatal trap 12: page fault while in kernel mode
fault code  = supervisor read data, page not present
instruction pointer = 0x20:0x803aab56
stack pointer   = 0x28:0xfe085fb3fa90
frame pointer   = 0x28:0xfe085fb3aaa0
fault code  = supervisor read data, page not present
cpuid = 2; apic id = 02
apic id = 06
instruction pointer = 0x20:0x803aab56
fault virtual address   = 0x28
fault code  = supervisor read data, page not present
stack pointer   = 0x28:0xfe085fb30a90
instruction pointer = 0x20:0x803aab56
stack pointer   = 0x28:0xfe085fb35a90
frame pointer   = 0x28:0xfe085fb3faa0
code segment= base 0x0, limit 0xf, type 0x1b
stack pointer   = 0x28:0xfe085fb44a90
frame pointer   = 0x28:0xfe085fb44aa0
code segment= base 0x0, limit 0xf, type 0x1b
= DPL 0, pres 1, long 1, def32 0, gran 1
fault virtual address   = 0x28
= DPL 0, pres 1, long 1, def32 0, gran 1
processor eflags= interrupt enabled, instruction pointer= 0x20:6
frame pointer   = 0x28:0xfe085fb30aa0
code segment= base 0x0, limit 0xf, type 0x1b
code segment= base 0x0, limit 0xf, type 0x1b
frame pointer   = 0x28:0xfe085fb35aa0
code segment= base 0x0, limit 0xf, type 0x1b
resume, IOPL = 0
stack pointer   = 0x28:0xfe085fb26a90
= DPL 0, pres 1, long 1, def32 0, gran 1
= DPL 0, pres 1, long 1, def32 0, gran 1
processor eflags= fault code= supervisor read data, page not
frame pointer   = 0x28:0xfe085fb26aa0
instruction pointer = 0x20:0x803aab56
processor eflags= interrupt enabled, code segment   = base b
= DPL 0, pres 1, long 1, def32 0, gran 1
processor eflags= interrupt enabled, resume, IOPL = 0
current process = 0 (zio_write_intr_2)
[ thread pid 0 tid 100500 ]
Stopped at  vdev_geom_io_done+0x36: movq0x28(%rbx),%rsi
db> where
Tracing pid 0 tid 100500 td 0xf8000aae6000
vdev_geom_io_done() at vdev_geom_io_done+0x36/frame 0xfe085fb30aa0
zio_vdev_io_done() at zio_vdev_io_done+0x176/frame 0xfe085fb30ad0
zio_execute() at zio_execute+0xac/frame 0xfe085fb30b20
taskqueue_run_locked() at taskqueue_run_locked+0x127/frame 0xfe085fb30b80
taskqueue_thread_loop() at taskqueue_thread_loop+0xc8/frame 0xfe085fb30bb0
fork_exit() at fork_exit+0x85/frame 0xfe085fb30bf0
fork_trampoline() at fork_trampoline+0xe/frame 0xfe085fb30bf0
--- trap 0, rip = 0, rsp = 0, rbp = 0 ---
db> 

-- 
Peter Wemm - pe...@

Re: svn commit: r320452 - in head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys

[Peter Wemm]

On Tuesday, July 11, 2017 11:08:15 PM Peter Wemm wrote:
> On Wednesday, June 28, 2017 01:59:20 PM Andriy Gapon wrote:
> >   A side bonus of this change is that now a vdev zio has a pointer
> >   to its corresponding bio while the zio is active.

> fault virtual address   = 0x28

> 
> db> where
> Tracing pid 0 tid 100471 td 0xf80005452000
> vdev_geom_io_done() at vdev_geom_io_done+0x36/frame 0xfe0239f9eaa0
> zio_vdev_io_done() at zio_vdev_io_done+0x176/frame 0xfe0239f9ead0
> zio_execute() at zio_execute+0xac/frame 0xfe0239f9eb20

Oops, truncated.


taskqueue_run_locked() at taskqueue_run_locked+0x127/frame 0xfe0239f9eb80
taskqueue_thread_loop() at taskqueue_thread_loop+0xc8/frame 0xfe0239f9ebb0
fork_exit() at fork_exit+0x85/frame 0xfe0239f9ebf0
fork_trampoline() at fork_trampoline+0xe/frame 0xfe0239f9ebf0
--- trap 0, rip = 0, rsp = 0, rbp = 0 ---


-- 
Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246

signature.asc
Description: This is a digitally signed message part.

Re: svn commit: r320452 - in head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys

[Peter Wemm]

On Wednesday, June 28, 2017 01:59:20 PM Andriy Gapon wrote:

>   A side bonus of this change is that now a vdev zio has a pointer
>   to its corresponding bio while the zio is active.

> @@ -1094,6 +1088,15 @@ sendreq:
>  static void
>  vdev_geom_io_done(zio_t *zio)
>  {
> + struct bio *bp = zio->io_bio;
> +
> + if (zio->io_type == ZIO_TYPE_READ) {
> + abd_return_buf_copy(zio->io_abd, bp->bio_data, zio->io_size);
> + } else if (zio->io_type == ZIO_TYPE_WRITE) {
> + abd_return_buf(zio->io_abd, bp->bio_data, zio->io_size);
> + }
> +
> + g_destroy_bio(bp);
>  }

We are getting a 100% repeatable failure when trying to boot machines with 
degraded volumes in the freebsd.org cluster.

<118>Setting hostname: tiny.nyi.freebsd.org.
<118>Setting up harvesting: [UMA],
[FS_ATIME],SWI,INTERRUPT,NET_NG,NET_ETHER,NET_TUN,MOUSE,KEYBOARD,D
<118>Feeding entropy: .

Fatal trap 12: page fault while in kernel mode
cpuid = 1; apic id = 01
fault virtual address   = 0x28

Fatal trap 12: page fault while in kernel mode
cpuid = 3; apic id = 07
fault virtual address   = 0x28

Fatal trap 12: page fault while in kernel mode
cpuid = 2; apic id = 06
apic id = 00
fault virtual address   = 0x28
= DPL 0, pres 1, long 1, def32 0, gran 1
processor eflags= interrupt enabled, resume, fault virtual address  
= 0x28
fault code  = supervisor read data, page not present
instruction pointer = 0x20:0x803aab56
stack pointer   = 0x28:0xfe0239fa3a90
fault code  = supervisor read data, page not present
IOPL = 0
current process = 0 (zio_write_intr_0)
frame pointer   = 0x28:0xfe0239fa3aa0

db> where   
Tracing pid 0 tid 100471 td 0xf80005452000
vdev_geom_io_done() at vdev_geom_io_done+0x36/frame 0xfe0239f9eaa0
zio_vdev_io_done() at zio_vdev_io_done+0x176/frame 0xfe0239f9ead0
zio_execute() at zio_execute+0xac/frame 0xfe0239f9eb20

This is dereferencing a null bp (ie: zio->io_bio).  It traps on multiple cores 
concurrently.

FreeBSD 12.0-CURRENT #0 r320900: Wed Jul 12 03:00:15 UTC 2017

(This is a smoke-test machine, recycled from somewhere else)

-- 
Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246

signature.asc
Description: This is a digitally signed message part.

Re: svn commit: r316874 - head/sys/kern

[Peter Wemm]

On Friday, April 14, 2017 08:13:52 PM Ngie Cooper wrote:
> > On Apr 14, 2017, at 20:12, Peter Wemm <pe...@wemm.org> wrote:
> > 
> > On Friday, April 14, 2017 07:36:55 PM Peter Wemm wrote:
> >> On Friday, April 14, 2017 02:14:16 PM Ngie Cooper wrote:
> >>>> On Apr 14, 2017, at 14:10, Maxim Sobolev <sobo...@sippysoft.com> wrote:
> >>>> 
> >>>> Peter, Ngie,
> >>>> 
> >>>> Looks like out of that refactoring came a logical bug that is present
> >>>> in
> >>>> the head, which causes syslod to first to shutdown the socket for
> >>>> reading
> >>>> and then try to select/recv on it (which is somewhat stupid). And that
> >>>> issue has been masked by shutdown() on datagram socket becoming
> >>>> effectively a NOP in 11 & head 20 months ago. It only affects head
> >>>> though, 11-stable still has the old code which does not include that
> >>>> half-closed socket into the select list. Attached patch is expected to
> >>>> fix head, Peter, it would be nice if you can give it a try (restoring
> >>>> latest changes into uipc_sockets.c) and let me know if it helps.
> >>>> 
> >>>> Thanks!
> >>> 
> >>> CCing hrs@ for input as he did the refactoring.
> >>> Thanks!
> >>> -Ngie
> >>> 
> >>> PS LGTM with the change. Will wait for feedback from wemm@.
> >> 
> >> This is definitely not working.  I get ENOSPC  and listen queue overflows
> >> on /var/run/logpriv now.
> >> 
> >> Grabbing an old 10.3 /usr/sbin/syslogd and placing it on the top of the
> >> 12.x one worked fine, aside from the include statements.
> > 
> > This can't be right:
> > if (SecureMode || res->ai_family == AF_LOCAL) {
> > 
> >/* Forbid communication in secure mode. */
> >if (shutdown(s, SHUT_RD) < 0 &&
> >
> >errno != ENOTCONN) {
> >
> >logerror("shutdown");
> >if (!Debug)
> >
> >die(0);
> >
> >}
> >dprintf("listening on socket\n");
> >sl_recv = NULL;
> >   
> >   }
> > 
> > This appears to disable unix domain sockets like /var/run/log and
> > /var/run/logpriv.
> 
> ACK. This looks like a fun bug.

> -Ngie

I suspect it's meant to be "if (SecureMode && res->ai_family != AF_LOCAL) {" 
as a simple logic inversion error of another line earlier.  However there's an 
awful lot of strange things in this code.

1) listen(s, 5) - on datagram sockets.
2) dprintf("shutdown") in code regardless of whether the shutdown is going to 
happen.
3) dprintf("listening on socket") in code that only happens when we're NOT 
going to listen.
4) dprintf("sending on socket") in the code path when we're going to listen.
5) shutdown on all unix domain sockets, regardless of securemode..

This code block makes my head spin.

-- 
Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246

signature.asc
Description: This is a digitally signed message part.

Re: svn commit: r316874 - head/sys/kern

[Peter Wemm]

On Friday, April 14, 2017 07:36:55 PM Peter Wemm wrote:
> On Friday, April 14, 2017 02:14:16 PM Ngie Cooper wrote:
> > > On Apr 14, 2017, at 14:10, Maxim Sobolev <sobo...@sippysoft.com> wrote:
> > > 
> > > Peter, Ngie,
> > > 
> > > Looks like out of that refactoring came a logical bug that is present in
> > > the head, which causes syslod to first to shutdown the socket for
> > > reading
> > > and then try to select/recv on it (which is somewhat stupid). And that
> > > issue has been masked by shutdown() on datagram socket becoming
> > > effectively a NOP in 11 & head 20 months ago. It only affects head
> > > though, 11-stable still has the old code which does not include that
> > > half-closed socket into the select list. Attached patch is expected to
> > > fix head, Peter, it would be nice if you can give it a try (restoring
> > > latest changes into uipc_sockets.c) and let me know if it helps.
> > > 
> > > Thanks!
> > 
> > CCing hrs@ for input as he did the refactoring.
> > Thanks!
> > -Ngie
> > 
> > PS LGTM with the change. Will wait for feedback from wemm@.
> 
> This is definitely not working.  I get ENOSPC  and listen queue overflows on
> /var/run/logpriv now.
> 
> Grabbing an old 10.3 /usr/sbin/syslogd and placing it on the top of the 12.x
> one worked fine, aside from the include statements.

This can't be right:
 if (SecureMode || res->ai_family == AF_LOCAL) {
/* Forbid communication in secure mode. */
if (shutdown(s, SHUT_RD) < 0 &&
errno != ENOTCONN) {
logerror("shutdown");
if (!Debug)
die(0);
    }
dprintf("listening on socket\n");
sl_recv = NULL;
   }

This appears to disable unix domain sockets like /var/run/log and 
/var/run/logpriv.

--
Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246

signature.asc
Description: This is a digitally signed message part.

Re: svn commit: r316874 - head/sys/kern

[Peter Wemm]

On Friday, April 14, 2017 02:14:16 PM Ngie Cooper wrote:
> > On Apr 14, 2017, at 14:10, Maxim Sobolev <sobo...@sippysoft.com> wrote:
> > 
> > Peter, Ngie,
> > 
> > Looks like out of that refactoring came a logical bug that is present in
> > the head, which causes syslod to first to shutdown the socket for reading
> > and then try to select/recv on it (which is somewhat stupid). And that
> > issue has been masked by shutdown() on datagram socket becoming
> > effectively a NOP in 11 & head 20 months ago. It only affects head
> > though, 11-stable still has the old code which does not include that
> > half-closed socket into the select list. Attached patch is expected to
> > fix head, Peter, it would be nice if you can give it a try (restoring
> > latest changes into uipc_sockets.c) and let me know if it helps.
> > 
> > Thanks!
> 
> CCing hrs@ for input as he did the refactoring.
> Thanks!
> -Ngie
> 
> PS LGTM with the change. Will wait for feedback from wemm@.

This is definitely not working.  I get ENOSPC  and listen queue overflows on 
/var/run/logpriv now.

Grabbing an old 10.3 /usr/sbin/syslogd and placing it on the top of the 12.x 
one worked fine, aside from the include statements.

-- 
Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246

signature.asc
Description: This is a digitally signed message part.

Re: svn commit: r316874 - head/sys/kern

[Peter Wemm]

On Friday, April 14, 2017 02:21:05 PM Maxim Sobolev wrote:
> Peter, It is actually the other way around. If you take syslogd code out of
> 11-stable and earlier that would work just fine with or without r316874.
> But since r285910 syslogd in head had been refactored a lot and I think
> that particular bug has introduced that has been masked by the shutdown()
> on datagram sockets becoming a NOP after r285910. Then r316874 restored our
> historical behavior for the shutdown(2) and bingo, bug in the new syslogd
> code is now causing it to spin when shutdown() != NOP.
> 
> -Max

Hmm, there's a new problem:

 45104 auditd   CALL  socket(PF_LOCAL,0x1002<SOCK_DGRAM|SOCK_CLOEXEC>,0)
 45104 auditd   RET   socket 3
 45104 auditd   CALL  connect(0x3,0x7fffdbd8,0x6a)
 45104 auditd   STRU  struct sockaddr { AF_LOCAL, /var/run/logpriv }
 45104 auditd   NAMI  "/var/run/logpriv"
 45104 auditd   RET   connect 0
 45104 auditd   CALL  sendto(0x3,0x7fffe130,0x2f,0,0,0)
 45104 auditd   RET   sendto -1 errno 55 No buffer space available
 45104 auditd   CALL  open(0x800da5c67,0x15<O_WRONLY|O_NONBLOCK|
O_CLOEXEC>)
 45104 auditd   NAMI  "/dev/console"
 45104 auditd   RET   open 4
.. and it all goes to /dev/console instead.

On restarting syslogd:
Apr 15 02:17:43 repoman2 syslogd: exiting on signal 15
sonewconn: pcb 0xf80051e72680: Listen queue overflow: 16 already in queue 
already

Umm.. did the patch forget to listen to incoming connections or something?

I haven't seen this before anywhere except when syslogd is wedged.


> 
> On Fri, Apr 14, 2017 at 12:46 PM, Peter Wemm <pe...@wemm.org> wrote:
> > On Friday, April 14, 2017 12:41:52 PM Maxim Sobolev wrote:
> > > Thanks, Peter. I will try to look into this asap.
> > 
> > I don't understand what is going on yet. Presumably there must be other
> > changes in play that affect udp/select sometime between the original 2015
> > change and this. The syslogd -s code is Old(TM).  I'm also wondering
> > whether
> > the -s code even works at all since the 2015 / r285910 change...
> > 
> > > -Max
> > > 
> > > On Apr 14, 2017 12:32 PM, "Peter Wemm" <pe...@wemm.org> wrote:
> > > > On Friday, April 14, 2017 11:49:26 AM Peter Wemm wrote:
> > > > > On Friday, April 14, 2017 05:23:28 PM Maxim Sobolev wrote:
> > > > > > Author: sobomax
> > > > > > Date: Fri Apr 14 17:23:28 2017
> > > > > > New Revision: 316874
> > > > > > URL: https://svnweb.freebsd.org/changeset/base/316874
> > > > > > 
> > > > > > Log:
> > > > > >   Restore ability to shutdown DGRAM sockets, still forcing
> > 
> > ENOTCONN to
> > 
> > > > be
> > > > 
> > > > > > returned by the shutdown(2) system call. This ability has been
> > 
> > lost as
> > 
> > > > > > part
> > > > > > of the svn revision 285910.
> > > > > > 
> > > > > >   Reviewed by:  ed, rwatson, glebius, hiren
> > > > > >   MFC after:2 weeks
> > > > > >   Differential Revision:https://reviews.freebsd.org/D10351
> > > > > 
> > > > > This appears to have broken syslogd and had a major change in
> > 
> > behavior
> > 
> > > > with
> > > > 
> > > > > regards to select(2).
> > > > > 
> > > > > If you run syslogd with the -s flag (which is default), it now spins
> > 
> > at
> > 
> > > > 100%
> > > > 
> > > > > cpu as all the shutdown sockets now return readable from select.
> > > > > 
> > > > > Old releases / jails also manifest this behavor.  If it wasn't for
> > > > > losing
> > > > > the ability to run old branch binaries I'd suggest changing syslogd
> > > > > instead, but we depend on this in the cluster and I expect others do
> > > > > too.
> > > > > 
> > > > > I'm not 100% certain that this change is the culprit but a heads-up
> > > > > can't
> > > > > hurt. I'll try reverting it on the freebsd cluster next, after
> > > > > fixing
> > > > > the
> > > > > broken auditing changes.
> > > > > 
> > > > > -Peter
> > > > 
> > > > I can confirm that reverting r316874 fixes syslogd and backwards
> > > > compatability
> > > > with old branches.
> > > > 
> > > > --
> > > > Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com;
> > > > KI6FJV
> > > > UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246
> > 
> > --
> > Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com;
> > KI6FJV
> > UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246

-- 
Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246

signature.asc
Description: This is a digitally signed message part.

Re: svn commit: r316874 - head/sys/kern

[Peter Wemm]

On Friday, April 14, 2017 02:10:56 PM Maxim Sobolev wrote:
> Peter, Ngie,
> 
> Looks like out of that refactoring came a logical bug that is present in
> the head, which causes syslod to first to shutdown the socket for reading
> and then try to select/recv on it (which is somewhat stupid). And that
> issue has been masked by shutdown() on datagram socket becoming effectively
> a NOP in 11 & head 20 months ago. It only affects head though, 11-stable
> still has the old code which does not include that half-closed socket into
> the select list. Attached patch is expected to fix head, Peter, it would be
> nice if you can give it a try (restoring latest changes into
> uipc_sockets.c) and let me know if it helps.

Confirmed - resting uipc_socket.c to HEAD and applying the patch to syslogd 
does solve the problem we encountered.  Thanks!

> Thanks!
> 
> On Fri, Apr 14, 2017 at 12:48 PM, Ngie Cooper (yaneurabeya) <
> 
> yaneurab...@gmail.com> wrote:
> > > On Apr 14, 2017, at 12:46, Peter Wemm <pe...@wemm.org> wrote:
> > > 
> > > On Friday, April 14, 2017 12:41:52 PM Maxim Sobolev wrote:
> > >> Thanks, Peter. I will try to look into this asap.
> > > 
> > > I don't understand what is going on yet. Presumably there must be other
> > > changes in play that affect udp/select sometime between the original
> > > 2015
> > > change and this. The syslogd -s code is Old(TM).  I'm also wondering
> > 
> > whether
> > 
> > > the -s code even works at all since the 2015 / r285910 change...
> > 
> > syslogd has been refactored a lot on ^/head. I don’t think it’s safe to
> > say that the ^/head and ^/stable/11 and earlier copies will function the
> > same.
> > Thanks,
> > -Ngie

-- 
Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246

signature.asc
Description: This is a digitally signed message part.

Re: svn commit: r316874 - head/sys/kern

[Peter Wemm]

On Friday, April 14, 2017 02:21:05 PM Maxim Sobolev wrote:
> Peter, It is actually the other way around. If you take syslogd code out of
> 11-stable and earlier that would work just fine with or without r316874.
> But since r285910 syslogd in head had been refactored a lot and I think
> that particular bug has introduced that has been masked by the shutdown()
> on datagram sockets becoming a NOP after r285910. Then r316874 restored our
> historical behavior for the shutdown(2) and bingo, bug in the new syslogd
> code is now causing it to spin when shutdown() != NOP.

Ok, this makes sense.

Just to be sure I'm on the same page, I should apply the syslogd.diff from a 
few messages ago and restore the shutdown(2) kernel code and give it a spin.  
Correct?

-Peter

> -Max
> 
> On Fri, Apr 14, 2017 at 12:46 PM, Peter Wemm <pe...@wemm.org> wrote:
> > On Friday, April 14, 2017 12:41:52 PM Maxim Sobolev wrote:
> > > Thanks, Peter. I will try to look into this asap.
> > 
> > I don't understand what is going on yet. Presumably there must be other
> > changes in play that affect udp/select sometime between the original 2015
> > change and this. The syslogd -s code is Old(TM).  I'm also wondering
> > whether
> > the -s code even works at all since the 2015 / r285910 change...
> > 
> > > -Max
> > > 
> > > On Apr 14, 2017 12:32 PM, "Peter Wemm" <pe...@wemm.org> wrote:
> > > > On Friday, April 14, 2017 11:49:26 AM Peter Wemm wrote:
> > > > > On Friday, April 14, 2017 05:23:28 PM Maxim Sobolev wrote:
> > > > > > Author: sobomax
> > > > > > Date: Fri Apr 14 17:23:28 2017
> > > > > > New Revision: 316874
> > > > > > URL: https://svnweb.freebsd.org/changeset/base/316874
> > > > > > 
> > > > > > Log:
> > > > > >   Restore ability to shutdown DGRAM sockets, still forcing
> > 
> > ENOTCONN to
> > 
> > > > be
> > > > 
> > > > > > returned by the shutdown(2) system call. This ability has been
> > 
> > lost as
> > 
> > > > > > part
> > > > > > of the svn revision 285910.
> > > > > > 
> > > > > >   Reviewed by:  ed, rwatson, glebius, hiren
> > > > > >   MFC after:2 weeks
> > > > > >   Differential Revision:https://reviews.freebsd.org/D10351
> > > > > 
> > > > > This appears to have broken syslogd and had a major change in
> > 
> > behavior
> > 
> > > > with
> > > > 
> > > > > regards to select(2).
> > > > > 
> > > > > If you run syslogd with the -s flag (which is default), it now spins
> > 
> > at
> > 
> > > > 100%
> > > > 
> > > > > cpu as all the shutdown sockets now return readable from select.
> > > > > 
> > > > > Old releases / jails also manifest this behavor.  If it wasn't for
> > > > > losing
> > > > > the ability to run old branch binaries I'd suggest changing syslogd
> > > > > instead, but we depend on this in the cluster and I expect others do
> > > > > too.
> > > > > 
> > > > > I'm not 100% certain that this change is the culprit but a heads-up
> > > > > can't
> > > > > hurt. I'll try reverting it on the freebsd cluster next, after
> > > > > fixing
> > > > > the
> > > > > broken auditing changes.
> > > > > 
> > > > > -Peter
> > > > 
> > > > I can confirm that reverting r316874 fixes syslogd and backwards
> > > > compatability
> > > > with old branches.
> > > > 
> > > > --
> > > > Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com;
> > > > KI6FJV
> > > > UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246
> > 
> > --
> > Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com;
> > KI6FJV
> > UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246

-- 
Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246

signature.asc
Description: This is a digitally signed message part.

Re: svn commit: r316874 - head/sys/kern

[Peter Wemm]

On Friday, April 14, 2017 12:41:52 PM Maxim Sobolev wrote:
> Thanks, Peter. I will try to look into this asap.

I don't understand what is going on yet. Presumably there must be other 
changes in play that affect udp/select sometime between the original 2015 
change and this. The syslogd -s code is Old(TM).  I'm also wondering whether 
the -s code even works at all since the 2015 / r285910 change...

> -Max
> 
> On Apr 14, 2017 12:32 PM, "Peter Wemm" <pe...@wemm.org> wrote:
> > On Friday, April 14, 2017 11:49:26 AM Peter Wemm wrote:
> > > On Friday, April 14, 2017 05:23:28 PM Maxim Sobolev wrote:
> > > > Author: sobomax
> > > > Date: Fri Apr 14 17:23:28 2017
> > > > New Revision: 316874
> > > > URL: https://svnweb.freebsd.org/changeset/base/316874
> > > > 
> > > > Log:
> > > >   Restore ability to shutdown DGRAM sockets, still forcing ENOTCONN to
> > 
> > be
> > 
> > > > returned by the shutdown(2) system call. This ability has been lost as
> > > > part
> > > > of the svn revision 285910.
> > > > 
> > > >   Reviewed by:  ed, rwatson, glebius, hiren
> > > >   MFC after:2 weeks
> > > >   Differential Revision:https://reviews.freebsd.org/D10351
> > > 
> > > This appears to have broken syslogd and had a major change in behavior
> > 
> > with
> > 
> > > regards to select(2).
> > > 
> > > If you run syslogd with the -s flag (which is default), it now spins at
> > 
> > 100%
> > 
> > > cpu as all the shutdown sockets now return readable from select.
> > > 
> > > Old releases / jails also manifest this behavor.  If it wasn't for
> > > losing
> > > the ability to run old branch binaries I'd suggest changing syslogd
> > > instead, but we depend on this in the cluster and I expect others do
> > > too.
> > > 
> > > I'm not 100% certain that this change is the culprit but a heads-up
> > > can't
> > > hurt. I'll try reverting it on the freebsd cluster next, after fixing
> > > the
> > > broken auditing changes.
> > > 
> > > -Peter
> > 
> > I can confirm that reverting r316874 fixes syslogd and backwards
> > compatability
> > with old branches.
> > 
> > --
> > Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com;
> > KI6FJV
> > UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246

-- 
Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246

signature.asc
Description: This is a digitally signed message part.

Re: svn commit: r316874 - head/sys/kern

[Peter Wemm]

On Friday, April 14, 2017 11:49:26 AM Peter Wemm wrote:
> On Friday, April 14, 2017 05:23:28 PM Maxim Sobolev wrote:
> > Author: sobomax
> > Date: Fri Apr 14 17:23:28 2017
> > New Revision: 316874
> > URL: https://svnweb.freebsd.org/changeset/base/316874
> > 
> > Log:
> >   Restore ability to shutdown DGRAM sockets, still forcing ENOTCONN to be
> > 
> > returned by the shutdown(2) system call. This ability has been lost as
> > part
> > of the svn revision 285910.
> > 
> >   Reviewed by:  ed, rwatson, glebius, hiren
> >   MFC after:2 weeks
> >   Differential Revision:https://reviews.freebsd.org/D10351
> 
> This appears to have broken syslogd and had a major change in behavior with
> regards to select(2).
> 
> If you run syslogd with the -s flag (which is default), it now spins at 100%
> cpu as all the shutdown sockets now return readable from select.
> 
> Old releases / jails also manifest this behavor.  If it wasn't for losing
> the ability to run old branch binaries I'd suggest changing syslogd
> instead, but we depend on this in the cluster and I expect others do too.
> 
> I'm not 100% certain that this change is the culprit but a heads-up can't
> hurt. I'll try reverting it on the freebsd cluster next, after fixing the
> broken auditing changes.
> 
> -Peter

I can confirm that reverting r316874 fixes syslogd and backwards compatability 
with old branches.

-- 
Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246

signature.asc
Description: This is a digitally signed message part.

Re: svn commit: r316874 - head/sys/kern

[Peter Wemm]

On Friday, April 14, 2017 05:23:28 PM Maxim Sobolev wrote:
> Author: sobomax
> Date: Fri Apr 14 17:23:28 2017
> New Revision: 316874
> URL: https://svnweb.freebsd.org/changeset/base/316874
> 
> Log:
>   Restore ability to shutdown DGRAM sockets, still forcing ENOTCONN to be
> returned by the shutdown(2) system call. This ability has been lost as part
> of the svn revision 285910.
> 
>   Reviewed by:ed, rwatson, glebius, hiren
>   MFC after:  2 weeks
>   Differential Revision:  https://reviews.freebsd.org/D10351

This appears to have broken syslogd and had a major change in behavior with 
regards to select(2).

If you run syslogd with the -s flag (which is default), it now spins at 100% 
cpu as all the shutdown sockets now return readable from select.

Old releases / jails also manifest this behavor.  If it wasn't for losing the 
ability to run old branch binaries I'd suggest changing syslogd instead, but 
we depend on this in the cluster and I expect others do too.

I'm not 100% certain that this change is the culprit but a heads-up can't 
hurt. I'll try reverting it on the freebsd cluster next, after fixing the 
broken auditing changes.

-Peter
-- 
Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246

signature.asc
Description: This is a digitally signed message part.

svn commit: r309512 - in stable/10/contrib/subversion: . subversion/include subversion/include/private subversion/libsvn_client subversion/libsvn_fs_fs subversion/libsvn_fs_x subversion/libsvn_ra_s...

[Peter Wemm]

Author: peter
Date: Sat Dec  3 20:30:25 2016
New Revision: 309512
URL: https://svnweb.freebsd.org/changeset/base/309512

Log:
  MFC r309356: svn 1.9.4 -> 1.9.5

Modified:
  stable/10/contrib/subversion/CHANGES
  stable/10/contrib/subversion/README
  stable/10/contrib/subversion/build-outputs.mk
  stable/10/contrib/subversion/configure
  stable/10/contrib/subversion/configure.ac
  stable/10/contrib/subversion/get-deps.sh
  stable/10/contrib/subversion/subversion/include/private/svn_sqlite.h
  stable/10/contrib/subversion/subversion/include/svn_version.h
  stable/10/contrib/subversion/subversion/libsvn_client/merge.c
  stable/10/contrib/subversion/subversion/libsvn_fs_fs/cached_data.c
  stable/10/contrib/subversion/subversion/libsvn_fs_fs/caching.c
  stable/10/contrib/subversion/subversion/libsvn_fs_fs/fs.c
  stable/10/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c
  stable/10/contrib/subversion/subversion/libsvn_fs_fs/low_level.c
  stable/10/contrib/subversion/subversion/libsvn_fs_fs/pack.c
  stable/10/contrib/subversion/subversion/libsvn_fs_fs/pack.h
  stable/10/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h
  stable/10/contrib/subversion/subversion/libsvn_fs_fs/rep-cache.c
  stable/10/contrib/subversion/subversion/libsvn_fs_fs/rep-cache.h
  stable/10/contrib/subversion/subversion/libsvn_fs_fs/transaction.c
  stable/10/contrib/subversion/subversion/libsvn_fs_fs/tree.c
  stable/10/contrib/subversion/subversion/libsvn_fs_x/rep-cache-db.h
  stable/10/contrib/subversion/subversion/libsvn_ra_serf/xml.c
  stable/10/contrib/subversion/subversion/libsvn_repos/reporter.c
  stable/10/contrib/subversion/subversion/libsvn_repos/repos.c
  stable/10/contrib/subversion/subversion/libsvn_subr/config_file.c
  stable/10/contrib/subversion/subversion/libsvn_subr/deprecated.c
  stable/10/contrib/subversion/subversion/libsvn_subr/gpg_agent.c
  stable/10/contrib/subversion/subversion/libsvn_subr/internal_statements.h
  stable/10/contrib/subversion/subversion/libsvn_subr/sqlite.c
  stable/10/contrib/subversion/subversion/libsvn_subr/sysinfo.c
  stable/10/contrib/subversion/subversion/libsvn_subr/win32_crashrpt.c
  stable/10/contrib/subversion/subversion/libsvn_subr/xml.c
  stable/10/contrib/subversion/subversion/libsvn_wc/conflicts.c
  stable/10/contrib/subversion/subversion/libsvn_wc/update_editor.c
  stable/10/contrib/subversion/subversion/libsvn_wc/wc-checks.h
  stable/10/contrib/subversion/subversion/libsvn_wc/wc-metadata.h
  stable/10/contrib/subversion/subversion/libsvn_wc/wc-queries.h
  stable/10/contrib/subversion/subversion/svn/info-cmd.c
  stable/10/contrib/subversion/subversion/svn/merge-cmd.c
  stable/10/contrib/subversion/subversion/svnserve/serve.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/subversion/CHANGES
==
--- stable/10/contrib/subversion/CHANGESSat Dec  3 20:30:05 2016
(r309511)
+++ stable/10/contrib/subversion/CHANGESSat Dec  3 20:30:25 2016
(r309512)
@@ -1,3 +1,54 @@
+Version 1.9.5
+(29 Nov 2016, from /branches/1.9.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.9.5
+
+ User-visible changes:
+  - Client-side bugfixes:
+* fix accessing non-existent paths during reintegrate merge (r1766699 et 
al)
+* fix handling of newly secured subdirectories in working copy (r1724448)
+* info: remove trailing whitespace in --show-item=revision (issue #4660)
+* fix recording wrong revisions for tree conflicts (r1734106)
+* gpg-agent: improve discovery of gpg-agent sockets (r1766327)
+* gpg-agent: fix file descriptor leak (r1766323)
+* resolve: fix --accept=mine-full for binary files (issue #4647)
+* merge: fix possible crash (issue #4652)
+* resolve: fix possible crash (r1748514)
+* fix potential crash in Win32 crash reporter (r1663253 et al)
+
+  - Server-side bugfixes:
+* fsfs: fix "offset too large" error during pack (issue #4657)
+* svnserve: enable hook script environments (r1769152)
+* fsfs: fix possible data reconstruction error (issue #4658)
+* fix source of spurious 'incoming edit' tree conflicts (r1770108)
+* fsfs: improve caching for large directories (r1721285)
+* fsfs: fix crash when encountering all-zero checksums (r1759686)
+* fsfs: fix potential source of repository corruptions (r1756266)
+* mod_dav_svn: fix excessive memory usage with mod_headers/mod_deflate
+  (issue #3084)
+* mod_dav_svn: reduce memory usage during GET requests (r1757529 et al)
+* fsfs: fix unexpected "database is locked" errors (r1741096 et al)
+* fsfs: fix opening old repositories without db/format files (r1720015)
+
+  - Client-side and server-side bugfixes:
+* fix possible crash when reading invalid configuration files (r1715777)
+
+  - Bindings bugfixes:
+* swig-pl: do not corrupt "{DATE}" revision variable (r1767768)
+* javahl: fix temporary accepting SSL server 

svn commit: r309511 - in stable/11/contrib/subversion: . subversion/include subversion/include/private subversion/libsvn_client subversion/libsvn_fs_fs subversion/libsvn_fs_x subversion/libsvn_ra_s...

[Peter Wemm]

Author: peter
Date: Sat Dec  3 20:30:05 2016
New Revision: 309511
URL: https://svnweb.freebsd.org/changeset/base/309511

Log:
  MFC r309356: svn 1.9.4 -> 1.9.5

Modified:
  stable/11/contrib/subversion/CHANGES
  stable/11/contrib/subversion/README
  stable/11/contrib/subversion/build-outputs.mk
  stable/11/contrib/subversion/configure
  stable/11/contrib/subversion/configure.ac
  stable/11/contrib/subversion/get-deps.sh
  stable/11/contrib/subversion/subversion/include/private/svn_sqlite.h
  stable/11/contrib/subversion/subversion/include/svn_version.h
  stable/11/contrib/subversion/subversion/libsvn_client/merge.c
  stable/11/contrib/subversion/subversion/libsvn_fs_fs/cached_data.c
  stable/11/contrib/subversion/subversion/libsvn_fs_fs/caching.c
  stable/11/contrib/subversion/subversion/libsvn_fs_fs/fs.c
  stable/11/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c
  stable/11/contrib/subversion/subversion/libsvn_fs_fs/low_level.c
  stable/11/contrib/subversion/subversion/libsvn_fs_fs/pack.c
  stable/11/contrib/subversion/subversion/libsvn_fs_fs/pack.h
  stable/11/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h
  stable/11/contrib/subversion/subversion/libsvn_fs_fs/rep-cache.c
  stable/11/contrib/subversion/subversion/libsvn_fs_fs/rep-cache.h
  stable/11/contrib/subversion/subversion/libsvn_fs_fs/transaction.c
  stable/11/contrib/subversion/subversion/libsvn_fs_fs/tree.c
  stable/11/contrib/subversion/subversion/libsvn_fs_x/rep-cache-db.h
  stable/11/contrib/subversion/subversion/libsvn_ra_serf/xml.c
  stable/11/contrib/subversion/subversion/libsvn_repos/reporter.c
  stable/11/contrib/subversion/subversion/libsvn_repos/repos.c
  stable/11/contrib/subversion/subversion/libsvn_subr/config_file.c
  stable/11/contrib/subversion/subversion/libsvn_subr/deprecated.c
  stable/11/contrib/subversion/subversion/libsvn_subr/gpg_agent.c
  stable/11/contrib/subversion/subversion/libsvn_subr/internal_statements.h
  stable/11/contrib/subversion/subversion/libsvn_subr/sqlite.c
  stable/11/contrib/subversion/subversion/libsvn_subr/sysinfo.c
  stable/11/contrib/subversion/subversion/libsvn_subr/win32_crashrpt.c
  stable/11/contrib/subversion/subversion/libsvn_subr/xml.c
  stable/11/contrib/subversion/subversion/libsvn_wc/conflicts.c
  stable/11/contrib/subversion/subversion/libsvn_wc/update_editor.c
  stable/11/contrib/subversion/subversion/libsvn_wc/wc-checks.h
  stable/11/contrib/subversion/subversion/libsvn_wc/wc-metadata.h
  stable/11/contrib/subversion/subversion/libsvn_wc/wc-queries.h
  stable/11/contrib/subversion/subversion/svn/info-cmd.c
  stable/11/contrib/subversion/subversion/svn/merge-cmd.c
  stable/11/contrib/subversion/subversion/svnserve/serve.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/contrib/subversion/CHANGES
==
--- stable/11/contrib/subversion/CHANGESSat Dec  3 20:01:12 2016
(r309510)
+++ stable/11/contrib/subversion/CHANGESSat Dec  3 20:30:05 2016
(r309511)
@@ -1,3 +1,54 @@
+Version 1.9.5
+(29 Nov 2016, from /branches/1.9.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.9.5
+
+ User-visible changes:
+  - Client-side bugfixes:
+* fix accessing non-existent paths during reintegrate merge (r1766699 et 
al)
+* fix handling of newly secured subdirectories in working copy (r1724448)
+* info: remove trailing whitespace in --show-item=revision (issue #4660)
+* fix recording wrong revisions for tree conflicts (r1734106)
+* gpg-agent: improve discovery of gpg-agent sockets (r1766327)
+* gpg-agent: fix file descriptor leak (r1766323)
+* resolve: fix --accept=mine-full for binary files (issue #4647)
+* merge: fix possible crash (issue #4652)
+* resolve: fix possible crash (r1748514)
+* fix potential crash in Win32 crash reporter (r1663253 et al)
+
+  - Server-side bugfixes:
+* fsfs: fix "offset too large" error during pack (issue #4657)
+* svnserve: enable hook script environments (r1769152)
+* fsfs: fix possible data reconstruction error (issue #4658)
+* fix source of spurious 'incoming edit' tree conflicts (r1770108)
+* fsfs: improve caching for large directories (r1721285)
+* fsfs: fix crash when encountering all-zero checksums (r1759686)
+* fsfs: fix potential source of repository corruptions (r1756266)
+* mod_dav_svn: fix excessive memory usage with mod_headers/mod_deflate
+  (issue #3084)
+* mod_dav_svn: reduce memory usage during GET requests (r1757529 et al)
+* fsfs: fix unexpected "database is locked" errors (r1741096 et al)
+* fsfs: fix opening old repositories without db/format files (r1720015)
+
+  - Client-side and server-side bugfixes:
+* fix possible crash when reading invalid configuration files (r1715777)
+
+  - Bindings bugfixes:
+* swig-pl: do not corrupt "{DATE}" revision variable (r1767768)
+* javahl: fix temporary accepting SSL server 

svn commit: r309355 - vendor/subversion/subversion-1.9.5

[Peter Wemm]

Author: peter
Date: Thu Dec  1 07:46:24 2016
New Revision: 309355
URL: https://svnweb.freebsd.org/changeset/base/309355

Log:
  Tag import of subversion-1.9.5

Added:
  vendor/subversion/subversion-1.9.5/
 - copied from r309354, vendor/subversion/dist/
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r309354 - in vendor/subversion/dist: . subversion/include subversion/include/private subversion/libsvn_client subversion/libsvn_fs_fs subversion/libsvn_fs_x subversion/libsvn_ra_serf su...

[Peter Wemm]

Author: peter
Date: Thu Dec  1 07:45:05 2016
New Revision: 309354
URL: https://svnweb.freebsd.org/changeset/base/309354

Log:
  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.

Modified:
  vendor/subversion/dist/CHANGES
  vendor/subversion/dist/README
  vendor/subversion/dist/build-outputs.mk
  vendor/subversion/dist/configure
  vendor/subversion/dist/configure.ac
  vendor/subversion/dist/get-deps.sh
  vendor/subversion/dist/subversion/include/private/svn_sqlite.h
  vendor/subversion/dist/subversion/include/svn_version.h
  vendor/subversion/dist/subversion/libsvn_client/merge.c
  vendor/subversion/dist/subversion/libsvn_fs_fs/cached_data.c
  vendor/subversion/dist/subversion/libsvn_fs_fs/caching.c
  vendor/subversion/dist/subversion/libsvn_fs_fs/fs.c
  vendor/subversion/dist/subversion/libsvn_fs_fs/fs_fs.c
  vendor/subversion/dist/subversion/libsvn_fs_fs/low_level.c
  vendor/subversion/dist/subversion/libsvn_fs_fs/pack.c
  vendor/subversion/dist/subversion/libsvn_fs_fs/pack.h
  vendor/subversion/dist/subversion/libsvn_fs_fs/rep-cache-db.h
  vendor/subversion/dist/subversion/libsvn_fs_fs/rep-cache.c
  vendor/subversion/dist/subversion/libsvn_fs_fs/rep-cache.h
  vendor/subversion/dist/subversion/libsvn_fs_fs/transaction.c
  vendor/subversion/dist/subversion/libsvn_fs_fs/tree.c
  vendor/subversion/dist/subversion/libsvn_fs_x/rep-cache-db.h
  vendor/subversion/dist/subversion/libsvn_ra_serf/xml.c
  vendor/subversion/dist/subversion/libsvn_repos/reporter.c
  vendor/subversion/dist/subversion/libsvn_repos/repos.c
  vendor/subversion/dist/subversion/libsvn_subr/config_file.c
  vendor/subversion/dist/subversion/libsvn_subr/deprecated.c
  vendor/subversion/dist/subversion/libsvn_subr/gpg_agent.c
  vendor/subversion/dist/subversion/libsvn_subr/internal_statements.h
  vendor/subversion/dist/subversion/libsvn_subr/sqlite.c
  vendor/subversion/dist/subversion/libsvn_subr/sysinfo.c
  vendor/subversion/dist/subversion/libsvn_subr/win32_crashrpt.c
  vendor/subversion/dist/subversion/libsvn_subr/xml.c
  vendor/subversion/dist/subversion/libsvn_wc/conflicts.c
  vendor/subversion/dist/subversion/libsvn_wc/update_editor.c
  vendor/subversion/dist/subversion/libsvn_wc/wc-checks.h
  vendor/subversion/dist/subversion/libsvn_wc/wc-metadata.h
  vendor/subversion/dist/subversion/libsvn_wc/wc-queries.h
  vendor/subversion/dist/subversion/svn/info-cmd.c
  vendor/subversion/dist/subversion/svn/merge-cmd.c
  vendor/subversion/dist/subversion/svnserve/serve.c

Modified: vendor/subversion/dist/CHANGES
==
--- vendor/subversion/dist/CHANGES  Thu Dec  1 05:37:29 2016
(r309353)
+++ vendor/subversion/dist/CHANGES  Thu Dec  1 07:45:05 2016
(r309354)
@@ -1,3 +1,54 @@
+Version 1.9.5
+(29 Nov 2016, from /branches/1.9.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.9.5
+
+ User-visible changes:
+  - Client-side bugfixes:
+* fix accessing non-existent paths during reintegrate merge (r1766699 et 
al)
+* fix handling of newly secured subdirectories in working copy (r1724448)
+* info: remove trailing whitespace in --show-item=revision (issue #4660)
+* fix recording wrong revisions for tree conflicts (r1734106)
+* gpg-agent: improve discovery of gpg-agent sockets (r1766327)
+* gpg-agent: fix file descriptor leak (r1766323)
+* resolve: fix --accept=mine-full for binary files (issue #4647)
+* merge: fix possible crash (issue #4652)
+* resolve: fix possible crash (r1748514)
+* fix potential crash in Win32 crash reporter (r1663253 et al)
+
+  - Server-side bugfixes:
+* fsfs: fix "offset too large" error during pack (issue #4657)
+* svnserve: enable hook script environments (r1769152)
+* fsfs: fix possible data reconstruction error (issue #4658)
+* fix source of spurious 'incoming edit' tree conflicts (r1770108)
+* fsfs: improve caching for large directories (r1721285)
+* fsfs: fix crash when encountering all-zero checksums (r1759686)
+* fsfs: fix potential source of repository corruptions (r1756266)
+* mod_dav_svn: fix excessive memory usage with mod_headers/mod_deflate
+  (issue #3084)
+* mod_dav_svn: reduce memory usage during GET requests (r1757529 et al)
+* fsfs: fix unexpected "database is locked" errors (r1741096 et al)
+* fsfs: fix opening old repositories without db/format files (r1720015)
+
+  - Client-side and server-side bugfixes:
+* fix possible crash when reading invalid configuration files (r1715777)
+
+  - Bindings bugfixes:
+* swig-pl: do not corrupt "{DATE}" revision variable (r1767768)
+* javahl: fix temporary accepting SSL server certificates (r1764851)
+* swig-pl: fix possible stack corruption (r1683266, r1683267)
+
+ Developer-visible changes:
+  - 

svn commit: r309356 - in head/contrib/subversion: . subversion/include subversion/include/private subversion/libsvn_client subversion/libsvn_fs_fs subversion/libsvn_fs_x subversion/libsvn_ra_serf s...

[Peter Wemm]

Author: peter
Date: Thu Dec  1 07:50:44 2016
New Revision: 309356
URL: https://svnweb.freebsd.org/changeset/base/309356

Log:
  Update from subversion 1.9.4 to 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.

Modified:
  head/contrib/subversion/CHANGES
  head/contrib/subversion/README
  head/contrib/subversion/build-outputs.mk
  head/contrib/subversion/configure
  head/contrib/subversion/configure.ac
  head/contrib/subversion/get-deps.sh
  head/contrib/subversion/subversion/include/private/svn_sqlite.h
  head/contrib/subversion/subversion/include/svn_version.h
  head/contrib/subversion/subversion/libsvn_client/merge.c
  head/contrib/subversion/subversion/libsvn_fs_fs/cached_data.c
  head/contrib/subversion/subversion/libsvn_fs_fs/caching.c
  head/contrib/subversion/subversion/libsvn_fs_fs/fs.c
  head/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c
  head/contrib/subversion/subversion/libsvn_fs_fs/low_level.c
  head/contrib/subversion/subversion/libsvn_fs_fs/pack.c
  head/contrib/subversion/subversion/libsvn_fs_fs/pack.h
  head/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h
  head/contrib/subversion/subversion/libsvn_fs_fs/rep-cache.c
  head/contrib/subversion/subversion/libsvn_fs_fs/rep-cache.h
  head/contrib/subversion/subversion/libsvn_fs_fs/transaction.c
  head/contrib/subversion/subversion/libsvn_fs_fs/tree.c
  head/contrib/subversion/subversion/libsvn_fs_x/rep-cache-db.h
  head/contrib/subversion/subversion/libsvn_ra_serf/xml.c
  head/contrib/subversion/subversion/libsvn_repos/reporter.c
  head/contrib/subversion/subversion/libsvn_repos/repos.c
  head/contrib/subversion/subversion/libsvn_subr/config_file.c
  head/contrib/subversion/subversion/libsvn_subr/deprecated.c
  head/contrib/subversion/subversion/libsvn_subr/gpg_agent.c
  head/contrib/subversion/subversion/libsvn_subr/internal_statements.h
  head/contrib/subversion/subversion/libsvn_subr/sqlite.c
  head/contrib/subversion/subversion/libsvn_subr/sysinfo.c
  head/contrib/subversion/subversion/libsvn_subr/win32_crashrpt.c
  head/contrib/subversion/subversion/libsvn_subr/xml.c
  head/contrib/subversion/subversion/libsvn_wc/conflicts.c
  head/contrib/subversion/subversion/libsvn_wc/update_editor.c
  head/contrib/subversion/subversion/libsvn_wc/wc-checks.h
  head/contrib/subversion/subversion/libsvn_wc/wc-metadata.h
  head/contrib/subversion/subversion/libsvn_wc/wc-queries.h
  head/contrib/subversion/subversion/svn/info-cmd.c
  head/contrib/subversion/subversion/svn/merge-cmd.c
  head/contrib/subversion/subversion/svnserve/serve.c
Directory Properties:
  head/contrib/subversion/   (props changed)

Modified: head/contrib/subversion/CHANGES
==
--- head/contrib/subversion/CHANGES Thu Dec  1 07:46:24 2016
(r309355)
+++ head/contrib/subversion/CHANGES Thu Dec  1 07:50:44 2016
(r309356)
@@ -1,3 +1,54 @@
+Version 1.9.5
+(29 Nov 2016, from /branches/1.9.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.9.5
+
+ User-visible changes:
+  - Client-side bugfixes:
+* fix accessing non-existent paths during reintegrate merge (r1766699 et 
al)
+* fix handling of newly secured subdirectories in working copy (r1724448)
+* info: remove trailing whitespace in --show-item=revision (issue #4660)
+* fix recording wrong revisions for tree conflicts (r1734106)
+* gpg-agent: improve discovery of gpg-agent sockets (r1766327)
+* gpg-agent: fix file descriptor leak (r1766323)
+* resolve: fix --accept=mine-full for binary files (issue #4647)
+* merge: fix possible crash (issue #4652)
+* resolve: fix possible crash (r1748514)
+* fix potential crash in Win32 crash reporter (r1663253 et al)
+
+  - Server-side bugfixes:
+* fsfs: fix "offset too large" error during pack (issue #4657)
+* svnserve: enable hook script environments (r1769152)
+* fsfs: fix possible data reconstruction error (issue #4658)
+* fix source of spurious 'incoming edit' tree conflicts (r1770108)
+* fsfs: improve caching for large directories (r1721285)
+* fsfs: fix crash when encountering all-zero checksums (r1759686)
+* fsfs: fix potential source of repository corruptions (r1756266)
+* mod_dav_svn: fix excessive memory usage with mod_headers/mod_deflate
+  (issue #3084)
+* mod_dav_svn: reduce memory usage during GET requests (r1757529 et al)
+* fsfs: fix unexpected "database is locked" errors (r1741096 et al)
+* fsfs: fix opening old repositories without db/format files (r1720015)
+
+  - Client-side and server-side bugfixes:
+* fix possible crash when reading invalid configuration files (r1715777)
+
+  - Bindings bugfixes:
+* swig-pl: do not corrupt "{DATE}" revision variable (r1767768)
+* javahl: fix temporary accepting SSL server 

svn commit: r304966 - head/sys/boot/i386/libi386

[Peter Wemm]

Author: peter
Date: Sun Aug 28 20:39:33 2016
New Revision: 304966
URL: https://svnweb.freebsd.org/changeset/base/304966

Log:
  The read-ahead code from r298230 made it likely the boot code would read
  beyond the end of disk. r298900 added code to prevent this.  Some BIOSes
  cause significant delays if asked to read past end-of-disk.
  
  We never trusted the BIOS to accurately report the sectorsize of disks
  before and this set of changes.  Unfortuately they interact badly with
  the infamous >2TB wraparound bugs.  We have a number of relatively-recent
  machines in the FreeBSD.org cluster where the BIOS reports 3TB disks as 1TB.
  
  With pre-r298900 they work just fine.  After r298900 they stop working if
  the boot environment attempts to access anything outside the first 1TB on
  the disk.  'ZFS: I/O error, all block copies unavailable' etc.  It affects
  both UFS and ZFS if they try to boot from large volumes.
  
  This change replaces the blind trust of the BIOS end-of-disk reporting
  with a read-ahead clip to prevent reads crossing the of end-of-disk
  boundary.  Since 2^32 (2TB) size reporting truncation is not uncommon,
  the clipping is done on 2TB aliases of the reported end-of-disk.
  ie: a 3TB disk reported as 1TB has readahead clipped at 1TB, 3TB, 5TB, ...
  as one of them is likely to be the real end-of-disk.
  
  This should make the loader on these broken machines behave the same as
  traditional pre-r298900 loader behavior, without disabling read-ahead.
  
  PR:   212139
  Discussed with:   tsoome, allanjude

Modified:
  head/sys/boot/i386/libi386/biosdisk.c

Modified: head/sys/boot/i386/libi386/biosdisk.c
==
--- head/sys/boot/i386/libi386/biosdisk.c   Sun Aug 28 19:48:08 2016
(r304965)
+++ head/sys/boot/i386/libi386/biosdisk.c   Sun Aug 28 20:39:33 2016
(r304966)
@@ -497,7 +497,7 @@ bd_realstrategy(void *devdata, int rw, d
 char *buf, size_t *rsize)
 {
 struct disk_devdesc *dev = (struct disk_devdesc *)devdata;
-intblks;
+intblks, remaining;
 #ifdef BD_SUPPORT_FRAGS /* XXX: sector size */
 char   fragbuf[BIOSDISK_SECSIZE];
 size_t fragsize;
@@ -513,14 +513,15 @@ bd_realstrategy(void *devdata, int rw, d
 if (rsize)
*rsize = 0;
 
-if (dblk >= BD(dev).bd_sectors) {
-   DEBUG("IO past disk end %llu", (unsigned long long)dblk);
-   return (EIO);
-}
-
-if (dblk + blks > BD(dev).bd_sectors) {
-   /* perform partial read */
-   blks = BD(dev).bd_sectors - dblk;
+/*
+ * Perform partial read to prevent read-ahead crossing
+ * the end of disk - or any 32 bit aliases of the end.
+ * Signed arithmetic is used to handle wrap-around cases
+ * like we do for TCP sequence numbers.
+ */
+remaining = (int)(BD(dev).bd_sectors - dblk);  /* truncate */
+if (remaining > 0 && remaining < blks) {
+   blks = remaining;
size = blks * BD(dev).bd_sectorsize;
DEBUG("short read %d", blks);
 }
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r303019 - head/sys/geom

[Peter Wemm]

On Saturday, July 23, 2016 09:39:00 PM Peter Wemm wrote:
> On Tuesday, July 19, 2016 05:36:21 AM Andrey V. Elsukov wrote:
> > Author: ae
> > Date: Tue Jul 19 05:36:21 2016
> > New Revision: 303019
> > URL: https://svnweb.freebsd.org/changeset/base/303019
> > 
> > Log:
> >   Use g_resize_provider() to change the size of GEOM_DISK provider,
> >   when it is being opened. This should fix the possible loss of a resize
> >   event when disk capacity changed.
> 
> Are you sure about this?  We have machines in the freebsd.org cluster that
> now panic on boot:
> 
> Trying to mount root from zfs:zroot []...
> GEOM_PART: da0 was automatically resized.
>   Use `gpart commit da0` to save changes or `gpart undo da0` to revert them.
> GEOM_PART: integrity check failed (da0, GPT)
> 
> Fatal trap 12: page fault while in kernel mode
> cpuid = 1; apic id = 01
> fault virtual address = 0x48
> fault code= supervisor read data, page not present
> instruction pointer   = 0x20:0x80740005
> stack pointer = 0x28:0xfe01f119db10
> frame pointer = 0x28:0xfe01f119db30
> code segment  = base 0x0, limit 0xf, type 0x1b
>   = DPL 0, pres 1, long 1, def32 0, gran 1
> processor eflags  = interrupt enabled, resume, IOPL = 0
> current process   = 13 (g_event)
> [ thread pid 13 tid 100019 ]
> Stopped at  g_part_resize+0x35: testb   $0x8,0x48(%rbx)
> 
> 
> 
> db> where
> Tracing pid 13 tid 100019 td 0xf8000426fa00
> g_part_resize() at g_part_resize+0x35/frame 0xfe01f119db30
> g_resize_provider_event() at g_resize_provider_event+0xb5/frame
> 0xfe01f119d0 g_run_events() at g_run_events+0x20e/frame
> 0xfe01f119dbb0
> ..
> 
> It is exploding here:
> g_part_resize(struct g_consumer *cp)
> {
> struct g_part_table *table;
> 
> G_PART_TRACE((G_T_TOPOLOGY, "%s(%s)", __func__,
> cp->provider->name)); g_topology_assert();
> 
> table = cp->geom->softc;
> if (table->gpt_opened == 0) {
> ^ (table is null)
> 
> Are you creating events too soon now?

Sometimes da0 fails, other times da1 fails.. and sometimes it is completely 
fine.  There is some sort of race going on with this change during the very 
first moments of bootup.

-- 
Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246

signature.asc
Description: This is a digitally signed message part.

Re: svn commit: r300557 - head/usr.sbin/apmd

[Peter Wemm]

On Thursday, May 26, 2016 07:54:20 PM Jilles Tjoelker wrote:
> On Tue, May 24, 2016 at 08:52:32AM -0700, John Baldwin wrote:
> > On Monday, May 23, 2016 09:24:41 PM Alan Somers wrote:
> > > On Mon, May 23, 2016 at 9:15 PM, Peter Wemm <pe...@freebsd.org> wrote:
> > > > Author: peter
> > > > Date: Tue May 24 03:15:46 2016
> > > > New Revision: 300557
> > > > URL: https://svnweb.freebsd.org/changeset/base/300557
> > > > 
> > > > Log:
> > > >   It seems  is a new prerequisite for  after
> > > >   r300539. Attempt to fix the build for i386.
> > > > 
> > > > Modified:
> > > >   head/usr.sbin/apmd/apmd.c
> > > >   head/usr.sbin/apmd/apmdlex.l
> > > >   head/usr.sbin/apmd/apmdparse.y
> > > 
> > > Are you sure this is necessary, even after 300544?
> > 
> > Actually, we try to avoid nested includes when possible for userland,
> > so I'd be inclined to drop the  nested include and just
> > add  to the places that need it.  Userland code in the
> > base system is supposed to have  or  as the
> > first #include anyway (which apmd was not following), so any fixes to
> > userland are probably style fixes anyway.
> 
> This is traditional BSD convention, but headers specified by POSIX work
> differently. POSIX headers can be included alone, so files that only
> include POSIX headers rarely need #include . This often
> causes some ugliness in the header file to use hidden names for things
> to reduce namespace pollution.
> 
> Since  is not specified by POSIX, it is not required to
> work without prerequisites.

FWIW I have no investment in the commit I made - I needed it to compile for 
the cluster.  Feel free to change/revert my commit so long as world compiles.

-- 
Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246

signature.asc
Description: This is a digitally signed message part.

svn commit: r300557 - head/usr.sbin/apmd

[Peter Wemm]

Author: peter
Date: Tue May 24 03:15:46 2016
New Revision: 300557
URL: https://svnweb.freebsd.org/changeset/base/300557

Log:
  It seems  is a new prerequisite for  after
  r300539. Attempt to fix the build for i386.

Modified:
  head/usr.sbin/apmd/apmd.c
  head/usr.sbin/apmd/apmdlex.l
  head/usr.sbin/apmd/apmdparse.y

Modified: head/usr.sbin/apmd/apmd.c
==
--- head/usr.sbin/apmd/apmd.c   Tue May 24 03:13:27 2016(r300556)
+++ head/usr.sbin/apmd/apmd.c   Tue May 24 03:15:46 2016(r300557)
@@ -32,6 +32,7 @@ static const char rcsid[] =
   "$FreeBSD$";
 #endif /* not lint */
 
+#include 
 #include 
 #include 
 #include 
@@ -45,7 +46,6 @@ static const char rcsid[] =
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 

Modified: head/usr.sbin/apmd/apmdlex.l
==
--- head/usr.sbin/apmd/apmdlex.lTue May 24 03:13:27 2016
(r300556)
+++ head/usr.sbin/apmd/apmdlex.lTue May 24 03:15:46 2016
(r300557)
@@ -30,6 +30,7 @@
  * $FreeBSD$
  */
 
+#include 
 #include 
 #include 
 #include 

Modified: head/usr.sbin/apmd/apmdparse.y
==
--- head/usr.sbin/apmd/apmdparse.y  Tue May 24 03:13:27 2016
(r300556)
+++ head/usr.sbin/apmd/apmdparse.y  Tue May 24 03:15:46 2016
(r300557)
@@ -30,6 +30,7 @@
  * $FreeBSD$
  */
 
+#include 
 #include 
 #include 
 #include 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r300539 - in head: . share/man/man3 sys/kern sys/sys tests/sys/sys

[Peter Wemm]

On Monday, May 23, 2016 08:29:18 PM Alan Somers wrote:
> Author: asomers
> Date: Mon May 23 20:29:18 2016
> New Revision: 300539
> URL: https://svnweb.freebsd.org/changeset/base/300539
> 
> Log:
>   Add bit_count to the bitstring(3) api
> 

(My aplogies, I replied to the wrong commit.)


This breaks i386:

In file included from /usr/src/usr.sbin/apmd/apmd.c:36:
In file included from /usr/obj/usr/src/tmp/usr/include/bitstring.h:34:
/usr/obj/usr/src/tmp/usr/include/sys/bitstring.h:278:13: error: implicit 
declaration of function '__bitcountl' is invalid in C99 [-Werror,-Wimplicit-
function-declaration]
_value += __bitcountl(*_curbitstr & mask);
...

This is coming from the inline below:

> @@ -256,4 +257,40 @@ bit_ffc(bitstr_t *_bitstr, int _nbits, i
>   bit_ffc_at(_bitstr, /*start*/0, _nbits, _result);
>  }
> 
> +/* Count the number of bits set in a bitstr of size _nbits at or after
> _start */ +static inline void
> +bit_count(bitstr_t *_bitstr, int _start, int _nbits, int *_result)
> +{
> + bitstr_t *_curbitstr, mask;
> + int _value = 0, curbitstr_len;
> +
> + if (_start >= _nbits)
> + goto out;
> +
> + _curbitstr = _bitstr + _bit_idx(_start);
> + _nbits -= _BITSTR_BITS * _bit_idx(_start);
> + _start -= _BITSTR_BITS * _bit_idx(_start);
> +
> + if (_start > 0) {
> + curbitstr_len = (int)_BITSTR_BITS < _nbits ?
> + (int)_BITSTR_BITS : _nbits;
> + mask = _bit_make_mask(_start, _bit_offset(curbitstr_len - 1));
> + _value += __bitcountl(*_curbitstr & mask);
> + _curbitstr++;
> + _nbits -= _BITSTR_BITS;
> + }
> + while (_nbits >= (int)_BITSTR_BITS) {
> + _value += __bitcountl(*_curbitstr);
> + _curbitstr++;
> + _nbits -= _BITSTR_BITS;
> + }
> + if (_nbits > 0) {
> + mask = _bit_make_mask(0, _bit_offset(_nbits - 1));
> + _value += __bitcountl(*_curbitstr & mask);
> + }
> +
> +out:
> + *_result = _value;
> +}

-- 
Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246

signature.asc
Description: This is a digitally signed message part.

Re: svn commit: r299090 - in head: etc/mtree include lib/libbluetooth sbin/hastd share/man/man3 sys/dev/xen/blkback sys/kern sys/net sys/sys tests/sys tests/sys/sys usr.sbin/bluetooth/hccontrol

[Peter Wemm]

On Thursday, May 05, 2016 10:57:16 AM Ed Maste wrote:
> On 4 May 2016 at 18:34, Alan Somers <asom...@freebsd.org> wrote:
> > Author: asomers
> > Date: Wed May  4 22:34:11 2016
> > New Revision: 299090
> > URL: https://svnweb.freebsd.org/changeset/base/299090
> > 
> > Log:
> >   Improve performance and functionality of the bitstring(3) api
> 
> tinderbox is failing on (at least) powerpc now with:
> 
> --- all_subdir_tests ---
> cc1: warnings being treated as errors
> /scratch/tmp/emaste/freebsd/sys/kern/subr_unit.c: In function 'main':
> /scratch/tmp/emaste/freebsd/sys/kern/subr_unit.c:1029: warning: format
> '%lu' expects type 'long unsigned int', but argument 2 has type
> 'unsigned int'
> *** [subr_unit.o] Error code 1
> ___
> svn-src-h...@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

It also breaks i386:

In file included from /usr/src/usr.sbin/apmd/apmd.c:36:
In file included from /usr/obj/usr/src/tmp/usr/include/bitstring.h:34:
/usr/obj/usr/src/tmp/usr/include/sys/bitstring.h:278:13: error: implicit 
declaration of function '__bitcountl' is invalid in C99 [-Werror,-Wimplicit-
function-declaration]
_value += __bitcountl(*_curbitstr & mask);
  ^


-- 
Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246

signature.asc
Description: This is a digitally signed message part.

svn commit: r299997 - head/sys/boot/i386/zfsboot

[Peter Wemm]

Author: peter
Date: Tue May 17 00:24:53 2016
New Revision: 27
URL: https://svnweb.freebsd.org/changeset/base/27

Log:
  Attempt to fix r299660:
  slba is used only for the GPT case.
  elba is used if either GPT or LOADER_GELI_SUPPORT is enabled.

Modified:
  head/sys/boot/i386/zfsboot/zfsboot.c

Modified: head/sys/boot/i386/zfsboot/zfsboot.c
==
--- head/sys/boot/i386/zfsboot/zfsboot.cTue May 17 00:23:46 2016
(r26)
+++ head/sys/boot/i386/zfsboot/zfsboot.cTue May 17 00:24:53 2016
(r27)
@@ -397,10 +397,12 @@ probe_drive(struct dsk *dsk)
 struct gpt_hdr hdr;
 struct gpt_ent *ent;
 unsigned part, entries_per_sec;
+daddr_t slba;
 #endif
-#ifdef LOADER_GELI_SUPPORT
-daddr_t slba, elba;
+#if defined(GPT) || defined(LOADER_GELI_SUPPORT)
+daddr_t elba;
 #endif
+
 struct dos_partition *dp;
 char *sec;
 unsigned i;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r298949 - head/sys/boot/i386/zfsboot

[Peter Wemm]

Author: peter
Date: Tue May  3 00:09:13 2016
New Revision: 298949
URL: https://svnweb.freebsd.org/changeset/base/298949

Log:
  Change a rounding operation that had missing braces into a roundup2()
  macro.  Adjust the buffer clipping code to work as expected.
  
  This prevented a number of machines in the FreeBSD.org cluster from
  booting due to "ZFS: i/o error - all block copies unavailable"
  after an unclean shutdown.

Modified:
  head/sys/boot/i386/zfsboot/zfsboot.c

Modified: head/sys/boot/i386/zfsboot/zfsboot.c
==
--- head/sys/boot/i386/zfsboot/zfsboot.cMon May  2 22:58:11 2016
(r298948)
+++ head/sys/boot/i386/zfsboot/zfsboot.cTue May  3 00:09:13 2016
(r298949)
@@ -224,21 +224,18 @@ vdev_read(vdev_t *vdev, void *priv, off_
 
while (bytes > 0) {
nb = bytes / DEV_BSIZE;
-   if (nb > READ_BUF_SIZE / DEV_BSIZE)
-   nb = READ_BUF_SIZE / DEV_BSIZE;
/*
 * Ensure that the read size plus the leading offset does not
 * exceed the size of the read buffer.
 */
-   if (nb * DEV_BSIZE + diff > READ_BUF_SIZE)
-   nb -= diff / DEV_BSIZE;
+   if (nb > (READ_BUF_SIZE - diff) / DEV_BSIZE)
+   nb = (READ_BUF_SIZE - diff) / DEV_BSIZE;
/*
 * Round the number of blocks to read up to the nearest multiple
 * of DEV_GELIBOOT_BSIZE.
 */
-   alignnb = nb + (diff / DEV_BSIZE) +
-   (DEV_GELIBOOT_BSIZE / DEV_BSIZE - 1) & ~
-   (unsigned int)(DEV_GELIBOOT_BSIZE / DEV_BSIZE - 1);
+   alignnb = roundup2(nb * DEV_BSIZE + diff, DEV_GELIBOOT_BSIZE)
+   / DEV_BSIZE;
 
if (drvread(dsk, dmadat->rdbuf, alignlba, alignnb))
return -1;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r298857 - head/etc/rc.d

[Peter Wemm]

Author: peter
Date: Sat Apr 30 19:01:51 2016
New Revision: 298857
URL: https://svnweb.freebsd.org/changeset/base/298857

Log:
  Fix incorrect permissions for /etc/rc.d/sendmail in fallout from
  release-pkg merge.

Modified:
  head/etc/rc.d/Makefile

Modified: head/etc/rc.d/Makefile
==
--- head/etc/rc.d/Makefile  Sat Apr 30 18:56:35 2016(r298856)
+++ head/etc/rc.d/Makefile  Sat Apr 30 19:01:51 2016(r298857)
@@ -295,7 +295,7 @@ FILESGROUPS+=   SMRCD
 SMRCD= sendmail
 .endif
 SMRCDDIR=  /etc/rc.d
-SMRCDDIRMODE=  ${BINMODE}
+SMRCDMODE= ${BINMODE}
 SMRCDPACKAGE=  sendmail
 
 .if ${MK_TIMED} != "no"
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r298140 - in head/etc: . devd

[Peter Wemm]

On Sunday, April 17, 2016 04:12:16 AM Glen Barber wrote:
> On Sat, Apr 16, 2016 at 09:01:04PM -0700, NGie Cooper wrote:
> > > On Apr 16, 2016, at 20:45, Glen Barber <g...@freebsd.org> wrote:
> > > 
> > > Author: gjb
> > > Date: Sun Apr 17 03:45:45 2016
> > > New Revision: 298140
> > > URL: https://svnweb.freebsd.org/changeset/base/298140
> > > 
> > > Log:
> > >  Fix etcupdate(8) with rc.sendmail and devd/*.  It turns out
> > >  BIN1 and such in etc/* cannot use FILESGROUPS.
> > >  
> > >  Reported by:peter
> > >  Sponsored by:The FreeBSD Foundation
> > 
> > This only applies to etc/Makefile . I offered to change that a couple
> > years ago and it was met with a large number of complaints and some teeth
> > gnashing.
> Based on the report, etc/devd/Makefile is affected as well.
> 
> Glen

Yep.  The short version is that 'make installworld' doesn't put things into 
/etc -  that's what 'make distribution', mergemaster, etcupdate, and 3rd party 
tools  do.   Having 'make installworld' suddenly begin to partly update /etc 
files is quite a POLA violation and caused etcupdate to delete them as they 
disappeared from the 'distribution' manifest.  eg:
  D /etc/auto_master
  D /etc/devd/hyperv.conf
  D /etc/devd/uath.conf
  D /etc/devd/ulpt.conf
  D /etc/devd/usb.conf
  D /etc/devd/zfs.conf
  D /etc/rc.sendmail
  U /etc/mtree/BSD.var.dist

-- 
Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246

signature.asc
Description: This is a digitally signed message part.

svn commit: r298141 - head/etc/rc.d

[Peter Wemm]

Author: peter
Date: Sun Apr 17 03:57:37 2016
New Revision: 298141
URL: https://svnweb.freebsd.org/changeset/base/298141

Log:
  Turn ssh_host_dsa_key back on until PR#208254 is taken care of.

Modified:
  head/etc/rc.d/sshd

Modified: head/etc/rc.d/sshd
==
--- head/etc/rc.d/sshd  Sun Apr 17 03:45:45 2016(r298140)
+++ head/etc/rc.d/sshd  Sun Apr 17 03:57:37 2016(r298141)
@@ -22,7 +22,7 @@ extra_commands="configtest keygen reload
 
 : ${sshd_rsa1_enable:="no"}
 : ${sshd_rsa_enable:="yes"}
-: ${sshd_dsa_enable:="no"}
+: ${sshd_dsa_enable:="yes"}
 : ${sshd_ecdsa_enable:="yes"}
 : ${sshd_ed25519_enable:="yes"}
 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r297974 - in head/sys: i386/i386 i386/ibcs2 x86/x86

[Peter Wemm]

On Thursday, April 14, 2016 12:14:13 PM Pedro Giffuni wrote:
> On 04/14/16 12:04, Pedro F. Giffuni wrote:
> > Author: pfg
> > Date: Thu Apr 14 17:04:06 2016
> > New Revision: 297974
> > URL: https://svnweb.freebsd.org/changeset/base/297974
> > 
> > Log:
> >x86: for pointers replace 0 with NULL.
> >
> >These are mostly cosmetical, no functional change.
> >
> >Found with devel/coccinelle.
> > 
> > Modified:
> >head/sys/i386/i386/db_disasm.c
> >head/sys/i386/i386/pmap.c
> >head/sys/i386/ibcs2/imgact_coff.c
> >head/sys/x86/x86/nexus.c
> 
> ...
> 
> > Modified: head/sys/i386/i386/pmap.c
> > ==
> >  --- head/sys/i386/i386/pmap.c  Thu Apr 14 16:32:27 2016
(r297973)
> > +++ head/sys/i386/i386/pmap.c   Thu Apr 14 17:04:06 2016
> > (r297974)
> > @@ -269,15 +269,15 @@ pt_entry_t *CMAP3;
> > 
> >   static pd_entry_t *KPTD;
> >   caddr_t ptvmmap = 0;
> >   caddr_t CADDR3;
> > 
> > -struct msgbuf *msgbufp = 0;
> > +struct msgbuf *msgbufp = NULL;
> > 
> >   /*
> >   
> >* Crashdump maps.
> >*/
> >   
> >   static caddr_t crashdumpmap;
> > 
> > -static pt_entry_t *PMAP1 = 0, *PMAP2;
> > -static pt_entry_t *PADDR1 = 0, *PADDR2;
> > +static pt_entry_t *PMAP1 = NULL, *PMAP2;
> > +static pt_entry_t *PADDR1 = NULL, *PADDR2;
> > 
> >   #ifdef SMP
> >   static int PMAP1cpu;
> >   static int PMAP1changedcpu;
> 
> Hmm .. being static, there is no need to initialize these.

Several eons ago, at least some of these were initialized to force them into 
the data section so that they had known or safe values before the bss zero 
pass.  I don't know if that was ever an issue on freebsd, or just the upstream 
code.  You'd have to look well back into ancient 2.0 or earlier vintage code.  

I have a vague memory that our early a.out kernel had to zero its own bss 
because the early a.out boot blocks didn't, and these variables would have 
been caught in the crossfire.  Or something..

In any case, I'd be surprised if the compiler didn't put them in the bss 
section these days anyway.  At least without cc -ffreestanding, anyway.

-- 
Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246

signature.asc
Description: This is a digitally signed message part.

Re: svn commit: r292206 - in head/contrib/unbound: . compat daemon dns64 dnstap doc iterator libunbound libunbound/python libunbound/python/doc libunbound/python/doc/modules libunbound/python/examples

[Peter Wemm]

On Monday, December 14, 2015 01:01:51 PM Dag-Erling Smørgrav wrote:
> Author: des
> Date: Mon Dec 14 13:01:51 2015
> New Revision: 292206
> URL: https://svnweb.freebsd.org/changeset/base/292206
> 
> Log:
>   Upgrade to Unbound 1.5.7.
> 
> Added:
>   head/contrib/unbound/.gitignore
>  - copied unchanged from r292133, vendor/unbound/dist/.gitignore
>   head/contrib/unbound/compat/isblank.c
>  - copied unchanged from r292133, vendor/unbound/dist/compat/isblank.c
> Modified:
>   head/contrib/unbound/Makefile.in

An error was introduced here that breaks some of the support scripts:

@@ -107,16 +107,15 @@
 fi
 
 # create self-signed cert for server
-cat >request.cfg < request.cfg
+echo "default_bits=$BITS\n" >> request.cfg
+echo "default_md=$HASH\n" >> request.cfg
+echo "prompt=no\n" >> request.cfg
+echo "distinguished_name=req_distinguished_name\n" >> request.cfg
+echo "\n" >> request.cfg
+echo "[req_distinguished_name]\n" >> request.cfg
+echo "commonName=$SERVERNAME\n" >> request.cfg
 
-[req_distinguished_name]
-commonName=$SERVERNAME
-EOF
 test -f request.cfg || error "could not create request.cfg"
 
 echo "create $SVR_BASE.pem (self signed certificate)"
@@ -125,16 +124,15 @@
 openssl x509 -in $SVR_BASE.pem -addtrust serverAuth -out 
$SVR_BASE"_trust.pem"
 
 # create client request and sign it, piped
-cat >request.cfg < request.cfg
+echo "default_bits=$BITS\n" >> request.cfg
+echo "default_md=$HASH\n" >> request.cfg
+echo "prompt=no\n" >> request.cfg
+echo "distinguished_name=req_distinguished_name\n" >> request.cfg
+echo "\n" >> request.cfg
+echo "[req_distinguished_name]\n" >> request.cfg
+echo "commonName=$CLIENTNAME" >> request.cfg
 
-[req_distinguished_name]
-commonName=$CLIENTNAME
-EOF
 test -f request.cfg || error "could not create request.cfg"
 
 echo "create $CTL_BASE.pem (signed client certificate)"

Whoever wrote this seems to have confused "echo" with "printf".  All the 
trailing "\n" lines cause an openssl error.  In the cluster build I had to 
remove the "\n" and that was sufficient to bootstrap new instances again.

I suspect this error is harmless on bash.  Unfortunately our environment 
cares.

-- 
Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246

signature.asc
Description: This is a digitally signed message part.

Re: svn commit: r292206 - in head/contrib/unbound: . compat daemon dns64 dnstap doc iterator libunbound libunbound/python libunbound/python/doc libunbound/python/doc/modules libunbound/python/examples

[Peter Wemm]

On Wednesday, February 03, 2016 10:10:51 AM Peter Wemm wrote:
> On Monday, December 14, 2015 01:01:51 PM Dag-Erling Smørgrav wrote:
> > Author: des
> > Date: Mon Dec 14 13:01:51 2015
> > New Revision: 292206
> > URL: https://svnweb.freebsd.org/changeset/base/292206
> > 
> > Log:
> >   Upgrade to Unbound 1.5.7.
> > 
> > Added:
> >   head/contrib/unbound/.gitignore
> >   
> >  - copied unchanged from r292133, vendor/unbound/dist/.gitignore
> >   
> >   head/contrib/unbound/compat/isblank.c
> >   
> >  - copied unchanged from r292133, vendor/unbound/dist/compat/isblank.c
> > 
> > Modified:
> >   head/contrib/unbound/Makefile.in
> 
> An error was introduced here that breaks some of the support scripts:
> 
> @@ -107,16 +107,15 @@
>  fi
> 
>  # create self-signed cert for server
> -cat >request.cfg < -[req]
> -default_bits=$BITS
> -default_md=$HASH
> -prompt=no
> -distinguished_name=req_distinguished_name
> +echo "[req]\n" > request.cfg
> +echo "default_bits=$BITS\n" >> request.cfg
> +echo "default_md=$HASH\n" >> request.cfg
> +echo "prompt=no\n" >> request.cfg
> +echo "distinguished_name=req_distinguished_name\n" >> request.cfg
> +echo "\n" >> request.cfg
> +echo "[req_distinguished_name]\n" >> request.cfg
> +echo "commonName=$SERVERNAME\n" >> request.cfg
> 
> -[req_distinguished_name]
> -commonName=$SERVERNAME
> -EOF
>  test -f request.cfg || error "could not create request.cfg"
> 
>  echo "create $SVR_BASE.pem (self signed certificate)"
> @@ -125,16 +124,15 @@
>  openssl x509 -in $SVR_BASE.pem -addtrust serverAuth -out
> $SVR_BASE"_trust.pem"
> 
>  # create client request and sign it, piped
> -cat >request.cfg < -[req]
> -default_bits=$BITS
> -default_md=$HASH
> -prompt=no
> -distinguished_name=req_distinguished_name
> +echo "[req]\n" > request.cfg
> +echo "default_bits=$BITS\n" >> request.cfg
> +echo "default_md=$HASH\n" >> request.cfg
> +echo "prompt=no\n" >> request.cfg
> +echo "distinguished_name=req_distinguished_name\n" >> request.cfg
> +echo "\n" >> request.cfg
> +echo "[req_distinguished_name]\n" >> request.cfg
> +echo "commonName=$CLIENTNAME" >> request.cfg
> 
> -[req_distinguished_name]
> -commonName=$CLIENTNAME
> -EOF
>  test -f request.cfg || error "could not create request.cfg"
> 
>  echo "create $CTL_BASE.pem (signed client certificate)"
> 
> Whoever wrote this seems to have confused "echo" with "printf".  All the
> trailing "\n" lines cause an openssl error.  In the cluster build I had to
> remove the "\n" and that was sufficient to bootstrap new instances again.

Filed as https://bugs.freebsd.org/206887
-- 
Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246

signature.asc
Description: This is a digitally signed message part.

svn commit: r290056 - svnadmin/hooks/scripts

[Peter Wemm]

Author: peter
Date: Tue Oct 27 20:38:50 2015
New Revision: 290056
URL: https://svnweb.freebsd.org/changeset/base/290056

Log:
  Suppress warnings about use of given/when.

Modified:
  svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl

Modified: svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl
==
--- svnadmin/hooks/scripts/detect-mergeinfo-bloat.plTue Oct 27 20:34:30 
2015(r290055)
+++ svnadmin/hooks/scripts/detect-mergeinfo-bloat.plTue Oct 27 20:38:50 
2015(r290056)
@@ -33,6 +33,9 @@
 require warnings;
 import warnings;
 
+use v5.10; # earliest occurance of feature
+no warnings 'experimental::smartmatch';
+
 use strict;
 use Carp;
 use feature qw(switch);# be 5.10 or later, or else!
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r289991 - svnadmin/hooks

[Peter Wemm]

Author: peter
Date: Mon Oct 26 04:11:33 2015
New Revision: 289991
URL: https://svnweb.freebsd.org/changeset/base/289991

Log:
  Test commit; capture a new template file.

Added:
  svnadmin/hooks/hooks-env.tmpl   (contents, props changed)

Added: svnadmin/hooks/hooks-env.tmpl
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ svnadmin/hooks/hooks-env.tmpl   Mon Oct 26 04:11:33 2015
(r289991)
@@ -0,0 +1,20 @@
+# $FreeBSD$
+### This file is an example hook script environment configuration file.
+### Hook scripts run in an empty environment by default.
+### As shown below each section defines environment variables for a
+### particular hook script. The [default] section defines environment
+### variables for all hook scripts, unless overridden by a hook-specific
+### section.
+
+### This example configures a UTF-8 locale for all hook scripts, so that 
+### special characters, such as umlauts, may be printed to stderr.
+### If UTF-8 is used with a mod_dav_svn server, the SVNUseUTF8 option must
+### also be set to 'yes' in httpd.conf.
+### With svnserve, the LANG environment variable of the svnserve process
+### must be set to the same value as given here.
+[default]
+LANG = en_US.UTF-8
+
+### This sets the PATH environment variable for the pre-commit hook.
+[pre-commit]
+PATH = /usr/local/bin:/usr/bin:/usr/sbin
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r289270 -

[Peter Wemm]

Author: peter
Date: Tue Oct 13 23:30:54 2015
New Revision: 289270
URL: https://svnweb.freebsd.org/changeset/base/289270

Log:
  Add *.po to auto-props
  
  Submitted by: wblock

Modified:
Directory Properties:
  /   (props changed)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r289177 - in vendor/subversion/dist: . doc/programmer doc/user subversion subversion/include subversion/include/private subversion/libsvn_auth_gnome_keyring subversion/libsvn_auth_kwall...

[Peter Wemm]

Author: peter
Date: Mon Oct 12 08:54:49 2015
New Revision: 289177
URL: https://svnweb.freebsd.org/changeset/base/289177

Log:
  Vendor import of subversion-1.9.2

Added:
  vendor/subversion/dist/.ycm_extra_conf.py   (contents, props changed)
  vendor/subversion/dist/doc/programmer/gtest-guide.txt   (contents, props 
changed)
  vendor/subversion/dist/subversion/include/private/svn_client_mtcc.h   
(contents, props changed)
  vendor/subversion/dist/subversion/include/private/svn_fs_fs_private.h   
(contents, props changed)
  vendor/subversion/dist/subversion/include/private/svn_object_pool.h   
(contents, props changed)
  vendor/subversion/dist/subversion/include/private/svn_packed_data.h   
(contents, props changed)
  vendor/subversion/dist/subversion/include/private/svn_sorts_private.h   
(contents, props changed)
  vendor/subversion/dist/subversion/include/svn_x509.h   (contents, props 
changed)
  
vendor/subversion/dist/subversion/libsvn_auth_gnome_keyring/libsvn_auth_gnome_keyring.pc.in
   (contents, props changed)
  
vendor/subversion/dist/subversion/libsvn_auth_kwallet/libsvn_auth_kwallet.pc.in 
  (contents, props changed)
  vendor/subversion/dist/subversion/libsvn_client/libsvn_client.pc.in   
(contents, props changed)
  vendor/subversion/dist/subversion/libsvn_client/mtcc.c   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_delta/libsvn_delta.pc.in   
(contents, props changed)
  vendor/subversion/dist/subversion/libsvn_diff/binary_diff.c   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_diff/libsvn_diff.pc.in   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_fs/deprecated.c   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_fs/libsvn_fs.pc.in   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_fs_base/libsvn_fs_base.pc.in   
(contents, props changed)
  vendor/subversion/dist/subversion/libsvn_fs_fs/cached_data.c   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_fs_fs/cached_data.h   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_fs_fs/dump-index.c   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_fs_fs/hotcopy.c   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_fs_fs/hotcopy.h   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_fs_fs/index.c   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_fs_fs/index.h   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_fs_fs/libsvn_fs_fs.pc.in   
(contents, props changed)
  vendor/subversion/dist/subversion/libsvn_fs_fs/load-index.c   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_fs_fs/low_level.c   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_fs_fs/low_level.h   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_fs_fs/pack.c   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_fs_fs/pack.h   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_fs_fs/recovery.c   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_fs_fs/recovery.h   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_fs_fs/rev_file.c   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_fs_fs/rev_file.h   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_fs_fs/revprops.c   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_fs_fs/revprops.h   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_fs_fs/stats.c   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_fs_fs/structure-indexes
  vendor/subversion/dist/subversion/libsvn_fs_fs/transaction.c   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_fs_fs/transaction.h   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_fs_fs/util.c   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_fs_fs/util.h   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_fs_fs/verify.c   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_fs_fs/verify.h   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_fs_util/libsvn_fs_util.pc.in   
(contents, props changed)
  vendor/subversion/dist/subversion/libsvn_fs_x/
  vendor/subversion/dist/subversion/libsvn_fs_x/TODO
  vendor/subversion/dist/subversion/libsvn_fs_x/cached_data.c   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_fs_x/cached_data.h   (contents, 
props changed)
  vendor/subversion/dist/subversion/libsvn_fs_x/caching.c   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_fs_x/changes.c   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_fs_x/changes.h   (contents, props 
changed)
  vendor/subversion/dist/subversion/libsvn_fs_x/dag.c   (contents, props 
changed)

svn commit: r289178 - vendor/subversion/subversion-1.9.2

[Peter Wemm]

Author: peter
Date: Mon Oct 12 08:55:54 2015
New Revision: 289178
URL: https://svnweb.freebsd.org/changeset/base/289178

Log:
  Tag subversion-1.9.2 import.

Added:
  vendor/subversion/subversion-1.9.2/
 - copied from r289177, vendor/subversion/dist/
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r289180 - in head: contrib/subversion contrib/subversion/doc/programmer contrib/subversion/doc/user contrib/subversion/subversion contrib/subversion/subversion/include contrib/subversio...

[Peter Wemm]

Author: peter
Date: Mon Oct 12 09:53:55 2015
New Revision: 289180
URL: https://svnweb.freebsd.org/changeset/base/289180

Log:
  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.
  
  Relnotes: yes

Added:
  head/contrib/subversion/.ycm_extra_conf.py
 - copied unchanged from r289178, vendor/subversion/dist/.ycm_extra_conf.py
  head/contrib/subversion/doc/programmer/gtest-guide.txt
 - copied unchanged from r289178, 
vendor/subversion/dist/doc/programmer/gtest-guide.txt
  head/contrib/subversion/subversion/include/private/svn_client_mtcc.h
 - copied unchanged from r289178, 
vendor/subversion/dist/subversion/include/private/svn_client_mtcc.h
  head/contrib/subversion/subversion/include/private/svn_fs_fs_private.h
 - copied unchanged from r289178, 
vendor/subversion/dist/subversion/include/private/svn_fs_fs_private.h
  head/contrib/subversion/subversion/include/private/svn_object_pool.h
 - copied unchanged from r289178, 
vendor/subversion/dist/subversion/include/private/svn_object_pool.h
  head/contrib/subversion/subversion/include/private/svn_packed_data.h
 - copied unchanged from r289178, 
vendor/subversion/dist/subversion/include/private/svn_packed_data.h
  head/contrib/subversion/subversion/include/private/svn_sorts_private.h
 - copied unchanged from r289178, 
vendor/subversion/dist/subversion/include/private/svn_sorts_private.h
  head/contrib/subversion/subversion/include/svn_x509.h
 - copied unchanged from r289178, 
vendor/subversion/dist/subversion/include/svn_x509.h
  
head/contrib/subversion/subversion/libsvn_auth_gnome_keyring/libsvn_auth_gnome_keyring.pc.in
 - copied unchanged from r289178, 
vendor/subversion/dist/subversion/libsvn_auth_gnome_keyring/libsvn_auth_gnome_keyring.pc.in
  
head/contrib/subversion/subversion/libsvn_auth_kwallet/libsvn_auth_kwallet.pc.in
 - copied unchanged from r289178, 
vendor/subversion/dist/subversion/libsvn_auth_kwallet/libsvn_auth_kwallet.pc.in
  head/contrib/subversion/subversion/libsvn_client/libsvn_client.pc.in
 - copied unchanged from r289178, 
vendor/subversion/dist/subversion/libsvn_client/libsvn_client.pc.in
  head/contrib/subversion/subversion/libsvn_client/mtcc.c
 - copied unchanged from r289178, 
vendor/subversion/dist/subversion/libsvn_client/mtcc.c
  head/contrib/subversion/subversion/libsvn_delta/libsvn_delta.pc.in
 - copied unchanged from r289178, 
vendor/subversion/dist/subversion/libsvn_delta/libsvn_delta.pc.in
  head/contrib/subversion/subversion/libsvn_diff/binary_diff.c
 - copied unchanged from r289178, 
vendor/subversion/dist/subversion/libsvn_diff/binary_diff.c
  head/contrib/subversion/subversion/libsvn_diff/libsvn_diff.pc.in
 - copied unchanged from r289178, 
vendor/subversion/dist/subversion/libsvn_diff/libsvn_diff.pc.in
  head/contrib/subversion/subversion/libsvn_fs/deprecated.c
 - copied unchanged from r289178, 
vendor/subversion/dist/subversion/libsvn_fs/deprecated.c
  head/contrib/subversion/subversion/libsvn_fs/libsvn_fs.pc.in
 - copied unchanged from r289178, 
vendor/subversion/dist/subversion/libsvn_fs/libsvn_fs.pc.in
  head/contrib/subversion/subversion/libsvn_fs_base/libsvn_fs_base.pc.in
 - copied unchanged from r289178, 
vendor/subversion/dist/subversion/libsvn_fs_base/libsvn_fs_base.pc.in
  head/contrib/subversion/subversion/libsvn_fs_fs/cached_data.c
 - copied unchanged from r289178, 
vendor/subversion/dist/subversion/libsvn_fs_fs/cached_data.c
  head/contrib/subversion/subversion/libsvn_fs_fs/cached_data.h
 - copied unchanged from r289178, 
vendor/subversion/dist/subversion/libsvn_fs_fs/cached_data.h
  head/contrib/subversion/subversion/libsvn_fs_fs/dump-index.c
 - copied unchanged from r289178, 
vendor/subversion/dist/subversion/libsvn_fs_fs/dump-index.c
  head/contrib/subversion/subversion/libsvn_fs_fs/hotcopy.c
 - copied unchanged from r289178, 
vendor/subversion/dist/subversion/libsvn_fs_fs/hotcopy.c
  head/contrib/subversion/subversion/libsvn_fs_fs/hotcopy.h
 - copied unchanged from r289178, 
vendor/subversion/dist/subversion/libsvn_fs_fs/hotcopy.h
  head/contrib/subversion/subversion/libsvn_fs_fs/index.c
 - copied unchanged from r289178, 
vendor/subversion/dist/subversion/libsvn_fs_fs/index.c
  head/contrib/subversion/subversion/libsvn_fs_fs/index.h
 - copied unchanged from r289178, 
vendor/subversion/dist/subversion/libsvn_fs_fs/index.h
  head/contrib/subversion/subversion/libsvn_fs_fs/libsvn_fs_fs.pc.in
 - copied 

Re: svn commit: r289087 - in head: etc etc/dma libexec libexec/dma libexec/dma-mbox-create libexec/dma/dma libexec/dma/dma-mbox-create share/examples share/examples/dma

[Peter Wemm]

On Saturday, October 10, 2015 04:44:23 PM Baptiste Daroussin wrote:
> On Fri, Oct 09, 2015 at 08:15:57PM -0700, Adrian Chadd wrote:
> > I think this broke being able to do installworld as non-root
> > 
> > 21:03 <@adrian> ===> libexec/dma/dmagent (installconfig)
> > 21:03 <@adrian> install:
> > /home/adrian/work/freebsd/head-embedded/src/../root/mips_ap/etc/dma/dma.co
> > nf: chown/chgrp: Operation not permitted
> > 21:03 <@adrian> *** Error code 71
> 
> Fixed in r289115
> 
> Bapt

You've broken etcupdate with this, and also the freebsd cluster.

# etcupdate status
Warnings:
  Non-empty directory remains: /etc/dma

You also made it delete ppp.conf:
  D /etc/ppp/ppp.conf
  D /etc/ppp

Deleting people's config files is not good.

-- 
Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246

signature.asc
Description: This is a digitally signed message part.

svn commit: r289200 - in head: . etc/sendmail

[Peter Wemm]

Author: peter
Date: Mon Oct 12 21:02:36 2015
New Revision: 289200
URL: https://svnweb.freebsd.org/changeset/base/289200

Log:
  If world is built with a custom sendmail.cf, use it for the distribution
  target.  This is the feeder for mergemaster / etcupdate.  This change
  makes installworld/mergemaster/etcupdate behave the same regardless of
  whether SENDMAIL_MC or SENDMAIL_CF is used.
  
  If you use a custom SENDMAIL_MC/CF in make.conf and excluded it from
  mergemaster.rc/etcupdate.conf to work around the conflicts, you may wish
  to revert that or change it from 'ignore' to 'always install'.
  
  If you do not use a custom SENDMAIL_MC/CF, there should be no change in
  behavior.

Modified:
  head/UPDATING
  head/etc/sendmail/Makefile

Modified: head/UPDATING
==
--- head/UPDATING   Mon Oct 12 20:21:17 2015(r289199)
+++ head/UPDATING   Mon Oct 12 21:02:36 2015(r289200)
@@ -31,6 +31,16 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20151012:
+   If you specify SENDMAIL_MC or SENDMAIL_CF in make.conf, mergemaster
+   and etcupdate will now use this file. A custom sendmail.cf is now
+   updated via this mechanism rather than via installworld.  If you had
+   excluded sendmail.cf in mergemaster.rc or etcupdate.conf, you may
+   want to remove the exclusion or change it to "always install".
+   /etc/mail/sendmail.cf is now managed the same way regardless of
+   whether SENDMAIL_MC/SENDMAIL_CF is used.  If you are not using
+   SENDMAIL_MC/SENDMAIL_CF there should be no change in behavior.
+
 20151011:
Compatibility shims for legacy ATA device names have been removed.
It includes ATA_STATIC_ID kernel option, kern.cam.ada.legacy_aliases

Modified: head/etc/sendmail/Makefile
==
--- head/etc/sendmail/Makefile  Mon Oct 12 20:21:17 2015(r289199)
+++ head/etc/sendmail/Makefile  Mon Oct 12 21:02:36 2015(r289200)
@@ -72,24 +72,25 @@ distribution:
${SMDIR}/helpfile ${DESTDIR}/etc/mail
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 640 \
/dev/null ${DESTDIR}/var/log/sendmail.st
-   ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
-   freebsd.cf ${DEST_CF}
-   ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
-   freebsd.submit.cf ${DEST_SUBMIT_CF}
-
-install:
-.if defined(INSTALL_CF) && ${INSTALL_CF} != ${DEST_CF}
+.if defined(INSTALL_CF)
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${INSTALL_CF} ${DEST_CF}
+.else
+   ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
+   freebsd.cf ${DEST_CF}
 .endif
 .if defined(SENDMAIL_ADDITIONAL_CF)
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${SENDMAIL_ADDITIONAL_CF} ${DESTDIR}/etc/mail
 .endif
-.if !defined(SENDMAIL_SET_USER_ID) && \
-defined(INSTALL_SUBMIT_CF) && ${INSTALL_SUBMIT_CF} != ${DEST_SUBMIT_CF}
-   ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
+.if !defined(SENDMAIL_SET_USER_ID)
+.if defined(INSTALL_SUBMIT_CF)
+   ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
${INSTALL_SUBMIT_CF} ${DEST_SUBMIT_CF}
+.else
+   ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
+   freebsd.submit.cf ${DEST_SUBMIT_CF}
+.endif
 .endif
 
 .include 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r289166 - in stable/10: contrib/apr contrib/apr-util contrib/apr-util/crypto contrib/apr-util/dbd contrib/apr-util/dbm contrib/apr-util/include contrib/apr-util/test contrib/apr/encodin...

[Peter Wemm]

Author: peter
Date: Mon Oct 12 04:57:36 2015
New Revision: 289166
URL: https://svnweb.freebsd.org/changeset/base/289166

Log:
  MFC: r269851,r272076,r274884,r282328,r285644,r286503,r286504,r286505,
   r286506,r286510,r286561,r286562,r287034
  
  Update svnlite from 1.8.10 to 1.8.14, and the support components:
  serf->1.3.8, apr->1.5.2, apr-util->1.5.4, sqlite3->3.8.11.1
  
  This includes syncing the developer templates with head.

Modified:
  stable/10/contrib/apr-util/CHANGES
  stable/10/contrib/apr-util/NOTICE
  stable/10/contrib/apr-util/apr-util.spec
  stable/10/contrib/apr-util/configure
  stable/10/contrib/apr-util/crypto/apr_crypto.c
  stable/10/contrib/apr-util/crypto/apr_passwd.c
  stable/10/contrib/apr-util/dbd/apr_dbd_mysql.c
  stable/10/contrib/apr-util/dbd/apr_dbd_odbc.c
  stable/10/contrib/apr-util/dbm/NWGNUmakefile
  stable/10/contrib/apr-util/include/apu_version.h
  stable/10/contrib/apr-util/test/Makefile.win
  stable/10/contrib/apr/CHANGES
  stable/10/contrib/apr/CMakeLists.txt
  stable/10/contrib/apr/Makefile.in
  stable/10/contrib/apr/NOTICE
  stable/10/contrib/apr/NWGNUmakefile
  stable/10/contrib/apr/apr.dsp
  stable/10/contrib/apr/apr.spec
  stable/10/contrib/apr/build-outputs.mk
  stable/10/contrib/apr/configure
  stable/10/contrib/apr/configure.in
  stable/10/contrib/apr/encoding/apr_escape.c
  stable/10/contrib/apr/include/apr_skiplist.h
  stable/10/contrib/apr/include/apr_version.h
  stable/10/contrib/apr/libapr.dsp
  stable/10/contrib/apr/locks/unix/proc_mutex.c
  stable/10/contrib/apr/memory/unix/apr_pools.c
  stable/10/contrib/apr/misc/unix/errorcodes.c
  stable/10/contrib/apr/network_io/unix/sockaddr.c
  stable/10/contrib/apr/network_io/unix/sockets.c
  stable/10/contrib/apr/poll/unix/epoll.c
  stable/10/contrib/apr/poll/unix/kqueue.c
  stable/10/contrib/apr/poll/unix/poll.c
  stable/10/contrib/apr/poll/unix/pollcb.c
  stable/10/contrib/apr/poll/unix/port.c
  stable/10/contrib/apr/poll/unix/z_asio.c
  stable/10/contrib/apr/tables/apr_skiplist.c
  stable/10/contrib/serf/CHANGES
  stable/10/contrib/serf/auth/auth_spnego_sspi.c
  stable/10/contrib/serf/buckets/deflate_buckets.c
  stable/10/contrib/serf/buckets/ssl_buckets.c
  stable/10/contrib/serf/serf.h
  stable/10/contrib/sqlite3/INSTALL
  stable/10/contrib/sqlite3/Makefile.am
  stable/10/contrib/sqlite3/Makefile.in
  stable/10/contrib/sqlite3/aclocal.m4
  stable/10/contrib/sqlite3/config.guess
  stable/10/contrib/sqlite3/config.sub
  stable/10/contrib/sqlite3/configure
  stable/10/contrib/sqlite3/configure.ac
  stable/10/contrib/sqlite3/depcomp
  stable/10/contrib/sqlite3/install-sh
  stable/10/contrib/sqlite3/ltmain.sh
  stable/10/contrib/sqlite3/missing
  stable/10/contrib/sqlite3/shell.c
  stable/10/contrib/sqlite3/sqlite3.1
  stable/10/contrib/sqlite3/sqlite3.c
  stable/10/contrib/sqlite3/sqlite3.h
  stable/10/contrib/sqlite3/sqlite3ext.h
  stable/10/contrib/subversion/CHANGES
  stable/10/contrib/subversion/Makefile.in
  stable/10/contrib/subversion/NOTICE
  stable/10/contrib/subversion/autogen.sh
  stable/10/contrib/subversion/build-outputs.mk
  stable/10/contrib/subversion/build.conf
  stable/10/contrib/subversion/configure
  stable/10/contrib/subversion/configure.ac
  stable/10/contrib/subversion/get-deps.sh
  stable/10/contrib/subversion/subversion/include/private/svn_diff_private.h
  
stable/10/contrib/subversion/subversion/include/private/svn_mergeinfo_private.h
  stable/10/contrib/subversion/subversion/include/private/svn_repos_private.h
  stable/10/contrib/subversion/subversion/include/private/svn_sqlite.h
  stable/10/contrib/subversion/subversion/include/svn_io.h
  stable/10/contrib/subversion/subversion/include/svn_version.h
  
stable/10/contrib/subversion/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
  stable/10/contrib/subversion/subversion/libsvn_client/copy.c
  stable/10/contrib/subversion/subversion/libsvn_client/externals.c
  stable/10/contrib/subversion/subversion/libsvn_client/log.c
  stable/10/contrib/subversion/subversion/libsvn_client/merge.c
  stable/10/contrib/subversion/subversion/libsvn_client/patch.c
  stable/10/contrib/subversion/subversion/libsvn_client/upgrade.c
  stable/10/contrib/subversion/subversion/libsvn_delta/svndiff.c
  stable/10/contrib/subversion/subversion/libsvn_diff/parse-diff.c
  stable/10/contrib/subversion/subversion/libsvn_diff/util.c
  stable/10/contrib/subversion/subversion/libsvn_fs_fs/caching.c
  stable/10/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c
  stable/10/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h
  stable/10/contrib/subversion/subversion/libsvn_fs_fs/tree.c
  stable/10/contrib/subversion/subversion/libsvn_ra_serf/commit.c
  stable/10/contrib/subversion/subversion/libsvn_ra_serf/options.c
  stable/10/contrib/subversion/subversion/libsvn_repos/commit.c
  stable/10/contrib/subversion/subversion/libsvn_repos/load-fs-vtable.c
  stable/10/contrib/subversion/subversion/libsvn_repos/rev_hunt.c
  

svn commit: r289000 - head/lib/libxo

[Peter Wemm]

Author: peter
Date: Thu Oct  8 01:17:45 2015
New Revision: 289000
URL: https://svnweb.freebsd.org/changeset/base/289000

Log:
  Move SHLIBDIR?=/lib before  so that it works again.

Modified:
  head/lib/libxo/Makefile

Modified: head/lib/libxo/Makefile
==
--- head/lib/libxo/Makefile Thu Oct  8 00:52:41 2015(r288999)
+++ head/lib/libxo/Makefile Thu Oct  8 01:17:45 2015(r289000)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+SHLIBDIR?=  /lib
+
 .include 
 
 LIBXOSRC=  ${SRCTOP}/contrib/libxo
@@ -9,8 +11,6 @@ LIBXOSRC=  ${SRCTOP}/contrib/libxo
 LIB=   xo
 SHLIB_MAJOR=0
 
-SHLIBDIR?=  /lib
-
 SRCS=  libxo.c xo_encoder.c xo_syslog.c
 
 CFLAGS+=-I${LIBXOSRC}/libxo
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r288705 - svnadmin/tools/svnssh

[Peter Wemm]

Author: peter
Date: Mon Oct  5 07:42:07 2015
New Revision: 288705
URL: https://svnweb.freebsd.org/changeset/base/288705

Log:
  Add a maximum elapsed time before exiting.

Modified:
  svnadmin/tools/svnssh/svnssh.c

Modified: svnadmin/tools/svnssh/svnssh.c
==
--- svnadmin/tools/svnssh/svnssh.c  Mon Oct  5 07:42:05 2015
(r288704)
+++ svnadmin/tools/svnssh/svnssh.c  Mon Oct  5 07:42:07 2015
(r288705)
@@ -205,6 +205,7 @@ main(int argc, char *argv[])
rl.rlim_cur = 60 * 60;  /* 60 minutes (soft) */
rl.rlim_max = 70 * 60;  /* 70 minutes (hard) */
setrlimit(RLIMIT_CPU, );
+   alarm(120); /* Limit total run time */
if (karma == 0)
syslog(LOG_INFO, "svn server: %s, karma %d", username, karma);
closelog();
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r288900 - svnadmin/tools/svnssh

[Peter Wemm]

Author: peter
Date: Mon Oct  5 21:18:41 2015
New Revision: 288900
URL: https://svnweb.freebsd.org/changeset/base/288900

Log:
  Fix the 120 minute runtime limit.

Modified:
  svnadmin/tools/svnssh/svnssh.c

Modified: svnadmin/tools/svnssh/svnssh.c
==
--- svnadmin/tools/svnssh/svnssh.c  Mon Oct  5 20:15:18 2015
(r288899)
+++ svnadmin/tools/svnssh/svnssh.c  Mon Oct  5 21:18:41 2015
(r288900)
@@ -205,7 +205,7 @@ main(int argc, char *argv[])
rl.rlim_cur = 60 * 60;  /* 60 minutes (soft) */
rl.rlim_max = 70 * 60;  /* 70 minutes (hard) */
setrlimit(RLIMIT_CPU, );
-   alarm(120); /* Limit total run time */
+   alarm(120 * 60);/* Limit total run time to 120 minutes */
if (karma == 0)
syslog(LOG_INFO, "svn server: %s, karma %d", username, karma);
closelog();
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r288681 - stable/10/sys/conf

[Peter Wemm]

Author: peter
Date: Mon Oct  5 01:25:51 2015
New Revision: 288681
URL: https://svnweb.freebsd.org/changeset/base/288681

Log:
  Fix broken build, again.
  
  cddl/contrib/opensolaris/uts/common/fs/zfs/bqueue.c wasn't added to
  conf/files in r286705 and was fixed by r286718.  The broken
  version was MFCed by r288571.
  
  Forgotten by:  mav (again)

Modified:
  stable/10/sys/conf/files

Modified: stable/10/sys/conf/files
==
--- stable/10/sys/conf/filesMon Oct  5 00:55:16 2015(r288680)
+++ stable/10/sys/conf/filesMon Oct  5 01:25:51 2015(r288681)
@@ -145,6 +145,7 @@ cddl/contrib/opensolaris/uts/common/fs/z
 cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c
optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c 
optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c
optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/bqueue.c
optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c  
optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c   
optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/ddt_zap.c   
optional zfs compile-with "${ZFS_C}"
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r287220 - head/etc/rc.d

[Peter Wemm]

Author: peter
Date: Thu Aug 27 20:52:41 2015
New Revision: 287220
URL: https://svnweb.freebsd.org/changeset/base/287220

Log:
  Fix a conversion error in rc.d/jail

Modified:
  head/etc/rc.d/jail

Modified: head/etc/rc.d/jail
==
--- head/etc/rc.d/jail  Thu Aug 27 20:38:45 2015(r287219)
+++ head/etc/rc.d/jail  Thu Aug 27 20:52:41 2015(r287220)
@@ -238,7 +238,7 @@ parse_options()
 
eval : \${jail_${_j}_mount_enable:=${jail_mount_enable:-NO}}
if checkyesno jail_${_j}_mount_enable; then
-   echo   allow.mount;  $_conf
+   echo   allow.mount;
fi
 
extract_var $_j set_hostname_allow allow.set_hostname YN NO
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r286718 - head/sys/conf

[Peter Wemm]

Author: peter
Date: Thu Aug 13 05:42:56 2015
New Revision: 286718
URL: https://svnweb.freebsd.org/changeset/base/286718

Log:
  Add missing cddl/contrib/opensolaris/uts/common/fs/zfs/bqueue.c that
  was left out of r286705.
  
  Forgotten by:  mav

Modified:
  head/sys/conf/files

Modified: head/sys/conf/files
==
--- head/sys/conf/files Thu Aug 13 05:02:04 2015(r286717)
+++ head/sys/conf/files Thu Aug 13 05:42:56 2015(r286718)
@@ -145,6 +145,7 @@ cddl/contrib/opensolaris/uts/common/fs/z
 cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c
optional zfs compile-with ${ZFS_C}
 cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c 
optional zfs compile-with ${ZFS_C}
 cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c
optional zfs compile-with ${ZFS_C}
+cddl/contrib/opensolaris/uts/common/fs/zfs/bqueue.c
optional zfs compile-with ${ZFS_C}
 cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c  
optional zfs compile-with ${ZFS_C}
 cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c   
optional zfs compile-with ${ZFS_C}
 cddl/contrib/opensolaris/uts/common/fs/zfs/ddt_zap.c   
optional zfs compile-with ${ZFS_C}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r286562 - head/usr.bin/svn/lib/libapr_util

[Peter Wemm]

Author: peter
Date: Mon Aug 10 00:53:45 2015
New Revision: 286562
URL: https://svnweb.freebsd.org/changeset/base/286562

Log:
  Add a #ifndef around the HAVE_ICONV settings since it is supplied
  by the Makefile.

Modified:
  head/usr.bin/svn/lib/libapr_util/apu.h

Modified: head/usr.bin/svn/lib/libapr_util/apu.h
==
--- head/usr.bin/svn/lib/libapr_util/apu.h  Mon Aug 10 00:46:24 2015
(r286561)
+++ head/usr.bin/svn/lib/libapr_util/apu.h  Mon Aug 10 00:53:45 2015
(r286562)
@@ -122,7 +122,9 @@
 #define APU_HAVE_NSS   0
 
 #define APU_HAVE_APR_ICONV 0
+#ifndef APU_HAVE_ICONV
 #define APU_HAVE_ICONV 0
+#endif
 #define APR_HAS_XLATE  (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)
 
 #endif /* APU_H */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

Re: svn commit: r286504 - head/usr.bin/svn/lib/libapr_util

[Peter Wemm]

On Sunday, August 09, 2015 05:14:13 PM Gregory Shapiro wrote:
 The change below appears to have broken cross compiling for mips platforms
 (using freebsd-wifi-build on an amd64 host):
 
 /home/gshapiro/tplink/src/usr.bin/svn/lib/libapr_util/../../../../contrib/ap
 r-util/xlate/xlate.c:40:19: error: iconv.h: No such file or directory mkdep:
 compile failed
 --- .depend ---
 *** [.depend] Error code 1
 
 make[6]: stopped in /home/gshapiro/tplink/src/usr.bin/svn/lib/libapr_util
 
 Setting APU_HAVE_ICONV to 0, undef'ing HAVE_ICONV_H, and preventing
 libapr_util/Makefile from turning them back on allowed buildworld to
 complete.
 
 In case it is needed, the host is:
 
 FreeBSD freebsd.local 11.0-CURRENT FreeBSD 11.0-CURRENT #0 r286285: Tue Aug 
 4 15:12:53 UTC 2015
 r...@releng2.nyi.freebsd.org:/usr/obj/usr/src/sys/GENERIC  amd64
 
 The src checkout is:
 
 Path: .
 Working Copy Root Path: /home/gshapiro/tplink/src
 URL: https://svn.freebsd.org/base/head
 Relative URL: ^/head
 Repository Root: https://svn.freebsd.org/base
 Repository UUID: ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
 Revision: 286560
 Node Kind: directory
 Schedule: normal
 Last Changed Author: mav
 Last Changed Rev: 286556
 Last Changed Date: 2015-08-09 13:41:44 -0700 (Sun, 09 Aug 2015)

Huh.  Is this an external tool or something?  I take it that it is forcing 
ICONV off?


 On Sun, Aug 09, 2015 at 05:15:29AM +, Peter Wemm wrote:
  Author: peter
  Date: Sun Aug  9 05:15:28 2015
  New Revision: 286504
  URL: https://svnweb.freebsd.org/changeset/base/286504
  
  Log:
Update apr-util config - I don't believe this part is used by svn, but
if it were, use shm_* instead of sysvshm.
  
  Modified:
head/usr.bin/svn/lib/libapr_util/apu.h
head/usr.bin/svn/lib/libapr_util/apu_config.h
  
  Modified: head/usr.bin/svn/lib/libapr_util/apu.h
  ==
   --- head/usr.bin/svn/lib/libapr_util/apu.h Sun Aug  9 05:14:25
  2015(r286503) +++ head/usr.bin/svn/lib/libapr_util/apu.hSun Aug 
   9
  05:15:28 2015   (r286504) @@ -117,16 +117,12 @@
  
   #define APU_HAVE_FREETDS   0
   #define APU_HAVE_ODBC  0
  
  -#define APU_HAVE_CRYPTO0
  -#define APU_HAVE_OPENSSL   0
  +#define APU_HAVE_CRYPTO1
  +#define APU_HAVE_OPENSSL   1
  
   #define APU_HAVE_NSS   0
  
  -#ifndef APU_HAVE_APR_ICONV
  
   #define APU_HAVE_APR_ICONV 0
  
  -#endif
  -#ifndef APU_HAVE_ICONV
  -#define APU_HAVE_ICONV 0
  -#endif
  +#define APU_HAVE_ICONV 1
  
   #define APR_HAS_XLATE  (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)
   
   #endif /* APU_H */
  
  Modified: head/usr.bin/svn/lib/libapr_util/apu_config.h
  ==
   --- head/usr.bin/svn/lib/libapr_util/apu_config.h  Sun Aug  9 
05:14:25
  2015(r286503) +++ head/usr.bin/svn/lib/libapr_util/apu_config.h 
  Sun Aug 
  9 05:15:28 2015 (r286504) @@ -13,7 +13,7 @@
  
   /* #undef APU_DSO_LIBDIR */
   
   /* Define if the inbuf parm to iconv() is const char ** */
  
  -#define APU_ICONV_INBUF_CONST 1
  +/* #undef APU_ICONV_INBUF_CONST */
  
   /* Define that OpenSSL uses const buffers */
   #define CRYPTO_OPENSSL_CONST_BUFFERS 1
  
  @@ -41,7 +41,7 @@
  
   /* #undef HAVE_FREETDS_SYBDB_H */
   
   /* Define to 1 if you have the iconv.h header file. */
  
  -/* #undef HAVE_ICONV_H */
  +#define HAVE_ICONV_H 1
  
   /* Define to 1 if you have the inttypes.h header file. */
   #define HAVE_INTTYPES_H 1

-- 
Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246

signature.asc
Description: This is a digitally signed message part.

svn commit: r286561 - head/usr.bin/svn/lib/libapr_util

[Peter Wemm]

Author: peter
Date: Mon Aug 10 00:46:24 2015
New Revision: 286561
URL: https://svnweb.freebsd.org/changeset/base/286561

Log:
  Don't assume iconv is enabled.  I didn't realize there was a configuration
  control to turn it off and it wasn't being respected.
  
  Pointed out by:   gshapiro

Modified:
  head/usr.bin/svn/lib/libapr_util/apu.h
  head/usr.bin/svn/lib/libapr_util/apu_config.h

Modified: head/usr.bin/svn/lib/libapr_util/apu.h
==
--- head/usr.bin/svn/lib/libapr_util/apu.h  Sun Aug  9 22:33:51 2015
(r286560)
+++ head/usr.bin/svn/lib/libapr_util/apu.h  Mon Aug 10 00:46:24 2015
(r286561)
@@ -122,7 +122,7 @@
 #define APU_HAVE_NSS   0
 
 #define APU_HAVE_APR_ICONV 0
-#define APU_HAVE_ICONV 1
+#define APU_HAVE_ICONV 0
 #define APR_HAS_XLATE  (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)
 
 #endif /* APU_H */

Modified: head/usr.bin/svn/lib/libapr_util/apu_config.h
==
--- head/usr.bin/svn/lib/libapr_util/apu_config.h   Sun Aug  9 22:33:51 
2015(r286560)
+++ head/usr.bin/svn/lib/libapr_util/apu_config.h   Mon Aug 10 00:46:24 
2015(r286561)
@@ -41,7 +41,7 @@
 /* #undef HAVE_FREETDS_SYBDB_H */
 
 /* Define to 1 if you have the iconv.h header file. */
-#define HAVE_ICONV_H 1
+/* #undef HAVE_ICONV_H */
 
 /* Define to 1 if you have the inttypes.h header file. */
 #define HAVE_INTTYPES_H 1
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r286498 - vendor/apr/apr-1.5.2

[Peter Wemm]

Author: peter
Date: Sun Aug  9 04:33:42 2015
New Revision: 286498
URL: https://svnweb.freebsd.org/changeset/base/286498

Log:
  Tag import of apr-1.5.2

Added:
 - copied from r286497, vendor/apr/dist/
Directory Properties:
  vendor/apr/apr-1.5.2/   (props changed)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r286497 - in vendor/apr/dist: . encoding include locks/unix memory/unix misc/unix network_io/unix poll/unix tables

[Peter Wemm]

Author: peter
Date: Sun Aug  9 04:32:54 2015
New Revision: 286497
URL: https://svnweb.freebsd.org/changeset/base/286497

Log:
  Vendor import apr-1.5.2

Modified:
  vendor/apr/dist/CHANGES
  vendor/apr/dist/CMakeLists.txt
  vendor/apr/dist/Makefile.in
  vendor/apr/dist/NOTICE
  vendor/apr/dist/NWGNUmakefile
  vendor/apr/dist/apr.dsp
  vendor/apr/dist/apr.spec
  vendor/apr/dist/build-outputs.mk
  vendor/apr/dist/configure
  vendor/apr/dist/configure.in
  vendor/apr/dist/encoding/apr_escape.c
  vendor/apr/dist/include/apr_skiplist.h
  vendor/apr/dist/include/apr_version.h
  vendor/apr/dist/libapr.dsp
  vendor/apr/dist/locks/unix/proc_mutex.c
  vendor/apr/dist/memory/unix/apr_pools.c
  vendor/apr/dist/misc/unix/errorcodes.c
  vendor/apr/dist/network_io/unix/sockaddr.c
  vendor/apr/dist/network_io/unix/sockets.c
  vendor/apr/dist/poll/unix/epoll.c
  vendor/apr/dist/poll/unix/kqueue.c
  vendor/apr/dist/poll/unix/poll.c
  vendor/apr/dist/poll/unix/pollcb.c
  vendor/apr/dist/poll/unix/port.c
  vendor/apr/dist/poll/unix/z_asio.c
  vendor/apr/dist/tables/apr_skiplist.c

Modified: vendor/apr/dist/CHANGES
==
--- vendor/apr/dist/CHANGES Sun Aug  9 02:10:20 2015(r286496)
+++ vendor/apr/dist/CHANGES Sun Aug  9 04:32:54 2015(r286497)
@@ -1,4 +1,63 @@
  -*- coding: utf-8 -*-
+Changes for APR 1.5.2
+
+  *) SECURITY: CVE-2015-1829 (cve.mitre.org)
+ APR applications using APR named pipe support on Windows can be 
+ vulnerable to a pipe squatting attack from a local process; the extent
+ of the vulnerability, when present, depends on the application.
+ Initial analysis and report was provided by John Hernandez of Casaba 
+ Security via HP SSRT Security Alert.  [Yann Ylavic]
+
+  *) apr_atomic: Fix errors when building on Visual Studio 2013 while
+ maintaining the ability to build on Visual Studio 6 with Windows
+ Server 2003 R2 SDK. PR 57191. [Gregg Smith]
+
+  *) Switch to generic atomics for early/unpatched Solaris 10 not exporting
+ some atomic functions.  PR 55418.  [Yann Ylavic]
+
+  *) apr_file_mktemp() on HP-UX: Remove limitation of 26 temporary files
+ per process.  PR 57677.  [Jeff Trawick]
+
+  *) apr_escape: Correctly calculate the size of the returned string in
+ apr_escape_path and set the correct return value in case we actually
+ escape the string. [aduryagin gmail.com] PR 57230.
+
+  *) pollcb on Windows: Handle calls with no file/socket descriptors.
+ Follow up to PR 49882. [Jeff Trawick, Yann Ylavic]
+
+  *) apr_poll(cb): fix error paths returned values and leaks.  [Yann Ylavic]
+
+  *) apr_thread_cond_*wait() on BeOS: Fix broken logic.  PR 45800.
+ [Jochen Voss (no e-mail)]
+
+  *) apr_skiplist: Optimize the number of allocations by reusing pooled or
+ malloc()ed nodes for the lifetime of the skiplist.  [Yann Ylavic]
+
+  *) apr_skiplist: Fix possible multiple-free() on the same value in
+ apr_skiplist_remove_all().  [Yann Ylavic]
+
+  *) apr_pollset: On z/OS, threadsafe apr_pollset_poll() may return
+ EDC8102I Operation would block under load.
+ [Pat Odonnell patod us.ibm.com]
+
+  *) On z/OS, apr_sockaddr_info_get() with family == APR_UNSPEC was not 
+ returning IPv4 addresses if any IPv6 addresses were returned. 
+ [Eric Covener]
+
+  *) Windows cmake build: Fix an incompatibility with cmake 2.8.12 and
+ later.  [Jeff Trawick]
+
+  *) apr_global_mutex/apr_proc_mutex: Resolve failures with the 
+ POSIX sem implementation in environments which receive signals.
+ [Jeff Trawick]
+
+  *) apr_skiplist: Fix potential corruption of skiplists leading to 
+ results or crashes. [Takashi Sato takashi tks st, Eric Covener]
+ PR 56654.
+
+  *) Improve platform detection by updating config.guess and config.sub.
+ [Rainer Jung]
+
 Changes for APR 1.5.1
 
   *) apr_os_proc_mutex_get() on Unix:  Avoid segfault for cross-
@@ -37,8 +96,8 @@ Changes for APR 1.5.1
   *) Correct a regression in 1.5.0 which affected out-of-tree
  builds on Unix.  [Rainer Jung]
 
-  *) Improve platform detection for bundled expat by updating
- config.guess and config.sub. [Rainer Jung]
+  *) Improve platform detection by updating config.guess and config.sub.
+ [Rainer Jung]
 
 Changes for APR 1.5.0
 

Modified: vendor/apr/dist/CMakeLists.txt
==
--- vendor/apr/dist/CMakeLists.txt  Sun Aug  9 02:10:20 2015
(r286496)
+++ vendor/apr/dist/CMakeLists.txt  Sun Aug  9 04:32:54 2015
(r286497)
@@ -234,6 +234,7 @@ SET(APR_TEST_SOURCES
   test/testprocmutex.c
   test/testrand.c
   test/testshm.c
+  test/testskiplist.c
   test/testsleep.c
   test/testsock.c
   test/testsockets.c
@@ -252,7 +253,6 @@ SET(APR_TEST_SOURCES
 
 SET(install_targets)
 SET(install_bin_pdb)
-SET(install_lib_pdb)
 
 # libapr-1 

svn commit: r286499 - in vendor/serf/dist: . auth buckets

[Peter Wemm]

Author: peter
Date: Sun Aug  9 04:35:12 2015
New Revision: 286499
URL: https://svnweb.freebsd.org/changeset/base/286499

Log:
  Vendor import serf-1.3.8

Modified:
  vendor/serf/dist/CHANGES
  vendor/serf/dist/auth/auth_spnego_sspi.c
  vendor/serf/dist/buckets/deflate_buckets.c
  vendor/serf/dist/buckets/ssl_buckets.c
  vendor/serf/dist/serf.h

Modified: vendor/serf/dist/CHANGES
==
--- vendor/serf/dist/CHANGESSun Aug  9 04:33:42 2015(r286498)
+++ vendor/serf/dist/CHANGESSun Aug  9 04:35:12 2015(r286499)
@@ -1,10 +1,18 @@
+Serf 1.3.8 [2014-10-20, from /tags/1.3.8, r]
+Fix issue #152: CRC calculation error for gzipped http reponses  4GB.
+Fix issue #153: SSPI CredHandle not freed when APR pool is destroyed.
+Fix issue #154: Disable SSLv2 and SSLv3 as both or broken.
+
+
 Serf 1.3.7 [2014-08-11, from /tags/1.3.7, r2411]
   Handle NUL bytes in fields of an X.509 certificate. (r2393, r2399)
 
+
 Serf 1.3.6 [2014-06-09, from /tags/1.3.6, r2372]
   Revert r2319 from serf 1.3.5: this change was making serf call 
handle_response
 multiple times in case of an error response, leading to unexpected 
behavior.
 
+
 Serf 1.3.5 [2014-04-27, from /tags/1.3.5, r2355]
   Fix issue #125: no reverse lookup during Negotiate authentication for 
proxies.
   Fix a crash caused by incorrect reuse of the ssltunnel CONNECT request 
(r2316)

Modified: vendor/serf/dist/auth/auth_spnego_sspi.c
==
--- vendor/serf/dist/auth/auth_spnego_sspi.cSun Aug  9 04:33:42 2015
(r286498)
+++ vendor/serf/dist/auth/auth_spnego_sspi.cSun Aug  9 04:35:12 2015
(r286499)
@@ -95,8 +95,8 @@ cleanup_ctx(void *data)
 }
 
 if (SecIsValidHandle(ctx-sspi_credentials)) {
-FreeCredentialsHandle(ctx-sspi_context);
-SecInvalidateHandle(ctx-sspi_context);
+FreeCredentialsHandle(ctx-sspi_credentials);
+SecInvalidateHandle(ctx-sspi_credentials);
 }
 
 return APR_SUCCESS;

Modified: vendor/serf/dist/buckets/deflate_buckets.c
==
--- vendor/serf/dist/buckets/deflate_buckets.c  Sun Aug  9 04:33:42 2015
(r286498)
+++ vendor/serf/dist/buckets/deflate_buckets.c  Sun Aug  9 04:35:12 2015
(r286499)
@@ -141,7 +141,6 @@ static apr_status_t serf_deflate_read(se
   const char **data, apr_size_t *len)
 {
 deflate_context_t *ctx = bucket-data;
-unsigned long compCRC, compLen;
 apr_status_t status;
 const char *private_data;
 apr_size_t private_len;
@@ -186,17 +185,25 @@ static apr_status_t serf_deflate_read(se
 ctx-state++;
 break;
 case STATE_VERIFY:
+{
+unsigned long compCRC, compLen, actualLen;
+
 /* Do the checksum computation. */
 compCRC = getLong((unsigned char*)ctx-hdr_buffer);
 if (ctx-crc != compCRC) {
 return SERF_ERROR_DECOMPRESSION_FAILED;
 }
 compLen = getLong((unsigned char*)ctx-hdr_buffer + 4);
-if (ctx-zstream.total_out != compLen) {
+/* The length in the trailer is module 2^32, so do the same for
+   the actual length. */
+actualLen = ctx-zstream.total_out;
+actualLen = 0x;
+if (actualLen != compLen) {
 return SERF_ERROR_DECOMPRESSION_FAILED;
 }
 ctx-state++;
 break;
+}
 case STATE_INIT:
 zRC = inflateInit2(ctx-zstream, ctx-windowSize);
 if (zRC != Z_OK) {
@@ -264,10 +271,14 @@ static apr_status_t serf_deflate_read(se
 ctx-zstream.next_in = (unsigned char*)private_data;
 ctx-zstream.avail_in = private_len;
 }
-zRC = Z_OK;
-while (ctx-zstream.avail_in != 0) {
-/* We're full, clear out our buffer, reset, and return. */
-if (ctx-zstream.avail_out == 0) {
+
+while (1) {
+
+zRC = inflate(ctx-zstream, Z_NO_FLUSH);
+
+/* We're full or zlib requires more space. Either case, clear
+   out our buffer, reset, and return. */
+if (zRC == Z_BUF_ERROR || ctx-zstream.avail_out == 0) {
 serf_bucket_t *tmp;
 ctx-zstream.next_out = ctx-buffer;
 private_len = ctx-bufferSize - ctx-zstream.avail_out;
@@ -283,7 +294,6 @@ static apr_status_t serf_deflate_read(se
 ctx-zstream.avail_out = ctx-bufferSize;
 break;
 }
-zRC = inflate(ctx-zstream, Z_NO_FLUSH);
 
 if (zRC == Z_STREAM_END) {
 serf_bucket_t *tmp;
@@ -330,9 +340,13 @@ static apr_status_t 

svn commit: r286500 - vendor/serf/serf-1.3.8

[Peter Wemm]

Author: peter
Date: Sun Aug  9 04:35:52 2015
New Revision: 286500
URL: https://svnweb.freebsd.org/changeset/base/286500

Log:
  Tag serf 1.3.8 import

Added:
 - copied from r286499, vendor/serf/dist/
Directory Properties:
  vendor/serf/serf-1.3.8/   (props changed)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r286501 - in vendor/subversion/dist: . subversion subversion/include subversion/include/private subversion/libsvn_auth_gnome_keyring subversion/libsvn_client subversion/libsvn_delta sub...

[Peter Wemm]

Author: peter
Date: Sun Aug  9 04:37:39 2015
New Revision: 286501
URL: https://svnweb.freebsd.org/changeset/base/286501

Log:
  Vendor import subversion-1.8.14

Modified:
  vendor/subversion/dist/CHANGES
  vendor/subversion/dist/Makefile.in
  vendor/subversion/dist/NOTICE
  vendor/subversion/dist/autogen.sh
  vendor/subversion/dist/build-outputs.mk
  vendor/subversion/dist/build.conf
  vendor/subversion/dist/configure
  vendor/subversion/dist/configure.ac
  vendor/subversion/dist/get-deps.sh
  vendor/subversion/dist/subversion/include/private/svn_diff_private.h
  vendor/subversion/dist/subversion/include/private/svn_mergeinfo_private.h
  vendor/subversion/dist/subversion/include/private/svn_repos_private.h
  vendor/subversion/dist/subversion/include/private/svn_sqlite.h
  vendor/subversion/dist/subversion/include/svn_io.h
  vendor/subversion/dist/subversion/include/svn_version.h
  vendor/subversion/dist/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
  vendor/subversion/dist/subversion/libsvn_client/copy.c
  vendor/subversion/dist/subversion/libsvn_client/externals.c
  vendor/subversion/dist/subversion/libsvn_client/log.c
  vendor/subversion/dist/subversion/libsvn_client/merge.c
  vendor/subversion/dist/subversion/libsvn_client/patch.c
  vendor/subversion/dist/subversion/libsvn_client/upgrade.c
  vendor/subversion/dist/subversion/libsvn_delta/svndiff.c
  vendor/subversion/dist/subversion/libsvn_diff/parse-diff.c
  vendor/subversion/dist/subversion/libsvn_diff/util.c
  vendor/subversion/dist/subversion/libsvn_fs_fs/caching.c
  vendor/subversion/dist/subversion/libsvn_fs_fs/fs_fs.c
  vendor/subversion/dist/subversion/libsvn_fs_fs/rep-cache-db.h
  vendor/subversion/dist/subversion/libsvn_fs_fs/tree.c
  vendor/subversion/dist/subversion/libsvn_ra_serf/commit.c
  vendor/subversion/dist/subversion/libsvn_ra_serf/options.c
  vendor/subversion/dist/subversion/libsvn_repos/commit.c
  vendor/subversion/dist/subversion/libsvn_repos/load-fs-vtable.c
  vendor/subversion/dist/subversion/libsvn_repos/rev_hunt.c
  vendor/subversion/dist/subversion/libsvn_subr/cache-membuffer.c
  vendor/subversion/dist/subversion/libsvn_subr/config.c
  vendor/subversion/dist/subversion/libsvn_subr/dso.c
  vendor/subversion/dist/subversion/libsvn_subr/error.c
  vendor/subversion/dist/subversion/libsvn_subr/gpg_agent.c
  vendor/subversion/dist/subversion/libsvn_subr/internal_statements.h
  vendor/subversion/dist/subversion/libsvn_subr/io.c
  vendor/subversion/dist/subversion/libsvn_subr/mergeinfo.c
  vendor/subversion/dist/subversion/libsvn_subr/sqlite3wrapper.c
  vendor/subversion/dist/subversion/libsvn_subr/string.c
  vendor/subversion/dist/subversion/libsvn_subr/version.c
  vendor/subversion/dist/subversion/libsvn_wc/adm_ops.c
  vendor/subversion/dist/subversion/libsvn_wc/cleanup.c
  vendor/subversion/dist/subversion/libsvn_wc/conflicts.c
  vendor/subversion/dist/subversion/libsvn_wc/copy.c
  vendor/subversion/dist/subversion/libsvn_wc/diff.h
  vendor/subversion/dist/subversion/libsvn_wc/diff_editor.c
  vendor/subversion/dist/subversion/libsvn_wc/diff_local.c
  vendor/subversion/dist/subversion/libsvn_wc/entries.c
  vendor/subversion/dist/subversion/libsvn_wc/externals.c
  vendor/subversion/dist/subversion/libsvn_wc/update_editor.c
  vendor/subversion/dist/subversion/libsvn_wc/wc-checks.h
  vendor/subversion/dist/subversion/libsvn_wc/wc-metadata.h
  vendor/subversion/dist/subversion/libsvn_wc/wc-metadata.sql
  vendor/subversion/dist/subversion/libsvn_wc/wc-queries.h
  vendor/subversion/dist/subversion/libsvn_wc/wc-queries.sql
  vendor/subversion/dist/subversion/libsvn_wc/wc.h
  vendor/subversion/dist/subversion/libsvn_wc/wc_db.c
  vendor/subversion/dist/subversion/libsvn_wc/wc_db.h
  vendor/subversion/dist/subversion/libsvn_wc/wc_db_private.h
  vendor/subversion/dist/subversion/libsvn_wc/wc_db_wcroot.c
  vendor/subversion/dist/subversion/svn/conflict-callbacks.c
  vendor/subversion/dist/subversion/svn/list-cmd.c
  vendor/subversion/dist/subversion/svn/svn.c
  vendor/subversion/dist/subversion/svn_private_config.h.in
  vendor/subversion/dist/subversion/svnadmin/svnadmin.c
  vendor/subversion/dist/subversion/svndumpfilter/svndumpfilter.c
  vendor/subversion/dist/subversion/svnrdump/load_editor.c
  vendor/subversion/dist/subversion/svnserve/serve.c
  vendor/subversion/dist/subversion/svnsync/sync.c
  vendor/subversion/dist/win-tests.py

Modified: vendor/subversion/dist/CHANGES
==
--- vendor/subversion/dist/CHANGES  Sun Aug  9 04:35:52 2015
(r286500)
+++ vendor/subversion/dist/CHANGES  Sun Aug  9 04:37:39 2015
(r286501)
@@ -1,3 +1,138 @@
+Version 1.8.14
+(5 Aug 2015, from /branches/1.8.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.14
+
+ User-visible changes:
+  - Client-side bugfixes:
+* document svn:autoprops (r1678494 et al.)
+* cp: fix 'svn cp ^/A/D/H@1 ^/A' to properly create A (r1674455, r1674456)
+* resolve: 

svn commit: r286502 - vendor/subversion/subversion-1.8.14

[Peter Wemm]

Author: peter
Date: Sun Aug  9 04:38:21 2015
New Revision: 286502
URL: https://svnweb.freebsd.org/changeset/base/286502

Log:
  Tag vendor import of subversion-1.8.14

Added:
 - copied from r286501, vendor/subversion/dist/
Directory Properties:
  vendor/subversion/subversion-1.8.14/   (props changed)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r286503 - in head: contrib/apr contrib/apr/encoding contrib/apr/include contrib/apr/locks/unix contrib/apr/memory/unix contrib/apr/misc/unix contrib/apr/network_io/unix contrib/apr/poll...

[Peter Wemm]

Author: peter
Date: Sun Aug  9 05:14:25 2015
New Revision: 286503
URL: https://svnweb.freebsd.org/changeset/base/286503

Log:
  Update apr-1.5.1 to 1.5.2

Modified:
  head/contrib/apr/CHANGES
  head/contrib/apr/CMakeLists.txt
  head/contrib/apr/Makefile.in
  head/contrib/apr/NOTICE
  head/contrib/apr/NWGNUmakefile
  head/contrib/apr/apr.dsp
  head/contrib/apr/apr.spec
  head/contrib/apr/build-outputs.mk
  head/contrib/apr/configure
  head/contrib/apr/configure.in
  head/contrib/apr/encoding/apr_escape.c
  head/contrib/apr/include/apr_skiplist.h
  head/contrib/apr/include/apr_version.h
  head/contrib/apr/libapr.dsp
  head/contrib/apr/locks/unix/proc_mutex.c
  head/contrib/apr/memory/unix/apr_pools.c
  head/contrib/apr/misc/unix/errorcodes.c
  head/contrib/apr/network_io/unix/sockaddr.c
  head/contrib/apr/network_io/unix/sockets.c
  head/contrib/apr/poll/unix/epoll.c
  head/contrib/apr/poll/unix/kqueue.c
  head/contrib/apr/poll/unix/poll.c
  head/contrib/apr/poll/unix/pollcb.c
  head/contrib/apr/poll/unix/port.c
  head/contrib/apr/poll/unix/z_asio.c
  head/contrib/apr/tables/apr_skiplist.c
  head/usr.bin/svn/lib/libapr/apr.h
  head/usr.bin/svn/lib/libapr/apr_private.h
Directory Properties:
  head/contrib/apr/   (props changed)

Modified: head/contrib/apr/CHANGES
==
--- head/contrib/apr/CHANGESSun Aug  9 04:38:21 2015(r286502)
+++ head/contrib/apr/CHANGESSun Aug  9 05:14:25 2015(r286503)
@@ -1,4 +1,63 @@
  -*- coding: utf-8 -*-
+Changes for APR 1.5.2
+
+  *) SECURITY: CVE-2015-1829 (cve.mitre.org)
+ APR applications using APR named pipe support on Windows can be 
+ vulnerable to a pipe squatting attack from a local process; the extent
+ of the vulnerability, when present, depends on the application.
+ Initial analysis and report was provided by John Hernandez of Casaba 
+ Security via HP SSRT Security Alert.  [Yann Ylavic]
+
+  *) apr_atomic: Fix errors when building on Visual Studio 2013 while
+ maintaining the ability to build on Visual Studio 6 with Windows
+ Server 2003 R2 SDK. PR 57191. [Gregg Smith]
+
+  *) Switch to generic atomics for early/unpatched Solaris 10 not exporting
+ some atomic functions.  PR 55418.  [Yann Ylavic]
+
+  *) apr_file_mktemp() on HP-UX: Remove limitation of 26 temporary files
+ per process.  PR 57677.  [Jeff Trawick]
+
+  *) apr_escape: Correctly calculate the size of the returned string in
+ apr_escape_path and set the correct return value in case we actually
+ escape the string. [aduryagin gmail.com] PR 57230.
+
+  *) pollcb on Windows: Handle calls with no file/socket descriptors.
+ Follow up to PR 49882. [Jeff Trawick, Yann Ylavic]
+
+  *) apr_poll(cb): fix error paths returned values and leaks.  [Yann Ylavic]
+
+  *) apr_thread_cond_*wait() on BeOS: Fix broken logic.  PR 45800.
+ [Jochen Voss (no e-mail)]
+
+  *) apr_skiplist: Optimize the number of allocations by reusing pooled or
+ malloc()ed nodes for the lifetime of the skiplist.  [Yann Ylavic]
+
+  *) apr_skiplist: Fix possible multiple-free() on the same value in
+ apr_skiplist_remove_all().  [Yann Ylavic]
+
+  *) apr_pollset: On z/OS, threadsafe apr_pollset_poll() may return
+ EDC8102I Operation would block under load.
+ [Pat Odonnell patod us.ibm.com]
+
+  *) On z/OS, apr_sockaddr_info_get() with family == APR_UNSPEC was not 
+ returning IPv4 addresses if any IPv6 addresses were returned. 
+ [Eric Covener]
+
+  *) Windows cmake build: Fix an incompatibility with cmake 2.8.12 and
+ later.  [Jeff Trawick]
+
+  *) apr_global_mutex/apr_proc_mutex: Resolve failures with the 
+ POSIX sem implementation in environments which receive signals.
+ [Jeff Trawick]
+
+  *) apr_skiplist: Fix potential corruption of skiplists leading to 
+ results or crashes. [Takashi Sato takashi tks st, Eric Covener]
+ PR 56654.
+
+  *) Improve platform detection by updating config.guess and config.sub.
+ [Rainer Jung]
+
 Changes for APR 1.5.1
 
   *) apr_os_proc_mutex_get() on Unix:  Avoid segfault for cross-
@@ -37,8 +96,8 @@ Changes for APR 1.5.1
   *) Correct a regression in 1.5.0 which affected out-of-tree
  builds on Unix.  [Rainer Jung]
 
-  *) Improve platform detection for bundled expat by updating
- config.guess and config.sub. [Rainer Jung]
+  *) Improve platform detection by updating config.guess and config.sub.
+ [Rainer Jung]
 
 Changes for APR 1.5.0
 

Modified: head/contrib/apr/CMakeLists.txt
==
--- head/contrib/apr/CMakeLists.txt Sun Aug  9 04:38:21 2015
(r286502)
+++ head/contrib/apr/CMakeLists.txt Sun Aug  9 05:14:25 2015
(r286503)
@@ -234,6 +234,7 @@ SET(APR_TEST_SOURCES
   test/testprocmutex.c
   test/testrand.c
   test/testshm.c
+  test/testskiplist.c
   

svn commit: r286504 - head/usr.bin/svn/lib/libapr_util

[Peter Wemm]

Author: peter
Date: Sun Aug  9 05:15:28 2015
New Revision: 286504
URL: https://svnweb.freebsd.org/changeset/base/286504

Log:
  Update apr-util config - I don't believe this part is used by svn, but
  if it were, use shm_* instead of sysvshm.

Modified:
  head/usr.bin/svn/lib/libapr_util/apu.h
  head/usr.bin/svn/lib/libapr_util/apu_config.h

Modified: head/usr.bin/svn/lib/libapr_util/apu.h
==
--- head/usr.bin/svn/lib/libapr_util/apu.h  Sun Aug  9 05:14:25 2015
(r286503)
+++ head/usr.bin/svn/lib/libapr_util/apu.h  Sun Aug  9 05:15:28 2015
(r286504)
@@ -117,16 +117,12 @@
 #define APU_HAVE_FREETDS   0
 #define APU_HAVE_ODBC  0
 
-#define APU_HAVE_CRYPTO0
-#define APU_HAVE_OPENSSL   0
+#define APU_HAVE_CRYPTO1
+#define APU_HAVE_OPENSSL   1
 #define APU_HAVE_NSS   0
 
-#ifndef APU_HAVE_APR_ICONV
 #define APU_HAVE_APR_ICONV 0
-#endif
-#ifndef APU_HAVE_ICONV
-#define APU_HAVE_ICONV 0
-#endif
+#define APU_HAVE_ICONV 1
 #define APR_HAS_XLATE  (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)
 
 #endif /* APU_H */

Modified: head/usr.bin/svn/lib/libapr_util/apu_config.h
==
--- head/usr.bin/svn/lib/libapr_util/apu_config.h   Sun Aug  9 05:14:25 
2015(r286503)
+++ head/usr.bin/svn/lib/libapr_util/apu_config.h   Sun Aug  9 05:15:28 
2015(r286504)
@@ -13,7 +13,7 @@
 /* #undef APU_DSO_LIBDIR */
 
 /* Define if the inbuf parm to iconv() is const char ** */
-#define APU_ICONV_INBUF_CONST 1
+/* #undef APU_ICONV_INBUF_CONST */
 
 /* Define that OpenSSL uses const buffers */
 #define CRYPTO_OPENSSL_CONST_BUFFERS 1
@@ -41,7 +41,7 @@
 /* #undef HAVE_FREETDS_SYBDB_H */
 
 /* Define to 1 if you have the iconv.h header file. */
-/* #undef HAVE_ICONV_H */
+#define HAVE_ICONV_H 1
 
 /* Define to 1 if you have the inttypes.h header file. */
 #define HAVE_INTTYPES_H 1
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r286505 - in head/contrib/serf: . auth buckets

[Peter Wemm]

Author: peter
Date: Sun Aug  9 05:16:14 2015
New Revision: 286505
URL: https://svnweb.freebsd.org/changeset/base/286505

Log:
  Update serf from 1.3.7 to 1.3.8.  Mostly disables sslv2 and sslv3.

Modified:
  head/contrib/serf/CHANGES
  head/contrib/serf/auth/auth_spnego_sspi.c
  head/contrib/serf/buckets/deflate_buckets.c
  head/contrib/serf/buckets/ssl_buckets.c
  head/contrib/serf/serf.h
Directory Properties:
  head/contrib/serf/   (props changed)

Modified: head/contrib/serf/CHANGES
==
--- head/contrib/serf/CHANGES   Sun Aug  9 05:15:28 2015(r286504)
+++ head/contrib/serf/CHANGES   Sun Aug  9 05:16:14 2015(r286505)
@@ -1,10 +1,18 @@
+Serf 1.3.8 [2014-10-20, from /tags/1.3.8, r]
+Fix issue #152: CRC calculation error for gzipped http reponses  4GB.
+Fix issue #153: SSPI CredHandle not freed when APR pool is destroyed.
+Fix issue #154: Disable SSLv2 and SSLv3 as both or broken.
+
+
 Serf 1.3.7 [2014-08-11, from /tags/1.3.7, r2411]
   Handle NUL bytes in fields of an X.509 certificate. (r2393, r2399)
 
+
 Serf 1.3.6 [2014-06-09, from /tags/1.3.6, r2372]
   Revert r2319 from serf 1.3.5: this change was making serf call 
handle_response
 multiple times in case of an error response, leading to unexpected 
behavior.
 
+
 Serf 1.3.5 [2014-04-27, from /tags/1.3.5, r2355]
   Fix issue #125: no reverse lookup during Negotiate authentication for 
proxies.
   Fix a crash caused by incorrect reuse of the ssltunnel CONNECT request 
(r2316)

Modified: head/contrib/serf/auth/auth_spnego_sspi.c
==
--- head/contrib/serf/auth/auth_spnego_sspi.c   Sun Aug  9 05:15:28 2015
(r286504)
+++ head/contrib/serf/auth/auth_spnego_sspi.c   Sun Aug  9 05:16:14 2015
(r286505)
@@ -95,8 +95,8 @@ cleanup_ctx(void *data)
 }
 
 if (SecIsValidHandle(ctx-sspi_credentials)) {
-FreeCredentialsHandle(ctx-sspi_context);
-SecInvalidateHandle(ctx-sspi_context);
+FreeCredentialsHandle(ctx-sspi_credentials);
+SecInvalidateHandle(ctx-sspi_credentials);
 }
 
 return APR_SUCCESS;

Modified: head/contrib/serf/buckets/deflate_buckets.c
==
--- head/contrib/serf/buckets/deflate_buckets.c Sun Aug  9 05:15:28 2015
(r286504)
+++ head/contrib/serf/buckets/deflate_buckets.c Sun Aug  9 05:16:14 2015
(r286505)
@@ -141,7 +141,6 @@ static apr_status_t serf_deflate_read(se
   const char **data, apr_size_t *len)
 {
 deflate_context_t *ctx = bucket-data;
-unsigned long compCRC, compLen;
 apr_status_t status;
 const char *private_data;
 apr_size_t private_len;
@@ -186,17 +185,25 @@ static apr_status_t serf_deflate_read(se
 ctx-state++;
 break;
 case STATE_VERIFY:
+{
+unsigned long compCRC, compLen, actualLen;
+
 /* Do the checksum computation. */
 compCRC = getLong((unsigned char*)ctx-hdr_buffer);
 if (ctx-crc != compCRC) {
 return SERF_ERROR_DECOMPRESSION_FAILED;
 }
 compLen = getLong((unsigned char*)ctx-hdr_buffer + 4);
-if (ctx-zstream.total_out != compLen) {
+/* The length in the trailer is module 2^32, so do the same for
+   the actual length. */
+actualLen = ctx-zstream.total_out;
+actualLen = 0x;
+if (actualLen != compLen) {
 return SERF_ERROR_DECOMPRESSION_FAILED;
 }
 ctx-state++;
 break;
+}
 case STATE_INIT:
 zRC = inflateInit2(ctx-zstream, ctx-windowSize);
 if (zRC != Z_OK) {
@@ -264,10 +271,14 @@ static apr_status_t serf_deflate_read(se
 ctx-zstream.next_in = (unsigned char*)private_data;
 ctx-zstream.avail_in = private_len;
 }
-zRC = Z_OK;
-while (ctx-zstream.avail_in != 0) {
-/* We're full, clear out our buffer, reset, and return. */
-if (ctx-zstream.avail_out == 0) {
+
+while (1) {
+
+zRC = inflate(ctx-zstream, Z_NO_FLUSH);
+
+/* We're full or zlib requires more space. Either case, clear
+   out our buffer, reset, and return. */
+if (zRC == Z_BUF_ERROR || ctx-zstream.avail_out == 0) {
 serf_bucket_t *tmp;
 ctx-zstream.next_out = ctx-buffer;
 private_len = ctx-bufferSize - ctx-zstream.avail_out;
@@ -283,7 +294,6 @@ static apr_status_t serf_deflate_read(se
 ctx-zstream.avail_out = ctx-bufferSize;
 break;
 }
-zRC = inflate(ctx-zstream, Z_NO_FLUSH);
 
 if (zRC == 

svn commit: r286506 - in head: contrib/subversion contrib/subversion/subversion contrib/subversion/subversion/include contrib/subversion/subversion/include/private contrib/subversion/subversion/lib...

[Peter Wemm]

Author: peter
Date: Sun Aug  9 05:22:53 2015
New Revision: 286506
URL: https://svnweb.freebsd.org/changeset/base/286506

Log:
  Update svnlite from 1.8.10 to 1.8.14.  This is mostly for client-side bug
  fixes and quality of life improvements.
  While there are security issues in this time frame that affect usage as a
  server (eg: linked into apache), this isn't possible here.

Modified:
  head/contrib/subversion/CHANGES
  head/contrib/subversion/Makefile.in
  head/contrib/subversion/NOTICE
  head/contrib/subversion/autogen.sh
  head/contrib/subversion/build-outputs.mk
  head/contrib/subversion/build.conf
  head/contrib/subversion/configure
  head/contrib/subversion/configure.ac
  head/contrib/subversion/get-deps.sh
  head/contrib/subversion/subversion/include/private/svn_diff_private.h
  head/contrib/subversion/subversion/include/private/svn_mergeinfo_private.h
  head/contrib/subversion/subversion/include/private/svn_repos_private.h
  head/contrib/subversion/subversion/include/private/svn_sqlite.h
  head/contrib/subversion/subversion/include/svn_io.h
  head/contrib/subversion/subversion/include/svn_version.h
  head/contrib/subversion/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
  head/contrib/subversion/subversion/libsvn_client/copy.c
  head/contrib/subversion/subversion/libsvn_client/externals.c
  head/contrib/subversion/subversion/libsvn_client/log.c
  head/contrib/subversion/subversion/libsvn_client/merge.c
  head/contrib/subversion/subversion/libsvn_client/patch.c
  head/contrib/subversion/subversion/libsvn_client/upgrade.c
  head/contrib/subversion/subversion/libsvn_delta/svndiff.c
  head/contrib/subversion/subversion/libsvn_diff/parse-diff.c
  head/contrib/subversion/subversion/libsvn_diff/util.c
  head/contrib/subversion/subversion/libsvn_fs_fs/caching.c
  head/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c
  head/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h
  head/contrib/subversion/subversion/libsvn_fs_fs/tree.c
  head/contrib/subversion/subversion/libsvn_ra_serf/commit.c
  head/contrib/subversion/subversion/libsvn_ra_serf/options.c
  head/contrib/subversion/subversion/libsvn_repos/commit.c
  head/contrib/subversion/subversion/libsvn_repos/load-fs-vtable.c
  head/contrib/subversion/subversion/libsvn_repos/rev_hunt.c
  head/contrib/subversion/subversion/libsvn_subr/cache-membuffer.c
  head/contrib/subversion/subversion/libsvn_subr/config.c
  head/contrib/subversion/subversion/libsvn_subr/dso.c
  head/contrib/subversion/subversion/libsvn_subr/error.c
  head/contrib/subversion/subversion/libsvn_subr/gpg_agent.c
  head/contrib/subversion/subversion/libsvn_subr/internal_statements.h
  head/contrib/subversion/subversion/libsvn_subr/io.c
  head/contrib/subversion/subversion/libsvn_subr/mergeinfo.c
  head/contrib/subversion/subversion/libsvn_subr/sqlite3wrapper.c
  head/contrib/subversion/subversion/libsvn_subr/string.c
  head/contrib/subversion/subversion/libsvn_subr/version.c
  head/contrib/subversion/subversion/libsvn_wc/adm_ops.c
  head/contrib/subversion/subversion/libsvn_wc/cleanup.c
  head/contrib/subversion/subversion/libsvn_wc/conflicts.c
  head/contrib/subversion/subversion/libsvn_wc/copy.c
  head/contrib/subversion/subversion/libsvn_wc/diff.h
  head/contrib/subversion/subversion/libsvn_wc/diff_editor.c
  head/contrib/subversion/subversion/libsvn_wc/diff_local.c
  head/contrib/subversion/subversion/libsvn_wc/entries.c
  head/contrib/subversion/subversion/libsvn_wc/externals.c
  head/contrib/subversion/subversion/libsvn_wc/update_editor.c
  head/contrib/subversion/subversion/libsvn_wc/wc-checks.h
  head/contrib/subversion/subversion/libsvn_wc/wc-metadata.h
  head/contrib/subversion/subversion/libsvn_wc/wc-metadata.sql
  head/contrib/subversion/subversion/libsvn_wc/wc-queries.h
  head/contrib/subversion/subversion/libsvn_wc/wc-queries.sql
  head/contrib/subversion/subversion/libsvn_wc/wc.h
  head/contrib/subversion/subversion/libsvn_wc/wc_db.c
  head/contrib/subversion/subversion/libsvn_wc/wc_db.h
  head/contrib/subversion/subversion/libsvn_wc/wc_db_private.h
  head/contrib/subversion/subversion/libsvn_wc/wc_db_wcroot.c
  head/contrib/subversion/subversion/svn/conflict-callbacks.c
  head/contrib/subversion/subversion/svn/list-cmd.c
  head/contrib/subversion/subversion/svn/svn.c
  head/contrib/subversion/subversion/svn_private_config.h.in
  head/contrib/subversion/subversion/svnadmin/svnadmin.c
  head/contrib/subversion/subversion/svndumpfilter/svndumpfilter.c
  head/contrib/subversion/subversion/svnrdump/load_editor.c
  head/contrib/subversion/subversion/svnserve/serve.c
  head/contrib/subversion/subversion/svnsync/sync.c
  head/contrib/subversion/win-tests.py
  head/usr.bin/svn/svn_private_config.h
Directory Properties:
  head/contrib/subversion/   (props changed)

Modified: head/contrib/subversion/CHANGES
==
--- head/contrib/subversion/CHANGES Sun Aug  9 05:16:14 2015
(r286505)
+++ 

svn commit: r286508 - vendor/sqlite3/sqlite-3081101

[Peter Wemm]

Author: peter
Date: Sun Aug  9 05:28:45 2015
New Revision: 286508
URL: https://svnweb.freebsd.org/changeset/base/286508

Log:
  Tag import of sqlite3-3.8.11.1 (3081101)

Added:
 - copied from r286507, vendor/sqlite3/dist/
Directory Properties:
  vendor/sqlite3/sqlite-3081101/   (props changed)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r286507 - vendor/sqlite3/dist

[Peter Wemm]

Author: peter
Date: Sun Aug  9 05:28:08 2015
New Revision: 286507
URL: https://svnweb.freebsd.org/changeset/base/286507

Log:
  Import sqlite3-3.8.11.1 (3081101)

Modified:
  vendor/sqlite3/dist/Makefile.am
  vendor/sqlite3/dist/Makefile.in
  vendor/sqlite3/dist/configure
  vendor/sqlite3/dist/configure.ac
  vendor/sqlite3/dist/shell.c
  vendor/sqlite3/dist/sqlite3.c
  vendor/sqlite3/dist/sqlite3.h
  vendor/sqlite3/dist/sqlite3ext.h

Modified: vendor/sqlite3/dist/Makefile.am
==
--- vendor/sqlite3/dist/Makefile.am Sun Aug  9 05:22:53 2015
(r286506)
+++ vendor/sqlite3/dist/Makefile.am Sun Aug  9 05:28:08 2015
(r286507)
@@ -6,9 +6,9 @@ libsqlite3_la_SOURCES = sqlite3.c
 libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
 
 bin_PROGRAMS = sqlite3
-sqlite3_SOURCES = shell.c sqlite3.h
-sqlite3_LDADD = $(top_builddir)/libsqlite3.la @READLINE_LIBS@
-sqlite3_DEPENDENCIES = $(top_builddir)/libsqlite3.la
+sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h
+sqlite3_LDADD = @READLINE_LIBS@
+sqlite3_CFLAGS = $(AM_CFLAGS)
 
 include_HEADERS = sqlite3.h sqlite3ext.h
 

Modified: vendor/sqlite3/dist/Makefile.in
==
--- vendor/sqlite3/dist/Makefile.in Sun Aug  9 05:22:53 2015
(r286506)
+++ vendor/sqlite3/dist/Makefile.in Sun Aug  9 05:28:08 2015
(r286507)
@@ -107,8 +107,12 @@ libsqlite3_la_LINK = $(LIBTOOL) --tag=CC
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libsqlite3_la_LDFLAGS) $(LDFLAGS) -o $@
 PROGRAMS = $(bin_PROGRAMS)
-am_sqlite3_OBJECTS = shell.$(OBJEXT)
+am_sqlite3_OBJECTS = sqlite3-shell.$(OBJEXT) sqlite3-sqlite3.$(OBJEXT)
 sqlite3_OBJECTS = $(am_sqlite3_OBJECTS)
+sqlite3_DEPENDENCIES =
+sqlite3_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+   --mode=link $(CCLD) $(sqlite3_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+   $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -272,9 +276,9 @@ AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_
 lib_LTLIBRARIES = libsqlite3.la
 libsqlite3_la_SOURCES = sqlite3.c
 libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
-sqlite3_SOURCES = shell.c sqlite3.h
-sqlite3_LDADD = $(top_builddir)/libsqlite3.la @READLINE_LIBS@
-sqlite3_DEPENDENCIES = $(top_builddir)/libsqlite3.la
+sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h
+sqlite3_LDADD = @READLINE_LIBS@
+sqlite3_CFLAGS = $(AM_CFLAGS)
 include_HEADERS = sqlite3.h sqlite3ext.h
 EXTRA_DIST = sqlite3.1 tea
 pkgconfigdir = ${libdir}/pkgconfig
@@ -402,7 +406,7 @@ clean-binPROGRAMS:
rm -f $$list
 sqlite3$(EXEEXT): $(sqlite3_OBJECTS) $(sqlite3_DEPENDENCIES) 
$(EXTRA_sqlite3_DEPENDENCIES) 
@rm -f sqlite3$(EXEEXT)
-   $(LINK) $(sqlite3_OBJECTS) $(sqlite3_LDADD) $(LIBS)
+   $(sqlite3_LINK) $(sqlite3_OBJECTS) $(sqlite3_LDADD) $(LIBS)
 
 mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -410,7 +414,8 @@ mostlyclean-compile:
 distclean-compile:
-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sqlite3-shell.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sqlite3-sqlite3.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sqlite3.Plo@am__quote@
 
 .c.o:
@@ -434,6 +439,34 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@  DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $
 
+sqlite3-shell.o: shell.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(sqlite3_CFLAGS) $(CFLAGS) -MT sqlite3-shell.o -MD 
-MP -MF $(DEPDIR)/sqlite3-shell.Tpo -c -o sqlite3-shell.o `test -f 'shell.c' || 
echo '$(srcdir)/'`shell.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/sqlite3-shell.Tpo 
$(DEPDIR)/sqlite3-shell.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@  source='shell.c' 
object='sqlite3-shell.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@  DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(sqlite3_CFLAGS) $(CFLAGS) -c -o sqlite3-shell.o 
`test -f 'shell.c' || echo '$(srcdir)/'`shell.c
+
+sqlite3-shell.obj: shell.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(sqlite3_CFLAGS) $(CFLAGS) -MT sqlite3-shell.obj 
-MD -MP -MF $(DEPDIR)/sqlite3-shell.Tpo -c -o sqlite3-shell.obj `if test -f 
'shell.c'; then $(CYGPATH_W) 'shell.c'; else $(CYGPATH_W) '$(srcdir)/shell.c'; 
fi`
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/sqlite3-shell.Tpo 
$(DEPDIR)/sqlite3-shell.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@  source='shell.c' 
object='sqlite3-shell.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@  

svn commit: r286509 - head/usr.bin/svn/svnversion

[Peter Wemm]

Author: peter
Date: Sun Aug  9 05:38:31 2015
New Revision: 286509
URL: https://svnweb.freebsd.org/changeset/base/286509

Log:
  Fix typo introduced in r275079

Modified:
  head/usr.bin/svn/svnversion/Makefile

Modified: head/usr.bin/svn/svnversion/Makefile
==
--- head/usr.bin/svn/svnversion/MakefileSun Aug  9 05:28:45 2015
(r286508)
+++ head/usr.bin/svn/svnversion/MakefileSun Aug  9 05:38:31 2015
(r286509)
@@ -27,6 +27,6 @@ LDADD=-L${LIBSVN_WCDIR} -lsvn_wc \
 LIBADD+=   bsdxml sqlite3 z pthread
 
 DPADD= ${LIBSVN_WC} ${LIBSVN_DELTA} ${LIBSVN_DIFF} ${LIBSVN_SUBR} \
-   ${LIBSERF} ${LIBAPR_UTIL}${LIBAPR}
+   ${LIBSERF} ${LIBAPR_UTIL} ${LIBAPR}
 
 .include bsd.prog.mk
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r286510 - head/contrib/sqlite3

[Peter Wemm]

Author: peter
Date: Sun Aug  9 05:44:57 2015
New Revision: 286510
URL: https://svnweb.freebsd.org/changeset/base/286510

Log:
  Update the private sqlite3 from 3.8.9 to 3.8.11.1 (used by svnlite and
  kerberos)

Modified:
  head/contrib/sqlite3/Makefile.am
  head/contrib/sqlite3/Makefile.in
  head/contrib/sqlite3/configure
  head/contrib/sqlite3/configure.ac
  head/contrib/sqlite3/shell.c
  head/contrib/sqlite3/sqlite3.c
  head/contrib/sqlite3/sqlite3.h
  head/contrib/sqlite3/sqlite3ext.h
Directory Properties:
  head/contrib/sqlite3/   (props changed)

Modified: head/contrib/sqlite3/Makefile.am
==
--- head/contrib/sqlite3/Makefile.amSun Aug  9 05:38:31 2015
(r286509)
+++ head/contrib/sqlite3/Makefile.amSun Aug  9 05:44:57 2015
(r286510)
@@ -6,9 +6,9 @@ libsqlite3_la_SOURCES = sqlite3.c
 libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
 
 bin_PROGRAMS = sqlite3
-sqlite3_SOURCES = shell.c sqlite3.h
-sqlite3_LDADD = $(top_builddir)/libsqlite3.la @READLINE_LIBS@
-sqlite3_DEPENDENCIES = $(top_builddir)/libsqlite3.la
+sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h
+sqlite3_LDADD = @READLINE_LIBS@
+sqlite3_CFLAGS = $(AM_CFLAGS)
 
 include_HEADERS = sqlite3.h sqlite3ext.h
 

Modified: head/contrib/sqlite3/Makefile.in
==
--- head/contrib/sqlite3/Makefile.inSun Aug  9 05:38:31 2015
(r286509)
+++ head/contrib/sqlite3/Makefile.inSun Aug  9 05:44:57 2015
(r286510)
@@ -107,8 +107,12 @@ libsqlite3_la_LINK = $(LIBTOOL) --tag=CC
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libsqlite3_la_LDFLAGS) $(LDFLAGS) -o $@
 PROGRAMS = $(bin_PROGRAMS)
-am_sqlite3_OBJECTS = shell.$(OBJEXT)
+am_sqlite3_OBJECTS = sqlite3-shell.$(OBJEXT) sqlite3-sqlite3.$(OBJEXT)
 sqlite3_OBJECTS = $(am_sqlite3_OBJECTS)
+sqlite3_DEPENDENCIES =
+sqlite3_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+   --mode=link $(CCLD) $(sqlite3_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+   $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -272,9 +276,9 @@ AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_
 lib_LTLIBRARIES = libsqlite3.la
 libsqlite3_la_SOURCES = sqlite3.c
 libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
-sqlite3_SOURCES = shell.c sqlite3.h
-sqlite3_LDADD = $(top_builddir)/libsqlite3.la @READLINE_LIBS@
-sqlite3_DEPENDENCIES = $(top_builddir)/libsqlite3.la
+sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h
+sqlite3_LDADD = @READLINE_LIBS@
+sqlite3_CFLAGS = $(AM_CFLAGS)
 include_HEADERS = sqlite3.h sqlite3ext.h
 EXTRA_DIST = sqlite3.1 tea
 pkgconfigdir = ${libdir}/pkgconfig
@@ -402,7 +406,7 @@ clean-binPROGRAMS:
rm -f $$list
 sqlite3$(EXEEXT): $(sqlite3_OBJECTS) $(sqlite3_DEPENDENCIES) 
$(EXTRA_sqlite3_DEPENDENCIES) 
@rm -f sqlite3$(EXEEXT)
-   $(LINK) $(sqlite3_OBJECTS) $(sqlite3_LDADD) $(LIBS)
+   $(sqlite3_LINK) $(sqlite3_OBJECTS) $(sqlite3_LDADD) $(LIBS)
 
 mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -410,7 +414,8 @@ mostlyclean-compile:
 distclean-compile:
-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sqlite3-shell.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sqlite3-sqlite3.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sqlite3.Plo@am__quote@
 
 .c.o:
@@ -434,6 +439,34 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@  DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $
 
+sqlite3-shell.o: shell.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(sqlite3_CFLAGS) $(CFLAGS) -MT sqlite3-shell.o -MD 
-MP -MF $(DEPDIR)/sqlite3-shell.Tpo -c -o sqlite3-shell.o `test -f 'shell.c' || 
echo '$(srcdir)/'`shell.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/sqlite3-shell.Tpo 
$(DEPDIR)/sqlite3-shell.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@  source='shell.c' 
object='sqlite3-shell.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@  DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(sqlite3_CFLAGS) $(CFLAGS) -c -o sqlite3-shell.o 
`test -f 'shell.c' || echo '$(srcdir)/'`shell.c
+
+sqlite3-shell.obj: shell.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(sqlite3_CFLAGS) $(CFLAGS) -MT sqlite3-shell.obj 
-MD -MP -MF $(DEPDIR)/sqlite3-shell.Tpo -c -o sqlite3-shell.obj `if test -f 
'shell.c'; then $(CYGPATH_W) 'shell.c'; else $(CYGPATH_W) '$(srcdir)/shell.c'; 
fi`
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/sqlite3-shell.Tpo 
$(DEPDIR)/sqlite3-shell.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@  

svn commit: r286511 - head/lib/libsqlite3

[Peter Wemm]

Author: peter
Date: Sun Aug  9 05:54:53 2015
New Revision: 286511
URL: https://svnweb.freebsd.org/changeset/base/286511

Log:
  Move the USE_PREAD configuration knob out of the middle of the autoconf
  generated ones.  It is easy to mistake as an option that has gone away
  when it's actually a control that was explicitly turned on for FreeBSD.

Modified:
  head/lib/libsqlite3/Makefile

Modified: head/lib/libsqlite3/Makefile
==
--- head/lib/libsqlite3/MakefileSun Aug  9 05:44:57 2015
(r286510)
+++ head/lib/libsqlite3/MakefileSun Aug  9 05:54:53 2015
(r286511)
@@ -12,10 +12,10 @@ SQLITE= ${.CURDIR}/../../contrib/sqlite3
 
 WARNS= 3
 CFLAGS+=   -I${SQLITE} \
+   -DUSE_PREAD=1 \
-DSTDC_HEADERS=1 \
-DHAVE_SYS_TYPES_H=1 \
-DHAVE_SYS_STAT_H=1 \
-   -DUSE_PREAD=1 \
-DHAVE_STDLIB_H=1 \
-DHAVE_STRING_H=1 \
-DHAVE_MEMORY_H=1 \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r286376 - svnadmin/hooks/scripts

[Peter Wemm]

Author: peter
Date: Thu Aug  6 18:18:07 2015
New Revision: 286376
URL: https://svnweb.freebsd.org/changeset/base/286376

Log:
  Catch cases where a log message is canonified all the way down to nothing
  due to an empty template being sent.

Modified:
  svnadmin/hooks/scripts/log-police.py

Modified: svnadmin/hooks/scripts/log-police.py
==
--- svnadmin/hooks/scripts/log-police.pyThu Aug  6 18:15:56 2015
(r286375)
+++ svnadmin/hooks/scripts/log-police.pyThu Aug  6 18:18:07 2015
(r286376)
@@ -64,8 +64,14 @@ def fix_txn(fs, txn_name):
   log_message = svn.fs.svn_fs_txn_prop(txn, svn:log)
   if log_message is not None:
 new_message = fix_log_message(log_message)
+if new_message.strip() == :
+  sys.stderr.write(Log message required\n)
+  sys.exit(1)
 if new_message != log_message:
   svn.fs.svn_fs_change_txn_prop(txn, svn:log, new_message)
+  else:
+sys.stderr.write(Log message required\n)
+sys.exit(1)
 
 
 def fix_rev(fs, revnum):
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r286377 - svnadmin/hooks/scripts

[Peter Wemm]

Author: peter
Date: Thu Aug  6 18:19:30 2015
New Revision: 286377
URL: https://svnweb.freebsd.org/changeset/base/286377

Log:
  Check for some specific forms of broken commit templates.

Added:
  svnadmin/hooks/scripts/stomp_bad_formatting.pl   (contents, props changed)

Added: svnadmin/hooks/scripts/stomp_bad_formatting.pl
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ svnadmin/hooks/scripts/stomp_bad_formatting.pl  Thu Aug  6 18:19:30 
2015(r286377)
@@ -0,0 +1,54 @@
+#!/usr/bin/perl -w
+#
+# $FreeBSD$
+
+use strict;
+my $debug = 0;
+
+# $ svnlook changed /home/svnmirror/base -r 12348
+# UU  head/sbin/mountd/mountd.c
+# UU  head/usr.sbin/mountd/mountd.c
+# $ svnlook log /home/svnmirror/base -r 12348
+# Avoid bogus free() of a junk pointer.
+#
+# Detected by: phkmalloc
+# Submitted by:   g...@lemis.de (Greg Lehey)
+#
+# Except that when called to vette a commit, it'll be -t txn, not -r rev
+
+
+my $repo = $ARGV[0];
+my $txn = $ARGV[1];
+
+my $log = ;
+
+open(LOG, svnlook log $repo -t $txn |) || die cannot open svnlook log: $!;
+foreach (LOG) {
+   print $$: log: $_ if ($debug);
+   $log .= $_;
+}
+close(LOG);
+
+if (stomp_bad_formatting($log)) {
+   exit 1;
+}
+exit 0;
+
+# 
+# Look for a few specific mangled/broken template cases as a
+# stopgap for checking for a proper template.
+
+sub stomp_bad_formatting {
+   my ($log) = @_;
+   my $rv = 0;
+   if ($log =~ m|\n\nReviewers:[\t ]+|s) {
+   printf STDERR  Non-standard/badly formatted template - 
found 'Reviewers:' instead of 'Reviewed by:'.\n;
+   $rv = 1;
+   }
+   # There is really no need for this spam in log messages.
+   if ($log =~ m|\n\nSubscribers:[\t ]+|s) {
+   printf STDERR  Non-standard/badly formatted template - 
found 'Subscribers:'.\n;
+   $rv = 1;
+   }
+   $rv;
+}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r286379 - svnadmin/hooks

[Peter Wemm]

Author: peter
Date: Thu Aug  6 18:29:26 2015
New Revision: 286379
URL: https://svnweb.freebsd.org/changeset/base/286379

Log:
  Check for some particularly bad manglings of the commit template.

Modified:
  svnadmin/hooks/pre-commit

Modified: svnadmin/hooks/pre-commit
==
--- svnadmin/hooks/pre-commit   Thu Aug  6 18:28:15 2015(r286378)
+++ svnadmin/hooks/pre-commit   Thu Aug  6 18:29:26 2015(r286379)
@@ -93,6 +93,9 @@ detect-mergeinfo-bloat.pl $REPO -t $T
 # check for upper/lowercase filename conflicts on clients
 case-insensitive.py $REPO $TXN || exit 1
 
+# catch some gross violations of commit template mangling.
+stomp_bad_formatting.pl $REPO $TXN || exit 1
+
 # fix log message.  
 log-police.py -t $TXN $REPO || exit 1
 
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org