Re: svn commit: r312404 - head/usr.bin/sed

[Bruce Evans]

On Fri, 20 Jan 2017, Bruce Evans wrote:


On Fri, 20 Jan 2017, Antoine Brodin wrote:

sed -i no longer works on symlinks which breaks lots of ports.
Please revert and request an exp-run.


sed() doesn't seem to actually understand symlinks (it has no flag like
-h to prevent following them when opening files), so its use of lstat()
to classify them is wrong.  This was harmless for symlinks but not for


Oops.  It only does the lstat() classification for the -I and -i cases,
where restricting to regular files is not completely wrong, but I don't
see any reason to do it.  Just require the target of the symlink to be
regular (and still be wrong when it is an irregular regular file in /proc).

The check also has races.  These may be hard to avoid if symlinks must
not be followed, but since sed must follow symlinks the correct method
is to open the file (following symlinks) and fstat() the fd.

sed has special support for stdin and stdout and special checks to
disallow -I and -i on stdin and stdout.  The fstat() check on them
wouldn't work right.  Editing stdin is only impossible since you
can't reopen it for both input and output.  sed has related problems
and races in its supported case whee reopening is possible since the
file name is know.  A non-racy version might open the file in r+ mode,
then fstat() it, but sed actually uses separate streams and even a
tempoary file, so it is not very in-place and has the usual races with
temporary files.

Bruce
___
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: r312522 - head/sys/net80211

[Adrian Chadd]

Author: adrian
Date: Fri Jan 20 07:43:40 2017
New Revision: 312522
URL: https://svnweb.freebsd.org/changeset/base/312522

Log:
  [net80211] allow for MCS16-23 to be statically configured.
  
  Tested:
  
  * AR9380, STA mode

Modified:
  head/sys/net80211/ieee80211_ioctl.c

Modified: head/sys/net80211/ieee80211_ioctl.c
==
--- head/sys/net80211/ieee80211_ioctl.c Fri Jan 20 07:11:21 2017
(r312521)
+++ head/sys/net80211/ieee80211_ioctl.c Fri Jan 20 07:43:40 2017
(r312522)
@@ -2225,7 +2225,7 @@ checkmcs(int mcs)
return 1;
if ((mcs & IEEE80211_RATE_MCS) == 0)/* MCS always have 0x80 set */
return 0;
-   return (mcs & 0x7f) <= 15;  /* XXX could search ht rate set */
+   return (mcs & 0x7f) <= 31;  /* XXX could search ht rate set */
 }
 
 static int
___
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: r312404 - head/usr.bin/sed

[Ngie Cooper (yaneurabeya)]

> On Jan 19, 2017, at 22:59, Xin Li  wrote:

…

> There are other issues with previous behavior, for instance, the file
> would inherit permissions from the symlink itself, while a more sensible
> behavior would be to use the permissions on the symlink target.
> 
> But I think it's reasonable to revert for now and do a exp-run so we
> know what would be broken.  Personally I have been running with this for
> a year and that made me thought it's safe :)

I think the lstat’s the incorrect part now — should open with 
O_NONBLOCK|O_RDONLY and fstat be used instead?
Thanks!
-Ngie


signature.asc
Description: Message signed with OpenPGP using GPGMail

Re: svn commit: r312519 - head/usr.bin/sed

[Ngie Cooper (yaneurabeya)]

> On Jan 19, 2017, at 23:27, Xin Li  wrote:
> 
> 
> 
> On 1/19/17 23:13, Ngie Cooper (yaneurabeya) wrote:
>> 
>>> On Jan 19, 2017, at 22:45, Xin LI  wrote:
>>> 
>>> Author: delphij
>>> Date: Fri Jan 20 06:45:06 2017
>>> New Revision: 312519
>>> URL: https://svnweb.freebsd.org/changeset/base/312519
>>> 
>>> Log:
>>> Revert r312404 as we need to do an exp-run and fix existing ports that
>>> rely on the previous behavior.
>>> 
>>> Requested by:   antonie (portmgr)
>> 
>>  I added 2 testcases to help check for this behavior later in r312521. 
>> All that needs to be done is remove this line: 
>> https://svnweb.freebsd.org/base/head/usr.bin/sed/tests/sed2_test.sh?view=markup=312521#l50
>>  .
> 
> Hmm to be honest I believe the old behavior is wrong and the intent is
> to reinstate the revision after we have fixed the ports.

I agree — once the revision is fixed and committed, it will verify that 
sed again fails.
If that’s not correct per the designed fix, we can modify the testcase 
further.
Thanks :),
-Ngie



signature.asc
Description: Message signed with OpenPGP using GPGMail

Re: svn commit: r312519 - head/usr.bin/sed

[Xin Li]

On 1/19/17 23:13, Ngie Cooper (yaneurabeya) wrote:
> 
>> On Jan 19, 2017, at 22:45, Xin LI  wrote:
>>
>> Author: delphij
>> Date: Fri Jan 20 06:45:06 2017
>> New Revision: 312519
>> URL: https://svnweb.freebsd.org/changeset/base/312519
>>
>> Log:
>>  Revert r312404 as we need to do an exp-run and fix existing ports that
>>  rely on the previous behavior.
>>
>>  Requested by:   antonie (portmgr)
> 
>   I added 2 testcases to help check for this behavior later in r312521. 
> All that needs to be done is remove this line: 
> https://svnweb.freebsd.org/base/head/usr.bin/sed/tests/sed2_test.sh?view=markup=312521#l50
>  .

Hmm to be honest I believe the old behavior is wrong and the intent is
to reinstate the revision after we have fixed the ports.

Cheers,



signature.asc
Description: OpenPGP digital signature

Re: svn commit: r312404 - head/usr.bin/sed

[Bruce Evans]

On Fri, 20 Jan 2017, Antoine Brodin wrote:


On Thu, Jan 19, 2017 at 9:01 AM, Xin LI  wrote:

Author: delphij
Date: Thu Jan 19 08:01:35 2017
New Revision: 312404
URL: https://svnweb.freebsd.org/changeset/base/312404

Log:
  Use S_ISREG instead of manual & (also it's better to compare the
  result from & and the pattern instead of just assuming it's one bit
  value).

  Pointed out by Tianjie Mao .

  MFC after:2 weeks
  Differential Revision:https://reviews.freebsd.org/D4827


Hi,

sed -i no longer works on symlinks which breaks lots of ports.
Please revert and request an exp-run.


sed() doesn't seem to actually understand symlinks (it has no flag like
-h to prevent following them when opening files), so its use of lstat()
to classify them is wrong.  This was harmless for symlinks but not for
other irregular file types pointed to by symlinks.  The buggy S_IFREG
test accidentally classified symlinks, sockets and whiteouts as regular,
but failed classify the file type of the target of symlinks that will
actually be used.  The fixed test limits sed to "regular" files
(including highly irregular ones in /proc).

It is a bug for sed to have any restrictions on file types.   This
breaks device indepedence.  Even /dev/std* was supposed to not work,
but worked accidentally since these files happen to be implemented as
symlinks.  Their targets /dev/fd/[0-2] didn't work accidentally, but
it was possible to trick sed into working on them by pointing to them
using symlinks.  Similarly for all file types.

POSIX only requires sed to work on text files.  I couldn't find anywhere
where it clearly defines what a text file is or any restriction to
regular files.  It requires sed to work on stdin which is often a pipe,
so it must not restrict on the file type found by fstat().  So a text
file should defined as "a file of any type containing text".  Utilities
shouldn't be restricted to text either, but that is a larger bug.  It
is now difficult to even define text.  Non-ASCII encodings of text look
like binary to me.

Bruce
___
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: r312519 - head/usr.bin/sed

[Ngie Cooper (yaneurabeya)]

> On Jan 19, 2017, at 22:45, Xin LI  wrote:
> 
> Author: delphij
> Date: Fri Jan 20 06:45:06 2017
> New Revision: 312519
> URL: https://svnweb.freebsd.org/changeset/base/312519
> 
> Log:
>  Revert r312404 as we need to do an exp-run and fix existing ports that
>  rely on the previous behavior.
> 
>  Requested by:antonie (portmgr)

I added 2 testcases to help check for this behavior later in r312521. 
All that needs to be done is remove this line: 
https://svnweb.freebsd.org/base/head/usr.bin/sed/tests/sed2_test.sh?view=markup=312521#l50
 .
Cheers!
-Ngie


signature.asc
Description: Message signed with OpenPGP using GPGMail

svn commit: r312521 - head/usr.bin/sed/tests

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 07:11:21 2017
New Revision: 312521
URL: https://svnweb.freebsd.org/changeset/base/312521

Log:
  Add testcases for -i with hardlinks and symlinks
  
  The symlink testcase is expected to fail, post-r312519 (the revert of
  r312404); mark it so.
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Added:
  head/usr.bin/sed/tests/sed2_test.sh   (contents, props changed)
Modified:
  head/usr.bin/sed/tests/Makefile

Modified: head/usr.bin/sed/tests/Makefile
==
--- head/usr.bin/sed/tests/Makefile Fri Jan 20 06:47:02 2017
(r312520)
+++ head/usr.bin/sed/tests/Makefile Fri Jan 20 07:11:21 2017
(r312521)
@@ -2,6 +2,7 @@
 
 PACKAGE=   tests
 
+ATF_TESTS_SH+= sed2_test
 NETBSD_ATF_TESTS_SH+=  sed_test
 TAP_TESTS_SH=  legacy_test
 TAP_TESTS_SH+= multi_test

Added: head/usr.bin/sed/tests/sed2_test.sh
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/usr.bin/sed/tests/sed2_test.sh Fri Jan 20 07:11:21 2017
(r312521)
@@ -0,0 +1,61 @@
+#
+# Copyright 2017 Dell EMC.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# $FreeBSD$
+#
+
+atf_test_case inplace_hardlink_src
+inplace_hardlink_src_head()
+{
+   atf_set "descr" "Verify -i works with a symlinked source file"
+}
+inplace_hardlink_src_body()
+{
+   echo foo > a
+   atf_check ln a b
+   atf_check sed -i '' -e 's,foo,bar,g' b
+   atf_check -o 'inline:bar\n' -s exit:0 cat b
+}
+
+atf_test_case inplace_symlink_src
+inplace_symlink_src_head()
+{
+   atf_set "descr" "Verify -i works with a symlinked source file"
+}
+inplace_symlink_src_body()
+{
+   atf_expect_fail "Check for S_IFREG reverted in r312404"
+
+   echo foo > a
+   atf_check ln -s a b
+   atf_check -e not-empty -s not-exit:0 sed -i '' -e 's,foo,bar,g' b
+}
+
+atf_init_test_cases()
+{
+   atf_add_test_case inplace_hardlink_src
+   atf_add_test_case inplace_symlink_src
+}
___
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: r312404 - head/usr.bin/sed

[Xin Li]

On 1/19/17 22:36, Conrad Meyer wrote:
> On Thu, Jan 19, 2017 at 10:29 PM, Antoine Brodin  wrote:
>> On Thu, Jan 19, 2017 at 9:01 AM, Xin LI  wrote:
>>> Author: delphij
>>> Date: Thu Jan 19 08:01:35 2017
>>> New Revision: 312404
>>> URL: https://svnweb.freebsd.org/changeset/base/312404
>>>
>>> Log:
>>>   Use S_ISREG instead of manual & (also it's better to compare the
>>>   result from & and the pattern instead of just assuming it's one bit
>>>   value).
>>>
>>>   Pointed out by Tianjie Mao .
>>>
>>>   MFC after:2 weeks
>>>   Differential Revision:https://reviews.freebsd.org/D4827
>>
>> Hi,
>>
>> sed -i no longer works on symlinks which breaks lots of ports.
>> Please revert and request an exp-run.
> 
> That is clearly the intent of the code in question.  It was a bug that
> it worked before — S_IFLNK and S_IFSOCK just happen to have the
> S_IFREG bit set.  It seems like either such ports should be fixed to
> dereference the link manually, or the check should be removed
> entirely.

There are other issues with previous behavior, for instance, the file
would inherit permissions from the symlink itself, while a more sensible
behavior would be to use the permissions on the symlink target.

But I think it's reasonable to revert for now and do a exp-run so we
know what would be broken.  Personally I have been running with this for
a year and that made me thought it's safe :)

Cheers,



signature.asc
Description: OpenPGP digital signature

Re: svn commit: r312404 - head/usr.bin/sed

[Xin Li]

On 1/19/17 22:29, Antoine Brodin wrote:
> On Thu, Jan 19, 2017 at 9:01 AM, Xin LI  wrote:
>> Author: delphij
>> Date: Thu Jan 19 08:01:35 2017
>> New Revision: 312404
>> URL: https://svnweb.freebsd.org/changeset/base/312404
>>
>> Log:
>>   Use S_ISREG instead of manual & (also it's better to compare the
>>   result from & and the pattern instead of just assuming it's one bit
>>   value).
>>
>>   Pointed out by Tianjie Mao .
>>
>>   MFC after:2 weeks
>>   Differential Revision:https://reviews.freebsd.org/D4827
> 
> Hi,
> 
> sed -i no longer works on symlinks which breaks lots of ports.
> Please revert and request an exp-run.

Done.  Requested as bug 216309.

Cheers,



signature.asc
Description: OpenPGP digital signature

svn commit: r312520 - head/usr.bin/sed/tests

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 06:47:02 2017
New Revision: 312520
URL: https://svnweb.freebsd.org/changeset/base/312520

Log:
  Integrate contrib/netbsd-tests/usr.bin/sed/t_sed.sh into the FreeBSD test
  suite as usr.bin/sed/sed_test
  
  Don't expect :emptybackref to fail -- it succeeds on FreeBSD
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/usr.bin/sed/tests/Makefile

Modified: head/usr.bin/sed/tests/Makefile
==
--- head/usr.bin/sed/tests/Makefile Fri Jan 20 06:45:06 2017
(r312519)
+++ head/usr.bin/sed/tests/Makefile Fri Jan 20 06:47:02 2017
(r312520)
@@ -2,11 +2,15 @@
 
 PACKAGE=   tests
 
+NETBSD_ATF_TESTS_SH+=  sed_test
 TAP_TESTS_SH=  legacy_test
 TAP_TESTS_SH+= multi_test
 TEST_METADATA.multi_test+= required_files="/usr/share/dict/words"
 TAP_TESTS_SH+= inplace_race_test
 
+ATF_TESTS_SH_SED_sed_test+=-e 's,atf_expect_fail "PR bin/28126",,g'
+${PACKAGE}FILES+=  d_c2048.in
+
 ${PACKAGE}FILES+=  hanoi.sed
 ${PACKAGE}FILES+=  math.sed
 ${PACKAGE}FILES+=  regress.G.out
@@ -35,4 +39,5 @@ ${PACKAGE}FILES+= regress.y.out
 
 SUBDIR=regress.multitest.out
 
+.include 
 .include 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r312519 - head/usr.bin/sed

[Xin LI]

Author: delphij
Date: Fri Jan 20 06:45:06 2017
New Revision: 312519
URL: https://svnweb.freebsd.org/changeset/base/312519

Log:
  Revert r312404 as we need to do an exp-run and fix existing ports that
  rely on the previous behavior.
  
  Requested by: antonie (portmgr)

Modified:
  head/usr.bin/sed/main.c

Modified: head/usr.bin/sed/main.c
==
--- head/usr.bin/sed/main.c Fri Jan 20 06:40:12 2017(r312518)
+++ head/usr.bin/sed/main.c Fri Jan 20 06:45:06 2017(r312519)
@@ -391,7 +391,7 @@ mf_fgets(SPACE *sp, enum e_spflag spflag
if (inplace != NULL) {
if (lstat(fname, ) != 0)
err(1, "%s", fname);
-   if (!S_ISREG(sb.st_mode))
+   if (!(sb.st_mode & S_IFREG))
errx(1, "%s: %s %s", fname,
"in-place editing only",
"works for regular files");
___
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: r312404 - head/usr.bin/sed

[Conrad Meyer]

On Thu, Jan 19, 2017 at 10:29 PM, Antoine Brodin  wrote:
> On Thu, Jan 19, 2017 at 9:01 AM, Xin LI  wrote:
>> Author: delphij
>> Date: Thu Jan 19 08:01:35 2017
>> New Revision: 312404
>> URL: https://svnweb.freebsd.org/changeset/base/312404
>>
>> Log:
>>   Use S_ISREG instead of manual & (also it's better to compare the
>>   result from & and the pattern instead of just assuming it's one bit
>>   value).
>>
>>   Pointed out by Tianjie Mao .
>>
>>   MFC after:2 weeks
>>   Differential Revision:https://reviews.freebsd.org/D4827
>
> Hi,
>
> sed -i no longer works on symlinks which breaks lots of ports.
> Please revert and request an exp-run.

That is clearly the intent of the code in question.  It was a bug that
it worked before — S_IFLNK and S_IFSOCK just happen to have the
S_IFREG bit set.  It seems like either such ports should be fixed to
dereference the link manually, or the check should be removed
entirely.

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: r312518 - in stable/10: contrib/xz contrib/xz/src/common contrib/xz/src/liblzma/api/lzma contrib/xz/src/liblzma/check contrib/xz/src/liblzma/common contrib/xz/src/liblzma/delta contrib/...

[Xin LI]

Author: delphij
Date: Fri Jan 20 06:40:12 2017
New Revision: 312518
URL: https://svnweb.freebsd.org/changeset/base/312518

Log:
  MFC r311504: MFV r311477: xz 5.2.3.

Modified:
  stable/10/contrib/xz/ChangeLog
  stable/10/contrib/xz/THANKS
  stable/10/contrib/xz/src/common/tuklib_cpucores.c
  stable/10/contrib/xz/src/common/tuklib_physmem.c
  stable/10/contrib/xz/src/liblzma/api/lzma/version.h
  stable/10/contrib/xz/src/liblzma/check/check.h
  stable/10/contrib/xz/src/liblzma/common/alone_decoder.c
  stable/10/contrib/xz/src/liblzma/common/alone_encoder.c
  stable/10/contrib/xz/src/liblzma/common/auto_decoder.c
  stable/10/contrib/xz/src/liblzma/common/block_decoder.c
  stable/10/contrib/xz/src/liblzma/common/block_encoder.c
  stable/10/contrib/xz/src/liblzma/common/common.h
  stable/10/contrib/xz/src/liblzma/common/index.c
  stable/10/contrib/xz/src/liblzma/common/index_decoder.c
  stable/10/contrib/xz/src/liblzma/common/index_encoder.c
  stable/10/contrib/xz/src/liblzma/common/stream_decoder.c
  stable/10/contrib/xz/src/liblzma/common/stream_encoder.c
  stable/10/contrib/xz/src/liblzma/common/stream_encoder_mt.c
  stable/10/contrib/xz/src/liblzma/delta/delta_common.c
  stable/10/contrib/xz/src/liblzma/delta/delta_decoder.c
  stable/10/contrib/xz/src/liblzma/delta/delta_encoder.c
  stable/10/contrib/xz/src/liblzma/delta/delta_private.h
  stable/10/contrib/xz/src/liblzma/lz/lz_decoder.c
  stable/10/contrib/xz/src/liblzma/lz/lz_decoder.h
  stable/10/contrib/xz/src/liblzma/lz/lz_encoder.c
  stable/10/contrib/xz/src/liblzma/lz/lz_encoder.h
  stable/10/contrib/xz/src/liblzma/lzma/lzma2_decoder.c
  stable/10/contrib/xz/src/liblzma/lzma/lzma2_encoder.c
  stable/10/contrib/xz/src/liblzma/lzma/lzma_decoder.c
  stable/10/contrib/xz/src/liblzma/lzma/lzma_encoder.c
  stable/10/contrib/xz/src/liblzma/lzma/lzma_encoder.h
  stable/10/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_fast.c
  stable/10/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_normal.c
  stable/10/contrib/xz/src/liblzma/lzma/lzma_encoder_presets.c
  stable/10/contrib/xz/src/liblzma/lzma/lzma_encoder_private.h
  stable/10/contrib/xz/src/liblzma/simple/arm.c
  stable/10/contrib/xz/src/liblzma/simple/armthumb.c
  stable/10/contrib/xz/src/liblzma/simple/ia64.c
  stable/10/contrib/xz/src/liblzma/simple/powerpc.c
  stable/10/contrib/xz/src/liblzma/simple/simple_coder.c
  stable/10/contrib/xz/src/liblzma/simple/simple_private.h
  stable/10/contrib/xz/src/liblzma/simple/sparc.c
  stable/10/contrib/xz/src/liblzma/simple/x86.c
  stable/10/contrib/xz/src/xz/args.c
  stable/10/contrib/xz/src/xz/coder.c
  stable/10/contrib/xz/src/xz/file_io.c
  stable/10/contrib/xz/src/xz/file_io.h
  stable/10/contrib/xz/src/xz/main.c
  stable/10/contrib/xz/src/xz/private.h
  stable/10/lib/liblzma/config.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/xz/ChangeLog
==
--- stable/10/contrib/xz/ChangeLog  Fri Jan 20 06:38:56 2017
(r312517)
+++ stable/10/contrib/xz/ChangeLog  Fri Jan 20 06:40:12 2017
(r312518)
@@ -1,3 +1,563 @@
+commit 3d566cd519017eee1a400e7961ff14058dfaf33c
+Author: Lasse Collin 
+Date:   2016-12-30 13:26:36 +0200
+
+Bump version and soname for 5.2.3.
+
+ src/liblzma/Makefile.am| 2 +-
+ src/liblzma/api/lzma/version.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 053e624fe33795e779ff736f16ce44a129c829b5
+Author: Lasse Collin 
+Date:   2016-12-30 13:25:10 +0200
+
+Update NEWS for 5.2.3.
+
+ NEWS | 39 +++
+ 1 file changed, 39 insertions(+)
+
+commit cae412b2b77d7fd88d187ed7659331709311f80d
+Author: Lasse Collin 
+Date:   2015-04-01 14:45:25 +0300
+
+xz: Fix the Capsicum rights on user_abort_pipe.
+
+ src/xz/file_io.c | 6 +-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+commit 9ccbae41000572193b9a09e7102f9e84dc6d96de
+Author: Lasse Collin 
+Date:   2016-12-28 21:05:22 +0200
+
+Mention potential sandboxing bugs in INSTALL.
+
+ INSTALL | 5 -
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+commit e013a337d3de77cce24360dffe956ea2339489b6
+Author: Lasse Collin 
+Date:   2016-11-21 20:24:50 +0200
+
+liblzma: Avoid multiple definitions of lzma_coder structures.
+
+Only one definition was visible in a translation unit.
+It avoided a few casts and temp variables but seems that
+this hack doesn't work with link-time optimizations in compilers
+as it's not C99/C11 compliant.
+
+Fixes:
+http://www.mail-archive.com/xz-devel@tukaani.org/msg00279.html
+
+ src/liblzma/common/alone_decoder.c |  44 +
+ src/liblzma/common/alone_encoder.c |  34 ---
+ src/liblzma/common/auto_decoder.c  |  35 ---
+ src/liblzma/common/block_decoder.c   

svn commit: r312517 - in stable/11: contrib/xz contrib/xz/src/common contrib/xz/src/liblzma/api/lzma contrib/xz/src/liblzma/check contrib/xz/src/liblzma/common contrib/xz/src/liblzma/delta contrib/...

[Xin LI]

Author: delphij
Date: Fri Jan 20 06:38:56 2017
New Revision: 312517
URL: https://svnweb.freebsd.org/changeset/base/312517

Log:
  MFC r311504: MFV r311477: xz 5.2.3.

Modified:
  stable/11/contrib/xz/ChangeLog
  stable/11/contrib/xz/THANKS
  stable/11/contrib/xz/src/common/tuklib_cpucores.c
  stable/11/contrib/xz/src/common/tuklib_physmem.c
  stable/11/contrib/xz/src/liblzma/api/lzma/version.h
  stable/11/contrib/xz/src/liblzma/check/check.h
  stable/11/contrib/xz/src/liblzma/common/alone_decoder.c
  stable/11/contrib/xz/src/liblzma/common/alone_encoder.c
  stable/11/contrib/xz/src/liblzma/common/auto_decoder.c
  stable/11/contrib/xz/src/liblzma/common/block_decoder.c
  stable/11/contrib/xz/src/liblzma/common/block_encoder.c
  stable/11/contrib/xz/src/liblzma/common/common.h
  stable/11/contrib/xz/src/liblzma/common/index.c
  stable/11/contrib/xz/src/liblzma/common/index_decoder.c
  stable/11/contrib/xz/src/liblzma/common/index_encoder.c
  stable/11/contrib/xz/src/liblzma/common/stream_decoder.c
  stable/11/contrib/xz/src/liblzma/common/stream_encoder.c
  stable/11/contrib/xz/src/liblzma/common/stream_encoder_mt.c
  stable/11/contrib/xz/src/liblzma/delta/delta_common.c
  stable/11/contrib/xz/src/liblzma/delta/delta_decoder.c
  stable/11/contrib/xz/src/liblzma/delta/delta_encoder.c
  stable/11/contrib/xz/src/liblzma/delta/delta_private.h
  stable/11/contrib/xz/src/liblzma/lz/lz_decoder.c
  stable/11/contrib/xz/src/liblzma/lz/lz_decoder.h
  stable/11/contrib/xz/src/liblzma/lz/lz_encoder.c
  stable/11/contrib/xz/src/liblzma/lz/lz_encoder.h
  stable/11/contrib/xz/src/liblzma/lzma/lzma2_decoder.c
  stable/11/contrib/xz/src/liblzma/lzma/lzma2_encoder.c
  stable/11/contrib/xz/src/liblzma/lzma/lzma_decoder.c
  stable/11/contrib/xz/src/liblzma/lzma/lzma_encoder.c
  stable/11/contrib/xz/src/liblzma/lzma/lzma_encoder.h
  stable/11/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_fast.c
  stable/11/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_normal.c
  stable/11/contrib/xz/src/liblzma/lzma/lzma_encoder_presets.c
  stable/11/contrib/xz/src/liblzma/lzma/lzma_encoder_private.h
  stable/11/contrib/xz/src/liblzma/simple/arm.c
  stable/11/contrib/xz/src/liblzma/simple/armthumb.c
  stable/11/contrib/xz/src/liblzma/simple/ia64.c
  stable/11/contrib/xz/src/liblzma/simple/powerpc.c
  stable/11/contrib/xz/src/liblzma/simple/simple_coder.c
  stable/11/contrib/xz/src/liblzma/simple/simple_private.h
  stable/11/contrib/xz/src/liblzma/simple/sparc.c
  stable/11/contrib/xz/src/liblzma/simple/x86.c
  stable/11/contrib/xz/src/xz/args.c
  stable/11/contrib/xz/src/xz/coder.c
  stable/11/contrib/xz/src/xz/file_io.c
  stable/11/contrib/xz/src/xz/file_io.h
  stable/11/contrib/xz/src/xz/main.c
  stable/11/contrib/xz/src/xz/private.h
  stable/11/lib/liblzma/config.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/contrib/xz/ChangeLog
==
--- stable/11/contrib/xz/ChangeLog  Fri Jan 20 06:24:31 2017
(r312516)
+++ stable/11/contrib/xz/ChangeLog  Fri Jan 20 06:38:56 2017
(r312517)
@@ -1,3 +1,563 @@
+commit 3d566cd519017eee1a400e7961ff14058dfaf33c
+Author: Lasse Collin 
+Date:   2016-12-30 13:26:36 +0200
+
+Bump version and soname for 5.2.3.
+
+ src/liblzma/Makefile.am| 2 +-
+ src/liblzma/api/lzma/version.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 053e624fe33795e779ff736f16ce44a129c829b5
+Author: Lasse Collin 
+Date:   2016-12-30 13:25:10 +0200
+
+Update NEWS for 5.2.3.
+
+ NEWS | 39 +++
+ 1 file changed, 39 insertions(+)
+
+commit cae412b2b77d7fd88d187ed7659331709311f80d
+Author: Lasse Collin 
+Date:   2015-04-01 14:45:25 +0300
+
+xz: Fix the Capsicum rights on user_abort_pipe.
+
+ src/xz/file_io.c | 6 +-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+commit 9ccbae41000572193b9a09e7102f9e84dc6d96de
+Author: Lasse Collin 
+Date:   2016-12-28 21:05:22 +0200
+
+Mention potential sandboxing bugs in INSTALL.
+
+ INSTALL | 5 -
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+commit e013a337d3de77cce24360dffe956ea2339489b6
+Author: Lasse Collin 
+Date:   2016-11-21 20:24:50 +0200
+
+liblzma: Avoid multiple definitions of lzma_coder structures.
+
+Only one definition was visible in a translation unit.
+It avoided a few casts and temp variables but seems that
+this hack doesn't work with link-time optimizations in compilers
+as it's not C99/C11 compliant.
+
+Fixes:
+http://www.mail-archive.com/xz-devel@tukaani.org/msg00279.html
+
+ src/liblzma/common/alone_decoder.c |  44 +
+ src/liblzma/common/alone_encoder.c |  34 ---
+ src/liblzma/common/auto_decoder.c  |  35 ---
+ src/liblzma/common/block_decoder.c   

Re: svn commit: r312404 - head/usr.bin/sed

[Antoine Brodin]

On Thu, Jan 19, 2017 at 9:01 AM, Xin LI  wrote:
> Author: delphij
> Date: Thu Jan 19 08:01:35 2017
> New Revision: 312404
> URL: https://svnweb.freebsd.org/changeset/base/312404
>
> Log:
>   Use S_ISREG instead of manual & (also it's better to compare the
>   result from & and the pattern instead of just assuming it's one bit
>   value).
>
>   Pointed out by Tianjie Mao .
>
>   MFC after:2 weeks
>   Differential Revision:https://reviews.freebsd.org/D4827

Hi,

sed -i no longer works on symlinks which breaks lots of ports.
Please revert and request an exp-run.

Cheers,

Antoine
___
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: r312516 - stable/10/contrib/bsnmp/snmpd

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 06:24:31 2017
New Revision: 312516
URL: https://svnweb.freebsd.org/changeset/base/312516

Log:
  MFC r312331:
  r312331 (by glebius):
  
  Fix regression from r310655, which broke operation of bsnmpd if it is bound
  to a non-wildcard address.  As documented in ip(4), doing sendmsg(2) with
  IP_SENDSRCADDR on a socket that is bound to non-wildcard address is
  completely different to using this control message on a wildcard one.
  
  A fix is to add a bool to mark whether we did setsockopt(IP_RECVDSTADDR)
  on the socket, and use IP_SENDSRCADDR control message only if we did.
  
  While here, garbage collect absolutely useless udp_recv() function that
  establishes some structures on stack to never use them later.

Modified:
  stable/10/contrib/bsnmp/snmpd/trans_udp.c
  stable/10/contrib/bsnmp/snmpd/trans_udp.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/bsnmp/snmpd/trans_udp.c
==
--- stable/10/contrib/bsnmp/snmpd/trans_udp.c   Fri Jan 20 06:22:42 2017
(r312515)
+++ stable/10/contrib/bsnmp/snmpd/trans_udp.c   Fri Jan 20 06:24:31 2017
(r312516)
@@ -34,6 +34,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -119,13 +120,15 @@ udp_init_port(struct tport *tp)
addr.sin_port = htons(p->port);
addr.sin_family = AF_INET;
addr.sin_len = sizeof(addr);
-   if (addr.sin_addr.s_addr == INADDR_ANY &&
-   setsockopt(p->input.fd, IPPROTO_IP, IP_RECVDSTADDR, ,
-   sizeof(on)) == -1) {
-   syslog(LOG_ERR, "setsockopt(IP_RECVDSTADDR): %m");
-   close(p->input.fd);
-   p->input.fd = -1;
-   return (SNMP_ERR_GENERR);
+   if (addr.sin_addr.s_addr == INADDR_ANY) {
+   if (setsockopt(p->input.fd, IPPROTO_IP, IP_RECVDSTADDR, ,
+   sizeof(on)) == -1) {
+   syslog(LOG_ERR, "setsockopt(IP_RECVDSTADDR): %m");
+   close(p->input.fd);
+   p->input.fd = -1;
+   return (SNMP_ERR_GENERR);
+   }
+   p->recvdstaddr = true;
}
if (bind(p->input.fd, (struct sockaddr *), sizeof(addr))) {
if (errno == EADDRNOTAVAIL) {
@@ -218,7 +221,6 @@ udp_send(struct tport *tp, const u_char 
 {
struct udp_port *p = (struct udp_port *)tp;
struct cmsghdr *cmsg;
-   struct in_addr *src_addr;
struct msghdr msg;
char cbuf[CMSG_SPACE(sizeof(struct in_addr))];
struct iovec iov;
@@ -231,15 +233,20 @@ udp_send(struct tport *tp, const u_char 
msg.msg_iovlen = 1;
msg.msg_name = __DECONST(void *, addr);
msg.msg_namelen = addrlen;
-   msg.msg_control = cbuf;
-   msg.msg_controllen = sizeof(cbuf);
 
-   cmsg = CMSG_FIRSTHDR();
-   cmsg->cmsg_level = IPPROTO_IP;
-   cmsg->cmsg_type = IP_SENDSRCADDR;
-   cmsg->cmsg_len = CMSG_LEN(sizeof(struct in_addr));
-   src_addr = (struct in_addr *)(void*)CMSG_DATA(cmsg);
-   memcpy(src_addr, >recv_addr, sizeof(struct in_addr));
+   if (p->recvdstaddr) {
+   msg.msg_control = cbuf;
+   msg.msg_controllen = sizeof(cbuf);
+
+   cmsg = CMSG_FIRSTHDR();
+   cmsg->cmsg_level = IPPROTO_IP;
+   cmsg->cmsg_type = IP_SENDSRCADDR;
+   cmsg->cmsg_len = CMSG_LEN(sizeof(struct in_addr));
+   memcpy(CMSG_DATA(cmsg), >dstaddr, sizeof(struct in_addr));
+   } else {
+   msg.msg_control = NULL;
+   msg.msg_controllen = 0;
+   }
 
return (sendmsg(p->input.fd, , 0));
 }
@@ -260,11 +267,12 @@ check_priv_dgram(struct port_input *pi, 
  * Each receive should return one datagram.
  */
 static ssize_t
-recv_dgram(struct port_input *pi, struct in_addr *laddr)
+udp_recv(struct tport *tp, struct port_input *pi)
 {
u_char embuf[1000];
char cbuf[CMSG_SPACE(SOCKCREDSIZE(CMGROUP_MAX)) +
CMSG_SPACE(sizeof(struct in_addr))];
+   struct udp_port *p = (struct udp_port *)tp;
struct msghdr msg;
struct iovec iov[1];
ssize_t len;
@@ -316,7 +324,8 @@ recv_dgram(struct port_input *pi, struct
cmsg = CMSG_NXTHDR(, cmsg)) {
if (cmsg->cmsg_level == IPPROTO_IP &&
cmsg->cmsg_type == IP_RECVDSTADDR)
-   memcpy(laddr, CMSG_DATA(cmsg), sizeof(struct in_addr));
+   memcpy(>dstaddr, CMSG_DATA(cmsg),
+   sizeof(struct in_addr));
if (cmsg->cmsg_level == SOL_SOCKET &&
cmsg->cmsg_type == SCM_CREDS)
cred = (struct sockcred *)CMSG_DATA(cmsg);
@@ -329,42 +338,6 @@ recv_dgram(struct port_input *pi, struct
 }
 
 /*
- * Receive something
- */
-static ssize_t
-udp_recv(struct tport *tp, struct port_input *pi)
-{
-  

svn commit: r312515 - stable/11/contrib/bsnmp/snmpd

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 06:22:42 2017
New Revision: 312515
URL: https://svnweb.freebsd.org/changeset/base/312515

Log:
  MFC r312331:
  r312331 (by glebius):
  
  Fix regression from r310655, which broke operation of bsnmpd if it is bound
  to a non-wildcard address.  As documented in ip(4), doing sendmsg(2) with
  IP_SENDSRCADDR on a socket that is bound to non-wildcard address is
  completely different to using this control message on a wildcard one.
  
  A fix is to add a bool to mark whether we did setsockopt(IP_RECVDSTADDR)
  on the socket, and use IP_SENDSRCADDR control message only if we did.
  
  While here, garbage collect absolutely useless udp_recv() function that
  establishes some structures on stack to never use them later.

Modified:
  stable/11/contrib/bsnmp/snmpd/trans_udp.c
  stable/11/contrib/bsnmp/snmpd/trans_udp.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/contrib/bsnmp/snmpd/trans_udp.c
==
--- stable/11/contrib/bsnmp/snmpd/trans_udp.c   Fri Jan 20 05:51:25 2017
(r312514)
+++ stable/11/contrib/bsnmp/snmpd/trans_udp.c   Fri Jan 20 06:22:42 2017
(r312515)
@@ -34,6 +34,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -119,13 +120,15 @@ udp_init_port(struct tport *tp)
addr.sin_port = htons(p->port);
addr.sin_family = AF_INET;
addr.sin_len = sizeof(addr);
-   if (addr.sin_addr.s_addr == INADDR_ANY &&
-   setsockopt(p->input.fd, IPPROTO_IP, IP_RECVDSTADDR, ,
-   sizeof(on)) == -1) {
-   syslog(LOG_ERR, "setsockopt(IP_RECVDSTADDR): %m");
-   close(p->input.fd);
-   p->input.fd = -1;
-   return (SNMP_ERR_GENERR);
+   if (addr.sin_addr.s_addr == INADDR_ANY) {
+   if (setsockopt(p->input.fd, IPPROTO_IP, IP_RECVDSTADDR, ,
+   sizeof(on)) == -1) {
+   syslog(LOG_ERR, "setsockopt(IP_RECVDSTADDR): %m");
+   close(p->input.fd);
+   p->input.fd = -1;
+   return (SNMP_ERR_GENERR);
+   }
+   p->recvdstaddr = true;
}
if (bind(p->input.fd, (struct sockaddr *), sizeof(addr))) {
if (errno == EADDRNOTAVAIL) {
@@ -218,7 +221,6 @@ udp_send(struct tport *tp, const u_char 
 {
struct udp_port *p = (struct udp_port *)tp;
struct cmsghdr *cmsg;
-   struct in_addr *src_addr;
struct msghdr msg;
char cbuf[CMSG_SPACE(sizeof(struct in_addr))];
struct iovec iov;
@@ -231,15 +233,20 @@ udp_send(struct tport *tp, const u_char 
msg.msg_iovlen = 1;
msg.msg_name = __DECONST(void *, addr);
msg.msg_namelen = addrlen;
-   msg.msg_control = cbuf;
-   msg.msg_controllen = sizeof(cbuf);
 
-   cmsg = CMSG_FIRSTHDR();
-   cmsg->cmsg_level = IPPROTO_IP;
-   cmsg->cmsg_type = IP_SENDSRCADDR;
-   cmsg->cmsg_len = CMSG_LEN(sizeof(struct in_addr));
-   src_addr = (struct in_addr *)(void*)CMSG_DATA(cmsg);
-   memcpy(src_addr, >recv_addr, sizeof(struct in_addr));
+   if (p->recvdstaddr) {
+   msg.msg_control = cbuf;
+   msg.msg_controllen = sizeof(cbuf);
+
+   cmsg = CMSG_FIRSTHDR();
+   cmsg->cmsg_level = IPPROTO_IP;
+   cmsg->cmsg_type = IP_SENDSRCADDR;
+   cmsg->cmsg_len = CMSG_LEN(sizeof(struct in_addr));
+   memcpy(CMSG_DATA(cmsg), >dstaddr, sizeof(struct in_addr));
+   } else {
+   msg.msg_control = NULL;
+   msg.msg_controllen = 0;
+   }
 
return (sendmsg(p->input.fd, , 0));
 }
@@ -260,11 +267,12 @@ check_priv_dgram(struct port_input *pi, 
  * Each receive should return one datagram.
  */
 static ssize_t
-recv_dgram(struct port_input *pi, struct in_addr *laddr)
+udp_recv(struct tport *tp, struct port_input *pi)
 {
u_char embuf[1000];
char cbuf[CMSG_SPACE(SOCKCREDSIZE(CMGROUP_MAX)) +
CMSG_SPACE(sizeof(struct in_addr))];
+   struct udp_port *p = (struct udp_port *)tp;
struct msghdr msg;
struct iovec iov[1];
ssize_t len;
@@ -316,7 +324,8 @@ recv_dgram(struct port_input *pi, struct
cmsg = CMSG_NXTHDR(, cmsg)) {
if (cmsg->cmsg_level == IPPROTO_IP &&
cmsg->cmsg_type == IP_RECVDSTADDR)
-   memcpy(laddr, CMSG_DATA(cmsg), sizeof(struct in_addr));
+   memcpy(>dstaddr, CMSG_DATA(cmsg),
+   sizeof(struct in_addr));
if (cmsg->cmsg_level == SOL_SOCKET &&
cmsg->cmsg_type == SCM_CREDS)
cred = (struct sockcred *)CMSG_DATA(cmsg);
@@ -329,42 +338,6 @@ recv_dgram(struct port_input *pi, struct
 }
 
 /*
- * Receive something
- */
-static ssize_t
-udp_recv(struct tport *tp, struct port_input *pi)
-{
-  

Re: svn commit: r312513 - head/sys/modules/ath

[Ngie Cooper (yaneurabeya)]

> On Jan 19, 2017, at 21:45, Ngie Cooper  wrote:
> 
> Author: ngie
> Date: Fri Jan 20 05:45:07 2017
> New Revision: 312513
> URL: https://svnweb.freebsd.org/changeset/base/312513
> 
> Log:
>  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
> ones
> 
>  This simplifies pathing in make/displayed output
> 
>  MFC after:3 weeks
>  Sponsored by: Dell EMC Isilon

I hope that this also gives Jenkins the hint that these warnings are not unique 
because the filename is now consistent between sys/conf/files and 
sys/modules/ath/Makefile: 
https://groups.google.com/forum/#!topic/jenkinsci-issues/8ewZHr_dXiU . We’ll 
see…
-Ngie


signature.asc
Description: Message signed with OpenPGP using GPGMail

svn commit: r312514 - head/gnu/usr.bin/gdb/gdbserver

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 05:51:25 2017
New Revision: 312514
URL: https://svnweb.freebsd.org/changeset/base/312514

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This simplifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/gnu/usr.bin/gdb/gdbserver/Makefile

Modified: head/gnu/usr.bin/gdb/gdbserver/Makefile
==
--- head/gnu/usr.bin/gdb/gdbserver/Makefile Fri Jan 20 05:45:07 2017
(r312513)
+++ head/gnu/usr.bin/gdb/gdbserver/Makefile Fri Jan 20 05:51:25 2017
(r312514)
@@ -3,7 +3,7 @@
 # Not elf specific so don't install in /usr/libexec/elf
 BINDIR=/usr/bin
 
-GDBDIR=${.CURDIR}/../../../../contrib/gdb
+GDBDIR=${SRCTOP}/contrib/gdb
 .PATH: ${GDBDIR}/gdb/signals
 .PATH: ${GDBDIR}/gdb/gdbserver
 .PATH: ${GDBDIR}/gdb
___
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: r312513 - head/sys/modules/ath

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 05:45:07 2017
New Revision: 312513
URL: https://svnweb.freebsd.org/changeset/base/312513

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This simplifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/sys/modules/ath/Makefile

Modified: head/sys/modules/ath/Makefile
==
--- head/sys/modules/ath/Makefile   Fri Jan 20 04:55:14 2017
(r312512)
+++ head/sys/modules/ath/Makefile   Fri Jan 20 05:45:07 2017
(r312513)
@@ -31,8 +31,8 @@
 
 ATH_RATE?= sample  # tx rate control algorithm
 
-.PATH: ${.CURDIR}/../../dev/ath
-.PATH: ${.CURDIR}/../../dev/ath/ath_hal
+.PATH: ${SRCTOP}/sys/dev/ath
+.PATH: ${SRCTOP}/sys/dev/ath/ath_hal
 
 KMOD=  if_ath
 SRCS=  if_ath.c if_ath_alq.c if_ath_debug.c if_ath_keycache.c if_ath_sysctl.c
@@ -46,7 +46,7 @@ SRCS+=device_if.h bus_if.h pci_if.h opt
 #
 # AR5210 support; these are first generation 11a-only devices.
 #
-.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5210
+.PATH: ${SRCTOP}/sys/dev/ath/ath_hal/ar5210
 SRCS+= ah_eeprom_v1.c \
ar5210_attach.c ar5210_beacon.c ar5210_interrupts.c \
ar5210_keycache.c ar5210_misc.c ar5210_phy.c ar5210_power.c \
@@ -56,7 +56,7 @@ SRCS+=ah_eeprom_v1.c \
 # AR5211 support; these are second generation 11b/g/a devices
 # (but 11g was OFDM only and is not supported).
 #
-.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5211
+.PATH: ${SRCTOP}/sys/dev/ath/ath_hal/ar5211
 SRCS+= ar5211_attach.c ar5211_beacon.c ar5211_interrupts.c \
ar5211_keycache.c ar5211_misc.c ar5211_phy.c ar5211_power.c \
ar5211_recv.c ar5211_reset.c ar5211_xmit.c
@@ -64,7 +64,7 @@ SRCS+=ar5211_attach.c ar5211_beacon.c a
 #
 # AR5212 support; this covers all other pci/cardbus legacy parts.
 #
-.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5212
+.PATH: ${SRCTOP}/sys/dev/ath/ath_hal/ar5212
 SRCS+= ar5212_ani.c ar5212_attach.c ar5212_beacon.c ar5212_eeprom.c \
ar5212_gpio.c ar5212_interrupts.c ar5212_keycache.c ar5212_misc.c \
ar5212_phy.c ar5212_power.c ar5212_recv.c ar5212_reset.c \
@@ -85,7 +85,7 @@ SRCS+=ar5413.c
 # NB: 9160 depends on 5416 but 5416 does not require 9160
 #
 # + 5416 (Owl)
-.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5416
+.PATH: ${SRCTOP}/sys/dev/ath/ath_hal/ar5416
 SRCS+= ah_eeprom_v14.c ah_eeprom_v4k.c \
ar5416_ani.c ar5416_attach.c ar5416_beacon.c ar5416_btcoex.c \
ar5416_cal.c ar5416_cal_iq.c ar5416_cal_adcgain.c ar5416_cal_adcdc.c \
@@ -97,7 +97,7 @@ SRCS+=ah_eeprom_v14.c ah_eeprom_v4k.c \
 SRCS+= ar2133.c
 
 # + AR9160 (Sowl)
-.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar9001
+.PATH: ${SRCTOP}/sys/dev/ath/ath_hal/ar9001
 SRCS+= ar9160_attach.c
 
 # + AR9130 - (Sowl) - Embedded (AR913x SoC)
@@ -111,7 +111,7 @@ SRCS+=  ar9130_attach.c ar9130_eeprom.c a
 
 # AR9002 series chips
 # + AR9220/AR9280 - Merlin
-.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar9002
+.PATH: ${SRCTOP}/sys/dev/ath/ath_hal/ar9002
 SRCS+= ar9280.c ar9280_attach.c ar9280_olc.c
 
 # + AR9285 - Kite
@@ -119,13 +119,13 @@ SRCS+=ar9285.c ar9285_reset.c ar9285_at
 SRCS+= ar9285_diversity.c ar9285_btcoex.c
 
 # + AR9287 - Kiwi
-.PATH:  ${.CURDIR}/../../dev/ath/ath_hal
+.PATH:  ${SRCTOP}/sys/dev/ath/ath_hal
 SRCS+=  ah_eeprom_9287.c
-.PATH:  ${.CURDIR}/../../dev/ath/ath_hal/ar9002
+.PATH:  ${SRCTOP}/sys/dev/ath/ath_hal/ar9002
 SRCS+=  ar9287.c ar9287_reset.c ar9287_attach.c ar9287_cal.c ar9287_olc.c
 
 # + AR9300 HAL
-.PATH:  ${.CURDIR}/../../contrib/dev/ath/ath_hal/ar9300
+.PATH:  ${SRCTOP}/sys/contrib/dev/ath/ath_hal/ar9300
 SRCS+= ar9300_interrupts.c ar9300_radar.c ar9300_ani.c ar9300_keycache.c
 SRCS+= ar9300_radio.c ar9300_xmit.c ar9300_attach.c ar9300_mci.c ar9300_stub.c
 SRCS+= ar9300_xmit_ds.c ar9300_beacon.c ar9300_misc.c ar9300_recv.c
@@ -135,22 +135,22 @@ SRCS+= ar9300_power.c ar9300_timer.c ar9
 
 # NB: rate control is bound to the driver by symbol names so only pick one
 .if ${ATH_RATE} == "sample"
-.PATH: ${.CURDIR}/../../dev/ath/ath_rate/sample
+.PATH: ${SRCTOP}/sys/dev/ath/ath_rate/sample
 SRCS+= sample.c
 .elif ${ATH_RATE} == "onoe"
-.PATH: ${.CURDIR}/../../dev/ath/ath_rate/onoe
+.PATH: ${SRCTOP}/sys/dev/ath/ath_rate/onoe
 SRCS+= onoe.c
 .elif ${ATH_RATE} == "amrr"
-.PATH: ${.CURDIR}/../../dev/ath/ath_rate/amrr
+.PATH: ${SRCTOP}/sys/dev/ath/ath_rate/amrr
 SRCS+= amrr.c
 .endif
 
 # DFS
-.PATH: ${.CURDIR}/../../dev/ath/ath_dfs/null
+.PATH: ${SRCTOP}/sys/dev/ath/ath_dfs/null
 SRCS+= dfs_null.c
 
-CFLAGS+=  -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal
-CFLAGS+=  -I. -I${.CURDIR}/../../contrib/dev/ath/ath_hal/
+CFLAGS+=  -I. -I${SRCTOP}/sys/dev/ath -I${SRCTOP}/sys/dev/ath/ath_hal
+CFLAGS+=  -I. -I${SRCTOP}/sys/contrib/dev/ath/ath_hal/
 
 .if !defined(KERNBUILDDIR)
 opt_ah.h:
___

Re: svn commit: r312434 - head/sys/sys

[Bruce Evans]

On Thu, 19 Jan 2017, Sean Bruno wrote:


Author: sbruno
Date: Thu Jan 19 19:58:08 2017
New Revision: 312434
URL: https://svnweb.freebsd.org/changeset/base/312434

Log:
 Adjust gtaskqueue startup again  so that we catch the !SMP case and
 users that choose not to use EARLY_AP_STARTUP.

 There is still an initialization issue/panic with !SMP and !EARLY_AP_STARTUP
 that we have yet to resolve.

 Submitted by:  bde


It is more for "legacy" (non-MSI) interrupts with most of the 8
combinations SMP, EARLY_AP_STARTUP and (ncpus > 1).  Some combinations
work, but not the simplest ones with ncpus == 1 since the complications
for the complex cases affect the simplest cases adversely.

Bruce
___
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: r312512 - head/lib/libdevdctl/tests

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:55:14 2017
New Revision: 312512
URL: https://svnweb.freebsd.org/changeset/base/312512

Log:
  Use .CURDIR:H instead of .CURDIR to simplify pathing in output, etc
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libdevdctl/tests/Makefile

Modified: head/lib/libdevdctl/tests/Makefile
==
--- head/lib/libdevdctl/tests/Makefile  Fri Jan 20 04:54:21 2017
(r312511)
+++ head/lib/libdevdctl/tests/Makefile  Fri Jan 20 04:55:14 2017
(r312512)
@@ -2,7 +2,7 @@
 
 TESTSDIR= ${TESTSBASE}/lib/libdevdctl
 
-.PATH: ${.CURDIR}/..
+.PATH: ${.CURDIR:H}
 
 PLAIN_TESTS_CXX= libdevdctl_unittest
 
___
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: r312511 - head/lib/libdwarf

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:54:21 2017
New Revision: 312511
URL: https://svnweb.freebsd.org/changeset/base/312511

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This simplifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libdwarf/Makefile

Modified: head/lib/libdwarf/Makefile
==
--- head/lib/libdwarf/Makefile  Fri Jan 20 04:54:09 2017(r312510)
+++ head/lib/libdwarf/Makefile  Fri Jan 20 04:54:21 2017(r312511)
@@ -94,7 +94,7 @@ CLEANFILES=   ${GENSRCS}
 CLEANDIRS= sys
 CFLAGS+=   -I. -I${SRCDIR} -I${ELFTCDIR}/common -I${ELFTCDIR}/libelf
 
-sys/elf32.h sys/elf64.h sys/elf_common.h: ${.CURDIR}/../../sys/${.TARGET} 
.NOMETA
+sys/elf32.h sys/elf64.h sys/elf_common.h: ${SRCTOP}/sys/${.TARGET} .NOMETA
mkdir -p ${.OBJDIR}/sys
ln -sf ${.ALLSRC} ${.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: r312510 - head/lib/libelf

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:54:09 2017
New Revision: 312510
URL: https://svnweb.freebsd.org/changeset/base/312510

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This simplifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libelf/Makefile

Modified: head/lib/libelf/Makefile
==
--- head/lib/libelf/MakefileFri Jan 20 04:53:50 2017(r312509)
+++ head/lib/libelf/MakefileFri Jan 20 04:54:09 2017(r312510)
@@ -82,7 +82,7 @@ CLEANFILES=   ${GENSRCS}
 CLEANDIRS= sys
 CFLAGS+=   -I. -I${SRCDIR} -I${ELFTCDIR}/common
 
-sys/elf32.h sys/elf64.h sys/elf_common.h: ${.CURDIR}/../../sys/${.TARGET} 
.NOMETA
+sys/elf32.h sys/elf64.h sys/elf_common.h: ${SRCTOP}/sys/${.TARGET} .NOMETA
mkdir -p ${.OBJDIR}/sys
ln -sf ${.ALLSRC} ${.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: r312509 - head/lib/libevent

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:53:50 2017
New Revision: 312509
URL: https://svnweb.freebsd.org/changeset/base/312509

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This simplifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libevent/Makefile

Modified: head/lib/libevent/Makefile
==
--- head/lib/libevent/Makefile  Fri Jan 20 04:53:45 2017(r312508)
+++ head/lib/libevent/Makefile  Fri Jan 20 04:53:50 2017(r312509)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PACKAGE=lib${LIB}
-.PATH: ${.CURDIR}/../../contrib/pf/libevent
+.PATH: ${SRCTOP}/contrib/pf/libevent
 
 .include 
 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r312508 - head/lib/libexpat

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:53:45 2017
New Revision: 312508
URL: https://svnweb.freebsd.org/changeset/base/312508

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This simplifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libexpat/Makefile

Modified: head/lib/libexpat/Makefile
==
--- head/lib/libexpat/Makefile  Fri Jan 20 04:53:40 2017(r312507)
+++ head/lib/libexpat/Makefile  Fri Jan 20 04:53:45 2017(r312508)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PACKAGE=lib${LIB}
-EXPAT= ${.CURDIR}/../../contrib/expat
+EXPAT= ${SRCTOP}/contrib/expat
 
 LIB=   bsdxml
 SHLIBDIR?= /lib
___
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: r312506 - in head/lib/libiconv_modules: . mapper_parallel

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:53:26 2017
New Revision: 312506
URL: https://svnweb.freebsd.org/changeset/base/312506

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This simplifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libiconv_modules/Makefile.inc
  head/lib/libiconv_modules/mapper_parallel/Makefile

Modified: head/lib/libiconv_modules/Makefile.inc
==
--- head/lib/libiconv_modules/Makefile.inc  Fri Jan 20 04:53:20 2017
(r312505)
+++ head/lib/libiconv_modules/Makefile.inc  Fri Jan 20 04:53:26 2017
(r312506)
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../libc/iconv
+.PATH: ${SRCTOP}/lib/libc/iconv
 
 SHLIB_MAJOR= 4
 WARNS?=6
-CFLAGS+= -I${.CURDIR}/../../libc/iconv
+CFLAGS+= -I${SRCTOP}/lib/libc/iconv
 
 CFLAGS+=   -Dbool=_Bool
 

Modified: head/lib/libiconv_modules/mapper_parallel/Makefile
==
--- head/lib/libiconv_modules/mapper_parallel/Makefile  Fri Jan 20 04:53:20 
2017(r312505)
+++ head/lib/libiconv_modules/mapper_parallel/Makefile  Fri Jan 20 04:53:26 
2017(r312506)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../mapper_serial
+.PATH: ${.CURDIR:H}/mapper_serial
 
 SHLIB= mapper_parallel
 SRCS+= citrus_mapper_serial.c
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r312507 - head/lib/libexecinfo

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:53:40 2017
New Revision: 312507
URL: https://svnweb.freebsd.org/changeset/base/312507

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This simplifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libexecinfo/Makefile

Modified: head/lib/libexecinfo/Makefile
==
--- head/lib/libexecinfo/Makefile   Fri Jan 20 04:53:26 2017
(r312506)
+++ head/lib/libexecinfo/Makefile   Fri Jan 20 04:53:40 2017
(r312507)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PACKAGE=lib${LIB}
-LIBEXECINFO=   ${.CURDIR}/../../contrib/libexecinfo
+LIBEXECINFO=   ${SRCTOP}/contrib/libexecinfo
 
 LIB=   execinfo
 SHLIB_MAJOR=   1
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r312505 - head/lib/libgssapi

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:53:20 2017
New Revision: 312505
URL: https://svnweb.freebsd.org/changeset/base/312505

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This simplifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libgssapi/Makefile

Modified: head/lib/libgssapi/Makefile
==
--- head/lib/libgssapi/Makefile Fri Jan 20 04:53:00 2017(r312504)
+++ head/lib/libgssapi/Makefile Fri Jan 20 04:53:20 2017(r312505)
@@ -3,7 +3,7 @@
 PACKAGE=lib${LIB}
 LIB=   gssapi
 SHLIB_MAJOR=   10
-VERSION_DEF=   ${.CURDIR}/../libc/Versions.def
+VERSION_DEF=   ${SRCTOP}/lib/libc/Versions.def
 SYMBOL_MAPS=   ${.CURDIR}/Symbol.map
 
 SRCS=
___
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: r312504 - head/lib/libcxxrt

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:53:00 2017
New Revision: 312504
URL: https://svnweb.freebsd.org/changeset/base/312504

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This simplifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libcxxrt/Makefile

Modified: head/lib/libcxxrt/Makefile
==
--- head/lib/libcxxrt/Makefile  Fri Jan 20 04:52:29 2017(r312503)
+++ head/lib/libcxxrt/Makefile  Fri Jan 20 04:53:00 2017(r312504)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PACKAGE=   clibs
-SRCDIR=${.CURDIR}/../../contrib/libcxxrt
+SRCDIR=${SRCTOP}/contrib/libcxxrt
 
 SHLIB_MAJOR=   1
 SHLIBDIR?= /lib
___
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: r312503 - head/lib/libcrypt

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:52:29 2017
New Revision: 312503
URL: https://svnweb.freebsd.org/changeset/base/312503

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This simplifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libcrypt/Makefile

Modified: head/lib/libcrypt/Makefile
==
--- head/lib/libcrypt/Makefile  Fri Jan 20 04:52:00 2017(r312502)
+++ head/lib/libcrypt/Makefile  Fri Jan 20 04:52:29 2017(r312503)
@@ -10,7 +10,7 @@ SHLIBDIR?=/lib
 SHLIB_MAJOR=   5
 LIB=   crypt
 
-.PATH: ${.CURDIR}/../libmd ${.CURDIR}/../../sys/crypto/sha2
+.PATH: ${SRCTOP}/lib/libmd ${SRCTOP}/sys/crypto/sha2
 SRCS=  crypt.c misc.c \
crypt-md5.c md5c.c \
crypt-nthash.c md4c.c \
@@ -19,12 +19,12 @@ SRCS=   crypt.c misc.c \
 MAN=   crypt.3
 MLINKS=crypt.3 crypt_get_format.3 crypt.3 crypt_r.3 \
crypt.3 crypt_set_format.3
-CFLAGS+=   -I${.CURDIR}/../libmd -I${.CURDIR}/../libutil \
-   -I${.CURDIR}/../../sys/crypto/sha2
+CFLAGS+=   -I${SRCTOP}/lib/libmd -I${SRCTOP}/lib/libutil \
+   -I${SRCTOP}/sys/crypto/sha2
 
 # Pull in the strong crypto, if it is present.
-.if exists(${.CURDIR}/../../secure/lib/libcrypt) && ${MK_CRYPT} != "no"
-.PATH: ${.CURDIR}/../../secure/lib/libcrypt
+.if exists(${SRCTOP}/secure/lib/libcrypt) && ${MK_CRYPT} != "no"
+.PATH: ${SRCTOP}/secure/lib/libcrypt
 SRCS+= crypt-des.c crypt-blowfish.c blowfish.c
 CFLAGS+=   -I${.CURDIR} -DHAS_DES -DHAS_BLOWFISH
 .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: r312502 - head/lib/libcompat

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:52:00 2017
New Revision: 312502
URL: https://svnweb.freebsd.org/changeset/base/312502

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This simplifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libcompat/Makefile

Modified: head/lib/libcompat/Makefile
==
--- head/lib/libcompat/Makefile Fri Jan 20 04:51:36 2017(r312501)
+++ head/lib/libcompat/Makefile Fri Jan 20 04:52:00 2017(r312502)
@@ -3,7 +3,7 @@
 
 PACKAGE=lib${LIB}
 LIB=   compat
-CFLAGS+=-DLIBC_SCCS -DSYSLIBC_SCCS -I${.CURDIR}/../libc/locale
+CFLAGS+=-DLIBC_SCCS -DSYSLIBC_SCCS -I${SRCTOP}/lib/libc/locale
 NO_PIC=
 
 WARNS?=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: r312501 - head/lib/libcom_err

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:51:36 2017
New Revision: 312501
URL: https://svnweb.freebsd.org/changeset/base/312501

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This simplifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libcom_err/Makefile

Modified: head/lib/libcom_err/Makefile
==
--- head/lib/libcom_err/MakefileFri Jan 20 04:50:46 2017
(r312500)
+++ head/lib/libcom_err/MakefileFri Jan 20 04:51:36 2017
(r312501)
@@ -5,7 +5,7 @@ LIB=com_err
 SRCS=  com_err.c error.c
 INCS=  ${COM_ERRDIR}/com_err.h ${COM_ERRDIR}/com_right.h
 MAN=   com_err.3
-COM_ERRDIR=${.CURDIR}/../../contrib/com_err
+COM_ERRDIR=${SRCTOP}/contrib/com_err
 CFLAGS+=   -I${COM_ERRDIR}
 
 LDFLAGS=   -Wl,--no-undefined
___
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: r312500 - head/lib/libkiconv

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:50:46 2017
New Revision: 312500
URL: https://svnweb.freebsd.org/changeset/base/312500

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This simplifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libkiconv/Makefile

Modified: head/lib/libkiconv/Makefile
==
--- head/lib/libkiconv/Makefile Fri Jan 20 04:50:19 2017(r312499)
+++ head/lib/libkiconv/Makefile Fri Jan 20 04:50:46 2017(r312500)
@@ -17,7 +17,7 @@ MLINKS+=  kiconv.3 kiconv_add_xlat16_cspa
kiconv.3 kiconv_add_xlat16_cspairs.3 \
kiconv.3 kiconv_add_xlat16_table.3
 
-CFLAGS+=   -I${.CURDIR}/../../sys
+CFLAGS+=   -I${SRCTOP}/sys
 
 WARNS?=1
 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r312499 - head/lib/libldns

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:50:19 2017
New Revision: 312499
URL: https://svnweb.freebsd.org/changeset/base/312499

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This simplifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libldns/Makefile

Modified: head/lib/libldns/Makefile
==
--- head/lib/libldns/Makefile   Fri Jan 20 04:46:20 2017(r312498)
+++ head/lib/libldns/Makefile   Fri Jan 20 04:50:19 2017(r312499)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 # Vendor sources and generated files
-LDNSDIR = ${.CURDIR}/../../contrib/ldns
+LDNSDIR = ${SRCTOP}/contrib/ldns
 
 PACKAGE=lib${LIB}
 .PATH: ${LDNSDIR} ${LDNSDIR}/compat
___
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: r312498 - head/lib/liblzma

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:46:20 2017
New Revision: 312498
URL: https://svnweb.freebsd.org/changeset/base/312498

Log:
  Use SRCTOP-relative paths and .CURDIR with :H instead of ".." specified paths
  
  This simplifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/liblzma/Makefile

Modified: head/lib/liblzma/Makefile
==
--- head/lib/liblzma/Makefile   Fri Jan 20 04:45:09 2017(r312497)
+++ head/lib/liblzma/Makefile   Fri Jan 20 04:46:20 2017(r312498)
@@ -2,9 +2,9 @@
 
 PACKAGE=lib${LIB}
 LIB=   lzma
-LZMADIR=   ${.CURDIR}/../../contrib/xz/src/liblzma
+LZMADIR=   ${SRCTOP}/contrib/xz/src/liblzma
 
-.PATH: ${LZMADIR}/../common
+.PATH: ${LZMADIR:H}/common
 SRCS+= tuklib_physmem.c tuklib_cpucores.c
 
 .PATH: ${LZMADIR}/api/lzma
@@ -145,7 +145,7 @@ CFLAGS+=-DHAVE_CONFIG_H \
-I${LZMADIR}/lzma \
-I${LZMADIR}/delta \
-I${LZMADIR}/simple \
-   -I${LZMADIR}/../common
+   -I${LZMADIR:H}/common
 
 LIBADD+=   pthread
 
___
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: r312497 - head/lib/libmagic

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:45:09 2017
New Revision: 312497
URL: https://svnweb.freebsd.org/changeset/base/312497

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This simplifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libmagic/Makefile

Modified: head/lib/libmagic/Makefile
==
--- head/lib/libmagic/Makefile  Fri Jan 20 04:43:21 2017(r312496)
+++ head/lib/libmagic/Makefile  Fri Jan 20 04:45:09 2017(r312497)
@@ -2,7 +2,7 @@
 # Copyright (c) David E. O'Brien, 2000-2004, 2006, 2009
 
 PACKAGE=lib${LIB}
-CONTRDIR=  ${.CURDIR}/../../contrib/file
+CONTRDIR=  ${SRCTOP}/contrib/file
 .PATH: ${CONTRDIR}/src
 .PATH: ${CONTRDIR}/doc
 
___
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: r312496 - head/lib/libmd

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:43:21 2017
New Revision: 312496
URL: https://svnweb.freebsd.org/changeset/base/312496

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This simplifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libmd/Makefile

Modified: head/lib/libmd/Makefile
==
--- head/lib/libmd/Makefile Fri Jan 20 04:42:43 2017(r312495)
+++ head/lib/libmd/Makefile Fri Jan 20 04:43:21 2017(r312496)
@@ -78,11 +78,11 @@ CLEANFILES+=md[245]hl.c md[245].ref md[
 # in which case:
 #   * macros are used to rename symbols to libcrypt internal names
 #   * no weak aliases are generated
-CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../sys/crypto/sha2
-CFLAGS+= -I${.CURDIR}/../../sys/crypto/skein
+CFLAGS+= -I${.CURDIR} -I${SRCTOP}/sys/crypto/sha2
+CFLAGS+= -I${SRCTOP}/sys/crypto/skein
 CFLAGS+= -DWEAK_REFS
-.PATH: ${.CURDIR}/${MACHINE_ARCH} ${.CURDIR}/../../sys/crypto/sha2
-.PATH: ${.CURDIR}/../../sys/crypto/skein 
${.CURDIR}/../../sys/crypto/skein/${MACHINE_ARCH}
+.PATH: ${.CURDIR}/${MACHINE_ARCH} ${SRCTOP}/sys/crypto/sha2
+.PATH: ${SRCTOP}/sys/crypto/skein ${SRCTOP}/sys/crypto/skein/${MACHINE_ARCH}
 
 .if exists(${MACHINE_ARCH}/sha.S)
 SRCS+= sha.S
___
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: r312495 - head/lib/libmilter

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:42:43 2017
New Revision: 312495
URL: https://svnweb.freebsd.org/changeset/base/312495

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This simplifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libmilter/Makefile

Modified: head/lib/libmilter/Makefile
==
--- head/lib/libmilter/Makefile Fri Jan 20 04:42:11 2017(r312494)
+++ head/lib/libmilter/Makefile Fri Jan 20 04:42:43 2017(r312495)
@@ -3,7 +3,7 @@
 .include 
 
 PACKAGE=sendmail
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
 .PATH: ${SENDMAIL_DIR}/libmilter ${SENDMAIL_DIR}/libsm
 
 CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r312493 - head/lib/libngatm

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:41:53 2017
New Revision: 312493
URL: https://svnweb.freebsd.org/changeset/base/312493

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This simplifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libngatm/Makefile

Modified: head/lib/libngatm/Makefile
==
--- head/lib/libngatm/Makefile  Fri Jan 20 04:40:55 2017(r312492)
+++ head/lib/libngatm/Makefile  Fri Jan 20 04:41:53 2017(r312493)
@@ -8,8 +8,8 @@ SHLIB_MAJOR= 4
 MAN=   libngatm.3 uniaddr.3 unifunc.3 unimsg.3 unisap.3 unistruct.3
 
 # source of the library lives in contrib
-SDIR=  ${.CURDIR}/../../sys
-CTRB=  ${.CURDIR}/../../contrib/ngatm
+SDIR=  ${SRCTOP}/sys
+CTRB=  ${SRCTOP}/contrib/ngatm
 LIBBASE= ${SDIR}/contrib/ngatm
 
 CFLAGS+= -I${LIBBASE} -I${.OBJDIR} -I${CTRB}/libngatm
___
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: r312494 - head/lib/libmp

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:42:11 2017
New Revision: 312494
URL: https://svnweb.freebsd.org/changeset/base/312494

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This simplifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libmp/Makefile

Modified: head/lib/libmp/Makefile
==
--- head/lib/libmp/Makefile Fri Jan 20 04:41:53 2017(r312493)
+++ head/lib/libmp/Makefile Fri Jan 20 04:42:11 2017(r312494)
@@ -10,9 +10,9 @@ MAN=  libmp.3
 INCS=  mp.h
 SRCS=  mpasbn.c
 
-CFLAGS+=   -I${.CURDIR}/../../crypto
+CFLAGS+=   -I${SRCTOP}/crypto
 
-VERSION_DEF=   ${.CURDIR}/../libc/Versions.def
+VERSION_DEF=   ${SRCTOP}/lib/libc/Versions.def
 SYMBOL_MAPS=   ${.CURDIR}/Symbol.map
 
 .if ${MK_TESTS} != "no"
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r312492 - head/lib/libnv

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:40:55 2017
New Revision: 312492
URL: https://svnweb.freebsd.org/changeset/base/312492

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libnv/Makefile

Modified: head/lib/libnv/Makefile
==
--- head/lib/libnv/Makefile Fri Jan 20 04:40:10 2017(r312491)
+++ head/lib/libnv/Makefile Fri Jan 20 04:40:55 2017(r312492)
@@ -8,8 +8,8 @@ SHLIBDIR?= /lib
 LIB=   nv
 SHLIB_MAJOR= 0
 
-.PATH: ${.CURDIR}/../../sys/contrib/libnv ${.CURDIR}/../../sys/sys
-CFLAGS+=-I${.CURDIR}/../../sys -I${.CURDIR}
+.PATH: ${SRCTOP}/sys/contrib/libnv ${SRCTOP}/sys/sys
+CFLAGS+=-I${SRCTOP}/sys -I${.CURDIR}
 
 SRCS=  cnvlist.c
 SRCS+= dnvlist.c
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r312491 - head/lib/libopie

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:40:10 2017
New Revision: 312491
URL: https://svnweb.freebsd.org/changeset/base/312491

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libopie/Makefile

Modified: head/lib/libopie/Makefile
==
--- head/lib/libopie/Makefile   Fri Jan 20 04:39:36 2017(r312490)
+++ head/lib/libopie/Makefile   Fri Jan 20 04:40:10 2017(r312491)
@@ -3,7 +3,7 @@
 # $FreeBSD$
 #
 PACKAGE=lib${LIB}
-OPIE_DIST?=${.CURDIR}/../../contrib/opie
+OPIE_DIST?=${SRCTOP}/contrib/opie
 DIST_DIR=  ${OPIE_DIST}/${.CURDIR:T}
 SHLIB_MAJOR=8
 
___
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: r312490 - head/lib/libpcap

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:39:36 2017
New Revision: 312490
URL: https://svnweb.freebsd.org/changeset/base/312490

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libpcap/Makefile

Modified: head/lib/libpcap/Makefile
==
--- head/lib/libpcap/Makefile   Fri Jan 20 04:38:54 2017(r312489)
+++ head/lib/libpcap/Makefile   Fri Jan 20 04:39:36 2017(r312490)
@@ -114,7 +114,7 @@ SHLIB_MAJOR=8
 #
 # Magic to grab sources out of src/contrib
 #
-PCAP_DISTDIR?=${.CURDIR}/../../contrib/libpcap
+PCAP_DISTDIR?=${SRCTOP}/contrib/libpcap
 CFLAGS+=-I${PCAP_DISTDIR}
 .PATH: ${PCAP_DISTDIR}
 .PATH: ${PCAP_DISTDIR}/bpf/net
___
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: r312489 - head/lib/libprocstat/zfs

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:38:54 2017
New Revision: 312489
URL: https://svnweb.freebsd.org/changeset/base/312489

Log:
  Use SRCTOP-relative paths and .CURDIR with :H instead of ".." specified paths
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libprocstat/zfs/Makefile

Modified: head/lib/libprocstat/zfs/Makefile
==
--- head/lib/libprocstat/zfs/Makefile   Fri Jan 20 04:37:22 2017
(r312488)
+++ head/lib/libprocstat/zfs/Makefile   Fri Jan 20 04:38:54 2017
(r312489)
@@ -1,21 +1,21 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/..
+.PATH: ${.CURDIR:H}
 
 SRCS=  zfs.c
 OBJS=  zfs.o
 WARNS?=1
 
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
-CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
-CFLAGS+= -I${.CURDIR}/..
+CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris
+CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
+CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR:H}
 CFLAGS+= -DNEED_SOLARIS_BOOLEAN
 
 all: ${OBJS}
___
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: r312488 - head/lib/libproc

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:37:22 2017
New Revision: 312488
URL: https://svnweb.freebsd.org/changeset/base/312488

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libproc/Makefile

Modified: head/lib/libproc/Makefile
==
--- head/lib/libproc/Makefile   Fri Jan 20 04:37:03 2017(r312487)
+++ head/lib/libproc/Makefile   Fri Jan 20 04:37:22 2017(r312488)
@@ -30,9 +30,9 @@ LIBADD+=  elf procstat rtld_db util
 .if ${MK_CDDL} != "no"
 LIBADD+=   ctf
 IGNORE_PRAGMA= YES
-CFLAGS+=   -I${.CURDIR}/../../cddl/contrib/opensolaris/lib/libctf/common \
-   -I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common \
-   -I${.CURDIR}/../../sys/cddl/compat/opensolaris
+CFLAGS+=   -I${SRCTOP}/cddl/contrib/opensolaris/lib/libctf/common \
+   -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common \
+   -I${SRCTOP}/sys/cddl/compat/opensolaris
 .else
 CFLAGS+=   -DNO_CTF
 .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: r312486 - head/lib/librpcsec_gss

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:36:48 2017
New Revision: 312486
URL: https://svnweb.freebsd.org/changeset/base/312486

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/librpcsec_gss/Makefile

Modified: head/lib/librpcsec_gss/Makefile
==
--- head/lib/librpcsec_gss/Makefile Fri Jan 20 04:36:28 2017
(r312485)
+++ head/lib/librpcsec_gss/Makefile Fri Jan 20 04:36:48 2017
(r312486)
@@ -8,11 +8,11 @@ SRCS+=rpcsec_gss.c rpcsec_gss_prot.c rp
 
 LIBADD=gssapi
 
-VERSION_DEF=   ${.CURDIR}/../libc/Versions.def
+VERSION_DEF=   ${SRCTOP}/lib/libc/Versions.def
 SYMBOL_MAPS=   ${.CURDIR}/Symbol.map
 
-CFLAGS+= -I${.CURDIR}/../../include
-CFLAGS+= -I${.CURDIR}/../../libc_rpc
+CFLAGS+= -I${SRCTOP}/include
+CFLAGS+= -I${SRCTOP}/lib/libc_rpc
 MK_PROFILE=no
 
 MAN=   rpcsec_gss.3
___
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: r312487 - head/lib/libpe

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:37:03 2017
New Revision: 312487
URL: https://svnweb.freebsd.org/changeset/base/312487

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libpe/Makefile

Modified: head/lib/libpe/Makefile
==
--- head/lib/libpe/Makefile Fri Jan 20 04:36:48 2017(r312486)
+++ head/lib/libpe/Makefile Fri Jan 20 04:37:03 2017(r312487)
@@ -3,7 +3,7 @@
 
 INTERNALLIB=
 
-ELFTCDIR=  ${.CURDIR}/../../contrib/elftoolchain
+ELFTCDIR=  ${SRCTOP}/contrib/elftoolchain
 
 .PATH: ${ELFTCDIR}/libpe
 
___
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: r312484 - head/lib/librt

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:36:06 2017
New Revision: 312484
URL: https://svnweb.freebsd.org/changeset/base/312484

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/librt/Makefile

Modified: head/lib/librt/Makefile
==
--- head/lib/librt/Makefile Fri Jan 20 04:35:49 2017(r312483)
+++ head/lib/librt/Makefile Fri Jan 20 04:36:06 2017(r312484)
@@ -5,7 +5,7 @@
 PACKAGE=lib${LIB}
 LIB=rt
 SHLIB_MAJOR= 1
-CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}
+CFLAGS+=-I${SRCTOP}/lib/libc/include -I${.CURDIR}
 .ifndef NO_THREAD_STACK_UNWIND
 CFLAGS+=-fexceptions
 .endif
@@ -18,7 +18,7 @@ SRCS+= aio.c mq.c sigev_thread.c timer.c
 
 PRECIOUSLIB=
 
-VERSION_DEF=${.CURDIR}/../libc/Versions.def
+VERSION_DEF=${SRCTOP}/lib/libc/Versions.def
 SYMBOL_MAPS=${.CURDIR}/Symbol.map
 
 .if ${MK_TESTS} != "no"
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r312485 - head/lib/librpcsvc

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:36:28 2017
New Revision: 312485
URL: https://svnweb.freebsd.org/changeset/base/312485

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/librpcsvc/Makefile

Modified: head/lib/librpcsvc/Makefile
==
--- head/lib/librpcsvc/Makefile Fri Jan 20 04:36:06 2017(r312484)
+++ head/lib/librpcsvc/Makefile Fri Jan 20 04:36:28 2017(r312485)
@@ -3,7 +3,7 @@
 
 .include 
 
-.PATH: ${.CURDIR}/../../include/rpcsvc
+.PATH: ${SRCTOP}/include/rpcsvc
 
 PACKAGE=lib${LIB}
 LIB=rpcsvc
___
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: r312483 - head/lib/libsbuf

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:35:49 2017
New Revision: 312483
URL: https://svnweb.freebsd.org/changeset/base/312483

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libsbuf/Makefile

Modified: head/lib/libsbuf/Makefile
==
--- head/lib/libsbuf/Makefile   Fri Jan 20 04:35:36 2017(r312482)
+++ head/lib/libsbuf/Makefile   Fri Jan 20 04:35:49 2017(r312483)
@@ -10,6 +10,6 @@ SHLIB_MAJOR   = 6
 SYMBOL_MAPS=${.CURDIR}/Symbol.map
 VERSION_DEF=   ${.CURDIR}/Version.def
 
-.PATH: ${.CURDIR}/../../sys/kern
+.PATH: ${SRCTOP}/sys/kern
 
 .include 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r312480 - head/lib/libsmb

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:35:00 2017
New Revision: 312480
URL: https://svnweb.freebsd.org/changeset/base/312480

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libsmb/Makefile

Modified: head/lib/libsmb/Makefile
==
--- head/lib/libsmb/MakefileFri Jan 20 04:34:34 2017(r312479)
+++ head/lib/libsmb/MakefileFri Jan 20 04:35:00 2017(r312480)
@@ -3,7 +3,7 @@
 .include 
 
 PACKAGE=lib${LIB}
-CONTRIBDIR=${.CURDIR}/../../contrib/smbfs
+CONTRIBDIR=${SRCTOP}/contrib/smbfs
 .PATH: ${CONTRIBDIR}/lib/smb
 
 LIB=   smb
___
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: r312482 - head/lib/libsm

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:35:36 2017
New Revision: 312482
URL: https://svnweb.freebsd.org/changeset/base/312482

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libsm/Makefile

Modified: head/lib/libsm/Makefile
==
--- head/lib/libsm/Makefile Fri Jan 20 04:35:18 2017(r312481)
+++ head/lib/libsm/Makefile Fri Jan 20 04:35:36 2017(r312482)
@@ -3,7 +3,7 @@
 .include 
 
 PACKAGE=sendmail
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
 .PATH: ${SENDMAIL_DIR}/libsm
 
 CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r312481 - head/lib/libsmdb

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:35:18 2017
New Revision: 312481
URL: https://svnweb.freebsd.org/changeset/base/312481

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libsmdb/Makefile

Modified: head/lib/libsmdb/Makefile
==
--- head/lib/libsmdb/Makefile   Fri Jan 20 04:35:00 2017(r312480)
+++ head/lib/libsmdb/Makefile   Fri Jan 20 04:35:18 2017(r312481)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PACKAGE=lib${LIB}
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
 .PATH: ${SENDMAIL_DIR}/libsmdb
 
 CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r312479 - head/lib/libsmutil

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:34:34 2017
New Revision: 312479
URL: https://svnweb.freebsd.org/changeset/base/312479

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libsmutil/Makefile

Modified: head/lib/libsmutil/Makefile
==
--- head/lib/libsmutil/Makefile Fri Jan 20 04:34:01 2017(r312478)
+++ head/lib/libsmutil/Makefile Fri Jan 20 04:34:34 2017(r312479)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PACKAGE=lib${LIB}
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
 .PATH: ${SENDMAIL_DIR}/libsmutil
 
 CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r312478 - head/lib/libsqlite3

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:34:01 2017
New Revision: 312478
URL: https://svnweb.freebsd.org/changeset/base/312478

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libsqlite3/Makefile

Modified: head/lib/libsqlite3/Makefile
==
--- head/lib/libsqlite3/MakefileFri Jan 20 04:33:45 2017
(r312477)
+++ head/lib/libsqlite3/MakefileFri Jan 20 04:34:01 2017
(r312478)
@@ -8,7 +8,7 @@ LIBADD+=pthread
 
 SRCS=  sqlite3.c
 
-SQLITE=${.CURDIR}/../../contrib/sqlite3
+SQLITE=${SRCTOP}/contrib/sqlite3
 .PATH: ${SQLITE}
 
 WARNS= 3
___
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: r312477 - head/lib/libstdthreads

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:33:45 2017
New Revision: 312477
URL: https://svnweb.freebsd.org/changeset/base/312477

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libstdthreads/Makefile

Modified: head/lib/libstdthreads/Makefile
==
--- head/lib/libstdthreads/Makefile Fri Jan 20 04:33:20 2017
(r312476)
+++ head/lib/libstdthreads/Makefile Fri Jan 20 04:33:45 2017
(r312477)
@@ -35,7 +35,7 @@ MLINKS=   thrd_create.3 call_once.3 \
 
 LIBADD=pthread
 
-VERSION_DEF= ${.CURDIR}/../libc/Versions.def
+VERSION_DEF= ${SRCTOP}/lib/libc/Versions.def
 SYMBOL_MAPS= ${.CURDIR}/Symbol.map
 
 .include 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r312476 - head/lib/libsysdecode

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:33:20 2017
New Revision: 312476
URL: https://svnweb.freebsd.org/changeset/base/312476

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libsysdecode/Makefile

Modified: head/lib/libsysdecode/Makefile
==
--- head/lib/libsysdecode/Makefile  Fri Jan 20 04:32:36 2017
(r312475)
+++ head/lib/libsysdecode/Makefile  Fri Jan 20 04:33:20 2017
(r312476)
@@ -9,8 +9,8 @@ SRCS=   errno.c flags.c ioctl.c signal.c s
 INCS=  sysdecode.h
 
 CFLAGS+= -I${.OBJDIR}
-CFLAGS+= -I${.CURDIR}/../../sys
-CFLAGS+= -I${.CURDIR}/../../libexec/rtld-elf
+CFLAGS+= -I${SRCTOP}/sys
+CFLAGS+= -I${SRCTOP}/libexec/rtld-elf
 
 MAN=   sysdecode.3 \
sysdecode_abi_to_freebsd_errno.3 \
___
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: r312474 - in head/lib/libthr: . support

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:32:19 2017
New Revision: 312474
URL: https://svnweb.freebsd.org/changeset/base/312474

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libthr/Makefile
  head/lib/libthr/support/Makefile.inc

Modified: head/lib/libthr/Makefile
==
--- head/lib/libthr/MakefileFri Jan 20 04:31:19 2017(r312473)
+++ head/lib/libthr/MakefileFri Jan 20 04:32:19 2017(r312474)
@@ -18,13 +18,13 @@ LIB=thr
 SHLIB_MAJOR= 3
 WARNS?=3
 CFLAGS+=-DPTHREAD_KERNEL
-CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \
-   -I${.CURDIR}/../../include
+CFLAGS+=-I${SRCTOP}/lib/libc/include -I${.CURDIR}/thread \
+   -I${SRCTOP}/include
 CFLAGS+=-I${.CURDIR}/arch/${MACHINE_CPUARCH}/include
 CFLAGS+=-I${.CURDIR}/sys
-CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf
-CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_CPUARCH}
-CFLAGS+=-I${.CURDIR}/../libthread_db
+CFLAGS+=-I${SRCTOP}/libexec/rtld-elf
+CFLAGS+=-I${SRCTOP}/libexec/rtld-elf/${MACHINE_CPUARCH}
+CFLAGS+=-I${SRCTOP}/lib/libthread_db
 CFLAGS+=-Winline
 
 .ifndef NO_THREAD_UNWIND_STACK
@@ -34,7 +34,7 @@ CFLAGS+=-D_PTHREAD_FORCED_UNWIND
 
 LDFLAGS+=-Wl,-znodelete
 
-VERSION_DEF=${.CURDIR}/../libc/Versions.def
+VERSION_DEF=${SRCTOP}/lib/libc/Versions.def
 SYMBOL_MAPS=${.CURDIR}/pthread.map
 
 MAN=   libthr.3

Modified: head/lib/libthr/support/Makefile.inc
==
--- head/lib/libthr/support/Makefile.incFri Jan 20 04:31:19 2017
(r312473)
+++ head/lib/libthr/support/Makefile.incFri Jan 20 04:32:19 2017
(r312474)
@@ -1,15 +1,15 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/support ${.CURDIR}/../libc/gen ${.CURDIR}/../libc/string
+.PATH: ${.CURDIR}/support ${SRCTOP}/lib/libc/gen ${SRCTOP}/lib/libc/string
 
 # libc must search machine_arch, then machine_cpuarch, but libthr has all its
 # code implemented in machine_cpuarch.  Cope.
-.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/sys)
-.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/sys
-CFLAGS+= -I${.CURDIR}/../libc/${MACHINE_ARCH}
+.if exists(${SRCTOP}/lib/libc/${MACHINE_ARCH}/sys)
+.PATH: ${SRCTOP}/lib/libc/${MACHINE_ARCH}/sys
+CFLAGS+= -I${SRCTOP}/lib/libc/${MACHINE_ARCH}
 .else
-.PATH: ${.CURDIR}/../libc/${MACHINE_CPUARCH}/sys
-CFLAGS+= -I${.CURDIR}/../libc/${MACHINE_CPUARCH}
+.PATH: ${SRCTOP}/lib/libc/${MACHINE_CPUARCH}/sys
+CFLAGS+= -I${SRCTOP}/lib/libc/${MACHINE_CPUARCH}
 .endif
 
 SYSCALLS= thr_new
___
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: r312475 - head/lib/libtelnet

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:32:36 2017
New Revision: 312475
URL: https://svnweb.freebsd.org/changeset/base/312475

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libtelnet/Makefile

Modified: head/lib/libtelnet/Makefile
==
--- head/lib/libtelnet/Makefile Fri Jan 20 04:32:19 2017(r312474)
+++ head/lib/libtelnet/Makefile Fri Jan 20 04:32:36 2017(r312475)
@@ -4,7 +4,7 @@
 .include 
 
 PACKAGE=lib${LIB}
-TELNETDIR= ${.CURDIR}/../../contrib/telnet
+TELNETDIR= ${SRCTOP}/contrib/telnet
 .PATH: ${TELNETDIR}/libtelnet
 
 LIB=   telnet
___
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: r312473 - head/lib/libunbound

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:31:19 2017
New Revision: 312473
URL: https://svnweb.freebsd.org/changeset/base/312473

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libunbound/Makefile

Modified: head/lib/libunbound/Makefile
==
--- head/lib/libunbound/MakefileFri Jan 20 04:30:05 2017
(r312472)
+++ head/lib/libunbound/MakefileFri Jan 20 04:31:19 2017
(r312473)
@@ -2,8 +2,8 @@
 
 PACKAGE=lib${LIB}
 # Vendor sources and generated files
-LDNSDIR= ${.CURDIR}/../../contrib/ldns
-UNBOUNDDIR= ${.CURDIR}/../../contrib/unbound
+LDNSDIR= ${SRCTOP}/contrib/ldns
+UNBOUNDDIR= ${SRCTOP}/contrib/unbound
 
 # Hold my beer and watch this
 .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/cachedb ${UNBOUNDDIR}/dns64 
${UNBOUNDDIR}/iterator ${UNBOUNDDIR}/sldns ${UNBOUNDDIR}/libunbound 
${UNBOUNDDIR}/services ${UNBOUNDDIR}/services/cache ${UNBOUNDDIR}/util 
${UNBOUNDDIR}/util/data ${UNBOUNDDIR}/util/storage ${UNBOUNDDIR}/validator 
___
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: r312472 - head/lib/libufs

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:30:05 2017
New Revision: 312472
URL: https://svnweb.freebsd.org/changeset/base/312472

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libufs/Makefile

Modified: head/lib/libufs/Makefile
==
--- head/lib/libufs/MakefileFri Jan 20 04:29:23 2017(r312471)
+++ head/lib/libufs/MakefileFri Jan 20 04:30:05 2017(r312472)
@@ -18,7 +18,7 @@ MLINKS+= ufs_disk_close.3 ufs_disk_fillo
 MLINKS+= ufs_disk_close.3 ufs_disk_fillout_blank.3
 MLINKS+= ufs_disk_close.3 ufs_disk_write.3
 
-.PATH:  ${.CURDIR}/../../sys/ufs/ffs
+.PATH:  ${SRCTOP}/sys/ufs/ffs
 
 WARNS?=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: r312471 - head/lib/libulog

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:29:23 2017
New Revision: 312471
URL: https://svnweb.freebsd.org/changeset/base/312471

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libulog/Makefile

Modified: head/lib/libulog/Makefile
==
--- head/lib/libulog/Makefile   Fri Jan 20 04:29:05 2017(r312470)
+++ head/lib/libulog/Makefile   Fri Jan 20 04:29:23 2017(r312471)
@@ -22,7 +22,7 @@ MLINKS+=ulog_login.3 ulog_login_pseudo.3
 
 LIBADD=md
 
-VERSION_DEF= ${.CURDIR}/../libc/Versions.def
+VERSION_DEF= ${SRCTOP}/lib/libc/Versions.def
 SYMBOL_MAPS= ${.CURDIR}/Symbol.map
 
 .if ${MK_INSTALLLIB} != "no"
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r312469 - head/lib/libypclnt

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:28:41 2017
New Revision: 312469
URL: https://svnweb.freebsd.org/changeset/base/312469

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libypclnt/Makefile

Modified: head/lib/libypclnt/Makefile
==
--- head/lib/libypclnt/Makefile Fri Jan 20 04:28:16 2017(r312468)
+++ head/lib/libypclnt/Makefile Fri Jan 20 04:28:41 2017(r312469)
@@ -24,9 +24,9 @@ GENSRCS=yp.h \
yppasswd_private_xdr.c
 
 RPCGEN=RPCGEN_CPP=${CPP:Q} rpcgen -C
-RPCSRC=${.CURDIR}/../../include/rpcsvc/yp.x
-RPCSRC_PW= ${.CURDIR}/../../include/rpcsvc/yppasswd.x
-RPCSRC_PRIV=   ${.CURDIR}/../../usr.sbin/rpc.yppasswdd/yppasswd_private.x
+RPCSRC=${SRCTOP}/include/rpcsvc/yp.x
+RPCSRC_PW= ${SRCTOP}/include/rpcsvc/yppasswd.x
+RPCSRC_PRIV=   ${SRCTOP}/usr.sbin/rpc.yppasswdd/yppasswd_private.x
 
 yp.h: ${RPCSRC}
${RPCGEN} -h -o ${.TARGET} ${RPCSRC}
___
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: r312470 - head/lib/libutil

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:29:05 2017
New Revision: 312470
URL: https://svnweb.freebsd.org/changeset/base/312470

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libutil/Makefile

Modified: head/lib/libutil/Makefile
==
--- head/lib/libutil/Makefile   Fri Jan 20 04:28:41 2017(r312469)
+++ head/lib/libutil/Makefile   Fri Jan 20 04:29:05 2017(r312470)
@@ -25,7 +25,7 @@ CFLAGS+= -DLIBC_SCCS
 CFLAGS+= -DINET6
 .endif
 
-CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libc/gen/
+CFLAGS+= -I${.CURDIR} -I${SRCTOP}/lib/libc/gen/
 
 MAN+=  expand_number.3 flopen.3 fparseln.3 hexdump.3 \
humanize_number.3 kinfo_getallproc.3 kinfo_getfile.3 \
___
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: r312468 - head/lib/libthread_db

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:28:16 2017
New Revision: 312468
URL: https://svnweb.freebsd.org/changeset/base/312468

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libthread_db/Makefile

Modified: head/lib/libthread_db/Makefile
==
--- head/lib/libthread_db/Makefile  Fri Jan 20 04:27:40 2017
(r312467)
+++ head/lib/libthread_db/Makefile  Fri Jan 20 04:28:16 2017
(r312468)
@@ -15,7 +15,7 @@ CFLAGS+=-I. -I${.CURDIR}
 SYM_MAPS+=${.CURDIR}/Symbol.map
 
 SYMBOL_MAPS=${SYM_MAPS}
-VERSION_DEF=${.CURDIR}/../libc/Versions.def
+VERSION_DEF=${SRCTOP}/lib/libc/Versions.def
 
 # Unfortunately, clang gives an incorrect warning about alignment in
 # arch/i386/libpthread_md.c, so turn that off for now.
___
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: r312467 - in head/lib/ncurses: . form formw menu menuw ncurses ncursesw panel panelw

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:27:40 2017
New Revision: 312467
URL: https://svnweb.freebsd.org/changeset/base/312467

Log:
  Use SRCTOP-relative paths and .CURDIR with :H instead of ".." specified paths
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/ncurses/config.mk
  head/lib/ncurses/form/Makefile
  head/lib/ncurses/formw/Makefile
  head/lib/ncurses/menu/Makefile
  head/lib/ncurses/menuw/Makefile
  head/lib/ncurses/ncurses/Makefile
  head/lib/ncurses/ncursesw/Makefile
  head/lib/ncurses/panel/Makefile
  head/lib/ncurses/panelw/Makefile

Modified: head/lib/ncurses/config.mk
==
--- head/lib/ncurses/config.mk  Fri Jan 20 04:04:25 2017(r312466)
+++ head/lib/ncurses/config.mk  Fri Jan 20 04:27:40 2017(r312467)
@@ -2,25 +2,25 @@
 
 # This Makefile is shared by libncurses, libform, libmenu, libpanel.
 
-NCURSES_DIR=   ${.CURDIR}/../../../contrib/ncurses
+NCURSES_DIR=   ${SRCTOP}/contrib/ncurses
 
 .if defined(ENABLE_WIDEC)
 LIB_SUFFIX=w
 CFLAGS+=   -D_XOPEN_SOURCE_EXTENDED -DENABLE_WIDEC
-NCURSES_CFG_H= ${.CURDIR}/../ncurses/ncurses_cfg.h
+NCURSES_CFG_H= ${.CURDIR:H}/ncurses/ncurses_cfg.h
 .else
 LIB_SUFFIX=
 NCURSES_CFG_H= ${.CURDIR}/ncurses_cfg.h
 .endif
 
 CFLAGS+=   -I.
-.if exists(${.OBJDIR}/../ncurses${LIB_SUFFIX})
-CFLAGS+=   -I${.OBJDIR}/../ncurses${LIB_SUFFIX}
+.if exists(${.OBJDIR:H}/ncurses${LIB_SUFFIX})
+CFLAGS+=   -I${.OBJDIR:H}/ncurses${LIB_SUFFIX}
 .endif
-CFLAGS+=   -I${.CURDIR}/../ncurses${LIB_SUFFIX}
+CFLAGS+=   -I${.CURDIR:H}/ncurses${LIB_SUFFIX}
 
 # for ${NCURSES_CFG_H}
-CFLAGS+=   -I${.CURDIR}/../ncurses
+CFLAGS+=   -I${.CURDIR:H}/ncurses
 
 CFLAGS+=   -I${NCURSES_DIR}/include
 CFLAGS+=   -I${NCURSES_DIR}/ncurses

Modified: head/lib/ncurses/form/Makefile
==
--- head/lib/ncurses/form/Makefile  Fri Jan 20 04:04:25 2017
(r312466)
+++ head/lib/ncurses/form/Makefile  Fri Jan 20 04:27:40 2017
(r312467)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include "${.CURDIR}/../config.mk"
+.include "${.CURDIR:H}/config.mk"
 
 SRCDIR=${NCURSES_DIR}/form
 

Modified: head/lib/ncurses/formw/Makefile
==
--- head/lib/ncurses/formw/Makefile Fri Jan 20 04:04:25 2017
(r312466)
+++ head/lib/ncurses/formw/Makefile Fri Jan 20 04:27:40 2017
(r312467)
@@ -2,4 +2,4 @@
 
 ENABLE_WIDEC=
 
-.include "${.CURDIR}/../form/Makefile"
+.include "${.CURDIR:H}/form/Makefile"

Modified: head/lib/ncurses/menu/Makefile
==
--- head/lib/ncurses/menu/Makefile  Fri Jan 20 04:04:25 2017
(r312466)
+++ head/lib/ncurses/menu/Makefile  Fri Jan 20 04:27:40 2017
(r312467)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include "${.CURDIR}/../config.mk"
+.include "${.CURDIR:H}/config.mk"
 
 SRCDIR=${NCURSES_DIR}/menu
 

Modified: head/lib/ncurses/menuw/Makefile
==
--- head/lib/ncurses/menuw/Makefile Fri Jan 20 04:04:25 2017
(r312466)
+++ head/lib/ncurses/menuw/Makefile Fri Jan 20 04:27:40 2017
(r312467)
@@ -2,4 +2,4 @@
 
 ENABLE_WIDEC=
 
-.include "${.CURDIR}/../menu/Makefile"
+.include "${.CURDIR:H}/menu/Makefile"

Modified: head/lib/ncurses/ncurses/Makefile
==
--- head/lib/ncurses/ncurses/Makefile   Fri Jan 20 04:04:25 2017
(r312466)
+++ head/lib/ncurses/ncurses/Makefile   Fri Jan 20 04:27:40 2017
(r312467)
@@ -10,7 +10,7 @@ MK_MAN=no
 
 .include 
 
-.include "${.CURDIR}/../config.mk"
+.include "${.CURDIR:H}/config.mk"
 
 LIB=   ncurses${LIB_SUFFIX}
 SHLIB_MAJOR=   8

Modified: head/lib/ncurses/ncursesw/Makefile
==
--- head/lib/ncurses/ncursesw/Makefile  Fri Jan 20 04:04:25 2017
(r312466)
+++ head/lib/ncurses/ncursesw/Makefile  Fri Jan 20 04:27:40 2017
(r312467)
@@ -2,6 +2,6 @@
 
 ENABLE_WIDEC=
 
-.PATH: ${.CURDIR}/../ncurses
+.PATH: ${.CURDIR:H}/ncurses
 
-.include "${.CURDIR}/../ncurses/Makefile"
+.include "${.CURDIR:H}/ncurses/Makefile"

Modified: head/lib/ncurses/panel/Makefile
==
--- head/lib/ncurses/panel/Makefile Fri Jan 20 04:04:25 2017
(r312466)
+++ head/lib/ncurses/panel/Makefile Fri Jan 20 04:27:40 2017
(r312467)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include "${.CURDIR}/../config.mk"
+.include "${.CURDIR:H}/config.mk"
 
 SRCDIR=${NCURSES_DIR}/panel
 

Modified: head/lib/ncurses/panelw/Makefile

svn commit: r312466 - head/lib/libc_nonshared

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:04:25 2017
New Revision: 312466
URL: https://svnweb.freebsd.org/changeset/base/312466

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libc_nonshared/Makefile

Modified: head/lib/libc_nonshared/Makefile
==
--- head/lib/libc_nonshared/MakefileFri Jan 20 04:03:55 2017
(r312465)
+++ head/lib/libc_nonshared/MakefileFri Jan 20 04:04:25 2017
(r312466)
@@ -6,7 +6,7 @@
 # bsd.lib.mk doesn't have an easy way to express that.
 MK_PROFILE?=no
 .include 
-NO_PIC=
+NO_PIC=
 # -fpic on some platforms, -fPIC on others.
 CFLAGS+=${PICFLAG} -DPIC -fvisibility=hidden
 
@@ -18,9 +18,9 @@ LIBC_NONSHARED_SRCS=
 SRCS=  __stub.c
 
 .if ${MK_ICONV} == "yes"
-.PATH: ${.CURDIR}/../libc/iconv
+.PATH: ${SRCTOP}/lib/libc/iconv
 .include "Makefile.iconv"
-CFLAGS+=-I${.CURDIR}/../libc/iconv
+CFLAGS+=-I${SRCTOP}/lib/libc/iconv
 .endif
 
 SRCS+= ${LIBC_NONSHARED_SRCS}
___
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: r312465 - head/lib/libcam

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 04:03:55 2017
New Revision: 312465
URL: https://svnweb.freebsd.org/changeset/base/312465

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libcam/Makefile

Modified: head/lib/libcam/Makefile
==
--- head/lib/libcam/MakefileFri Jan 20 03:59:10 2017(r312464)
+++ head/lib/libcam/MakefileFri Jan 20 04:03:55 2017(r312465)
@@ -36,11 +36,10 @@ MLINKS+=cam.3 cam_open_device.3 \
cam_cdbparse.3 csio_encode_visit.3 \
cam_cdbparse.3 buff_encode_visit.3
 
-.PATH: ${.CURDIR}/../../sys/cam/scsi ${.CURDIR}/../../sys/cam/ata \
-   ${.CURDIR}/../../sys/cam
+.PATH: ${SRCTOP}/sys/cam/scsi ${SRCTOP}/sys/cam/ata \
+   ${SRCTOP}/sys/cam
 
-SDIR=  ${.CURDIR}/../../sys
-CFLAGS+=   -I${.CURDIR} -I${SDIR}
+CFLAGS+=   -I${.CURDIR} -I${SRCTOP}/sys
 
 SHLIB_MAJOR=   7
 
___
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: r312464 - head/lib/libc++

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 03:59:10 2017
New Revision: 312464
URL: https://svnweb.freebsd.org/changeset/base/312464

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libc++/Makefile

Modified: head/lib/libc++/Makefile
==
--- head/lib/libc++/MakefileFri Jan 20 03:58:50 2017(r312463)
+++ head/lib/libc++/MakefileFri Jan 20 03:59:10 2017(r312464)
@@ -3,9 +3,9 @@
 .include 
 
 PACKAGE=   clibs
-_LIBCXXRTDIR=  ${.CURDIR}/../../contrib/libcxxrt
-HDRDIR=${.CURDIR}/../../contrib/libc++/include
-SRCDIR=${.CURDIR}/../../contrib/libc++/src
+_LIBCXXRTDIR=  ${SRCTOP}/contrib/libcxxrt
+HDRDIR=${SRCTOP}/contrib/libc++/include
+SRCDIR=${SRCTOP}/contrib/libc++/src
 CXXINCLUDEDIR= ${INCLUDEDIR}/c++/v${SHLIB_MAJOR}
 .if ${MACHINE_CPUARCH} == "arm"
 STATIC_CXXFLAGS+= -mlong-calls
___
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: r312463 - head/lib/libbz2

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 03:58:50 2017
New Revision: 312463
URL: https://svnweb.freebsd.org/changeset/base/312463

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libbz2/Makefile

Modified: head/lib/libbz2/Makefile
==
--- head/lib/libbz2/MakefileFri Jan 20 03:57:52 2017(r312462)
+++ head/lib/libbz2/MakefileFri Jan 20 03:58:50 2017(r312463)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PACKAGE=   lib${LIB}
-BZ2DIR=${.CURDIR}/../../contrib/bzip2
+BZ2DIR=${SRCTOP}/contrib/bzip2
 .PATH: ${BZ2DIR}
 
 LIB=   bz2
___
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: r312462 - head/lib/libbsnmp/libbsnmp

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 03:57:52 2017
New Revision: 312462
URL: https://svnweb.freebsd.org/changeset/base/312462

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libbsnmp/libbsnmp/Makefile

Modified: head/lib/libbsnmp/libbsnmp/Makefile
==
--- head/lib/libbsnmp/libbsnmp/Makefile Fri Jan 20 03:57:24 2017
(r312461)
+++ head/lib/libbsnmp/libbsnmp/Makefile Fri Jan 20 03:57:52 2017
(r312462)
@@ -4,7 +4,7 @@
 
 .include 
 
-CONTRIB= ${.CURDIR}/../../../contrib/bsnmp/lib
+CONTRIB= ${SRCTOP}/contrib/bsnmp/lib
 .PATH: ${CONTRIB}
 
 LIB=   bsnmp
___
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: r312461 - head/lib/libbsm

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 03:57:24 2017
New Revision: 312461
URL: https://svnweb.freebsd.org/changeset/base/312461

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libbsm/Makefile

Modified: head/lib/libbsm/Makefile
==
--- head/lib/libbsm/MakefileFri Jan 20 03:56:42 2017(r312460)
+++ head/lib/libbsm/MakefileFri Jan 20 03:57:24 2017(r312461)
@@ -3,7 +3,7 @@
 #
 
 PACKAGE=   lib${LIB}
-OPENBSMDIR=${.CURDIR}/../../contrib/openbsm
+OPENBSMDIR=${SRCTOP}/contrib/openbsm
 _LIBBSMDIR=${OPENBSMDIR}/libbsm
 
 LIB=   bsm
___
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: r312460 - head/lib/libbluetooth

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 03:56:42 2017
New Revision: 312460
URL: https://svnweb.freebsd.org/changeset/base/312460

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libbluetooth/Makefile

Modified: head/lib/libbluetooth/Makefile
==
--- head/lib/libbluetooth/Makefile  Fri Jan 20 03:56:10 2017
(r312459)
+++ head/lib/libbluetooth/Makefile  Fri Jan 20 03:56:42 2017
(r312460)
@@ -6,7 +6,7 @@ LIB=bluetooth
 MAN=   bluetooth.3
 
 WARNS?=2
-CFLAGS+=   -I${.CURDIR} -I${.CURDIR}/../../sys
+CFLAGS+=   -I${.CURDIR} -I${SRCTOP}/sys
 
 SHLIB_MAJOR=   4
 
___
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: r312458 - head/lib/libbegemot

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 03:55:43 2017
New Revision: 312458
URL: https://svnweb.freebsd.org/changeset/base/312458

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libbegemot/Makefile

Modified: head/lib/libbegemot/Makefile
==
--- head/lib/libbegemot/MakefileFri Jan 20 03:55:21 2017
(r312457)
+++ head/lib/libbegemot/MakefileFri Jan 20 03:55:43 2017
(r312458)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-LIBBEGEMOT_DIR=${.CURDIR}/../../contrib/libbegemot
+LIBBEGEMOT_DIR=${SRCTOP}/contrib/libbegemot
 
 PACKAGE=lib${LIB}
 .PATH: ${LIBBEGEMOT_DIR}
___
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: r312459 - head/lib/libblocksruntime

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 03:56:10 2017
New Revision: 312459
URL: https://svnweb.freebsd.org/changeset/base/312459

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libblocksruntime/Makefile

Modified: head/lib/libblocksruntime/Makefile
==
--- head/lib/libblocksruntime/Makefile  Fri Jan 20 03:55:43 2017
(r312458)
+++ head/lib/libblocksruntime/Makefile  Fri Jan 20 03:56:10 2017
(r312459)
@@ -6,7 +6,7 @@ SHLIB_MAJOR=0
 CFLAGS+=-I${.CURDIR}
 WARNS?=2
 
-.PATH: ${.CURDIR}/../../contrib/compiler-rt/lib/BlocksRuntime
+.PATH: ${SRCTOP}/contrib/compiler-rt/lib/BlocksRuntime
 
 INCS=  Block.h Block_private.h
 SRCS=  data.c runtime.c
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r312457 - head/lib/libauditd

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 03:55:21 2017
New Revision: 312457
URL: https://svnweb.freebsd.org/changeset/base/312457

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libauditd/Makefile

Modified: head/lib/libauditd/Makefile
==
--- head/lib/libauditd/Makefile Fri Jan 20 03:54:36 2017(r312456)
+++ head/lib/libauditd/Makefile Fri Jan 20 03:55:21 2017(r312457)
@@ -3,7 +3,7 @@
 #
 
 PACKAGE=lib${LIB}
-OPENBSMDIR=${.CURDIR}/../../contrib/openbsm
+OPENBSMDIR=${SRCTOP}/contrib/openbsm
 _LIBAUDITDDIR= ${OPENBSMDIR}/libauditd
 _LIBBSMDIR=${OPENBSMDIR}/libbsm
 
___
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: r312456 - head/lib/libarchive

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 03:54:36 2017
New Revision: 312456
URL: https://svnweb.freebsd.org/changeset/base/312456

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libarchive/Makefile

Modified: head/lib/libarchive/Makefile
==
--- head/lib/libarchive/MakefileFri Jan 20 03:52:16 2017
(r312455)
+++ head/lib/libarchive/MakefileFri Jan 20 03:54:36 2017
(r312456)
@@ -2,7 +2,7 @@
 .include 
 
 PACKAGE=lib${LIB}
-_LIBARCHIVEDIR=${.CURDIR}/../../contrib/libarchive
+_LIBARCHIVEDIR=${SRCTOP}/contrib/libarchive
 
 LIB=   archive
 
___
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: r312455 - in head/lib/csu: aarch64 amd64 arm i386 mips powerpc powerpc64 riscv sparc64

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 03:52:16 2017
New Revision: 312455
URL: https://svnweb.freebsd.org/changeset/base/312455

Log:
  Use SRCTOP-relative paths and .CURDIR with :H instead of ".." specified paths
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/csu/aarch64/Makefile
  head/lib/csu/amd64/Makefile
  head/lib/csu/arm/Makefile
  head/lib/csu/i386/Makefile
  head/lib/csu/mips/Makefile
  head/lib/csu/powerpc/Makefile
  head/lib/csu/powerpc64/Makefile
  head/lib/csu/riscv/Makefile
  head/lib/csu/sparc64/Makefile

Modified: head/lib/csu/aarch64/Makefile
==
--- head/lib/csu/aarch64/Makefile   Fri Jan 20 03:34:59 2017
(r312454)
+++ head/lib/csu/aarch64/Makefile   Fri Jan 20 03:52:16 2017
(r312455)
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
 
 SRCS=  crt1.c crti.S crtn.S
 OBJS=  ${SRCS:N*.h:R:S/$/.o/g}
 OBJS+= Scrt1.o gcrt1.o
-CFLAGS+=   -I${.CURDIR}/../common \
-   -I${.CURDIR}/../../libc/include
+CFLAGS+=   -I${.CURDIR:H}/common \
+   -I${SRCTOP}/lib/libc/include
 
 FILES= ${OBJS}
 FILESMODE= ${LIBMODE}

Modified: head/lib/csu/amd64/Makefile
==
--- head/lib/csu/amd64/Makefile Fri Jan 20 03:34:59 2017(r312454)
+++ head/lib/csu/amd64/Makefile Fri Jan 20 03:52:16 2017(r312455)
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
 
 SRCS=  crt1.c crti.S crtn.S
 OBJS=  ${SRCS:N*.h:R:S/$/.o/g}
 OBJS+= Scrt1.o gcrt1.o
-CFLAGS+=   -I${.CURDIR}/../common \
-   -I${.CURDIR}/../../libc/include
+CFLAGS+=   -I${.CURDIR:H}/common \
+   -I${SRCTOP}/lib/libc/include
 CFLAGS+=   -fno-omit-frame-pointer
 
 FILES= ${OBJS}

Modified: head/lib/csu/arm/Makefile
==
--- head/lib/csu/arm/Makefile   Fri Jan 20 03:34:59 2017(r312454)
+++ head/lib/csu/arm/Makefile   Fri Jan 20 03:52:16 2017(r312455)
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
 
 SRCS=  crt1.c crti.S crtn.S
 OBJS=  ${SRCS:N*.h:R:S/$/.o/g}
 OBJS+= Scrt1.o gcrt1.o
-CFLAGS+=   -I${.CURDIR}/../common \
-   -I${.CURDIR}/../../libc/include
+CFLAGS+=   -I${.CURDIR:H}/common \
+   -I${SRCTOP}/lib/libc/include
 STATIC_CFLAGS+=-mlong-calls
 
 FILES= ${OBJS}

Modified: head/lib/csu/i386/Makefile
==
--- head/lib/csu/i386/Makefile  Fri Jan 20 03:34:59 2017(r312454)
+++ head/lib/csu/i386/Makefile  Fri Jan 20 03:52:16 2017(r312455)
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
 
 SRCS=  crti.S crtn.S
 OBJS=  ${SRCS:N*.h:R:S/$/.o/g}
 OBJS+= gcrt1.o crt1.o Scrt1.o
-CFLAGS+=   -I${.CURDIR}/../common \
-   -I${.CURDIR}/../../libc/include
+CFLAGS+=   -I${.CURDIR:H}/common \
+   -I${SRCTOP}/lib/libc/include
 
 FILES= ${OBJS}
 FILESMODE= ${LIBMODE}

Modified: head/lib/csu/mips/Makefile
==
--- head/lib/csu/mips/Makefile  Fri Jan 20 03:34:59 2017(r312454)
+++ head/lib/csu/mips/Makefile  Fri Jan 20 03:52:16 2017(r312455)
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
 
 SRCS=  crt1.c crti.S crtn.S
 OBJS=  ${SRCS:N*.h:R:S/$/.o/g}
 OBJS+= Scrt1.o gcrt1.o
-CFLAGS+=   -I${.CURDIR}/../common \
-   -I${.CURDIR}/../../libc/include
+CFLAGS+=   -I${.CURDIR:H}/common \
+   -I${SRCTOP}/lib/libc/include
 
 FILES= ${OBJS}
 FILESMODE= ${LIBMODE}

Modified: head/lib/csu/powerpc/Makefile
==
--- head/lib/csu/powerpc/Makefile   Fri Jan 20 03:34:59 2017
(r312454)
+++ head/lib/csu/powerpc/Makefile   Fri Jan 20 03:52:16 2017
(r312455)
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
 
 SRCS=  crt1.c crti.S crtn.S
 OBJS=  ${SRCS:N*.h:R:S/$/.o/g}
 OBJS+= Scrt1.o gcrt1.o
-CFLAGS+=   -I${.CURDIR}/../common \
-   -I${.CURDIR}/../../libc/include
+CFLAGS+=   -I${.CURDIR:H}/common \
+   -I${SRCTOP}/lib/libc/include
 
 FILES= ${OBJS}
 FILESMODE= ${LIBMODE}

Modified: head/lib/csu/powerpc64/Makefile
==
--- head/lib/csu/powerpc64/Makefile Fri Jan 

svn commit: r312454 - in head/lib/libalias: libalias modules

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 03:34:59 2017
New Revision: 312454
URL: https://svnweb.freebsd.org/changeset/base/312454

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libalias/libalias/Makefile
  head/lib/libalias/modules/Makefile
  head/lib/libalias/modules/Makefile.inc

Modified: head/lib/libalias/libalias/Makefile
==
--- head/lib/libalias/libalias/Makefile Fri Jan 20 03:31:50 2017
(r312453)
+++ head/lib/libalias/libalias/Makefile Fri Jan 20 03:34:59 2017
(r312454)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../sys/netinet/libalias
+.PATH: ${SRCTOP}/sys/netinet/libalias
 
 PACKAGE=lib${LIB}
 LIB=   alias

Modified: head/lib/libalias/modules/Makefile
==
--- head/lib/libalias/modules/Makefile  Fri Jan 20 03:31:50 2017
(r312453)
+++ head/lib/libalias/modules/Makefile  Fri Jan 20 03:34:59 2017
(r312454)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include "${.CURDIR}/../../../sys/modules/libalias/modules/modules.inc"
+.include "${SRCTOP}/sys/modules/libalias/modules/modules.inc"
 
 SUBDIR=${MODULES}
 

Modified: head/lib/libalias/modules/Makefile.inc
==
--- head/lib/libalias/modules/Makefile.inc  Fri Jan 20 03:31:50 2017
(r312453)
+++ head/lib/libalias/modules/Makefile.inc  Fri Jan 20 03:34:59 2017
(r312454)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../../sys/netinet/libalias
+.PATH: ${SRCTOP}/sys/netinet/libalias
 
 SHLIBDIR?= /lib
 LIB?=   alias_${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: r312453 - in head/lib/libpam: libpam static_libpam

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 03:31:50 2017
New Revision: 312453
URL: https://svnweb.freebsd.org/changeset/base/312453

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libpam/libpam/Makefile
  head/lib/libpam/static_libpam/Makefile

Modified: head/lib/libpam/libpam/Makefile
==
--- head/lib/libpam/libpam/Makefile Fri Jan 20 03:27:47 2017
(r312452)
+++ head/lib/libpam/libpam/Makefile Fri Jan 20 03:31:50 2017
(r312453)
@@ -36,7 +36,7 @@
 # $FreeBSD$
 
 PACKAGE=lib${LIB}
-OPENPAM=   ${.CURDIR}/../../../contrib/openpam
+OPENPAM=   ${SRCTOP}/contrib/openpam
 .PATH: ${OPENPAM}/include ${OPENPAM}/lib/libpam ${OPENPAM}/doc/man
 
 # static_libpam will build libpam.a

Modified: head/lib/libpam/static_libpam/Makefile
==
--- head/lib/libpam/static_libpam/Makefile  Fri Jan 20 03:27:47 2017
(r312452)
+++ head/lib/libpam/static_libpam/Makefile  Fri Jan 20 03:31:50 2017
(r312453)
@@ -35,7 +35,7 @@
 #
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../libpam
+.PATH: ${SRCTOP}/lib/libpam
 
 # Only build the static library.
 LIB=   pam
@@ -66,4 +66,4 @@ CLEANFILES+=  openpam_static.o \
 openpam_static_modules.o: openpam_static.o ${STATIC_MODULES}
${CC} -nostdlib ${CFLAGS} -o ${.TARGET} -r -Wl,--whole-archive 
${.ALLSRC}
 
-.include "${.CURDIR}/../libpam/Makefile"
+.include "${.CURDIR:H}/libpam/Makefile"
___
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: r312452 - in head/lib/libpam/modules: . pam_passwdqc pam_ssh

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 03:27:47 2017
New Revision: 312452
URL: https://svnweb.freebsd.org/changeset/base/312452

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative 
ones
  
  This implifies pathing in make/displayed output
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libpam/modules/Makefile.inc
  head/lib/libpam/modules/pam_passwdqc/Makefile
  head/lib/libpam/modules/pam_ssh/Makefile

Modified: head/lib/libpam/modules/Makefile.inc
==
--- head/lib/libpam/modules/Makefile.incFri Jan 20 03:23:24 2017
(r312451)
+++ head/lib/libpam/modules/Makefile.incFri Jan 20 03:27:47 2017
(r312452)
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
-PAMDIR=${.CURDIR}/../../../../contrib/openpam
+PAMDIR=${SRCTOP}/contrib/openpam
 
 MK_INSTALLLIB= no
 MK_PROFILE=no
 
-CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam
+CFLAGS+= -I${PAMDIR}/include -I${SRCTOP}/lib/libpam
 
 SHLIB_NAME?=   ${LIB}.so.${SHLIB_MAJOR}
 LIBADD+=   pam

Modified: head/lib/libpam/modules/pam_passwdqc/Makefile
==
--- head/lib/libpam/modules/pam_passwdqc/Makefile   Fri Jan 20 03:23:24 
2017(r312451)
+++ head/lib/libpam/modules/pam_passwdqc/Makefile   Fri Jan 20 03:27:47 
2017(r312452)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SRCDIR=${.CURDIR}/../../../../contrib/pam_modules/pam_passwdqc
+SRCDIR=${SRCTOP}/contrib/pam_modules/pam_passwdqc
 .PATH: ${SRCDIR}
 
 LIB=   pam_passwdqc

Modified: head/lib/libpam/modules/pam_ssh/Makefile
==
--- head/lib/libpam/modules/pam_ssh/MakefileFri Jan 20 03:23:24 2017
(r312451)
+++ head/lib/libpam/modules/pam_ssh/MakefileFri Jan 20 03:27:47 2017
(r312452)
@@ -1,7 +1,7 @@
 # PAM module for SSH
 # $FreeBSD$
 
-SSHDIR=${.CURDIR}/../../../../crypto/openssh
+SSHDIR=${SRCTOP}/crypto/openssh
 
 LIB=   pam_ssh
 MAN=   pam_ssh.8
___
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: r312451 - in head/lib/libc: . aarch64/string arm/aeabi capability gdtoa gen iconv md posix1e regex/grot resolv stdlib/jemalloc stdtime string sys

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 03:23:24 2017
New Revision: 312451
URL: https://svnweb.freebsd.org/changeset/base/312451

Log:
  Replace dot-dot relative pathing with SRCTOP-relative paths where possible
  
  This reduces build output, need for recalculating paths, and makes it clearer
  which paths are relative to what areas in the source tree. The change in
  performance over a locally mounted UFS filesystem was negligible in my 
testing,
  but this may more positively impact other filesystems like NFS.
  
  LIBC_SRCTOP was left alone so Juniper (and other users) can continue to
  manipulate lib/libc/Makefile (and other Makefile.inc's under lib/libc) as
  include Makefiles with custom options.
  
  Discussed with:   marcel, sjg
  MFC after:1 week
  Reviewed by:  emaste
  Sponsored by: Dell EMC Isilon
  Differential Revision:https://reviews.freebsd.org/D9207

Modified:
  head/lib/libc/Makefile
  head/lib/libc/aarch64/string/Makefile.inc
  head/lib/libc/arm/aeabi/Makefile.inc
  head/lib/libc/capability/Makefile.inc
  head/lib/libc/gdtoa/Makefile.inc
  head/lib/libc/gen/Makefile.inc
  head/lib/libc/iconv/Makefile.inc
  head/lib/libc/md/Makefile.inc
  head/lib/libc/posix1e/Makefile.inc
  head/lib/libc/regex/grot/Makefile
  head/lib/libc/resolv/Makefile.inc
  head/lib/libc/stdlib/jemalloc/Makefile.inc
  head/lib/libc/stdtime/Makefile.inc
  head/lib/libc/string/Makefile.inc
  head/lib/libc/sys/Makefile.inc

Modified: head/lib/libc/Makefile
==
--- head/lib/libc/Makefile  Fri Jan 20 03:14:18 2017(r312450)
+++ head/lib/libc/Makefile  Fri Jan 20 03:23:24 2017(r312451)
@@ -36,7 +36,7 @@ SHLIB_LDSCRIPT=libc_nossp.ldscript
 .endif
 SHLIB_LDSCRIPT_LINKS=libxnet.so
 WARNS?=2
-CFLAGS+=-I${LIBC_SRCTOP}/include -I${LIBC_SRCTOP}/../../include
+CFLAGS+=-I${LIBC_SRCTOP}/include -I${SRCTOP}/include
 CFLAGS+=-I${LIBC_SRCTOP}/${LIBC_ARCH}
 .if ${MK_NLS} != "no"
 CFLAGS+=-DNLS

Modified: head/lib/libc/aarch64/string/Makefile.inc
==
--- head/lib/libc/aarch64/string/Makefile.inc   Fri Jan 20 03:14:18 2017
(r312450)
+++ head/lib/libc/aarch64/string/Makefile.inc   Fri Jan 20 03:23:24 2017
(r312451)
@@ -4,7 +4,7 @@
 # https://git.linaro.org/toolchain/cortex-strings.git
 #
 
-.PATH: ${LIBC_SRCTOP}/../../contrib/cortex-strings/src/aarch64
+.PATH: ${SRCTOP}/contrib/cortex-strings/src/aarch64
 
 MDSRCS+=memchr.S \
memcmp.S \

Modified: head/lib/libc/arm/aeabi/Makefile.inc
==
--- head/lib/libc/arm/aeabi/Makefile.incFri Jan 20 03:14:18 2017
(r312450)
+++ head/lib/libc/arm/aeabi/Makefile.incFri Jan 20 03:23:24 2017
(r312451)
@@ -21,7 +21,7 @@ SRCS+=aeabi_vfp_double.S  \
 # libc. This causes issues when other parts of libc call these functions.
 # We work around this by including these functions in libc but mark them as
 # hidden so users of libc will not pick up these versions.
-.PATH: ${LIBC_SRCTOP}/../../contrib/compiler-rt/lib/builtins/arm
+.PATH: ${SRCTOP}/contrib/compiler-rt/lib/builtins/arm
 
 SRCS+= aeabi_memcmp.S  \
aeabi_memcpy.S  \

Modified: head/lib/libc/capability/Makefile.inc
==
--- head/lib/libc/capability/Makefile.inc   Fri Jan 20 03:14:18 2017
(r312450)
+++ head/lib/libc/capability/Makefile.inc   Fri Jan 20 03:23:24 2017
(r312451)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 # capability sources
-.PATH: ${LIBC_SRCTOP}/../../sys/kern ${LIBC_SRCTOP}/capability
+.PATH: ${SRCTOP}/sys/kern ${LIBC_SRCTOP}/capability
 
 SRCS+= subr_capability.c
 

Modified: head/lib/libc/gdtoa/Makefile.inc
==
--- head/lib/libc/gdtoa/Makefile.incFri Jan 20 03:14:18 2017
(r312450)
+++ head/lib/libc/gdtoa/Makefile.incFri Jan 20 03:23:24 2017
(r312451)
@@ -10,11 +10,11 @@ GDTOASRCS+=dmisc.c dtoa.c gdtoa.c gethex
 
 SYM_MAPS+=${LIBC_SRCTOP}/gdtoa/Symbol.map
 
-CFLAGS+=-I${LIBC_SRCTOP}/../../contrib/gdtoa
+CFLAGS+=-I${SRCTOP}/contrib/gdtoa
 
 .for src in ${GDTOASRCS}
 MISRCS+=gdtoa_${src}
 CLEANFILES+=gdtoa_${src}
-gdtoa_${src}: ${LIBC_SRCTOP}/../../contrib/gdtoa/${src} .NOMETA
+gdtoa_${src}: ${SRCTOP}/contrib/gdtoa/${src} .NOMETA
ln -sf ${.ALLSRC} ${.TARGET}
 .endfor

Modified: head/lib/libc/gen/Makefile.inc
==
--- head/lib/libc/gen/Makefile.inc  Fri Jan 20 03:14:18 2017
(r312450)
+++ head/lib/libc/gen/Makefile.inc  Fri Jan 20 03:23:24 2017
(r312451)
@@ -152,11 +152,11 @@ SRCS+=fts-compat.c \
unvis-compat.c
 .endif
 
-.PATH: ${LIBC_SRCTOP}/../../contrib/libc-pwcache
+.PATH: 

svn commit: r312450 - head/etc/mtree

[Ed Maste]

Author: emaste
Date: Fri Jan 20 03:14:18 2017
New Revision: 312450
URL: https://svnweb.freebsd.org/changeset/base/312450

Log:
  Remove obsolete /usr/lib/debug/usr/lib/private dir
  
  Missed in r282420
  
  Reported by:  dim

Modified:
  head/etc/mtree/BSD.debug.dist

Modified: head/etc/mtree/BSD.debug.dist
==
--- head/etc/mtree/BSD.debug.dist   Fri Jan 20 02:50:24 2017
(r312449)
+++ head/etc/mtree/BSD.debug.dist   Fri Jan 20 03:14:18 2017
(r312450)
@@ -40,8 +40,6 @@
 ..
 i18n
 ..
-private
-..
 ..
 libexec
 bsdinstall
___
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: r312449 - stable/11/contrib/llvm/projects/libunwind/src

[Ed Maste]

Author: emaste
Date: Fri Jan 20 02:50:24 2017
New Revision: 312449
URL: https://svnweb.freebsd.org/changeset/base/312449

Log:
  MFC r311647: libunwind: add noexec stack annotation
  
  Sponsored by: The FreeBSD Foundation

Modified:
  stable/11/contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S
  stable/11/contrib/llvm/projects/libunwind/src/UnwindRegistersSave.S
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S
==
--- stable/11/contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S  
Fri Jan 20 02:48:52 2017(r312448)
+++ stable/11/contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S  
Fri Jan 20 02:50:24 2017(r312449)
@@ -483,3 +483,5 @@ DEFINE_LIBUNWIND_PRIVATE_FUNCTION(_ZN9li
 /* RISCVTODO */
 
 #endif
+
+  .section .note.GNU-stack,"",@progbits

Modified: stable/11/contrib/llvm/projects/libunwind/src/UnwindRegistersSave.S
==
--- stable/11/contrib/llvm/projects/libunwind/src/UnwindRegistersSave.S Fri Jan 
20 02:48:52 2017(r312448)
+++ stable/11/contrib/llvm/projects/libunwind/src/UnwindRegistersSave.S Fri Jan 
20 02:50:24 2017(r312449)
@@ -469,3 +469,5 @@ DEFINE_LIBUNWIND_FUNCTION(unw_getcontext
 /* RISCVTODO */
 
 #endif
+
+.section .note.GNU-stack,"",@progbits
___
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: r312448 - stable/11/contrib/llvm/projects/libunwind/src

[Ed Maste]

Author: emaste
Date: Fri Jan 20 02:48:52 2017
New Revision: 312448
URL: https://svnweb.freebsd.org/changeset/base/312448

Log:
  MFC r310365: libunwind: make __{de,}register_frame compatible with libgcc API
  
  The libgcc __register_frame and __deregister_frame functions take a
  pointer to a set of FDE/CIEs, terminated by an entry where length is 0.
  
  In Apple's libunwind implementation the pointer is taken to be to a
  single FDE. I suspect this was just an Apple bug, compensated by Apple-
  specific code in LLVM.
  
  See lib/ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp and
  http://lists.llvm.org/pipermail/llvm-dev/2013-April/061737.html
  for more detail.
  
  This change is based on the LLVM RTDyldMemoryManager.cpp. It should
  later be changed to be alignment-safe.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  stable/11/contrib/llvm/projects/libunwind/src/UnwindLevel1-gcc-ext.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/contrib/llvm/projects/libunwind/src/UnwindLevel1-gcc-ext.c
==
--- stable/11/contrib/llvm/projects/libunwind/src/UnwindLevel1-gcc-ext.c
Fri Jan 20 02:46:14 2017(r312447)
+++ stable/11/contrib/llvm/projects/libunwind/src/UnwindLevel1-gcc-ext.c
Fri Jan 20 02:48:52 2017(r312448)
@@ -224,6 +224,47 @@ _LIBUNWIND_EXPORT uintptr_t _Unwind_GetI
 
 #if _LIBUNWIND_SUPPORT_DWARF_UNWIND
 
+#ifdef __FreeBSD__
+
+// Based on LLVM's lib/ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp
+// and XXX should be fixed to be alignment-safe.
+static void processFDE(const char *addr, bool isDeregister) {
+  uint64_t length;
+  while ((length = *((const uint32_t *)addr)) != 0) {
+const char *p = addr + 4;
+if (length == 0x) {
+  length = *((const uint64_t *)p);
+  p += 8;
+}
+uint32_t offset = *((const uint32_t *)p);
+if (offset != 0) {
+  if (isDeregister)
+_unw_remove_dynamic_fde((unw_word_t)(uintptr_t)addr);
+  else
+_unw_add_dynamic_fde((unw_word_t)(uintptr_t)addr);
+}
+addr = p + length;
+  }
+}
+
+/// Called by programs with dynamic code generators that want to register
+/// dynamically generated FDEs, with a libgcc-compatible API.
+
+_LIBUNWIND_EXPORT void __register_frame(const void *addr) {
+  _LIBUNWIND_TRACE_API("__register_frame(%p)", addr);
+  processFDE(addr, false);
+}
+
+/// Called by programs with dynamic code generators that want to unregister
+/// dynamically generated FDEs, with a libgcc-compatible API.
+_LIBUNWIND_EXPORT void __deregister_frame(const void *addr) {
+  _LIBUNWIND_TRACE_API("__deregister_frame(%p)", addr);
+  processFDE(addr, true);
+}
+
+
+#else
+
 /// Called by programs with dynamic code generators that want
 /// to register a dynamically generated FDE.
 /// This function has existed on Mac OS X since 10.4, but
@@ -243,6 +284,7 @@ _LIBUNWIND_EXPORT void __deregister_fram
   _unw_remove_dynamic_fde((unw_word_t)(uintptr_t) fde);
 }
 
+#endif
 
 // The following register/deregister functions are gcc extensions.
 // They have existed on Mac OS X, but have never worked because Mac OS X
___
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: r312447 - in stable/11/contrib/llvm/projects/libunwind: include src

[Ed Maste]

Author: emaste
Date: Fri Jan 20 02:46:14 2017
New Revision: 312447
URL: https://svnweb.freebsd.org/changeset/base/312447

Log:
  MFC r308006: libunwind: consistently add \n to log and trace messages
  
  Previously most messages included a newline in the string, but a few of
  them were missing. Fix these and simplify by just adding the newline in
  the _LIBUNWIND_LOG macro itself.
  
  While here correct 'libuwind' typo (missing 'n').
  
  Upstream LLVM libunwind commits r280086 and r280103.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  stable/11/contrib/llvm/projects/libunwind/include/libunwind.h
  stable/11/contrib/llvm/projects/libunwind/src/AddressSpace.hpp
  stable/11/contrib/llvm/projects/libunwind/src/CompactUnwinder.hpp
  stable/11/contrib/llvm/projects/libunwind/src/EHHeaderParser.hpp
  stable/11/contrib/llvm/projects/libunwind/src/Unwind-EHABI.cpp
  stable/11/contrib/llvm/projects/libunwind/src/Unwind-sjlj.c
  stable/11/contrib/llvm/projects/libunwind/src/UnwindCursor.hpp
  stable/11/contrib/llvm/projects/libunwind/src/UnwindLevel1-gcc-ext.c
  stable/11/contrib/llvm/projects/libunwind/src/UnwindLevel1.c
  stable/11/contrib/llvm/projects/libunwind/src/config.h
  stable/11/contrib/llvm/projects/libunwind/src/libunwind.cpp
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/contrib/llvm/projects/libunwind/include/libunwind.h
==
--- stable/11/contrib/llvm/projects/libunwind/include/libunwind.h   Fri Jan 
20 02:09:59 2017(r312446)
+++ stable/11/contrib/llvm/projects/libunwind/include/libunwind.h   Fri Jan 
20 02:46:14 2017(r312447)
@@ -6,7 +6,7 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //
-// Compatible with libuwind API documented at:
+// Compatible with libunwind API documented at:
 //   http://www.nongnu.org/libunwind/man/libunwind(3).html
 //
 
//===--===//
@@ -120,7 +120,7 @@ extern int unw_init_remote_thread(unw_cu
 #endif /* UNW_REMOTE */
 
 /*
- * traditional libuwind "remote" API
+ * traditional libunwind "remote" API
  *   NOT IMPLEMENTED on Mac OS X
  *
  * extern int   unw_init_remote(unw_cursor_t*, unw_addr_space_t,

Modified: stable/11/contrib/llvm/projects/libunwind/src/AddressSpace.hpp
==
--- stable/11/contrib/llvm/projects/libunwind/src/AddressSpace.hpp  Fri Jan 
20 02:09:59 2017(r312446)
+++ stable/11/contrib/llvm/projects/libunwind/src/AddressSpace.hpp  Fri Jan 
20 02:46:14 2017(r312447)
@@ -374,7 +374,7 @@ inline bool LocalAddressSpace::findUnwin
   (_Unwind_Ptr) targetAddr, );
   info.arm_section_length = (uintptr_t)length;
  #endif
-  _LIBUNWIND_TRACE_UNWINDING("findUnwindSections: section %X length %x\n",
+  _LIBUNWIND_TRACE_UNWINDING("findUnwindSections: section %X length %x",
  info.arm_section, info.arm_section_length);
   if (info.arm_section && info.arm_section_length)
 return true;

Modified: stable/11/contrib/llvm/projects/libunwind/src/CompactUnwinder.hpp
==
--- stable/11/contrib/llvm/projects/libunwind/src/CompactUnwinder.hpp   Fri Jan 
20 02:09:59 2017(r312446)
+++ stable/11/contrib/llvm/projects/libunwind/src/CompactUnwinder.hpp   Fri Jan 
20 02:46:14 2017(r312447)
@@ -105,7 +105,7 @@ int CompactUnwinder_x86::stepWithComp
 default:
   (void)functionStart;
   _LIBUNWIND_DEBUG_LOG("bad register for EBP frame, encoding=%08X for  "
-   "function starting at 0x%X\n",
+   "function starting at 0x%X",
 compactEncoding, functionStart);
   _LIBUNWIND_ABORT("invalid compact unwind encoding");
 }
@@ -224,7 +224,7 @@ int CompactUnwinder_x86::stepWithComp
   break;
 default:
   _LIBUNWIND_DEBUG_LOG("bad register for frameless, encoding=%08X for "
-   "function starting at 0x%X\n",
+   "function starting at 0x%X",
encoding, functionStart);
   _LIBUNWIND_ABORT("invalid compact unwind encoding");
 }
@@ -336,7 +336,7 @@ int CompactUnwinder_x86_64::stepWithC
 default:
   (void)functionStart;
   _LIBUNWIND_DEBUG_LOG("bad register for RBP frame, encoding=%08X for "
-   "function starting at 0x%llX\n",
+   "function starting at 0x%llX",
 compactEncoding, functionStart);
   _LIBUNWIND_ABORT("invalid compact unwind encoding");
 }
@@ -455,7 +455,7 @@ int CompactUnwinder_x86_64::stepWithC
   break;
 default:
   _LIBUNWIND_DEBUG_LOG("bad register for frameless, encoding=%08X for "
-   "function starting at 0x%llX\n",
+  

svn commit: r312446 - head/lib/libc/stdtime

[Ed Maste]

Author: emaste
Date: Fri Jan 20 02:09:59 2017
New Revision: 312446
URL: https://svnweb.freebsd.org/changeset/base/312446

Log:
  libc: remove reference to nonexistent lib/locale directory
  
  As far as I can tell this was introduced in r72406 and updated in several
  subsequent revisions, but the lib/locale directory it referenced never
  existed.
  
  Reviewed by:  ngie
  Sponsored by: The FreeBSD Foundation
  Differential Revision:https://reviews.freebsd.org/D9252

Modified:
  head/lib/libc/stdtime/Makefile.inc

Modified: head/lib/libc/stdtime/Makefile.inc
==
--- head/lib/libc/stdtime/Makefile.inc  Fri Jan 20 00:17:53 2017
(r312445)
+++ head/lib/libc/stdtime/Makefile.inc  Fri Jan 20 02:09:59 2017
(r312446)
@@ -1,8 +1,7 @@
 #  Makefile.inc,v 1.2 1994/09/13 21:26:01 wollman Exp
 # $FreeBSD$
 
-.PATH: ${LIBC_SRCTOP}/stdtime ${LIBC_SRCTOP}/../locale \
-   ${LIBC_SRCTOP}/../../contrib/tzcode/stdtime
+.PATH: ${LIBC_SRCTOP}/stdtime ${LIBC_SRCTOP}/../../contrib/tzcode/stdtime
 
 SRCS+= asctime.c difftime.c localtime.c strftime.c strptime.c timelocal.c \
time32.c
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r312445 - stable/11/sys/netinet

[Josh Paetzel]

Author: jpaetzel
Date: Fri Jan 20 00:17:53 2017
New Revision: 312445
URL: https://svnweb.freebsd.org/changeset/base/312445

Log:
  Revert MFC of 310847 and 310864
  
  Requested by glebius who had questions about the original
  head commit that I didn't see.

Modified:
  stable/11/sys/netinet/ip_carp.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/netinet/ip_carp.c
==
--- stable/11/sys/netinet/ip_carp.c Fri Jan 20 00:15:11 2017
(r312444)
+++ stable/11/sys/netinet/ip_carp.c Fri Jan 20 00:17:53 2017
(r312445)
@@ -581,96 +581,27 @@ carp6_input(struct mbuf **mp, int *offp,
 }
 #endif /* INET6 */
 
-/*
- * This routine should not be necessary at all, but some switches
- * (VMWare ESX vswitches) can echo our own packets back at us,
- * and we must ignore them or they will cause us to drop out of
- * MASTER mode.
- *
- * We cannot catch all cases of network loops.  Instead, what we
- * do here is catch any packet that arrives with a carp header
- * with a VHID of 0, that comes from an address that is our own.
- * These packets are by definition "from us" (even if they are from
- * a misconfigured host that is pretending to be us).
- *
- * The VHID test is outside this mini-function.
- */
-static int
-carp_source_is_self(struct mbuf *m, struct ifaddr *ifa, sa_family_t af)
-{
-#ifdef INET
-   struct ip *ip4;
-   struct in_addr in4;
-#endif
-#ifdef INET6
-   struct ip6_hdr *ip6;
-   struct in6_addr in6;
-#endif
-
-   switch (af) {
-#ifdef INET
-   case AF_INET:
-   ip4 = mtod(m, struct ip *);
-   in4 = ifatoia(ifa)->ia_addr.sin_addr;
-   return (in4.s_addr == ip4->ip_src.s_addr);
-#endif
-#ifdef INET6
-   case AF_INET6:
-   ip6 = mtod(m, struct ip6_hdr *);
-   in6 = ifatoia6(ifa)->ia_addr.sin6_addr;
-   return (memcmp(, >ip6_src, sizeof(in6)) == 0);
-#endif
-   default:
-   break;
-   }
-   return (0);
-}
-
 static void
 carp_input_c(struct mbuf *m, struct carp_header *ch, sa_family_t af)
 {
struct ifnet *ifp = m->m_pkthdr.rcvif;
-   struct ifaddr *ifa, *match;
+   struct ifaddr *ifa;
struct carp_softc *sc;
uint64_t tmp_counter;
struct timeval sc_tv, ch_tv;
-   int error;
 
-   /*
-* Verify that the VHID is valid on the receiving interface.
-*
-* There should be just one match.  If there are none
-* the VHID is not valid and we drop the packet.  If
-* there are multiple VHID matches, take just the first
-* one, for compatibility with previous code.  While we're
-* scanning, check for obvious loops in the network topology
-* (these should never happen, and as noted above, we may
-* miss real loops; this is just a double-check).
-*/
+   /* verify that the VHID is valid on the receiving interface */
IF_ADDR_RLOCK(ifp);
-   error = 0;
-   match = NULL;
-   IFNET_FOREACH_IFA(ifp, ifa) {
-   if (match == NULL && ifa->ifa_carp != NULL &&
-   ifa->ifa_addr->sa_family == af &&
-   ifa->ifa_carp->sc_vhid == ch->carp_vhid)
-   match = ifa;
-   if (ch->carp_vhid == 0 && carp_source_is_self(m, ifa, af))
-   error = ELOOP;
-   }
-   ifa = error ? NULL : match;
-   if (ifa != NULL)
-   ifa_ref(ifa);
+   IFNET_FOREACH_IFA(ifp, ifa)
+   if (ifa->ifa_addr->sa_family == af &&
+   ifa->ifa_carp->sc_vhid == ch->carp_vhid) {
+   ifa_ref(ifa);
+   break;
+   }
IF_ADDR_RUNLOCK(ifp);
 
if (ifa == NULL) {
-   if (error == ELOOP) {
-   CARP_DEBUG("dropping looped packet on interface %s\n",
-   ifp->if_xname);
-   CARPSTATS_INC(carps_badif); /* ??? */
-   } else {
-   CARPSTATS_INC(carps_badvhid);
-   }
+   CARPSTATS_INC(carps_badvhid);
m_freem(m);
return;
}
@@ -856,41 +787,12 @@ carp_send_ad_error(struct carp_softc *sc
}
 }
 
-/*
- * Pick the best ifaddr on the given ifp for sending CARP
- * advertisements.
- *
- * "Best" here is defined by ifa_preferred().  This function is much
- * much like ifaof_ifpforaddr() except that we just use ifa_preferred().
- *
- * (This could be simplified to return the actual address, except that
- * it has a different format in AF_INET and AF_INET6.)
- */
-static struct ifaddr *
-carp_best_ifa(int af, struct ifnet *ifp)
-{
-   struct ifaddr *ifa, *best;
-
-   if (af >= AF_MAX)
-   return (NULL);
-   best = NULL;
-   IF_ADDR_RLOCK(ifp);
-   TAILQ_FOREACH(ifa, >if_addrhead, ifa_link) 

svn commit: r312444 - stable/10/sys/netinet

[Josh Paetzel]

Author: jpaetzel
Date: Fri Jan 20 00:15:11 2017
New Revision: 312444
URL: https://svnweb.freebsd.org/changeset/base/312444

Log:
  Revert MFC of 310847 and 310864
  
  Requested by glebius who had questions about the original
  head commit that I didn't see.

Modified:
  stable/10/sys/netinet/ip_carp.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netinet/ip_carp.c
==
--- stable/10/sys/netinet/ip_carp.c Fri Jan 20 00:02:11 2017
(r312443)
+++ stable/10/sys/netinet/ip_carp.c Fri Jan 20 00:15:11 2017
(r312444)
@@ -573,96 +573,27 @@ carp6_input(struct mbuf **mp, int *offp,
 }
 #endif /* INET6 */
 
-/*
- * This routine should not be necessary at all, but some switches
- * (VMWare ESX vswitches) can echo our own packets back at us,
- * and we must ignore them or they will cause us to drop out of
- * MASTER mode.
- *
- * We cannot catch all cases of network loops.  Instead, what we
- * do here is catch any packet that arrives with a carp header
- * with a VHID of 0, that comes from an address that is our own.
- * These packets are by definition "from us" (even if they are from
- * a misconfigured host that is pretending to be us).
- *
- * The VHID test is outside this mini-function.
- */
-static int
-carp_source_is_self(struct mbuf *m, struct ifaddr *ifa, sa_family_t af)
-{
-#ifdef INET
-   struct ip *ip4;
-   struct in_addr in4;
-#endif
-#ifdef INET6
-   struct ip6_hdr *ip6;
-   struct in6_addr in6;
-#endif
-
-   switch (af) {
-#ifdef INET
-   case AF_INET:
-   ip4 = mtod(m, struct ip *);
-   in4 = ifatoia(ifa)->ia_addr.sin_addr;
-   return (in4.s_addr == ip4->ip_src.s_addr);
-#endif
-#ifdef INET6
-   case AF_INET6:
-   ip6 = mtod(m, struct ip6_hdr *);
-   in6 = ifatoia6(ifa)->ia_addr.sin6_addr;
-   return (memcmp(, >ip6_src, sizeof(in6)) == 0);
-#endif
-   default:
-   break;
-   }
-   return (0);
-}
-
 static void
 carp_input_c(struct mbuf *m, struct carp_header *ch, sa_family_t af)
 {
struct ifnet *ifp = m->m_pkthdr.rcvif;
-   struct ifaddr *ifa, *match;
+   struct ifaddr *ifa;
struct carp_softc *sc;
uint64_t tmp_counter;
struct timeval sc_tv, ch_tv;
-   int error;
 
-   /*
-* Verify that the VHID is valid on the receiving interface.
-*
-* There should be just one match.  If there are none
-* the VHID is not valid and we drop the packet.  If
-* there are multiple VHID matches, take just the first
-* one, for compatibility with previous code.  While we're
-* scanning, check for obvious loops in the network topology
-* (these should never happen, and as noted above, we may
-* miss real loops; this is just a double-check).
-*/
+   /* verify that the VHID is valid on the receiving interface */
IF_ADDR_RLOCK(ifp);
-   error = 0;
-   match = NULL;
-   IFNET_FOREACH_IFA(ifp, ifa) {
-   if (match == NULL && ifa->ifa_carp != NULL &&
-   ifa->ifa_addr->sa_family == af &&
-   ifa->ifa_carp->sc_vhid == ch->carp_vhid)
-   match = ifa;
-   if (ch->carp_vhid == 0 && carp_source_is_self(m, ifa, af))
-   error = ELOOP;
-   }
-   ifa = error ? NULL : match;
-   if (ifa != NULL)
-   ifa_ref(ifa);
+   IFNET_FOREACH_IFA(ifp, ifa)
+   if (ifa->ifa_addr->sa_family == af &&
+   ifa->ifa_carp->sc_vhid == ch->carp_vhid) {
+   ifa_ref(ifa);
+   break;
+   }
IF_ADDR_RUNLOCK(ifp);
 
if (ifa == NULL) {
-   if (error == ELOOP) {
-   CARP_DEBUG("dropping looped packet on interface %s\n",
-   ifp->if_xname);
-   CARPSTATS_INC(carps_badif); /* ??? */
-   } else {
-   CARPSTATS_INC(carps_badvhid);
-   }
+   CARPSTATS_INC(carps_badvhid);
m_freem(m);
return;
}
@@ -858,41 +789,12 @@ carp_send_ad_error(struct carp_softc *sc
}
 }
 
-/*
- * Pick the best ifaddr on the given ifp for sending CARP
- * advertisements.
- *
- * "Best" here is defined by ifa_preferred().  This function is much
- * much like ifaof_ifpforaddr() except that we just use ifa_preferred().
- *
- * (This could be simplified to return the actual address, except that
- * it has a different format in AF_INET and AF_INET6.)
- */
-static struct ifaddr *
-carp_best_ifa(int af, struct ifnet *ifp)
-{
-   struct ifaddr *ifa, *best;
-
-   if (af >= AF_MAX)
-   return (NULL);
-   best = NULL;
-   IF_ADDR_RLOCK(ifp);
-   TAILQ_FOREACH(ifa, >if_addrhead, ifa_link) 

Re: svn commit: r312437 - in head/sys/dev: mpr mps

[Slawa Olhovchenkov]

On Thu, Jan 19, 2017 at 09:47:51PM +, Scott Long wrote:

> Author: scottl
> Date: Thu Jan 19 21:47:50 2017
> New Revision: 312437
> URL: https://svnweb.freebsd.org/changeset/base/312437
> 
> Log:
>   Rework the debug print API. Event printing no longer gets special handling.
>   All of the printing from the tables file now has wrappers so that the
>   handling is cleaner and it's possible to print something out (say, during
>   development) without having to fight the global debug flags. This re-org
>   will also make it easier to have the tables be compiled out at build time
>   if desired.
>   
>   Other than fixing some minor bugs, there are no user-visible changes from
>   this change

Can you also do "atomics" print?
Now debugs interleave w/ other outputs and line can split multiple
times.
___
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: r312443 - in head/sys: conf netgraph

[Pedro F. Giffuni]

Author: pfg
Date: Fri Jan 20 00:02:11 2017
New Revision: 312443
URL: https://svnweb.freebsd.org/changeset/base/312443

Log:
  mppc - Finish pluging NETGRAPH_MPPC_COMPRESSION.
  
  There were several places where reference to compression were left
  unfinished. Furthermore, KASSERTs contained references to MPPC_INVALID
  which is not defined in the tree and therefore were sure to break with
  INVARIANTS: comment them out.
  
  Reported by:  Eugene Grosbein
  PR:   216265
  MFC after:3 days

Modified:
  head/sys/conf/NOTES
  head/sys/conf/options
  head/sys/netgraph/ng_mppc.c

Modified: head/sys/conf/NOTES
==
--- head/sys/conf/NOTES Thu Jan 19 23:44:05 2017(r312442)
+++ head/sys/conf/NOTES Fri Jan 20 00:02:11 2017(r312443)
@@ -774,8 +774,7 @@ options NETGRAPH_IPFW
 optionsNETGRAPH_KSOCKET
 optionsNETGRAPH_L2TP
 optionsNETGRAPH_LMI
-# MPPC compression requires proprietary files (not included)
-#options   NETGRAPH_MPPC_COMPRESSION
+optionsNETGRAPH_MPPC_COMPRESSION
 optionsNETGRAPH_MPPC_ENCRYPTION
 optionsNETGRAPH_NETFLOW
 optionsNETGRAPH_NAT

Modified: head/sys/conf/options
==
--- head/sys/conf/options   Thu Jan 19 23:44:05 2017(r312442)
+++ head/sys/conf/options   Fri Jan 20 00:02:11 2017(r312443)
@@ -517,7 +517,6 @@ NETGRAPH_IPFW   opt_netgraph.h
 NETGRAPH_KSOCKET   opt_netgraph.h
 NETGRAPH_L2TP  opt_netgraph.h
 NETGRAPH_LMI   opt_netgraph.h
-# MPPC compression requires proprietary files (not included)
 NETGRAPH_MPPC_COMPRESSION  opt_netgraph.h
 NETGRAPH_MPPC_ENCRYPTION   opt_netgraph.h
 NETGRAPH_NAT   opt_netgraph.h

Modified: head/sys/netgraph/ng_mppc.c
==
--- head/sys/netgraph/ng_mppc.c Thu Jan 19 23:44:05 2017(r312442)
+++ head/sys/netgraph/ng_mppc.c Fri Jan 20 00:02:11 2017(r312443)
@@ -66,7 +66,7 @@
 
 #if !defined(NETGRAPH_MPPC_COMPRESSION) && !defined(NETGRAPH_MPPC_ENCRYPTION)
 #ifdef KLD_MODULE
-/* XXX NETGRAPH_MPPC_COMPRESSION isn't functional yet */
+#define NETGRAPH_MPPC_COMPRESSION
 #define NETGRAPH_MPPC_ENCRYPTION
 #else
 /* This case is indicative of an error in sys/conf files */
@@ -81,7 +81,6 @@ static MALLOC_DEFINE(M_NETGRAPH_MPPC, "n
 #endif
 
 #ifdef NETGRAPH_MPPC_COMPRESSION
-/* XXX this file doesn't exist yet, but hopefully someday it will... */
 #include 
 #endif
 #ifdef NETGRAPH_MPPC_ENCRYPTION
@@ -543,7 +542,7 @@ err1:
, d->history, flags, 0);
 
/* Check return value */
-   KASSERT(rtn != MPPC_INVALID, ("%s: invalid", __func__));
+   /* KASSERT(rtn != MPPC_INVALID, ("%s: invalid", __func__)); */
if ((rtn & MPPC_EXPANDED) == 0
&& (rtn & MPPC_COMP_OK) == MPPC_COMP_OK) {
outlen -= destCnt; 
@@ -805,7 +804,7 @@ failed:
, , d->history, flags);
 
/* Check return value */
-   KASSERT(rtn != MPPC_INVALID, ("%s: invalid", __func__));
+   /* KASSERT(rtn != MPPC_INVALID, ("%s: invalid", __func__)); */
if ((rtn & MPPC_DEST_EXHAUSTED) != 0
|| (rtn & MPPC_DECOMP_OK) != MPPC_DECOMP_OK) {
log(LOG_ERR, "%s: decomp returned 0x%x",
___
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: r312439 - stable/11/sys/netinet

[Gleb Smirnoff]

  Josh,

  did you notice my reply to the original commit?!

On Thu, Jan 19, 2017 at 11:38:31PM +, Josh Paetzel wrote:
J> Author: jpaetzel
J> Date: Thu Jan 19 23:38:31 2017
J> New Revision: 312439
J> URL: https://svnweb.freebsd.org/changeset/base/312439
J> 
J> Log:
J>   MFC 310847 310864
J>   
J>   Harden CARP against network loops.
J>   
J>   If there is a loop in the network a CARP that is in MASTER state will see 
it's
J>   own broadcasts, which will then cause it to assume BACKUP state.  When it
J>   assumes BACKUP it will stop sending advertisements.  In that state it will 
no
J>   longer see advertisements and will assume MASTER...
J>   
J>   We can't catch all the cases where we are seeing our own CARP broadcast, 
but
J>   we can catch the obvious case.
J>   
J>   Unbreak ip_carp with WITHOUT_INET6 enabled by conditionalizing all IPv6
J>   structs under the INET6 #ifdef. Similarly (even though it doesn't seem
J>   to affect the build), conditionalize all IPv4 structs under the INET
J>   #ifdef
J>   
J>   This also unbreaks the LINT-NOINET6 tinderbox target on amd64; I have not
J>   verified other MACHINE/TARGET pairs (e.g. armv6/arm).
J>   
J>   Submitted by:  torek
J>   Obtained from: FreeNAS
J>   Pointyhat fix: ngie
J> 
J> Modified:
J>   stable/11/sys/netinet/ip_carp.c
J> Directory Properties:
J>   stable/11/   (props changed)
J> 
J> Modified: stable/11/sys/netinet/ip_carp.c
J> 
==
J> --- stable/11/sys/netinet/ip_carp.c  Thu Jan 19 22:07:21 2017
(r312438)
J> +++ stable/11/sys/netinet/ip_carp.c  Thu Jan 19 23:38:31 2017
(r312439)
J> @@ -581,27 +581,96 @@ carp6_input(struct mbuf **mp, int *offp,
J>  }
J>  #endif /* INET6 */
J>  
J> +/*
J> + * This routine should not be necessary at all, but some switches
J> + * (VMWare ESX vswitches) can echo our own packets back at us,
J> + * and we must ignore them or they will cause us to drop out of
J> + * MASTER mode.
J> + *
J> + * We cannot catch all cases of network loops.  Instead, what we
J> + * do here is catch any packet that arrives with a carp header
J> + * with a VHID of 0, that comes from an address that is our own.
J> + * These packets are by definition "from us" (even if they are from
J> + * a misconfigured host that is pretending to be us).
J> + *
J> + * The VHID test is outside this mini-function.
J> + */
J> +static int
J> +carp_source_is_self(struct mbuf *m, struct ifaddr *ifa, sa_family_t af)
J> +{
J> +#ifdef INET
J> +struct ip *ip4;
J> +struct in_addr in4;
J> +#endif
J> +#ifdef INET6
J> +struct ip6_hdr *ip6;
J> +struct in6_addr in6;
J> +#endif
J> +
J> +switch (af) {
J> +#ifdef INET
J> +case AF_INET:
J> +ip4 = mtod(m, struct ip *);
J> +in4 = ifatoia(ifa)->ia_addr.sin_addr;
J> +return (in4.s_addr == ip4->ip_src.s_addr);
J> +#endif
J> +#ifdef INET6
J> +case AF_INET6:
J> +ip6 = mtod(m, struct ip6_hdr *);
J> +in6 = ifatoia6(ifa)->ia_addr.sin6_addr;
J> +return (memcmp(, >ip6_src, sizeof(in6)) == 0);
J> +#endif
J> +default:
J> +break;
J> +}
J> +return (0);
J> +}
J> +
J>  static void
J>  carp_input_c(struct mbuf *m, struct carp_header *ch, sa_family_t af)
J>  {
J>  struct ifnet *ifp = m->m_pkthdr.rcvif;
J> -struct ifaddr *ifa;
J> +struct ifaddr *ifa, *match;
J>  struct carp_softc *sc;
J>  uint64_t tmp_counter;
J>  struct timeval sc_tv, ch_tv;
J> +int error;
J>  
J> -/* verify that the VHID is valid on the receiving interface */
J> +/*
J> + * Verify that the VHID is valid on the receiving interface.
J> + *
J> + * There should be just one match.  If there are none
J> + * the VHID is not valid and we drop the packet.  If
J> + * there are multiple VHID matches, take just the first
J> + * one, for compatibility with previous code.  While we're
J> + * scanning, check for obvious loops in the network topology
J> + * (these should never happen, and as noted above, we may
J> + * miss real loops; this is just a double-check).
J> + */
J>  IF_ADDR_RLOCK(ifp);
J> -IFNET_FOREACH_IFA(ifp, ifa)
J> -if (ifa->ifa_addr->sa_family == af &&
J> -ifa->ifa_carp->sc_vhid == ch->carp_vhid) {
J> -ifa_ref(ifa);
J> -break;
J> -}
J> +error = 0;
J> +match = NULL;
J> +IFNET_FOREACH_IFA(ifp, ifa) {
J> +if (match == NULL && ifa->ifa_carp != NULL &&
J> +ifa->ifa_addr->sa_family == af &&
J> +ifa->ifa_carp->sc_vhid == ch->carp_vhid)
J> +match = ifa;
J> +if (ch->carp_vhid == 0 && carp_source_is_self(m, ifa, af))
J> +error = ELOOP;
J> +}
J> +ifa = error ? NULL : match;
J> +if (ifa != NULL)
J> +ifa_ref(ifa);
J>  IF_ADDR_RUNLOCK(ifp);
J>  
J>  if (ifa == NULL) {
J> 

svn commit: r312442 - stable/10/sys/kern

[Ravi Pokala]

Author: rpokala
Date: Thu Jan 19 23:44:05 2017
New Revision: 312442
URL: https://svnweb.freebsd.org/changeset/base/312442

Log:
  MFC r311963: Remove writability requirement for single-mbuf, contiguous-
  range m_pulldown()
  
  m_pulldown() only needs to determine if a mbuf is writable if it is going to
  copy data into the data region of an existing mbuf. It does this to create a
  contiguous data region in a single mbuf from multiple mbufs in the chain. If
  the requested memory region is already contiguous and nothing needs to
  change, the mbuf does not need to be writeable.

Modified:
  stable/10/sys/kern/uipc_mbuf2.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/uipc_mbuf2.c
==
--- stable/10/sys/kern/uipc_mbuf2.c Thu Jan 19 23:42:51 2017
(r312441)
+++ stable/10/sys/kern/uipc_mbuf2.c Thu Jan 19 23:44:05 2017
(r312442)
@@ -161,7 +161,7 @@ m_pulldown(struct mbuf *m, int off, int 
 * the target data is on .
 * if we got enough data on the mbuf "n", we're done.
 */
-   if ((off == 0 || offp) && len <= n->m_len - off && writable)
+   if ((off == 0 || offp) && len <= n->m_len - off)
goto ok;
 
/*
___
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: r312441 - stable/11/sys/kern

[Ravi Pokala]

Author: rpokala
Date: Thu Jan 19 23:42:51 2017
New Revision: 312441
URL: https://svnweb.freebsd.org/changeset/base/312441

Log:
  MFC r311963: Remove writability requirement for single-mbuf, contiguous-
  range m_pulldown()
  
  m_pulldown() only needs to determine if a mbuf is writable if it is going to
  copy data into the data region of an existing mbuf. It does this to create a
  contiguous data region in a single mbuf from multiple mbufs in the chain. If
  the requested memory region is already contiguous and nothing needs to
  change, the mbuf does not need to be writeable.

Modified:
  stable/11/sys/kern/uipc_mbuf2.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/kern/uipc_mbuf2.c
==
--- stable/11/sys/kern/uipc_mbuf2.c Thu Jan 19 23:42:26 2017
(r312440)
+++ stable/11/sys/kern/uipc_mbuf2.c Thu Jan 19 23:42:51 2017
(r312441)
@@ -159,7 +159,7 @@ m_pulldown(struct mbuf *m, int off, int 
 * the target data is on .
 * if we got enough data on the mbuf "n", we're done.
 */
-   if ((off == 0 || offp) && len <= n->m_len - off && writable)
+   if ((off == 0 || offp) && len <= n->m_len - off)
goto ok;
 
/*
___
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: r312440 - stable/10/sys/netinet

[Josh Paetzel]

Author: jpaetzel
Date: Thu Jan 19 23:42:26 2017
New Revision: 312440
URL: https://svnweb.freebsd.org/changeset/base/312440

Log:
  MFC 310847 310864
  
  Harden CARP against network loops.
  
  If there is a loop in the network a CARP that is in MASTER state will see it's
  own broadcasts, which will then cause it to assume BACKUP state.  When it
  assumes BACKUP it will stop sending advertisements.  In that state it will no
  longer see advertisements and will assume MASTER...
  
  We can't catch all the cases where we are seeing our own CARP broadcast, but
  we can catch the obvious case.
  
  Unbreak ip_carp with WITHOUT_INET6 enabled by conditionalizing all IPv6
  structs under the INET6 #ifdef. Similarly (even though it doesn't seem
  to affect the build), conditionalize all IPv4 structs under the INET
  #ifdef
  
  This also unbreaks the LINT-NOINET6 tinderbox target on amd64; I have not
  verified other MACHINE/TARGET pairs (e.g. armv6/arm).
  
  Submitted by: torek
  Obtained from:FreeNAS
  Pointyhat fix:ngie

Modified:
  stable/10/sys/netinet/ip_carp.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netinet/ip_carp.c
==
--- stable/10/sys/netinet/ip_carp.c Thu Jan 19 23:38:31 2017
(r312439)
+++ stable/10/sys/netinet/ip_carp.c Thu Jan 19 23:42:26 2017
(r312440)
@@ -573,27 +573,96 @@ carp6_input(struct mbuf **mp, int *offp,
 }
 #endif /* INET6 */
 
+/*
+ * This routine should not be necessary at all, but some switches
+ * (VMWare ESX vswitches) can echo our own packets back at us,
+ * and we must ignore them or they will cause us to drop out of
+ * MASTER mode.
+ *
+ * We cannot catch all cases of network loops.  Instead, what we
+ * do here is catch any packet that arrives with a carp header
+ * with a VHID of 0, that comes from an address that is our own.
+ * These packets are by definition "from us" (even if they are from
+ * a misconfigured host that is pretending to be us).
+ *
+ * The VHID test is outside this mini-function.
+ */
+static int
+carp_source_is_self(struct mbuf *m, struct ifaddr *ifa, sa_family_t af)
+{
+#ifdef INET
+   struct ip *ip4;
+   struct in_addr in4;
+#endif
+#ifdef INET6
+   struct ip6_hdr *ip6;
+   struct in6_addr in6;
+#endif
+
+   switch (af) {
+#ifdef INET
+   case AF_INET:
+   ip4 = mtod(m, struct ip *);
+   in4 = ifatoia(ifa)->ia_addr.sin_addr;
+   return (in4.s_addr == ip4->ip_src.s_addr);
+#endif
+#ifdef INET6
+   case AF_INET6:
+   ip6 = mtod(m, struct ip6_hdr *);
+   in6 = ifatoia6(ifa)->ia_addr.sin6_addr;
+   return (memcmp(, >ip6_src, sizeof(in6)) == 0);
+#endif
+   default:
+   break;
+   }
+   return (0);
+}
+
 static void
 carp_input_c(struct mbuf *m, struct carp_header *ch, sa_family_t af)
 {
struct ifnet *ifp = m->m_pkthdr.rcvif;
-   struct ifaddr *ifa;
+   struct ifaddr *ifa, *match;
struct carp_softc *sc;
uint64_t tmp_counter;
struct timeval sc_tv, ch_tv;
+   int error;
 
-   /* verify that the VHID is valid on the receiving interface */
+   /*
+* Verify that the VHID is valid on the receiving interface.
+*
+* There should be just one match.  If there are none
+* the VHID is not valid and we drop the packet.  If
+* there are multiple VHID matches, take just the first
+* one, for compatibility with previous code.  While we're
+* scanning, check for obvious loops in the network topology
+* (these should never happen, and as noted above, we may
+* miss real loops; this is just a double-check).
+*/
IF_ADDR_RLOCK(ifp);
-   IFNET_FOREACH_IFA(ifp, ifa)
-   if (ifa->ifa_addr->sa_family == af &&
-   ifa->ifa_carp->sc_vhid == ch->carp_vhid) {
-   ifa_ref(ifa);
-   break;
-   }
+   error = 0;
+   match = NULL;
+   IFNET_FOREACH_IFA(ifp, ifa) {
+   if (match == NULL && ifa->ifa_carp != NULL &&
+   ifa->ifa_addr->sa_family == af &&
+   ifa->ifa_carp->sc_vhid == ch->carp_vhid)
+   match = ifa;
+   if (ch->carp_vhid == 0 && carp_source_is_self(m, ifa, af))
+   error = ELOOP;
+   }
+   ifa = error ? NULL : match;
+   if (ifa != NULL)
+   ifa_ref(ifa);
IF_ADDR_RUNLOCK(ifp);
 
if (ifa == NULL) {
-   CARPSTATS_INC(carps_badvhid);
+   if (error == ELOOP) {
+   CARP_DEBUG("dropping looped packet on interface %s\n",
+   ifp->if_xname);
+   CARPSTATS_INC(carps_badif); /* ??? */
+   } else {
+   CARPSTATS_INC(carps_badvhid);

svn commit: r312439 - stable/11/sys/netinet

[Josh Paetzel]

Author: jpaetzel
Date: Thu Jan 19 23:38:31 2017
New Revision: 312439
URL: https://svnweb.freebsd.org/changeset/base/312439

Log:
  MFC 310847 310864
  
  Harden CARP against network loops.
  
  If there is a loop in the network a CARP that is in MASTER state will see it's
  own broadcasts, which will then cause it to assume BACKUP state.  When it
  assumes BACKUP it will stop sending advertisements.  In that state it will no
  longer see advertisements and will assume MASTER...
  
  We can't catch all the cases where we are seeing our own CARP broadcast, but
  we can catch the obvious case.
  
  Unbreak ip_carp with WITHOUT_INET6 enabled by conditionalizing all IPv6
  structs under the INET6 #ifdef. Similarly (even though it doesn't seem
  to affect the build), conditionalize all IPv4 structs under the INET
  #ifdef
  
  This also unbreaks the LINT-NOINET6 tinderbox target on amd64; I have not
  verified other MACHINE/TARGET pairs (e.g. armv6/arm).
  
  Submitted by: torek
  Obtained from:FreeNAS
  Pointyhat fix:ngie

Modified:
  stable/11/sys/netinet/ip_carp.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/netinet/ip_carp.c
==
--- stable/11/sys/netinet/ip_carp.c Thu Jan 19 22:07:21 2017
(r312438)
+++ stable/11/sys/netinet/ip_carp.c Thu Jan 19 23:38:31 2017
(r312439)
@@ -581,27 +581,96 @@ carp6_input(struct mbuf **mp, int *offp,
 }
 #endif /* INET6 */
 
+/*
+ * This routine should not be necessary at all, but some switches
+ * (VMWare ESX vswitches) can echo our own packets back at us,
+ * and we must ignore them or they will cause us to drop out of
+ * MASTER mode.
+ *
+ * We cannot catch all cases of network loops.  Instead, what we
+ * do here is catch any packet that arrives with a carp header
+ * with a VHID of 0, that comes from an address that is our own.
+ * These packets are by definition "from us" (even if they are from
+ * a misconfigured host that is pretending to be us).
+ *
+ * The VHID test is outside this mini-function.
+ */
+static int
+carp_source_is_self(struct mbuf *m, struct ifaddr *ifa, sa_family_t af)
+{
+#ifdef INET
+   struct ip *ip4;
+   struct in_addr in4;
+#endif
+#ifdef INET6
+   struct ip6_hdr *ip6;
+   struct in6_addr in6;
+#endif
+
+   switch (af) {
+#ifdef INET
+   case AF_INET:
+   ip4 = mtod(m, struct ip *);
+   in4 = ifatoia(ifa)->ia_addr.sin_addr;
+   return (in4.s_addr == ip4->ip_src.s_addr);
+#endif
+#ifdef INET6
+   case AF_INET6:
+   ip6 = mtod(m, struct ip6_hdr *);
+   in6 = ifatoia6(ifa)->ia_addr.sin6_addr;
+   return (memcmp(, >ip6_src, sizeof(in6)) == 0);
+#endif
+   default:
+   break;
+   }
+   return (0);
+}
+
 static void
 carp_input_c(struct mbuf *m, struct carp_header *ch, sa_family_t af)
 {
struct ifnet *ifp = m->m_pkthdr.rcvif;
-   struct ifaddr *ifa;
+   struct ifaddr *ifa, *match;
struct carp_softc *sc;
uint64_t tmp_counter;
struct timeval sc_tv, ch_tv;
+   int error;
 
-   /* verify that the VHID is valid on the receiving interface */
+   /*
+* Verify that the VHID is valid on the receiving interface.
+*
+* There should be just one match.  If there are none
+* the VHID is not valid and we drop the packet.  If
+* there are multiple VHID matches, take just the first
+* one, for compatibility with previous code.  While we're
+* scanning, check for obvious loops in the network topology
+* (these should never happen, and as noted above, we may
+* miss real loops; this is just a double-check).
+*/
IF_ADDR_RLOCK(ifp);
-   IFNET_FOREACH_IFA(ifp, ifa)
-   if (ifa->ifa_addr->sa_family == af &&
-   ifa->ifa_carp->sc_vhid == ch->carp_vhid) {
-   ifa_ref(ifa);
-   break;
-   }
+   error = 0;
+   match = NULL;
+   IFNET_FOREACH_IFA(ifp, ifa) {
+   if (match == NULL && ifa->ifa_carp != NULL &&
+   ifa->ifa_addr->sa_family == af &&
+   ifa->ifa_carp->sc_vhid == ch->carp_vhid)
+   match = ifa;
+   if (ch->carp_vhid == 0 && carp_source_is_self(m, ifa, af))
+   error = ELOOP;
+   }
+   ifa = error ? NULL : match;
+   if (ifa != NULL)
+   ifa_ref(ifa);
IF_ADDR_RUNLOCK(ifp);
 
if (ifa == NULL) {
-   CARPSTATS_INC(carps_badvhid);
+   if (error == ELOOP) {
+   CARP_DEBUG("dropping looped packet on interface %s\n",
+   ifp->if_xname);
+   CARPSTATS_INC(carps_badif); /* ??? */
+   } else {
+   CARPSTATS_INC(carps_badvhid);

svn commit: r312438 - in head/sys/contrib/dev/acpica: . common compiler components/debugger components/disassembler components/dispatcher components/events components/executer components/hardware c...

[Jung-uk Kim]

Author: jkim
Date: Thu Jan 19 22:07:21 2017
New Revision: 312438
URL: https://svnweb.freebsd.org/changeset/base/312438

Log:
  Merge ACPICA 20170119.

Modified:
  head/sys/contrib/dev/acpica/changes.txt
  head/sys/contrib/dev/acpica/common/acfileio.c
  head/sys/contrib/dev/acpica/common/acgetline.c
  head/sys/contrib/dev/acpica/common/adfile.c
  head/sys/contrib/dev/acpica/common/adisasm.c
  head/sys/contrib/dev/acpica/common/adwalk.c
  head/sys/contrib/dev/acpica/common/ahids.c
  head/sys/contrib/dev/acpica/common/ahpredef.c
  head/sys/contrib/dev/acpica/common/ahtable.c
  head/sys/contrib/dev/acpica/common/ahuuids.c
  head/sys/contrib/dev/acpica/common/cmfsize.c
  head/sys/contrib/dev/acpica/common/dmextern.c
  head/sys/contrib/dev/acpica/common/dmrestag.c
  head/sys/contrib/dev/acpica/common/dmtable.c
  head/sys/contrib/dev/acpica/common/dmtables.c
  head/sys/contrib/dev/acpica/common/dmtbdump.c
  head/sys/contrib/dev/acpica/common/dmtbinfo.c
  head/sys/contrib/dev/acpica/common/getopt.c
  head/sys/contrib/dev/acpica/compiler/aslanalyze.c
  head/sys/contrib/dev/acpica/compiler/aslascii.c
  head/sys/contrib/dev/acpica/compiler/aslbtypes.c
  head/sys/contrib/dev/acpica/compiler/aslcodegen.c
  head/sys/contrib/dev/acpica/compiler/aslcompile.c
  head/sys/contrib/dev/acpica/compiler/aslcompiler.h
  head/sys/contrib/dev/acpica/compiler/aslcompiler.l
  head/sys/contrib/dev/acpica/compiler/aslcstyle.y
  head/sys/contrib/dev/acpica/compiler/asldebug.c
  head/sys/contrib/dev/acpica/compiler/asldefine.h
  head/sys/contrib/dev/acpica/compiler/aslerror.c
  head/sys/contrib/dev/acpica/compiler/aslexternal.c
  head/sys/contrib/dev/acpica/compiler/aslfileio.c
  head/sys/contrib/dev/acpica/compiler/aslfiles.c
  head/sys/contrib/dev/acpica/compiler/aslfold.c
  head/sys/contrib/dev/acpica/compiler/aslglobal.h
  head/sys/contrib/dev/acpica/compiler/aslhelp.c
  head/sys/contrib/dev/acpica/compiler/aslhelpers.y
  head/sys/contrib/dev/acpica/compiler/aslhex.c
  head/sys/contrib/dev/acpica/compiler/aslkeywords.y
  head/sys/contrib/dev/acpica/compiler/asllength.c
  head/sys/contrib/dev/acpica/compiler/asllisting.c
  head/sys/contrib/dev/acpica/compiler/asllistsup.c
  head/sys/contrib/dev/acpica/compiler/aslload.c
  head/sys/contrib/dev/acpica/compiler/asllookup.c
  head/sys/contrib/dev/acpica/compiler/aslmain.c
  head/sys/contrib/dev/acpica/compiler/aslmap.c
  head/sys/contrib/dev/acpica/compiler/aslmapenter.c
  head/sys/contrib/dev/acpica/compiler/aslmapoutput.c
  head/sys/contrib/dev/acpica/compiler/aslmaputils.c
  head/sys/contrib/dev/acpica/compiler/aslmessages.c
  head/sys/contrib/dev/acpica/compiler/aslmessages.h
  head/sys/contrib/dev/acpica/compiler/aslmethod.c
  head/sys/contrib/dev/acpica/compiler/aslnamesp.c
  head/sys/contrib/dev/acpica/compiler/asloffset.c
  head/sys/contrib/dev/acpica/compiler/aslopcodes.c
  head/sys/contrib/dev/acpica/compiler/asloperands.c
  head/sys/contrib/dev/acpica/compiler/aslopt.c
  head/sys/contrib/dev/acpica/compiler/asloptions.c
  head/sys/contrib/dev/acpica/compiler/aslparser.y
  head/sys/contrib/dev/acpica/compiler/aslpld.c
  head/sys/contrib/dev/acpica/compiler/aslpredef.c
  head/sys/contrib/dev/acpica/compiler/aslprepkg.c
  head/sys/contrib/dev/acpica/compiler/aslprimaries.y
  head/sys/contrib/dev/acpica/compiler/aslprintf.c
  head/sys/contrib/dev/acpica/compiler/aslprune.c
  head/sys/contrib/dev/acpica/compiler/aslresource.c
  head/sys/contrib/dev/acpica/compiler/aslresources.y
  head/sys/contrib/dev/acpica/compiler/aslrestype1.c
  head/sys/contrib/dev/acpica/compiler/aslrestype1i.c
  head/sys/contrib/dev/acpica/compiler/aslrestype2.c
  head/sys/contrib/dev/acpica/compiler/aslrestype2d.c
  head/sys/contrib/dev/acpica/compiler/aslrestype2e.c
  head/sys/contrib/dev/acpica/compiler/aslrestype2q.c
  head/sys/contrib/dev/acpica/compiler/aslrestype2s.c
  head/sys/contrib/dev/acpica/compiler/aslrestype2w.c
  head/sys/contrib/dev/acpica/compiler/aslrules.y
  head/sys/contrib/dev/acpica/compiler/aslstartup.c
  head/sys/contrib/dev/acpica/compiler/aslstubs.c
  head/sys/contrib/dev/acpica/compiler/aslsupport.l
  head/sys/contrib/dev/acpica/compiler/aslsupport.y
  head/sys/contrib/dev/acpica/compiler/asltokens.y
  head/sys/contrib/dev/acpica/compiler/asltransform.c
  head/sys/contrib/dev/acpica/compiler/asltree.c
  head/sys/contrib/dev/acpica/compiler/asltypes.h
  head/sys/contrib/dev/acpica/compiler/asltypes.y
  head/sys/contrib/dev/acpica/compiler/aslutils.c
  head/sys/contrib/dev/acpica/compiler/asluuid.c
  head/sys/contrib/dev/acpica/compiler/aslwalks.c
  head/sys/contrib/dev/acpica/compiler/aslxref.c
  head/sys/contrib/dev/acpica/compiler/aslxrefout.c
  head/sys/contrib/dev/acpica/compiler/dtcompile.c
  head/sys/contrib/dev/acpica/compiler/dtcompiler.h
  head/sys/contrib/dev/acpica/compiler/dtexpress.c
  head/sys/contrib/dev/acpica/compiler/dtfield.c
  head/sys/contrib/dev/acpica/compiler/dtio.c
  head/sys/contrib/dev/acpica/compiler/dtparser.l
  head/sys/contrib/dev/acpica/compiler

svn commit: r312437 - in head/sys/dev: mpr mps

[Scott Long]

Author: scottl
Date: Thu Jan 19 21:47:50 2017
New Revision: 312437
URL: https://svnweb.freebsd.org/changeset/base/312437

Log:
  Rework the debug print API. Event printing no longer gets special handling.
  All of the printing from the tables file now has wrappers so that the
  handling is cleaner and it's possible to print something out (say, during
  development) without having to fight the global debug flags. This re-org
  will also make it easier to have the tables be compiled out at build time
  if desired.
  
  Other than fixing some minor bugs, there are no user-visible changes from
  this change
  
  Sponsored by: Netflix, Inc.
  Differential Revision:D9238

Modified:
  head/sys/dev/mpr/mpr_sas.c
  head/sys/dev/mpr/mpr_table.c
  head/sys/dev/mpr/mpr_table.h
  head/sys/dev/mpr/mprvar.h
  head/sys/dev/mps/mps_sas.c
  head/sys/dev/mps/mps_table.c
  head/sys/dev/mps/mps_table.h
  head/sys/dev/mps/mpsvar.h

Modified: head/sys/dev/mpr/mpr_sas.c
==
--- head/sys/dev/mpr/mpr_sas.c  Thu Jan 19 20:44:29 2017(r312436)
+++ head/sys/dev/mpr/mpr_sas.c  Thu Jan 19 21:47:50 2017(r312437)
@@ -349,7 +349,7 @@ mprsas_log_command(struct mpr_command *c
sbuf_printf(, "SMID %u ", cm->cm_desc.Default.SMID);
sbuf_vprintf(, fmt, ap);
sbuf_finish();
-   mpr_dprint_field(cm->cm_sc, level, "%s", sbuf_data());
+   mpr_print_field(cm->cm_sc, "%s", sbuf_data());
 
va_end(ap);
 }

Modified: head/sys/dev/mpr/mpr_table.c
==
--- head/sys/dev/mpr/mpr_table.cThu Jan 19 20:44:29 2017
(r312436)
+++ head/sys/dev/mpr/mpr_table.cThu Jan 19 21:47:50 2017
(r312437)
@@ -197,27 +197,26 @@ mpr_describe_devinfo(uint32_t devinfo, c
 }
 
 void
-mpr_print_iocfacts(struct mpr_softc *sc, MPI2_IOC_FACTS_REPLY *facts)
+_mpr_print_iocfacts(struct mpr_softc *sc, MPI2_IOC_FACTS_REPLY *facts)
 {
-
MPR_PRINTFIELD_START(sc, "IOCFacts");
MPR_PRINTFIELD(sc, facts, MsgVersion, 0x%x);
MPR_PRINTFIELD(sc, facts, HeaderVersion, 0x%x);
MPR_PRINTFIELD(sc, facts, IOCNumber, %d);
MPR_PRINTFIELD(sc, facts, IOCExceptions, 0x%x);
MPR_PRINTFIELD(sc, facts, MaxChainDepth, %d);
-   mpr_dprint_field(sc, MPR_XINFO, "WhoInit: %s\n",
+   mpr_print_field(sc, "WhoInit: %s\n",
mpr_describe_table(mpr_whoinit_names, facts->WhoInit));
MPR_PRINTFIELD(sc, facts, NumberOfPorts, %d);
MPR_PRINTFIELD(sc, facts, MaxMSIxVectors, %d);
MPR_PRINTFIELD(sc, facts, RequestCredit, %d);
MPR_PRINTFIELD(sc, facts, ProductID, 0x%x);
-   mpr_dprint_field(sc, MPR_XINFO, "IOCCapabilities: %b\n",
+   mpr_print_field(sc, "IOCCapabilities: %b\n",
facts->IOCCapabilities, "\20" "\3ScsiTaskFull" "\4DiagTrace"
"\5SnapBuf" "\6ExtBuf" "\7EEDP" "\10BiDirTarg" "\11Multicast"
"\14TransRetry" "\15IR" "\16EventReplay" "\17RaidAccel"
"\20MSIXIndex" "\21HostDisc");
-   mpr_dprint_field(sc, MPR_XINFO, "FWVersion= %d-%d-%d-%d\n",
+   mpr_print_field(sc, "FWVersion= %d-%d-%d-%d\n",
facts->FWVersion.Struct.Major,
facts->FWVersion.Struct.Minor,
facts->FWVersion.Struct.Unit,
@@ -227,7 +226,7 @@ mpr_print_iocfacts(struct mpr_softc *sc,
MPR_PRINTFIELD(sc, facts, MaxTargets, %d);
MPR_PRINTFIELD(sc, facts, MaxSasExpanders, %d);
MPR_PRINTFIELD(sc, facts, MaxEnclosures, %d);
-   mpr_dprint_field(sc, MPR_XINFO, "ProtocolFlags: %b\n",
+   mpr_print_field(sc, "ProtocolFlags: %b\n",
facts->ProtocolFlags, "\20" "\1ScsiTarg" "\2ScsiInit");
MPR_PRINTFIELD(sc, facts, HighPriorityCredit, %d);
MPR_PRINTFIELD(sc, facts, MaxReplyDescriptorPostQueueDepth, %d);
@@ -238,7 +237,7 @@ mpr_print_iocfacts(struct mpr_softc *sc,
 }
 
 void
-mpr_print_portfacts(struct mpr_softc *sc, MPI2_PORT_FACTS_REPLY *facts)
+_mpr_print_portfacts(struct mpr_softc *sc, MPI2_PORT_FACTS_REPLY *facts)
 {
 
MPR_PRINTFIELD_START(sc, "PortFacts");
@@ -248,24 +247,24 @@ mpr_print_portfacts(struct mpr_softc *sc
 }
 
 void
-mpr_print_event(struct mpr_softc *sc, MPI2_EVENT_NOTIFICATION_REPLY *event)
+_mpr_print_event(struct mpr_softc *sc, MPI2_EVENT_NOTIFICATION_REPLY *event)
 {
 
-   MPR_EVENTFIELD_START(sc, "EventReply");
-   MPR_EVENTFIELD(sc, event, EventDataLength, %d);
-   MPR_EVENTFIELD(sc, event, AckRequired, %d);
-   mpr_dprint_field(sc, MPR_EVENT, "Event: %s (0x%x)\n",
+   MPR_PRINTFIELD_START(sc, "EventReply");
+   MPR_PRINTFIELD(sc, event, EventDataLength, %d);
+   MPR_PRINTFIELD(sc, event, AckRequired, %d);
+   mpr_print_field(sc, "Event: %s (0x%x)\n",
mpr_describe_table(mpr_event_names, event->Event), event->Event);
-   MPR_EVENTFIELD(sc, event, EventContext, 0x%x);
+   MPR_PRINTFIELD(sc, event, EventContext,