date:20170622

svn commit: r320258 - head/share/mk

2017-06-22 Thread Ed Maste

Author: emaste
Date: Fri Jun 23 03:55:00 2017
New Revision: 320258
URL: https://svnweb.freebsd.org/changeset/base/320258

Log:
  change GNU ld LINKER_TYPE from binutils to bfd
  
  GNU binutils includes two linkers: ld.bfd and ld.gold.  For clarity use
  LINKER_TYPE=bfd to refer to ld.bfd, the original binutils linker that
  identifies itself as "GNU ld".
  
  Discussed with:   bdrewery

Modified:
  head/share/mk/bsd.linker.mk

Modified: head/share/mk/bsd.linker.mk
==
--- head/share/mk/bsd.linker.mk Fri Jun 23 02:42:04 2017(r320257)
+++ head/share/mk/bsd.linker.mk Fri Jun 23 03:55:00 2017(r320258)
@@ -47,7 +47,7 @@ _ld_version!= ${${ld}} --version 2>/dev/null | head -n
 .error Unable to determine linker type from ${ld}=${${ld}}
 .endif
 .if ${_ld_version:[1..2]} == "GNU ld"
-${X_}LINKER_TYPE=  binutils
+${X_}LINKER_TYPE=  bfd
 _v=${_ld_version:M[1-9].[0-9]*:[1]}
 .elif ${_ld_version:[1]} == "LLD"
 ${X_}LINKER_TYPE=  lld
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r320156 - in head: cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/ztest cddl/contrib/opensolaris/lib/libzfs/common sys/cddl/contrib/opensolaris/common/zfs sys/cddl/contr

2017-06-22 Thread Justin Hibbits

Hi Andriy,

On Tuesday, June 20, 2017, Andriy Gapon  wrote:

> Author: avg
> Date: Tue Jun 20 17:39:24 2017
> New Revision: 320156
> URL: https://svnweb.freebsd.org/changeset/base/320156
>
> Log:
>   MFV r318946: 8021 ARC buf data scatter-ization
>
>   illumos/illumos-gate@770499e185d15678ccb0be57ebc626ad18d93383
>   https://github.com/illumos/illumos-gate/commit/
> 770499e185d15678ccb0be57ebc626ad18d93383
>
>   https://www.illumos.org/issues/8021
> The ARC buf data project (known simply as "ABD" since its genesis in
> the ZoL
> community) changes the way the ARC allocates `b_pdata` memory from
> using linear
> `void *` buffers to using scatter/gather lists of fixed-size 1KB
> chunks. This
> improves ZFS's performance by helping to defragment the address space
> occupied
> by the ARC, in particular for cases where compressed ARC is enabled.
> It could
> also ease future work to allocate pages directly from `segkpm` for
> minimal-
> overhead memory allocations, bypassing the `kmem` subsystem.
> This is essentially the same change as the one which recently landed
> in ZFS on
> Linux, although they made some platform-specific changes while
> adapting this
> work to their codebase:
> 1. Implemented the equivalent of the `segkpm` suggestion for future
> work
> mentioned above to bypass issues that they've had with the Linux
> kernel memory
> allocator.
> 2. Changed the internal representation of the ABD's scatter/gather
> list so it
> could be used to pass I/O directly into Linux block device drivers.
> (This
> feature is not available in the illumos block device interface yet.)
>
>   FreeBSD notes:
>   - the actual (default) chunk size is 4KB (despite the text above saying
> 1KB)
>   - we can try to reimplement ABDs, so that they are not permanently
> mapped into the KVA unless explicitly requested, especially on
> platforms with scarce KVA
>   - we can try to use unmapped I/O and avoid intermediate allocation of a
> linear, virtual memory mapped buffer
>   - we can try to avoid extra data copying by referring to chunks / pages
> in the original ABD
>
>   Reviewed by: Matthew Ahrens 
>   Reviewed by: George Wilson 
>   Reviewed by: Paul Dagnelie 
>   Reviewed by: John Kennedy 
>   Reviewed by: Prakash Surya 
>   Reviewed by: Prashanth Sreenivasa 
>   Reviewed by: Pavel Zakharov 
>   Reviewed by: Chris Williamson 
>   Approved by: Richard Lowe 
>   Author: Dan Kimmel 
>
>   MFC after:3 weeks
>
> Added:
>   head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/abd.c
>  - copied, changed from r318946, vendor-sys/illumos/dist/uts/
> common/fs/zfs/abd.c
>   head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/abd.h
>  - copied, changed from r318946, vendor-sys/illumos/dist/uts/
> common/fs/zfs/sys/abd.h
> Modified:
>   head/cddl/contrib/opensolaris/cmd/zdb/zdb.c
>   head/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c
>   head/cddl/contrib/opensolaris/cmd/ztest/ztest.c
>   head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
>   head/sys/cddl/contrib/opensolaris/common/zfs/zfs_fletcher.c
>   head/sys/cddl/contrib/opensolaris/common/zfs/zfs_fletcher.h
>   head/sys/cddl/contrib/opensolaris/uts/common/Makefile.files
>   head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
>   head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/blkptr.c
>   head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
>   head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c
>   head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
>   head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
>   head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
>   head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/edonr_zfs.c
>   head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lz4.c
>   head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c
>   head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/skein_zfs.c
>   head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
>   head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/ddt.h
>   head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
>   head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h
>   head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
>   head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h
>   head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h
>   head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
>   head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c
>   head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c
>   head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c
>

svn commit: r320257 - in head/contrib/ipfilter: lib tools

2017-06-22 Thread Cy Schubert

Author: cy
Date: Fri Jun 23 02:42:04 2017
New Revision: 320257
URL: https://svnweb.freebsd.org/changeset/base/320257

Log:
  Replace AF_INET6 ifdefs with USE_INET6 ifdefs. This is more consistent
  and guaranteed to build everywhere in ipfilter.
  
  Not all of this commit can be MFCed. Some is original code while others
  are not.

Modified:
  head/contrib/ipfilter/lib/familyname.c
  head/contrib/ipfilter/lib/printhashnode.c
  head/contrib/ipfilter/lib/printip.c
  head/contrib/ipfilter/lib/printpoolnode.c
  head/contrib/ipfilter/tools/ipf_y.y

Modified: head/contrib/ipfilter/lib/familyname.c
==
--- head/contrib/ipfilter/lib/familyname.c  Fri Jun 23 01:05:49 2017
(r320256)
+++ head/contrib/ipfilter/lib/familyname.c  Fri Jun 23 02:42:04 2017
(r320257)
@@ -4,7 +4,7 @@ const char *familyname(int family)
 {
if (family == AF_INET)
return "inet";
-#ifdef AF_INET6
+#ifdef USE_INET6
if (family == AF_INET6)
return "inet6";
 #endif

Modified: head/contrib/ipfilter/lib/printhashnode.c
==
--- head/contrib/ipfilter/lib/printhashnode.c   Fri Jun 23 01:05:49 2017
(r320256)
+++ head/contrib/ipfilter/lib/printhashnode.c   Fri Jun 23 02:42:04 2017
(r320257)
@@ -35,7 +35,7 @@ printhashnode(iph, ipep, copyfunc, opts, fields)
}
printf("\n");
} else if ((opts & OPT_DEBUG) != 0) {
-#ifdef AF_INET6
+#ifdef USE_INET6
if (ipe.ipe_family == AF_INET6) {
char buf[INET6_ADDRSTRLEN + 1];
const char *str;
@@ -59,7 +59,7 @@ printhashnode(iph, ipep, copyfunc, opts, fields)
} else if (ipe.ipe_family == AF_INET) {
 #else
if (ipe.ipe_family == AF_INET) {
-#endif /* AF_INET6 */
+#endif /* USE_INET6 */
PRINTF("\t%d\tAddress: %s", hv,
inet_ntoa(ipe.ipe_addr.in4));
printmask(ipe.ipe_family, (u_32_t 
*)_mask.in4_addr);

Modified: head/contrib/ipfilter/lib/printip.c
==
--- head/contrib/ipfilter/lib/printip.c Fri Jun 23 01:05:49 2017
(r320256)
+++ head/contrib/ipfilter/lib/printip.c Fri Jun 23 02:42:04 2017
(r320257)
@@ -25,7 +25,7 @@ printip(family, addr)
else
PRINTF("%s", inet_ntoa(ipa));
}
-#ifdef AF_INET6
+#ifdef USE_INET6
else if (family == AF_INET6) {
char buf[INET6_ADDRSTRLEN + 1];
const char *str;

Modified: head/contrib/ipfilter/lib/printpoolnode.c
==
--- head/contrib/ipfilter/lib/printpoolnode.c   Fri Jun 23 01:05:49 2017
(r320256)
+++ head/contrib/ipfilter/lib/printpoolnode.c   Fri Jun 23 02:42:04 2017
(r320257)
@@ -33,7 +33,7 @@ printpoolnode(np, opts, fields)
printmask(np->ipn_addr.adf_family,
  (u_32_t *)>ipn_mask.adf_addr);
} else {
-#ifdef AF_INET6
+#ifdef USE_INET6
if (np->ipn_addr.adf_family == AF_INET6) {
char buf[INET6_ADDRSTRLEN + 1];
const char *str;
@@ -54,9 +54,7 @@ printpoolnode(np, opts, fields)
} else {
PRINTF("\tAddress: family: %d\n",
np->ipn_addr.adf_family);
-#ifdef AF_INET6
}
-#endif
printmask(np->ipn_addr.adf_family,
  (u_32_t *)>ipn_mask.adf_addr);
 #ifdef USE_QUAD_T

Modified: head/contrib/ipfilter/tools/ipf_y.y
==
--- head/contrib/ipfilter/tools/ipf_y.y Fri Jun 23 01:05:49 2017
(r320256)
+++ head/contrib/ipfilter/tools/ipf_y.y Fri Jun 23 02:42:04 2017
(r320257)
@@ -2303,7 +2303,7 @@ makepool(list)
 
for (n = top, a = list; (n != NULL) && (a != NULL); a = a->al_next) {
if (use_inet6 == 1) {
-#ifdef AF_INET6
+#ifdef USE_INET6
n->ipn_addr.adf_family = AF_INET6;
n->ipn_addr.adf_addr = a->al_i6addr;
n->ipn_addr.adf_len = offsetof(addrfamily_t,
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r320242 - head/etc/ntp

2017-06-22 Thread Cy Schubert

In message <201706230210.v5n2at0l075...@slippy.cwsent.com>, Cy Schubert 
writes:
> In message <2caa5927-9919-ce19-93f4-1005a5257...@freebsd.org>, Allan Jude 
> write
> s:
> > On 2017-06-22 21:04, Cy Schubert wrote:
> > > In message <1498161747.66489.10.ca...@freebsd.org>, Ian Lepore writes:
> > >> On Thu, 2017-06-22 at 19:25 +, Cy Schubert wrote:
> > >>> Author: cy
> > >>> Date: Thu Jun 22 19:25:17 2017
> > >>> New Revision: 320242
> > >>> URL: https://svnweb.freebsd.org/changeset/base/320242
> > >>>
> > >>> Log:
> > >>> Ã  Update leap-seconds to leap-seconds.3701462400.
> > >>> Ã 
> > >>>
> > >>> Modified: head/etc/ntp/leap-seconds
> > >>> =
> > >>> =
> > >>> --- head/etc/ntp/leap-seconds   Thu Jun 22 18:40:34 2017
> > >>> (r320241)
> > >>> +++ head/etc/ntp/leap-seconds   Thu Jun 22 19:25:17 2017
> > >>> (r320242)
> > >>> @@ -128,7 +128,7 @@
> > >>> Ã #Washington, DC
> > >>> Ã #jeffrey.prilla...@usno.navy.mil
> > >>> Ã #
> > >>> -#  Last Update of leap second values:Ã Ã Ã 6 Jul 2016
> > >>> +#  Last Update of leap second values:Ã Ã 18 Apr 2017
> > >>> Ã #
> > >> Ã # The following line shows this last update date in NTP
> > >>> timestampÃ 
> > >>> Ã #format. This is the date on which the most recent change to
> > >>> @@ -136,7 +136,7 @@
> > >>> Ã #be identified by the unique pair of characters in the first
> > >>> twoÃ 
> > >>> Ã #columns as shown below.
> > >>> Ã #
> > >>> -#$ Ã 3676752000
> > >>> +#$ Ã 3701462400
> > >>> Ã #
> > >>
> > >> Where did this leapfile come from? Ã The last update of leap second
> > >> values is supposed to change only when the actual list of offsets
> > >> changes, not when the file is updated to just change an expiration
> > >> date. Ã This is actually very explicitly documented in the file itself,
> > >> just a few lines down from this change:
> > > 
> > > The source of the leapfile is in the commit message. Here it is again:
> > > 
> > > Obtained from:  ftp://tycho.usno.navy.mil/pub/ntp/leap-seconds.3701462400
> > > 
> > >>
> > >> Ã  If an announcement by the IERS specifies that no leap second isÃ 
> > >> Ã  scheduled, then only the expiration date of the file willÃ 
> > >> Ã  be advanced to show that the information in the file is still
> > >> Ã  current -- the update time stamp, the data and the name of the 
> > >> fileÃ 
> > >> Ã  will not change.
> > >>
> > >>
> > >>> -#  File expires on:Ã Ã 1 Jun 2017
> > >>> +#  Updated through IERS Bulletin C 53
> > >>> +#  File expires on:Ã Ã 1 Dec 2017
> > >>> Ã #
> > >>> -#@ 3705264000
> > >>> +#@ 3721075200
> > >>> Ã #
> > >>
> > >> This expiration is wrong too, dangerously so IMO. Ã The data in the file
> > >> is good through 12-31-2017-23:59:59, although historical practice has
> > >> been to make the file expire a couple days before that. Ã Making it
> > >> expire 31 days early is about the worst possible choice... some systems
> > >> for notifying clients/consumers of an impending leap second (or the
> > >> lack thereof) only do so during the last month before the leap
> > >> opportunity -- this has the file expire just at the point such software
> > >> would consider it authoratative for dissemination. 
> > > 
> > > My guess is that USNO may have had reason to do so. I'll keep an eye on 
> > > their next release of the file.
> > > Ã 
> > >>
> > >> I will note however, unlike the update date, there is no formal written
> > >> description of how expiration date is determined, so the previous
> > >> paragraph is just my opinion and experience working in the timing
> > >> field.
> > >>
> > >> A leapfile without these problems can be found at
> > >>
> > >> Ã Ã ftp://time.nist.gov/pub/leap-seconds.list
> > > 
> > > We can use that instead. Attached is the diff between the USNO and NIST 
> > > versions of the file.
> > > 
> > > One would think that two groups within the US Government might be able to
>  
> > > produce a consistent leapfile. I suspect the real reason is that the USNO
>  
> > > might have a different bureaucratic process than the NIST does.
> > > 
> > >>
> > >>
> > >> -- Ian
> > >>
> > >>> Ã 2272060800   10  # 1 Jan 1972
> > >>> Ã 2287785600   11  # 1 Jul 1972
> > >>> @@ -216,5 +216,5 @@
> > >>> Ã #the hash line is also ignored in the
> > >>> Ã #computation.
> > >>> Ã #
> > >>> -#h 63f8fea8 587c099d abcf130a ad525eae 3e105052
> > >>> +#h 3f004255 91f969f7 252361e5 27aa6754 eb6b7c72
> > >>> Ã #
> > >>>
> > >>
> > > 
> > > I'll update to the NIST version of the file.
> > > 
> > > 
> > > 
> > > 
> > > 
> > > 
> > > Cheers,
> > > Cy Schubert 
> > > FreeBSD UNIX:     Web:  http://www.FreeBSD.org
> > > 
> > >   The need of the many outweighs the greed of the few.
> > > 
> > 
> > The NIST version does seem to have a number of improvements,

Re: svn commit: r320242 - head/etc/ntp

2017-06-22 Thread Cy Schubert

In message <2caa5927-9919-ce19-93f4-1005a5257...@freebsd.org>, Allan Jude 
write
s:
> On 2017-06-22 21:04, Cy Schubert wrote:
> > In message <1498161747.66489.10.ca...@freebsd.org>, Ian Lepore writes:
> >> On Thu, 2017-06-22 at 19:25 +, Cy Schubert wrote:
> >>> Author: cy
> >>> Date: Thu Jun 22 19:25:17 2017
> >>> New Revision: 320242
> >>> URL: https://svnweb.freebsd.org/changeset/base/320242
> >>>
> >>> Log:
> >>> Ã  Update leap-seconds to leap-seconds.3701462400.
> >>> Ã 
> >>>
> >>> Modified: head/etc/ntp/leap-seconds
> >>> =
> >>> =
> >>> --- head/etc/ntp/leap-seconds Thu Jun 22 18:40:34 2017
> >>> (r320241)
> >>> +++ head/etc/ntp/leap-seconds Thu Jun 22 19:25:17 2017
> >>> (r320242)
> >>> @@ -128,7 +128,7 @@
> >>> Ã #  Washington, DC
> >>> Ã #  jeffrey.prilla...@usno.navy.mil
> >>> Ã #
> >>> -#Last Update of leap second values:Ã Ã Ã 6 Jul 2016
> >>> +#Last Update of leap second values:Ã Ã 18 Apr 2017
> >>> Ã #
> >> Ã #   The following line shows this last update date in NTP
> >>> timestampÃ 
> >>> Ã #  format. This is the date on which the most recent change to
> >>> @@ -136,7 +136,7 @@
> >>> Ã #  be identified by the unique pair of characters in the first
> >>> twoÃ 
> >>> Ã #  columns as shown below.
> >>> Ã #
> >>> -#$   Ã 3676752000
> >>> +#$   Ã 3701462400
> >>> Ã #
> >>
> >> Where did this leapfile come from? Ã The last update of leap second
> >> values is supposed to change only when the actual list of offsets
> >> changes, not when the file is updated to just change an expiration
> >> date. Ã This is actually very explicitly documented in the file itself,
> >> just a few lines down from this change:
> > 
> > The source of the leapfile is in the commit message. Here it is again:
> > 
> > Obtained from:  ftp://tycho.usno.navy.mil/pub/ntp/leap-seconds.3701462400
> > 
> >>
> >> Ã  If an announcement by the IERS specifies that no leap second isÃ 
> >> Ã  scheduled, then only the expiration date of the file willÃ 
> >> Ã  be advanced to show that the information in the file is still
> >> Ã  current -- the update time stamp, the data and the name of the fileÃ 
> >> Ã  will not change.
> >>
> >>
> >>> -#File expires on:Ã Ã 1 Jun 2017
> >>> +#Updated through IERS Bulletin C 53
> >>> +#File expires on:Ã Ã 1 Dec 2017
> >>> Ã #
> >>> -#@   3705264000
> >>> +#@   3721075200
> >>> Ã #
> >>
> >> This expiration is wrong too, dangerously so IMO. Ã The data in the file
> >> is good through 12-31-2017-23:59:59, although historical practice has
> >> been to make the file expire a couple days before that. Ã Making it
> >> expire 31 days early is about the worst possible choice... some systems
> >> for notifying clients/consumers of an impending leap second (or the
> >> lack thereof) only do so during the last month before the leap
> >> opportunity -- this has the file expire just at the point such software
> >> would consider it authoratative for dissemination. 
> > 
> > My guess is that USNO may have had reason to do so. I'll keep an eye on 
> > their next release of the file.
> > Ã 
> >>
> >> I will note however, unlike the update date, there is no formal written
> >> description of how expiration date is determined, so the previous
> >> paragraph is just my opinion and experience working in the timing
> >> field.
> >>
> >> A leapfile without these problems can be found at
> >>
> >> Ã Ã ftp://time.nist.gov/pub/leap-seconds.list
> > 
> > We can use that instead. Attached is the diff between the USNO and NIST 
> > versions of the file.
> > 
> > One would think that two groups within the US Government might be able to 
> > produce a consistent leapfile. I suspect the real reason is that the USNO 
> > might have a different bureaucratic process than the NIST does.
> > 
> >>
> >>
> >> -- Ian
> >>
> >>> Ã 2272060800 10  # 1 Jan 1972
> >>> Ã 2287785600 11  # 1 Jul 1972
> >>> @@ -216,5 +216,5 @@
> >>> Ã #  the hash line is also ignored in the
> >>> Ã #  computation.
> >>> Ã #
> >>> -#h   63f8fea8 587c099d abcf130a ad525eae 3e105052
> >>> +#h   3f004255 91f969f7 252361e5 27aa6754 eb6b7c72
> >>> Ã #
> >>>
> >>
> > 
> > I'll update to the NIST version of the file.
> > 
> > 
> > 
> > 
> > 
> > 
> > Cheers,
> > Cy Schubert 
> > FreeBSD UNIX:     Web:  http://www.FreeBSD.org
> > 
> > The need of the many outweighs the greed of the few.
> > 
> 
> The NIST version does seem to have a number of improvements, like
> corrected typos etc, but:
> 
> -#Last Update of leap second values:  18 Apr 2017
> +#Last Update of leap second values:   8 July 2016
> 
> The USNO one seems newer. A bit strange.

That was Ian's issue. I think the following explanation makes sense: The 
leap second itself wasn't

Re: svn commit: r320242 - head/etc/ntp

2017-06-22 Thread Allan Jude

On 2017-06-22 21:04, Cy Schubert wrote:
> In message <1498161747.66489.10.ca...@freebsd.org>, Ian Lepore writes:
>> On Thu, 2017-06-22 at 19:25 +, Cy Schubert wrote:
>>> Author: cy
>>> Date: Thu Jun 22 19:25:17 2017
>>> New Revision: 320242
>>> URL: https://svnweb.freebsd.org/changeset/base/320242
>>>
>>> Log:
>>> Â  Update leap-seconds to leap-seconds.3701462400.
>>> Â 
>>>
>>> Modified: head/etc/ntp/leap-seconds
>>> =
>>> =
>>> --- head/etc/ntp/leap-seconds   Thu Jun 22 18:40:34 2017
>>> (r320241)
>>> +++ head/etc/ntp/leap-seconds   Thu Jun 22 19:25:17 2017
>>> (r320242)
>>> @@ -128,7 +128,7 @@
>>> Â # Washington, DC
>>> Â # jeffrey.prilla...@usno.navy.mil
>>> Â #
>>> -#  Last Update of leap second values:Â Â Â 6 Jul 2016
>>> +#  Last Update of leap second values:Â Â 18 Apr 2017
>>> Â #
>> Â #  The following line shows this last update date in NTP
>>> timestampÂ 
>>> Â # format. This is the date on which the most recent change to
>>> @@ -136,7 +136,7 @@
>>> Â # be identified by the unique pair of characters in the first
>>> twoÂ 
>>> Â # columns as shown below.
>>> Â #
>>> -#$ Â 3676752000
>>> +#$ Â 3701462400
>>> Â #
>>
>> Where did this leapfile come from? Â The last update of leap second
>> values is supposed to change only when the actual list of offsets
>> changes, not when the file is updated to just change an expiration
>> date. Â This is actually very explicitly documented in the file itself,
>> just a few lines down from this change:
> 
> The source of the leapfile is in the commit message. Here it is again:
> 
> Obtained from:  ftp://tycho.usno.navy.mil/pub/ntp/leap-seconds.3701462400
> 
>>
>> Â  If an announcement by the IERS specifies that no leap second isÂ 
>> Â  scheduled, then only the expiration date of the file willÂ 
>> Â  be advanced to show that the information in the file is still
>> Â  current -- the update time stamp, the data and the name of the fileÂ 
>> Â  will not change.
>>
>>
>>> -#  File expires on:Â Â 1 Jun 2017
>>> +#  Updated through IERS Bulletin C 53
>>> +#  File expires on:Â Â 1 Dec 2017
>>> Â #
>>> -#@ 3705264000
>>> +#@ 3721075200
>>> Â #
>>
>> This expiration is wrong too, dangerously so IMO. Â The data in the file
>> is good through 12-31-2017-23:59:59, although historical practice has
>> been to make the file expire a couple days before that. Â Making it
>> expire 31 days early is about the worst possible choice... some systems
>> for notifying clients/consumers of an impending leap second (or the
>> lack thereof) only do so during the last month before the leap
>> opportunity -- this has the file expire just at the point such software
>> would consider it authoratative for dissemination. 
> 
> My guess is that USNO may have had reason to do so. I'll keep an eye on 
> their next release of the file.
> Â 
>>
>> I will note however, unlike the update date, there is no formal written
>> description of how expiration date is determined, so the previous
>> paragraph is just my opinion and experience working in the timing
>> field.
>>
>> A leapfile without these problems can be found at
>>
>> Â Â ftp://time.nist.gov/pub/leap-seconds.list
> 
> We can use that instead. Attached is the diff between the USNO and NIST 
> versions of the file.
> 
> One would think that two groups within the US Government might be able to 
> produce a consistent leapfile. I suspect the real reason is that the USNO 
> might have a different bureaucratic process than the NIST does.
> 
>>
>>
>> -- Ian
>>
>>> Â 227206080010  # 1 Jan 1972
>>> Â 228778560011  # 1 Jul 1972
>>> @@ -216,5 +216,5 @@
>>> Â # the hash line is also ignored in the
>>> Â # computation.
>>> Â #
>>> -#h 63f8fea8 587c099d abcf130a ad525eae 3e105052
>>> +#h 3f004255 91f969f7 252361e5 27aa6754 eb6b7c72
>>> Â #
>>>
>>
> 
> I'll update to the NIST version of the file.
> 
> 
> 
> 
> 
> 
> Cheers,
> Cy Schubert 
> FreeBSD UNIX:     Web:  http://www.FreeBSD.org
> 
>   The need of the many outweighs the greed of the few.
> 

The NIST version does seem to have a number of improvements, like
corrected typos etc, but:

-#  Last Update of leap second values:  18 Apr 2017
+#  Last Update of leap second values:   8 July 2016

The USNO one seems newer. A bit strange.

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

Re: svn commit: r320242 - head/etc/ntp

2017-06-22 Thread Cy Schubert

In message <1498161747.66489.10.ca...@freebsd.org>, Ian Lepore writes:
> On Thu, 2017-06-22 at 19:25 +, Cy Schubert wrote:
> > Author: cy
> > Date: Thu Jun 22 19:25:17 2017
> > New Revision: 320242
> > URL: https://svnweb.freebsd.org/changeset/base/320242
> > 
> > Log:
> > Â  Update leap-seconds to leap-seconds.3701462400.
> >Â 
> > 
> > Modified: head/etc/ntp/leap-seconds
> > =
> > =
> > --- head/etc/ntp/leap-seconds   Thu Jun 22 18:40:34 2017
> > (r320241)
> > +++ head/etc/ntp/leap-seconds   Thu Jun 22 19:25:17 2017
> > (r320242)
> > @@ -128,7 +128,7 @@
> > Â # Washington, DC
> > Â # jeffrey.prilla...@usno.navy.mil
> > Â #
> > -#  Last Update of leap second values:Â Â Â 6 Jul 2016
> > +#  Last Update of leap second values:Â Â 18 Apr 2017
> > Â #
> Â #   The following line shows this last update date in NTP
> > timestampÂ 
> > Â # format. This is the date on which the most recent change to
> > @@ -136,7 +136,7 @@
> > Â # be identified by the unique pair of characters in the first
> > twoÂ 
> > Â # columns as shown below.
> > Â #
> > -#$ Â 3676752000
> > +#$ Â 3701462400
> > Â #
> 
> Where did this leapfile come from? Â The last update of leap second
> values is supposed to change only when the actual list of offsets
> changes, not when the file is updated to just change an expiration
> date. Â This is actually very explicitly documented in the file itself,
> just a few lines down from this change:

The source of the leapfile is in the commit message. Here it is again:

Obtained from:  ftp://tycho.usno.navy.mil/pub/ntp/leap-seconds.3701462400

> 
> Â  If an announcement by the IERS specifies that no leap second isÂ 
> Â  scheduled, then only the expiration date of the file willÂ 
> Â  be advanced to show that the information in the file is still
> Â  current -- the update time stamp, the data and the name of the fileÂ 
> Â  will not change.
> 
> 
> > -#  File expires on:Â Â 1 Jun 2017
> > +#  Updated through IERS Bulletin C 53
> > +#  File expires on:Â Â 1 Dec 2017
> > Â #
> > -#@ 3705264000
> > +#@ 3721075200
> > Â #
> 
> This expiration is wrong too, dangerously so IMO. Â The data in the file
> is good through 12-31-2017-23:59:59, although historical practice has
> been to make the file expire a couple days before that. Â Making it
> expire 31 days early is about the worst possible choice... some systems
> for notifying clients/consumers of an impending leap second (or the
> lack thereof) only do so during the last month before the leap
> opportunity -- this has the file expire just at the point such software
> would consider it authoratative for dissemination. 

My guess is that USNO may have had reason to do so. I'll keep an eye on 
their next release of the file.
Â 
> 
> I will note however, unlike the update date, there is no formal written
> description of how expiration date is determined, so the previous
> paragraph is just my opinion and experience working in the timing
> field.
> 
> A leapfile without these problems can be found at
> 
> Â Â ftp://time.nist.gov/pub/leap-seconds.list

We can use that instead. Attached is the diff between the USNO and NIST 
versions of the file.

One would think that two groups within the US Government might be able to 
produce a consistent leapfile. I suspect the real reason is that the USNO 
might have a different bureaucratic process than the NIST does.

> 
> 
> -- Ian
> 
> > Â 227206080010  # 1 Jan 1972
> > Â 228778560011  # 1 Jul 1972
> > @@ -216,5 +216,5 @@
> > Â # the hash line is also ignored in the
> > Â # computation.
> > Â #
> > -#h 63f8fea8 587c099d abcf130a ad525eae 3e105052
> > +#h 3f004255 91f969f7 252361e5 27aa6754 eb6b7c72
> > Â #
> > 
> 

I'll update to the NIST version of the file.




--- leap-seconds2017-04-18 07:11:44.0 -0700
+++ leap-seconds.3676924800 2017-02-07 10:05:13.0 -0800
@@ -1,10 +1,10 @@
 #
 #  In the following text, the symbol '#' introduces
-#  a comment, which continues from that symbol until 
+#  a comment, which continues from that symbol until
 #  the end of the line. A plain comment line has a
 #  whitespace character following the comment indicator.
-#  There are also special comment lines defined below. 
-#  A special comment will always have a non-whitespace 
+#  There are also special comment lines defined below.
+#  A special comment will always have a non-whitespace
 #  character in column 2.
 #
 #  A blank line should be ignored.
@@ -15,17 +15,22 @@
 #  are transmitted by almost all time services.
 #
 #  The first column shows an epoch as a number of seconds
-#  since 1900.0 and the second column shows the number of
-#  seconds that must be added to UTC to compute TAI for
-#  any timestamp at or after that epoch. The value on 
-#  each line is valid from the indicated initial

svn commit: r320256 - head/etc/ntp

2017-06-22 Thread Cy Schubert

Author: cy
Date: Fri Jun 23 01:05:49 2017
New Revision: 320256
URL: https://svnweb.freebsd.org/changeset/base/320256

Log:
  Replace the leap-seconds file in r320242 from USNO -
  ftp://tycho.usno.navy.mil/pub/ntp/leap-seconds.3701462400 - with a
  leap-seconds file from NIST at ftp://time.nist.gov/pub/. The USNO
  version of the file changes the last documented leap second update
  time whereas the NIST version does not. The expiration of the USNO
  version of the file is also one month short.
  
  Requested by: ian@
  Obtained from:ftp://time.nist.gov/pub/leap-seconds.3676924800
  MFC after:3 days

Modified:
  head/etc/ntp/leap-seconds

Modified: head/etc/ntp/leap-seconds
==
--- head/etc/ntp/leap-seconds   Fri Jun 23 00:40:09 2017(r320255)
+++ head/etc/ntp/leap-seconds   Fri Jun 23 01:05:49 2017(r320256)
@@ -1,10 +1,10 @@
 #
 #  In the following text, the symbol '#' introduces
-#  a comment, which continues from that symbol until 
+#  a comment, which continues from that symbol until
 #  the end of the line. A plain comment line has a
 #  whitespace character following the comment indicator.
-#  There are also special comment lines defined below. 
-#  A special comment will always have a non-whitespace 
+#  There are also special comment lines defined below.
+#  A special comment will always have a non-whitespace
 #  character in column 2.
 #
 #  A blank line should be ignored.
@@ -15,17 +15,22 @@
 #  are transmitted by almost all time services.
 #
 #  The first column shows an epoch as a number of seconds
-#  since 1900.0 and the second column shows the number of
-#  seconds that must be added to UTC to compute TAI for
-#  any timestamp at or after that epoch. The value on 
-#  each line is valid from the indicated initial instant
-#  until the epoch given on the next one or indefinitely 
-#  into the future if there is no next line.
+#  since 1 January 1900, 00:00:00 (1900.0 is also used to
+#  indicate the same epoch.) Both of these time stamp formats
+#  ignore the complexities of the time scales that were
+#  used before the current definition of UTC at the start
+#  of 1972. (See note 3 below.)
+#  The second column shows the number of seconds that
+#  must be added to UTC to compute TAI for any timestamp
+#  at or after that epoch. The value on each line is
+#  valid from the indicated initial instant until the
+#  epoch given on the next one or indefinitely into the
+#  future if there is no next line.
 #  (The comment on each line shows the representation of
-#  the corresponding initial epoch in the usual 
+#  the corresponding initial epoch in the usual
 #  day-month-year format. The epoch always begins at
 #  00:00:00 UTC on the indicated day. See Note 5 below.)
-#  
+#
 #  Important notes:
 #
 #  1. Coordinated Universal Time (UTC) is often referred to
@@ -33,7 +38,7 @@
 #  longer used, and the use of GMT to designate UTC is
 #  discouraged.
 #
-#  2. The UTC time scale is realized by many national 
+#  2. The UTC time scale is realized by many national
 #  laboratories and timing centers. Each laboratory
 #  identifies its realization with its name: Thus
 #  UTC(NIST), UTC(USNO), etc. The differences among
@@ -42,12 +47,12 @@
 #  and can be ignored for many purposes. These differences
 #  are tabulated in Circular T, which is published monthly
 #  by the International Bureau of Weights and Measures
-#  (BIPM). See www.bipm.fr for more information.
+#  (BIPM). See www.bipm.org for more information.
 #
-#  3. The current defintion of the relationship between UTC 
-#  and TAI dates from 1 January 1972. A number of different 
-#  time scales were in use before than epoch, and it can be 
-#  quite difficult to compute precise timestamps and time 
+#  3. The current definition of the relationship between UTC
+#  and TAI dates from 1 January 1972. A number of different
+#  time scales were in use before that epoch, and it can be
+#  quite difficult to compute precise timestamps and time
 #  intervals in those "prehistoric" days. For more information,
 #  consult:
 #
@@ -58,36 +63,34 @@
 #  of Time," Proc. of the IEEE, Vol. 79, pp. 894-905,
 #  July, 1991.
 #
-#  4.  The insertion of leap seconds into UTC is currently the
-#  responsibility of the International Earth Rotation Service,
-#  which is located at the Paris Observatory: 
+#  4. The decision to insert a leap second into UTC is currently
+#  the responsibility of the International Earth Rotation and
+#  Reference Systems Service. (The name was changed from the
+#  International Earth Rotation Service, but the acronym IERS
+#  is still used.)
 #

svn commit: r320255 - in head: lib/libc/sys share/man/man4

2017-06-22 Thread Alan Somers

Author: asomers
Date: Fri Jun 23 00:40:09 2017
New Revision: 320255
URL: https://svnweb.freebsd.org/changeset/base/320255

Log:
  Clarify usage of aio(4) with kqueue(2)
  
  Reviewed by:  jhb
  MFC after:3 weeks
  Differential Revision:https://reviews.freebsd.org/D11299

Modified:
  head/lib/libc/sys/kqueue.2
  head/share/man/man4/aio.4

Modified: head/lib/libc/sys/kqueue.2
==
--- head/lib/libc/sys/kqueue.2  Fri Jun 23 00:27:40 2017(r320254)
+++ head/lib/libc/sys/kqueue.2  Fri Jun 23 00:40:09 2017(r320255)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 17, 2017
+.Dd June 22, 2017
 .Dt KQUEUE 2
 .Os
 .Sh NAME
@@ -351,33 +351,18 @@ case.
 Takes a descriptor as the identifier, and returns whenever
 there is no remaining data in the write buffer.
 .It Dv EVFILT_AIO
-The sigevent portion of the AIO request is filled in, with
-.Va sigev_notify_kqueue
-containing the descriptor of the kqueue that the event should
-be attached to,
-.Va sigev_notify_kevent_flags
-containing the kevent flags which should be
-.Dv EV_ONESHOT ,
-.Dv EV_CLEAR
-or
-.Dv EV_DISPATCH ,
-.Va sigev_value
-containing the udata value, and
-.Va sigev_notify
-set to
-.Dv SIGEV_KEVENT .
-When the
-.Fn aio_*
-system call is made, the event will be registered
-with the specified kqueue, and the
-.Va ident
-argument set to the
-.Fa struct aiocb
-returned by the
-.Fn aio_*
-system call.
+Events for this filter are not registered with
+.Fn kevent
+directly but are registered via the
+.Va aio_sigevent
+member of an asychronous I/O request when it is scheduled via an asychronous 
I/O
+system call such as
+.Fn aio_read .
 The filter returns under the same conditions as
 .Fn aio_error .
+For more details on this filter see
+.Xr sigevent 3 and
+.Xr aio 4 .
 .It Dv EVFILT_VNODE
 Takes a file descriptor as the identifier and the events to watch for in
 .Va fflags ,

Modified: head/share/man/man4/aio.4
==
--- head/share/man/man4/aio.4   Fri Jun 23 00:27:40 2017(r320254)
+++ head/share/man/man4/aio.4   Fri Jun 23 00:40:09 2017(r320255)
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 21, 2016
+.Dd June 22, 2017
 .Dt AIO 4
 .Os
 .Sh NAME
@@ -161,11 +161,27 @@ field which can be used to request notification when a
 For
 .Dv SIGEV_KEVENT
 notifications,
-the posted kevent will contain:
+the
+.Va sigevent
+.Ap
+s
+.Va sigev_notify_kqueue
+field should contain the descriptor of the kqueue that the event should be 
attached
+to, its
+.Va sigev_notify_kevent_flags
+field may contain
+.Dv EV_ONESHOT ,
+.Dv EV_CLEAR , and/or
+.Dv EV_DISPATCH , and its
+.Va sigev_notify
+field should be set to
+.Dv SIGEV_KEVENT .
+The posted kevent will contain:
 .Bl -column ".Va filter"
 .It Sy Member Ta Sy Value
 .It Va ident Ta asynchronous I/O control buffer pointer
 .It Va filter Ta Dv EVFILT_AIO
+.It Va flags Ta Dv EV_EOF
 .It Va udata Ta
 value stored in
 .Va aio_sigevent.sigev_value
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r320048 - head/usr.bin/mkuzip

2017-06-22 Thread Conrad Meyer

ffd is leaked in return paths.  Coverity CID 1376420.

On Fri, Jun 16, 2017 at 7:58 PM, Maxim Sobolev  wrote:
> Author: sobomax
> Date: Sat Jun 17 02:58:31 2017
> New Revision: 320048
> URL: https://svnweb.freebsd.org/changeset/base/320048
>
> Log:
>   o Move logic that determines size of the input image into its own
> file. That logic has grown quite significantly now;
>
>   o add a special handling for the snapshot images. Those have some
> extra headers at the end of the image and we don't need those
> in the output image really.
>
>   MFC after:6 weeks
>
> ...
> Added: head/usr.bin/mkuzip/mkuz_insize.c
> ...
> +off_t
> +mkuz_get_insize(struct mkuz_cfg *cfp)
> +{
> +   int ffd;
> +   off_t ms;
> +   struct stat sb;
> +   struct statfs statfsbuf;
> +
> +   if (fstat(cfp->fdr, ) != 0) {
> +   warn("fstat(%s)", cfp->iname);
> +   return (-1);
> +   }
> +   if ((sb.st_flags & SF_SNAPSHOT) != 0) {
> +   if (fstatfs(cfp->fdr, ) != 0) {
> +   warn("fstatfs(%s)", cfp->iname);
> +   return (-1);
> +   }
> +   ffd = open(statfsbuf.f_mntfromname, O_RDONLY);
> +   if (ffd < 0) {
> +   warn("open(%s, O_RDONLY)", statfsbuf.f_mntfromname);
> +   return (-1);
> +   }
> +   if (ioctl(ffd, DIOCGMEDIASIZE, ) < 0) {
> +   warn("ioctl(DIOCGMEDIASIZE)");
> +   return (-1);

ffd leaked here.

> +   }

ffd also leaked here via fallthrough return.

> +   sb.st_size = ms;
> +   } else if (S_ISCHR(sb.st_mode)) {
> +   if (ioctl(cfp->fdr, DIOCGMEDIASIZE, ) < 0) {
> +   warn("ioctl(DIOCGMEDIASIZE)");
> +   return (-1);
> +   }
> +   sb.st_size = ms;
> +   } else if (!S_ISREG(sb.st_mode)) {
> +   warnx("%s: not a character device or regular file\n",
> +   cfp->iname);
> +   return (-1);
> +   }
> +   return (sb.st_size);
> +}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r320254 - head/release/arm64

2017-06-22 Thread Glen Barber

Author: gjb
Date: Fri Jun 23 00:27:40 2017
New Revision: 320254
URL: https://svnweb.freebsd.org/changeset/base/320254

Log:
  Fix, for the fourth or fifth time now, looking up where boot1.efi
  is located.
  
  MFC after:5 days
  X-MFC-Note:   maybe
  X-MFC-With:   r320252, r320253
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/arm64/RPI3.conf

Modified: head/release/arm64/RPI3.conf
==
--- head/release/arm64/RPI3.confFri Jun 23 00:11:34 2017
(r320253)
+++ head/release/arm64/RPI3.confFri Jun 23 00:27:40 2017
(r320254)
@@ -45,8 +45,8 @@ arm_install_uboot() {
 
_OBJDIR="$(chroot ${CHROOTDIR} make -C ${WORLDDIR} -V .OBJDIR)"
_OBJDIR="$(realpath ${_OBJDIR})"
-   if [ -d "${CHROOTDIR}/${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}" ]; 
then
-   
BOOTFILES="/${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}/usr/src/sys/boot"
+   if [ -d 
"${CHROOTDIR}/${_OBJDIR%%/usr/src}/${EMBEDDED_TARGET}.${EMBEDDED_TARGET_ARCH}" 
]; then
+   
BOOTFILES="/${_OBJDIR%%/usr/src}/${EMBEDDED_TARGET}.${EMBEDDED_TARGET_ARCH}/usr/src/sys/boot"
else
BOOTFILES="/${_OBJDIR}/sys/boot"
fi
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r320253 - head/release/arm64

2017-06-22 Thread Glen Barber

Author: gjb
Date: Fri Jun 23 00:11:34 2017
New Revision: 320253
URL: https://svnweb.freebsd.org/changeset/base/320253

Log:
  Remove two configuration entries used for debugging that snuck in.
  
  MFC after:5 days
  X-MFC-Note:   maybe
  X-MFC-With:   r320252
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/arm64/RPI3.conf

Modified: head/release/arm64/RPI3.conf
==
--- head/release/arm64/RPI3.confFri Jun 23 00:08:36 2017
(r320252)
+++ head/release/arm64/RPI3.confFri Jun 23 00:11:34 2017
(r320253)
@@ -10,8 +10,7 @@ EMBEDDED_TARGET="arm64"
 EMBEDDED_TARGET_ARCH="aarch64"
 EMBEDDEDPORTS="sysutils/u-boot-rpi3 security/ca_root_nss"
 KERNEL="GENERIC"
-#MAKE_FLAGS="${MAKE_FLAGS} -s"
-WORLD_FLAGS="${WORLD_FLAGS} -j48 UBLDR_LOADADDR=0x4200"
+WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x4200"
 IMAGE_SIZE="2G"
 PART_SCHEME="MBR"
 FAT_SIZE="50m -b 1m"
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r320252 - in head/release: . arm64 tools

2017-06-22 Thread Glen Barber

Author: gjb
Date: Fri Jun 23 00:08:36 2017
New Revision: 320252
URL: https://svnweb.freebsd.org/changeset/base/320252

Log:
  In release/release.sh:
  - Rename chroot_arm_armv6_build_release() to chroot_arm_build_release()
and make it hardware agnostic (such as armv6 -vs- armv7 -vs- arm64).
  
  - Evaluate EMBEDDED_TARGET differently so release/tools/arm.subr can
be used for arm/armv6 and arm64/aarch64.
  
  - Update comments and copyright.
  
  In release/tools/arm.subr:
  - In arm_create_disk(), change the default alignment from 63 to 512k,
fixing a boot issue on arm64 and EFI. [1]
  
  - Update comments and copyright.
  
  Add a RPI3 configuration file, pieces obtained from Crochet.
  
  Obtained from:Crochet [1]
  MFC after:5 days
  X-MFC-Note:   maybe
  Sponsored by: The FreeBSD Foundation

Added:
  head/release/arm64/RPI3.conf   (contents, props changed)
Modified:
  head/release/release.sh
  head/release/tools/arm.subr

Added: head/release/arm64/RPI3.conf
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/release/arm64/RPI3.confFri Jun 23 00:08:36 2017
(r320252)
@@ -0,0 +1,66 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+CHROOT_MAKEENV="TARGET=amd64 TARGET_ARCH=amd64"
+SRCBRANCH="base/head@rHEAD"
+EMBEDDEDBUILD=1
+EMBEDDED_TARGET="arm64"
+EMBEDDED_TARGET_ARCH="aarch64"
+EMBEDDEDPORTS="sysutils/u-boot-rpi3 security/ca_root_nss"
+KERNEL="GENERIC"
+#MAKE_FLAGS="${MAKE_FLAGS} -s"
+WORLD_FLAGS="${WORLD_FLAGS} -j48 UBLDR_LOADADDR=0x4200"
+IMAGE_SIZE="2G"
+PART_SCHEME="MBR"
+FAT_SIZE="50m -b 1m"
+FAT_TYPE="16"
+MD_ARGS="-x 63 -y 255"
+NODOC=1
+DTB_REPO="https://github.com/raspberrypi/firmware/blob/master/boot;
+DTB="bcm2710-rpi-3-b.dtb"
+OVERLAYS="mmc.dtbo pi3-disable-bt.dtbo"
+export BOARDNAME="RPI3"
+
+arm_install_uboot() {
+   UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi3"
+   UBOOT_FILES="LICENCE.broadcom README armstub8.bin bootcode.bin 
config.txt \
+   fixup.dat fixup_cd.dat fixup_x.dat start.elf start_cd.elf \
+   start_x.elf u-boot.bin"
+   FATMOUNT="${DESTDIR%${KERNEL}}fat"
+   UFSMOUNT="${DESTDIR%${KERNEL}}ufs"
+   chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
+   chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
+   chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
+   for _UF in ${UBOOT_FILES}; do
+   chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \
+   ${FATMOUNT}/${_UF}
+   done
+   chroot ${CHROOTDIR} fetch -o "${FATMOUNT}/${DTB}" 
"${DTB_REPO}/${DTB}?raw=true"
+   chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/overlays
+   for _OL in ${OVERLAYS}; do
+   chroot ${CHROOTDIR} fetch -o "${FATMOUNT}/overlays/${_OL}"\
+   "${DTB_REPO}/overlays/${_OL}?raw=true"
+   done
+
+   _OBJDIR="$(chroot ${CHROOTDIR} make -C ${WORLDDIR} -V .OBJDIR)"
+   _OBJDIR="$(realpath ${_OBJDIR})"
+   if [ -d "${CHROOTDIR}/${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}" ]; 
then
+   
BOOTFILES="/${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}/usr/src/sys/boot"
+   else
+   BOOTFILES="/${_OBJDIR}/sys/boot"
+   fi
+
+   chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/EFI/BOOT
+   chroot ${CHROOTDIR} cp -p ${BOOTFILES}/efi/boot1/boot1.efi \
+   ${FATMOUNT}/EFI/BOOT/bootaa64.efi
+   chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
+   sync
+   umount_loop ${CHROOTDIR}/${FATMOUNT}
+   umount_loop ${CHROOTDIR}/${UFSMOUNT}
+   chroot ${CHROOTDIR} rmdir ${FATMOUNT}
+   chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
+   
+   return 0
+}

Modified: head/release/release.sh
==
--- head/release/release.sh Fri Jun 23 00:00:00 2017(r320251)
+++ head/release/release.sh Fri Jun 23 00:08:36 2017(r320252)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #-
-# Copyright (c) 2013-2015 The FreeBSD Foundation
+# Copyright (c) 2013-2017 The FreeBSD Foundation
 # Copyright (c) 2013 Glen Barber
 # Copyright (c) 2011 Nathan Whitehorn
 # All rights reserved.
@@ -148,10 +148,11 @@ env_check() {
WITH_COMPRESSED_IMAGES=
NODOC=yes
case ${EMBEDDED_TARGET}:${EMBEDDED_TARGET_ARCH} in
-   arm:armv6)
-   
chroot_build_release_cmd="chroot_arm_armv6_build_release"
+   arm:armv6|arm64:aarch64)
+   
chroot_build_release_cmd="chroot_arm_build_release"
;;
*)
+   ;;
esac
fi
 
@@ -346,13 +347,19 @@ chroot_build_release() {
return 0
 } # chroot_build_release()
 
-# chroot_arm_armv6_build_release(): Create arm/armv6 SD card image.

svn commit: r320251 - stable/11/sys/conf

2017-06-22 Thread Glen Barber

Author: gjb
Date: Fri Jun 23 00:00:00 2017
New Revision: 320251
URL: https://svnweb.freebsd.org/changeset/base/320251

Log:
  Update stable/11 to BETA3 as part of the 11.1-RELEASE cycle.
  
  Approved by:  re (implicit)
  Sponsored by: The FreeBSD Foundation

Modified:
  stable/11/sys/conf/newvers.sh

Modified: stable/11/sys/conf/newvers.sh
==
--- stable/11/sys/conf/newvers.sh   Thu Jun 22 22:53:10 2017
(r320250)
+++ stable/11/sys/conf/newvers.sh   Fri Jun 23 00:00:00 2017
(r320251)
@@ -44,7 +44,7 @@
 
 TYPE="FreeBSD"
 REVISION="11.1"
-BRANCH="BETA2"
+BRANCH="BETA3"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
 fi
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r306806 - head/usr.bin/dtc

2017-06-22 Thread Conrad Meyer

Hi Ed,

I suspect this commit accidentally introduced a bug in define handling
and was detected by Coverity as dead code (CID 1376409).

On Fri, Oct 7, 2016 at 5:57 AM, Ed Maste  wrote:
> Author: emaste
> Date: Fri Oct  7 12:57:35 2016
> New Revision: 306806
> URL: https://svnweb.freebsd.org/changeset/base/306806
>
> Log:
>   Improvements to BSD-licensed DTC.
>
>   - Numerous crash and bug fixes
>   - Improved warning and error messages
>   - Permit multiple labels on nodes and properties
>   - Fix node@address references
>   - Add support for /delete-node/
>   - Consume whitespace after a node
>   - Read the next token before the second /memreserve/
>   - Fix parsing of whitespace
>   - Clean up /delete-node/ and add support for /delete-property/
>   - Handle /delete-node/ specifying a unit address
>
>   Obtained from:https://github.com/davidchisnall/dtc @df5ede4
>
> Modified:
>   head/usr.bin/dtc/checking.cc
>   head/usr.bin/dtc/checking.hh
>   head/usr.bin/dtc/dtb.cc
>   head/usr.bin/dtc/dtb.hh
>   head/usr.bin/dtc/dtc.1
>   head/usr.bin/dtc/dtc.cc
>   head/usr.bin/dtc/fdt.cc
>   head/usr.bin/dtc/fdt.hh
>   head/usr.bin/dtc/input_buffer.cc
>   head/usr.bin/dtc/input_buffer.hh
>   head/usr.bin/dtc/string.cc
>   head/usr.bin/dtc/util.hh

The original diff email was truncated, but this function was both
moved from fdt.cc to input_buffer.cc and modified at the same time:

fdt.cc:
@@ -1169,87 +1327,10 @@
  }
 }

-bool
-device_tree::parse_include(input_buffer ,
-const std::string ,
-std::vector ,
-FILE *depfile,
-bool _header)
-{
- if (!input.consume("/include/"))
- {
- return false;
- }
- bool reallyInclude = true;
- if (input.consume("if "))
- {
- input.next_token();
- string name = string::parse_property_name(input);
- // XXX: Error handling
- if (defines.find(name) == defines.end())
- {
- reallyInclude = false;
- }
- input.consume('/');
- }
- input.next_token();
- if (!input.consume('"'))
- {
- input.parse_error("Expected quoted filename");
- valid = false;
- return false;
- }
- int length = 0;
- while (input[length] != '"') length++;
-
- std::string file((const char*)input, length);
- std::string include_file = dir + '/' + file;
- input.consume(file.c_str());
- if (!reallyInclude)
- {
- input.consume('"');
- input.next_token();
- return true;
- }
...

input_buffer.cc:

+void
+text_input_buffer::handle_include()
+{
+ bool reallyInclude = true;
+ if (consume("if "))
+ {
+ next_token();
+ string name = parse_property_name();
+ if (defines.count(name) > 0)
+ {
+ reallyInclude = true;
+ }
+ consume('/');
+ }
+ next_token();
+ if (!consume('"'))
+ {
+ parse_error("Expected quoted filename");
+ return;
+ }
+ string file = parse_to('"');
+ consume('"');
+ if (!reallyInclude)
+ {
+ return;
+ }

Note the use of the 'reallyInclude' sentinel.  In the old function, it
would be false if a "define" wasn't found in the "defines" lookup
table, causing an early function return.

In the new function, it is only ever initialized to true — even if the
"define" isn't located in the global "defines" lookup table.

Maybe the sense of the 'if (defines.count(name) > 0)' check and set
should be inverted?  Something like:

if (defines.count(name) <= 0)
   reallyInclude = false;

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

svn commit: r320250 - head/share/mk

2017-06-22 Thread Bryan Drewery

Author: bdrewery
Date: Thu Jun 22 22:53:10 2017
New Revision: 320250
URL: https://svnweb.freebsd.org/changeset/base/320250

Log:
  Provide proper values for X_LINKER_TYPE/VERSION when XLD == LD.
  
  MFC after:2 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/share/mk/bsd.linker.mk

Modified: head/share/mk/bsd.linker.mk
==
--- head/share/mk/bsd.linker.mk Thu Jun 22 22:53:07 2017(r320249)
+++ head/share/mk/bsd.linker.mk Thu Jun 22 22:53:10 2017(r320250)
@@ -60,6 +60,10 @@ ${X_}LINKER_VERSION!=echo "${_v:M[1-9].[0-9]*}" | \
 .undef _ld_version
 .undef _v
 .endif
+.else
+# Use LD's values
+X_LINKER_TYPE= ${LINKER_TYPE}
+X_LINKER_VERSION=  ${LINKER_VERSION}
 .endif # ${ld} == "LD" || (${ld} == "XLD" && ${XLD} != ${LD})
 
 # Export the values so sub-makes don't have to look them up again, using the
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r320249 - head/share/mk

2017-06-22 Thread Bryan Drewery

Author: bdrewery
Date: Thu Jun 22 22:53:07 2017
New Revision: 320249
URL: https://svnweb.freebsd.org/changeset/base/320249

Log:
  Don't overwrite already-set LINKER_VERSION/LINKER_TYPE.
  
  MFC after:2 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/share/mk/bsd.linker.mk

Modified: head/share/mk/bsd.linker.mk
==
--- head/share/mk/bsd.linker.mk Thu Jun 22 21:22:12 2017(r320248)
+++ head/share/mk/bsd.linker.mk Thu Jun 22 22:53:07 2017(r320249)
@@ -41,7 +41,7 @@ ${var}=   ${${var}.${${X_}_ld_hash}}
 .endif
 
 .if ${ld} == "LD" || (${ld} == "XLD" && ${XLD} != ${LD})
-
+.if !defined(${X_}LINKER_TYPE) || !defined(${X_}LINKER_VERSION)
 _ld_version!=  ${${ld}} --version 2>/dev/null | head -n 1 || echo none
 .if ${_ld_version} == "none"
 .error Unable to determine linker type from ${ld}=${${ld}}
@@ -59,6 +59,7 @@ ${X_}LINKER_VERSION!= echo "${_v:M[1-9].[0-9]*}" | \
  awk -F. '{print $$1 * 1 + $$2 * 100 + $$3;}'
 .undef _ld_version
 .undef _v
+.endif
 .endif # ${ld} == "LD" || (${ld} == "XLD" && ${XLD} != ${LD})
 
 # Export the values so sub-makes don't have to look them up again, using the
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r320248 - head/share/mk

2017-06-22 Thread Bryan Drewery

On 6/22/2017 2:44 PM, O. Hartmann wrote:
> Am Thu, 22 Jun 2017 21:22:12 + (UTC)
> Bryan Drewery  schrieb:
> 
>> Author: bdrewery
>> Date: Thu Jun 22 21:22:12 2017
>> New Revision: 320248
>> URL: https://svnweb.freebsd.org/changeset/base/320248
>>
>> Log:
>>   LINKER_VERSION: Support external binutils.
>>   
>>   The ports binutils stores the version in the 5th word so just look for
>>   a version using a pattern instead.
>>   
>>   Reported by:   rpokala
>>   MFC after: 2 weeks
>>   Sponsored by:  Dell EMC Isilon
>>
>> Modified:
>>   head/share/mk/bsd.linker.mk
>>
>> Modified: head/share/mk/bsd.linker.mk
>> ==
>> --- head/share/mk/bsd.linker.mk  Thu Jun 22 21:03:30 2017
>> (r320247)
>> +++ head/share/mk/bsd.linker.mk  Thu Jun 22 21:22:12 2017
>> (r320248)
>> @@ -48,7 +48,7 @@ _ld_version!=  ${${ld}} --version 2>/dev/null | head -n
>>  .endif
>>  .if ${_ld_version:[1..2]} == "GNU ld"
>>  ${X_}LINKER_TYPE=   binutils
>> -_v= ${_ld_version:[3]}
>> +_v= ${_ld_version:M[1-9].[0-9]*:[1]}
>>  .elif ${_ld_version:[1]} == "LLD"
>>  ${X_}LINKER_TYPE=   lld
>>  _v= ${_ld_version:[2]}
>> ___
>> svn-src-h...@freebsd.org mailing list
>> https://lists.freebsd.org/mailman/listinfo/svn-src-head
>> To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
> 
> make installworld:
> 
> 
> [...]
> --- installworld ---
> mkdir -p /tmp/install.miEfyZyL
> progs=$(for prog in [ awk cap_mkdb cat chflags chmod chown cmp cp  date echo 
> egrep find
> grep id install   ln make mkdir mtree mv pwd_mkdb  rm sed services_mkdb sh 
> strip sysctl
> test true uname wc zic tzsetup   makewhatis; do  if progpath=`which $prog`; 
> then  echo
> $progpath;  else  echo "Required tool $prog not found in PATH." >&2;  exit 1; 
>  fi;
> done);  libs=$(ldd -f "%o %p\n" -f "%o %p\n" $progs 2>/dev/null | sort -u |  
> while read
> line; do  $line;  if [ "$2 $3" != "not found" ]; then  echo $2;  else  echo 
> "Required
> library $1 not found." >&2;  exit 1;  fi;  done);  cp $libs $progs 
> /tmp/install.miEfyZyL
> cp -R ${PATH_LOCALE:-"/usr/share/locale"} /tmp/install.miEfyZyL/locale cd 
> /usr/src;
> COMPILER_VERSION=4  COMPILER_FEATURES=c++11  COMPILER_TYPE=clang
> COMPILER_FREEBSD_VERSION=126 MAKEOBJDIRPREFIX=/usr/obj  MACHINE_ARCH=amd64
> MACHINE=amd64  CPUTYPE=native CC="cc -target x86_64-unknown-freebsd12.0
> --sysroot=/usr/obj/usr/src/tmp -B/usr/obj/usr/src/tmp/usr/bin" CXX="c++  
> -target
> x86_64-unknown-freebsd12.0 --sysroot=/usr/obj/usr/src/tmp
> -B/usr/obj/usr/src/tmp/usr/bin"  CPP="cpp -target x86_64-unknown-freebsd12.0
> --sysroot=/usr/obj/usr/src/tmp -B/usr/obj/usr/src/tmp/usr/bin"  AS="as" 
> AR="ar" LD="ld"
> LLVM_LINK=""  NM=nm OBJCOPY="objcopy"  RANLIB=ranlib STRINGS=  SIZE="size"
> PATH=/usr/obj/usr/src/tmp/legacy/usr/sbin:/usr/obj/usr/src/tmp/legacy/usr/bin:/usr/obj/usr/src/tmp/legacy/bin:/usr/obj/usr/src/tmp/usr/sbin:/usr/obj/usr/src/tmp/usr/bin:/tmp/install.miEfyZyL
> LD_LIBRARY_PATH=/tmp/install.miEfyZyL  
> PATH_LOCALE=/tmp/install.miEfyZyL/locale make -f
> Makefile.inc1__MAKE_SHELL=/tmp/install.miEfyZyL/sh reinstall;
> COMPILER_VERSION=4  COMPILER_FEATURES=c++11  COMPILER_TYPE=clang
> COMPILER_FREEBSD_VERSION=126 MAKEOBJDIRPREFIX=/usr/obj  MACHINE_ARCH=amd64
> MACHINE=amd64  CPUTYPE=native CC="cc -target x86_64-unknown-freebsd12.0
> --sysroot=/usr/obj/usr/src/tmp -B/usr/obj/usr/src/tmp/usr/bin" CXX="c++  
> -target
> x86_64-unknown-freebsd12.0 --sysroot=/usr/obj/usr/src/tmp
> -B/usr/obj/usr/src/tmp/usr/bin"  CPP="cpp -target x86_64-unknown-freebsd12.0
> --sysroot=/usr/obj/usr/src/tmp -B/usr/obj/usr/src/tmp/usr/bin"  AS="as" 
> AR="ar" LD="ld"
> LLVM_LINK=""  NM=nm OBJCOPY="objcopy"  RANLIB=ranlib STRINGS=  SIZE="size"
> PATH=/usr/obj/usr/src/tmp/legacy/usr/sbin:/usr/obj/usr/src/tmp/legacy/usr/bin:/usr/obj/usr/src/tmp/legacy/bin:/usr/obj/usr/src/tmp/usr/sbin:/usr/obj/usr/src/tmp/usr/bin:/tmp/install.miEfyZyL
> LD_LIBRARY_PATH=/tmp/install.miEfyZyL  
> PATH_LOCALE=/tmp/install.miEfyZyL/locale rm
> -rf /tmp/install.miEfyZyL sh: head: not found make[2]: 
> "/usr/src/share/mk/bsd.linker.mk"
> line 41: Unable to determine linker type from LD=ld *** [installworld] Error 
> code 1
> 
> 

r320249 fixes it. No need to do another buildworld.

-- 
Regards,
Bryan Drewery



signature.asc
Description: OpenPGP digital signature

Re: svn commit: r320248 - head/share/mk

2017-06-22 Thread Bryan Drewery

On 6/22/2017 2:44 PM, O. Hartmann wrote:
> Am Thu, 22 Jun 2017 21:22:12 + (UTC)
> Bryan Drewery  schrieb:
> 
>> Author: bdrewery
>> Date: Thu Jun 22 21:22:12 2017
>> New Revision: 320248
>> URL: https://svnweb.freebsd.org/changeset/base/320248
>>
>> Log:
>>   LINKER_VERSION: Support external binutils.
>>   
>>   The ports binutils stores the version in the 5th word so just look for
>>   a version using a pattern instead.
>>   
>>   Reported by:   rpokala
>>   MFC after: 2 weeks
>>   Sponsored by:  Dell EMC Isilon
>>
>> Modified:
>>   head/share/mk/bsd.linker.mk
>>
>> Modified: head/share/mk/bsd.linker.mk
>> ==
>> --- head/share/mk/bsd.linker.mk  Thu Jun 22 21:03:30 2017
>> (r320247)
>> +++ head/share/mk/bsd.linker.mk  Thu Jun 22 21:22:12 2017
>> (r320248)
>> @@ -48,7 +48,7 @@ _ld_version!=  ${${ld}} --version 2>/dev/null | head -n
>>  .endif
>>  .if ${_ld_version:[1..2]} == "GNU ld"
>>  ${X_}LINKER_TYPE=   binutils
>> -_v= ${_ld_version:[3]}
>> +_v= ${_ld_version:M[1-9].[0-9]*:[1]}
>>  .elif ${_ld_version:[1]} == "LLD"
>>  ${X_}LINKER_TYPE=   lld
>>  _v= ${_ld_version:[2]}
>> ___
>> svn-src-h...@freebsd.org mailing list
>> https://lists.freebsd.org/mailman/listinfo/svn-src-head
>> To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
> 
> make installworld:
> 
> 
> [...]
> --- installworld ---
> mkdir -p /tmp/install.miEfyZyL
> progs=$(for prog in [ awk cap_mkdb cat chflags chmod chown cmp cp  date echo 
> egrep find
> grep id install   ln make mkdir mtree mv pwd_mkdb  rm sed services_mkdb sh 
> strip sysctl
> test true uname wc zic tzsetup   makewhatis; do  if progpath=`which $prog`; 
> then  echo
> $progpath;  else  echo "Required tool $prog not found in PATH." >&2;  exit 1; 
>  fi;
> done);  libs=$(ldd -f "%o %p\n" -f "%o %p\n" $progs 2>/dev/null | sort -u |  
> while read
> line; do  $line;  if [ "$2 $3" != "not found" ]; then  echo $2;  else  echo 
> "Required
> library $1 not found." >&2;  exit 1;  fi;  done);  cp $libs $progs 
> /tmp/install.miEfyZyL
> cp -R ${PATH_LOCALE:-"/usr/share/locale"} /tmp/install.miEfyZyL/locale cd 
> /usr/src;
> COMPILER_VERSION=4  COMPILER_FEATURES=c++11  COMPILER_TYPE=clang
> COMPILER_FREEBSD_VERSION=126 MAKEOBJDIRPREFIX=/usr/obj  MACHINE_ARCH=amd64
> MACHINE=amd64  CPUTYPE=native CC="cc -target x86_64-unknown-freebsd12.0
> --sysroot=/usr/obj/usr/src/tmp -B/usr/obj/usr/src/tmp/usr/bin" CXX="c++  
> -target
> x86_64-unknown-freebsd12.0 --sysroot=/usr/obj/usr/src/tmp
> -B/usr/obj/usr/src/tmp/usr/bin"  CPP="cpp -target x86_64-unknown-freebsd12.0
> --sysroot=/usr/obj/usr/src/tmp -B/usr/obj/usr/src/tmp/usr/bin"  AS="as" 
> AR="ar" LD="ld"
> LLVM_LINK=""  NM=nm OBJCOPY="objcopy"  RANLIB=ranlib STRINGS=  SIZE="size"
> PATH=/usr/obj/usr/src/tmp/legacy/usr/sbin:/usr/obj/usr/src/tmp/legacy/usr/bin:/usr/obj/usr/src/tmp/legacy/bin:/usr/obj/usr/src/tmp/usr/sbin:/usr/obj/usr/src/tmp/usr/bin:/tmp/install.miEfyZyL
> LD_LIBRARY_PATH=/tmp/install.miEfyZyL  
> PATH_LOCALE=/tmp/install.miEfyZyL/locale make -f
> Makefile.inc1__MAKE_SHELL=/tmp/install.miEfyZyL/sh reinstall;
> COMPILER_VERSION=4  COMPILER_FEATURES=c++11  COMPILER_TYPE=clang
> COMPILER_FREEBSD_VERSION=126 MAKEOBJDIRPREFIX=/usr/obj  MACHINE_ARCH=amd64
> MACHINE=amd64  CPUTYPE=native CC="cc -target x86_64-unknown-freebsd12.0
> --sysroot=/usr/obj/usr/src/tmp -B/usr/obj/usr/src/tmp/usr/bin" CXX="c++  
> -target
> x86_64-unknown-freebsd12.0 --sysroot=/usr/obj/usr/src/tmp
> -B/usr/obj/usr/src/tmp/usr/bin"  CPP="cpp -target x86_64-unknown-freebsd12.0
> --sysroot=/usr/obj/usr/src/tmp -B/usr/obj/usr/src/tmp/usr/bin"  AS="as" 
> AR="ar" LD="ld"
> LLVM_LINK=""  NM=nm OBJCOPY="objcopy"  RANLIB=ranlib STRINGS=  SIZE="size"
> PATH=/usr/obj/usr/src/tmp/legacy/usr/sbin:/usr/obj/usr/src/tmp/legacy/usr/bin:/usr/obj/usr/src/tmp/legacy/bin:/usr/obj/usr/src/tmp/usr/sbin:/usr/obj/usr/src/tmp/usr/bin:/tmp/install.miEfyZyL
> LD_LIBRARY_PATH=/tmp/install.miEfyZyL  
> PATH_LOCALE=/tmp/install.miEfyZyL/locale rm
> -rf /tmp/install.miEfyZyL sh: head: not found make[2]: 
> "/usr/src/share/mk/bsd.linker.mk"
> line 41: Unable to determine linker type from LD=ld *** [installworld] Error 
> code 1
> 
> 

r320247 should have prevented this.  Did you do a full buildworld after
SVN up? Which revision are you actually on?

-- 
Regards,
Bryan Drewery



signature.asc
Description: OpenPGP digital signature

Re: svn commit: r320248 - head/share/mk

2017-06-22 Thread O. Hartmann

Am Thu, 22 Jun 2017 21:22:12 + (UTC)
Bryan Drewery  schrieb:

> Author: bdrewery
> Date: Thu Jun 22 21:22:12 2017
> New Revision: 320248
> URL: https://svnweb.freebsd.org/changeset/base/320248
> 
> Log:
>   LINKER_VERSION: Support external binutils.
>   
>   The ports binutils stores the version in the 5th word so just look for
>   a version using a pattern instead.
>   
>   Reported by:rpokala
>   MFC after:  2 weeks
>   Sponsored by:   Dell EMC Isilon
> 
> Modified:
>   head/share/mk/bsd.linker.mk
> 
> Modified: head/share/mk/bsd.linker.mk
> ==
> --- head/share/mk/bsd.linker.mk   Thu Jun 22 21:03:30 2017
> (r320247)
> +++ head/share/mk/bsd.linker.mk   Thu Jun 22 21:22:12 2017
> (r320248)
> @@ -48,7 +48,7 @@ _ld_version!=   ${${ld}} --version 2>/dev/null | head -n
>  .endif
>  .if ${_ld_version:[1..2]} == "GNU ld"
>  ${X_}LINKER_TYPE=binutils
> -_v=  ${_ld_version:[3]}
> +_v=  ${_ld_version:M[1-9].[0-9]*:[1]}
>  .elif ${_ld_version:[1]} == "LLD"
>  ${X_}LINKER_TYPE=lld
>  _v=  ${_ld_version:[2]}
> ___
> svn-src-h...@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

make installworld:


[...]
--- installworld ---
mkdir -p /tmp/install.miEfyZyL
progs=$(for prog in [ awk cap_mkdb cat chflags chmod chown cmp cp  date echo 
egrep find
grep id install   ln make mkdir mtree mv pwd_mkdb  rm sed services_mkdb sh 
strip sysctl
test true uname wc zic tzsetup   makewhatis; do  if progpath=`which $prog`; 
then  echo
$progpath;  else  echo "Required tool $prog not found in PATH." >&2;  exit 1;  
fi;
done);  libs=$(ldd -f "%o %p\n" -f "%o %p\n" $progs 2>/dev/null | sort -u |  
while read
line; do  $line;  if [ "$2 $3" != "not found" ]; then  echo $2;  else  echo 
"Required
library $1 not found." >&2;  exit 1;  fi;  done);  cp $libs $progs 
/tmp/install.miEfyZyL
cp -R ${PATH_LOCALE:-"/usr/share/locale"} /tmp/install.miEfyZyL/locale cd 
/usr/src;
COMPILER_VERSION=4  COMPILER_FEATURES=c++11  COMPILER_TYPE=clang
COMPILER_FREEBSD_VERSION=126 MAKEOBJDIRPREFIX=/usr/obj  MACHINE_ARCH=amd64
MACHINE=amd64  CPUTYPE=native CC="cc -target x86_64-unknown-freebsd12.0
--sysroot=/usr/obj/usr/src/tmp -B/usr/obj/usr/src/tmp/usr/bin" CXX="c++  -target
x86_64-unknown-freebsd12.0 --sysroot=/usr/obj/usr/src/tmp
-B/usr/obj/usr/src/tmp/usr/bin"  CPP="cpp -target x86_64-unknown-freebsd12.0
--sysroot=/usr/obj/usr/src/tmp -B/usr/obj/usr/src/tmp/usr/bin"  AS="as" AR="ar" 
LD="ld"
LLVM_LINK=""  NM=nm OBJCOPY="objcopy"  RANLIB=ranlib STRINGS=  SIZE="size"
PATH=/usr/obj/usr/src/tmp/legacy/usr/sbin:/usr/obj/usr/src/tmp/legacy/usr/bin:/usr/obj/usr/src/tmp/legacy/bin:/usr/obj/usr/src/tmp/usr/sbin:/usr/obj/usr/src/tmp/usr/bin:/tmp/install.miEfyZyL
LD_LIBRARY_PATH=/tmp/install.miEfyZyL  PATH_LOCALE=/tmp/install.miEfyZyL/locale 
make -f
Makefile.inc1__MAKE_SHELL=/tmp/install.miEfyZyL/sh reinstall;
COMPILER_VERSION=4  COMPILER_FEATURES=c++11  COMPILER_TYPE=clang
COMPILER_FREEBSD_VERSION=126 MAKEOBJDIRPREFIX=/usr/obj  MACHINE_ARCH=amd64
MACHINE=amd64  CPUTYPE=native CC="cc -target x86_64-unknown-freebsd12.0
--sysroot=/usr/obj/usr/src/tmp -B/usr/obj/usr/src/tmp/usr/bin" CXX="c++  -target
x86_64-unknown-freebsd12.0 --sysroot=/usr/obj/usr/src/tmp
-B/usr/obj/usr/src/tmp/usr/bin"  CPP="cpp -target x86_64-unknown-freebsd12.0
--sysroot=/usr/obj/usr/src/tmp -B/usr/obj/usr/src/tmp/usr/bin"  AS="as" AR="ar" 
LD="ld"
LLVM_LINK=""  NM=nm OBJCOPY="objcopy"  RANLIB=ranlib STRINGS=  SIZE="size"
PATH=/usr/obj/usr/src/tmp/legacy/usr/sbin:/usr/obj/usr/src/tmp/legacy/usr/bin:/usr/obj/usr/src/tmp/legacy/bin:/usr/obj/usr/src/tmp/usr/sbin:/usr/obj/usr/src/tmp/usr/bin:/tmp/install.miEfyZyL
LD_LIBRARY_PATH=/tmp/install.miEfyZyL  PATH_LOCALE=/tmp/install.miEfyZyL/locale 
rm
-rf /tmp/install.miEfyZyL sh: head: not found make[2]: 
"/usr/src/share/mk/bsd.linker.mk"
line 41: Unable to determine linker type from LD=ld *** [installworld] Error 
code 1


-- 
O. Hartmann

Ich widerspreche der Nutzung oder Übermittlung meiner Daten für
Werbezwecke oder für die Markt- oder Meinungsforschung (§ 28 Abs. 4 BDSG).


pgpCFCREKmtaE.pgp
Description: OpenPGP digital signature

svn commit: r320248 - head/share/mk

2017-06-22 Thread Bryan Drewery

Author: bdrewery
Date: Thu Jun 22 21:22:12 2017
New Revision: 320248
URL: https://svnweb.freebsd.org/changeset/base/320248

Log:
  LINKER_VERSION: Support external binutils.
  
  The ports binutils stores the version in the 5th word so just look for
  a version using a pattern instead.
  
  Reported by:  rpokala
  MFC after:2 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/share/mk/bsd.linker.mk

Modified: head/share/mk/bsd.linker.mk
==
--- head/share/mk/bsd.linker.mk Thu Jun 22 21:03:30 2017(r320247)
+++ head/share/mk/bsd.linker.mk Thu Jun 22 21:22:12 2017(r320248)
@@ -48,7 +48,7 @@ _ld_version!= ${${ld}} --version 2>/dev/null | head -n
 .endif
 .if ${_ld_version:[1..2]} == "GNU ld"
 ${X_}LINKER_TYPE=  binutils
-_v=${_ld_version:[3]}
+_v=${_ld_version:M[1-9].[0-9]*:[1]}
 .elif ${_ld_version:[1]} == "LLD"
 ${X_}LINKER_TYPE=  lld
 _v=${_ld_version:[2]}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r320245 - head/share/mk

2017-06-22 Thread Bryan Drewery

Author: bdrewery
Date: Thu Jun 22 21:03:24 2017
New Revision: 320245
URL: https://svnweb.freebsd.org/changeset/base/320245

Log:
  Support XLD for setting X_LINKER_TYPE and X_LINKER_VERSION.
  
  This is similar to r300350 for bsd.compiler.mk.
  
  MFC after:2 weeks
  Reviewed by:  emaste
  Sponsored by: Dell EMC Isilon
  Differential Revision:https://reviews.freebsd.org/D11309

Modified:
  head/share/mk/bsd.linker.mk

Modified: head/share/mk/bsd.linker.mk
==
--- head/share/mk/bsd.linker.mk Thu Jun 22 21:03:20 2017(r320244)
+++ head/share/mk/bsd.linker.mk Thu Jun 22 21:03:24 2017(r320245)
@@ -9,25 +9,39 @@
 # major * 1 + minor * 100 + tiny
 # It too can be overridden on the command line.
 #
+# These variables with an X_ prefix will also be provided if XLD is set.
+#
 # This file may be included multiple times, but only has effect the first time.
 #
 
 .if !target()
 :
 
-_ld_version!=  ${LD} --version 2>/dev/null | head -n 1 || echo none
+.for ld X_ in LD $${_empty_var_} XLD X_
+.if ${ld} == "LD" || !empty(XLD)
+.if ${ld} == "LD" || (${ld} == "XLD" && ${XLD} != ${LD})
+
+_ld_version!=  ${${ld}} --version 2>/dev/null | head -n 1 || echo none
 .if ${_ld_version} == "none"
-.error Unable to determine linker type from LD=${LD}
+.error Unable to determine linker type from ${ld}=${${ld}}
 .endif
 .if ${_ld_version:[1..2]} == "GNU ld"
-LINKER_TYPE=   binutils
+${X_}LINKER_TYPE=  binutils
 _v=${_ld_version:[3]}
 .elif ${_ld_version:[1]} == "LLD"
-LINKER_TYPE=   lld
+${X_}LINKER_TYPE=  lld
 _v=${_ld_version:[2]}
 .else
-.error Unknown linker from LD=${LD}: ${_ld_version}
+.error Unknown linker from ${ld}=${${ld}}: ${_ld_version}
 .endif
-LINKER_VERSION!=echo "${_v:M[1-9].[0-9]*}" | awk -F. '{print $$1 * 1 + $$2 
* 100 + $$3;}'
+${X_}LINKER_VERSION!=  echo "${_v:M[1-9].[0-9]*}" | \
+ awk -F. '{print $$1 * 1 + $$2 * 100 + $$3;}'
+.undef _ld_version
+.undef _v
+.endif # ${ld} == "LD" || (${ld} == "XLD" && ${XLD} != ${LD})
+
+.endif # ${ld} == "LD" || !empty(XLD)
+.endfor# .for ld in LD XLD
+
 
 .endif # !target()
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r320244 - head/share/mk

2017-06-22 Thread Bryan Drewery

Author: bdrewery
Date: Thu Jun 22 21:03:20 2017
New Revision: 320244
URL: https://svnweb.freebsd.org/changeset/base/320244

Log:
  Add basic bsd.linker.mk auto included from bsd.compiler.mk.
  
  This will provide LINKER_TYPE and LINKER_VERSION.
  
  MFC after:2 weeks
  Reviewed by:  emaste
  Sponsored by: Dell EMC Isilon
  Differential Revision:https://reviews.freebsd.org/D11308

Added:
  head/share/mk/bsd.linker.mk   (contents, props changed)
Modified:
  head/share/mk/Makefile
  head/share/mk/bsd.compiler.mk

Modified: head/share/mk/Makefile
==
--- head/share/mk/Makefile  Thu Jun 22 20:32:23 2017(r320243)
+++ head/share/mk/Makefile  Thu Jun 22 21:03:20 2017(r320244)
@@ -33,6 +33,7 @@ FILES=\
bsd.kmod.mk \
bsd.lib.mk \
bsd.libnames.mk \
+   bsd.linker.mk \
bsd.links.mk \
bsd.man.mk \
bsd.mkopt.mk \

Modified: head/share/mk/bsd.compiler.mk
==
--- head/share/mk/bsd.compiler.mk   Thu Jun 22 20:32:23 2017
(r320243)
+++ head/share/mk/bsd.compiler.mk   Thu Jun 22 21:03:20 2017
(r320244)
@@ -194,4 +194,5 @@ ${var}.${${X_}_cc_hash}:=   ${${var}}
 .endif # ${cc} == "CC" || !empty(XCC)
 .endfor# .for cc in CC XCC
 
+.include 
 .endif # !target()

Added: head/share/mk/bsd.linker.mk
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/share/mk/bsd.linker.mk Thu Jun 22 21:03:20 2017(r320244)
@@ -0,0 +1,33 @@
+# $FreeBSD$
+
+# Setup variables for the linker.
+#
+# LINKER_TYPE is the major type of linker. Currently binutils and lld support
+# automatic detection.
+#
+# LINKER_VERSION is a numeric constant equal to:
+# major * 1 + minor * 100 + tiny
+# It too can be overridden on the command line.
+#
+# This file may be included multiple times, but only has effect the first time.
+#
+
+.if !target()
+:
+
+_ld_version!=  ${LD} --version 2>/dev/null | head -n 1 || echo none
+.if ${_ld_version} == "none"
+.error Unable to determine linker type from LD=${LD}
+.endif
+.if ${_ld_version:[1..2]} == "GNU ld"
+LINKER_TYPE=   binutils
+_v=${_ld_version:[3]}
+.elif ${_ld_version:[1]} == "LLD"
+LINKER_TYPE=   lld
+_v=${_ld_version:[2]}
+.else
+.error Unknown linker from LD=${LD}: ${_ld_version}
+.endif
+LINKER_VERSION!=echo "${_v:M[1-9].[0-9]*}" | awk -F. '{print $$1 * 1 + $$2 
* 100 + $$3;}'
+
+.endif # !target()
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r320247 - head

2017-06-22 Thread Bryan Drewery

Author: bdrewery
Date: Thu Jun 22 21:03:30 2017
New Revision: 320247
URL: https://svnweb.freebsd.org/changeset/base/320247

Log:
  Pass along LINKER_* vars during installworld and show in test-system-compiler.
  
  Sponsored by: Dell EMC Isilon

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==
--- head/Makefile.inc1  Thu Jun 22 21:03:27 2017(r320246)
+++ head/Makefile.inc1  Thu Jun 22 21:03:30 2017(r320247)
@@ -149,7 +149,8 @@ TEST_SYSTEM_COMPILER_VARS= \
WANT_COMPILER_TYPE WANT_COMPILER_VERSION WANT_COMPILER_VERSION_FILE \
WANT_COMPILER_FREEBSD_VERSION WANT_COMPILER_FREEBSD_VERSION_FILE \
CC COMPILER_TYPE COMPILER_FEATURES COMPILER_VERSION \
-   COMPILER_FREEBSD_VERSION
+   COMPILER_FREEBSD_VERSION \
+   LINKER_TYPE LINKER_VERSION
 test-system-compiler: .PHONY
 .for v in ${TEST_SYSTEM_COMPILER_VARS}
${_+_}@printf "%-35s= %s\n" "${v}" "${${v}}"
@@ -181,7 +182,9 @@ CROSSENV+=  COMPILER_VERSION=${X_COMPILER_VERSION} \
 _COMPILER_METADATA_VARS=   COMPILER_VERSION \
COMPILER_TYPE \
COMPILER_FEATURES \
-   COMPILER_FREEBSD_VERSION
+   COMPILER_FREEBSD_VERSION \
+   LINKER_VERSION \
+   LINKER_TYPE
 compiler-metadata.mk: .PHONY .META
@: > ${.TARGET}
@echo ".info Using cached compiler metadata from build at $$(hostname) 
on $$(date)" \
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r320246 - head/share/mk

2017-06-22 Thread Bryan Drewery

Author: bdrewery
Date: Thu Jun 22 21:03:27 2017
New Revision: 320246
URL: https://svnweb.freebsd.org/changeset/base/320246

Log:
  Support cached linker values in environment.
  
  This is similar to r289659 for bsd.compiler.mk.
  
  MFC after:2 weeks
  Reviewed by:  emaste
  Sponsored by: Dell EMC Isilon
  Differential Revision:https://reviews.freebsd.org/D11310

Modified:
  head/share/mk/bsd.linker.mk

Modified: head/share/mk/bsd.linker.mk
==
--- head/share/mk/bsd.linker.mk Thu Jun 22 21:03:24 2017(r320245)
+++ head/share/mk/bsd.linker.mk Thu Jun 22 21:03:27 2017(r320246)
@@ -19,6 +19,27 @@ :
 
 .for ld X_ in LD $${_empty_var_} XLD X_
 .if ${ld} == "LD" || !empty(XLD)
+# Try to import LINKER_TYPE and LINKER_VERSION from parent make.
+# The value is only used/exported for the same environment that impacts
+# LD and LINKER_* settings here.
+_exported_vars=${X_}LINKER_TYPE ${X_}LINKER_VERSION
+${X_}_ld_hash= ${${ld}}${MACHINE}${PATH}
+${X_}_ld_hash:=${${X_}_ld_hash:hash}
+# Only import if none of the vars are set somehow else.
+_can_export=   yes
+.for var in ${_exported_vars}
+.if defined(${var})
+_can_export=   no
+.endif
+.endfor
+.if ${_can_export} == yes
+.for var in ${_exported_vars}
+.if defined(${var}.${${X_}_ld_hash})
+${var}=${${var}.${${X_}_ld_hash}}
+.endif
+.endfor
+.endif
+
 .if ${ld} == "LD" || (${ld} == "XLD" && ${XLD} != ${LD})
 
 _ld_version!=  ${${ld}} --version 2>/dev/null | head -n 1 || echo none
@@ -39,6 +60,14 @@ ${X_}LINKER_VERSION!=echo "${_v:M[1-9].[0-9]*}" | \
 .undef _ld_version
 .undef _v
 .endif # ${ld} == "LD" || (${ld} == "XLD" && ${XLD} != ${LD})
+
+# Export the values so sub-makes don't have to look them up again, using the
+# hash key computed above.
+.for var in ${_exported_vars}
+${var}.${${X_}_ld_hash}:=  ${${var}}
+.export-env ${var}.${${X_}_ld_hash}
+.undef ${var}.${${X_}_ld_hash}
+.endfor
 
 .endif # ${ld} == "LD" || !empty(XLD)
 .endfor# .for ld in LD XLD
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r320243 - head/share/mk

2017-06-22 Thread Bryan Drewery

Author: bdrewery
Date: Thu Jun 22 20:32:23 2017
New Revision: 320243
URL: https://svnweb.freebsd.org/changeset/base/320243

Log:
  Fix spelling error.
  
  Reported by:  arc
  Sponsored by: Dell EMC Isilon

Modified:
  head/share/mk/bsd.compiler.mk

Modified: head/share/mk/bsd.compiler.mk
==
--- head/share/mk/bsd.compiler.mk   Thu Jun 22 19:25:17 2017
(r320242)
+++ head/share/mk/bsd.compiler.mk   Thu Jun 22 20:32:23 2017
(r320243)
@@ -9,7 +9,7 @@
 #
 # COMPILER_VERSION is a numeric constant equal to:
 # major * 1 + minor * 100 + tiny
-# It too can be overriden on the command line. When testing it, be sure to
+# It too can be overridden on the command line. When testing it, be sure to
 # make sure that you are limiting the test to a specific compiler. Testing
 # against 30300 for gcc likely isn't  what you wanted (since versions of gcc
 # prior to 4.2 likely have no prayer of working).
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r320242 - head/etc/ntp

2017-06-22 Thread Ian Lepore

On Thu, 2017-06-22 at 19:25 +, Cy Schubert wrote:
> Author: cy
> Date: Thu Jun 22 19:25:17 2017
> New Revision: 320242
> URL: https://svnweb.freebsd.org/changeset/base/320242
> 
> Log:
>   Update leap-seconds to leap-seconds.3701462400.
> 
> 
> Modified: head/etc/ntp/leap-seconds
> =
> =
> --- head/etc/ntp/leap-seconds Thu Jun 22 18:40:34 2017
> (r320241)
> +++ head/etc/ntp/leap-seconds Thu Jun 22 19:25:17 2017
> (r320242)
> @@ -128,7 +128,7 @@
>  #Washington, DC
>  #jeffrey.prilla...@usno.navy.mil
>  #
> -#Last Update of leap second values:   6 Jul 2016
> +#Last Update of leap second values:  18 Apr 2017
>  #
 #  The following line shows this last update date in NTP
> timestamp 
>  #format. This is the date on which the most recent change to
> @@ -136,7 +136,7 @@
>  #be identified by the unique pair of characters in the first
> two 
>  #columns as shown below.
>  #
> -#$    3676752000
> +#$    3701462400
>  #

Where did this leapfile come from?  The last update of leap second
values is supposed to change only when the actual list of offsets
changes, not when the file is updated to just change an expiration
date.  This is actually very explicitly documented in the file itself,
just a few lines down from this change:

  If an announcement by the IERS specifies that no leap second is 
  scheduled, then only the expiration date of the file will 
  be advanced to show that the information in the file is still
  current -- the update time stamp, the data and the name of the file 
  will not change.

> -#File expires on:  1 Jun 2017
> +#Updated through IERS Bulletin C 53
> +#File expires on:  1 Dec 2017
>  #
> -#@   3705264000
> +#@   3721075200
>  #

This expiration is wrong too, dangerously so IMO.  The data in the file
is good through 12-31-2017-23:59:59, although historical practice has
been to make the file expire a couple days before that.  Making it
expire 31 days early is about the worst possible choice... some systems
for notifying clients/consumers of an impending leap second (or the
lack thereof) only do so during the last month before the leap
opportunity -- this has the file expire just at the point such software
would consider it authoratative for dissemination.  

I will note however, unlike the update date, there is no formal written
description of how expiration date is determined, so the previous
paragraph is just my opinion and experience working in the timing
field.

A leapfile without these problems can be found at

  ftp://time.nist.gov/pub/leap-seconds.list

-- Ian

>  2272060800   10  # 1 Jan 1972
>  2287785600   11  # 1 Jul 1972
> @@ -216,5 +216,5 @@
>  #the hash line is also ignored in the
>  #computation.
>  #
> -#h   63f8fea8 587c099d abcf130a ad525eae 3e105052
> +#h   3f004255 91f969f7 252361e5 27aa6754 eb6b7c72
>  #
> 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r320242 - head/etc/ntp

2017-06-22 Thread Cy Schubert

Author: cy
Date: Thu Jun 22 19:25:17 2017
New Revision: 320242
URL: https://svnweb.freebsd.org/changeset/base/320242

Log:
  Update leap-seconds to leap-seconds.3701462400.
  
  As per https://datacenter.iers.org/eop/-/somos/5Rgv/latest/16:
  
   INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS)
  
  SERVICE INTERNATIONAL DE LA ROTATION TERRESTRE ET DES SYSTEMES DE REFERENCE
  
  SERVICE DE LA ROTATION TERRESTRE
  OBSERVATOIRE DE PARIS
  61, Av. de l'Observatoire 75014 PARIS (France)
  Tel.  : 33 (0) 1 40 51 23 35
  FAX   : 33 (0) 1 40 51 22 91
  Internet  : services.i...@obspm.fr
  
   Paris, 9 January 2017
  
   Bulletin C 53
  
   To authorities responsible
   for the measurement and
   distribution of time
  
INFORMATION ON UTC - TAI
  
   NO leap second will be introduced at the end of June 2017.
   The difference between Coordinated Universal Time UTC and the
   International Atomic Time TAI is :
  
   from 2017 January 1, 0h UTC, until further notice : UTC-TAI = -37 s
  
   Leap seconds can be introduced in UTC at the end of the months of December
   or June,  depending on the evolution of UT1-TAI. Bulletin C is mailed every
   six months, either to announce a time step in UTC, or to confirm that there
   will be no time step at the next possible date.
  
  Christian BIZOUARD
  Director
  Earth Orientation Center of IERS
Observatoire de Paris, France
  
  Obtained from:
ftp://tycho.usno.navy.mil/pub/ntp/leap-seconds.3701462400
  MFC after:3 days

Modified:
  head/etc/ntp/leap-seconds

Modified: head/etc/ntp/leap-seconds
==
--- head/etc/ntp/leap-seconds   Thu Jun 22 18:40:34 2017(r320241)
+++ head/etc/ntp/leap-seconds   Thu Jun 22 19:25:17 2017(r320242)
@@ -128,7 +128,7 @@
 #  Washington, DC
 #  jeffrey.prilla...@usno.navy.mil
 #
-#  Last Update of leap second values:   6 Jul 2016
+#  Last Update of leap second values:  18 Apr 2017
 #
 #  The following line shows this last update date in NTP timestamp 
 #  format. This is the date on which the most recent change to
@@ -136,7 +136,7 @@
 #  be identified by the unique pair of characters in the first two 
 #  columns as shown below.
 #
-#$  3676752000
+#$  3701462400
 #
 #  The data in this file will be updated periodically as new leap 
 #  seconds are announced. In addition to being entered on the line
@@ -168,10 +168,10 @@
 #  current -- the update time stamp, the data and the name of the file 
 #  will not change.
 #
-#  Updated through IERS Bulletin C 52
-#  File expires on:  1 Jun 2017
+#  Updated through IERS Bulletin C 53
+#  File expires on:  1 Dec 2017
 #
-#@ 3705264000
+#@ 3721075200
 #
 2272060800 10  # 1 Jan 1972
 2287785600 11  # 1 Jul 1972
@@ -216,5 +216,5 @@
 #  the hash line is also ignored in the
 #  computation.
 #
-#h 63f8fea8 587c099d abcf130a ad525eae 3e105052
+#h 3f004255 91f969f7 252361e5 27aa6754 eb6b7c72
 #
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r320241 - stable/11/sys/kern

2017-06-22 Thread Mark Johnston

Author: markj
Date: Thu Jun 22 18:40:34 2017
New Revision: 320241
URL: https://svnweb.freebsd.org/changeset/base/320241

Log:
  MFC r320124:
  Fix the !TD_IS_IDLETHREAD(curthread) locking assertions.
  
  Approved by:  re (kib)

Modified:
  stable/11/sys/kern/kern_mutex.c
  stable/11/sys/kern/kern_rwlock.c
  stable/11/sys/kern/kern_sx.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/kern/kern_mutex.c
==
--- stable/11/sys/kern/kern_mutex.c Thu Jun 22 18:39:52 2017
(r320240)
+++ stable/11/sys/kern/kern_mutex.c Thu Jun 22 18:40:34 2017
(r320241)
@@ -233,7 +233,8 @@ __mtx_lock_flags(volatile uintptr_t *c, int opts, cons
 
m = mtxlock2mtx(c);
 
-   KASSERT(kdb_active != 0 || !TD_IS_IDLETHREAD(curthread),
+   KASSERT(kdb_active != 0 || SCHEDULER_STOPPED() ||
+   !TD_IS_IDLETHREAD(curthread),
("mtx_lock() by idle thread %p on sleep mutex %s @ %s:%d",
curthread, m->lock_object.lo_name, file, line));
KASSERT(m->mtx_lock != MTX_DESTROYED,
@@ -390,7 +391,7 @@ _mtx_trylock_flags_(volatile uintptr_t *c, int opts, c
 
m = mtxlock2mtx(c);
 
-   KASSERT(kdb_active != 0 || !TD_IS_IDLETHREAD(curthread),
+   KASSERT(kdb_active != 0 || !TD_IS_IDLETHREAD(td),
("mtx_trylock() by idle thread %p on sleep mutex %s @ %s:%d",
curthread, m->lock_object.lo_name, file, line));
KASSERT(m->mtx_lock != MTX_DESTROYED,

Modified: stable/11/sys/kern/kern_rwlock.c
==
--- stable/11/sys/kern/kern_rwlock.cThu Jun 22 18:39:52 2017
(r320240)
+++ stable/11/sys/kern/kern_rwlock.cThu Jun 22 18:40:34 2017
(r320241)
@@ -269,7 +269,8 @@ _rw_wlock_cookie(volatile uintptr_t *c, const char *fi
 
rw = rwlock2rw(c);
 
-   KASSERT(kdb_active != 0 || !TD_IS_IDLETHREAD(curthread),
+   KASSERT(kdb_active != 0 || SCHEDULER_STOPPED() ||
+   !TD_IS_IDLETHREAD(curthread),
("rw_wlock() by idle thread %p on rwlock %s @ %s:%d",
curthread, rw->lock_object.lo_name, file, line));
KASSERT(rw->rw_lock != RW_DESTROYED,
@@ -305,7 +306,7 @@ __rw_try_wlock(volatile uintptr_t *c, const char *file
 
rw = rwlock2rw(c);
 
-   KASSERT(kdb_active != 0 || !TD_IS_IDLETHREAD(curthread),
+   KASSERT(kdb_active != 0 || !TD_IS_IDLETHREAD(td),
("rw_try_wlock() by idle thread %p on rwlock %s @ %s:%d",
curthread, rw->lock_object.lo_name, file, line));
KASSERT(rw->rw_lock != RW_DESTROYED,
@@ -615,7 +616,8 @@ __rw_rlock(volatile uintptr_t *c, const char *file, in
td = curthread;
rw = rwlock2rw(c);
 
-   KASSERT(kdb_active != 0 || !TD_IS_IDLETHREAD(td),
+   KASSERT(kdb_active != 0 || SCHEDULER_STOPPED_TD(td) ||
+   !TD_IS_IDLETHREAD(td),
("rw_rlock() by idle thread %p on rwlock %s @ %s:%d",
td, rw->lock_object.lo_name, file, line));
KASSERT(rw->rw_lock != RW_DESTROYED,
@@ -815,7 +817,6 @@ _rw_runlock_cookie(volatile uintptr_t *c, const char *
 
TD_LOCKS_DEC(curthread);
 }
-
 
 /*
  * This function is called when we are unable to obtain a write lock on the

Modified: stable/11/sys/kern/kern_sx.c
==
--- stable/11/sys/kern/kern_sx.cThu Jun 22 18:39:52 2017
(r320240)
+++ stable/11/sys/kern/kern_sx.cThu Jun 22 18:40:34 2017
(r320241)
@@ -293,7 +293,8 @@ _sx_xlock(struct sx *sx, int opts, const char *file, i
uintptr_t tid, x;
int error = 0;
 
-   KASSERT(kdb_active != 0 || !TD_IS_IDLETHREAD(curthread),
+   KASSERT(kdb_active != 0 || SCHEDULER_STOPPED() ||
+   !TD_IS_IDLETHREAD(curthread),
("sx_xlock() by idle thread %p on sx %s @ %s:%d",
curthread, sx->lock_object.lo_name, file, line));
KASSERT(sx->sx_lock != SX_LOCK_DESTROYED,
@@ -330,7 +331,7 @@ sx_try_xlock_(struct sx *sx, const char *file, int lin
if (SCHEDULER_STOPPED_TD(td))
return (1);
 
-   KASSERT(kdb_active != 0 || !TD_IS_IDLETHREAD(curthread),
+   KASSERT(kdb_active != 0 || !TD_IS_IDLETHREAD(td),
("sx_try_xlock() by idle thread %p on sx %s @ %s:%d",
curthread, sx->lock_object.lo_name, file, line));
KASSERT(sx->sx_lock != SX_LOCK_DESTROYED,
@@ -1028,7 +1029,8 @@ _sx_slock(struct sx *sx, int opts, const char *file, i
uintptr_t x;
int error;
 
-   KASSERT(kdb_active != 0 || !TD_IS_IDLETHREAD(curthread),
+   KASSERT(kdb_active != 0 || SCHEDULER_STOPPED() ||
+   !TD_IS_IDLETHREAD(curthread),
("sx_slock() by idle thread %p on sx %s @ %s:%d",
curthread, sx->lock_object.lo_name, file, line));
KASSERT(sx->sx_lock != SX_LOCK_DESTROYED,

svn commit: r320240 - head/include

2017-06-22 Thread Ed Schouten

Author: ed
Date: Thu Jun 22 18:39:52 2017
New Revision: 320240
URL: https://svnweb.freebsd.org/changeset/base/320240

Log:
  Use __ISO_C_VISIBLE, as opposed to testing __STDC_VERSION__.
  
  FreeBSD's C library uses __STDC_VERSION__ to determine whether the
  compiler provides language features specific to a certain version of the
  C standard. __ISO_C_VISIBLE is used to specify which library features
  need to be exposed.
  
  max_align_t currently uses __STDC_VERSION__, even though it should be
  using __ISO_C_VISIBLE to remain consistent with the rest of the headers
  in include/.
  
  Reviewed by:  dim
  MFC after:1 month
  Differential Revision:https://reviews.freebsd.org/D11303

Modified:
  head/include/stddef.h

Modified: head/include/stddef.h
==
--- head/include/stddef.h   Thu Jun 22 17:10:34 2017(r320239)
+++ head/include/stddef.h   Thu Jun 22 18:39:52 2017(r320240)
@@ -62,7 +62,7 @@ typedef   ___wchar_t  wchar_t;
 #endif
 #endif
 
-#if __STDC_VERSION__ >= 201112L || __cplusplus >= 201103L
+#if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L
 #ifndef __CLANG_MAX_ALIGN_T_DEFINED
 typedef__max_align_t   max_align_t;
 #define __CLANG_MAX_ALIGN_T_DEFINED
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r320234 - head/sys/boot/efi/include

2017-06-22 Thread Ed Maste

On 22 June 2017 at 14:23, Dimitry Andric  wrote:
>> Modified: head/sys/boot/efi/include/efidef.h
>> ==
>> --- head/sys/boot/efi/include/efidef.hThu Jun 22 13:31:44 2017   
>>  (r320233)
>> +++ head/sys/boot/efi/include/efidef.hThu Jun 22 14:30:09 2017   
>>  (r320234)
>> @@ -178,6 +178,7 @@ typedef enum {
>> #define EFI_MEMORY_DESCRIPTOR_VERSION  1
>> typedef struct {
>> UINT32  Type;   // Field size is 32 bits 
>> followed by 32 bit pad
>> +UINT32  Pad;
>> EFI_PHYSICAL_ADDRESSPhysicalStart;  // Field size is 64 bits
>> EFI_VIRTUAL_ADDRESS VirtualStart;   // Field size is 64 bits
>> UINT64  NumberOfPages;  // Field size is 64 bits
>
> If you explicitly insert padding, it is better to mark the struct as
> __packed, I think.  Or at least also specify the alignment explicitly.

Perhaps, although this struct now matches the definition in the edk
and u-boot EFI headers.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r320234 - head/sys/boot/efi/include

2017-06-22 Thread Toomas Soome


> On 22. juuni 2017, at 21:23, Dimitry Andric  wrote:
> 
> On 22 Jun 2017, at 16:30, Ed Maste  wrote:
>> 
>> Author: emaste
>> Date: Thu Jun 22 14:30:09 2017
>> New Revision: 320234
>> URL: https://svnweb.freebsd.org/changeset/base/320234
>> 
>> Log:
>> Make structure padding explicit in EFI_MEMORY_DESCRIPTOR
>> 
>> The EFI memory descriptor 64-bit aligns PhysicalStart on both 32- and
>> 64-bit platforms.  Make the padding explicit for i386 EFI.
>> 
>> Submitted by:Siva Mahadevan 
>> MFC after:   3 weeks
>> Sponsored by:The FreeBSD Foundation
>> Differential Revision:   https://reviews.freebsd.org/D11301
>> 
>> Modified:
>> head/sys/boot/efi/include/efidef.h
>> 
>> Modified: head/sys/boot/efi/include/efidef.h
>> ==
>> --- head/sys/boot/efi/include/efidef.h   Thu Jun 22 13:31:44 2017
>> (r320233)
>> +++ head/sys/boot/efi/include/efidef.h   Thu Jun 22 14:30:09 2017
>> (r320234)
>> @@ -178,6 +178,7 @@ typedef enum {
>> #define EFI_MEMORY_DESCRIPTOR_VERSION  1
>> typedef struct {
>>UINT32  Type;   // Field size is 32 bits 
>> followed by 32 bit pad
>> +UINT32  Pad;
>>EFI_PHYSICAL_ADDRESSPhysicalStart;  // Field size is 64 bits
>>EFI_VIRTUAL_ADDRESS VirtualStart;   // Field size is 64 bits
>>UINT64  NumberOfPages;  // Field size is 64 bits
> 
> If you explicitly insert padding, it is better to mark the struct as
> __packed, I think.  Or at least also specify the alignment explicitly.
> 
> -Dimitry
> 


There is also second one with the same issue:

in sys/boot/efi/include/efiprot.h
@@ -90,12 +90,14 @@ typedef struct {
 BOOLEAN LogicalPartition;
 BOOLEAN ReadOnly;
 BOOLEAN WriteCaching;
+UINT8   pad1[3];
 
 UINT32  BlockSize;
 UINT32  IoAlign;
+UINT8   pad2[4];
 
 EFI_LBA LastBlock;
-} EFI_BLOCK_IO_MEDIA;
+} __packed EFI_BLOCK_IO_MEDIA;

Without this, the EFI32 will get disk sizes wrong.

rgds,
toomas

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

Re: svn commit: r320234 - head/sys/boot/efi/include

2017-06-22 Thread Dimitry Andric

On 22 Jun 2017, at 16:30, Ed Maste  wrote:
> 
> Author: emaste
> Date: Thu Jun 22 14:30:09 2017
> New Revision: 320234
> URL: https://svnweb.freebsd.org/changeset/base/320234
> 
> Log:
>  Make structure padding explicit in EFI_MEMORY_DESCRIPTOR
> 
>  The EFI memory descriptor 64-bit aligns PhysicalStart on both 32- and
>  64-bit platforms.  Make the padding explicit for i386 EFI.
> 
>  Submitted by:Siva Mahadevan 
>  MFC after:   3 weeks
>  Sponsored by:The FreeBSD Foundation
>  Differential Revision:   https://reviews.freebsd.org/D11301
> 
> Modified:
>  head/sys/boot/efi/include/efidef.h
> 
> Modified: head/sys/boot/efi/include/efidef.h
> ==
> --- head/sys/boot/efi/include/efidef.hThu Jun 22 13:31:44 2017
> (r320233)
> +++ head/sys/boot/efi/include/efidef.hThu Jun 22 14:30:09 2017
> (r320234)
> @@ -178,6 +178,7 @@ typedef enum {
> #define EFI_MEMORY_DESCRIPTOR_VERSION  1
> typedef struct {
> UINT32  Type;   // Field size is 32 bits 
> followed by 32 bit pad
> +UINT32  Pad;
> EFI_PHYSICAL_ADDRESSPhysicalStart;  // Field size is 64 bits
> EFI_VIRTUAL_ADDRESS VirtualStart;   // Field size is 64 bits
> UINT64  NumberOfPages;  // Field size is 64 bits

If you explicitly insert padding, it is better to mark the struct as
__packed, I think.  Or at least also specify the alignment explicitly.

-Dimitry



signature.asc
Description: Message signed with OpenPGP

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

2017-06-22 Thread Andriy Gapon

Author: avg
Date: Thu Jun 22 17:10:34 2017
New Revision: 320239
URL: https://svnweb.freebsd.org/changeset/base/320239

Log:
  MFV r319950: 5220 L2ARC does not support devices that do not provide 512B 
access
  
  FreeBSD note: the actual change has been in FreeBSD since r297848.  This
  commit accounts for integration of that change with subsequent changes,
  especially r320156 (MFV of r318946) and r314274.
  
  illumos/illumos-gate@403a8da73c64ff9dfb6230ba045c765a242213fb
  
https://github.com/illumos/illumos-gate/commit/403a8da73c64ff9dfb6230ba045c765a242213fb
  
  https://www.illumos.org/issues/5220
There are disk devices that have logical sector size larger than 512B, for
example 4KB. That is, their physical sector size is larger than 512B and 
they
do not provide emulation for 512B sector sizes. For such devices both a data
offset and a data size must be properly aligned. L2ARC should arrange that
because it uses physical I/O.
zio_vdev_io_start() performs a necessary transformation if io_size is not
aligned to vdev_ashift, but that is done only for logical I/O. Something
similar should be done in L2ARC code.
* a temporary write buffer should be allocated if the original buffer is
  not going to be compressed and its size is not aligned
* size of a temporary compression buffer should be ashift aligned
* for the reads, if a size of a target buffer is not sufficiently large 
and
  it is not aligned then a temporary read buffer should be allocated
  
  Reviewed by: George Wilson 
  Reviewed by: Dan Kimmel 
  Reviewed by: Saso Kiselkov 
  Approved by: Dan McDonald 
  Author: Andriy Gapon 
  
  MFC after:3 weeks

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
Directory Properties:
  head/sys/cddl/contrib/opensolaris/   (props changed)

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c   Thu Jun 22 
16:58:09 2017(r320238)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c   Thu Jun 22 
17:10:34 2017(r320239)
@@ -1343,7 +1343,7 @@ typedef struct l2arc_read_callback {
blkptr_tl2rcb_bp;   /* original blkptr */
zbookmark_phys_tl2rcb_zb;   /* original bookmark */
int l2rcb_flags;/* original flags */
-   void*l2rcb_abd; /* temporary buffer */
+   abd_t   *l2rcb_abd; /* temporary buffer */
 } l2arc_read_callback_t;
 
 typedef struct l2arc_write_callback {
@@ -7485,8 +7485,13 @@ l2arc_write_buffers(spa_t *spa, l2arc_dev_t *dev, uint
 * Normally the L2ARC can use the hdr's data, but if
 * we're sharing data between the hdr and one of its
 * bufs, L2ARC needs its own copy of the data so that
-* the ZIO below can't race with the buf consumer. To
-* ensure that this copy will be available for the
+* the ZIO below can't race with the buf consumer.
+* Another case where we need to create a copy of the
+* data is when the buffer size is not device-aligned
+* and we need to pad the block to make it such.
+* That also keeps the clock hand suitably aligned.
+*
+* To ensure that the copy will be available for the
 * lifetime of the ZIO and be cleaned up afterwards, we
 * add it to the l2arc_free_on_write queue.
 */
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

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

2017-06-22 Thread Andriy Gapon

Author: avg
Date: Thu Jun 22 16:58:09 2017
New Revision: 320238
URL: https://svnweb.freebsd.org/changeset/base/320238

Log:
  MFV r319742: 8056 zfs send size estimate is inaccurate for some zvols
  
  illumos/illumos-gate@0255edcc85fc0cd1dda0e49bcd52eb66c06a1b16
  
https://github.com/illumos/illumos-gate/commit/0255edcc85fc0cd1dda0e49bcd52eb66c06a1b16
  
  https://www.illumos.org/issues/8056
The send size estimate for a zvol can be too low, if the size of the record
headers (dmu_replay_record_t's) is a significant portion of the size.
This is typically the case when the data is highly compressible, especially
with embedded blocks.
The problem is that dmu_adjust_send_estimate_for_indirects() assumes that
blocks are the size of the "recordsize" property (128KB).
However, for zvols, the blocks are the size of the "volblocksize" property
(8KB). Therefore, we estimate that there will be 16x less record headers 
than
there really will be.
  
  Reviewed by: Matthew Ahrens 
  Reviewed by: Pavel Zakharov 
  Approved by: Robert Mustacchi 
  Author: Paul Dagnelie 
  
  MFC after:3 weeks

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
Directory Properties:
  head/sys/cddl/contrib/opensolaris/   (props changed)

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
==
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c  Thu Jun 
22 16:52:22 2017(r320237)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c  Thu Jun 
22 16:58:09 2017(r320238)
@@ -1140,10 +1140,17 @@ dmu_adjust_send_estimate_for_indirects(dsl_dataset_t *
 */
uint64_t recordsize;
uint64_t record_count;
+   objset_t *os;
+   VERIFY0(dmu_objset_from_ds(ds, ));
 
/* Assume all (uncompressed) blocks are recordsize. */
-   err = dsl_prop_get_int_ds(ds, zfs_prop_to_name(ZFS_PROP_RECORDSIZE),
-   );
+   if (os->os_phys->os_type == DMU_OST_ZVOL) {
+   err = dsl_prop_get_int_ds(ds,
+   zfs_prop_to_name(ZFS_PROP_VOLBLOCKSIZE), );
+   } else {
+   err = dsl_prop_get_int_ds(ds,
+   zfs_prop_to_name(ZFS_PROP_RECORDSIZE), );
+   }
if (err != 0)
return (err);
record_count = uncompressed / recordsize;
@@ -1212,6 +1219,10 @@ dmu_send_estimate(dsl_dataset_t *ds, dsl_dataset_t *fr
 
err = dmu_adjust_send_estimate_for_indirects(ds, uncomp, comp,
stream_compressed, sizep);
+   /*
+* Add the size of the BEGIN and END records to the estimate.
+*/
+   *sizep += 2 * sizeof (dmu_replay_record_t);
return (err);
 }
 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

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

2017-06-22 Thread Andriy Gapon

Author: avg
Date: Thu Jun 22 16:52:22 2017
New Revision: 320237
URL: https://svnweb.freebsd.org/changeset/base/320237

Log:
  MFV r318947: 7578 Fix/improve some aspects of ZIL writing.
  
  FreeBSD note: this commit removes small differences between what mav
  committed to FreeBSD in r308782 and what ended up committed to illumos
  after addressing all review comments.
  
  illumos/illumos-gate@c5ee46810f82e8a53d2cc5a487568a573f449039
  
https://github.com/illumos/illumos-gate/commit/c5ee46810f82e8a53d2cc5a487568a573f449039
  
  https://www.illumos.org/issues/7578
After some ZIL changes 6 years ago zil_slog_limit got partially broken
due to zl_itx_list_sz not updated when async itx'es upgraded to sync.
Actually because of other changes about that time zl_itx_list_sz is not
really required to implement the functionality, so this patch removes
some unneeded broken code and variables.
Original idea of zil_slog_limit was to reduce chance of SLOG abuse by
single heavy logger, that increased latency for other (more latency 
critical)
loggers, by pushing heavy log out into the main pool instead of SLOG. Beside
huge latency increase for heavy writers, this implementation caused double
write of all data, since the log records were explicitly prepared for SLOG.
Since we now have I/O scheduler, I've found it can be much more efficient
to reduce priority of heavy logger SLOG writes from ZIO_PRIORITY_SYNC_WRITE
to ZIO_PRIORITY_ASYNC_WRITE, while still leave them on SLOG.
Existing ZIL implementation had problem with space efficiency when it
has to write large chunks of data into log blocks of limited size. In some
cases efficiency stopped to almost as low as 50%. In case of ZIL stored on
spinning rust, that also reduced log write speed in half, since head had to
uselessly fly over allocated but not written areas. This change improves
the situation by offloading problematic operations from z*_log_write() to
zil_lwb_commit(), which knows real situation of log blocks allocation and
can split large requests into pieces much more efficiently. Also as side
effect it removes one of two data copy operations done by ZIL code WR_COPIED
case.
While there, untangle and unify code of z*_log_write() functions.
Also zfs_log_write() alike to zvol_log_write() can now handle writes 
crossing
block boundary, that may also improve efficiency if ZPL is made to do that.
  
  Reviewed by: Matthew Ahrens 
  Reviewed by: Prakash Surya 
  Reviewed by: Andriy Gapon 
  Reviewed by: Steven Hartland 
  Reviewed by: Brad Lewis 
  Reviewed by: Richard Elling 
  Approved by: Robert Mustacchi 
  Author: Alexander Motin 
  
  MFC after:3 weeks

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
Directory Properties:
  head/sys/cddl/contrib/opensolaris/   (props changed)

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h
==
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h  Thu Jun 
22 15:52:18 2017(r320236)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h  Thu Jun 
22 16:52:22 2017(r320237)
@@ -139,10 +139,27 @@ typedef struct zil_bp_node {
avl_node_t  zn_node;
 } zil_bp_node_t;
 
+/*
+ * Maximum amount of write data that can be put into single log block.
+ */
 #defineZIL_MAX_LOG_DATA (SPA_OLD_MAXBLOCKSIZE - sizeof (zil_chain_t) - 
\
 sizeof (lr_write_t))
 #defineZIL_MAX_COPIED_DATA \
 ((SPA_OLD_MAXBLOCKSIZE - sizeof (zil_chain_t)) / 2 - sizeof (lr_write_t))
+
+/*
+ * Maximum amount of log space we agree to waste to reduce number of
+ * WR_NEED_COPY chunks to reduce zl_get_data() overhead (~12%).
+ */
+#defineZIL_MAX_WASTE_SPACE (ZIL_MAX_LOG_DATA / 8)
+
+/*
+ * Maximum amount of write data for WR_COPIED.  Fall back to WR_NEED_COPY
+ * as more space efficient if we can't fit at least two log records into
+ * maximum sized log block.
+ */
+#defineZIL_MAX_COPIED_DATA ((SPA_OLD_MAXBLOCKSIZE - \
+sizeof (zil_chain_t)) / 2 - sizeof (lr_write_t))
 
 #ifdef __cplusplus
 }

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
==
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c   Thu Jun 22 
15:52:18 2017(r320236)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c   Thu Jun 22 
16:52:22 2017(r320237)
@@ -90,12 +90,12 @@ SYSCTL_INT(_vfs_zfs_trim, OID_AUTO, enabled, CTLFLAG_R
 
 /*
  * Limit SLOG write size per commit executed with

svn commit: r320236 - head/sys/sys

2017-06-22 Thread Conrad Meyer

Author: cem
Date: Thu Jun 22 15:52:18 2017
New Revision: 320236
URL: https://svnweb.freebsd.org/changeset/base/320236

Log:
  sglist.h: Fix sg_refs signedness to match refcount(9)
  
  PR:   220122
  Reported by:  Mark Millard 
  Sponsored by: Dell EMC Isilon

Modified:
  head/sys/sys/sglist.h

Modified: head/sys/sys/sglist.h
==
--- head/sys/sys/sglist.h   Thu Jun 22 15:09:42 2017(r320235)
+++ head/sys/sys/sglist.h   Thu Jun 22 15:52:18 2017(r320236)
@@ -48,7 +48,7 @@ struct sglist_seg {
 
 struct sglist {
struct sglist_seg *sg_segs;
-   int sg_refs;
+   u_int   sg_refs;
u_short sg_nseg;
u_short sg_maxseg;
 };
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r320235 - head/sys/conf

2017-06-22 Thread Ed Maste

Author: emaste
Date: Thu Jun 22 15:09:42 2017
New Revision: 320235
URL: https://svnweb.freebsd.org/changeset/base/320235

Log:
  retire arm64 kernel module linker workaround
  
  Relocatable linking in aarch64 ld from binutils 2.25.1 does not work.
  The linker corrupts the references to the external symbols which are
  defined by other object in the linking set and should therefore lose
  the GOT entry.
  
  The problem is fixed in later versions of GNU ld and does not exist in
  the in-tree lld linker that we now use by default for arm64, so the
  workaround can be removed.
  
  Reviewed by:  kib
  MFC after:3 weeks
  Sponsored by: The FreeBSD Foundation
  Differential Revision:https://reviews.freebsd.org/D11302

Modified:
  head/sys/conf/kmod.mk

Modified: head/sys/conf/kmod.mk
==
--- head/sys/conf/kmod.mk   Thu Jun 22 14:30:09 2017(r320234)
+++ head/sys/conf/kmod.mk   Thu Jun 22 15:09:42 2017(r320235)
@@ -209,18 +209,8 @@ ${PROG}.debug: ${FULLPROG}
 
 .if ${__KLD_SHARED} == yes
 ${FULLPROG}: ${KMOD}.kld
-.if ${MACHINE_CPUARCH} != "aarch64"
${LD} -m ${LD_EMULATION} -Bshareable -znotext ${_LDFLAGS} \
-o ${.TARGET} ${KMOD}.kld
-.else
-#XXXKIB Relocatable linking in aarch64 ld from binutils 2.25.1 does
-#   not work.  The linker corrupts the references to the external
-#   symbols which are defined by other object in the linking set
-#   and should therefore loose the GOT entry.  The problem seems
-#   to be fixed in the binutils-gdb git HEAD as of 2015-10-04.  Hack
-#   below allows to get partially functioning modules for now.
-   ${LD} -m ${LD_EMULATION} -Bshareable ${_LDFLAGS} -o ${.TARGET} ${OBJS}
-.endif
 .if !defined(DEBUG_FLAGS)
${OBJCOPY} --strip-debug ${.TARGET}
 .endif
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r320234 - head/sys/boot/efi/include

2017-06-22 Thread Ed Maste

Author: emaste
Date: Thu Jun 22 14:30:09 2017
New Revision: 320234
URL: https://svnweb.freebsd.org/changeset/base/320234

Log:
  Make structure padding explicit in EFI_MEMORY_DESCRIPTOR
  
  The EFI memory descriptor 64-bit aligns PhysicalStart on both 32- and
  64-bit platforms.  Make the padding explicit for i386 EFI.
  
  Submitted by: Siva Mahadevan 
  MFC after:3 weeks
  Sponsored by: The FreeBSD Foundation
  Differential Revision:https://reviews.freebsd.org/D11301

Modified:
  head/sys/boot/efi/include/efidef.h

Modified: head/sys/boot/efi/include/efidef.h
==
--- head/sys/boot/efi/include/efidef.h  Thu Jun 22 13:31:44 2017
(r320233)
+++ head/sys/boot/efi/include/efidef.h  Thu Jun 22 14:30:09 2017
(r320234)
@@ -178,6 +178,7 @@ typedef enum {
 #define EFI_MEMORY_DESCRIPTOR_VERSION  1
 typedef struct {
 UINT32  Type;   // Field size is 32 bits 
followed by 32 bit pad
+UINT32  Pad;
 EFI_PHYSICAL_ADDRESSPhysicalStart;  // Field size is 64 bits
 EFI_VIRTUAL_ADDRESS VirtualStart;   // Field size is 64 bits
 UINT64  NumberOfPages;  // Field size is 64 bits
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r320222 - in stable/10: etc etc/cron.d etc/mtree etc/newsyslog.conf.d etc/pam.d etc/syslog.d tools/build/mk usr.sbin/cron/cron usr.sbin/cron/lib usr.sbin/syslogd

2017-06-22 Thread Ngie Cooper


> On Jun 22, 2017, at 03:28, John Baldwin  wrote:
> 
>> On 6/22/17 4:02 AM, Ngie Cooper (yaneurabeya) wrote:
>> 
>>> On Jun 22, 2017, at 00:35, John Baldwin  wrote:
>> 
>> …
>> 
>>> Please revert the breakout of the existing config files.  I think that 
>>> splitting
>>> up the conf files is too disruptive of a change (POLA) for stable branches.
>> 
>>Done in r320229 and r320230.
> 
> I haven't checked if this was merged to 11, but if so, I think they should 
> also
> stay a single conf file in 11 for the same reason.

No, it wasn't merged to 11, so no further action required here.

>>> This was agreed to by other folks in the followup thread to the commits in
>>> head that you continue to ignore.
>> 
>> 
>>> In head please either fully split up the files or revert to a single file
>>> (another part of that thread you continue to ignore).
>> 
>>My eyes glazed over trying to read through all of the posts. I seem to 
>> have missed the point where a proposed change was made to split up the 
>> config files further. Could this please be summarized again?
> 
> I think that having the files partially split up is the worst of both
> worlds as folks writing config management rules, etc. have to use
> different approaches depending on the rule.  I think that is a headache
> and would rather have the config either be all in a single file, or all
> be split up into conf.d/ so that it is consistent.  I also think that
> when splitting up a conf file we should do it all at once so that there is
> only one painful /etc merge instead of several of them.

This still doesn't answer my concern fully. In what way are the config files in 
base not broken down 100%, i.e., what action can I take to resolve your 
concerns about it not being fully modularized? I think syslog.conf having 
kerberos.log is likely the last issue, but I would really like clarification in 
order to move forward.

If there isn't any actionable feedback here, I'll call what's done in head 
"good enough", not MFC the changes, and move on to other pressing tasks.

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

svn commit: r320233 - stable/11/release/doc/en_US.ISO8859-1/relnotes

2017-06-22 Thread Glen Barber

Author: gjb
Date: Thu Jun 22 13:31:44 2017
New Revision: 320233
URL: https://svnweb.freebsd.org/changeset/base/320233

Log:
  Document r320218, primes(6) updated to new limit of 2^64-1.
  Document r320164, qlnxe(4) firmware and hardware support updates.
  
  Approved by:  re (implicit)
  Sponsored by: The FreeBSD Foundation

Modified:
  stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml  Thu Jun 22 
12:46:48 2017(r320232)
+++ stable/11/release/doc/en_US.ISO8859-1/relnotes/article.xml  Thu Jun 22 
13:31:44 2017(r320233)
@@ -247,6 +247,11 @@
   The  utility has been
added, providing command-line access to features and debugging
facilities of  devices.
+
+  The  utility now
+   enumerates primes beyond
+   3825123056546413050, up to a new limit of
+   2^64 - 1.
 
 
 
@@ -711,6 +716,12 @@
   The  driver has been updated
to firmware version 1.16.45.0 for T4, T5, and T6 cards.
+
+  The  driver has been
+   updated to support QLE41XXX hardware.
+
+  The  driver firmware has
+   been updated to version 8.30.0.0.
 
   
 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r320232 - head/contrib/ipfilter/tools

2017-06-22 Thread Cy Schubert

Author: cy
Date: Thu Jun 22 12:46:48 2017
New Revision: 320232
URL: https://svnweb.freebsd.org/changeset/base/320232

Log:
  In poolnodcommand(): TTL (-T) is only valid when adding a node to a
  pool (ippool -a) not when removing a node from a pool (ippool -r).
  Flag -T as an error in ippool -r.

Modified:
  head/contrib/ipfilter/tools/ippool.c

Modified: head/contrib/ipfilter/tools/ippool.c
==
--- head/contrib/ipfilter/tools/ippool.cThu Jun 22 11:03:42 2017
(r320231)
+++ head/contrib/ipfilter/tools/ippool.cThu Jun 22 12:46:48 2017
(r320232)
@@ -201,10 +201,14 @@ poolnodecommand(remove, argc, argv)
}
break;
case 'T' :
-   ttl = atoi(optarg);
-   if (ttl < 0) {
-   fprintf(stderr, "cannot set negative ttl\n");
-   return -1;
+   if (remove == 0) {
+   ttl = atoi(optarg);
+   if (ttl < 0) {
+   fprintf(stderr, "cannot set negative 
ttl\n");
+   return -1;
+   }
+   } else {
+   usage(argv[0]);
}
break;
case 'v' :
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r320174 - head/share/mk

2017-06-22 Thread Edward Napierala

2017-06-20 21:52 GMT+01:00 Bryan Drewery :

> Author: bdrewery
> Date: Tue Jun 20 20:52:06 2017
> New Revision: 320174
> URL: https://svnweb.freebsd.org/changeset/base/320174
>
> Log:
>   Fix 'make clean all' to work again.
>
>   This likely broke completely with r308599.
>
>   Apply the same fix for 'make destroy' which is a DIRDEPS_BUILD thing.


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

svn commit: r320231 - stable/11/sys/vm

2017-06-22 Thread Konstantin Belousov

Author: kib
Date: Thu Jun 22 11:03:42 2017
New Revision: 320231
URL: https://svnweb.freebsd.org/changeset/base/320231

Log:
  MFC r319975:
  Some minor improvements to vnode_pager_generic_putpages().
  
  Approved by:  re (marius)

Modified:
  stable/11/sys/vm/vnode_pager.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/vm/vnode_pager.c
==
--- stable/11/sys/vm/vnode_pager.c  Thu Jun 22 07:57:29 2017
(r320230)
+++ stable/11/sys/vm/vnode_pager.c  Thu Jun 22 11:03:42 2017
(r320231)
@@ -1158,7 +1158,7 @@ vnode_pager_generic_putpages(struct vnode *vp, vm_page
vm_ooffset_t poffset;
struct uio auio;
struct iovec aiov;
-   int count, error, i, maxsize, ncount, ppscheck;
+   int count, error, i, maxsize, ncount, pgoff, ppscheck;
static struct timeval lastfail;
static int curfail;
 
@@ -1169,10 +1169,11 @@ vnode_pager_generic_putpages(struct vnode *vp, vm_page
rtvals[i] = VM_PAGER_ERROR;
 
if ((int64_t)ma[0]->pindex < 0) {
-   printf("vnode_pager_putpages: attempt to write meta-data!!! -- 
0x%lx(%lx)\n",
-   (long)ma[0]->pindex, (u_long)ma[0]->dirty);
+   printf("vnode_pager_generic_putpages: "
+   "attempt to write meta-data 0x%jx(%lx)\n",
+   (uintmax_t)ma[0]->pindex, (u_long)ma[0]->dirty);
rtvals[0] = VM_PAGER_BAD;
-   return VM_PAGER_BAD;
+   return (VM_PAGER_BAD);
}
 
maxsize = count * PAGE_SIZE;
@@ -1195,8 +1196,6 @@ vnode_pager_generic_putpages(struct vnode *vp, vm_page
VM_OBJECT_WLOCK(object);
if (maxsize + poffset > object->un_pager.vnp.vnp_size) {
if (object->un_pager.vnp.vnp_size > poffset) {
-   int pgoff;
-
maxsize = object->un_pager.vnp.vnp_size - poffset;
ncount = btoc(maxsize);
if ((pgoff = (int)maxsize & PAGE_MASK) != 0) {
@@ -1210,6 +1209,7 @@ vnode_pager_generic_putpages(struct vnode *vp, vm_page
vm_page_assert_sbusied(m);
KASSERT(!pmap_page_is_write_mapped(m),
("vnode_pager_generic_putpages: page %p is not read-only", m));
+   MPASS(m->dirty != 0);
vm_page_clear_dirty(m, pgoff, PAGE_SIZE -
pgoff);
}
@@ -1217,15 +1217,14 @@ vnode_pager_generic_putpages(struct vnode *vp, vm_page
maxsize = 0;
ncount = 0;
}
-   if (ncount < count) {
-   for (i = ncount; i < count; i++) {
-   rtvals[i] = VM_PAGER_BAD;
-   }
-   }
+   for (i = ncount; i < count; i++)
+   rtvals[i] = VM_PAGER_BAD;
}
+   for (i = 0; i < ncount - ((btoc(maxsize) & PAGE_MASK) != 0); i++)
+   MPASS(ma[i]->dirty == VM_PAGE_BITS_ALL);
VM_OBJECT_WUNLOCK(object);
 
-   aiov.iov_base = (caddr_t) 0;
+   aiov.iov_base = NULL;
aiov.iov_len = maxsize;
auio.uio_iov = 
auio.uio_iovcnt = 1;
@@ -1233,26 +1232,23 @@ vnode_pager_generic_putpages(struct vnode *vp, vm_page
auio.uio_segflg = UIO_NOCOPY;
auio.uio_rw = UIO_WRITE;
auio.uio_resid = maxsize;
-   auio.uio_td = (struct thread *) 0;
+   auio.uio_td = NULL;
error = VOP_WRITE(vp, , vnode_pager_putpages_ioflags(flags),
curthread->td_ucred);
PCPU_INC(cnt.v_vnodeout);
PCPU_ADD(cnt.v_vnodepgsout, ncount);
 
ppscheck = 0;
-   if (error) {
-   if ((ppscheck = ppsratecheck(, , 1)))
-   printf("vnode_pager_putpages: I/O error %d\n", error);
-   }
-   if (auio.uio_resid) {
-   if (ppscheck || ppsratecheck(, , 1))
-   printf("vnode_pager_putpages: residual I/O %zd at 
%lu\n",
-   auio.uio_resid, (u_long)ma[0]->pindex);
-   }
-   for (i = 0; i < ncount; i++) {
+   if (error != 0 && (ppscheck = ppsratecheck(, , 1))
+   != 0)
+   printf("vnode_pager_putpages: I/O error %d\n", error);
+   if (auio.uio_resid != 0 && (ppscheck != 0 ||
+   ppsratecheck(, , 1) != 0))
+   printf("vnode_pager_putpages: residual I/O %zd at %ju\n",
+   auio.uio_resid, (uintmax_t)ma[0]->pindex);
+   for (i = 0; i < ncount; i++)
rtvals[i] = VM_PAGER_OK;
-   }
-   return rtvals[0];
+   return (rtvals[0]);
 }
 
 int
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any

Re: svn commit: r320222 - in stable/10: etc etc/cron.d etc/mtree etc/newsyslog.conf.d etc/pam.d etc/syslog.d tools/build/mk usr.sbin/cron/cron usr.sbin/cron/lib usr.sbin/syslogd

2017-06-22 Thread John Baldwin

On 6/22/17 4:02 AM, Ngie Cooper (yaneurabeya) wrote:
> 
>> On Jun 22, 2017, at 00:35, John Baldwin  wrote:
> 
> …
> 
>> Please revert the breakout of the existing config files.  I think that 
>> splitting
>> up the conf files is too disruptive of a change (POLA) for stable branches.
> 
>   Done in r320229 and r320230.

I haven't checked if this was merged to 11, but if so, I think they should also
stay a single conf file in 11 for the same reason.

>> This was agreed to by other folks in the followup thread to the commits in
>> head that you continue to ignore.
> 
> 
>> In head please either fully split up the files or revert to a single file
>> (another part of that thread you continue to ignore).
> 
>   My eyes glazed over trying to read through all of the posts. I seem to 
> have missed the point where a proposed change was made to split up the config 
> files further. Could this please be summarized again?

I think that having the files partially split up is the worst of both
worlds as folks writing config management rules, etc. have to use
different approaches depending on the rule.  I think that is a headache
and would rather have the config either be all in a single file, or all
be split up into conf.d/ so that it is consistent.  I also think that
when splitting up a conf file we should do it all at once so that there is
only one painful /etc merge instead of several of them.

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

Re: svn commit: r320222 - in stable/10: etc etc/cron.d etc/mtree etc/newsyslog.conf.d etc/pam.d etc/syslog.d tools/build/mk usr.sbin/cron/cron usr.sbin/cron/lib usr.sbin/syslogd

2017-06-22 Thread Ngie Cooper (yaneurabeya)


> On Jun 22, 2017, at 00:35, John Baldwin  wrote:

…

> Please revert the breakout of the existing config files.  I think that 
> splitting
> up the conf files is too disruptive of a change (POLA) for stable branches.

Done in r320229 and r320230.

> This was agreed to by other folks in the followup thread to the commits in
> head that you continue to ignore.


> In head please either fully split up the files or revert to a single file
> (another part of that thread you continue to ignore).

My eyes glazed over trying to read through all of the posts. I seem to 
have missed the point where a proposed change was made to split up the config 
files further. Could this please be summarized again?
Thank you,
-Ngie


signature.asc
Description: Message signed with OpenPGP using GPGMail

svn commit: r320230 - stable/10/etc

2017-06-22 Thread Ngie Cooper

Author: ngie
Date: Thu Jun 22 07:57:29 2017
New Revision: 320230
URL: https://svnweb.freebsd.org/changeset/base/320230

Log:
  Revert r320228 as well
  
  See r320229 for the other related revert commit.

Modified:
  stable/10/etc/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/Makefile
==
--- stable/10/etc/Makefile  Thu Jun 22 07:54:12 2017(r320229)
+++ stable/10/etc/Makefile  Thu Jun 22 07:57:29 2017(r320230)
@@ -3,6 +3,9 @@
 
 .include 
 
+SUBDIR= \
+   newsyslog.conf.d
+
 .if ${MK_SENDMAIL} != "no"
 SUBDIR+=sendmail
 .endif
@@ -238,11 +241,9 @@ distribution:
 .if ${MK_BLUETOOTH} != "no"
${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
 .endif
-   ${_+_}cd ${.CURDIR}/cron.d; ${MAKE} install
${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
${_+_}cd ${.CURDIR}/devd; ${MAKE} install
${_+_}cd ${.CURDIR}/gss; ${MAKE} install
-   ${_+_}cd ${.CURDIR}/newsyslog.conf.d; ${MAKE} install
 .if ${MK_NTP} != "no"
${_+_}cd ${.CURDIR}/ntp; ${MAKE} install
 .endif
@@ -252,7 +253,6 @@ distribution:
 .endif
${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install
${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap
-   ${_+_}cd ${.CURDIR}/syslog.d; ${MAKE} install
${_+_}cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt
${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install
cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0444 \
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r320229 - in stable/10: etc etc/cron.d etc/mtree etc/newsyslog.conf.d etc/pam.d etc/syslog.d tools/build/mk usr.sbin/cron/cron usr.sbin/cron/lib usr.sbin/syslogd

2017-06-22 Thread Ngie Cooper

Author: ngie
Date: Thu Jun 22 07:54:12 2017
New Revision: 320229
URL: https://svnweb.freebsd.org/changeset/base/320229

Log:
  Revert r320222,r320223,r320224
  
  The committed changes (reverted after this commit) break POLA on
  a stable branch.
  
  Requested by: jhb

Deleted:
  stable/10/etc/cron.d/
  stable/10/etc/newsyslog.conf.d/amd.conf
  stable/10/etc/newsyslog.conf.d/ftp.conf
  stable/10/etc/newsyslog.conf.d/lpr.conf
  stable/10/etc/newsyslog.conf.d/pf.conf
  stable/10/etc/newsyslog.conf.d/ppp.conf
  stable/10/etc/newsyslog.conf.d/sendmail.conf
  stable/10/etc/syslog.d/
Modified:
  stable/10/etc/crontab
  stable/10/etc/mtree/BSD.root.dist
  stable/10/etc/newsyslog.conf
  stable/10/etc/newsyslog.conf.d/Makefile
  stable/10/etc/pam.d/Makefile
  stable/10/etc/syslog.conf
  stable/10/tools/build/mk/OptionalObsoleteFiles.inc
  stable/10/usr.sbin/cron/cron/cron.8
  stable/10/usr.sbin/cron/cron/cron.h
  stable/10/usr.sbin/cron/cron/database.c
  stable/10/usr.sbin/cron/cron/pathnames.h
  stable/10/usr.sbin/cron/lib/misc.c
  stable/10/usr.sbin/syslogd/syslog.conf.5
  stable/10/usr.sbin/syslogd/syslogd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/crontab
==
--- stable/10/etc/crontab   Thu Jun 22 07:42:36 2017(r320228)
+++ stable/10/etc/crontab   Thu Jun 22 07:54:12 2017(r320229)
@@ -7,6 +7,8 @@ PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin
 #
 #minutehourmdaymonth   wdaywho command
 #
+*/5*   *   *   *   root/usr/libexec/atrun
+#
 # Save some entropy so that /dev/random can re-seed on boot.
 */11   *   *   *   *   operator /usr/libexec/save-entropy
 #

Modified: stable/10/etc/mtree/BSD.root.dist
==
--- stable/10/etc/mtree/BSD.root.dist   Thu Jun 22 07:42:36 2017
(r320228)
+++ stable/10/etc/mtree/BSD.root.dist   Thu Jun 22 07:54:12 2017
(r320229)
@@ -30,8 +30,6 @@
 ..
 bluetooth
 ..
-cron.d
-..
 defaults
 ..
 devd
@@ -73,8 +71,6 @@
 ssh
 ..
 ssl
-..
-syslog.d
 ..
 zfs
 ..

Modified: stable/10/etc/newsyslog.conf
==
--- stable/10/etc/newsyslog.confThu Jun 22 07:42:36 2017
(r320228)
+++ stable/10/etc/newsyslog.confThu Jun 22 07:54:12 2017
(r320229)
@@ -18,6 +18,7 @@
 #
 # logfilename  [owner:group]mode count size when  flags 
[/pid_file] [sig_num]
 /var/log/all.log   600  7 *@T00  J
+/var/log/amd.log   644  7 100  * J
 /var/log/auth.log  600  7 100  @0101T JC
 /var/log/console.log   600  5 100  * J
 /var/log/cron  600  3 100  * JC
@@ -25,13 +26,18 @@
 /var/log/debug.log 600  7 100  * JC
 /var/log/init.log  644  3 100  * J
 /var/log/kerberos.log  600  7 100  * J
+/var/log/lpd-errs  644  7 100  * JC
 /var/log/maillog   640  7 *@T00  JC
 /var/log/messages  644  5 100  @0101T JC
 /var/log/monthly.log   640  12*$M1D0 JN
+/var/log/pflog 600  3 100  * JB
/var/run/pflogd.pid
+/var/log/ppp.log   root:network640  3 100  * JC
 /var/log/devd.log  644  3 100  * JC
 /var/log/security  600  10100  * JC
+/var/log/sendmail.st   640  10*168   BN
 /var/log/utx.log   644  3 *@01T05 B
 /var/log/weekly.log640  5 *$W6D0 JN
+/var/log/xferlog   600  7 100  * JC
 
  /etc/newsyslog.conf.d/*
  /usr/local/etc/newsyslog.conf.d/*

Modified: stable/10/etc/newsyslog.conf.d/Makefile
==
--- stable/10/etc/newsyslog.conf.d/Makefile Thu Jun 22 07:42:36 2017
(r320228)
+++ stable/10/etc/newsyslog.conf.d/Makefile Thu Jun 22 07:54:12 2017
(r320229)
@@ -6,32 +6,8 @@ BINDIR=/etc/newsyslog.conf.d
 
 FILES=
 
-.if ${MK_AMD} != "no"
-FILES+=amd.conf
-.endif
-
-.if ${MK_FTP} != "no"
-FILES+=ftp.conf
-.endif
-
-.if ${MK_LPR} != "no"
-FILES+=lpr.conf
-.endif
-
 .if ${MK_OFED} != "no"
 FILES+=opensm.conf
-.endif
-
-.if ${MK_PF} != "no"
-FILES+=pf.conf
-.endif
-
-.if ${MK_PPP} != "no"
-FILES+=ppp.conf
-.endif
-
-.if ${MK_SENDMAIL} != "no"
-FILES+=sendmail.conf
 .endif
 
 .include

svn commit: r320228 - stable/10/etc

2017-06-22 Thread Ngie Cooper

Author: ngie
Date: Thu Jun 22 07:42:36 2017
New Revision: 320228
URL: https://svnweb.freebsd.org/changeset/base/320228

Log:
  MFC r318545:
  
  Install {cron.d,newsyslog.conf.d,syslog.d} via `make distribution`, not `make 
install`
  
  I incorrectly started this pattern in r277541 with the opensm 
newsyslog.conf.d file,
  and continued using it in r318441 and r318443.
  
  This will fix the files being handled improperly via installworld, preventing 
tools like
  etcupdate, mergemaster, etc from functioning properly when comparing the 
installed
  contents on a system vs the contents in a source tree when doing merges.
  
  PR:   219404
  MFC with: r277541, r318441, r318443

Modified:
  stable/10/etc/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/Makefile
==
--- stable/10/etc/Makefile  Thu Jun 22 07:37:10 2017(r320227)
+++ stable/10/etc/Makefile  Thu Jun 22 07:42:36 2017(r320228)
@@ -3,11 +3,6 @@
 
 .include 
 
-SUBDIR=\
-   cron.d \
-   newsyslog.conf.d \
-   syslog.d
-
 .if ${MK_SENDMAIL} != "no"
 SUBDIR+=sendmail
 .endif
@@ -243,9 +238,11 @@ distribution:
 .if ${MK_BLUETOOTH} != "no"
${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
 .endif
+   ${_+_}cd ${.CURDIR}/cron.d; ${MAKE} install
${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
${_+_}cd ${.CURDIR}/devd; ${MAKE} install
${_+_}cd ${.CURDIR}/gss; ${MAKE} install
+   ${_+_}cd ${.CURDIR}/newsyslog.conf.d; ${MAKE} install
 .if ${MK_NTP} != "no"
${_+_}cd ${.CURDIR}/ntp; ${MAKE} install
 .endif
@@ -255,6 +252,7 @@ distribution:
 .endif
${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install
${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap
+   ${_+_}cd ${.CURDIR}/syslog.d; ${MAKE} install
${_+_}cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt
${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install
cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0444 \
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r320222 - in stable/10: etc etc/cron.d etc/mtree etc/newsyslog.conf.d etc/pam.d etc/syslog.d tools/build/mk usr.sbin/cron/cron usr.sbin/cron/lib usr.sbin/syslogd

2017-06-22 Thread John Baldwin

On 6/22/17 3:08 AM, Ngie Cooper wrote:
> Author: ngie
> Date: Thu Jun 22 07:08:18 2017
> New Revision: 320222
> URL: https://svnweb.freebsd.org/changeset/base/320222
> 
> Log:
>   MFC r308139,r308157,r308160,r316818,r318250,r318443:
>   
>   r308139 (by bapt):
>   
>   cron(8): add support for /etc/cron.d and /usr/local/etc/cron.d
>   
>   For automation tools it is way easier to maintain files in directories 
> rather
>   than modifying /etc/crontab.
>   
>   The files in those directories are in the same format as /etc/crontab
>   
>   Relnotes:   yes
>   
>   r308157 (by bapt):
>   
>   Fix typo in cron(8) date
>   
>   r308160 (by bapt):
>   
>   syslogd(8): add an 'include' keyword
>   
>   All the '.conf' files not beginning with a '.' contained int he directory
>   following the keyword will be included.
>   
>   This keyword can only be used in the first level configuration files.
>   
>   Modify the default syslogd.conf to 'include' /etc/syslog.d and
>   /usr/local/etc/syslog.d
>   
>   It simplify a lot handling of syslog from automation tools.
>   
>   Relnotes:   yes
>   
>   r316818:
>   
>   Conditionally install /etc/pam.d/ftp* and /etc/pam.d/telnetd
>   
>   /etc/pam.d/ftp* should be installed with MK_FTP != no and
>   /etc/pam.d/telnetd should be installed when MK_TELNET != no.
>   
>   r318250:
>   
>   Handle the logfiles in newsyslog and syslogd conditionally, based on
>   src.conf(5) knobs
>   
>   This will allow consumers of FreeBSD to use the unmodified configuration
>   files out of the box more than previously.
>   
>   Both newsyslog.conf and syslog.conf:
>   - /var/log/lpd-errs (MK_LPR != no)
>   - /var/log/ppp.log (MK_PPP != no)
>   - /var/log/xferlog (MK_FTP != no)
>   
>   newsyslog.conf:
>   - /var/log/amd.log (MK_AMD != no)
>   - /var/log/pflog (MK_PF != no)
>   - /var/log/sendmail.st (MK_SENDMAIL != no)
>   
>   r318443:
>   
>   Conditionally handle the crontab entry for atrun(8)
>   
>   The default crontab prior to this commit assumes atrun(8) is always
>   present, which isn't true if MK_AT == no. Move atrun(8) execution
>   from /etc/crontab to /etc/cron.d/at, and base /etc/cron.d/at's installation
>   on MK_AT. cron(8) will detect /etc/cron.d/at's presence when the 
> configuration
>   is loaded and run atrun every 5 minutes like it would prior to this commit.
>   
>   SHELL and PATH are duplicated between /etc/crontab and /etc/cron.d/at
>   because atrun(8) executes programs, which may rely on environment
>   set in the current default /etc/crontab.
>   
>   Noted by:   bdrewery (in an internal review)
>   Relnotes:   yes (may need to add environmental modifications to
>/etc/cron.d/at)

Please revert the breakout of the existing config files.  I think that splitting
up the conf files is too disruptive of a change (POLA) for stable branches.

This was agreed to by other folks in the followup thread to the commits in
head that you continue to ignore.

In head please either fully split up the files or revert to a single file
(another part of that thread you continue to ignore).

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

svn commit: r320224 - stable/10/usr.sbin/syslogd

2017-06-22 Thread Ngie Cooper

Author: ngie
Date: Thu Jun 22 07:14:37 2017
New Revision: 320224
URL: https://svnweb.freebsd.org/changeset/base/320224

Log:
  MFC r309194,r309216:
  
  r309194 (by bapt):
  
  initialize *nextp which could be left uninitialized in case the configuration
  file cannot be open/read
  
  CID:  1365665
  
  r309216 (by bapt):
  
  Properly initialize nextp

Modified:
  stable/10/usr.sbin/syslogd/syslogd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/syslogd/syslogd.c
==
--- stable/10/usr.sbin/syslogd/syslogd.cThu Jun 22 07:10:01 2017
(r320223)
+++ stable/10/usr.sbin/syslogd/syslogd.cThu Jun 22 07:14:37 2017
(r320224)
@@ -1764,6 +1764,7 @@ init(int signo)
free((char *)f);
}
Files = NULL;
+   nextp = 
 
/* open the configuration file */
if ((cf = fopen(ConfFile, "r")) == NULL) {
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r320223 - stable/10/usr.sbin/cron/cron

2017-06-22 Thread Ngie Cooper

Author: ngie
Date: Thu Jun 22 07:10:01 2017
New Revision: 320223
URL: https://svnweb.freebsd.org/changeset/base/320223

Log:
  MFC r308158:
  r308158 (by bapt):
  
  Allow symlinks to be followed in cron.d directories and fix detection of
  regular files on NFS

Modified:
  stable/10/usr.sbin/cron/cron/database.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/cron/cron/database.c
==
--- stable/10/usr.sbin/cron/cron/database.c Thu Jun 22 07:08:18 2017
(r320222)
+++ stable/10/usr.sbin/cron/cron/database.c Thu Jun 22 07:10:01 2017
(r320223)
@@ -44,7 +44,7 @@ load_database(old_db)
 {
DIR *dir;
struct stat statbuf;
-   struct stat syscron_stat;
+   struct stat syscron_stat, st;
time_t  maxmtime;
DIR_T   *dp;
cron_db new_db;
@@ -124,7 +124,8 @@ load_database(old_db)
while (NULL != (dp = readdir(dir))) {
if (dp->d_name[0] == '.')
continue;
-   if (dp->d_type != DT_REG)
+   if (fstatat(dirfd(dir), dp->d_name, , 0) == 0 &&
+   !S_ISREG(st.st_mode))
continue;
snprintf(tabname, sizeof(tabname), "%s/%s",
syscrontabs[i].name, dp->d_name);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r320222 - in stable/10: etc etc/cron.d etc/mtree etc/newsyslog.conf.d etc/pam.d etc/syslog.d tools/build/mk usr.sbin/cron/cron usr.sbin/cron/lib usr.sbin/syslogd

2017-06-22 Thread Ngie Cooper

Author: ngie
Date: Thu Jun 22 07:08:18 2017
New Revision: 320222
URL: https://svnweb.freebsd.org/changeset/base/320222

Log:
  MFC r308139,r308157,r308160,r316818,r318250,r318443:
  
  r308139 (by bapt):
  
  cron(8): add support for /etc/cron.d and /usr/local/etc/cron.d
  
  For automation tools it is way easier to maintain files in directories rather
  than modifying /etc/crontab.
  
  The files in those directories are in the same format as /etc/crontab
  
  Relnotes: yes
  
  r308157 (by bapt):
  
  Fix typo in cron(8) date
  
  r308160 (by bapt):
  
  syslogd(8): add an 'include' keyword
  
  All the '.conf' files not beginning with a '.' contained int he directory
  following the keyword will be included.
  
  This keyword can only be used in the first level configuration files.
  
  Modify the default syslogd.conf to 'include' /etc/syslog.d and
  /usr/local/etc/syslog.d
  
  It simplify a lot handling of syslog from automation tools.
  
  Relnotes: yes
  
  r316818:
  
  Conditionally install /etc/pam.d/ftp* and /etc/pam.d/telnetd
  
  /etc/pam.d/ftp* should be installed with MK_FTP != no and
  /etc/pam.d/telnetd should be installed when MK_TELNET != no.
  
  r318250:
  
  Handle the logfiles in newsyslog and syslogd conditionally, based on
  src.conf(5) knobs
  
  This will allow consumers of FreeBSD to use the unmodified configuration
  files out of the box more than previously.
  
  Both newsyslog.conf and syslog.conf:
  - /var/log/lpd-errs (MK_LPR != no)
  - /var/log/ppp.log (MK_PPP != no)
  - /var/log/xferlog (MK_FTP != no)
  
  newsyslog.conf:
  - /var/log/amd.log (MK_AMD != no)
  - /var/log/pflog (MK_PF != no)
  - /var/log/sendmail.st (MK_SENDMAIL != no)
  
  r318443:
  
  Conditionally handle the crontab entry for atrun(8)
  
  The default crontab prior to this commit assumes atrun(8) is always
  present, which isn't true if MK_AT == no. Move atrun(8) execution
  from /etc/crontab to /etc/cron.d/at, and base /etc/cron.d/at's installation
  on MK_AT. cron(8) will detect /etc/cron.d/at's presence when the configuration
  is loaded and run atrun every 5 minutes like it would prior to this commit.
  
  SHELL and PATH are duplicated between /etc/crontab and /etc/cron.d/at
  because atrun(8) executes programs, which may rely on environment
  set in the current default /etc/crontab.
  
  Noted by: bdrewery (in an internal review)
  Relnotes: yes (may need to add environmental modifications to
 /etc/cron.d/at)

Added:
  stable/10/etc/cron.d/
 - copied from r318443, head/etc/cron.d/
  stable/10/etc/newsyslog.conf.d/amd.conf
 - copied, changed from r318250, head/etc/newsyslog.conf.d/amd.conf
  stable/10/etc/newsyslog.conf.d/ftp.conf
 - copied, changed from r318250, head/etc/newsyslog.conf.d/ftp.conf
  stable/10/etc/newsyslog.conf.d/lpr.conf
 - copied, changed from r318250, head/etc/newsyslog.conf.d/lpr.conf
  stable/10/etc/newsyslog.conf.d/pf.conf
 - copied, changed from r318250, head/etc/newsyslog.conf.d/pf.conf
  stable/10/etc/newsyslog.conf.d/ppp.conf
 - copied, changed from r318250, head/etc/newsyslog.conf.d/ppp.conf
  stable/10/etc/newsyslog.conf.d/sendmail.conf
 - copied unchanged from r318250, head/etc/newsyslog.conf.d/sendmail.conf
  stable/10/etc/syslog.d/
 - copied from r318250, head/etc/syslog.d/
Modified:
  stable/10/etc/Makefile
  stable/10/etc/cron.d/Makefile
  stable/10/etc/crontab
  stable/10/etc/mtree/BSD.root.dist
  stable/10/etc/newsyslog.conf
  stable/10/etc/newsyslog.conf.d/Makefile
  stable/10/etc/pam.d/Makefile
  stable/10/etc/syslog.conf
  stable/10/etc/syslog.d/Makefile
  stable/10/tools/build/mk/OptionalObsoleteFiles.inc
  stable/10/usr.sbin/cron/cron/cron.8
  stable/10/usr.sbin/cron/cron/cron.h
  stable/10/usr.sbin/cron/cron/database.c
  stable/10/usr.sbin/cron/cron/pathnames.h
  stable/10/usr.sbin/cron/lib/misc.c
  stable/10/usr.sbin/syslogd/syslog.conf.5
  stable/10/usr.sbin/syslogd/syslogd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/Makefile
==
--- stable/10/etc/Makefile  Thu Jun 22 06:25:34 2017(r320221)
+++ stable/10/etc/Makefile  Thu Jun 22 07:08:18 2017(r320222)
@@ -4,7 +4,9 @@
 .include 
 
 SUBDIR=\
-   newsyslog.conf.d
+   cron.d \
+   newsyslog.conf.d \
+   syslog.d
 
 .if ${MK_SENDMAIL} != "no"
 SUBDIR+=sendmail

Modified: stable/10/etc/cron.d/Makefile
==
--- head/etc/cron.d/MakefileThu May 18 06:33:55 2017(r318443)
+++ stable/10/etc/cron.d/Makefile   Thu Jun 22 07:08:18 2017
(r320222)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include 
+.include 
 
 .if ${MK_AT} != "no"
 FILES+=at

Modified: stable/10/etc/crontab
==
--- stable/10/etc/crontab   Thu Jun 22

svn commit: r320221 - head/contrib/ipfilter/tools

2017-06-22 Thread Cy Schubert

Author: cy
Date: Thu Jun 22 06:25:34 2017
New Revision: 320221
URL: https://svnweb.freebsd.org/changeset/base/320221

Log:
  poolflush() has no positional arguments.

Modified:
  head/contrib/ipfilter/tools/ippool.c

Modified: head/contrib/ipfilter/tools/ippool.c
==
--- head/contrib/ipfilter/tools/ippool.cThu Jun 22 05:34:41 2017
(r320220)
+++ head/contrib/ipfilter/tools/ippool.cThu Jun 22 06:25:34 2017
(r320221)
@@ -583,7 +583,7 @@ poolflush(argc, argv)
break;  /* keep compiler happy */
}
 
-   if (argc - 1 - optind > 0)
+   if (argc - optind > 0)
usage(argv[0]);
 
if (opts & OPT_DEBUG)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

54 matches

Mail list logo