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-head@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"

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-head@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"

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-head@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"

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-head@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"

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: 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: 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-head@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"

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-head@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"

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

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 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: 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-head@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"

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: r303019 - head/sys/geom

[Peter Wemm]

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?

At the very least, please reconsider having this MFC'ed without getting to the 
bottom of it.
-- 
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-head@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"

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-head@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-head@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"

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-head@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"

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-head@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"

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-head@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"

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: 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-head@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"

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-head@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"

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-head@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

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-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-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-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-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-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-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-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-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: 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-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-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-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org

Re: svn commit: r286223 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Peter Wemm]

On Monday, August 03, 2015 11:31:58 AM Steven Hartland wrote:
 On 03/08/2015 10:47, Slawa Olhovchenkov wrote:
  On Mon, Aug 03, 2015 at 09:34:10AM +, Steven Hartland wrote:
  Author: smh
  Date: Mon Aug  3 09:34:09 2015
  New Revision: 286223
  URL: https://svnweb.freebsd.org/changeset/base/286223
  
  Log:
 Fix KSTACK_PAGES check in ZFS module
 
 The check introduced by r285946 failed to add the dependency on
 opt_kstack_pages.h which meant the default value for the platform
 instead
 of the customised options KSTACK_PAGES=X was being tested.
 
 Also wrap in #ifdef __FreeBSD__ for portability.
  
  /usr/src/sys/kern/kern_proc.c:int kstack_pages = KSTACK_PAGES;
  
  May be check variable kstack_pages is best way?
  Eliminate dependency on foreign opt_.
 
 I did think of that but as other modules such as dtrace, which is also
 cddl code, already have this dependency I went with this.
 
 I'm easy though, if there's a concusses that kstack_pages or possibly
 curthread-td_kstack_pages, which would take into account the
 possibility of varied thread stack sizes, then I can make that change.
 
 What do others think?

The whole thing has missing the point.

Changing the default for the entire kernel just because the zfs compat 
wrappers can't be bothered requesting a suitable value is.. unfortunate.. 
particularly when it is in freebsd-provided code, not upstream zfs code.

Fix the kproc_kthread_add() calls in do_thread_create() and zvol_geom_run() 
instead.  Enforce a lower bound there for zfs threads instead of making the 
entire rest of the kernel use more memory.

eg: I'm thinking along these lines:
Index: cddl/compat/opensolaris/sys/proc.h

--- cddl/compat/opensolaris/sys/proc.h  (revision 286224)
+++ cddl/compat/opensolaris/sys/proc.h  (working copy)
@@ -77,6 +77,8 @@
ASSERT(state == TS_RUN);
ASSERT(pp == p0);
 
+   if (stksize  16384)
+   stksize = 16384;/* Enforce lower bound on ZFS threads */
error = kproc_kthread_add(proc, arg, zfsproc, td, RFSTOPPED,
stksize / PAGE_SIZE, zfskern, solthread %p, proc);
if (error == 0) {


Beware, some platforms have large pages (eg: ia64 in -stable has 8k, 16k or 
32k pages, from memory).  Specifying an arbitrary number of pages in code 
that's supposed to be portable isn't a good idea.

-- 
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: r285139 - in head: lib/libnv sys/conf sys/contrib/libnv sys/kern sys/sys

[Peter Wemm]

On Saturday, July 04, 2015 04:33:38 PM Mariusz Zaborski wrote:
 Author: oshogbo
 Date: Sat Jul  4 16:33:37 2015
 New Revision: 285139
 URL: https://svnweb.freebsd.org/changeset/base/285139
 
 Log:
   Move the nvlist source and private includes from sys/kern to seperate
   directory sys/contrib/libnv.
 
   The goal of this operation is to NOT install header files which shouldn't
   be used outside the nvlist library.

   head/sys/contrib/libnv/nvlist.c
  - copied, changed from r285128, head/sys/kern/subr_nvlist.c

You have broken kernel builds for the freebsd.org cluster.  By renaming 
subr_nvlist.o to nvlist.o you now cause:

make[2]: .../Makefile line 3143: warning: duplicate script for target 
nvpair.o ignored
make[2]: .../Makefile line 1260: warning: using previous script for 
nvpair.o defined here



linking kernel.debug
nvpair.o: In function `illumos_nvlist_add_nvlist':
/usr/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c:1136: multiple 
definition of `illumos_nvlist_add_nvlist'
nvpair.o:/usr/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c:1136: 
first defined here
nvpair.o: In function `illumos_nvlist_add_nvpair':
/usr/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c:1971: multiple 
definition of `illumos_nvlist_add_nvpair'
nvpair.o:/usr/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c:1971: 
first defined here


I'm going to attempt to revert this for the freebsd.org cluster because I need 
it to compile for openssl.

-- 
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: r285336 - in head/sys: netipsec opencrypto

[Peter Wemm]

On Thursday, July 09, 2015 06:16:36 PM George V. Neville-Neil wrote:
 Author: gnn
 Date: Thu Jul  9 18:16:35 2015
 New Revision: 285336
 URL: https://svnweb.freebsd.org/changeset/base/285336
 
 Log:
   Add support for AES modes to IPSec.  These modes work both in software
 only mode and with hardware support on systems that have AESNI
 instructions.
 
   Differential Revision:  D2936
   Reviewed by:jmg, eri, cognet
   Sponsored by:   Rubicon Communications (Netgate)
 
 Modified:
   head/sys/netipsec/xform_ah.c
   head/sys/netipsec/xform_esp.c

 @@ -953,6 +989,11 @@ esp_output_cb(struct cryptop *crp)
   case CRYPTO_SHA2_512_HMAC:
   alen = esph-hashsize/2;
   break;
 + case CRYPTO_AES_128_GMAC:
 + case CRYPTO_AES_192_GMAC:
 + case CRYPTO_AES_256_GMAC:
 + alen = esph-hashsize;
 + break;
   default:
   alen = AH_HMAC_HASHLEN;
   break;

This introduces a LINT compile failure:

/usr/src/sys/netipsec/xform_esp.c:992:9: error: use of undeclared identifier 
'CRYPTO_AES_128_GMAC'
case CRYPTO_AES_128_GMAC:
 ^
/usr/src/sys/netipsec/xform_esp.c:993:9: error: use of undeclared identifier 
'CRYPTO_AES_192_GMAC'
case CRYPTO_AES_192_GMAC:
 ^
/usr/src/sys/netipsec/xform_esp.c:994:9: error: use of undeclared identifier 
'CRYPTO_AES_256_GMAC'
case CRYPTO_AES_256_GMAC:
 ^
3 errors generated.
--- xform_esp.o ---





-- 
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: r284417 - in head: cddl/lib gnu/lib/libgcc gnu/lib/libssp lib/libalias/libalias lib/libalias/modules lib/libbegemot lib/libc lib/libcam lib/libcapsicum lib/libcasper lib/libcrypt lib/l

[Peter Wemm]

On Monday, June 15, 2015 03:34:21 PM Baptiste Daroussin wrote:
 Author: bapt
 Date: Mon Jun 15 15:34:20 2015
 New Revision: 284417
 URL: https://svnweb.freebsd.org/changeset/base/284417
 
 Log:
   Enforce overwritting SHLIBDIR
 
   Since METAMODE has been added, sys.mk loads bsd.mkopt.mk which ends load
 loading bsd.own.mk which then defines SHLIBDIR before all the Makefile.inc
 everywhere.
 
   This makes /lib being populated again.
 
   Reported by:many

I don't understand how this metamode crap could possibly have been tested with 
things of this magnitude turning 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.

Re: svn commit: r284417 - in head: cddl/lib gnu/lib/libgcc gnu/lib/libssp lib/libalias/libalias lib/libalias/modules lib/libbegemot lib/libc lib/libcam lib/libcapsicum lib/libcasper lib/libcrypt lib/l

[Peter Wemm]

On Monday, June 15, 2015 09:27:09 AM Adrian Chadd wrote:
 ... this feels like the wrong solution. A really, really wrong solution.
 
 I was just about to use SHLIBDIR overriding for doing something for
 cross-builds, and now I can't.
 
 
 
 -adrian

FWIW; you can usually use the I really mean it override..
SHLIBDIR := /somewhere

Like Baptiste said, this was just to buy time to prevent people from getting 
trashed as a result of doing an installworld when running zfs.  It's more than 
just ZFS, but that's the most visible failure mode.

The failure is that the zfs libraries and libnvpair get installed into 
/usr/lib, but the /sbin zfs binaries use the ones from /lib.  Depending on the 
age of the now-stale copies in /lib, you get undefined symbols.  And if you get 
rid of them, you now have a boot failure if /usr is its own dataset.  delete-
old-libs doesn't help because it thinks that the /lib version is the correct 
one.
-- 
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: r283301 - head/etc/rc.d

[Peter Wemm]

Author: peter
Date: Fri May 22 21:33:13 2015
New Revision: 283301
URL: https://svnweb.freebsd.org/changeset/base/283301

Log:
  Adjust default argument construction for -c to be getopt compliant for
  consistency, even though unbound understood it.

Modified:
  head/etc/rc.d/local_unbound

Modified: head/etc/rc.d/local_unbound
==
--- head/etc/rc.d/local_unbound Fri May 22 21:10:14 2015(r283300)
+++ head/etc/rc.d/local_unbound Fri May 22 21:33:13 2015(r283301)
@@ -25,7 +25,7 @@ pidfile=/var/run/${name}.pid
 
 : ${local_unbound_workdir:=/var/unbound}
 : ${local_unbound_config:=${local_unbound_workdir}/unbound.conf}
-: ${local_unbound_flags:=-c${local_unbound_config}}
+: ${local_unbound_flags:=-c ${local_unbound_config}}
 : ${local_unbound_forwardconf:=${local_unbound_workdir}/forward.conf}
 : ${local_unbound_controlconf:=${local_unbound_workdir}/control.conf}
 : ${local_unbound_anchor:=${local_unbound_workdir}/root.key}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org

Re: svn commit: r283159 - head

[Peter Wemm]

On Wednesday, May 20, 2015 06:41:54 PM Garrett Cooper wrote:
 Author: ngie
 Date: Wed May 20 18:41:54 2015
 New Revision: 283159
 URL: https://svnweb.freebsd.org/changeset/base/283159
 
 Log:
   Fix breakage I didn't fully solve in r283151 by depending on the .PHONY
   target, not the directory when building libctf for libproc
 
   Reported by: many, Jenkins
   Submitted by: rodrigc
 
 Modified:
   head/Makefile.inc1
 
 Modified: head/Makefile.inc1
 
 == --- head/Makefile.inc1 Wed May 20 17:48:22 2015(r283158)
 +++ head/Makefile.inc1Wed May 20 18:41:54 2015(r283159)
 @@ -1745,7 +1745,7 @@ _generic_libs+= ${_DIR}
  lib/libopie__L lib/libtacplus__L: lib/libmd__L
 
  lib/libproc__L: \
 -${_cddl_lib_libctf} lib/libelf__L lib/librtld_db__L lib/libutil__L
 +${_cddl_lib_libctf:D${_cddl_lib_libctf}__L} lib/libelf__L
 lib/librtld_db__L lib/libutil__L .if ${MK_CXX} != no
  .if ${MK_LIBCPLUSPLUS} != no
  lib/libproc__L: lib/libc++

Even after this, head is still not buildable for me:

=== lib/libproc (obj,depend,all,install)
make[4]: /usr/obj/usr/src/lib/libproc/.depend, 425: ignoring stale .depend for 
/usr/obj/usr/src/tmp/usr/lib/libctf.a
/usr/obj/usr/src/tmp/usr/bin/ld: cannot find -lctf
cc: error: linker command failed with exit code 1 (use -v to see invocation)

svn rev is 283163.  Perhaps a full revert is in order?
-- 
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: r282448 - head/sys/compat/freebsd32

[Peter Wemm]

Author: peter
Date: Tue May  5 05:14:12 2015
New Revision: 282448
URL: https://svnweb.freebsd.org/changeset/base/282448

Log:
  Fix an error in r281551, part of the getfsstat() / kern_getfsstat()
  rework.  The number of entries was supposed to be returned to the user,
  not used as a scratch variable.
  
  This broke RELENG_4 jails starting up on current systems.

Modified:
  head/sys/compat/freebsd32/freebsd32_misc.c

Modified: head/sys/compat/freebsd32/freebsd32_misc.c
==
--- head/sys/compat/freebsd32/freebsd32_misc.c  Tue May  5 04:23:55 2015
(r282447)
+++ head/sys/compat/freebsd32/freebsd32_misc.c  Tue May  5 05:14:12 2015
(r282448)
@@ -248,7 +248,7 @@ freebsd4_freebsd32_getfsstat(struct thre
 {
struct statfs *buf, *sp;
struct statfs32 stat32;
-   size_t count, size;
+   size_t count, size, copycount;
int error;
 
count = uap-bufsize / sizeof(struct statfs32);
@@ -256,12 +256,13 @@ freebsd4_freebsd32_getfsstat(struct thre
error = kern_getfsstat(td, buf, size, count, UIO_SYSSPACE, 
uap-flags);
if (size  0) {
sp = buf;
-   while (count  0  error == 0) {
+   copycount = count;
+   while (copycount  0  error == 0) {
copy_statfs(sp, stat32);
error = copyout(stat32, uap-buf, sizeof(stat32));
sp++;
uap-buf++;
-   count--;
+   copycount--;
}
free(buf, M_TEMP);
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org

Re: svn commit: r281551 - in head/sys: compat/freebsd32 compat/linprocfs kern sys

[Peter Wemm]

On Wednesday, April 15, 2015 09:13:11 AM Edward Tomasz Napierala wrote:
 Author: trasz
 Date: Wed Apr 15 09:13:11 2015
 New Revision: 281551
 URL: https://svnweb.freebsd.org/changeset/base/281551
 
 Log:
   Rewrite linprocfs_domtab() as a wrapper around kern_getfsstat(). This
   adds missing jail and MAC checks.
 
   Differential Revision:  https://reviews.freebsd.org/D2193
   Reviewed by:kib@
   MFC after:  1 month

Please don't MFC this without taking care of of the follow-up bug fix.  
Something like r282448 is needed to keep old binaries (and old jails) working.

-- 
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: r281643 - head/sys/net

[Peter Wemm]

On Friday, April 17, 2015 06:39:16 AM Gleb Smirnoff wrote:
 Author: glebius
 Date: Fri Apr 17 06:39:15 2015
 New Revision: 281643
 URL: https://svnweb.freebsd.org/changeset/base/281643
 
 Log:
   Bring in if_types.h from projects/ifnet, where types are
   defined in enum.
 
 Modified:
   head/sys/net/if_types.h

I'm sorry, but this breaks the freebsd.org cluster.

281642 works
281643 fails
head with 281643 reverted works

IPv6 doesn't work on systems with pf, carp and multiple interfaces.  I have 
nothing more specific than that.

-- 
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: r281643 - head/sys/net

[Peter Wemm]

On Sunday, May 03, 2015 09:52:08 PM Peter Wemm wrote:
 On Sunday, May 03, 2015 09:31:01 PM Peter Wemm wrote:
  On Friday, April 17, 2015 06:39:16 AM Gleb Smirnoff wrote:
   Author: glebius
   Date: Fri Apr 17 06:39:15 2015
   New Revision: 281643
   URL: https://svnweb.freebsd.org/changeset/base/281643
   
   Log:
 Bring in if_types.h from projects/ifnet, where types are
 defined in enum.
   
   Modified:
 head/sys/net/if_types.h
  
  I'm sorry, but this breaks the freebsd.org cluster.
  
  281642 works
  281643 fails
  head with 281643 reverted works
  
  IPv6 doesn't work on systems with pf, carp and multiple interfaces.  I
  have
  nothing more specific than that.
 
 The kernel is smaller with the enums:
   text data   bss   dec hex
 11438123   730686   2998048   15166857   0xe76d89
 11437787   730686   2998048   15166521   0xe76c39
 
 The first is with the #defines, the second is enums.  The enums caused 336
 bytes less code to be generated, so presumably the enums enabled some
 optimization that wasn't expected.

More data; looking at size *.o in the kernel compile obj directory to see what 
changes size with enum vs #define:
@@ -470,10 +470,10 @@
 1158 1240 1282 0x502   imgact_shell.o
11617 160   36118130x2e25   in.o
  343   00  343 0x157   in4_cksum.o
-   22155   00221550x568b   in6.o
+   22187   00221870x56ab   in6.o
 2084   00 2084 0x824   in6_cksum.o
 1155 2000 1355 0x54b   in6_gif.o
-5208  12   16 52360x1474   in6_ifattach.o
+5224  12   16 52520x1484   in6_ifattach.o
21933 8640227970x590d   in6_mcast.o
 6860   00 68600x1acc   in6_pcb.o
 26276960  248 98350x266b   in6_proto.o
@@ -750,8 +750,8 @@
25424 4520258760x6514   mvs.o
0  240   24  0x18   mvs_if.o
 5989 2680 62570x1871   mvs_pci.o
-   17111 388   72175710x44a3   nd6.o
-   15251  92   48153910x3c1f   nd6_nbr.o
+   17287 388   72177470x4553   nd6.o
+   15366  92   48155060x3c92   nd6_nbr.o
16318  66   16164000x4010   nd6_rtr.o
  466 1968  670 0x29e   nehemiah.o
 78442412 2036122920x3004   netisr.o

The size changes are confined to the ipv6 stack.

-- 
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: r281643 - head/sys/net

[Peter Wemm]

On Sunday, May 03, 2015 10:15:13 PM Peter Wemm wrote:
 On Sunday, May 03, 2015 09:52:08 PM Peter Wemm wrote:
  On Sunday, May 03, 2015 09:31:01 PM Peter Wemm wrote:
   On Friday, April 17, 2015 06:39:16 AM Gleb Smirnoff wrote:
Author: glebius
Date: Fri Apr 17 06:39:15 2015
New Revision: 281643
URL: https://svnweb.freebsd.org/changeset/base/281643

Log:
  Bring in if_types.h from projects/ifnet, where types are
  defined in enum.

Modified:
  head/sys/net/if_types.h
   
   I'm sorry, but this breaks the freebsd.org cluster.
   
   281642 works
   281643 fails
   head with 281643 reverted works
   
   IPv6 doesn't work on systems with pf, carp and multiple interfaces.  I
   have
   nothing more specific than that.
  
  The kernel is smaller with the enums:
text data   bss   dec hex
  
  11438123   730686   2998048   15166857   0xe76d89
  11437787   730686   2998048   15166521   0xe76c39
  
  The first is with the #defines, the second is enums.  The enums caused 336
  bytes less code to be generated, so presumably the enums enabled some
  optimization that wasn't expected.
 
 More data; looking at size *.o in the kernel compile obj directory to see
 what changes size with enum vs #define:
 @@ -470,10 +470,10 @@
  1158 1240 1282 0x502   imgact_shell.o
 11617 160   36118130x2e25   in.o
   343   00  343 0x157   in4_cksum.o
 -   22155   00221550x568b   in6.o
 +   22187   00221870x56ab   in6.o
  2084   00 2084 0x824   in6_cksum.o
  1155 2000 1355 0x54b   in6_gif.o
 -5208  12   16 52360x1474   in6_ifattach.o
 +5224  12   16 52520x1484   in6_ifattach.o
 21933 8640227970x590d   in6_mcast.o
  6860   00 68600x1acc   in6_pcb.o
  26276960  248 98350x266b   in6_proto.o
 @@ -750,8 +750,8 @@
 25424 4520258760x6514   mvs.o
 0  240   24  0x18   mvs_if.o
  5989 2680 62570x1871   mvs_pci.o
 -   17111 388   72175710x44a3   nd6.o
 -   15251  92   48153910x3c1f   nd6_nbr.o
 +   17287 388   72177470x4553   nd6.o
 +   15366  92   48155060x3c92   nd6_nbr.o
 16318  66   16164000x4010   nd6_rtr.o
   466 1968  670 0x29e   nehemiah.o
  78442412 2036122920x3004   netisr.o
 
 The size changes are confined to the ipv6 stack.

I've just been pointed to the #ifdef IFT_* fix for this, at about the same time 
I was looking at the C code.  Sigh, fixed already, I believe.


-- 
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: r281643 - head/sys/net

[Peter Wemm]

On Sunday, May 03, 2015 09:31:01 PM Peter Wemm wrote:
 On Friday, April 17, 2015 06:39:16 AM Gleb Smirnoff wrote:
  Author: glebius
  Date: Fri Apr 17 06:39:15 2015
  New Revision: 281643
  URL: https://svnweb.freebsd.org/changeset/base/281643
  
  Log:
Bring in if_types.h from projects/ifnet, where types are
defined in enum.
  
  Modified:
head/sys/net/if_types.h
 
 I'm sorry, but this breaks the freebsd.org cluster.
 
 281642 works
 281643 fails
 head with 281643 reverted works
 
 IPv6 doesn't work on systems with pf, carp and multiple interfaces.  I have
 nothing more specific than that.

The kernel is smaller with the enums:
  text data   bss   dec hex  
11438123   730686   2998048   15166857   0xe76d89  
11437787   730686   2998048   15166521   0xe76c39

The first is with the #defines, the second is enums.  The enums caused 336 
bytes 
less code to be generated, so presumably the enums enabled some optimization 
that wasn't expected.

-- 
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: r281550 - in head: . bin/csh contrib/smbfs/include/netsmb contrib/smbfs/lib/smb include lib/libarchive lib/libc/iconv lib/libc/locale lib/libiconv_modules/BIG5 lib/libiconv_modules/DEC

[Peter Wemm]

On Wednesday, April 15, 2015 11:29:19 AM Adrian Chadd wrote:
 cc1: warnings being treated as errors
 /usr/home/adrian/work/freebsd/embedded/head/src/bin/csh/../../contrib/tcsh/s
 h.func.c: In function 'iconv_catgets':
 /usr/home/adrian/work/freebsd/embedded/head/src/bin/csh/../../contrib/tcsh/s
 h.func.c:2599: warning: passing argument 2 of 'dl_iconv' from incompatible
 pointer type
 
 -adrian
 
 On 15 April 2015 at 02:09, Tijl Coosemans t...@freebsd.org wrote:
  Author: tijl
  Date: Wed Apr 15 09:09:20 2015
  New Revision: 281550
  URL: https://svnweb.freebsd.org/changeset/base/281550
  
  Log:
Remove the const qualifier from iconv(3) to comply with POSIX:
http://pubs.opengroup.org/onlinepubs/9699919799/functions/iconv.html

Adjust all code that calls iconv.

[Massive commit diff quote trimmed]

This is one of those unfortunate things.  A mistake was made during the 
standards process that wasn't caught untill too late.  It was corrected, but 
not until the damage was done.  The short version is that in the posix spec, 
the man page had the wrong type (and made no sense), but the actual code 
definition in the include file spec was correct.

So, a bunch of OS's used the text description as the source of truth.  
Ports/libiconv is one.

Others requested a formal clarification and the posix committee specifically 
said the include file spec (which makes sense) is the correct one and updated 
the man page to match the include file.  Linux glibc uses the correct form.

When I originally pulled the trigger I used the incorrect ports/libiconv form 
because I didn't know any better and regretted it since.

I'm glad the mistake has been fixed.  However, this is a gift that keeps on 
giving.  There will be loose ends like the warning above turning up in odd 
places for some time.  We'll just have to deal with it, a bit of whackamole 
will be required.  :(

-- 
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: r281008 - head/sys/dev/ciss

[Peter Wemm]

Author: peter
Date: Thu Apr  2 23:12:18 2015
New Revision: 281008
URL: https://svnweb.freebsd.org/changeset/base/281008

Log:
  Remove redundant mtx_lock/unlock in ciss_name_device. This is a guaranteed
  insta-panic on device add/remove.  This is only called from the notify
  thread which already holds the lock while calling this function.

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

Modified: head/sys/dev/ciss/ciss.c
==
--- head/sys/dev/ciss/ciss.cThu Apr  2 22:42:23 2015(r281007)
+++ head/sys/dev/ciss/ciss.cThu Apr  2 23:12:18 2015(r281008)
@@ -3438,11 +3438,9 @@ ciss_name_device(struct ciss_softc *sc, 
 target, 0);
 
 if (status == CAM_REQ_CMP) {
-   mtx_lock(sc-ciss_mtx);
xpt_path_lock(path);
periph = cam_periph_find(path, NULL);
xpt_path_unlock(path);
-   mtx_unlock(sc-ciss_mtx);
xpt_free_path(path);
if (periph != NULL) {
sprintf(sc-ciss_logical[bus][target].cl_name, %s%d,
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org

svn commit: r278229 - head/sys/conf

[Peter Wemm]

Author: peter
Date: Thu Feb  5 01:36:53 2015
New Revision: 278229
URL: https://svnweb.freebsd.org/changeset/base/278229

Log:
  Add -fwrapv to CFLAGS for the kernel.  This essentially un-reverts r259045.
  
  The C standard undefines behavior when signed integers overflow. The
  compiler toolchain has become more adept at detecting this and taking
  advantage of faster undefined behavior.  At the current time this has the
  unfortunate effect of the clock stopping after 24 days of uptime.
  
  clang makes no distinction between -fwrapv and -fno-strict-overflow.  gcc
  does treat them differently but -fwrapv is mature in gcc and is the
  behavior are actually expecting.
  
  Obtained from:kib

Modified:
  head/sys/conf/kern.mk

Modified: head/sys/conf/kern.mk
==
--- head/sys/conf/kern.mk   Thu Feb  5 00:12:21 2015(r278228)
+++ head/sys/conf/kern.mk   Thu Feb  5 01:36:53 2015(r278229)
@@ -158,6 +158,14 @@ INLINE_LIMIT?= 8000
 CFLAGS+=   -ffreestanding
 
 #
+# The C standard leaves signed integer overflow behavior undefined.
+# gcc and clang opimizers take advantage of this.  The kernel makes
+# use of signed integer wraparound mechanics so we need the compiler
+# to treat it as a wraparound and not take shortcuts.
+# 
+CFLAGS+=   -fwrapv
+
+#
 # GCC SSP support
 #
 .if ${MK_SSP} != no  \
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org

svn commit: r278230 - head/sys/kern

[Peter Wemm]

Author: peter
Date: Thu Feb  5 01:43:21 2015
New Revision: 278230
URL: https://svnweb.freebsd.org/changeset/base/278230

Log:
  Initialize ticks so that it wraps 10 minutes after boot to increase the
  chances of finding problems related to wraparound sooner.
  
  This comes from P4 change 167856 on 2009/08/26 around when we had problems
  with the TCP stack with ticks after 24 days of uptime.

Modified:
  head/sys/kern/kern_clock.c

Modified: head/sys/kern/kern_clock.c
==
--- head/sys/kern/kern_clock.c  Thu Feb  5 01:36:53 2015(r278229)
+++ head/sys/kern/kern_clock.c  Thu Feb  5 01:43:21 2015(r278230)
@@ -410,6 +410,11 @@ initclocks(dummy)
 #ifdef SW_WATCHDOG
EVENTHANDLER_REGISTER(watchdog_list, watchdog_config, NULL, 0);
 #endif
+   /*
+* Arrange for ticks to wrap 10 minutes after boot to help catch
+* sign problems sooner.
+*/
+   ticks = INT_MAX - (hz * 10 * 60);
 }
 
 /*
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org

Re: svn commit: r272827 - head

[Peter Wemm]

On Thursday, October 09, 2014 03:52:01 PM Baptiste Daroussin wrote:
 Author: bapt
 Date: Thu Oct  9 15:52:01 2014
 New Revision: 272827
 URL: https://svnweb.freebsd.org/changeset/base/272827
 
 Log:
   Add size(1) to the cross build toolchain
 
 Modified:
   head/Makefile.inc1
 
 Modified: head/Makefile.inc1
 
 == --- head/Makefile.inc1 Thu Oct  9 15:35:28 2014(r272826)
 +++ head/Makefile.inc1Thu Oct  9 15:52:01 2014(r272827)
 @@ -315,7 +315,7 @@ X${COMPILER}?=${CROSS_COMPILER_PREFIX}$
  X${COMPILER}?=   ${${COMPILER}}
  .endif
  .endfor
 -XBINUTILS=   AS AR LD NM OBJCOPY OBJDUMP RANLIB STRINGS
 +XBINUTILS=   AS AR LD NM OBJCOPY OBJDUMP RANLIB SIZE STRINGS
  .for BINUTIL in ${XBINUTILS}
  .if defined(CROSS_BINUTILS_PREFIX)
  X${BINUTIL}?=${CROSS_BINUTILS_PREFIX}${${BINUTIL}}
 @@ -327,7 +327,8 @@ WMAKEENV+=CC=${XCC} ${XFLAGS} CXX=${
   CPP=${XCPP} ${XFLAGS} \
   AS=${XAS} AR=${XAR} LD=${XLD} NM=${XNM} \
   OBJDUMP=${XOBJDUMP} OBJCOPY=${XOBJCOPY} \
 - RANLIB=${XRANLIB} STRINGS=${XSTRINGS}
 + RANLIB=${XRANLIB} STRINGS=${XSTRINGS} \
 + SIZE=${XSIZE}
 
  .if ${XCC:M/*}
  XFLAGS=  --sysroot=${WORLDTMP}

This broke 'make buildkernel'.

kern.pre.mk:
SIZE?=  size

kern.post.mk:
SYSTEM_LD_TAIL= @${OBJCOPY} --strip-symbol gcc2_compiled. ${.TARGET} ; \
${SIZE} ${.TARGET} ; chmod 755 ${.TARGET}

This is getting executed as:
objcopy --strip-symbol gcc2_compiled. .kernel ; kernel ; chmod 755 kernel

ie: kernel instead of size kernel.  XSIZE isn't set for the non-cross 
case.

-- 
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: r272076 - in head/contrib/apr-util: . crypto dbd dbm include test

[Peter Wemm]

Author: peter
Date: Wed Sep 24 18:38:51 2014
New Revision: 272076
URL: http://svnweb.freebsd.org/changeset/base/272076

Log:
  Merge apr-util 1.5.3 - 1.5.4.  A minor bug fix update.

Modified:
  head/contrib/apr-util/CHANGES
  head/contrib/apr-util/NOTICE
  head/contrib/apr-util/apr-util.spec
  head/contrib/apr-util/configure
  head/contrib/apr-util/crypto/apr_crypto.c
  head/contrib/apr-util/crypto/apr_passwd.c
  head/contrib/apr-util/dbd/apr_dbd_mysql.c
  head/contrib/apr-util/dbd/apr_dbd_odbc.c
  head/contrib/apr-util/dbm/NWGNUmakefile
  head/contrib/apr-util/include/apu_version.h
  head/contrib/apr-util/test/Makefile.win
Directory Properties:
  head/contrib/apr-util/   (props changed)

Modified: head/contrib/apr-util/CHANGES
==
--- head/contrib/apr-util/CHANGES   Wed Sep 24 18:14:16 2014
(r272075)
+++ head/contrib/apr-util/CHANGES   Wed Sep 24 18:38:51 2014
(r272076)
@@ -1,4 +1,30 @@
  -*- coding: utf-8 -*-
+Changes with APR-util 1.5.4
+
+  *) MySQL driver: Fix incorrect handling of bad parameter in the
+ driver support for apr_dbd_transaction_end().  PR 56330.
+ [Weiqiang Li weiqiang_li hotmail.com]
+
+  *) apr_crypto_get_driver(): Fix invalid storage reference on error path.
+ [Philip Martin philip.martin wandisco.com]
+
+  *) Fix compile failure for Android.  PR 56627.  [Fredrik Fornwall 
+ fredrik fornwall.net, Jeff Trawick]
+
+  *) Fix to let ODBC driver build with MSVC6, which does not have intptr_t
+ [Tom Donovan]
+
+  *) 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]
+
+  *) Fix detection of Berkeley DB 6.0. PR 55277.
+ [Lars Wendler polynomial-c gentoo.org]
+
+  *) Improve platform detection for bundled expat by updating
+ config.guess and config.sub. [Rainer Jung]
+
 Changes with APR-util 1.5.3
 
   *) Cygwin: Use correct file extension when loading APR DSOs.  PR 55587.

Modified: head/contrib/apr-util/NOTICE
==
--- head/contrib/apr-util/NOTICEWed Sep 24 18:14:16 2014
(r272075)
+++ head/contrib/apr-util/NOTICEWed Sep 24 18:38:51 2014
(r272076)
@@ -1,7 +1,7 @@
 Apache Portable Runtime Utility Library
-Copyright (c) 2011 The Apache Software Foundation.
+Copyright (c) 2000-2014 The Apache Software Foundation.
 
-This product includes software developed by
+This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
 Portions of this software were developed at the National Center

Modified: head/contrib/apr-util/apr-util.spec
==
--- head/contrib/apr-util/apr-util.spec Wed Sep 24 18:14:16 2014
(r272075)
+++ head/contrib/apr-util/apr-util.spec Wed Sep 24 18:38:51 2014
(r272076)
@@ -3,7 +3,7 @@
 
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
-Version: 1.5.3
+Version: 1.5.4
 Release: 1
 License: Apache Software License
 Group: System Environment/Libraries

Modified: head/contrib/apr-util/configure
==
--- head/contrib/apr-util/configure Wed Sep 24 18:14:16 2014
(r272075)
+++ head/contrib/apr-util/configure Wed Sep 24 18:38:51 2014
(r272076)
@@ -11608,19 +11608,34 @@ fi
   apu_db_version=0
 
   # Maximum supported version announced in help string.
-  # Although we search for all versions up to 5.9,
+  # Although we search for all versions up to 6.9,
   # we should only include existing versions in our
   # help string.
-  db_max_version=53
-  db_min_version=41
   dbm_list=sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4
+  db_max_version=48
+  db_min_version=41
+  db_version=$db_min_version
+  while [ $db_version -le $db_max_version ]
+  do
+dbm_list=$dbm_list, db$db_version
+db_version=`expr $db_version + 1`
+  done
+  db_max_version=53
+  db_min_version=50
+  db_version=$db_min_version
+  while [ $db_version -le $db_max_version ]
+  do
+dbm_list=$dbm_list, db$db_version
+db_version=`expr $db_version + 1`
+  done
+  db_max_version=60
+  db_min_version=60
   db_version=$db_min_version
   while [ $db_version -le $db_max_version ]
   do
 dbm_list=$dbm_list, db$db_version
 db_version=`expr $db_version + 1`
   done
-  dbm_list=$dbm_list, db60
 
 
 # Check whether --with-dbm was given.
@@ -12093,8 +12108,8 @@ if test ${with_berkeley_db+set} = set;
 
   all_places=$check_places
 
-  # Start version search at version 5.9
-  db_version=59
+  # Start version search at version 6.9
+  db_version=69
   while [ $db_version -ge 40 ]
   do
 db_major=`echo $db_version | sed 

Re: svn commit: r271243 - head/sys/vm

[Peter Wemm]

On Monday, September 08, 2014 12:19:04 AM Alan Cox wrote:

 Log:
   Make two functions static and eliminate an unused #define.

Unfortunately, the code (and compiler) disagrees..

 @@ -1504,7 +1507,7 @@ again:
   *   possibly extended).  When merging, this routine may delete one or
   *   both neighbors.
   */
 -void
 +static void
  vm_map_simplify_entry(vm_map_t map, vm_map_entry_t entry)
  {
   vm_map_entry_t next, prev;


sys/security/mac/mac_process.c:366:4: error: implicit declaration of function 
'vm_map_simplify_entry' is invalid in C99 [-Werror,-Wimplicit-function-
declaration]
vm_map_simplify_entry(map, vme);

The code in question:

static void
mac_proc_vm_revoke_recurse(struct thread *td, struct ucred *cred,
struct vm_map *map)
{
vm_map_entry_t vme;
...
vm_map_simplify_entry(map, vme);
   ^^
}
}
vm_map_unlock(map);
}


-- 
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: r271248 - head/etc/rc.d

[Peter Wemm]

Author: peter
Date: Mon Sep  8 05:14:58 2014
New Revision: 271248
URL: http://svnweb.freebsd.org/changeset/base/271248

Log:
  Temporarily remove the warning added r270781 - it prints the warning
  regardless of whether the usage is correct or not and this generates a
  LOT of noise, even when you have specified a mask.

Modified:
  head/etc/rc.d/jail

Modified: head/etc/rc.d/jail
==
--- head/etc/rc.d/jail  Mon Sep  8 03:16:28 2014(r271247)
+++ head/etc/rc.d/jail  Mon Sep  8 05:14:58 2014(r271248)
@@ -321,8 +321,6 @@ jail_extract_address()
elif [ ${_type} = inet6 ]; then
# In case _mask is not set for IPv6, use /128.
_mask=${_mask:-/128}
-   warn $_type $_addr: an IPv6 address should always be  \
-   specified with a prefix length.  /128 is used.
fi
 }
 
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org

svn commit: r270871 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Peter Wemm]

Author: peter
Date: Sun Aug 31 09:05:02 2014
New Revision: 270871
URL: http://svnweb.freebsd.org/changeset/base/270871

Log:
  Move the restored #ifdef i386 test back inside the #ifdef _KERNEL block
  where it originally was.

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c   Sun Aug 31 
06:46:21 2014(r270870)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c   Sun Aug 31 
09:05:02 2014(r270871)
@@ -2560,9 +2560,7 @@ arc_reclaim_needed(void)
(btop(vmem_size(heap_arena, VMEM_FREE | VMEM_ALLOC))  2))
return (1);
 #endif
-#endif /* sun */
-
-#else
+#else  /* sun */
 #ifdef __i386__
/* i386 has KVA limits that the raw page counts above don't consider */
if (kmem_used()  (kmem_size() * 3) / 4) {
@@ -2571,6 +2569,9 @@ arc_reclaim_needed(void)
return (1);
}
 #endif
+#endif /* sun */
+
+#else
if (spa_get_random(100) == 0)
return (1);
 #endif
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org

Re: svn commit: r270759 - in head/sys: cddl/compat/opensolaris/kern cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/fs/zfs vm

[Peter Wemm]

On Saturday 30 August 2014 02:03:42 Steven Hartland wrote:
 - Original Message -
 From: Peter Wemm pe...@wemm.org
 
  On Friday 29 August 2014 21:42:15 Steven Hartland wrote:

 
  If this function returns non-zerp, ARC is given back:
  
  static int
  arc_reclaim_needed(void)
  {
  
  if (kmem_free_count()  zfs_arc_free_target) {
  
  return (1);
  
  }
  
   /*
   * Cooperate with pagedaemon when it's time for it to scan
   * and reclaim some pages.
   */
  
  if (vm_paging_needed()) {
  
  return (1);
  
  }
  
  ie: if v_free (ignoring v_cache free pages) gets below the threshold,
  stop
  evertyhing and discard ARC pages.
  
  The vm_paging_needed() code is a NO-OP at this point. It can never
  return
  
  true.  Consider:
  vm_cnt.v_free_target = 4 * vm_cnt.v_free_min +
  
  vm_cnt.v_free_reserved;
  vs
  
  vm_pageout_wakeup_thresh = (vm_cnt.v_free_min / 10) * 11;
  
  zfs_arc_free_target defaults to vm_cnt.v_free_target, which is 400% of
  v_free_min, and compares it against the smaller v_free pool.
  
  vm_paging_needed() compares the total free pool (v_free + v_cache)
  against the
  smaller wakeup threshold - 110% of v_free_min.
  
  Comparing a larger value against a smaller target than the previous
  test will
  never succeed unless you manually change the arc_free_target sysctl.
 
 I'm aware of the values involved, and as I said what you're proposing
 was more akin to where I started, but I was informed that it had already
 been tested and didn't work well.

And Karl also said that his tests are on machines that have no v_cache, so 
he's not testing the scenario.

The code, as written, is wrong.  It's as simple as that.

The logic is wrong.

You've introduced dead code.

Your code changes introduce a scenario that CAUSES one of the very problems 
you're using as a justtification for the changes.

Your own testers have admitted that they don't test the scenario that the 
problem exists with.

  Also, what about the magic numbers here:
  u_int zfs_arc_free_target = (1  19); /* default before pagedaemon
  init only */
 
 That is just a total fall back case and should never be triggered unless
 as the comment states the pagedaemon isn't initialised.
 
  That's half a million pages, or 2GB of physical ram on a 4K page size
  system
  How is this going to work on early boot in the machines in the cluster
  with
  less than 2GB of ram?
 
 Its there to ensure that ARC doesn't run wild ARC for the few
 milliseconds
 / seconds before pagedaemon is initalised.
 
 We can change the value no problem, what would you suggest 116 aka
 256MB?

Please stop picking magic numbers out of thin air.  You are working with file 
system and VM - critical parts of the system.  This is NOT the place to be 
screwing around with things you don't understand.  alc@ was trying to be 
polite.

 Thanks for all the feedback, its great to have my understanding of
 how things work in this area confirmed by those who know.

 Hopefully we'll be able to get to the bottom of this with everyones
 help and get a solid fix for these issues that have plaged 10 into
 10.1 :)

I'm very disappointed in the attention to detail and errors in the commit.  
I'm almost at the point where I want to ask for the whole thing to be backed 
out.

-- 
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: r270759 - in head/sys: cddl/compat/opensolaris/kern cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/fs/zfs vm

[Peter Wemm]

 @@
 kmem_free_count(void)
 {
 
-   return (vm_cnt.v_free_count);
+   /* cache is just a flavor of free pages in FreeBSD */
+   return (vm_cnt.v_free_count + vm_cnt.v_cache_count);
 }
 
 u_int


The rest of the system looks at the big picture it would be happy to let the 
free pool run quite a way down so long as there's cache pages available to 
satisfy the free space requirements.  This would lead ZFS to mistakenly 
sacrifice ARC for no reason.  I'm not sure how big a deal this is, but I can't 
imagine many scenarios where I want ARC to be discarded in order to save some 
effectively free pages.

 That said, I can easily believe that your patch works better than the
 existing code, because it is closer in spirit to my interpretation of
 what the Solaris code does.  Specifically, I believe that the Solaris
 code starts trimming the ARC before the Solaris page daemon starts
 writing dirty pages to secondary storage.  Now, you've made FreeBSD do
 the same.  However, you've expressed it in a way that looks broken.
 
 To wrap up, I think that you can easily write this in a way that
 simultaneously behaves like Solaris and doesn't look wrong to a VM expert.
 
  Out of interest would it be possible to update machines in the cluster to
  see how their workload reacts to the change?
  
 Regards
 Steve

I'd like to see the free vs cache thing resolved first but it's going to be 
tricky to get a comparison.

For the first few months of the year, things were really troublesome.  It was 
quite easy to overtax the machines and run them into the ground.

This is not the case now - things are working pretty well under pressure 
(prior to the commit).  Its got to the point that we feel comfortable 
thrashing the machines really hard again.  Getting a comparison when it 
already works well is going to be tricky.

We don't have large memory machines that aren't already tuned for 
vfs.zfs.arc_max caps for tmpfs use.

For context to the wider audience, we do not run -release or -pN in the 
freebsd cluster.  We mostly run -current, and some -stable.   I am well aware 
that there is significant discomfort in 10.0-R with zfs but we already have the 
fixes for that.
-- 
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: r270759 - in head/sys: cddl/compat/opensolaris/kern cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/fs/zfs vm

[Peter Wemm]

On Friday 29 August 2014 21:42:15 Steven Hartland wrote:
 - Original Message -
 From: Peter Wemm pe...@wemm.org
 
  On Friday 29 August 2014 20:51:03 Steven Hartland wrote:
 snip..
 
   Does Karl's explaination as to why this doesn't work above change
   your
   mind?
  
  Actually no, I would expect the code as committed would *cause* the
  undesirable behavior that Karl described.
  
  ie: access a few large files and cause them to reside in cache.  Say
  50GB or so
  on a 200G ram machine.  We now have the state where:
  
  v_cache = 50GB
  v_free = 1MB
  
  The rest of the vm system looks at vm_paging_needed(), which is:  do
  we have
  enough v_cache + v_free?  Since there's 50.001GB free, the answer is
  no.
  It'll let v_free run right down to v_free_min because of the giant
  pool of
  v_cache just sitting there, waiting to be used.
  
  The zfs change, as committed will ignore all the free memory in the
  form of
  v_cache.. and will be freaking out about how low v_free is getting and
  will be
  sacrificing ARC in order to put more memory into the v_free pool.
  
  As long as ARC keeps sacrificing itself this way, the free pages in
  the v_cache
  pool won't get used.  When ARC finally runs out of pages to give up to
  v_free,
  the kernel will start using the free pages from v_cache.  Eventually
  it'll run
  down that v_cache free pool and arc will be in a bare minimum state
  while this
  is happening.
  
  Meanwhile, ZFS ARC will be crippled.  This has consequences - it does
  RCU like
  things from ARC to keep fragmentation under control.  With ARC
  crippled,
  fragmentation will increase because there's less opportunistic
  gathering of
  data from ARC.
  
  Granted, you have to get things freed from active/inactive to the
  cache state,
  but once it's there, depending on the worlkload, it'll mess with ARC.
 
 There's already a vm_paging_needed() check in there below so this will
 already
 be dealt with will it not?

No.

If you read the code that you changed, you won't get that far. The v_free test 
comes before vm_paging_needed(), and if the v_free test triggers then ARC will 
return pages and not look at the rest of the function.

If this function returns non-zerp, ARC is given back:

static int
arc_reclaim_needed(void)
{
if (kmem_free_count()  zfs_arc_free_target) {
return (1);
}
 /*
 * Cooperate with pagedaemon when it's time for it to scan
 * and reclaim some pages.
 */
if (vm_paging_needed()) {
return (1);
}

ie: if v_free (ignoring v_cache free pages) gets below the threshold, stop 
evertyhing and discard ARC pages. 

The vm_paging_needed() code is a NO-OP at this point. It can never return 
true.  Consider:
vm_cnt.v_free_target = 4 * vm_cnt.v_free_min + vm_cnt.v_free_reserved;
vs
vm_pageout_wakeup_thresh = (vm_cnt.v_free_min / 10) * 11;

zfs_arc_free_target defaults to vm_cnt.v_free_target, which is 400% of 
v_free_min, and compares it against the smaller v_free pool.

vm_paging_needed() compares the total free pool (v_free + v_cache) against the 
smaller wakeup threshold - 110% of v_free_min.

Comparing a larger value against a smaller target than the previous test will 
never succeed unless you manually change the arc_free_target sysctl.


Also, what about the magic numbers here:
u_int zfs_arc_free_target = (1  19); /* default before pagedaemon init only 
*/

That's half a million pages, or 2GB of physical ram on a 4K page size system  
How is this going to work on early boot in the machines in the cluster with 
less than 2GB of ram?

-- 
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: r270759 - in head/sys: cddl/compat/opensolaris/kern cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/fs/zfs vm

[Peter Wemm]

On Thursday 28 August 2014 17:30:17 Alan Cox wrote:
 On 08/28/2014 16:15, Matthew D. Fuller wrote:
  On Thu, Aug 28, 2014 at 10:11:39PM +0100 I heard the voice of
  
  Steven Hartland, and lo! it spake thus:
  Its very likely applicable to stable/9 although I've never used 9
  myself, we jumped from 9 direct to 10.
  
  This is actually hitting two different issues from the two bugs:
  
  - 191510 is about ARC isn't greedy enough on huge-memory machines,
  
and from the osreldate that bug was filed on 9.2, so presumably is
applicable.
  
  - 187594 is about ARC is too greedy (probably mostly on not-so-huge
  
machines) and starves/drives the rest of the system into swap.  That
I believe came about as a result of some unrelated change in the
10.x stream that upset the previous balance between ARC and the rest
of the VM, so isn't a problem on 9.x.
 
 10.0 had a bug in the page daemon that was fixed in 10-STABLE about
 three months ago (r265945).  The ARC was not the only thing affected by
 this bug.

I'm concerned about potential unintended consequences of this change.

Before, arc reclaim was driven by vm_paging_needed(), which was:
vm_paging_needed(void)
{
return (vm_cnt.v_free_count + vm_cnt.v_cache_count 
vm_pageout_wakeup_thresh);
}
Now it's ignoring the v_cache_count and looking exclusively at v_free_count.  
cache pages are free pages that just happen to have known contents.  If I 
read this change right, zfs arc will now discard checksummed cache pages to 
make room for non-checksummed pages:

+   if (kmem_free_count()  zfs_arc_free_target) {
+   return (1);
+   }
...
+kmem_free_count(void)
+{
+   return (vm_cnt.v_free_count);
+}

This seems like a pretty substantial behavior change.  I'm concerned that it 
doesn't appear to count all the forms of free pages.

I haven't seen the problems with the over-aggressive ARC since the page daemon 
bug was fixed.  It's been working fine under pretty abusive loads in the 
freebsd 
cluster after that fix.

(I should know better than to fire a reply off before full fact checking, but 
this commit worries me..)

-- 
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: r270510 - head

[Peter Wemm]

On Sunday 24 August 2014 21:21:54 Don Lewis wrote:
 Author: truckman
 Date: Sun Aug 24 21:21:54 2014
 New Revision: 270510
 URL: http://svnweb.freebsd.org/changeset/base/270510
 
 Log:
   Catch up to gcc 3.3 - 3.4 upgrade.
 
   MFC after:  3 days
 
 Modified:
   head/ObsoleteFiles.inc
 
 Modified: head/ObsoleteFiles.inc
 
 == --- head/ObsoleteFiles.inc Sun Aug 24 19:31:26 2014(r270509)
 +++ head/ObsoleteFiles.incSun Aug 24 21:21:54 2014(r270510)
 @@ -3205,6 +3205,202 @@ OLD_FILES+=lib/geom/geom_concat.so.1
  OLD_FILES+=lib/geom/geom_label.so.1
  OLD_FILES+=lib/geom/geom_nop.so.1
  OLD_FILES+=lib/geom/geom_stripe.so.1
 +# 20040728: GCC 3.4.2
 +OLD_DIRS+=usr/include/c++/3.3
 +OLD_FILES+=usr/include/c++/3.3/FlexLexer.h
 +OLD_FILES+=usr/include/c++/3.3/algorithm
 +OLD_FILES+=usr/include/c++/3.3/backward/algo.h

I suspect that there's a story here that needs to be told..

-- 
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: r270062 - in head: sbin/umount usr.bin/showmount

[Peter Wemm]

Author: peter
Date: Sat Aug 16 14:56:11 2014
New Revision: 270062
URL: http://svnweb.freebsd.org/changeset/base/270062

Log:
  Use mount protocol version 3 by default for showmount and umount.
  mount_nfs effectively uses mount protocol v3 by default already.
  v1 mount protocol is being removed along with nfsv2 by a high profile NFS
  appliance vendor and our legacy v1 mount protocol usage causes rpc errors.

Modified:
  head/sbin/umount/umount.c
  head/usr.bin/showmount/showmount.8
  head/usr.bin/showmount/showmount.c

Modified: head/sbin/umount/umount.c
==
--- head/sbin/umount/umount.c   Sat Aug 16 14:30:46 2014(r270061)
+++ head/sbin/umount/umount.c   Sat Aug 16 14:56:11 2014(r270062)
@@ -394,7 +394,7 @@ umountfs(struct statfs *sfs)
 * has been unmounted.
 */
if (ai != NULL  !(fflag  MNT_FORCE)  do_rpc) {
-   clp = clnt_create(hostp, MOUNTPROG, MOUNTVERS, udp);
+   clp = clnt_create(hostp, MOUNTPROG, MOUNTVERS3, udp);
if (clp  == NULL) {
warnx(%s: %s, hostp,
clnt_spcreateerror(MOUNTPROG));

Modified: head/usr.bin/showmount/showmount.8
==
--- head/usr.bin/showmount/showmount.8  Sat Aug 16 14:30:46 2014
(r270061)
+++ head/usr.bin/showmount/showmount.8  Sat Aug 16 14:56:11 2014
(r270062)
@@ -31,7 +31,7 @@
 .\ @(#)showmount.88.3 (Berkeley) 3/29/95
 .\ $FreeBSD$
 .\
-.Dd March 29, 1995
+.Dd August 16, 2014
 .Dt SHOWMOUNT 8
 .Os
 .Sh NAME
@@ -41,6 +41,7 @@
 .Nm
 .Op Fl a | d
 .Op Fl e
+.Op Fl 1
 .Op Fl 3
 .Op Ar host
 .Sh DESCRIPTION
@@ -76,10 +77,10 @@ List directory paths of mount points ins
 Show the
 .Ar host Ns 's
 exports list.
+.It Fl 1
+Use mount protocol Version 1, compatible with legacy servers.
 .It Fl 3
-Use mount protocol Version 3, compatible with
-.Tn NFS
-Version 3.
+Ignored for backwards compatibility.
 .El
 .Sh SEE ALSO
 .Xr mount 8 ,

Modified: head/usr.bin/showmount/showmount.c
==
--- head/usr.bin/showmount/showmount.c  Sat Aug 16 14:30:46 2014
(r270061)
+++ head/usr.bin/showmount/showmount.c  Sat Aug 16 14:56:11 2014
(r270062)
@@ -110,11 +110,11 @@ main(int argc, char **argv)
 {
register struct exportslist *exp;
register struct grouplist *grp;
-   register int rpcs = 0, mntvers = 1;
+   register int rpcs = 0, mntvers = 3;
const char *host;
int ch, estat;
 
-   while ((ch = getopt(argc, argv, ade3)) != -1)
+   while ((ch = getopt(argc, argv, ade13)) != -1)
switch (ch) {
case 'a':
if (type == 0) {
@@ -133,6 +133,9 @@ main(int argc, char **argv)
case 'e':
rpcs |= DOEXPORTS;
break;
+   case '1':
+   mntvers = 1;
+   break;
case '3':
mntvers = 3;
break;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org

svn commit: r269851 - head/contrib/sqlite3

[Peter Wemm]

Author: peter
Date: Tue Aug 12 02:09:00 2014
New Revision: 269851
URL: http://svnweb.freebsd.org/changeset/base/269851

Log:
  Update sqlite-3.7.17 - 3.8.5

Modified:
  head/contrib/sqlite3/INSTALL
  head/contrib/sqlite3/Makefile.in
  head/contrib/sqlite3/aclocal.m4
  head/contrib/sqlite3/config.guess
  head/contrib/sqlite3/config.sub
  head/contrib/sqlite3/configure
  head/contrib/sqlite3/configure.ac
  head/contrib/sqlite3/depcomp
  head/contrib/sqlite3/install-sh
  head/contrib/sqlite3/ltmain.sh
  head/contrib/sqlite3/missing
  head/contrib/sqlite3/shell.c
  head/contrib/sqlite3/sqlite3.1
  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/INSTALL
==
--- head/contrib/sqlite3/INSTALLTue Aug 12 02:04:48 2014
(r269850)
+++ head/contrib/sqlite3/INSTALLTue Aug 12 02:09:00 2014
(r269851)
@@ -1,16 +1,25 @@
 Installation Instructions
 *
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
 
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 Basic Installation
 ==
 
-These are generic installation instructions.
+   Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
 
The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -23,9 +32,9 @@ debugging `configure').
 
It can also use an optional file (typically called `config.cache'
 and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
+the results of its tests to speed up reconfiguring.  Caching is
 disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
 
If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
@@ -35,30 +44,37 @@ some point `config.cache' contains resul
 may remove or edit it.
 
The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
 
-The simplest way to compile this package is:
+   The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system.  If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
+ `./configure' to configure the package for your system.
 
- Running `configure' takes awhile.  While running, it prints some
- messages telling which features it is checking for.
+ Running `configure' might take a while.  While running, it prints
+ some messages telling which features it is checking for.
 
   2. Type `make' to compile the package.
 
   3. Optionally, type `make check' to run any self-tests that come with
- the package.
+ the package, generally using the just-built uninstalled binaries.
 
   4. Type `make install' to install the programs and any data files and
- documentation.
+ documentation.  When installing into a prefix owned by root, it is
+ recommended that the package be configured and built as a regular
+ user, and only the `make install' phase executed with root
+ privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+ this time using the binaries in their final installed location.
+ This target does not install anything.  Running this target as a
+ regular user, 

svn commit: r269550 - head/usr.sbin/cron/cron

[Peter Wemm]

Author: peter
Date: Tue Aug  5 01:32:09 2014
New Revision: 269550
URL: http://svnweb.freebsd.org/changeset/base/269550

Log:
  Check gethostname(2) return code - but even if it succeeds it may not
  null terminate.
  
  Temporarily use From: $user@$hostname rather than From: $user.
  The latter exposes incompatible behavior if using dma(8).  sendmail(8)
  (and other alternatives) canonify either form on submission (even
  if masquerading), but dma will leak a non-compliant address to
  the internet.

Modified:
  head/usr.sbin/cron/cron/do_command.c

Modified: head/usr.sbin/cron/cron/do_command.c
==
--- head/usr.sbin/cron/cron/do_command.cTue Aug  5 01:29:02 2014
(r269549)
+++ head/usr.sbin/cron/cron/do_command.cTue Aug  5 01:32:09 2014
(r269550)
@@ -481,14 +481,17 @@ child_process(e, u)
auto char   mailcmd[MAX_COMMAND];
auto char   hostname[MAXHOSTNAMELEN];
 
-   (void) gethostname(hostname, MAXHOSTNAMELEN);
+   if (gethostname(hostname, MAXHOSTNAMELEN) == -1)
+   hostname[0] = '\0';
+   hostname[sizeof(hostname) - 1] = '\0';
(void) snprintf(mailcmd, sizeof(mailcmd),
   MAILARGS, MAILCMD);
if (!(mail = cron_popen(mailcmd, w, e))) {
warn(%s, MAILCMD);
(void) _exit(ERROR_EXIT);
}
-   fprintf(mail, From: %s (Cron Daemon)\n, 
usernm);
+   fprintf(mail, From: Cron Daemon %s@%s\n,
+   usernm, hostname);
fprintf(mail, To: %s\n, mailto);
fprintf(mail, Subject: Cron %s@%s %s\n,
usernm, first_word(hostname, .),
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org

svn commit: r269489 - head/sys/kern

[Peter Wemm]

Author: peter
Date: Sun Aug  3 22:37:21 2014
New Revision: 269489
URL: http://svnweb.freebsd.org/changeset/base/269489

Log:
  Partial revert of r262867.
  
  r262867 was described as fixing socket buffer checks for SOCK_SEQPACKET,
  but also changed one of the SOCK_DGRAM code paths to use the new
  sbappendaddr_nospacecheck_locked() function.  This lead to SOCK_DGRAM
  bypassing socket buffer limits.

Modified:
  head/sys/kern/uipc_usrreq.c

Modified: head/sys/kern/uipc_usrreq.c
==
--- head/sys/kern/uipc_usrreq.c Sun Aug  3 21:56:53 2014(r269488)
+++ head/sys/kern/uipc_usrreq.c Sun Aug  3 22:37:21 2014(r269489)
@@ -897,7 +897,7 @@ uipc_send(struct socket *so, int flags, 
from = sun_noname;
so2 = unp2-unp_socket;
SOCKBUF_LOCK(so2-so_rcv);
-   if (sbappendaddr_nospacecheck_locked(so2-so_rcv, from, m,
+   if (sbappendaddr_locked(so2-so_rcv, from, m,
control)) {
sorwakeup_locked(so2);
m = NULL;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org

svn commit: r269392 - head/etc/defaults

[Peter Wemm]

Author: peter
Date: Fri Aug  1 19:32:20 2014
New Revision: 269392
URL: http://svnweb.freebsd.org/changeset/base/269392

Log:
  Like with /usr/lib + /usr/lib/compat, add the optional /usr/lib32/compat
  to the ldconfig32 default path.  /usr/lib32 is the 32 bit versions of
  *current* libraries, while old versions should be able to be in
  /usr/lib32/compat, like with /usr/lib/compat.  The separation is meant to
  keep the compile time default search paths cleaner.

Modified:
  head/etc/defaults/rc.conf

Modified: head/etc/defaults/rc.conf
==
--- head/etc/defaults/rc.conf   Fri Aug  1 18:36:40 2014(r269391)
+++ head/etc/defaults/rc.conf   Fri Aug  1 19:32:20 2014(r269392)
@@ -610,7 +610,8 @@ clear_tmp_X=YES   # Clear and recreate 
 ldconfig_insecure=NO # Set to YES to disable ldconfig security checks
 ldconfig_paths=/usr/lib/compat /usr/local/lib /usr/local/lib/compat/pkg
# shared library search paths
-ldconfig32_paths=/usr/lib32 # 32-bit compatibility shared library search 
paths
+ldconfig32_paths=/usr/lib32 /usr/lib32/compat
+   # 32-bit compatibility shared library search paths
 ldconfig_paths_aout=/usr/lib/compat/aout /usr/local/lib/aout
# a.out shared library search paths
 ldconfig_local_dirs=/usr/local/libdata/ldconfig
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org

svn commit: r269155 - head

[Peter Wemm]

Author: peter
Date: Sun Jul 27 17:34:49 2014
New Revision: 269155
URL: http://svnweb.freebsd.org/changeset/base/269155

Log:
  Forced commit - testing commit mail etc pipelines.

Modified:
  head/UPDATING

Modified: head/UPDATING
==
--- head/UPDATING   Sun Jul 27 16:29:57 2014(r269154)
+++ head/UPDATING   Sun Jul 27 17:34:49 2014(r269155)
@@ -1,4 +1,4 @@
-Updating Information for FreeBSD current users
+Updating Information for FreeBSD current users.
 
 This file is maintained and copyrighted by M. Warner Losh i...@freebsd.org.
 See end of file for further details.  For commonly done items, please see the
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org

svn commit: r268960 - in head/contrib/serf: . auth

[Peter Wemm]

Author: peter
Date: Mon Jul 21 22:10:29 2014
New Revision: 268960
URL: http://svnweb.freebsd.org/changeset/base/268960

Log:
  Merge serf-1.3.6
  +  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.

Modified:
  head/contrib/serf/CHANGES
  head/contrib/serf/auth/auth.c
  head/contrib/serf/outgoing.c
  head/contrib/serf/serf.h
Directory Properties:
  head/contrib/serf/   (props changed)

Modified: head/contrib/serf/CHANGES
==
--- head/contrib/serf/CHANGES   Mon Jul 21 22:09:16 2014(r268959)
+++ head/contrib/serf/CHANGES   Mon Jul 21 22:10:29 2014(r268960)
@@ -1,3 +1,7 @@
+Serf 1.3.6 [2014-06-09, from /tags/1.3.6, r]
+  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, r]
   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.c
==
--- head/contrib/serf/auth/auth.c   Mon Jul 21 22:09:16 2014
(r268959)
+++ head/contrib/serf/auth/auth.c   Mon Jul 21 22:10:29 2014
(r268960)
@@ -408,7 +408,6 @@ apr_status_t serf__handle_auth_response(
consider the reponse body as invalid and discard it. */
 status = discard_body(response);
 *consumed_response = 1;
-
 if (!APR_STATUS_IS_EOF(status)) {
 return status;
 }

Modified: head/contrib/serf/outgoing.c
==
--- head/contrib/serf/outgoing.cMon Jul 21 22:09:16 2014
(r268959)
+++ head/contrib/serf/outgoing.cMon Jul 21 22:10:29 2014
(r268960)
@@ -916,22 +916,21 @@ static apr_status_t handle_response(serf
  * themselves by not registering credential callbacks.
  */
 if (request-conn-ctx-cred_cb) {
-status = serf__handle_auth_response(consumed_response,
-request,
-request-resp_bkt,
-request-handler_baton,
-pool);
-
-if (SERF_BUCKET_READ_ERROR(status)) {
-/* Report the request as 'died'/'cancelled' to the application */
-(void)(*request-handler)(request,
-  NULL,
-  request-handler_baton,
-  pool);
-}
-
-if (status)
-return status;
+  status = serf__handle_auth_response(consumed_response,
+  request,
+  request-resp_bkt,
+  request-handler_baton,
+  pool);
+
+  /* If there was an error reading the response (maybe there wasn't
+ enough data available), don't bother passing the response to the
+ application.
+
+ If the authentication was tried, but failed, pass the response
+ to the application, maybe it can do better. */
+  if (status) {
+  return status;
+  }
 }
 
 if (!consumed_response) {

Modified: head/contrib/serf/serf.h
==
--- head/contrib/serf/serf.hMon Jul 21 22:09:16 2014(r268959)
+++ head/contrib/serf/serf.hMon Jul 21 22:10:29 2014(r268960)
@@ -1062,7 +1062,7 @@ void serf_debug__bucket_alloc_check(
 /* Version info */
 #define SERF_MAJOR_VERSION 1
 #define SERF_MINOR_VERSION 3
-#define SERF_PATCH_VERSION 5
+#define SERF_PATCH_VERSION 6
 
 /* Version number string */
 #define SERF_VERSION_STRING APR_STRINGIFY(SERF_MAJOR_VERSION) . \
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org

Re: svn commit: r268827 - head/usr.sbin/ndp

[Peter Wemm]

On Friday 18 July 2014 10:35:33 Benjamin Kaduk wrote:
 On Fri, Jul 18, 2014 at 2:48 AM, Peter Wemm pe...@freebsd.org wrote:
  Author: peter
  Date: Fri Jul 18 06:48:02 2014
  New Revision: 268827
  URL: http://svnweb.freebsd.org/changeset/base/268827
  
  Log:
Fix ndp -d hostname.
 
 MFC?
 
 -Ben

It is not broken in 10.x or earlier, so no.

-- 
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: r268827 - head/usr.sbin/ndp

[Peter Wemm]

Author: peter
Date: Fri Jul 18 06:48:02 2014
New Revision: 268827
URL: http://svnweb.freebsd.org/changeset/base/268827

Log:
  Fix ndp -d hostname.

Modified:
  head/usr.sbin/ndp/ndp.c

Modified: head/usr.sbin/ndp/ndp.c
==
--- head/usr.sbin/ndp/ndp.c Fri Jul 18 02:49:41 2014(r268826)
+++ head/usr.sbin/ndp/ndp.c Fri Jul 18 06:48:02 2014(r268827)
@@ -188,9 +188,9 @@ main(int argc, char **argv)
mode = ch;
arg = NULL;
break;
-   case 'd':
case 'f':
exit(file(optarg) ? 1 : 0);
+   case 'd':
case 'i':
if (mode) {
usage();
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org

svn commit: r268833 - head/sys/dev/bge

[Peter Wemm]

Author: peter
Date: Fri Jul 18 07:41:38 2014
New Revision: 268833
URL: http://svnweb.freebsd.org/changeset/base/268833

Log:
  Fix an apparent conversion error in bge to the new driver api.
  if_multiaddr_array() does the LLADDR work, don't do it twice.
  
  This broke IPv6 in interesting ways in the FreeBSD.org cluster.

Modified:
  head/sys/dev/bge/if_bge.c

Modified: head/sys/dev/bge/if_bge.c
==
--- head/sys/dev/bge/if_bge.c   Fri Jul 18 07:18:37 2014(r268832)
+++ head/sys/dev/bge/if_bge.c   Fri Jul 18 07:41:38 2014(r268833)
@@ -1646,8 +1646,8 @@ bge_setmulti(struct bge_softc *sc)
 
if_multiaddr_array(ifp, mta, mcnt, mc_count);
for(i = 0; i  mcnt; i++) {
-   h = ether_crc32_le(LLADDR((struct sockaddr_dl *)
-   (mta + (i * ETHER_ADDR_LEN))), ETHER_ADDR_LEN)  0x7F;
+   h = ether_crc32_le(mta + (i * ETHER_ADDR_LEN),
+   ETHER_ADDR_LEN)  0x7F;
hashes[(h  0x60)  5] |= 1  (h  0x1F);
}
 
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org

svn commit: r268441 - head/sys/sys

[Peter Wemm]

Author: peter
Date: Wed Jul  9 00:12:05 2014
New Revision: 268441
URL: http://svnweb.freebsd.org/changeset/base/268441

Log:
  Bump __FreeBSD_version after last SA-14:17.kmem so we have something
  to test against in the freebsd.org cluster.

Modified:
  head/sys/sys/param.h

Modified: head/sys/sys/param.h
==
--- head/sys/sys/param.hTue Jul  8 23:11:15 2014(r268440)
+++ head/sys/sys/param.hWed Jul  9 00:12:05 2014(r268441)
@@ -58,7 +58,7 @@
  * in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1100026  /* Master, propagated to newvers */
+#define __FreeBSD_version 1100027  /* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org

svn commit: r266735 - in head/contrib/apr: . docs encoding file_io/unix include include/arch/unix include/private locks/unix network_io/unix passwd poll/unix shmem/unix strings support/unix tables ...

[Peter Wemm]

Author: peter
Date: Tue May 27 07:15:14 2014
New Revision: 266735
URL: http://svnweb.freebsd.org/changeset/base/266735

Log:
  Merge apr-1.4.8 - apr-1.5.1 and update.

Added:
  head/contrib/apr/CMakeLists.txt
 - copied unchanged from r266734, vendor/apr/dist/CMakeLists.txt
  head/contrib/apr/README.cmake
 - copied unchanged from r266734, vendor/apr/dist/README.cmake
  head/contrib/apr/encoding/
 - copied from r266734, vendor/apr/dist/encoding/
  head/contrib/apr/include/apr.hwc
 - copied unchanged from r266734, vendor/apr/dist/include/apr.hwc
  head/contrib/apr/include/apr_escape.h
 - copied unchanged from r266734, vendor/apr/dist/include/apr_escape.h
  head/contrib/apr/include/apr_skiplist.h
 - copied unchanged from r266734, vendor/apr/dist/include/apr_skiplist.h
  head/contrib/apr/include/private/
 - copied from r266734, vendor/apr/dist/include/private/
  head/contrib/apr/poll/unix/z_asio.c
 - copied unchanged from r266734, vendor/apr/dist/poll/unix/z_asio.c
  head/contrib/apr/tables/apr_skiplist.c
 - copied unchanged from r266734, vendor/apr/dist/tables/apr_skiplist.c
  head/contrib/apr/tools/
 - copied from r266734, vendor/apr/dist/tools/
Modified:
  head/contrib/apr/CHANGES
  head/contrib/apr/LICENSE
  head/contrib/apr/Makefile.in
  head/contrib/apr/Makefile.win
  head/contrib/apr/NOTICE
  head/contrib/apr/apr.dep
  head/contrib/apr/apr.dsp
  head/contrib/apr/apr.mak
  head/contrib/apr/apr.spec
  head/contrib/apr/build-outputs.mk
  head/contrib/apr/build.conf
  head/contrib/apr/configure
  head/contrib/apr/configure.in
  head/contrib/apr/docs/canonical_filenames.html
  head/contrib/apr/file_io/unix/filedup.c
  head/contrib/apr/file_io/unix/filestat.c
  head/contrib/apr/file_io/unix/mktemp.c
  head/contrib/apr/file_io/unix/open.c
  head/contrib/apr/file_io/unix/pipe.c
  head/contrib/apr/file_io/unix/readwrite.c
  head/contrib/apr/include/apr.h.in
  head/contrib/apr/include/apr_allocator.h
  head/contrib/apr/include/apr_errno.h
  head/contrib/apr/include/apr_file_info.h
  head/contrib/apr/include/apr_file_io.h
  head/contrib/apr/include/apr_fnmatch.h
  head/contrib/apr/include/apr_hash.h
  head/contrib/apr/include/apr_inherit.h
  head/contrib/apr/include/apr_lib.h
  head/contrib/apr/include/apr_mmap.h
  head/contrib/apr/include/apr_network_io.h
  head/contrib/apr/include/apr_poll.h
  head/contrib/apr/include/apr_pools.h
  head/contrib/apr/include/apr_shm.h
  head/contrib/apr/include/apr_strings.h
  head/contrib/apr/include/apr_tables.h
  head/contrib/apr/include/apr_thread_mutex.h
  head/contrib/apr/include/apr_thread_proc.h
  head/contrib/apr/include/apr_time.h
  head/contrib/apr/include/apr_user.h
  head/contrib/apr/include/apr_version.h
  head/contrib/apr/include/arch/unix/apr_arch_poll_private.h
  head/contrib/apr/include/arch/unix/apr_arch_threadproc.h
  head/contrib/apr/include/arch/unix/apr_private.h.in
  head/contrib/apr/libapr.dep
  head/contrib/apr/libapr.dsp
  head/contrib/apr/libapr.mak
  head/contrib/apr/locks/unix/proc_mutex.c
  head/contrib/apr/network_io/unix/sendrecv.c
  head/contrib/apr/network_io/unix/sockaddr.c
  head/contrib/apr/network_io/unix/socket_util.c
  head/contrib/apr/network_io/unix/sockets.c
  head/contrib/apr/network_io/unix/sockopt.c
  head/contrib/apr/passwd/apr_getpass.c
  head/contrib/apr/poll/unix/pollcb.c
  head/contrib/apr/poll/unix/pollset.c
  head/contrib/apr/shmem/unix/shm.c
  head/contrib/apr/strings/apr_cpystrn.c
  head/contrib/apr/strings/apr_strings.c
  head/contrib/apr/support/unix/waitio.c
  head/contrib/apr/tables/apr_hash.c
  head/contrib/apr/tables/apr_tables.c
Directory Properties:
  head/contrib/apr/   (props changed)

Modified: head/contrib/apr/CHANGES
==
--- head/contrib/apr/CHANGESTue May 27 07:00:57 2014(r266734)
+++ head/contrib/apr/CHANGESTue May 27 07:15:14 2014(r266735)
@@ -1,235 +1,124 @@
  -*- coding: utf-8 -*-
-Changes for APR 1.4.8
+Changes for APR 1.5.1
 
-  *) Fix compiltation with FreeBSD on ARM.  [Olli Hauer ohauer gmx.de]
+  *) apr_os_proc_mutex_get() on Unix:  Avoid segfault for cross-
+ process pthread mutexes.  [Yann Ylavic ylavic.dev gmail.com]
 
-  *) Fix 1.4.7 regression in apr_mcast_hops() and apr_mcast_loopback()
- for AF_INET (IPv4) sockets on most Unix platforms.  [Joe Orton]
+  *) When using shmget-based shared memory, the ID used for ftok is
+ now an APR hash of the filename instead of the constant '1'.
+ We do this to help avoid collisions. PR 53996 [Jim Jagielski]
 
-  *) Fix the return value of apr_threadattr_detach_get() on some
- platforms like OS X and Solaris. [Rainer Jung, dusanv gmail com]
+  *) apr_socket_atreadeof(): Fix breakage on OS X. [Jim Jagielski]
 
-Changes for APR 1.4.7
+  *) Fix POSIX shared memory (shm_open) use for named shared memory.
+ Includes adding '--enable-posix-shm' to force 

svn commit: r266736 - head/usr.bin/svn/lib/libapr

[Peter Wemm]

Author: peter
Date: Tue May 27 07:16:43 2014
New Revision: 266736
URL: http://svnweb.freebsd.org/changeset/base/266736

Log:
  Update backend files and makefiles for apr 1.4.8 - 1.5.1

Modified:
  head/usr.bin/svn/lib/libapr/Makefile
  head/usr.bin/svn/lib/libapr/apr.h
  head/usr.bin/svn/lib/libapr/apr_private.h

Modified: head/usr.bin/svn/lib/libapr/Makefile
==
--- head/usr.bin/svn/lib/libapr/MakefileTue May 27 07:15:14 2014
(r266735)
+++ head/usr.bin/svn/lib/libapr/MakefileTue May 27 07:16:43 2014
(r266736)
@@ -4,7 +4,7 @@
 
 INTERNALLIB=   yes
 LIB=   apr
-SRCS=  apr_cpystrn.c apr_fnmatch.c apr_getpass.c apr_hash.c \
+SRCS=  apr_cpystrn.c apr_fnmatch.c apr_getpass.c apr_hash.c 
apr_skiplist.c \
apr_pools.c apr_random.c apr_snprintf.c apr_strings.c \
apr_strnatcmp.c apr_strtok.c apr_tables.c buffer.c \
builtins.c charset.c common.c copy.c dir.c dso.c env.c \
@@ -18,7 +18,7 @@ SRCS= apr_cpystrn.c apr_fnmatch.c apr_g
shm.c signals.c sockaddr.c socket_util.c sockets.c \
sockopt.c solaris.c start.c tempdir.c thread.c thread_cond.c \
thread_mutex.c thread_rwlock.c threadpriv.c time.c \
-   timestr.c userinfo.c version.c waitio.c
+   timestr.c userinfo.c version.c waitio.c z_asio.c
 
 .PATH: ${APR}/atomic/unix ${APR}/dso/unix ${APR}/file_io/unix \
${APR}/locks/unix ${APR}/memory/unix ${APR}/misc/unix \

Modified: head/usr.bin/svn/lib/libapr/apr.h
==
--- head/usr.bin/svn/lib/libapr/apr.h   Tue May 27 07:15:14 2014
(r266735)
+++ head/usr.bin/svn/lib/libapr/apr.h   Tue May 27 07:16:43 2014
(r266736)
@@ -118,7 +118,7 @@
  * or the extern C namespace 
  */
 
-#if APR_HAVE_WINDOWS_H
+#if APR_HAVE_WINDOWS_H  defined(WIN32)
 /* If windows.h was already included, our preferences don't matter.
  * If not, include a restricted set of windows headers to our tastes.
  */
@@ -466,6 +466,8 @@ typedef  apr_uint32_tapr_uin
  */
 #define APR_THREAD_FUNC   
 
+#if defined(DOXYGEN) || !defined(WIN32)
+
 /**
  * The public APR functions are declared with APR_DECLARE(), so they may
  * use the most appropriate calling convention.  Public APR functions with 
@@ -518,6 +520,20 @@ typedef  apr_uint32_tapr_uin
  */
 #define APR_DECLARE_DATA
 
+#elif defined(APR_DECLARE_STATIC)
+#define APR_DECLARE(type)type __stdcall
+#define APR_DECLARE_NONSTD(type) type __cdecl
+#define APR_DECLARE_DATA
+#elif defined(APR_DECLARE_EXPORT)
+#define APR_DECLARE(type)__declspec(dllexport) type __stdcall
+#define APR_DECLARE_NONSTD(type) __declspec(dllexport) type __cdecl
+#define APR_DECLARE_DATA __declspec(dllexport)
+#else
+#define APR_DECLARE(type)__declspec(dllimport) type __stdcall
+#define APR_DECLARE_NONSTD(type) __declspec(dllimport) type __cdecl
+#define APR_DECLARE_DATA __declspec(dllimport)
+#endif
+
 /* Define APR_SSIZE_T_FMT.  
  * If ssize_t is an integer we define it to be d,
  * if ssize_t is a long int we define it to be ld,

Modified: head/usr.bin/svn/lib/libapr/apr_private.h
==
--- head/usr.bin/svn/lib/libapr/apr_private.h   Tue May 27 07:15:14 2014
(r266735)
+++ head/usr.bin/svn/lib/libapr/apr_private.h   Tue May 27 07:16:43 2014
(r266736)
@@ -86,6 +86,9 @@
 /* Define if accept4 function is supported */
 #define HAVE_ACCEPT4 1
 
+/* Define if async i/o supports message q's */
+/* #undef HAVE_AIO_MSGQ */
+
 /* Define to 1 if you have `alloca', as a function or macro. */
 #define HAVE_ALLOCA 1
 
@@ -142,7 +145,7 @@
 /* #undef HAVE_DL_H */
 
 /* Define if dup3 function is supported */
-/* #undef HAVE_DUP3 */
+#define HAVE_DUP3 1
 
 /* Define if EGD is supported */
 /* #undef HAVE_EGD */
@@ -934,7 +937,7 @@
 
 
 /* switch this on if we have a BeOS version below BONE */
-#if BEOS  !HAVE_BONE_VERSION
+#if defined(BEOS)  !defined(HAVE_BONE_VERSION)
 #define BEOS_R5 1
 #else
 #define BEOS_BONE 1
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org

svn commit: r266728 - in head/contrib/serf: . auth

[Peter Wemm]

Author: peter
Date: Tue May 27 04:52:32 2014
New Revision: 266728
URL: http://svnweb.freebsd.org/changeset/base/266728

Log:
  Update serf 1.3.4 - 1.3.5

Modified:
  head/contrib/serf/CHANGES
  head/contrib/serf/auth/auth.c
  head/contrib/serf/auth/auth_spnego.c
  head/contrib/serf/outgoing.c
  head/contrib/serf/serf.h
  head/contrib/serf/ssltunnel.c
Directory Properties:
  head/contrib/serf/   (props changed)

Modified: head/contrib/serf/CHANGES
==
--- head/contrib/serf/CHANGES   Tue May 27 04:39:23 2014(r266727)
+++ head/contrib/serf/CHANGES   Tue May 27 04:52:32 2014(r266728)
@@ -1,4 +1,11 @@
-Serf 1.3.4 [2014-02-08, from /tags/1.3.4, r]
+Serf 1.3.5 [2014-04-27, from /tags/1.3.5, r]
+  Fix issue #125: no reverse lookup during Negotiate authentication for 
proxies.
+  Fix a crash caused by incorrect reuse of the ssltunnel CONNECT request 
(r2316)
+  Cancel request if response parsing failed + authn callback set (r2319)
+  Update the expired certificates in the test suite.
+
+
+Serf 1.3.4 [2014-02-08, from /tags/1.3.4, r2310]
   Fix issue #119: Endless loop during ssl tunnel setup with Negotiate authn
   Fix issue #123: Can't setup ssl tunnel which sends Connection close header
   Fix a race condition when initializing OpenSSL from multiple threads (r2263)

Modified: head/contrib/serf/auth/auth.c
==
--- head/contrib/serf/auth/auth.c   Tue May 27 04:39:23 2014
(r266727)
+++ head/contrib/serf/auth/auth.c   Tue May 27 04:52:32 2014
(r266728)
@@ -408,6 +408,7 @@ apr_status_t serf__handle_auth_response(
consider the reponse body as invalid and discard it. */
 status = discard_body(response);
 *consumed_response = 1;
+
 if (!APR_STATUS_IS_EOF(status)) {
 return status;
 }

Modified: head/contrib/serf/auth/auth_spnego.c
==
--- head/contrib/serf/auth/auth_spnego.cTue May 27 04:39:23 2014
(r266727)
+++ head/contrib/serf/auth/auth_spnego.cTue May 27 04:52:32 2014
(r266728)
@@ -335,8 +335,7 @@ do_auth(peer_t peer,
  tmp, tmp_len,
  gss_info);
 } else {
-char *proxy_host;
-apr_getnameinfo(proxy_host, conn-ctx-proxy_address, 0);
+char *proxy_host = conn-ctx-proxy_address-hostname;
 status = gss_api_get_credentials(conn,
  token, token_len, proxy_host,
  tmp, tmp_len,

Modified: head/contrib/serf/outgoing.c
==
--- head/contrib/serf/outgoing.cTue May 27 04:39:23 2014
(r266727)
+++ head/contrib/serf/outgoing.cTue May 27 04:52:32 2014
(r266728)
@@ -916,21 +916,22 @@ static apr_status_t handle_response(serf
  * themselves by not registering credential callbacks.
  */
 if (request-conn-ctx-cred_cb) {
-  status = serf__handle_auth_response(consumed_response,
-  request,
-  request-resp_bkt,
-  request-handler_baton,
-  pool);
-
-  /* If there was an error reading the response (maybe there wasn't
- enough data available), don't bother passing the response to the
- application.
-
- If the authentication was tried, but failed, pass the response
- to the application, maybe it can do better. */
-  if (status) {
-  return status;
-  }
+status = serf__handle_auth_response(consumed_response,
+request,
+request-resp_bkt,
+request-handler_baton,
+pool);
+
+if (SERF_BUCKET_READ_ERROR(status)) {
+/* Report the request as 'died'/'cancelled' to the application */
+(void)(*request-handler)(request,
+  NULL,
+  request-handler_baton,
+  pool);
+}
+
+if (status)
+return status;
 }
 
 if (!consumed_response) {

Modified: head/contrib/serf/serf.h
==
--- head/contrib/serf/serf.hTue May 27 04:39:23 2014(r266727)
+++ head/contrib/serf/serf.hTue May 27 04:52:32 2014(r266728)
@@ -1062,7 +1062,7 @@ void serf_debug__bucket_alloc_check(
 /* Version info */
 #define SERF_MAJOR_VERSION 1
 #define 

svn commit: r266731 - in head: contrib/subversion contrib/subversion/subversion/include contrib/subversion/subversion/include/private contrib/subversion/subversion/libsvn_client contrib/subversion/...

[Peter Wemm]

Author: peter
Date: Tue May 27 04:59:53 2014
New Revision: 266731
URL: http://svnweb.freebsd.org/changeset/base/266731

Log:
  Merge svn-1.8.8 - 1.8.9

Modified:
  head/contrib/subversion/CHANGES
  head/contrib/subversion/NOTICE
  head/contrib/subversion/build-outputs.mk
  head/contrib/subversion/configure
  head/contrib/subversion/configure.ac
  head/contrib/subversion/subversion/include/private/svn_cache.h
  head/contrib/subversion/subversion/include/private/svn_dep_compat.h
  head/contrib/subversion/subversion/include/svn_version.h
  head/contrib/subversion/subversion/libsvn_client/commit_util.c
  head/contrib/subversion/subversion/libsvn_client/export.c
  head/contrib/subversion/subversion/libsvn_client/merge.c
  head/contrib/subversion/subversion/libsvn_client/prop_commands.c
  head/contrib/subversion/subversion/libsvn_delta/svndiff.c
  head/contrib/subversion/subversion/libsvn_fs_fs/fs.c
  head/contrib/subversion/subversion/libsvn_fs_fs/fs.h
  head/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h
  head/contrib/subversion/subversion/libsvn_ra_serf/getlocks.c
  head/contrib/subversion/subversion/libsvn_ra_serf/inherited_props.c
  head/contrib/subversion/subversion/libsvn_ra_serf/locks.c
  head/contrib/subversion/subversion/libsvn_ra_serf/log.c
  head/contrib/subversion/subversion/libsvn_ra_serf/update.c
  head/contrib/subversion/subversion/libsvn_ra_svn/protocol
  head/contrib/subversion/subversion/libsvn_repos/dump.c
  head/contrib/subversion/subversion/libsvn_repos/fs-wrap.c
  head/contrib/subversion/subversion/libsvn_subr/cache-memcache.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/prompt.c
  head/contrib/subversion/subversion/libsvn_subr/sysinfo.c
  head/contrib/subversion/subversion/libsvn_subr/version.c
  head/contrib/subversion/subversion/libsvn_wc/status.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_db.c
  head/contrib/subversion/subversion/libsvn_wc/wc_db.h
  head/contrib/subversion/subversion/libsvn_wc/wc_db_wcroot.c
  head/contrib/subversion/subversion/svn/conflict-callbacks.c
  head/contrib/subversion/subversion/svndumpfilter/svndumpfilter.c
  head/contrib/subversion/subversion/svnrdump/util.c
  head/contrib/subversion/subversion/svnserve/serve.c
  head/usr.bin/svn/svn_private_config.h
Directory Properties:
  head/contrib/subversion/   (props changed)

Modified: head/contrib/subversion/CHANGES
==
--- head/contrib/subversion/CHANGES Tue May 27 04:56:06 2014
(r266730)
+++ head/contrib/subversion/CHANGES Tue May 27 04:59:53 2014
(r266731)
@@ -1,3 +1,70 @@
+Version 1.8.9
+(07 May 2014, from /branches/1.8.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.9
+
+ User-visible changes:
+  - Client-side bugfixes:
+* log: use proper peg revision over DAV (r1568872)
+* upgrade: allow upgrading from 1.7 with exclusive locks (r1572102 et al)
+* proplist: resolve inconsitent inherited property results (r1575270 et al)
+* increase minimal timestamp sleep from 1ms to 10ms (r1581305 et al)
+* merge: automatic merge confused by subtree merge (issue #4481)
+* propget: report proper error on invalid revision for url (r1586255)
+* commit: fix an assertion when committing a deleted descendant
+  (r1571747, r1571787, r1571795)
+* merge: resolve segfault when '--force' merges a directory delete
+  (r1577812, r1577813, r1579429)
+* resolve: prevent interactive conflict resolution when nothing has been
+  done to resolve the conflict (r1577294)
+* update: fix locks lost from wc with pre-1.6.17 servers (issue #4412)
+* merge: honor the 'preserved-conflict-file-exts' setting (r1577151)
+* list: fix '--verbose' against older servers (r159)
+* unlock: fix ability to remove locks with timeouts (r1579588)
+* copy: fix 'svn copy URL WC' on relocated working copies
+  (r1580626, r1580650)
+* export: allow file externals to be exported (issue #4427)
+* move: fix working copy db inconsistency in cert scenarios (issue #4437)
+* commit: fix an issue where mixed revision copy with non copy descendants
+  that shadow a not present node couldn't be committed (r1518942 et al)
+* delete: properly remove move_to info when the node in its original
+  location is removed (r1538812 et al)
+* status; fix an issue where output would vary based on if the target
+  was the node itself or its parent (r1544597 et al)
+
+  - 

Re: svn commit: r266423 - in head/sys: conf dev/i40e modules/i40e

[Peter Wemm]

On 5/20/14, 9:08 AM, Jack Vogel wrote:
 If you don't like the name there's this wonderful feature of ifconfig

 ifconfig i40e0 name eth0 (or whatever pleases you...)

 Oh and Bruce, I did run into the string length issue, so with this driver
 the queues
 are all named 'q%d', I might go back and change the earlier drivers.

 I found the 'too long' strings caused some really weird behavior with
 vmstat once
 you had 32 queues, btw.

 Jack



 On Tue, May 20, 2014 at 8:49 AM, Bruce Evans b...@optusnet.com.au
 mailto:b...@optusnet.com.au wrote:

 On Tue, 20 May 2014, Julian Elischer wrote:

 On 5/20/14, 11:14 PM, Julian Elischer wrote:

 On 5/20/14, 1:50 AM, Rui Paulo wrote:

 On 18 May 2014, at 18:41, Julian Elischer
 jul...@freebsd.org mailto:jul...@freebsd.org wrote:

 On 5/19/14, 9:21 AM, Jack F Vogel wrote:

 Author: jfv
 Date: Mon May 19 01:21:02 2014
 New Revision: 266423
 URL: http://svnweb.freebsd.org/changeset/base/266423

 Log:
This is the beta release of the driver for the new
Intel 40G Ethernet Controller XL710 Family.
 This is
the core driver, a VF driver called i40evf,
 will be
following soon. Questions or comments to myself or
my co-developer Eric Joyner. Cheers!

 love the name..

 Aesthetics aside, I think the name should be changed.
  Network drivers always used [a-z] for name and [0-9] for
 unit.  Can you find an example where this is not true?


 I just meant the XL (Roman Numeral 40) part..


 sorry to have caused this fuss jsut because I like the use of the
 common XL name to (in this case) hint at 40.
 the device name in netstat could be ixlgNNN  (intel 40gig) even
 if the device is aimed at the 710 (and later 720 etc..)


 Then the correct name is xlN, but unfortunately ;) wpaul already used
 up most
 of the 2-letter namespace (xl went in 1998).  ixl would be OK.

 Bruce


I'm pretty sure the original naming would have caused drama at work with
their monitoring system - I seem to recall that they know that interface
names are alpha chars followed by an interface instance number.  I suspect
that that might exclude

I would much rather see something like ixlN

-Peter
--
Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV

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

svn commit: r265151 - in head/sys: amd64/conf arm/conf i386/conf ia64/conf mips/conf pc98/conf powerpc/conf sparc64/conf

[Peter Wemm]

Author: peter
Date: Wed Apr 30 17:43:49 2014
New Revision: 265151
URL: http://svnweb.freebsd.org/changeset/base/265151

Log:
  Nuke svn:ignore on the conf directory - This makes sense for the compile
  directory, but not so much for here as it's including ignores for things
  like GENERIC etc.
  
  Submitted by: markm

Modified:
Directory Properties:
  head/sys/amd64/conf/   (props changed)
  head/sys/arm/conf/   (props changed)
  head/sys/i386/conf/   (props changed)
  head/sys/ia64/conf/   (props changed)
  head/sys/mips/conf/   (props changed)
  head/sys/pc98/conf/   (props changed)
  head/sys/powerpc/conf/   (props changed)
  head/sys/sparc64/conf/   (props changed)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org