Re: svn commit: r366578 - head/sbin/devd
On 09/10/20 15:16, Renato Botelho wrote:
On 09/10/20 13:57, Warner Losh wrote:
On Fri, Oct 9, 2020 at 10:19 AM Renato Botelho <mailto:ga...@freebsd.org>> wrote:
On 09/10/20 12:29, Warner Losh wrote:
> Author: imp
> Date: Fri Oct 9 15:29:05 2020
> New Revision: 366578
> URL: https://svnweb.freebsd.org/changeset/base/366578
<https://svnweb.freebsd.org/changeset/base/366578>
>
> Log:
> Avoid using single quotes in arguments to logger.
>
> Single quotes interfere with the workaround put in with
r335753 and
> aren't necessary in this case. I believe that all the
underling issues
> with r335753 have been corrected, but need to do more extensive
> followup before reverting it as a bad idea.
Hi Warner,
How to proceed if it's needed to pass multiple parameters to a
command
in following format?
cmd param1 'param2 has spaces and a $variable'
action "cmd param1 'param2 has spaces and a '$variable";
should do the trick. I'm documenting this now...
It worked!! Thanks!
Oooops, too fast.
I wrote this script:
#!/bin/sh
echo "Param1 = '${1}'" >> /root/log
echo "Param2 = '${2}'" >> /root/log
And added this action on devd config:
notify 0 {
match "system" "IFNET";
match "type""LINK_UP";
media-type "ethernet";
action "/root/log.sh -c 'interface linkup start '$subsystem";
};
notify 0 {
match "system" "IFNET";
match "type""LINK_DOWN";
media-type "ethernet";
action "/root/log.sh -c 'interface linkup stop '$subsystem";
};
And got the following output on /root/log:
Param1 = '-c'
Param2 = 'interface linkup start $em0'
___
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: r366578 - head/sbin/devd
On 09/10/20 13:57, Warner Losh wrote: On Fri, Oct 9, 2020 at 10:19 AM Renato Botelho <mailto:ga...@freebsd.org>> wrote: On 09/10/20 12:29, Warner Losh wrote: > Author: imp > Date: Fri Oct 9 15:29:05 2020 > New Revision: 366578 > URL: https://svnweb.freebsd.org/changeset/base/366578 <https://svnweb.freebsd.org/changeset/base/366578> > > Log: > Avoid using single quotes in arguments to logger. > > Single quotes interfere with the workaround put in with r335753 and > aren't necessary in this case. I believe that all the underling issues > with r335753 have been corrected, but need to do more extensive > followup before reverting it as a bad idea. Hi Warner, How to proceed if it's needed to pass multiple parameters to a command in following format? cmd param1 'param2 has spaces and a $variable' action "cmd param1 'param2 has spaces and a '$variable"; should do the trick. I'm documenting this now... It worked!! Thanks! ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r366578 - head/sbin/devd
On 09/10/20 12:29, Warner Losh wrote: Author: imp Date: Fri Oct 9 15:29:05 2020 New Revision: 366578 URL: https://svnweb.freebsd.org/changeset/base/366578 Log: Avoid using single quotes in arguments to logger. Single quotes interfere with the workaround put in with r335753 and aren't necessary in this case. I believe that all the underling issues with r335753 have been corrected, but need to do more extensive followup before reverting it as a bad idea. Hi Warner, How to proceed if it's needed to pass multiple parameters to a command in following format? cmd param1 'param2 has spaces and a $variable' -- Renato Botelho ___ 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: r357683 - head/lib/libc/string
On 08/02/20 18:17, Eitan Adler wrote: Author: eadler Date: Sat Feb 8 21:17:48 2020 New Revision: 357683 URL: https://svnweb.freebsd.org/changeset/base/357683 Log: memset.3: better fix previous typo Upon re-reading the whole sentence this is a better fix. MFC with: r357681 Modified: head/lib/libc/string/memset.3 Modified: head/lib/libc/string/memset.3 == --- head/lib/libc/string/memset.3 Sat Feb 8 21:02:20 2020 (r357682) +++ head/lib/libc/string/memset.3 Sat Feb 8 21:17:48 2020 (r357683) @@ -63,8 +63,9 @@ Undefined behaviour from .Fn memset , resulting from storage overflow, will occur if .Fa len -is greater than the length of buffer -.Fa dest . +is greater than the length of the +.Fa dest +buffer. The behaviour is also undefined if .Fa dest is an invalid pointer. .Dd should be bumped to current date -- Renato Botelho ___ 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: r354149 - head/sys/net
On 09/11/19 01:16, Gleb Smirnoff wrote: > Renato, > > can you please try out the attached patch? I upgraded to r354607 with the patch applied and the problem is now fixed. Thanks -- Renato Botelho ___ 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: r354149 - head/sys/net
On 08/11/19 13:27, Renato Botelho wrote: > On 29/10/19 14:36, Gleb Smirnoff wrote: >> Author: glebius >> Date: Tue Oct 29 17:36:06 2019 >> New Revision: 354149 >> URL: https://svnweb.freebsd.org/changeset/base/354149 >> >> Log: >> There is a long standing problem with multicast programming for NICs >> and IPv6. With IPv6 we may call if_addmulti() in context of processing >> of an incoming packet. Usually this is interrupt context. While most >> of the NIC drivers are able to reprogram multicast filters without >> sleeping, some of them can't. An example is e1000 family of drivers. >> With iflib conversion the problem was somewhat hidden. Iflib processes >> packets in private taskqueue, so going to sleep doesn't trigger an >> assertion. However, the sleep would block operation of the driver and >> following incoming packets would fill the ring and eventually would >> start being dropped. Enabling epoch for the full time of a packet >> processing again started to trigger assertions for e1000. >> >> Fix this problem once and for all using a general taskqueue to call >> if_ioctl() method in all cases when if_addmulti() is called in a >> non sleeping context. Note that nobody cares about returned value. >> >> Reviewed by: hselasky, kib >> Differential Revision: https://reviews.freebsd.org/D22154 > > Hi Gleb, > > I upgraded my laptop running 13-CURRENT from r354133 to r354437 and it > crashed during boot as you can see in the pictures [1]. It seems like > it crashed while it was configuring network. > > After bisect I managed to boot fine with r354148 and reproduce the crash > with this revision applied. > > Here is the relevant portion of my /etc/rc.conf: > > # Lagg > ifconfig_em0="up" > wlans_iwn0="wlan0" > ifconfig_wlan0="WPA" > create_args_wlan0="wlanaddr 3c:97:0e:48:3f:f8 up" > cloned_interfaces="lagg0" > ifconfig_lagg0="up laggproto failover laggport em0 laggport wlan0 DHCP" > ifconfig_lagg0_ipv6="inet6 accept_rtadv" > rtsold_enable="YES" > > [1] https://imgur.com/a/lBtq3FW I forgot to mention. If I disable IPv6 on lagg interface the crash is gone. -- Renato Botelho ___ 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: r354149 - head/sys/net
On 29/10/19 14:36, Gleb Smirnoff wrote: > Author: glebius > Date: Tue Oct 29 17:36:06 2019 > New Revision: 354149 > URL: https://svnweb.freebsd.org/changeset/base/354149 > > Log: > There is a long standing problem with multicast programming for NICs > and IPv6. With IPv6 we may call if_addmulti() in context of processing > of an incoming packet. Usually this is interrupt context. While most > of the NIC drivers are able to reprogram multicast filters without > sleeping, some of them can't. An example is e1000 family of drivers. > With iflib conversion the problem was somewhat hidden. Iflib processes > packets in private taskqueue, so going to sleep doesn't trigger an > assertion. However, the sleep would block operation of the driver and > following incoming packets would fill the ring and eventually would > start being dropped. Enabling epoch for the full time of a packet > processing again started to trigger assertions for e1000. > > Fix this problem once and for all using a general taskqueue to call > if_ioctl() method in all cases when if_addmulti() is called in a > non sleeping context. Note that nobody cares about returned value. > > Reviewed by:hselasky, kib > Differential Revision:https://reviews.freebsd.org/D22154 Hi Gleb, I upgraded my laptop running 13-CURRENT from r354133 to r354437 and it crashed during boot as you can see in the pictures [1]. It seems like it crashed while it was configuring network. After bisect I managed to boot fine with r354148 and reproduce the crash with this revision applied. Here is the relevant portion of my /etc/rc.conf: # Lagg ifconfig_em0="up" wlans_iwn0="wlan0" ifconfig_wlan0="WPA" create_args_wlan0="wlanaddr 3c:97:0e:48:3f:f8 up" cloned_interfaces="lagg0" ifconfig_lagg0="up laggproto failover laggport em0 laggport wlan0 DHCP" ifconfig_lagg0_ipv6="inet6 accept_rtadv" rtsold_enable="YES" [1] https://imgur.com/a/lBtq3FW -- Renato Botelho ___ 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: r338888 - head/sbin/devd
On 22/09/18 12:32, Warner Losh wrote: > Author: imp > Date: Sat Sep 22 15:32:53 2018 > New Revision: 33 > URL: https://svnweb.freebsd.org/changeset/base/33 > > Log: > We don't need shell protection for when we're expanding matches. > Don't add it. This should fix when we do regepx matches against > variables we've set and fix wifi bring up. > > PR: 231441 > Approved by: re@ (kib) > Differential Revision: https://reviews.freebsd.org/D17267 Warner, We are seeing unexpected $ on /var/log/messages when matches are replaced inside shell commands between single quotes. With action set as follow: action "logger -t kern.notice 'device-name=$device-name start'"; We see a log entry like this: Sep 26 13:56:06 x230 kern.notice[27604]: device-name=$rtwn0 start Reverting this change made it to log properly: Sep 26 13:56:06 x230 kern.notice[27604]: device-name=rtwn0 start There is an open bug already: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=240411 -- Renato Botelho ___ 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: r345625 - in head: contrib/elftoolchain/readelf lib/libc lib/libthr libexec/rtld-elf sys/sys
On 3/28/19 4:25 AM, Oliver Pinter wrote:
> On Thursday, March 28, 2019, Ed Maste wrote:
>
>> Author: emaste
>> Date: Thu Mar 28 02:12:32 2019
>> New Revision: 345625
>> URL: https://svnweb.freebsd.org/changeset/base/345625
>>
>> Log:
>> revert r341429 "disable BIND_NOW in libc, libthr, and rtld"
>>
>> r345620 by kib@ fixed the rtld issue that caused a crash at startup
>> during resolution of libc's ifuncs with BIND_NOW.
>>
>> PR: 23
>> Sponsored by: The FreeBSD Foundation
>>
>> Modified:
>> head/contrib/elftoolchain/readelf/readelf.c
>> head/lib/libc/Makefile
>> head/lib/libthr/Makefile
>> head/libexec/rtld-elf/Makefile
>> head/sys/sys/elf_common.h
>>
>> Modified: head/contrib/elftoolchain/readelf/readelf.c
>>
>> ==
>> --- head/contrib/elftoolchain/readelf/readelf.c Thu Mar 28 01:12:44 2019
>> (r345624)
>> +++ head/contrib/elftoolchain/readelf/readelf.c Thu Mar 28 02:12:32 2019
>> (r345625)
>> @@ -3490,6 +3490,7 @@ dump_notes(struct readelf *re)
>>
>> static struct flag_desc note_feature_ctl_flags[] = {
>> { NT_FREEBSD_FCTL_ASLR_DISABLE, "ASLR_DISABLE" },
>> + { NT_FREEBSD_FCTL_IMPLIED_MAX_PROT, "IMPLIED_MAX_PROT" },
>> { 0, NULL }
>> };
>>
>>
> Seems like this and the other hunk belongs to a different patch.
Indeed. It broke the build for me
--
Renato Botelho
___
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: r345625 - in head: contrib/elftoolchain/readelf lib/libc lib/libthr libexec/rtld-elf sys/sys
On 28/03/19 14:31, Peter Jeremy wrote: > On 2019-Mar-28 09:41:49 -0300, Renato Botelho wrote: >> On 3/28/19 4:25 AM, Oliver Pinter wrote: >>> On Thursday, March 28, 2019, Ed Maste wrote: >>> >>>> Author: emaste >>>> Date: Thu Mar 28 02:12:32 2019 >>>> New Revision: 345625 >>>> URL: https://svnweb.freebsd.org/changeset/base/345625 >>>> >>> Seems like this and the other hunk belongs to a different patch. >> Indeed. It broke the build for me > > No, r345638 broke the build by only reverting one of the two extraneous hunks > from this commit. > Yes, you are right. And now it's fixed. -- Renato Botelho signature.asc Description: OpenPGP digital signature
Re: svn commit: r349976 - head
On 13/07/19 13:48, Ian Lepore wrote: > Author: ian > Date: Sat Jul 13 16:48:27 2019 > New Revision: 349976 > URL: https://svnweb.freebsd.org/changeset/base/349976 > > Log: > Add an entry mentioning the permission/mode change to daily accounting > files. > > Modified: > head/UPDATING > > Modified: head/UPDATING > == > --- head/UPDATING Sat Jul 13 16:32:19 2019(r349975) > +++ head/UPDATING Sat Jul 13 16:48:27 2019(r349976) > @@ -31,6 +31,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: > disable the most expensive debugging functionality run > "ln -s 'abort:false,junk:false' /etc/malloc.conf".) > > +20190713: > +Default permissions on the /var/account/acct file (and copies of it > rotated > +by periodic daily scripts) are changed from 0644 to 0640 because the > file > +contains sensitive information that should not be world-readable. If > the > +/var/account directory must be created by rc.d/accounting, the mode used > is > +now 0750. Admins who use the accounting feature are encouraged to > change > +the mode of an existing /var/account directory to 0750 or 0700. Block is indented with 4 spaces instead of tabs -- Renato Botelho signature.asc Description: OpenPGP digital signature
Re: svn commit: r347961 - head
On 18/05/19 16:36, Brad Davis wrote: > Author: brd > Date: Sat May 18 19:36:23 2019 > New Revision: 347961 > URL: https://svnweb.freebsd.org/changeset/base/347961 > > Log: > Add note to UPDATING for users of mergemaster after the move of > master.passwd > and group in r347638. > > Approved by:allanjude (mentor) > > Modified: > head/UPDATING > > Modified: head/UPDATING > == > --- head/UPDATING Sat May 18 19:32:38 2019(r347960) > +++ head/UPDATING Sat May 18 19:36:23 2019(r347961) > @@ -31,6 +31,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: > disable the most expensive debugging functionality run > "ln -s 'abort:false,junk:false' /etc/malloc.conf".) > > +20190517: > + For users of mergemaster, after recent changes to locations of > + master.passwd and group in the source tree mergemaster needs to be > + updated. Before running `mergemaster -p', cd to usr.sbin/mergemaster > + and run `make install'. > + etcupdate is installing group and master.passwd to /lib/libc/gen. It seems wrong. root@x230:/usr/src # etcupdate -p A /lib/libc/gen/group A /lib/libc/gen/master.passwd -- Renato Botelho signature.asc Description: OpenPGP digital signature
Re: svn commit: r347218 - head/sys/compat/linsysfs
On 07/05/19 02:45, Dmitry Chagin wrote: > вт, 7 мая 2019 г. в 08:32, Rodney W. Grimes : > >>> Author: dchagin >>> Date: Tue May 7 05:08:13 2019 >>> New Revision: 347218 >>> URL: https://svnweb.freebsd.org/changeset/base/347218 >>> >>> Log: >>> Remove wrong copyright line. Discussed with Carlos Neira. >>> >>> Reported by:Rodney W. Grimes >> normally just use a committers username, aka rgrimes or rgrimes@ >> for these types of things. >> >> > ah, I see only: Rodney W. Grimes > > > >>> MFC after: 2 weeks >>> Differential Revision: https://reviews.freebsd.org/D13656 >> >> Hang on, now you removed his copyright? >> I see he said that was ok, but that was not the desired intent here. >> It would of been fine to have the copyright read: >> >> * Copyright (c) 2006 IronPort Systems >> * All rights reserved. >> * Copyright (c) 2017 Carlos Neira cneirabus...@gmail.com >> >> As a heads up to other committers you should never insert your >> copyright between another copyright and the "All rights reserved." text, >> if you wish to assert the all rights reserved you should duplicate >> it like: >> >> * Copyright (c) 2006 IronPort Systems >> * All rights reserved. >> * Copyright (c) 2017 Carlos Neira cneirabus...@gmail.com >> * All rights reserved. >> >> preferably on the line with your copyright as in: >> * Copyright (c) 2017 Carlos Neira cneirabus...@gmail.com All rights >> reserved. >> >> But if at all possible it would be best if we could not add any >> more of these, and remove them when possible. >> >> > and that actually I did. thanks Rod was saying to remove "All rights reserved" when possible, not the Copyright line. -- Renato Botelho ___ 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: r345625 - in head: contrib/elftoolchain/readelf lib/libc lib/libthr libexec/rtld-elf sys/sys
On 28/03/19 14:31, Peter Jeremy wrote: > On 2019-Mar-28 09:41:49 -0300, Renato Botelho wrote: >> On 3/28/19 4:25 AM, Oliver Pinter wrote: >>> On Thursday, March 28, 2019, Ed Maste wrote: >>> >>>> Author: emaste >>>> Date: Thu Mar 28 02:12:32 2019 >>>> New Revision: 345625 >>>> URL: https://svnweb.freebsd.org/changeset/base/345625 >>>> >>> Seems like this and the other hunk belongs to a different patch. >> Indeed. It broke the build for me > > No, r345638 broke the build by only reverting one of the two extraneous hunks > from this commit. > Yes, you are right. And now it's fixed. -- Renato Botelho signature.asc Description: OpenPGP digital signature
Re: svn commit: r345625 - in head: contrib/elftoolchain/readelf lib/libc lib/libthr libexec/rtld-elf sys/sys
On 3/28/19 4:25 AM, Oliver Pinter wrote:
> On Thursday, March 28, 2019, Ed Maste wrote:
>
>> Author: emaste
>> Date: Thu Mar 28 02:12:32 2019
>> New Revision: 345625
>> URL: https://svnweb.freebsd.org/changeset/base/345625
>>
>> Log:
>> revert r341429 "disable BIND_NOW in libc, libthr, and rtld"
>>
>> r345620 by kib@ fixed the rtld issue that caused a crash at startup
>> during resolution of libc's ifuncs with BIND_NOW.
>>
>> PR: 23
>> Sponsored by: The FreeBSD Foundation
>>
>> Modified:
>> head/contrib/elftoolchain/readelf/readelf.c
>> head/lib/libc/Makefile
>> head/lib/libthr/Makefile
>> head/libexec/rtld-elf/Makefile
>> head/sys/sys/elf_common.h
>>
>> Modified: head/contrib/elftoolchain/readelf/readelf.c
>>
>> ==
>> --- head/contrib/elftoolchain/readelf/readelf.c Thu Mar 28 01:12:44 2019
>> (r345624)
>> +++ head/contrib/elftoolchain/readelf/readelf.c Thu Mar 28 02:12:32 2019
>> (r345625)
>> @@ -3490,6 +3490,7 @@ dump_notes(struct readelf *re)
>>
>> static struct flag_desc note_feature_ctl_flags[] = {
>> { NT_FREEBSD_FCTL_ASLR_DISABLE, "ASLR_DISABLE" },
>> + { NT_FREEBSD_FCTL_IMPLIED_MAX_PROT, "IMPLIED_MAX_PROT" },
>> { 0, NULL }
>> };
>>
>>
> Seems like this and the other hunk belongs to a different patch.
Indeed. It broke the build for me
--
Renato Botelho
___
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: r341464 - head/sbin/savecore
On 04/12/18 17:59, Ed Maste wrote: > On Tue, 4 Dec 2018 at 07:34, Renato Botelho wrote: >> >> Author: garga (ports committer) >> Date: Tue Dec 4 12:34:22 2018 >> New Revision: 341464 >> URL: https://svnweb.freebsd.org/changeset/base/341464 >> >> Log: >> Restore /var/crash permissions to 0750, as declared in mtree file. After >> r337337 it changed to 0755. >> >> Reviewed by: loos >> Approved by: loos >> MFC after:3 days >> Sponsored by: Rubicon Communications, LLC (Netgate) >> Differential Revision:https://reviews.freebsd.org/D18355 > > Please insta-MFC this to stable/12 (while folks sort out the 12.0 question). Done in r341493 -- Renato Botelho ___ 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: r341493 - stable/12/sbin/savecore
Author: garga (ports committer) Date: Tue Dec 4 20:40:28 2018 New Revision: 341493 URL: https://svnweb.freebsd.org/changeset/base/341493 Log: MFC r341464: Restore /var/crash permissions to 0750, as declared in mtree file. After r337337 it changed to 0755. Reviewed by: loos Approved by: loos Sponsored by: Rubicon Communications, LLC (Netgate) Differential Revision:https://reviews.freebsd.org/D18355 Modified: stable/12/sbin/savecore/Makefile Directory Properties: stable/12/ (props changed) Modified: stable/12/sbin/savecore/Makefile == --- stable/12/sbin/savecore/MakefileTue Dec 4 19:55:39 2018 (r341492) +++ stable/12/sbin/savecore/MakefileTue Dec 4 20:40:28 2018 (r341493) @@ -2,7 +2,9 @@ PACKAGE=runtime CONFS= minfree -CONFSDIR= /var/crash +VAR_CRASH= /var/crash +VAR_CRASH_MODE=0750 +CONFSDIR= VAR_CRASH PROG= savecore LIBADD=z xo MAN= savecore.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"
Re: svn commit: r341464 - head/sbin/savecore
On 04/12/18 17:59, Ed Maste wrote: > On Tue, 4 Dec 2018 at 07:34, Renato Botelho wrote: >> >> Author: garga (ports committer) >> Date: Tue Dec 4 12:34:22 2018 >> New Revision: 341464 >> URL: https://svnweb.freebsd.org/changeset/base/341464 >> >> Log: >> Restore /var/crash permissions to 0750, as declared in mtree file. After >> r337337 it changed to 0755. >> >> Reviewed by: loos >> Approved by: loos >> MFC after:3 days >> Sponsored by: Rubicon Communications, LLC (Netgate) >> Differential Revision:https://reviews.freebsd.org/D18355 > > Please insta-MFC this to stable/12 (while folks sort out the 12.0 question). Sure. I'll just do it. -- Renato Botelho ___ 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: r341464 - head/sbin/savecore
Author: garga (ports committer) Date: Tue Dec 4 12:34:22 2018 New Revision: 341464 URL: https://svnweb.freebsd.org/changeset/base/341464 Log: Restore /var/crash permissions to 0750, as declared in mtree file. After r337337 it changed to 0755. Reviewed by: loos Approved by: loos MFC after:3 days Sponsored by: Rubicon Communications, LLC (Netgate) Differential Revision:https://reviews.freebsd.org/D18355 Modified: head/sbin/savecore/Makefile Modified: head/sbin/savecore/Makefile == --- head/sbin/savecore/Makefile Tue Dec 4 10:30:31 2018(r341463) +++ head/sbin/savecore/Makefile Tue Dec 4 12:34:22 2018(r341464) @@ -2,7 +2,9 @@ PACKAGE=runtime CONFS= minfree -CONFSDIR= /var/crash +VAR_CRASH= /var/crash +VAR_CRASH_MODE=0750 +CONFSDIR= VAR_CRASH PROG= savecore LIBADD=z xo MAN= savecore.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"
Re: svn commit: r341011 - head/lib/libfetch
On 27/11/18 08:06, Dag-Erling Smørgrav wrote: > Author: des > Date: Tue Nov 27 10:06:41 2018 > New Revision: 341011 > URL: https://svnweb.freebsd.org/changeset/base/341011 > > Log: > Support proxying FTP over HTTPS, not just HTTP. > > There is probably a PR for this, but I can't find this, or remember who > submitted it. The patch got lost in the noise of another that wasn't > ready to commit. Are you talking about this one? https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=220468 -- Renato Botelho ___ 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: r340698 - releng/12.0/usr.sbin/ntp/ntpd
Author: garga (ports committer)
Date: Tue Nov 20 20:31:23 2018
New Revision: 340698
URL: https://svnweb.freebsd.org/changeset/base/340698
Log:
MFC r340439,r340440
Fix /etc/ntp permissions. According to mtree it must be 0700
Approved by: re (gjb)
Sponsored by: Rubicon Communications, LLC (Netgate)
Modified:
releng/12.0/usr.sbin/ntp/ntpd/Makefile
Directory Properties:
releng/12.0/ (props changed)
Modified: releng/12.0/usr.sbin/ntp/ntpd/Makefile
==
--- releng/12.0/usr.sbin/ntp/ntpd/Makefile Tue Nov 20 20:16:03 2018
(r340697)
+++ releng/12.0/usr.sbin/ntp/ntpd/Makefile Tue Nov 20 20:31:23 2018
(r340698)
@@ -7,9 +7,12 @@ MAN=
.PATH: ${SRCTOP}/contrib/ntp/ntpd \
${.OBJDIR}
+DIRS= ETC_NTP
+ETC_NTP= /etc/ntp
+ETC_NTP_MODE= 0700
CONFS= ntp.conf
FILES= leap-seconds
-FILESDIR= /etc/ntp
+FILESDIR= ETC_NTP
FILESMODE= 644
PROG= ntpd
___
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: r340696 - stable/12/usr.sbin/ntp/ntpd
Author: garga (ports committer)
Date: Tue Nov 20 20:08:51 2018
New Revision: 340696
URL: https://svnweb.freebsd.org/changeset/base/340696
Log:
MFC r340439,r340440
Fix /etc/ntp permissions. According to mtree it must be 0700
Approved by: imp
Sponsored by: Rubicon Communications, LLC (Netgate)
Modified:
stable/12/usr.sbin/ntp/ntpd/Makefile
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/usr.sbin/ntp/ntpd/Makefile
==
--- stable/12/usr.sbin/ntp/ntpd/MakefileTue Nov 20 19:37:09 2018
(r340695)
+++ stable/12/usr.sbin/ntp/ntpd/MakefileTue Nov 20 20:08:51 2018
(r340696)
@@ -7,9 +7,12 @@ MAN=
.PATH: ${SRCTOP}/contrib/ntp/ntpd \
${.OBJDIR}
+DIRS= ETC_NTP
+ETC_NTP= /etc/ntp
+ETC_NTP_MODE= 0700
CONFS= ntp.conf
FILES= leap-seconds
-FILESDIR= /etc/ntp
+FILESDIR= ETC_NTP
FILESMODE= 644
PROG= ntpd
___
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: r340439 - head/usr.sbin/ntp/ntpd
On 14/11/18 16:23, Eugene Grosbein wrote:
> 15.11.2018 1:12, Renato Botelho wrote:
>
>>>> Modified: head/usr.sbin/ntp/ntpd/Makefile
>>>> ==
>>>> --- head/usr.sbin/ntp/ntpd/MakefileWed Nov 14 16:18:13 2018
>>>> (r340438)
>>>> +++ head/usr.sbin/ntp/ntpd/MakefileWed Nov 14 16:19:15 2018
>>>> (r340439)
>>>> @@ -7,9 +7,12 @@ MAN=
>>>> .PATH:${SRCTOP}/contrib/ntp/ntpd \
>>>>${.OBJDIR}
>>>>
>>>> +DIRS= ETC_NTP
>>>> +ETC_NTP= /etc/ntp
>>>> +ETN_NTP_MODE= 0700
>>>
>>> s/ETN/ETC/?
>>
>> Yes, I need to commit a fix. Do I need to request a new approval from a
>> src committer?
>>
>> Index: ntpd/Makefile
>> ===
>> --- ntpd/Makefile(revision 340439)
>> +++ ntpd/Makefile(working copy)
>> @@ -9,7 +9,7 @@
>>
>> DIRS= ETC_NTP
>> ETC_NTP=/etc/ntp
>> -ETN_NTP_MODE= 0700
>> +ETC_NTP_MODE= 0700
>> CONFS= ntp.conf
>> FILES= leap-seconds
>> FILESDIR= ETC_NTP
>>
>
> Yes, you need. Approved.
Fixed in 340440. Thanks!
--
Renato Botelho
___
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: r340440 - head/usr.sbin/ntp/ntpd
Author: garga (ports committer) Date: Wed Nov 14 18:38:27 2018 New Revision: 340440 URL: https://svnweb.freebsd.org/changeset/base/340440 Log: Fix typo introduced in r340439 - s/ETN/ETC/ Reported by: jhb, yuripv Approved by: eugen MFC after:3 days X-MFC-With: 340439 Sponsored by: Rubicon Communications, LLC (Netgate) Modified: head/usr.sbin/ntp/ntpd/Makefile Modified: head/usr.sbin/ntp/ntpd/Makefile == --- head/usr.sbin/ntp/ntpd/Makefile Wed Nov 14 16:19:15 2018 (r340439) +++ head/usr.sbin/ntp/ntpd/Makefile Wed Nov 14 18:38:27 2018 (r340440) @@ -9,7 +9,7 @@ MAN= DIRS= ETC_NTP ETC_NTP= /etc/ntp -ETN_NTP_MODE= 0700 +ETC_NTP_MODE= 0700 CONFS= ntp.conf FILES= leap-seconds FILESDIR= ETC_NTP ___ 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: r340439 - head/usr.sbin/ntp/ntpd
On 14/11/18 14:33, John Baldwin wrote:
> On 11/14/18 8:19 AM, Renato Botelho wrote:
>> Author: garga (ports committer)
>> Date: Wed Nov 14 16:19:15 2018
>> New Revision: 340439
>> URL: https://svnweb.freebsd.org/changeset/base/340439
>>
>> Log:
>> Fix /etc/ntp permissions. According to mtree it must be 0700
>>
>> Reviewed by: imp
>> Approved by: imp
>> MFC after: 3 days
>> Sponsored by: Rubicon Communications, LLC (Netgate)
>> Differential Revision: https://reviews.freebsd.org/D17973
>>
>> Modified:
>> head/usr.sbin/ntp/ntpd/Makefile
>>
>> Modified: head/usr.sbin/ntp/ntpd/Makefile
>> ==
>> --- head/usr.sbin/ntp/ntpd/Makefile Wed Nov 14 16:18:13 2018
>> (r340438)
>> +++ head/usr.sbin/ntp/ntpd/Makefile Wed Nov 14 16:19:15 2018
>> (r340439)
>> @@ -7,9 +7,12 @@ MAN=
>> .PATH: ${SRCTOP}/contrib/ntp/ntpd \
>> ${.OBJDIR}
>>
>> +DIRS= ETC_NTP
>> +ETC_NTP=/etc/ntp
>> +ETN_NTP_MODE= 0700
>
> s/ETN/ETC/?
Yes, I need to commit a fix. Do I need to request a new approval from a
src committer?
Index: ntpd/Makefile
===
--- ntpd/Makefile (revision 340439)
+++ ntpd/Makefile (working copy)
@@ -9,7 +9,7 @@
DIRS= ETC_NTP
ETC_NTP= /etc/ntp
-ETN_NTP_MODE= 0700
+ETC_NTP_MODE= 0700
CONFS= ntp.conf
FILES= leap-seconds
FILESDIR= ETC_NTP
--
Renato Botelho
___
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: r340439 - head/usr.sbin/ntp/ntpd
Author: garga (ports committer)
Date: Wed Nov 14 16:19:15 2018
New Revision: 340439
URL: https://svnweb.freebsd.org/changeset/base/340439
Log:
Fix /etc/ntp permissions. According to mtree it must be 0700
Reviewed by: imp
Approved by: imp
MFC after:3 days
Sponsored by: Rubicon Communications, LLC (Netgate)
Differential Revision:https://reviews.freebsd.org/D17973
Modified:
head/usr.sbin/ntp/ntpd/Makefile
Modified: head/usr.sbin/ntp/ntpd/Makefile
==
--- head/usr.sbin/ntp/ntpd/Makefile Wed Nov 14 16:18:13 2018
(r340438)
+++ head/usr.sbin/ntp/ntpd/Makefile Wed Nov 14 16:19:15 2018
(r340439)
@@ -7,9 +7,12 @@ MAN=
.PATH: ${SRCTOP}/contrib/ntp/ntpd \
${.OBJDIR}
+DIRS= ETC_NTP
+ETC_NTP= /etc/ntp
+ETN_NTP_MODE= 0700
CONFS= ntp.conf
FILES= leap-seconds
-FILESDIR= /etc/ntp
+FILESDIR= ETC_NTP
FILESMODE= 644
PROG= ntpd
___
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: r338243 - head/usr.sbin/ndp
Author: garga (ports committer)
Date: Thu Aug 23 10:38:59 2018
New Revision: 338243
URL: https://svnweb.freebsd.org/changeset/base/338243
Log:
usr.sbin/ndp: Cleanup in preparation to add libxo support
* Constify rtpref_str declaration
* Remove unused h_errno declaration
* Use time_t type for expire
* Use strlcpy to set static "?" value to ifname
* Rename local variable 's' to stop shadowing global definition
* Close socket used in pfx_flush()
* Use local variables for sock() in setdefif() and getdefif()
* Increase WARNS to 3
Reviewed by: allanjude, kevans
Approved by: allanjude
Sponsored by: Rubicon Communications, LLC (Netgate)
Differential Revision:https://reviews.freebsd.org/D8
Modified:
head/usr.sbin/ndp/Makefile
head/usr.sbin/ndp/ndp.c
Modified: head/usr.sbin/ndp/Makefile
==
--- head/usr.sbin/ndp/Makefile Thu Aug 23 07:34:51 2018(r338242)
+++ head/usr.sbin/ndp/Makefile Thu Aug 23 10:38:59 2018(r338243)
@@ -22,6 +22,6 @@ SRCS= ndp.c gmt2local.c
CFLAGS+= -I. -I${.CURDIR} -I${SRCTOP}/contrib/tcpdump
CFLAGS+= -D_U_=""
-WARNS?=1
+WARNS?=3
.include
Modified: head/usr.sbin/ndp/ndp.c
==
--- head/usr.sbin/ndp/ndp.c Thu Aug 23 07:34:51 2018(r338242)
+++ head/usr.sbin/ndp/ndp.c Thu Aug 23 10:38:59 2018(r338243)
@@ -151,7 +151,7 @@ static void setdefif(char *);
static char *sec2str(time_t);
static void ts_print(const struct timeval *);
-static char *rtpref_str[] = {
+static const char *rtpref_str[] = {
"medium", /* 00 */
"high", /* 01 */
"rsv", /* 10 */
@@ -565,9 +565,8 @@ dump(struct sockaddr_in6 *addr, int cflag)
struct rt_msghdr *rtm;
struct sockaddr_in6 *sin;
struct sockaddr_dl *sdl;
- extern int h_errno;
struct timeval now;
- u_long expire;
+ time_t expire;
int addrwidth;
int llwidth;
int ifwidth;
@@ -670,8 +669,10 @@ again:;
if (W_ADDR + W_LL - addrwidth > llwidth)
llwidth = W_ADDR + W_LL - addrwidth;
ifname = if_indextoname(sdl->sdl_index, ifix_buf);
- if (!ifname)
- ifname = "?";
+ if (ifname == NULL) {
+ strlcpy(ifix_buf, "?", sizeof(ifix_buf));
+ ifname = ifix_buf;
+ }
ifwidth = strlen(ifname);
if (W_ADDR + W_LL + W_IF - addrwidth - llwidth > ifwidth)
ifwidth = W_ADDR + W_LL + W_IF - addrwidth - llwidth;
@@ -764,22 +765,22 @@ static struct in6_nbrinfo *
getnbrinfo(struct in6_addr *addr, int ifindex, int warning)
{
static struct in6_nbrinfo nbi;
- int s;
+ int sock;
- if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0)
+ if ((sock = socket(AF_INET6, SOCK_DGRAM, 0)) < 0)
err(1, "socket");
bzero(&nbi, sizeof(nbi));
if_indextoname(ifindex, nbi.ifname);
nbi.addr = *addr;
- if (ioctl(s, SIOCGNBRINFO_IN6, (caddr_t)&nbi) < 0) {
+ if (ioctl(sock, SIOCGNBRINFO_IN6, (caddr_t)&nbi) < 0) {
if (warning)
warn("ioctl(SIOCGNBRINFO_IN6)");
- close(s);
+ close(sock);
return(NULL);
}
- close(s);
+ close(sock);
return(&nbi);
}
@@ -902,19 +903,19 @@ static void
ifinfo(char *ifname, int argc, char **argv)
{
struct in6_ndireq nd;
- int i, s;
+ int i, sock;
u_int32_t newflags;
#ifdef IPV6CTL_USETEMPADDR
u_int8_t nullbuf[8];
#endif
- if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
+ if ((sock = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
err(1, "socket");
/* NOTREACHED */
}
bzero(&nd, sizeof(nd));
strlcpy(nd.ifname, ifname, sizeof(nd.ifname));
- if (ioctl(s, SIOCGIFINFO_IN6, (caddr_t)&nd) < 0) {
+ if (ioctl(sock, SIOCGIFINFO_IN6, (caddr_t)&nd) < 0) {
err(1, "ioctl(SIOCGIFINFO_IN6)");
/* NOTREACHED */
}
@@ -973,7 +974,7 @@ ifinfo(char *ifname, int argc, char **argv)
SETVALUE("curhlim", ND.chlim);
ND.flags = newflags;
- if (ioctl(s, SIOCSIFINFO_IN6, (caddr_t)&nd) < 0) {
+ if (ioctl(sock, SIOCSIFINFO_IN6, (caddr_t)&nd) < 0) {
err(1, "ioctl(SIOCSIFINFO_IN6)");
/* NOTREACHED */
}
@@ -986,7 +987,7 @@ ifinfo(char *ifname, int argc, char **argv)
/* NOTREACHED */
}
- if (ioctl(s, SIOCGIFINFO_IN6, (caddr_t)&nd) < 0) {
+ if (ioctl(sock, SIOCGIFINFO_IN6, (caddr_t)&nd) < 0) {
err(1,
Re: svn commit: r337814 - head/tests/sys/kqueue/libkqueue
On 14/08/18 16:31, David Bright wrote:
> Author: dab
> Date: Tue Aug 14 19:31:06 2018
> New Revision: 337814
> URL: https://svnweb.freebsd.org/changeset/base/337814
>
> Log:
> Fix several (more) memory leaks.
>
> A follow-up to r337812 to catch a couple more memory leaks that should
> have been included in that change.
>
> Reported by:Coverity
> CID:1296064, 1296067 (for real this time)
> MFC after: 3 days
> X-MFC-with: r337812
> Sponsored by: Dell EMC
>
> Modified:
> head/tests/sys/kqueue/libkqueue/main.c
>
> Modified: head/tests/sys/kqueue/libkqueue/main.c
> ==
> --- head/tests/sys/kqueue/libkqueue/main.cTue Aug 14 19:21:31 2018
> (r337813)
> +++ head/tests/sys/kqueue/libkqueue/main.cTue Aug 14 19:31:06 2018
> (r337814)
> @@ -235,10 +235,14 @@ kevent_add(int kqfd, struct kevent *kev,
> intptr_t data,
> void *udata)
> {
> +char *kev_str;
> +
> EV_SET(kev, ident, filter, flags, fflags, data, NULL);
> if (kevent(kqfd, kev, 1, NULL, 0, NULL) < 0) {
> -printf("Unable to add the following kevent:\n%s\n",
> -kevent_to_str(kev));
> +kev_str = kevent_to_str(kev);
It seems that this line is indented with spaces instead of TABs
> + printf("Unable to add the following kevent:\n%s\n",
> +kev_str);
> + free(kev_str);
> err(1, "kevent(): %s", strerror(errno));
> }
> }
> @@ -246,6 +250,9 @@ kevent_add(int kqfd, struct kevent *kev,
> void
> kevent_cmp(struct kevent *k1, struct kevent *k2)
> {
> +char *kev1_str;
> +char *kev2_str;
> +
> /* XXX-
> Workaround for inconsistent implementation of kevent(2)
> */
> @@ -258,8 +265,12 @@ kevent_cmp(struct kevent *k1, struct kevent *k2)
>k1->data != k2->data || k1->udata != k2->udata ||
>k1->ext[0] != k2->ext[0] || k1->ext[1] != k2->ext[1] ||
>k1->ext[0] != k2->ext[2] || k1->ext[0] != k2->ext[3]) {
> +kev1_str = kevent_to_str(k1);
Same here
> + kev2_str = kevent_to_str(k2);
> printf("kevent_cmp: mismatch:\n %s !=\n %s\n",
> - kevent_to_str(k1), kevent_to_str(k2));
> +kev1_str, kev2_str);
> + free(kev1_str);
> + free(kev2_str);
> abort();
> }
> }
> ___
> svn-src-h...@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
>
--
Renato Botelho
___
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: r337497 - in head: . contrib/mdocml contrib/tnftp/src etc/root share/skel tools/tools/nanobsd/pcengines/Files/root tools/tools/nanobsd/rescue/Files/root usr.bin/mail usr.bin/man usr.bi
On 08/08/18 16:24, Alan Somers wrote: > Author: asomers > Date: Wed Aug 8 19:24:20 2018 > New Revision: 337497 > URL: https://svnweb.freebsd.org/changeset/base/337497 > > Log: > Switch the default pager for most commands to less > > Finally, a pager for the nineties. > > MFC after: Never > Relnotes: Yes > Differential Revision: https://reviews.freebsd.org/D13465 > Poll: https://reviews.freebsd.org/V7 Thank you! -- Renato Botelho ___ 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: r336169 - head/share/mk
Author: garga (ports committer)
Date: Tue Jul 10 11:33:37 2018
New Revision: 336169
URL: https://svnweb.freebsd.org/changeset/base/336169
Log:
A direct call to echo was intruduced in r333407, which made messages
to be displayed when make is called with -s. Replace it by ${ECHO}.
Reviewed by: brd, bdrewery
Approved by: brd, bdrewery
Sponsored by: Rubicon Communications, LLC (Netgate)
Differential Revision:https://reviews.freebsd.org/D16195
Modified:
head/share/mk/bsd.files.mk
Modified: head/share/mk/bsd.files.mk
==
--- head/share/mk/bsd.files.mk Tue Jul 10 10:50:43 2018(r336168)
+++ head/share/mk/bsd.files.mk Tue Jul 10 11:33:37 2018(r336169)
@@ -80,7 +80,7 @@ _${group}FILES+= ${file}
installdirs-${group}:
- @echo installing dirs ${group}DIR ${${group}DIR}
+ @${ECHO} installing dirs ${group}DIR ${${group}DIR}
.for dir in ${${group}DIR}
.if defined(NO_ROOT)
${INSTALL} ${${group}TAG_ARGS} -d ${DESTDIR}${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"
Re: svn commit: r334617 - in head: . etc
On 05/06/18 15:26, Konstantin Belousov wrote: > On Tue, Jun 05, 2018 at 12:13:05PM -0600, Brad Davis wrote: >> On Tue, Jun 5, 2018, at 10:46 AM, Konstantin Belousov wrote: >>> I find it often very useful to do >>> (cd src/etc/rc.d && make install) >>> Same for defaults and several other directories which in fact contains >>> non-editable content. Is this planned to keep working ? >> >> The short answer is, no. All rc.d scripts get moved to the src of the >> program they start. >> >> That said, if there is a big need for this, we can see about options to keep >> them working. >> >> What are you trying to accomplish when you do this? Just verify the rc.d >> scripts match your src tree? > > I avoid mergemaster/etcupdate and whatever else. rc.d and /etc/rc, > /etc/rc.subr /etc/rc.network are not suitable to etc, they are binaries > provided by the project not for the user editing. > > When upgrading the host, esp. on HEAD, i usually refresh scripts by this > procedure and avoid any editing and implied conflict resolution for real > configs. > > Not being able to easily install clean copies of these scripts would > be very inconvenient and time consuming. If I understood what Brad is saying, each rc.d script will be installed by the application it belongs to. So when it's installing SSH it will also install /etc/rc.d/sshd and you will not need to deal with rc.d files on mergemaster anymore. Is it correct, Brad? -- Renato Botelho ___ 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: r333407 - head/share/mk
On 24/05/18 22:52, Brad Davis wrote:
> On Thu, May 24, 2018, at 4:16 PM, Bryan Drewery wrote:
>> On 5/24/2018 1:41 PM, Renato Botelho wrote:
>>> On 09/05/18 10:44, Brad Davis wrote:
>>>> Author: brd
>>>> Date: Wed May 9 13:44:54 2018
>>>> New Revision: 333407
>>>> URL: https://svnweb.freebsd.org/changeset/base/333407
>>>>
>>>> Log:
>>>> Enable directory creation with FILESDIR.
>>>>
>>>> This is part of packaging base work.
>>>>
>>>> Reviewed by: will
>>>> Approved by: bapt (mentor), allanjude (mentor)
>>>> Differential Revision: https://reviews.freebsd.org/D15130
>>>>
>>>> Modified:
>>>> head/share/mk/bsd.files.mk
>>>> head/share/mk/bsd.own.mk
>>>>
>>>> Modified: head/share/mk/bsd.files.mk
>>>> ==
>>>> --- head/share/mk/bsd.files.mk Wed May 9 12:25:23 2018
>>>> (r333406)
>>>> +++ head/share/mk/bsd.files.mk Wed May 9 13:44:54 2018
>>>> (r333407)
>>>> @@ -67,7 +67,7 @@ STAGE_AS_${file:T}= ${${group}NAME_${file:T}}
>>>> STAGE_DIR.${file:T}= ${STAGE_OBJTOP}${${group}DIR_${file:T}}
>>>> stage_as.${file:T}: ${file}
>>>>
>>>> -installfiles-${group}: _${group}INS_${file:T}
>>>> +installfiles-${group}: installdirs-${group} _${group}INS_${file:T}
>>>> _${group}INS_${file:T}: ${file}
>>>>${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN_${.ALLSRC:T}} \
>>>>-g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
>>>> @@ -77,10 +77,24 @@ _${group}INS_${file:T}: ${file}
>>>> _${group}FILES+= ${file}
>>>> .endif
>>>> .endfor
>>>> +
>>>> +
>>>> +installdirs-${group}:
>>>> + @echo installing dirs ${group}DIR ${${group}DIR}
>>>
>>> I'm seeing this message while running `make -s installworld`.
>>>
>>
>> Needs to use ${ECHO} rather than echo.
>
> Oh I see now.. OK, this will be fixed in a coming update.
Thank you!
--
Renato Botelho
___
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: r333407 - head/share/mk
On 09/05/18 10:44, Brad Davis wrote:
> Author: brd
> Date: Wed May 9 13:44:54 2018
> New Revision: 333407
> URL: https://svnweb.freebsd.org/changeset/base/333407
>
> Log:
> Enable directory creation with FILESDIR.
>
> This is part of packaging base work.
>
> Reviewed by:will
> Approved by:bapt (mentor), allanjude (mentor)
> Differential Revision: https://reviews.freebsd.org/D15130
>
> Modified:
> head/share/mk/bsd.files.mk
> head/share/mk/bsd.own.mk
>
> Modified: head/share/mk/bsd.files.mk
> ==
> --- head/share/mk/bsd.files.mkWed May 9 12:25:23 2018
> (r333406)
> +++ head/share/mk/bsd.files.mkWed May 9 13:44:54 2018
> (r333407)
> @@ -67,7 +67,7 @@ STAGE_AS_${file:T}= ${${group}NAME_${file:T}}
> STAGE_DIR.${file:T}= ${STAGE_OBJTOP}${${group}DIR_${file:T}}
> stage_as.${file:T}: ${file}
>
> -installfiles-${group}: _${group}INS_${file:T}
> +installfiles-${group}: installdirs-${group} _${group}INS_${file:T}
> _${group}INS_${file:T}: ${file}
> ${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN_${.ALLSRC:T}} \
> -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
> @@ -77,10 +77,24 @@ _${group}INS_${file:T}: ${file}
> _${group}FILES+= ${file}
> .endif
> .endfor
> +
> +
> +installdirs-${group}:
> + @echo installing dirs ${group}DIR ${${group}DIR}
I'm seeing this message while running `make -s installworld`.
--
Renato Botelho
___
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: r333612 - head/sys/net
On 14/05/18 17:06, Stephen Hurd wrote: > Author: shurd > Date: Mon May 14 20:06:49 2018 > New Revision: 333612 > URL: https://svnweb.freebsd.org/changeset/base/333612 > > Log: > Replace rmlock with epoch in lagg > > Use the new epoch based reclamation API. Now the hot paths will not > block at all, and the sx lock is used for the softc data. This fixes LORs > reported where the rwlock was obtained when the sxlock was held. > > Submitted by: mmacy > Reported by:Harry Schmalzbauer > Reviewed by:sbruno > Sponsored by: Limelight Networks > Differential Revision: https://reviews.freebsd.org/D15355 Thanks! This fixed my (wlan0+em0) failover lagg interface. -- Renato Botelho ___ 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: r331364 - head/release/tools
On 22/03/18 14:49, Glen Barber wrote: > Author: gjb > Date: Thu Mar 22 17:49:27 2018 > New Revision: 331364 > URL: https://svnweb.freebsd.org/changeset/base/331364 > > Log: > Remove google_accounts_manager from VM_RC_LIST in the GCE configuration > file, no longer needed. > > PR: 221714 > MFC after: 3 days > Sponsored by: The FreeBSD Foundation > > Modified: > head/release/tools/gce.conf > > Modified: head/release/tools/gce.conf > == > --- head/release/tools/gce.conf Thu Mar 22 17:46:38 2018 > (r331363) > +++ head/release/tools/gce.conf Thu Mar 22 17:49:27 2018 > (r331364) > @@ -9,7 +9,7 @@ export VM_EXTRA_PACKAGES="firstboot-freebsd-update fir > sysutils/py-google-compute-engine" > > # Set to a list of third-party software to enable in rc.conf(5). > -export VM_RC_LIST="google_accounts_manager ntpd sshd firstboot_growfs \ > +export VM_RC_LIST="ntpd sshd firstboot_growfs \ > firstboot_pkgs firstboot_freebsd_update google_startup \ > google_accounts_daemon google_clock_skew_daemon > google_instance_setup google_ip_forwarding_daemon First 2 lines end up with '\' but following 2 lines don't. It would be nice to add just to keep it consistent IMO -- Renato Botelho ___ 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: r331349 - stable/11/sbin/ifconfig
Author: garga (ports committer)
Date: Thu Mar 22 10:57:51 2018
New Revision: 331349
URL: https://svnweb.freebsd.org/changeset/base/331349
Log:
MFC r322281:
Add missing parenthesis on error message
Approved by: loos
Sponsored by: Rubicon Communications, LLC (Netgate)
Modified:
stable/11/sbin/ifconfig/ifconfig.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sbin/ifconfig/ifconfig.c
==
--- stable/11/sbin/ifconfig/ifconfig.c Thu Mar 22 09:43:15 2018
(r331348)
+++ stable/11/sbin/ifconfig/ifconfig.c Thu Mar 22 10:57:51 2018
(r331349)
@@ -762,7 +762,7 @@ top:
if ((s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0)) < 0 &&
(uafp != NULL || errno != EAFNOSUPPORT ||
(s = socket(AF_LOCAL, SOCK_DGRAM, 0)) < 0))
- err(1, "socket(family %u,SOCK_DGRAM", ifr.ifr_addr.sa_family);
+ err(1, "socket(family %u,SOCK_DGRAM)", ifr.ifr_addr.sa_family);
while (argc > 0) {
p = cmd_lookup(*argv, iscreate);
___
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: r329148 - head/etc/devd
On 12/02/18 02:45, Warner Losh wrote:
> Author: imp
> Date: Mon Feb 12 04:45:26 2018
> New Revision: 329148
> URL: https://svnweb.freebsd.org/changeset/base/329148
>
> Log:
> Switch to using devmatch to autoload drivers. Remove usb.conf
> as obsolete because devmatch gets its information from the same
> place as the genration scripts.
>
> Added:
> head/etc/devd/devmatch.conf (contents, props changed)
> Deleted:
> head/etc/devd/usb.conf
>
> Added: head/etc/devd/devmatch.conf
> ==
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ head/etc/devd/devmatch.conf Mon Feb 12 04:45:26 2018
> (r329148)
> @@ -0,0 +1,13 @@
> +#
> +# $FreeBSD$
> +#
> +
> +#
> +# Example devd configuration file for automatically
> +# loading what modules we can based on nomatch
> +# events.
> +#
> +# Generic NOMATCH event
> +nomatch 100 {
> + action "service devmatch onestart"
Config syntax is broken. It's missing ; in the end of above line
--
Renato Botelho
___
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: r328279 - head/usr.bin/sockstat
On 23/01/18 11:03, Emmanuel Vadot wrote:
> Author: manu
> Date: Tue Jan 23 13:03:47 2018
> New Revision: 328279
> URL: https://svnweb.freebsd.org/changeset/base/328279
>
> Log:
> sockstat: Add -q option to suppress the header line
>
> MFC after: 1 week
> Sponsored by: Gandi.net
>
> Modified:
> head/usr.bin/sockstat/sockstat.1
> head/usr.bin/sockstat/sockstat.c
>
> Modified: head/usr.bin/sockstat/sockstat.1
> ==
> --- head/usr.bin/sockstat/sockstat.1 Tue Jan 23 08:07:00 2018
> (r328278)
> +++ head/usr.bin/sockstat/sockstat.1 Tue Jan 23 13:03:47 2018
> (r328279)
> @@ -27,7 +27,7 @@
> .\"
> .\" $FreeBSD$
> .\"
> -.Dd September 12, 2017
> +.Dd January 23, 2018
> .Dt SOCKSTAT 1
> .Os
> .Sh NAME
> @@ -83,6 +83,8 @@ The
> argument is a comma-separated list of protocol names,
> as they are defined in
> .Xr protocols 5 .
> +.It Fl q
> +Quiet mode, do not print the header line.
> .It Fl S
> Display the protocol stack, if applicable.
> This is currently only implemented for TCP.
>
> Modified: head/usr.bin/sockstat/sockstat.c
> ==
> --- head/usr.bin/sockstat/sockstat.c Tue Jan 23 08:07:00 2018
> (r328278)
> +++ head/usr.bin/sockstat/sockstat.c Tue Jan 23 13:03:47 2018
> (r328279)
> @@ -76,6 +76,7 @@ static int opt_c; /* Show connected sockets */
> static intopt_j; /* Show specified jail */
> static intopt_L; /* Don't show IPv4 or IPv6 loopback sockets */
> static intopt_l; /* Show listening sockets */
> +static intopt_q; /* Don't show header */
> static intopt_S; /* Show protocol stack if applicable */
> static intopt_s; /* Show protocol state if applicable */
> static intopt_U; /* Show remote UDP encapsulation port number */
> @@ -1155,19 +1156,21 @@ display(void)
> struct sock *s;
> int hash, n, pos;
>
> - printf("%-8s %-10s %-5s %-2s %-6s %-*s %-*s",
> - "USER", "COMMAND", "PID", "FD", "PROTO",
> - opt_w ? 45 : 21, "LOCAL ADDRESS",
> - opt_w ? 45 : 21, "FOREIGN ADDRESS");
> - if (opt_U)
> - printf(" %-6s", "ENCAPS");
> - if (opt_s) {
> - printf(" %-12s", "PATH STATE");
> - printf(" %-12s", "CONN STATE");
> + if (opt_q != 1) {
> + printf("%-8s %-10s %-5s %-2s %-6s %-*s %-*s",
> + "USER", "COMMAND", "PID", "FD", "PROTO",
> + opt_w ? 45 : 21, "LOCAL ADDRESS",
> + opt_w ? 45 : 21, "FOREIGN ADDRESS");
> + if (opt_U)
> + printf(" %-6s", "ENCAPS");
> + if (opt_s) {
> + printf(" %-12s", "PATH STATE");
> + printf(" %-12s", "CONN STATE");
> + }
> + if (opt_S)
> + printf(" %.*s", TCP_FUNCTION_NAME_LEN_MAX, "STACK");
> + printf("\n");
> }
> - if (opt_S)
> - printf(" %.*s", TCP_FUNCTION_NAME_LEN_MAX, "STACK");
> - printf("\n");
> setpassent(1);
> for (xf = xfiles, n = 0; n < nxfiles; ++n, ++xf) {
> if (xf->xf_data == NULL)
> @@ -1248,7 +1251,7 @@ main(int argc, char *argv[])
> int o, i;
>
> opt_j = -1;
> - while ((o = getopt(argc, argv, "46cj:Llp:P:SsUuvw")) != -1)
> + while ((o = getopt(argc, argv, "46cj:Llp:P:qSsUuvw")) != -1)
> switch (o) {
> case '4':
> opt_4 = 1;
> @@ -1274,6 +1277,8 @@ main(int argc, char *argv[])
> case 'P':
> protos_defined = parse_protos(optarg);
> break;
> + case 'q':
> + opt_q = 1;
Isn't it missing a break here?
> case 'S':
> opt_S = 1;
> break;
> ___
> svn-src-h...@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
>
--
Renato Botelho
___
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: r325520 - head/share/mk
On 07/11/17 16:20, Bryan Drewery wrote: > Author: bdrewery > Date: Tue Nov 7 18:20:08 2017 > New Revision: 325520 > URL: https://svnweb.freebsd.org/changeset/base/325520 > > Log: > Reenable AUTO_OBJ by default. > > The problem with it was a bogus .OBJDIR in some cases where creation of > object directories were purposely not attempted, such as for 'make cleandir' > and in etc/ sub-directories. In these cases bmake would start with a > bogus .OBJDIR like etc/ due to MAKEOBJDIR being a dynamic value based on > .CURDIR, SRCTOP, and OBJTOP. OBJTOP would not yet be defined but is > during early src.sys.obj.mk. That file and auto.obj.mk both were not > modifying .OBJDIR unless they expected to create the objdir. Thus in > these cases the .OBJDIR was left as etc/* rather than fixed to the > proper .CURDIR. > > The issues were fixed in r325404 and r325416. An assertion to avoid the > bad .OBJDIR was added in r325405. > > Sponsored by: Dell EMC Isilon Bryan, Are these messages expected to show when make -s is used? [Creating objdir /usr/obj/usr/src/amd64.amd64/usr.bin/look...] Thanks -- Renato Botelho ___ 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: r324023 - in stable/11: . contrib/compiler-rt/include/sanitizer contrib/compiler-rt/include/xray contrib/compiler-rt/lib/asan contrib/compiler-rt/lib/builtins contrib/compiler-rt/lib/b
On 26/09/17 16:56, Dimitry Andric wrote: > Author: dim > Date: Tue Sep 26 19:56:36 2017 > New Revision: 324023 > URL: https://svnweb.freebsd.org/changeset/base/324023 > > Log: > Merge clang, llvm, lld, lldb, compiler-rt and libc++ 5.0.0 release. This commit added a bad entry in UPDATING with date as "2017mmdd" -- Renato Botelho ___ 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: r322281 - head/sbin/ifconfig
Author: garga (ports committer)
Date: Tue Aug 8 22:40:26 2017
New Revision: 322281
URL: https://svnweb.freebsd.org/changeset/base/322281
Log:
Add missing parenthesis on error message
Approved by: loos
MFC after:3 days
Sponsored by: Rubicon Communications, LLC (Netgate)
Modified:
head/sbin/ifconfig/ifconfig.c
Modified: head/sbin/ifconfig/ifconfig.c
==
--- head/sbin/ifconfig/ifconfig.c Tue Aug 8 21:09:26 2017
(r322280)
+++ head/sbin/ifconfig/ifconfig.c Tue Aug 8 22:40:26 2017
(r322281)
@@ -760,7 +760,7 @@ top:
if ((s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0)) < 0 &&
(uafp != NULL || errno != EAFNOSUPPORT ||
(s = socket(AF_LOCAL, SOCK_DGRAM, 0)) < 0))
- err(1, "socket(family %u,SOCK_DGRAM", ifr.ifr_addr.sa_family);
+ err(1, "socket(family %u,SOCK_DGRAM)", ifr.ifr_addr.sa_family);
while (argc > 0) {
p = cmd_lookup(*argv, iscreate);
___
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: r320674 - head/usr.sbin/bsdinstall/scripts
On 05/07/17 10:37, Bartek Rutkowski wrote:
> Author: robak (ports committer)
> Date: Wed Jul 5 13:37:27 2017
> New Revision: 320674
> URL: https://svnweb.freebsd.org/changeset/base/320674
>
> Log:
> Add option to bsdinstall to disable insecure console, update stack guard
> option
>
> This patch adds new bsdinstall option to hardening section that allows users
> to change this behaviour to secure one and updates stack guard option so it
> would set the value of relevant sysctl to 512 (2MB)
>
> Submitted by: Bartek Rutkowski
> Reviewed by:adrian, bapt, emaste
> Approved by:bapt, emaste
> MFC after: 1 day
> Sponsored by: Pixeware LTD
> Differential Revision: https://reviews.freebsd.org/D9700
>
> Modified:
> head/usr.sbin/bsdinstall/scripts/config
> head/usr.sbin/bsdinstall/scripts/hardening
>
> Modified: head/usr.sbin/bsdinstall/scripts/config
> ==
> --- head/usr.sbin/bsdinstall/scripts/config Wed Jul 5 13:13:38 2017
> (r320673)
> +++ head/usr.sbin/bsdinstall/scripts/config Wed Jul 5 13:37:27 2017
> (r320674)
> @@ -35,6 +35,11 @@ rm $BSDINSTALL_TMPETC/rc.conf.*
> cat $BSDINSTALL_CHROOT/etc/sysctl.conf $BSDINSTALL_TMPETC/sysctl.conf.* >>
> $BSDINSTALL_TMPETC/sysctl.conf
> rm $BSDINSTALL_TMPETC/sysctl.conf.*
>
> +if [ -f $BSDINSTALL_TMPTEC/ttys.hardening ]; then
> + cat $BSDINSTALL_TMPTEC/ttys.hardening > $BSDINSTALL_TMPTEC/ttys
> + rm $BSDINSTALL_TMPTEC/ttys.hardening
> +fi
> +
> cp $BSDINSTALL_TMPETC/* $BSDINSTALL_CHROOT/etc
>
> cat $BSDINSTALL_TMPBOOT/loader.conf.* >> $BSDINSTALL_TMPBOOT/loader.conf
>
> Modified: head/usr.sbin/bsdinstall/scripts/hardening
> ==
> --- head/usr.sbin/bsdinstall/scripts/hardeningWed Jul 5 13:13:38
> 2017(r320673)
> +++ head/usr.sbin/bsdinstall/scripts/hardeningWed Jul 5 13:37:27
> 2017(r320674)
> @@ -42,10 +42,11 @@ FEATURES=$( dialog --backtitle "FreeBSD Installer" \
> "3 read_msgbuf" "Disable reading kernel message buffer for unprivileged
> users" ${read_msgbuf:-off} \
> "4 proc_debug" "Disable process debugging facilities for unprivileged
> users" ${proc_debug:-off} \
> "5 random_pid" "Randomize the PID of newly created processes"
> ${random_pid:-off} \
> - "6 stack_guard" "Insert stack guard page ahead of the growable
> segments" ${stack_guard:-off} \
> + "6 stack_guard" "Set stack guard buffer size to 2MB"
> ${stack_guard:-off} \
> "7 clear_tmp" "Clean the /tmp filesystem on system startup"
> ${clear_tmp:-off} \
> "8 disable_syslogd" "Disable opening Syslogd network socket (disables
> remote logging)" ${disable_syslogd:-off} \
> "9 disable_sendmail" "Disable Sendmail service"
> ${disable_sendmail:-off} \
> + "9 secure_console" "Enable console password prompt"
> ${secure_console:-off} \
There are two options '9' now
--
Renato Botelho
___
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: r318161 - head/contrib/bmake
On 10/05/17 19:35, Ngie Cooper wrote: > On Wed, May 10, 2017 at 3:31 PM, Ngie Cooper wrote: >> On Wed, May 10, 2017 at 3:24 PM, Simon J. Gerraty wrote: >>> Author: sjg >>> Date: Wed May 10 22:24:09 2017 >>> New Revision: 318161 >>> URL: https://svnweb.freebsd.org/changeset/base/318161 >>> >>> Log: >>> Ensure buf2 is in scope >> >> I think this is the proper fix for the issue that Bryan, Ravi, and I > > Ravi -> Renato > >> reported.. also reported as Coverity CID: 1374641. Yeah, it fixed the problem to me. Thanks! -- Renato Botelho ___ 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: r317048 - stable/11/usr.sbin/arp
Author: garga (ports committer)
Date: Mon Apr 17 13:01:42 2017
New Revision: 317048
URL: https://svnweb.freebsd.org/changeset/base/317048
Log:
MFC r316592:
Introduce libxo support to arp(8)
Reviewed by: wblock, gnn, allanjude, phil
Approved by: allanjude
Sponsored by: Rubicon Communications (Netgate)
Differential Revision:https://reviews.freebsd.org/D9563
Modified:
stable/11/usr.sbin/arp/Makefile
stable/11/usr.sbin/arp/arp.8
stable/11/usr.sbin/arp/arp.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/usr.sbin/arp/Makefile
==
--- stable/11/usr.sbin/arp/Makefile Mon Apr 17 12:42:58 2017
(r317047)
+++ stable/11/usr.sbin/arp/Makefile Mon Apr 17 13:01:42 2017
(r317048)
@@ -4,6 +4,8 @@
PROG= arp
MAN= arp.4 arp.8
+LIBADD=xo
+
WARNS?=3
.include
Modified: stable/11/usr.sbin/arp/arp.8
==
--- stable/11/usr.sbin/arp/arp.8Mon Apr 17 12:42:58 2017
(r317047)
+++ stable/11/usr.sbin/arp/arp.8Mon Apr 17 13:01:42 2017
(r317048)
@@ -28,7 +28,7 @@
.\" @(#)arp.8 8.1 (Berkeley) 6/6/93
.\" $FreeBSD$
.\"
-.Dd January 31, 2013
+.Dd April 6, 2017
.Dt ARP 8
.Os
.Sh NAME
@@ -36,10 +36,12 @@
.Nd address resolution display and control
.Sh SYNOPSIS
.Nm
+.Op Fl -libxo Ar options
.Op Fl n
.Op Fl i Ar interface
.Ar hostname
.Nm
+.Op Fl -libxo Ar options
.Op Fl n
.Op Fl i Ar interface
.Fl a
@@ -77,6 +79,13 @@ using Internet dot notation.
.Pp
Available options:
.Bl -tag -width indent
+.It Fl -libxo
+Generate output via
+.Xr libxo 3
+in a selection of different human and machine readable formats.
+See
+.Xr xo_parse_args 3
+for details on command line arguments.
.It Fl a
The program displays or deletes all of the current
.Tn ARP
@@ -182,6 +191,8 @@ character will mark the rest of the line
.El
.Sh SEE ALSO
.Xr inet 3 ,
+.Xr libxo 3 ,
+.Xr xo_parse_args 3 ,
.Xr arp 4 ,
.Xr ifconfig 8 ,
.Xr ndp 8
Modified: stable/11/usr.sbin/arp/arp.c
==
--- stable/11/usr.sbin/arp/arp.cMon Apr 17 12:42:58 2017
(r317047)
+++ stable/11/usr.sbin/arp/arp.cMon Apr 17 13:01:42 2017
(r317048)
@@ -78,6 +78,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
typedef void (action_fn)(struct sockaddr_dl *sdl, struct sockaddr_in *s_in,
struct rt_msghdr *rtm);
@@ -114,6 +115,8 @@ struct if_nameindex *ifnameindex;
#define SETFUNC(f) { if (func) usage(); func = (f); }
+#define ARP_XO_VERSION "1"
+
int
main(int argc, char *argv[])
{
@@ -121,6 +124,10 @@ main(int argc, char *argv[])
int rtn = 0;
int aflag = 0; /* do it for all entries */
+ argc = xo_parse_args(argc, argv);
+ if (argc < 0)
+ exit(1);
+
while ((ch = getopt(argc, argv, "andfsSi:")) != -1)
switch(ch) {
case 'a':
@@ -155,12 +162,13 @@ main(int argc, char *argv[])
func = F_GET;
if (rifname) {
if (func != F_GET && !(func == F_DELETE && aflag))
- errx(1, "-i not applicable to this operation");
+ xo_errx(1, "-i not applicable to this operation");
if (if_nametoindex(rifname) == 0) {
if (errno == ENXIO)
- errx(1, "interface %s does not exist", rifname);
+ xo_errx(1, "interface %s does not exist",
+ rifname);
else
- err(1, "if_nametoindex(%s)", rifname);
+ xo_err(1, "if_nametoindex(%s)", rifname);
}
}
switch (func) {
@@ -168,7 +176,16 @@ main(int argc, char *argv[])
if (aflag) {
if (argc != 0)
usage();
+
+ xo_set_version(ARP_XO_VERSION);
+ xo_open_container("arp");
+ xo_open_list("arp-cache");
+
search(0, print_entry);
+
+ xo_close_list("arp-cache");
+ xo_close_container("arp");
+ xo_finish();
} else {
if (argc != 1)
usage();
@@ -218,7 +235,7 @@ file(char *name)
char line[100], arg[5][50], *args[5], *p;
if ((fp = fopen(name, "r")) == NULL)
- err(1, "cannot open %s", name);
+ xo_err(1, "cannot open %s", name);
args[0] = &arg[0][0];
args[1] = &arg[1][0];
args[2] = &arg[2][0];
@@ -234,7 +251,7 @@ file(char *name)
i = sscanf(p, "%49s %49s %49s %49s %49s", arg[0], a
svn commit: r316592 - head/usr.sbin/arp
Author: garga (ports committer)
Date: Thu Apr 6 22:50:28 2017
New Revision: 316592
URL: https://svnweb.freebsd.org/changeset/base/316592
Log:
Introduce libxo support to arp(8)
Reviewed by: wblock, gnn, allanjude, phil
Approved by: allanjude
MFC after:1 week
Sponsored by: Rubicon Communications (Netgate)
Differential Revision:https://reviews.freebsd.org/D9563
Modified:
head/usr.sbin/arp/Makefile
head/usr.sbin/arp/arp.8
head/usr.sbin/arp/arp.c
Modified: head/usr.sbin/arp/Makefile
==
--- head/usr.sbin/arp/Makefile Thu Apr 6 22:21:49 2017(r316591)
+++ head/usr.sbin/arp/Makefile Thu Apr 6 22:50:28 2017(r316592)
@@ -4,6 +4,8 @@
PROG= arp
MAN= arp.4 arp.8
+LIBADD=xo
+
WARNS?=3
.include
Modified: head/usr.sbin/arp/arp.8
==
--- head/usr.sbin/arp/arp.8 Thu Apr 6 22:21:49 2017(r316591)
+++ head/usr.sbin/arp/arp.8 Thu Apr 6 22:50:28 2017(r316592)
@@ -28,7 +28,7 @@
.\" @(#)arp.8 8.1 (Berkeley) 6/6/93
.\" $FreeBSD$
.\"
-.Dd January 31, 2013
+.Dd April 6, 2017
.Dt ARP 8
.Os
.Sh NAME
@@ -36,10 +36,12 @@
.Nd address resolution display and control
.Sh SYNOPSIS
.Nm
+.Op Fl -libxo Ar options
.Op Fl n
.Op Fl i Ar interface
.Ar hostname
.Nm
+.Op Fl -libxo Ar options
.Op Fl n
.Op Fl i Ar interface
.Fl a
@@ -77,6 +79,13 @@ using Internet dot notation.
.Pp
Available options:
.Bl -tag -width indent
+.It Fl -libxo
+Generate output via
+.Xr libxo 3
+in a selection of different human and machine readable formats.
+See
+.Xr xo_parse_args 3
+for details on command line arguments.
.It Fl a
The program displays or deletes all of the current
.Tn ARP
@@ -182,6 +191,8 @@ character will mark the rest of the line
.El
.Sh SEE ALSO
.Xr inet 3 ,
+.Xr libxo 3 ,
+.Xr xo_parse_args 3 ,
.Xr arp 4 ,
.Xr ifconfig 8 ,
.Xr ndp 8
Modified: head/usr.sbin/arp/arp.c
==
--- head/usr.sbin/arp/arp.c Thu Apr 6 22:21:49 2017(r316591)
+++ head/usr.sbin/arp/arp.c Thu Apr 6 22:50:28 2017(r316592)
@@ -78,6 +78,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
typedef void (action_fn)(struct sockaddr_dl *sdl, struct sockaddr_in *s_in,
struct rt_msghdr *rtm);
@@ -114,6 +115,8 @@ struct if_nameindex *ifnameindex;
#define SETFUNC(f) { if (func) usage(); func = (f); }
+#define ARP_XO_VERSION "1"
+
int
main(int argc, char *argv[])
{
@@ -121,6 +124,10 @@ main(int argc, char *argv[])
int rtn = 0;
int aflag = 0; /* do it for all entries */
+ argc = xo_parse_args(argc, argv);
+ if (argc < 0)
+ exit(1);
+
while ((ch = getopt(argc, argv, "andfsSi:")) != -1)
switch(ch) {
case 'a':
@@ -155,12 +162,13 @@ main(int argc, char *argv[])
func = F_GET;
if (rifname) {
if (func != F_GET && !(func == F_DELETE && aflag))
- errx(1, "-i not applicable to this operation");
+ xo_errx(1, "-i not applicable to this operation");
if (if_nametoindex(rifname) == 0) {
if (errno == ENXIO)
- errx(1, "interface %s does not exist", rifname);
+ xo_errx(1, "interface %s does not exist",
+ rifname);
else
- err(1, "if_nametoindex(%s)", rifname);
+ xo_err(1, "if_nametoindex(%s)", rifname);
}
}
switch (func) {
@@ -168,7 +176,16 @@ main(int argc, char *argv[])
if (aflag) {
if (argc != 0)
usage();
+
+ xo_set_version(ARP_XO_VERSION);
+ xo_open_container("arp");
+ xo_open_list("arp-cache");
+
search(0, print_entry);
+
+ xo_close_list("arp-cache");
+ xo_close_container("arp");
+ xo_finish();
} else {
if (argc != 1)
usage();
@@ -218,7 +235,7 @@ file(char *name)
char line[100], arg[5][50], *args[5], *p;
if ((fp = fopen(name, "r")) == NULL)
- err(1, "cannot open %s", name);
+ xo_err(1, "cannot open %s", name);
args[0] = &arg[0][0];
args[1] = &arg[1][0];
args[2] = &arg[2][0];
@@ -234,7 +251,7 @@ file(char *name)
i = sscanf(p, "%49s %49s %49s %49s %49s", arg[0], arg[1],
arg[2], arg[3], arg[4]);
if (i < 2) {
- warnx("bad line: %s", line)
svn commit: r314595 - stable/11/usr.bin/sockstat
Author: garga (ports committer)
Date: Fri Mar 3 12:30:18 2017
New Revision: 314595
URL: https://svnweb.freebsd.org/changeset/base/314595
Log:
MFC r314039:
Fix style(9)
Reviewed by: ngie, tuexen, vangyzen, allanjude
Approved by: allanjude
MFC after:1 week
Sponsored by: Rubicon Communications (Netgate)
Differential Revision:https://reviews.freebsd.org/D9588
Modified:
stable/11/usr.bin/sockstat/sockstat.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/usr.bin/sockstat/sockstat.c
==
--- stable/11/usr.bin/sockstat/sockstat.c Fri Mar 3 12:06:33 2017
(r314594)
+++ stable/11/usr.bin/sockstat/sockstat.c Fri Mar 3 12:30:18 2017
(r314595)
@@ -88,9 +88,9 @@ static size_t numprotos; /* allocated s
static int *ports;
-#define INT_BIT (sizeof(int)*CHAR_BIT)
-#define SET_PORT(p) do { ports[p / INT_BIT] |= 1 << (p % INT_BIT); } while (0)
-#define CHK_PORT(p) (ports[p / INT_BIT] & (1 << (p % INT_BIT)))
+#defineINT_BIT (sizeof(int)*CHAR_BIT)
+#defineSET_PORT(p) do { ports[p / INT_BIT] |= 1 << (p % INT_BIT); }
while (0)
+#defineCHK_PORT(p) (ports[p / INT_BIT] & (1 << (p % INT_BIT)))
struct addr {
struct sockaddr_storage address;
@@ -111,7 +111,7 @@ struct sock {
struct sock *next;
};
-#define HASHSIZE 1009
+#defineHASHSIZE 1009
static struct sock *sockhash[HASHSIZE];
static struct xfile *xfiles;
@@ -131,7 +131,6 @@ xprintf(const char *fmt, ...)
return (len);
}
-
static int
get_proto_type(const char *proto)
{
@@ -147,7 +146,6 @@ get_proto_type(const char *proto)
return (pent->p_proto);
}
-
static void
init_protos(int num)
{
@@ -167,7 +165,6 @@ init_protos(int num)
numprotos = proto_count;
}
-
static int
parse_protos(char *protospec)
{
@@ -190,7 +187,6 @@ parse_protos(char *protospec)
return (proto_index);
}
-
static void
parse_ports(const char *portspec)
{
@@ -359,27 +355,27 @@ gather_sctp(void)
err(1, "malloc()");
switch (xladdr->address.sa.sa_family) {
case AF_INET:
-#define __IN_IS_ADDR_LOOPBACK(pina) \
+#define__IN_IS_ADDR_LOOPBACK(pina) \
((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET)
- if
(!__IN_IS_ADDR_LOOPBACK(&xladdr->address.sin.sin_addr))
+ if (!__IN_IS_ADDR_LOOPBACK(
+ &xladdr->address.sin.sin_addr))
local_all_loopback = 0;
-#undef __IN_IS_ADDR_LOOPBACK
- sockaddr(&laddr->address,
-AF_INET,
-&xladdr->address.sin.sin_addr,
-htons(xinpcb->local_port));
+#undef __IN_IS_ADDR_LOOPBACK
+ sockaddr(&laddr->address, AF_INET,
+ &xladdr->address.sin.sin_addr,
+ htons(xinpcb->local_port));
break;
case AF_INET6:
- if
(!IN6_IS_ADDR_LOOPBACK(&xladdr->address.sin6.sin6_addr))
+ if (!IN6_IS_ADDR_LOOPBACK(
+ &xladdr->address.sin6.sin6_addr))
local_all_loopback = 0;
- sockaddr(&laddr->address,
-AF_INET6,
-&xladdr->address.sin6.sin6_addr,
-htons(xinpcb->local_port));
+ sockaddr(&laddr->address, AF_INET6,
+ &xladdr->address.sin6.sin6_addr,
+ htons(xinpcb->local_port));
break;
default:
errx(1, "address family %d not supported",
-xladdr->address.sa.sa_family);
+ xladdr->address.sa.sa_family);
}
laddr->next = NULL;
if (prev_laddr == NULL)
@@ -389,33 +385,38 @@ gather_sctp(void)
prev_laddr = laddr;
}
if (sock->laddr == NULL) {
- if ((sock->laddr = calloc(1, sizeof(struct addr))) ==
NULL)
+ if ((sock->laddr =
+ calloc(1, sizeof(struct addr))) == NULL)
err(1, "malloc()");
sock->laddr->address.ss_family = sock->family;
if (sock->family == AF_INET)
- sock->laddr->address.ss
svn commit: r314042 - stable/11/sbin/fsck_ffs
Author: garga (ports committer)
Date: Tue Feb 21 12:51:45 2017
New Revision: 314042
URL: https://svnweb.freebsd.org/changeset/base/314042
Log:
MFC r313745:
* Add missing parameters to usage()
* Add missing parameters to manpage synopsis
* Add missing description of -d flag
* Sort flags descriptions
Reviewed by: allanjude, kib
Approved by: allanjude
MFC after:1 week
Sponsored by: Rubicon Communications (Netgate)
Differential Revision:https://reviews.freebsd.org/D9152
Modified:
stable/11/sbin/fsck_ffs/fsck_ffs.8
stable/11/sbin/fsck_ffs/main.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sbin/fsck_ffs/fsck_ffs.8
==
--- stable/11/sbin/fsck_ffs/fsck_ffs.8 Tue Feb 21 12:45:56 2017
(r314041)
+++ stable/11/sbin/fsck_ffs/fsck_ffs.8 Tue Feb 21 12:51:45 2017
(r314042)
@@ -29,7 +29,7 @@
.\"@(#)fsck.8 8.4 (Berkeley) 5/9/95
.\" $FreeBSD$
.\"
-.Dd October 5, 2016
+.Dd February 14, 2017
.Dt FSCK_FFS 8
.Os
.Sh NAME
@@ -38,7 +38,7 @@
.Nd file system consistency check and interactive repair
.Sh SYNOPSIS
.Nm
-.Op Fl BEFfnpRryZ
+.Op Fl BCdEFfnpRrSyZ
.Op Fl b Ar block
.Op Fl c Ar level
.Op Fl m Ar mode
@@ -149,45 +149,6 @@ If unexpected errors are found,
the file system is marked as needing a foreground check and
.Nm
exits without attempting any further cleaning.
-.It Fl E
-Clear unallocated blocks, notifying the underlying device that they
-are not used and that their contents may be discarded.
-This is useful for filesystems which have been mounted on systems
-without TRIM support, or with TRIM support disabled, as well as
-filesystems which have been copied from one device to another.
-.Pp
-See the
-.Fl E
-and
-.Fl t
-flags of
-.Xr newfs 8 ,
-and
-the
-.Fl t
-flag of
-.Xr tunefs 8 .
-.It Fl F
-Determine whether the file system needs to be cleaned immediately
-in foreground, or if its cleaning can be deferred to background.
-To be eligible for background cleaning it must have been running
-with soft updates, not have been marked as needing a foreground check,
-and be mounted and writable when the background check is to be done.
-If these conditions are met, then
-.Nm
-exits with a zero exit status.
-Otherwise it exits with a non-zero exit status.
-If the file system is clean,
-it will exit with a non-zero exit status so that the clean status
-of the file system can be verified and reported during the foreground
-checks.
-Note that when invoked with the
-.Fl F
-flag, no cleanups are done.
-The only thing that
-.Nm
-does is to determine whether a foreground or background
-check is needed and exit with an appropriate status code.
.It Fl b
Use the block specified immediately after the flag as
the super block for the file system.
@@ -243,6 +204,47 @@ first line of output from
This option implies the
.Fl f
flag.
+.It Fl d
+Enable debugging messages.
+.It Fl E
+Clear unallocated blocks, notifying the underlying device that they
+are not used and that their contents may be discarded.
+This is useful for filesystems which have been mounted on systems
+without TRIM support, or with TRIM support disabled, as well as
+filesystems which have been copied from one device to another.
+.Pp
+See the
+.Fl E
+and
+.Fl t
+flags of
+.Xr newfs 8 ,
+and
+the
+.Fl t
+flag of
+.Xr tunefs 8 .
+.It Fl F
+Determine whether the file system needs to be cleaned immediately
+in foreground, or if its cleaning can be deferred to background.
+To be eligible for background cleaning it must have been running
+with soft updates, not have been marked as needing a foreground check,
+and be mounted and writable when the background check is to be done.
+If these conditions are met, then
+.Nm
+exits with a zero exit status.
+Otherwise it exits with a non-zero exit status.
+If the file system is clean,
+it will exit with a non-zero exit status so that the clean status
+of the file system can be verified and reported during the foreground
+checks.
+Note that when invoked with the
+.Fl F
+flag, no cleanups are done.
+The only thing that
+.Nm
+does is to determine whether a foreground or background
+check is needed and exit with an appropriate status code.
.It Fl f
Force
.Nm
Modified: stable/11/sbin/fsck_ffs/main.c
==
--- stable/11/sbin/fsck_ffs/main.c Tue Feb 21 12:45:56 2017
(r314041)
+++ stable/11/sbin/fsck_ffs/main.c Tue Feb 21 12:51:45 2017
(r314042)
@@ -670,7 +670,7 @@ static void
usage(void)
{
(void) fprintf(stderr,
-"usage: %s [-BEFfnpry] [-b block] [-c level] [-m mode] filesystem ...\n",
+"usage: %s [-BCdEFfnpRrSyZ] [-b block] [-c level] [-m mode] filesystem ...\n",
getprogname());
exit(1);
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To u
svn commit: r314041 - stable/11/usr.sbin/ndp
Author: garga (ports committer)
Date: Tue Feb 21 12:45:56 2017
New Revision: 314041
URL: https://svnweb.freebsd.org/changeset/base/314041
Log:
MFC r313737:
Fix style(9)
Reviewed by: allanjude, vangyzen
Approved by: allanjude
MFC after:1 week
Sponsored by: Rubicon Communications (Netgate)
Differential Revision:https://reviews.freebsd.org/D9510
Modified:
stable/11/usr.sbin/ndp/ndp.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/usr.sbin/ndp/ndp.c
==
--- stable/11/usr.sbin/ndp/ndp.cTue Feb 21 12:43:02 2017
(r314040)
+++ stable/11/usr.sbin/ndp/ndp.cTue Feb 21 12:45:56 2017
(r314041)
@@ -109,10 +109,11 @@
#include
#include "gmt2local.h"
-#define NEXTADDR(w, s) \
- if (rtm->rtm_addrs & (w)) { \
- bcopy((char *)&s, cp, sizeof(s)); cp += SA_SIZE(&s);}
-
+#defineNEXTADDR(w, s) \
+ if (rtm->rtm_addrs & (w)) { \
+ bcopy((char *)&s, cp, sizeof(s)); \
+ cp += SA_SIZE(&s); \
+ }
static pid_t pid;
static int nflag;
@@ -529,10 +530,10 @@ delete:
printf("cannot locate %s\n", host);
return (1);
}
-/*
- * need to reinit the field because it has rt_key
- * but we want the actual address
- */
+ /*
+* need to reinit the field because it has rt_key
+* but we want the actual address
+*/
NEXTADDR(RTA_DST, sin_m);
rtm->rtm_flags |= RTF_LLDATA;
if (rtmsg(RTM_DELETE) == 0) {
@@ -604,7 +605,8 @@ again:;
rtm = (struct rt_msghdr *)next;
sin = (struct sockaddr_in6 *)(rtm + 1);
- sdl = (struct sockaddr_dl *)((char *)sin +
ALIGN(sin->sin6_len));
+ sdl = (struct sockaddr_dl *)((char *)sin +
+ ALIGN(sin->sin6_len));
/*
* Some OSes can produce a route that has the LINK flag but
@@ -724,7 +726,7 @@ again:;
isrouter ? "R" : "",
(rtm->rtm_flags & RTF_ANNOUNCE) ? "p" : "");
} else {
-#if 0 /* W and P are mystery even for us */
+#if 0 /* W and P are mystery even for us */
sin = (struct sockaddr_in6 *)
(sdl->sdl_len + (char *)sdl);
snprintf(flgbuf, sizeof(flgbuf), "%s%s%s%s",
@@ -855,7 +857,7 @@ rtmsg(int cmd)
rtm->rtm_inits = RTV_EXPIRE;
}
rtm->rtm_flags |= (RTF_HOST | RTF_STATIC | RTF_LLDATA);
-#if 0 /* we don't support ipv6addr/128 type proxying */
+#if 0 /* we don't support ipv6addr/128 type proxying */
if (rtm->rtm_flags & RTF_ANNOUNCE) {
rtm->rtm_flags &= ~RTF_HOST;
rtm->rtm_addrs |= RTA_NETMASK;
@@ -868,7 +870,7 @@ rtmsg(int cmd)
NEXTADDR(RTA_DST, sin_m);
NEXTADDR(RTA_GATEWAY, sdl_m);
-#if 0 /* we don't support ipv6addr/128 type proxying */
+#if 0 /* we don't support ipv6addr/128 type proxying */
memset(&so_mask.sin6_addr, 0xff, sizeof(so_mask.sin6_addr));
NEXTADDR(RTA_NETMASK, so_mask);
#endif
@@ -913,7 +915,7 @@ ifinfo(char *ifname, int argc, char **ar
err(1, "ioctl(SIOCGIFINFO_IN6)");
/* NOTREACHED */
}
-#define ND nd.ndi
+#defineND nd.ndi
newflags = ND.flags;
for (i = 0; i < argc; i++) {
int clear = 0;
@@ -924,35 +926,33 @@ ifinfo(char *ifname, int argc, char **ar
cp++;
}
-#define SETFLAG(s, f) \
- do {\
- if (strcmp(cp, (s)) == 0) {\
- if (clear)\
- newflags &= ~(f);\
- else\
- newflags |= (f);\
- }\
- } while (0)
+#defineSETFLAG(s, f) do { \
+ if (strcmp(cp, (s)) == 0) { \
+ if (clear) \
+ newflags &= ~(f); \
+ else\
+ newflags |= (f);\
+ } \
+} while (0)
/*
* XXX: this macro is not 100% correct, in that it matches "nud" against
* "nudbogus". But we just let it go since this is minor.
*/
-#define SETVALUE(f, v) \
- do { \
- char *valptr; \
- unsigned long newval; \
- v = 0; /* unspecified */ \
- if (strncmp(cp, f, strlen(f)) == 0) { \
- valptr = strchr(cp, '='); \
- if (valptr == NULL) \
- err(1, "syntax error in %s fie
svn commit: r314039 - head/usr.bin/sockstat
Author: garga (ports committer)
Date: Tue Feb 21 12:37:59 2017
New Revision: 314039
URL: https://svnweb.freebsd.org/changeset/base/314039
Log:
Fix style(9)
Reviewed by: ngie, tuexen, vangyzen, allanjude
Approved by: allanjude
MFC after:1 week
Sponsored by: Rubicon Communications (Netgate)
Differential Revision:https://reviews.freebsd.org/D9588
Modified:
head/usr.bin/sockstat/sockstat.c
Modified: head/usr.bin/sockstat/sockstat.c
==
--- head/usr.bin/sockstat/sockstat.cTue Feb 21 12:29:07 2017
(r314038)
+++ head/usr.bin/sockstat/sockstat.cTue Feb 21 12:37:59 2017
(r314039)
@@ -88,9 +88,9 @@ static size_t numprotos; /* allocated s
static int *ports;
-#define INT_BIT (sizeof(int)*CHAR_BIT)
-#define SET_PORT(p) do { ports[p / INT_BIT] |= 1 << (p % INT_BIT); } while (0)
-#define CHK_PORT(p) (ports[p / INT_BIT] & (1 << (p % INT_BIT)))
+#defineINT_BIT (sizeof(int)*CHAR_BIT)
+#defineSET_PORT(p) do { ports[p / INT_BIT] |= 1 << (p % INT_BIT); }
while (0)
+#defineCHK_PORT(p) (ports[p / INT_BIT] & (1 << (p % INT_BIT)))
struct addr {
struct sockaddr_storage address;
@@ -111,7 +111,7 @@ struct sock {
struct sock *next;
};
-#define HASHSIZE 1009
+#defineHASHSIZE 1009
static struct sock *sockhash[HASHSIZE];
static struct xfile *xfiles;
@@ -131,7 +131,6 @@ xprintf(const char *fmt, ...)
return (len);
}
-
static int
get_proto_type(const char *proto)
{
@@ -147,7 +146,6 @@ get_proto_type(const char *proto)
return (pent->p_proto);
}
-
static void
init_protos(int num)
{
@@ -167,7 +165,6 @@ init_protos(int num)
numprotos = proto_count;
}
-
static int
parse_protos(char *protospec)
{
@@ -190,7 +187,6 @@ parse_protos(char *protospec)
return (proto_index);
}
-
static void
parse_ports(const char *portspec)
{
@@ -359,27 +355,27 @@ gather_sctp(void)
err(1, "malloc()");
switch (xladdr->address.sa.sa_family) {
case AF_INET:
-#define __IN_IS_ADDR_LOOPBACK(pina) \
+#define__IN_IS_ADDR_LOOPBACK(pina) \
((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET)
- if
(!__IN_IS_ADDR_LOOPBACK(&xladdr->address.sin.sin_addr))
+ if (!__IN_IS_ADDR_LOOPBACK(
+ &xladdr->address.sin.sin_addr))
local_all_loopback = 0;
-#undef __IN_IS_ADDR_LOOPBACK
- sockaddr(&laddr->address,
-AF_INET,
-&xladdr->address.sin.sin_addr,
-htons(xinpcb->local_port));
+#undef __IN_IS_ADDR_LOOPBACK
+ sockaddr(&laddr->address, AF_INET,
+ &xladdr->address.sin.sin_addr,
+ htons(xinpcb->local_port));
break;
case AF_INET6:
- if
(!IN6_IS_ADDR_LOOPBACK(&xladdr->address.sin6.sin6_addr))
+ if (!IN6_IS_ADDR_LOOPBACK(
+ &xladdr->address.sin6.sin6_addr))
local_all_loopback = 0;
- sockaddr(&laddr->address,
-AF_INET6,
-&xladdr->address.sin6.sin6_addr,
-htons(xinpcb->local_port));
+ sockaddr(&laddr->address, AF_INET6,
+ &xladdr->address.sin6.sin6_addr,
+ htons(xinpcb->local_port));
break;
default:
errx(1, "address family %d not supported",
-xladdr->address.sa.sa_family);
+ xladdr->address.sa.sa_family);
}
laddr->next = NULL;
if (prev_laddr == NULL)
@@ -389,33 +385,38 @@ gather_sctp(void)
prev_laddr = laddr;
}
if (sock->laddr == NULL) {
- if ((sock->laddr = calloc(1, sizeof(struct addr))) ==
NULL)
+ if ((sock->laddr =
+ calloc(1, sizeof(struct addr))) == NULL)
err(1, "malloc()");
sock->laddr->address.ss_family = sock->family;
if (sock->family == AF_INET)
- sock->laddr->address.ss_len = sizeof(struct
sockaddr_in);
+ sock->laddr->address.ss_len =
svn commit: r313803 - stable/10/usr.sbin/arp
Author: garga (ports committer)
Date: Thu Feb 16 09:19:29 2017
New Revision: 313803
URL: https://svnweb.freebsd.org/changeset/base/313803
Log:
MFC r313477:
Cleanup on usr.sbin/arp/arp.c
* 'blackhole' and 'reject' are mutually exclusive, replace printf() by errx()
when both are selected.
* 'trail' option is no longer supported since first import of arp from 4.4BSD.
XXX message was added 13 years ago in r128192. I believe it's time to remove
it.
* Use warnx() to print some informative messages instead of printf()
* Replace strncmp() by strcmp() when validating parameters and exit when
invalid
parameter is found
Reviewed by: allanjude, vangyzen, cem
Approved by: allanjude
MFC after:1 week
Sponsored by: Rubicon Communications (Netgate)
Differential Revision:https://reviews.freebsd.org/D9504
Modified:
stable/10/usr.sbin/arp/arp.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/arp/arp.c
==
--- stable/10/usr.sbin/arp/arp.cThu Feb 16 09:12:36 2017
(r313802)
+++ stable/10/usr.sbin/arp/arp.cThu Feb 16 09:19:29 2017
(r313803)
@@ -319,7 +319,7 @@ set(int argc, char **argv)
return (1);
doing_proxy = flags = expire_time = 0;
while (argc-- > 0) {
- if (strncmp(argv[0], "temp", 4) == 0) {
+ if (strcmp(argv[0], "temp") == 0) {
struct timespec tp;
int max_age;
size_t len = sizeof(max_age);
@@ -329,10 +329,10 @@ set(int argc, char **argv)
&max_age, &len, NULL, 0) != 0)
err(1, "sysctlbyname");
expire_time = tp.tv_sec + max_age;
- } else if (strncmp(argv[0], "pub", 3) == 0) {
+ } else if (strcmp(argv[0], "pub") == 0) {
flags |= RTF_ANNOUNCE;
doing_proxy = 1;
- if (argc && strncmp(argv[1], "only", 3) == 0) {
+ if (argc && strcmp(argv[1], "only") == 0) {
/*
* Compatibility: in pre FreeBSD 8 times
* the "only" keyword used to mean that
@@ -341,29 +341,28 @@ set(int argc, char **argv)
*/
argc--; argv++;
}
- } else if (strncmp(argv[0], "blackhole", 9) == 0) {
+ } else if (strcmp(argv[0], "blackhole") == 0) {
if (flags & RTF_REJECT) {
- printf("Choose one of blackhole or reject, "
+ errx(1, "Choose one of blackhole or reject, "
"not both.");
}
flags |= RTF_BLACKHOLE;
- } else if (strncmp(argv[0], "reject", 6) == 0) {
+ } else if (strcmp(argv[0], "reject") == 0) {
if (flags & RTF_BLACKHOLE) {
- printf("Choose one of blackhole or reject, "
+ errx(1, "Choose one of blackhole or reject, "
"not both.");
}
flags |= RTF_REJECT;
- } else if (strncmp(argv[0], "trail", 5) == 0) {
- /* XXX deprecated and undocumented feature */
- printf("%s: Sending trailers is no longer supported\n",
- host);
+ } else {
+ warnx("Invalid parameter '%s'", argv[0]);
+ usage();
}
argv++;
}
ea = (struct ether_addr *)LLADDR(&sdl_m);
if (doing_proxy && !strcmp(eaddr, "auto")) {
if (!get_ether_addr(dst->sin_addr.s_addr, ea)) {
- printf("no interface found for %s\n",
+ warnx("no interface found for %s",
inet_ntoa(dst->sin_addr));
return (1);
}
@@ -399,7 +398,7 @@ set(int argc, char **argv)
if ((sdl->sdl_family != AF_LINK) ||
(rtm->rtm_flags & RTF_GATEWAY) ||
!valid_type(sdl->sdl_type)) {
- printf("cannot intuit interface index and type for %s\n", host);
+ warnx("cannot intuit interface index and type for %s", host);
return (1);
}
sdl_m.sdl_type = sdl->sdl_type;
@@ -487,7 +486,7 @@ delete(char *host)
* is a proxy-arp entry to remove.
*/
if (flags & RTF_ANNOUNCE) {
- fprintf(stderr, "delete: cannot locate %s\n", host);
+ warnx("delete: cannot locate %s", host);
svn commit: r313802 - stable/11/usr.sbin/arp
Author: garga (ports committer)
Date: Thu Feb 16 09:12:36 2017
New Revision: 313802
URL: https://svnweb.freebsd.org/changeset/base/313802
Log:
MFC r313477:
Cleanup on usr.sbin/arp/arp.c
* 'blackhole' and 'reject' are mutually exclusive, replace printf() by errx()
when both are selected.
* 'trail' option is no longer supported since first import of arp from 4.4BSD.
XXX message was added 13 years ago in r128192. I believe it's time to remove
it.
* Use warnx() to print some informative messages instead of printf()
* Replace strncmp() by strcmp() when validating parameters and exit when
invalid
parameter is found
Reviewed by: allanjude, vangyzen, cem
Approved by: allanjude
MFC after:1 week
Sponsored by: Rubicon Communications (Netgate)
Differential Revision:https://reviews.freebsd.org/D9504
Modified:
stable/11/usr.sbin/arp/arp.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/usr.sbin/arp/arp.c
==
--- stable/11/usr.sbin/arp/arp.cThu Feb 16 06:52:53 2017
(r313801)
+++ stable/11/usr.sbin/arp/arp.cThu Feb 16 09:12:36 2017
(r313802)
@@ -319,7 +319,7 @@ set(int argc, char **argv)
return (1);
doing_proxy = flags = expire_time = 0;
while (argc-- > 0) {
- if (strncmp(argv[0], "temp", 4) == 0) {
+ if (strcmp(argv[0], "temp") == 0) {
struct timespec tp;
int max_age;
size_t len = sizeof(max_age);
@@ -329,10 +329,10 @@ set(int argc, char **argv)
&max_age, &len, NULL, 0) != 0)
err(1, "sysctlbyname");
expire_time = tp.tv_sec + max_age;
- } else if (strncmp(argv[0], "pub", 3) == 0) {
+ } else if (strcmp(argv[0], "pub") == 0) {
flags |= RTF_ANNOUNCE;
doing_proxy = 1;
- if (argc && strncmp(argv[1], "only", 3) == 0) {
+ if (argc && strcmp(argv[1], "only") == 0) {
/*
* Compatibility: in pre FreeBSD 8 times
* the "only" keyword used to mean that
@@ -341,29 +341,28 @@ set(int argc, char **argv)
*/
argc--; argv++;
}
- } else if (strncmp(argv[0], "blackhole", 9) == 0) {
+ } else if (strcmp(argv[0], "blackhole") == 0) {
if (flags & RTF_REJECT) {
- printf("Choose one of blackhole or reject, "
+ errx(1, "Choose one of blackhole or reject, "
"not both.");
}
flags |= RTF_BLACKHOLE;
- } else if (strncmp(argv[0], "reject", 6) == 0) {
+ } else if (strcmp(argv[0], "reject") == 0) {
if (flags & RTF_BLACKHOLE) {
- printf("Choose one of blackhole or reject, "
+ errx(1, "Choose one of blackhole or reject, "
"not both.");
}
flags |= RTF_REJECT;
- } else if (strncmp(argv[0], "trail", 5) == 0) {
- /* XXX deprecated and undocumented feature */
- printf("%s: Sending trailers is no longer supported\n",
- host);
+ } else {
+ warnx("Invalid parameter '%s'", argv[0]);
+ usage();
}
argv++;
}
ea = (struct ether_addr *)LLADDR(&sdl_m);
if (doing_proxy && !strcmp(eaddr, "auto")) {
if (!get_ether_addr(dst->sin_addr.s_addr, ea)) {
- printf("no interface found for %s\n",
+ warnx("no interface found for %s",
inet_ntoa(dst->sin_addr));
return (1);
}
@@ -399,7 +398,7 @@ set(int argc, char **argv)
if ((sdl->sdl_family != AF_LINK) ||
(rtm->rtm_flags & RTF_GATEWAY) ||
!valid_type(sdl->sdl_type)) {
- printf("cannot intuit interface index and type for %s\n", host);
+ warnx("cannot intuit interface index and type for %s", host);
return (1);
}
sdl_m.sdl_type = sdl->sdl_type;
@@ -487,7 +486,7 @@ delete(char *host)
* is a proxy-arp entry to remove.
*/
if (flags & RTF_ANNOUNCE) {
- fprintf(stderr, "delete: cannot locate %s\n", host);
+ warnx("delete: cannot locate %s", host);
svn commit: r313765 - stable/10/usr.sbin/arp
Author: garga (ports committer)
Date: Wed Feb 15 09:18:08 2017
New Revision: 313765
URL: https://svnweb.freebsd.org/changeset/base/313765
Log:
MFC r313457:
Fix style(9)
Reviewed by: vangyzen, allanjude, cem
Approved by: allanjude
MFC after:1 week
Sponsored by: Rubicon Communications (Netgate)
Differential Revision:https://reviews.freebsd.org/D9494
Modified:
stable/10/usr.sbin/arp/arp.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/arp/arp.c
==
--- stable/10/usr.sbin/arp/arp.cWed Feb 15 09:15:51 2017
(r313764)
+++ stable/10/usr.sbin/arp/arp.cWed Feb 15 09:18:08 2017
(r313765)
@@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$");
* arp - display, set, and delete arp table entries
*/
-
#include
#include
#include
@@ -80,8 +79,8 @@ __FBSDID("$FreeBSD$");
#include
#include
-typedef void (action_fn)(struct sockaddr_dl *sdl,
- struct sockaddr_in *s_in, struct rt_msghdr *rtm);
+typedef void (action_fn)(struct sockaddr_dl *sdl, struct sockaddr_in *s_in,
+struct rt_msghdr *rtm);
static int search(u_long addr, action_fn *action);
static action_fn print_entry;
@@ -344,18 +343,20 @@ set(int argc, char **argv)
}
} else if (strncmp(argv[0], "blackhole", 9) == 0) {
if (flags & RTF_REJECT) {
- printf("Choose one of blackhole or reject, not
both.\n");
+ printf("Choose one of blackhole or reject, "
+ "not both.");
}
flags |= RTF_BLACKHOLE;
} else if (strncmp(argv[0], "reject", 6) == 0) {
if (flags & RTF_BLACKHOLE) {
- printf("Choose one of blackhole or reject, not
both.\n");
+ printf("Choose one of blackhole or reject, "
+ "not both.");
}
flags |= RTF_REJECT;
} else if (strncmp(argv[0], "trail", 5) == 0) {
/* XXX deprecated and undocumented feature */
printf("%s: Sending trailers is no longer supported\n",
- host);
+ host);
}
argv++;
}
@@ -381,7 +382,7 @@ set(int argc, char **argv)
/*
* In the case a proxy-arp entry is being added for
-* a remote end point, the RTF_ANNOUNCE flag in the
+* a remote end point, the RTF_ANNOUNCE flag in the
* RTM_GET command is an indication to the kernel
* routing code that the interface associated with
* the prefix route covering the local end of the
@@ -467,7 +468,7 @@ delete(char *host)
sdl = (struct sockaddr_dl *)(SA_SIZE(addr) + (char *)addr);
/*
-* With the new L2/L3 restructure, the route
+* With the new L2/L3 restructure, the route
* returned is a prefix route. The important
* piece of information from the previous
* RTM_GET is the interface index. In the
@@ -486,7 +487,7 @@ delete(char *host)
* is a proxy-arp entry to remove.
*/
if (flags & RTF_ANNOUNCE) {
- fprintf(stderr, "delete: cannot locate %s\n",host);
+ fprintf(stderr, "delete: cannot locate %s\n", host);
return (1);
}
@@ -525,7 +526,7 @@ search(u_long addr, action_fn *action)
mib[5] = RTF_LLINFO;
#else
mib[5] = 0;
-#endif
+#endif
if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
err(1, "route-sysctl-estimate");
if (needed == 0)/* empty table */
@@ -575,7 +576,7 @@ print_entry(struct sockaddr_dl *sdl,
struct if_nameindex *p;
int seg;
- if (ifnameindex == NULL)
+ if (ifnameindex == NULL)
if ((ifnameindex = if_nameindex()) == NULL)
err(1, "cannot retrieve interface names");
@@ -597,7 +598,8 @@ print_entry(struct sockaddr_dl *sdl,
sdl->sdl_type == IFT_L2VLAN ||
sdl->sdl_type == IFT_BRIDGE) &&
sdl->sdl_alen == ETHER_ADDR_LEN)
- printf("%s", ether_ntoa((struct ether_addr
*)LLADDR(sdl)));
+ printf("%s",
+ ether_ntoa((struct ether_addr *)LLADDR(sdl)));
else {
int n = sdl->sdl_nlen > 0 ? sdl->sdl_nlen + 1 : 0;
@@ -607,7 +609,7 @@ print_entry(struct sockaddr_dl *sdl,
printf("(incomplete)");
for (p = ifnameindex; p && ifnameindex->if_index &&
-ifnameind
svn commit: r313764 - stable/10/usr.sbin/bsdinstall/scripts
Author: garga (ports committer) Date: Wed Feb 15 09:15:51 2017 New Revision: 313764 URL: https://svnweb.freebsd.org/changeset/base/313764 Log: MFC r313448: bsdinstall: Make sure chroot filesystems are umounted after use * DISTDIR_IS_UNIONFS is set every time BSDINSTALL_DISTDIR is mounted inside BSDINSTALL_CHROOT. Use this flag to decide if it needs to be umounted * BSDINSTALL_CHROOT/dev is mounted when 'bsdinstall mount' is called, there is no need to mount it again when user goes to shell after installation Reviewed by: allanjude Obtained from:pfSense MFC after:1 week Sponsored by: Rubicon Communications (Netgate) Differential Revision:https://reviews.freebsd.org/D8573 Modified: stable/10/usr.sbin/bsdinstall/scripts/auto Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/bsdinstall/scripts/auto == --- stable/10/usr.sbin/bsdinstall/scripts/auto Wed Feb 15 08:49:28 2017 (r313763) +++ stable/10/usr.sbin/bsdinstall/scripts/auto Wed Feb 15 09:15:51 2017 (r313764) @@ -387,9 +387,11 @@ finalconfig trap error SIGINT # SIGINT is bad again bsdinstall config || error "Failed to save config" +if [ -n "$DISTDIR_IS_UNIONFS" ]; then + umount -f $BSDINSTALL_DISTDIR +fi + if [ ! -z "$BSDINSTALL_FETCHDEST" ]; then - [ "$BSDINSTALL_FETCHDEST" != "$BSDINSTALL_DISTDIR" ] && \ - umount "$BSDINSTALL_DISTDIR" rm -rf "$BSDINSTALL_FETCHDEST" fi @@ -398,7 +400,6 @@ dialog --backtitle "FreeBSD Installer" - "The installation is now finished. Before exiting the installer, would you like to open a shell in the new system to make any final manual modifications?" 0 0 if [ $? -eq 0 ]; then clear - mount -t devfs devfs "$BSDINSTALL_CHROOT/dev" echo This shell is operating in a chroot in the new system. \ When finished making configuration changes, type \"exit\". chroot "$BSDINSTALL_CHROOT" /bin/sh 2>&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: r313763 - stable/11/usr.sbin/arp
Author: garga (ports committer)
Date: Wed Feb 15 08:49:28 2017
New Revision: 313763
URL: https://svnweb.freebsd.org/changeset/base/313763
Log:
MFC r313457:
Fix style(9)
Reviewed by: vangyzen, allanjude, cem
Approved by: allanjude
MFC after:1 week
Sponsored by: Rubicon Communications (Netgate)
Differential Revision:https://reviews.freebsd.org/D9494
Modified:
stable/11/usr.sbin/arp/arp.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/usr.sbin/arp/arp.c
==
--- stable/11/usr.sbin/arp/arp.cWed Feb 15 08:43:26 2017
(r313762)
+++ stable/11/usr.sbin/arp/arp.cWed Feb 15 08:49:28 2017
(r313763)
@@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$");
* arp - display, set, and delete arp table entries
*/
-
#include
#include
#include
@@ -80,8 +79,8 @@ __FBSDID("$FreeBSD$");
#include
#include
-typedef void (action_fn)(struct sockaddr_dl *sdl,
- struct sockaddr_in *s_in, struct rt_msghdr *rtm);
+typedef void (action_fn)(struct sockaddr_dl *sdl, struct sockaddr_in *s_in,
+struct rt_msghdr *rtm);
static int search(u_long addr, action_fn *action);
static action_fn print_entry;
@@ -344,18 +343,20 @@ set(int argc, char **argv)
}
} else if (strncmp(argv[0], "blackhole", 9) == 0) {
if (flags & RTF_REJECT) {
- printf("Choose one of blackhole or reject, not
both.\n");
+ printf("Choose one of blackhole or reject, "
+ "not both.");
}
flags |= RTF_BLACKHOLE;
} else if (strncmp(argv[0], "reject", 6) == 0) {
if (flags & RTF_BLACKHOLE) {
- printf("Choose one of blackhole or reject, not
both.\n");
+ printf("Choose one of blackhole or reject, "
+ "not both.");
}
flags |= RTF_REJECT;
} else if (strncmp(argv[0], "trail", 5) == 0) {
/* XXX deprecated and undocumented feature */
printf("%s: Sending trailers is no longer supported\n",
- host);
+ host);
}
argv++;
}
@@ -381,7 +382,7 @@ set(int argc, char **argv)
/*
* In the case a proxy-arp entry is being added for
-* a remote end point, the RTF_ANNOUNCE flag in the
+* a remote end point, the RTF_ANNOUNCE flag in the
* RTM_GET command is an indication to the kernel
* routing code that the interface associated with
* the prefix route covering the local end of the
@@ -467,7 +468,7 @@ delete(char *host)
sdl = (struct sockaddr_dl *)(SA_SIZE(addr) + (char *)addr);
/*
-* With the new L2/L3 restructure, the route
+* With the new L2/L3 restructure, the route
* returned is a prefix route. The important
* piece of information from the previous
* RTM_GET is the interface index. In the
@@ -486,7 +487,7 @@ delete(char *host)
* is a proxy-arp entry to remove.
*/
if (flags & RTF_ANNOUNCE) {
- fprintf(stderr, "delete: cannot locate %s\n",host);
+ fprintf(stderr, "delete: cannot locate %s\n", host);
return (1);
}
@@ -525,7 +526,7 @@ search(u_long addr, action_fn *action)
mib[5] = RTF_LLINFO;
#else
mib[5] = 0;
-#endif
+#endif
if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
err(1, "route-sysctl-estimate");
if (needed == 0)/* empty table */
@@ -575,7 +576,7 @@ print_entry(struct sockaddr_dl *sdl,
struct if_nameindex *p;
int seg;
- if (ifnameindex == NULL)
+ if (ifnameindex == NULL)
if ((ifnameindex = if_nameindex()) == NULL)
err(1, "cannot retrieve interface names");
@@ -597,7 +598,8 @@ print_entry(struct sockaddr_dl *sdl,
sdl->sdl_type == IFT_L2VLAN ||
sdl->sdl_type == IFT_BRIDGE) &&
sdl->sdl_alen == ETHER_ADDR_LEN)
- printf("%s", ether_ntoa((struct ether_addr
*)LLADDR(sdl)));
+ printf("%s",
+ ether_ntoa((struct ether_addr *)LLADDR(sdl)));
else {
int n = sdl->sdl_nlen > 0 ? sdl->sdl_nlen + 1 : 0;
@@ -607,7 +609,7 @@ print_entry(struct sockaddr_dl *sdl,
printf("(incomplete)");
for (p = ifnameindex; p && ifnameindex->if_index &&
-ifnameind
svn commit: r313762 - stable/11/usr.sbin/bsdinstall/scripts
Author: garga (ports committer) Date: Wed Feb 15 08:43:26 2017 New Revision: 313762 URL: https://svnweb.freebsd.org/changeset/base/313762 Log: MFC r313448: bsdinstall: Make sure chroot filesystems are umounted after use * DISTDIR_IS_UNIONFS is set every time BSDINSTALL_DISTDIR is mounted inside BSDINSTALL_CHROOT. Use this flag to decide if it needs to be umounted * BSDINSTALL_CHROOT/dev is mounted when 'bsdinstall mount' is called, there is no need to mount it again when user goes to shell after installation Reviewed by: allanjude Obtained from:pfSense MFC after:1 week Sponsored by: Rubicon Communications (Netgate) Differential Revision:https://reviews.freebsd.org/D8573 Modified: stable/11/usr.sbin/bsdinstall/scripts/auto Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/bsdinstall/scripts/auto == --- stable/11/usr.sbin/bsdinstall/scripts/auto Wed Feb 15 07:59:54 2017 (r313761) +++ stable/11/usr.sbin/bsdinstall/scripts/auto Wed Feb 15 08:43:26 2017 (r313762) @@ -449,9 +449,11 @@ finalconfig trap error SIGINT # SIGINT is bad again bsdinstall config || error "Failed to save config" +if [ -n "$DISTDIR_IS_UNIONFS" ]; then + umount -f $BSDINSTALL_DISTDIR +fi + if [ ! -z "$BSDINSTALL_FETCHDEST" ]; then - [ "$BSDINSTALL_FETCHDEST" != "$BSDINSTALL_DISTDIR" ] && \ - umount "$BSDINSTALL_DISTDIR" rm -rf "$BSDINSTALL_FETCHDEST" fi @@ -460,7 +462,6 @@ dialog --backtitle "FreeBSD Installer" - "The installation is now finished. Before exiting the installer, would you like to open a shell in the new system to make any final manual modifications?" 0 0 if [ $? -eq 0 ]; then clear - mount -t devfs devfs "$BSDINSTALL_CHROOT/dev" echo This shell is operating in a chroot in the new system. \ When finished making configuration changes, type \"exit\". chroot "$BSDINSTALL_CHROOT" /bin/sh 2>&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: r313745 - head/sbin/fsck_ffs
Author: garga (ports committer)
Date: Tue Feb 14 21:14:24 2017
New Revision: 313745
URL: https://svnweb.freebsd.org/changeset/base/313745
Log:
* Add missing parameters to usage()
* Add missing parameters to manpage synopsis
* Add missing description of -d flag
* Sort flags descriptions
Reviewed by: allanjude, kib
Approved by: allanjude
MFC after:1 week
Sponsored by: Rubicon Communications (Netgate)
Differential Revision:https://reviews.freebsd.org/D9152
Modified:
head/sbin/fsck_ffs/fsck_ffs.8
head/sbin/fsck_ffs/main.c
Modified: head/sbin/fsck_ffs/fsck_ffs.8
==
--- head/sbin/fsck_ffs/fsck_ffs.8 Tue Feb 14 21:05:36 2017
(r313744)
+++ head/sbin/fsck_ffs/fsck_ffs.8 Tue Feb 14 21:14:24 2017
(r313745)
@@ -29,7 +29,7 @@
.\"@(#)fsck.8 8.4 (Berkeley) 5/9/95
.\" $FreeBSD$
.\"
-.Dd October 5, 2016
+.Dd February 14, 2017
.Dt FSCK_FFS 8
.Os
.Sh NAME
@@ -38,7 +38,7 @@
.Nd file system consistency check and interactive repair
.Sh SYNOPSIS
.Nm
-.Op Fl BEFfnpRryZ
+.Op Fl BCdEFfnpRrSyZ
.Op Fl b Ar block
.Op Fl c Ar level
.Op Fl m Ar mode
@@ -149,45 +149,6 @@ If unexpected errors are found,
the file system is marked as needing a foreground check and
.Nm
exits without attempting any further cleaning.
-.It Fl E
-Clear unallocated blocks, notifying the underlying device that they
-are not used and that their contents may be discarded.
-This is useful for filesystems which have been mounted on systems
-without TRIM support, or with TRIM support disabled, as well as
-filesystems which have been copied from one device to another.
-.Pp
-See the
-.Fl E
-and
-.Fl t
-flags of
-.Xr newfs 8 ,
-and
-the
-.Fl t
-flag of
-.Xr tunefs 8 .
-.It Fl F
-Determine whether the file system needs to be cleaned immediately
-in foreground, or if its cleaning can be deferred to background.
-To be eligible for background cleaning it must have been running
-with soft updates, not have been marked as needing a foreground check,
-and be mounted and writable when the background check is to be done.
-If these conditions are met, then
-.Nm
-exits with a zero exit status.
-Otherwise it exits with a non-zero exit status.
-If the file system is clean,
-it will exit with a non-zero exit status so that the clean status
-of the file system can be verified and reported during the foreground
-checks.
-Note that when invoked with the
-.Fl F
-flag, no cleanups are done.
-The only thing that
-.Nm
-does is to determine whether a foreground or background
-check is needed and exit with an appropriate status code.
.It Fl b
Use the block specified immediately after the flag as
the super block for the file system.
@@ -243,6 +204,47 @@ first line of output from
This option implies the
.Fl f
flag.
+.It Fl d
+Enable debugging messages.
+.It Fl E
+Clear unallocated blocks, notifying the underlying device that they
+are not used and that their contents may be discarded.
+This is useful for filesystems which have been mounted on systems
+without TRIM support, or with TRIM support disabled, as well as
+filesystems which have been copied from one device to another.
+.Pp
+See the
+.Fl E
+and
+.Fl t
+flags of
+.Xr newfs 8 ,
+and
+the
+.Fl t
+flag of
+.Xr tunefs 8 .
+.It Fl F
+Determine whether the file system needs to be cleaned immediately
+in foreground, or if its cleaning can be deferred to background.
+To be eligible for background cleaning it must have been running
+with soft updates, not have been marked as needing a foreground check,
+and be mounted and writable when the background check is to be done.
+If these conditions are met, then
+.Nm
+exits with a zero exit status.
+Otherwise it exits with a non-zero exit status.
+If the file system is clean,
+it will exit with a non-zero exit status so that the clean status
+of the file system can be verified and reported during the foreground
+checks.
+Note that when invoked with the
+.Fl F
+flag, no cleanups are done.
+The only thing that
+.Nm
+does is to determine whether a foreground or background
+check is needed and exit with an appropriate status code.
.It Fl f
Force
.Nm
Modified: head/sbin/fsck_ffs/main.c
==
--- head/sbin/fsck_ffs/main.c Tue Feb 14 21:05:36 2017(r313744)
+++ head/sbin/fsck_ffs/main.c Tue Feb 14 21:14:24 2017(r313745)
@@ -670,7 +670,7 @@ static void
usage(void)
{
(void) fprintf(stderr,
-"usage: %s [-BEFfnpry] [-b block] [-c level] [-m mode] filesystem ...\n",
+"usage: %s [-BCdEFfnpRrSyZ] [-b block] [-c level] [-m mode] filesystem ...\n",
getprogname());
exit(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: r313737 - head/usr.sbin/ndp
Author: garga (ports committer)
Date: Tue Feb 14 18:11:16 2017
New Revision: 313737
URL: https://svnweb.freebsd.org/changeset/base/313737
Log:
Fix style(9)
Reviewed by: allanjude, vangyzen
Approved by: allanjude
MFC after:1 week
Sponsored by: Rubicon Communications (Netgate)
Differential Revision:https://reviews.freebsd.org/D9510
Modified:
head/usr.sbin/ndp/ndp.c
Modified: head/usr.sbin/ndp/ndp.c
==
--- head/usr.sbin/ndp/ndp.c Tue Feb 14 18:03:17 2017(r313736)
+++ head/usr.sbin/ndp/ndp.c Tue Feb 14 18:11:16 2017(r313737)
@@ -109,10 +109,11 @@
#include
#include "gmt2local.h"
-#define NEXTADDR(w, s) \
- if (rtm->rtm_addrs & (w)) { \
- bcopy((char *)&s, cp, sizeof(s)); cp += SA_SIZE(&s);}
-
+#defineNEXTADDR(w, s) \
+ if (rtm->rtm_addrs & (w)) { \
+ bcopy((char *)&s, cp, sizeof(s)); \
+ cp += SA_SIZE(&s); \
+ }
static pid_t pid;
static int nflag;
@@ -529,10 +530,10 @@ delete:
printf("cannot locate %s\n", host);
return (1);
}
-/*
- * need to reinit the field because it has rt_key
- * but we want the actual address
- */
+ /*
+* need to reinit the field because it has rt_key
+* but we want the actual address
+*/
NEXTADDR(RTA_DST, sin_m);
rtm->rtm_flags |= RTF_LLDATA;
if (rtmsg(RTM_DELETE) == 0) {
@@ -604,7 +605,8 @@ again:;
rtm = (struct rt_msghdr *)next;
sin = (struct sockaddr_in6 *)(rtm + 1);
- sdl = (struct sockaddr_dl *)((char *)sin +
ALIGN(sin->sin6_len));
+ sdl = (struct sockaddr_dl *)((char *)sin +
+ ALIGN(sin->sin6_len));
/*
* Some OSes can produce a route that has the LINK flag but
@@ -724,7 +726,7 @@ again:;
isrouter ? "R" : "",
(rtm->rtm_flags & RTF_ANNOUNCE) ? "p" : "");
} else {
-#if 0 /* W and P are mystery even for us */
+#if 0 /* W and P are mystery even for us */
sin = (struct sockaddr_in6 *)
(sdl->sdl_len + (char *)sdl);
snprintf(flgbuf, sizeof(flgbuf), "%s%s%s%s",
@@ -855,7 +857,7 @@ rtmsg(int cmd)
rtm->rtm_inits = RTV_EXPIRE;
}
rtm->rtm_flags |= (RTF_HOST | RTF_STATIC | RTF_LLDATA);
-#if 0 /* we don't support ipv6addr/128 type proxying */
+#if 0 /* we don't support ipv6addr/128 type proxying */
if (rtm->rtm_flags & RTF_ANNOUNCE) {
rtm->rtm_flags &= ~RTF_HOST;
rtm->rtm_addrs |= RTA_NETMASK;
@@ -868,7 +870,7 @@ rtmsg(int cmd)
NEXTADDR(RTA_DST, sin_m);
NEXTADDR(RTA_GATEWAY, sdl_m);
-#if 0 /* we don't support ipv6addr/128 type proxying */
+#if 0 /* we don't support ipv6addr/128 type proxying */
memset(&so_mask.sin6_addr, 0xff, sizeof(so_mask.sin6_addr));
NEXTADDR(RTA_NETMASK, so_mask);
#endif
@@ -913,7 +915,7 @@ ifinfo(char *ifname, int argc, char **ar
err(1, "ioctl(SIOCGIFINFO_IN6)");
/* NOTREACHED */
}
-#define ND nd.ndi
+#defineND nd.ndi
newflags = ND.flags;
for (i = 0; i < argc; i++) {
int clear = 0;
@@ -924,35 +926,33 @@ ifinfo(char *ifname, int argc, char **ar
cp++;
}
-#define SETFLAG(s, f) \
- do {\
- if (strcmp(cp, (s)) == 0) {\
- if (clear)\
- newflags &= ~(f);\
- else\
- newflags |= (f);\
- }\
- } while (0)
+#defineSETFLAG(s, f) do { \
+ if (strcmp(cp, (s)) == 0) { \
+ if (clear) \
+ newflags &= ~(f); \
+ else\
+ newflags |= (f);\
+ } \
+} while (0)
/*
* XXX: this macro is not 100% correct, in that it matches "nud" against
* "nudbogus". But we just let it go since this is minor.
*/
-#define SETVALUE(f, v) \
- do { \
- char *valptr; \
- unsigned long newval; \
- v = 0; /* unspecified */ \
- if (strncmp(cp, f, strlen(f)) == 0) { \
- valptr = strchr(cp, '='); \
- if (valptr == NULL) \
- err(1, "syntax error in %s field", (f)); \
- errno = 0; \
- newval = strtoul(++valptr
svn commit: r313477 - head/usr.sbin/arp
Author: garga (ports committer)
Date: Thu Feb 9 19:58:12 2017
New Revision: 313477
URL: https://svnweb.freebsd.org/changeset/base/313477
Log:
Cleanup on usr.sbin/arp/arp.c
* 'blackhole' and 'reject' are mutually exclusive, replace printf() by errx()
when both are selected.
* 'trail' option is no longer supported since first import of arp from 4.4BSD.
XXX message was added 13 years ago in r128192. I believe it's time to remove
it.
* Use warnx() to print some informative messages instead of printf()
* Replace strncmp() by strcmp() when validating parameters and exit when
invalid
parameter is found
Reviewed by: allanjude, vangyzen, cem
Approved by: allanjude
MFC after:1 week
Sponsored by: Rubicon Communications (Netgate)
Differential Revision:https://reviews.freebsd.org/D9504
Modified:
head/usr.sbin/arp/arp.c
Modified: head/usr.sbin/arp/arp.c
==
--- head/usr.sbin/arp/arp.c Thu Feb 9 17:48:33 2017(r313476)
+++ head/usr.sbin/arp/arp.c Thu Feb 9 19:58:12 2017(r313477)
@@ -319,7 +319,7 @@ set(int argc, char **argv)
return (1);
doing_proxy = flags = expire_time = 0;
while (argc-- > 0) {
- if (strncmp(argv[0], "temp", 4) == 0) {
+ if (strcmp(argv[0], "temp") == 0) {
struct timespec tp;
int max_age;
size_t len = sizeof(max_age);
@@ -329,10 +329,10 @@ set(int argc, char **argv)
&max_age, &len, NULL, 0) != 0)
err(1, "sysctlbyname");
expire_time = tp.tv_sec + max_age;
- } else if (strncmp(argv[0], "pub", 3) == 0) {
+ } else if (strcmp(argv[0], "pub") == 0) {
flags |= RTF_ANNOUNCE;
doing_proxy = 1;
- if (argc && strncmp(argv[1], "only", 3) == 0) {
+ if (argc && strcmp(argv[1], "only") == 0) {
/*
* Compatibility: in pre FreeBSD 8 times
* the "only" keyword used to mean that
@@ -341,29 +341,28 @@ set(int argc, char **argv)
*/
argc--; argv++;
}
- } else if (strncmp(argv[0], "blackhole", 9) == 0) {
+ } else if (strcmp(argv[0], "blackhole") == 0) {
if (flags & RTF_REJECT) {
- printf("Choose one of blackhole or reject, "
+ errx(1, "Choose one of blackhole or reject, "
"not both.");
}
flags |= RTF_BLACKHOLE;
- } else if (strncmp(argv[0], "reject", 6) == 0) {
+ } else if (strcmp(argv[0], "reject") == 0) {
if (flags & RTF_BLACKHOLE) {
- printf("Choose one of blackhole or reject, "
+ errx(1, "Choose one of blackhole or reject, "
"not both.");
}
flags |= RTF_REJECT;
- } else if (strncmp(argv[0], "trail", 5) == 0) {
- /* XXX deprecated and undocumented feature */
- printf("%s: Sending trailers is no longer supported\n",
- host);
+ } else {
+ warnx("Invalid parameter '%s'", argv[0]);
+ usage();
}
argv++;
}
ea = (struct ether_addr *)LLADDR(&sdl_m);
if (doing_proxy && !strcmp(eaddr, "auto")) {
if (!get_ether_addr(dst->sin_addr.s_addr, ea)) {
- printf("no interface found for %s\n",
+ warnx("no interface found for %s",
inet_ntoa(dst->sin_addr));
return (1);
}
@@ -399,7 +398,7 @@ set(int argc, char **argv)
if ((sdl->sdl_family != AF_LINK) ||
(rtm->rtm_flags & RTF_GATEWAY) ||
!valid_type(sdl->sdl_type)) {
- printf("cannot intuit interface index and type for %s\n", host);
+ warnx("cannot intuit interface index and type for %s", host);
return (1);
}
sdl_m.sdl_type = sdl->sdl_type;
@@ -487,7 +486,7 @@ delete(char *host)
* is a proxy-arp entry to remove.
*/
if (flags & RTF_ANNOUNCE) {
- fprintf(stderr, "delete: cannot locate %s\n", host);
+ warnx("delete: cannot locate %s", host);
return (1);
}
@@ -870,9 +869,8 @@ get_ether_addr(in_addr_
svn commit: r313457 - head/usr.sbin/arp
Author: garga (ports committer)
Date: Wed Feb 8 20:21:29 2017
New Revision: 313457
URL: https://svnweb.freebsd.org/changeset/base/313457
Log:
Fix style(9)
Reviewed by: vangyzen, allanjude, cem
Approved by: allanjude
MFC after:1 week
Sponsored by: Rubicon Communications (Netgate)
Differential Revision:https://reviews.freebsd.org/D9494
Modified:
head/usr.sbin/arp/arp.c
Modified: head/usr.sbin/arp/arp.c
==
--- head/usr.sbin/arp/arp.c Wed Feb 8 20:08:38 2017(r313456)
+++ head/usr.sbin/arp/arp.c Wed Feb 8 20:21:29 2017(r313457)
@@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$");
* arp - display, set, and delete arp table entries
*/
-
#include
#include
#include
@@ -80,8 +79,8 @@ __FBSDID("$FreeBSD$");
#include
#include
-typedef void (action_fn)(struct sockaddr_dl *sdl,
- struct sockaddr_in *s_in, struct rt_msghdr *rtm);
+typedef void (action_fn)(struct sockaddr_dl *sdl, struct sockaddr_in *s_in,
+struct rt_msghdr *rtm);
static int search(u_long addr, action_fn *action);
static action_fn print_entry;
@@ -344,18 +343,20 @@ set(int argc, char **argv)
}
} else if (strncmp(argv[0], "blackhole", 9) == 0) {
if (flags & RTF_REJECT) {
- printf("Choose one of blackhole or reject, not
both.\n");
+ printf("Choose one of blackhole or reject, "
+ "not both.");
}
flags |= RTF_BLACKHOLE;
} else if (strncmp(argv[0], "reject", 6) == 0) {
if (flags & RTF_BLACKHOLE) {
- printf("Choose one of blackhole or reject, not
both.\n");
+ printf("Choose one of blackhole or reject, "
+ "not both.");
}
flags |= RTF_REJECT;
} else if (strncmp(argv[0], "trail", 5) == 0) {
/* XXX deprecated and undocumented feature */
printf("%s: Sending trailers is no longer supported\n",
- host);
+ host);
}
argv++;
}
@@ -381,7 +382,7 @@ set(int argc, char **argv)
/*
* In the case a proxy-arp entry is being added for
-* a remote end point, the RTF_ANNOUNCE flag in the
+* a remote end point, the RTF_ANNOUNCE flag in the
* RTM_GET command is an indication to the kernel
* routing code that the interface associated with
* the prefix route covering the local end of the
@@ -467,7 +468,7 @@ delete(char *host)
sdl = (struct sockaddr_dl *)(SA_SIZE(addr) + (char *)addr);
/*
-* With the new L2/L3 restructure, the route
+* With the new L2/L3 restructure, the route
* returned is a prefix route. The important
* piece of information from the previous
* RTM_GET is the interface index. In the
@@ -486,7 +487,7 @@ delete(char *host)
* is a proxy-arp entry to remove.
*/
if (flags & RTF_ANNOUNCE) {
- fprintf(stderr, "delete: cannot locate %s\n",host);
+ fprintf(stderr, "delete: cannot locate %s\n", host);
return (1);
}
@@ -525,7 +526,7 @@ search(u_long addr, action_fn *action)
mib[5] = RTF_LLINFO;
#else
mib[5] = 0;
-#endif
+#endif
if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
err(1, "route-sysctl-estimate");
if (needed == 0)/* empty table */
@@ -575,7 +576,7 @@ print_entry(struct sockaddr_dl *sdl,
struct if_nameindex *p;
int seg;
- if (ifnameindex == NULL)
+ if (ifnameindex == NULL)
if ((ifnameindex = if_nameindex()) == NULL)
err(1, "cannot retrieve interface names");
@@ -597,7 +598,8 @@ print_entry(struct sockaddr_dl *sdl,
sdl->sdl_type == IFT_L2VLAN ||
sdl->sdl_type == IFT_BRIDGE) &&
sdl->sdl_alen == ETHER_ADDR_LEN)
- printf("%s", ether_ntoa((struct ether_addr
*)LLADDR(sdl)));
+ printf("%s",
+ ether_ntoa((struct ether_addr *)LLADDR(sdl)));
else {
int n = sdl->sdl_nlen > 0 ? sdl->sdl_nlen + 1 : 0;
@@ -607,7 +609,7 @@ print_entry(struct sockaddr_dl *sdl,
printf("(incomplete)");
for (p = ifnameindex; p && ifnameindex->if_index &&
-ifnameindex->if_name; p++) {
+ ifnameindex->if_name; p++) {
if (p->if_index == sdl
svn commit: r313448 - head/usr.sbin/bsdinstall/scripts
Author: garga (ports committer) Date: Wed Feb 8 17:03:52 2017 New Revision: 313448 URL: https://svnweb.freebsd.org/changeset/base/313448 Log: bsdinstall: Make sure chroot filesystems are umounted after use * DISTDIR_IS_UNIONFS is set every time BSDINSTALL_DISTDIR is mounted inside BSDINSTALL_CHROOT. Use this flag to decide if it needs to be umounted * BSDINSTALL_CHROOT/dev is mounted when 'bsdinstall mount' is called, there is no need to mount it again when user goes to shell after installation Reviewed by: allanjude Obtained from:pfSense MFC after:1 week Sponsored by: Rubicon Communications (Netgate) Differential Revision:https://reviews.freebsd.org/D8573 Modified: head/usr.sbin/bsdinstall/scripts/auto Modified: head/usr.sbin/bsdinstall/scripts/auto == --- head/usr.sbin/bsdinstall/scripts/auto Wed Feb 8 16:46:57 2017 (r313447) +++ head/usr.sbin/bsdinstall/scripts/auto Wed Feb 8 17:03:52 2017 (r313448) @@ -449,9 +449,11 @@ finalconfig trap error SIGINT # SIGINT is bad again bsdinstall config || error "Failed to save config" +if [ -n "$DISTDIR_IS_UNIONFS" ]; then + umount -f $BSDINSTALL_DISTDIR +fi + if [ ! -z "$BSDINSTALL_FETCHDEST" ]; then - [ "$BSDINSTALL_FETCHDEST" != "$BSDINSTALL_DISTDIR" ] && \ - umount "$BSDINSTALL_DISTDIR" rm -rf "$BSDINSTALL_FETCHDEST" fi @@ -460,7 +462,6 @@ dialog --backtitle "FreeBSD Installer" - "The installation is now finished. Before exiting the installer, would you like to open a shell in the new system to make any final manual modifications?" 0 0 if [ $? -eq 0 ]; then clear - mount -t devfs devfs "$BSDINSTALL_CHROOT/dev" echo This shell is operating in a chroot in the new system. \ When finished making configuration changes, type \"exit\". chroot "$BSDINSTALL_CHROOT" /bin/sh 2>&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"
Re: svn commit: r313048 - in head: contrib/tcpdump contrib/tcpdump/lbl contrib/tcpdump/missing usr.sbin/tcpdump/tcpdump
> On 1 Feb 2017, at 18:26, Gleb Smirnoff wrote: > > Author: glebius > Date: Wed Feb 1 20:26:42 2017 > New Revision: 313048 > URL: https://svnweb.freebsd.org/changeset/base/313048 > > Log: > Update tcpdump to 4.9.0. > > It fixes many buffer overflow in different protocol parsers, but none of > them are critical, even in absense of Capsicum. > > Security:CVE-2016-7922, CVE-2016-7923, CVE-2016-7924, CVE-2016-7925 > Security:CVE-2016-7926, CVE-2016-7927, CVE-2016-7928, CVE-2016-7929 > Security:CVE-2016-7930, CVE-2016-7931, CVE-2016-7932, CVE-2016-7933 > Security:CVE-2016-7934, CVE-2016-7935, CVE-2016-7936, CVE-2016-7937 > Security:CVE-2016-7938, CVE-2016-7939, CVE-2016-7940, CVE-2016-7973 > Security:CVE-2016-7974, CVE-2016-7975, CVE-2016-7983, CVE-2016-7984 > Security:CVE-2016-7985, CVE-2016-7986, CVE-2016-7992, CVE-2016-7993 > Security:CVE-2016-8574, CVE-2016-8575, CVE-2017-5202, CVE-2017-5203 > Security:CVE-2017-5204, CVE-2017-5205, CVE-2017-5341, CVE-2017-5342 > Security:CVE-2017-5482, CVE-2017-5483, CVE-2017-5484, CVE-2017-5485 > Security:CVE-2017-5486 Hi Gleb, Do you plan to MFC it to stable/11 and stable/10? -- Renato Botelho ___ 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: r293829 - head/sys/net
Alexander,
Looks like this change introduced a bug. It was reported at pfSense and a
ticket was opened at bugzilla:
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=215122
> On 13 Jan 2016, at 12:32, Alexander V. Chernikov wrote:
>
> Author: melifaro
> Date: Wed Jan 13 14:32:48 2016
> New Revision: 293829
> URL: https://svnweb.freebsd.org/changeset/base/293829
>
> Log:
> Remove RTF_RNH_LOCKED support from rtalloc1_fib().
>
> Last caller using it was eliminated in r293471.
>
> Sponsored by:Yandex LLC
>
> Modified:
> head/sys/net/route.c
> head/sys/net/route.h
>
> Modified: head/sys/net/route.c
> ==
> --- head/sys/net/route.c Wed Jan 13 14:28:12 2016(r293828)
> +++ head/sys/net/route.c Wed Jan 13 14:32:48 2016(r293829)
> @@ -409,7 +409,6 @@ rtalloc1_fib(struct sockaddr *dst, int r
> struct rtentry *newrt;
> struct rt_addrinfo info;
> int err = 0, msgtype = RTM_MISS;
> - int needlock;
>
> KASSERT((fibnum < rt_numfibs), ("rtalloc1_fib: bad fibnum"));
> rnh = rt_tables_get_rnh(fibnum, dst->sa_family);
> @@ -420,23 +419,16 @@ rtalloc1_fib(struct sockaddr *dst, int r
> /*
>* Look up the address in the table for that Address Family
>*/
> - needlock = !(ignflags & RTF_RNH_LOCKED);
> - if (needlock)
> - RADIX_NODE_HEAD_RLOCK(rnh);
> -#ifdef INVARIANTS
> - else
> - RADIX_NODE_HEAD_LOCK_ASSERT(rnh);
> -#endif
> + RADIX_NODE_HEAD_RLOCK(rnh);
> rn = rnh->rnh_matchaddr(dst, rnh);
> if (rn && ((rn->rn_flags & RNF_ROOT) == 0)) {
> newrt = RNTORT(rn);
> RT_LOCK(newrt);
> RT_ADDREF(newrt);
> - if (needlock)
> - RADIX_NODE_HEAD_RUNLOCK(rnh);
> - goto done;
> + RADIX_NODE_HEAD_RUNLOCK(rnh);
> + return (newrt);
>
> - } else if (needlock)
> + } else
> RADIX_NODE_HEAD_RUNLOCK(rnh);
>
> /*
> @@ -456,10 +448,7 @@ miss:
> bzero(&info, sizeof(info));
> info.rti_info[RTAX_DST] = dst;
> rt_missmsg_fib(msgtype, &info, 0, err, fibnum);
> - }
> -done:
> - if (newrt)
> - RT_LOCK_ASSERT(newrt);
> + }
> return (newrt);
> }
>
>
> Modified: head/sys/net/route.h
> ==
> --- head/sys/net/route.h Wed Jan 13 14:28:12 2016(r293828)
> +++ head/sys/net/route.h Wed Jan 13 14:32:48 2016(r293829)
> @@ -175,7 +175,7 @@ struct rtentry {
> /* 0x800 and up unassigned */
> #define RTF_STICKY 0x1000 /* always route dst->src */
>
> -#define RTF_RNH_LOCKED 0x4000 /* radix node head is locked */
> +#define RTF_RNH_LOCKED 0x4000 /* unused */
>
> #define RTF_GWFLAG_COMPAT 0x8000/* a compatibility bit for
> interacting
> with existing routing apps */
> ___
> svn-src-h...@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
--
Renato Botelho
___
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: r306219 - head/sys/dev/oce
> On 22 Sep 2016, at 19:51, Josh Paetzel wrote: > > Author: jpaetzel > Date: Thu Sep 22 22:51:11 2016 > New Revision: 306219 > URL: https://svnweb.freebsd.org/changeset/base/306219 > > Log: > Update oce to version 11.0.50.0 > > Submitted by:Venkat Duvvuru Hi Josh, Do you have plans to MFC it? This version seems to fix a problem reported by users at: https://lists.freebsd.org/pipermail/freebsd-net/2015-June/042530.html <https://lists.freebsd.org/pipermail/freebsd-net/2015-June/042530.html> This single line change is part of the update. If you don’t have plans to MFC the whole driver updated, it would be nice if we at least import this fix Regards -- Renato Botelho ___ 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: r308443 - head/bin/hostname
> On 8 Nov 2016, at 09:36, Marcelo Araujo wrote:
>
> Author: araujo
> Date: Tue Nov 8 11:36:33 2016
> New Revision: 308443
> URL: https://svnweb.freebsd.org/changeset/base/308443
>
> Log:
> Add -d flag that prints domain only.
>
> PR: 212875
> Submitted by:Ben RUBSON
> Reviewed by: pi
>
> Modified:
> head/bin/hostname/hostname.1
> head/bin/hostname/hostname.c
>
> Modified: head/bin/hostname/hostname.1
> ==
> --- head/bin/hostname/hostname.1 Tue Nov 8 10:10:55 2016
> (r308442)
> +++ head/bin/hostname/hostname.1 Tue Nov 8 11:36:33 2016
> (r308443)
> @@ -29,7 +29,7 @@
> .\" @(#)hostname.1 8.2 (Berkeley) 4/28/95
> .\" $FreeBSD$
> .\"
> -.Dd December 7, 2006
> +.Dd November 9, 2016
> .Dt HOSTNAME 1
> .Os
> .Sh NAME
> @@ -37,7 +37,8 @@
> .Nd set or print name of current host system
> .Sh SYNOPSIS
> .Nm
> -.Op Fl fs
> +.Op Fl f
> +.Op Fl s|d
> .Op Ar name-of-host
> .Sh DESCRIPTION
> The
> @@ -62,6 +63,8 @@ This is the default behavior.
> .It Fl s
> Trim off any domain information from the printed
> name.
> +.It Fl d
> +Only print domain information.
> .El
> .Sh SEE ALSO
> .Xr gethostname 3 ,
>
> Modified: head/bin/hostname/hostname.c
> ==
> --- head/bin/hostname/hostname.c Tue Nov 8 10:10:55 2016
> (r308442)
> +++ head/bin/hostname/hostname.c Tue Nov 8 11:36:33 2016
> (r308443)
> @@ -54,11 +54,12 @@ static void usage(void) __dead2;
> int
> main(int argc, char *argv[])
> {
> - int ch, sflag;
> + int ch, sflag, dflag;
> char *p, hostname[MAXHOSTNAMELEN];
>
> sflag = 0;
> - while ((ch = getopt(argc, argv, "fs")) != -1)
> + dflag = 0;
> + while ((ch = getopt(argc, argv, "fsd")) != -1)
> switch (ch) {
> case 'f':
> /*
> @@ -70,6 +71,9 @@ main(int argc, char *argv[])
> case 's':
> sflag = 1;
> break;
> + case 'd':
> + dflag = 1;
> + break;
> case '?':
> default:
> usage();
> @@ -77,7 +81,7 @@ main(int argc, char *argv[])
> argc -= optind;
> argv += optind;
>
> - if (argc > 1)
> + if (argc > 1 || (sflag && dflag))
> usage();
>
> if (*argv) {
> @@ -90,6 +94,10 @@ main(int argc, char *argv[])
> p = strchr(hostname, '.');
> if (p != NULL)
> *p = '\0';
> + } else if (dflag) {
> + p = strchr(hostname, '.');
> + if (p != NULL)
> + strcpy(hostname, ++p);
> }
> (void)printf("%s\n", hostname);
> }
> @@ -100,6 +108,6 @@ static void
> usage(void)
> {
>
> - (void)fprintf(stderr, "usage: hostname [-fs] [name-of-host]\n");
> + (void)fprintf(stderr, "usage: hostname [-f] [s|d] [name-of-host]\n");
It’s missing ‘-‘ sign on [s|d] block, what makes message a bit confused IMO.
Maybe [-s|-d] would be more clear.
--
Renato Botelho
___
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: r308139 - in head: etc/mtree usr.sbin/cron/cron usr.sbin/cron/lib
> On 31 Oct 2016, at 16:20, Baptiste Daroussin wrote: > > Author: bapt > Date: Mon Oct 31 18:20:12 2016 > New Revision: 308139 > URL: https://svnweb.freebsd.org/changeset/base/308139 > > Log: > cron(8): add support for /etc/cron.d and /usr/local/etc/cron.d > > For automation tools it is way easier to maintain files in directories rather > than modifying /etc/crontab. > > The files in those directories are in the same format as /etc/crontab Thank you! -- Renato Botelho ___ 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: r306289 - head/sys/net
> On 24 Sep 2016, at 04:09, Kristof Provost wrote: > > Author: kp > Date: Sat Sep 24 07:09:43 2016 > New Revision: 306289 > URL: https://svnweb.freebsd.org/changeset/base/306289 > > Log: > bridge: Fix fragment handling and memory leak > > Fragmented UDP and ICMP packets were corrupted if a firewall with > reassembling > feature (like pf'scrub) is enabled on the bridge. This patch fixes corrupted > packet problem and the panic (triggered easly with low RAM) as explain in PR > 185633. > > bridge_pfil and bridge_fragment relationship: > > bridge_pfil() receive (IN direction) packets and sent it to the firewall The > firewall can be configured for reassembling fragmented packet (like > pf'scrubing) > in one mbuf chain when bridge_pfil() need to send this reassembled packet to > the > outgoing interface, it needs to re-fragment it by using bridge_fragment() > bridge_fragment() had to split this mbuf (using ip_fragment) first then > had to M_PREPEND each packet in the mbuf chain for adding Ethernet > header. > > But M_PREPEND can sometime create a new mbuf on the begining of the mbuf > chain, > then the "main" pointer of this mbuf chain should be updated and this case is > tottaly forgotten. The original bridge_fragment code (Revision 158140, > 2006 April 29) came from OpenBSD, and the call to bridge_enqueue was > embedded. But on FreeBSD, bridge_enqueue() is done after bridge_fragment(), > then the original OpenBSD code can't work as-it of FreeBSD. > > PR: 185633 > Submitted by:Olivier Cochard-Labbé > Differential Revision: https://reviews.freebsd.org/D7780 Kristof, Do you hace plans to MFC it to stable/11 and stable/10? -- Renato Botelho ___ 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: r301603 - head/contrib/blacklist/bin
Author: garga (ports committer) Date: Wed Jun 8 11:58:03 2016 New Revision: 301603 URL: https://svnweb.freebsd.org/changeset/base/301603 Log: Move misplaced break statement to right place Reported by: Coverity CID: 1304340 Reviewed by: lidl Differential Revision:https://reviews.freebsd.org/D6749 Sponsored by: Rubicon Communications (Netgate) Modified: head/contrib/blacklist/bin/blacklistctl.c Modified: head/contrib/blacklist/bin/blacklistctl.c == --- head/contrib/blacklist/bin/blacklistctl.c Wed Jun 8 11:47:19 2016 (r301602) +++ head/contrib/blacklist/bin/blacklistctl.c Wed Jun 8 11:58:03 2016 (r301603) @@ -96,10 +96,10 @@ main(int argc, char *argv[]) break; case 'b': blocked = 1; + break; case 'D': dbname = optarg; break; - break; case 'd': debug++; break; ___ 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: r301280 - head/release
Author: garga (ports committer)
Date: Fri Jun 3 18:37:56 2016
New Revision: 301280
URL: https://svnweb.freebsd.org/changeset/base/301280
Log:
One of the already implemented options in release/Makefile is NOSRC. When
it's defined, installation image is shipped without source distribution
(src.txz)
Add the hability of defining NOSRC in release.conf and pass it to
'make release' argument
Approved by: gjb
Sponsored by: Rubicon Communications (Netgate)
Differential Revision:https://reviews.freebsd.org/D6710
Modified:
head/release/release.conf.sample
head/release/release.sh
Modified: head/release/release.conf.sample
==
--- head/release/release.conf.sampleFri Jun 3 18:23:45 2016
(r301279)
+++ head/release/release.conf.sampleFri Jun 3 18:37:56 2016
(r301280)
@@ -51,6 +51,7 @@ PORTBRANCH="ports/head@rHEAD"
## Set miscellaneous 'make release' settings.
#NODOC=
#NOPORTS=
+#NOSRC=
#WITH_DVD=
#WITH_COMPRESSED_IMAGES=
Modified: head/release/release.sh
==
--- head/release/release.sh Fri Jun 3 18:23:45 2016(r301279)
+++ head/release/release.sh Fri Jun 3 18:37:56 2016(r301280)
@@ -102,6 +102,9 @@ env_setup() {
NODOC=
NOPORTS=
+ # Set to non-empty value to disable distributing source tree.
+ NOSRC=
+
# Set to non-empty value to build dvd1.iso as part of the release.
WITH_DVD=
WITH_COMPRESSED_IMAGES=
@@ -160,15 +163,18 @@ env_check() {
NODOC=yes
fi
- # If NOPORTS and/or NODOC are unset, they must not pass to make as
- # variables. The release makefile verifies definedness of the
+ # If NOSRC, NOPORTS and/or NODOC are unset, they must not pass to make
+ # as variables. The release makefile verifies definedness of the
# NOPORTS/NODOC variables instead of their values.
- DOCPORTS=
+ SRCDOCPORTS=
if [ -n "${NOPORTS}" ]; then
- DOCPORTS="NOPORTS=yes "
+ SRCDOCPORTS="NOPORTS=yes"
fi
if [ -n "${NODOC}" ]; then
- DOCPORTS="${DOCPORTS}NODOC=yes"
+ SRCDOCPORTS="${SRCDOCPORTS}${SRCDOCPORTS:+ }NODOC=yes"
+ fi
+ if [ -n "${NOSRC}" ]; then
+ SRCDOCPORTS="${SRCDOCPORTS}${SRCDOCPORTS:+ }NOSRC=yes"
fi
# The aggregated build-time flags based upon variables defined within
@@ -206,7 +212,7 @@ env_check() {
RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} \
KERNCONF=\"${KERNEL}\" ${ARCH_FLAGS} ${CONF_FILES}"
RELEASE_RMAKEFLAGS="${ARCH_FLAGS} \
- KERNCONF=\"${KERNEL}\" ${CONF_FILES} ${DOCPORTS} \
+ KERNCONF=\"${KERNEL}\" ${CONF_FILES} ${SRCDOCPORTS} \
WITH_DVD=${WITH_DVD} WITH_VMIMAGES=${WITH_VMIMAGES} \
WITH_CLOUDWARE=${WITH_CLOUDWARE} XZ_THREADS=${XZ_THREADS}"
___
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: r301226 - in head: etc etc/defaults etc/periodic/security etc/rc.d lib lib/libblacklist libexec libexec/blacklistd-helper share/mk tools/build/mk usr.sbin usr.sbin/blacklistctl usr.sbi
> On Jun 2, 2016, at 16:24, Renato Botelho wrote: > >> On Jun 2, 2016, at 16:06, Kurt Lidl wrote: >> >> Author: lidl >> Date: Thu Jun 2 19:06:04 2016 >> New Revision: 301226 >> URL: https://svnweb.freebsd.org/changeset/base/301226 >> >> Log: >> Add basic blacklist build support >> >> Reviewed by: rpaulo >> Approved by: rpaulo >> Relnotes:YES >> Sponsored by:The FreeBSD Foundation >> Differential Revision: https://reviews.freebsd.org/D5913 >> >> Added: >> head/etc/blacklistd.conf (contents, props changed) >> head/etc/rc.d/blacklistd (contents, props changed) >> head/lib/libblacklist/ >> head/lib/libblacklist/Makefile (contents, props changed) >> head/libexec/blacklistd-helper/ >> head/libexec/blacklistd-helper/Makefile (contents, props changed) >> head/usr.sbin/blacklistctl/ >> head/usr.sbin/blacklistctl/Makefile (contents, props changed) >> head/usr.sbin/blacklistd/ >> head/usr.sbin/blacklistd/Makefile (contents, props changed) >> Modified: >> head/etc/Makefile >> head/etc/defaults/rc.conf >> head/etc/periodic/security/520.pfdenied >> head/etc/rc.d/Makefile >> head/lib/Makefile >> head/libexec/Makefile >> head/share/mk/bsd.libnames.mk >> head/share/mk/src.libnames.mk >> head/share/mk/src.opts.mk >> head/tools/build/mk/OptionalObsoleteFiles.inc >> head/usr.sbin/Makefile > > Looks like it’s missing man pages, no? nvm my fat finger, now I saw the other commit. Sorry for the noise. -- Renato Botelho ___ 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: r301226 - in head: etc etc/defaults etc/periodic/security etc/rc.d lib lib/libblacklist libexec libexec/blacklistd-helper share/mk tools/build/mk usr.sbin usr.sbin/blacklistctl usr.sbi
> On Jun 2, 2016, at 16:06, Kurt Lidl wrote: > > Author: lidl > Date: Thu Jun 2 19:06:04 2016 > New Revision: 301226 > URL: https://svnweb.freebsd.org/changeset/base/301226 > > Log: > Add basic blacklist build support > > Reviewed by: rpaulo > Approved by: rpaulo > Relnotes:YES > Sponsored by:The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D5913 > > Added: > head/etc/blacklistd.conf (contents, props changed) > head/etc/rc.d/blacklistd (contents, props changed) > head/lib/libblacklist/ > head/lib/libblacklist/Makefile (contents, props changed) > head/libexec/blacklistd-helper/ > head/libexec/blacklistd-helper/Makefile (contents, props changed) > head/usr.sbin/blacklistctl/ > head/usr.sbin/blacklistctl/Makefile (contents, props changed) > head/usr.sbin/blacklistd/ > head/usr.sbin/blacklistd/Makefile (contents, props changed) > Modified: > head/etc/Makefile > head/etc/defaults/rc.conf > head/etc/periodic/security/520.pfdenied > head/etc/rc.d/Makefile > head/lib/Makefile > head/libexec/Makefile > head/share/mk/bsd.libnames.mk > head/share/mk/src.libnames.mk > head/share/mk/src.opts.mk > head/tools/build/mk/OptionalObsoleteFiles.inc > head/usr.sbin/Makefile Looks like it’s missing man pages, no? -- Renato Botelho ___ 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: r300057 - stable/10/sbin/reboot
Author: garga (ports committer)
Date: Tue May 17 14:52:05 2016
New Revision: 300057
URL: https://svnweb.freebsd.org/changeset/base/300057
Log:
MFC r299196:
Add missing parameters -N and -l to reroot and halt usage()
Approved by: bapt
Sponsored by: Rubicon Communications (Netgate)
Differential Revision:https://reviews.freebsd.org/D6173
Modified:
stable/10/sbin/reboot/reboot.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sbin/reboot/reboot.c
==
--- stable/10/sbin/reboot/reboot.c Tue May 17 14:10:45 2016
(r300056)
+++ stable/10/sbin/reboot/reboot.c Tue May 17 14:52:05 2016
(r300057)
@@ -248,8 +248,8 @@ usage(void)
{
(void)fprintf(stderr, dohalt ?
- "usage: halt [-lnpq] [-k kernel]\n" :
- "usage: reboot [-dlnpq] [-k kernel]\n");
+ "usage: halt [-lNnpq] [-k kernel]\n" :
+ "usage: reboot [-dlNnpqr] [-k kernel]\n");
exit(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: r299196 - head/sbin/reboot
Author: garga (ports committer)
Date: Fri May 6 20:49:14 2016
New Revision: 299196
URL: https://svnweb.freebsd.org/changeset/base/299196
Log:
Add missing parameters -N and -l to reroot and halt usage()
Approved by: bapt
Sponsored by: Rubicon Communications (Netgate)
Differential Revision:https://reviews.freebsd.org/D6173
Modified:
head/sbin/reboot/reboot.c
Modified: head/sbin/reboot/reboot.c
==
--- head/sbin/reboot/reboot.c Fri May 6 20:32:39 2016(r299195)
+++ head/sbin/reboot/reboot.c Fri May 6 20:49:14 2016(r299196)
@@ -248,8 +248,8 @@ usage(void)
{
(void)fprintf(stderr, dohalt ?
- "usage: halt [-lnpq] [-k kernel]\n" :
- "usage: reboot [-dlnpq] [-k kernel]\n");
+ "usage: halt [-lNnpq] [-k kernel]\n" :
+ "usage: reboot [-dlNnpqr] [-k kernel]\n");
exit(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"
Re: svn commit: r298107 - in head: . bin/cat bin/cat/tests bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/date/tests bin/dd bin/dd/tests bin/df bin/domainname bin/echo bin/ed bin/expr bin/
> On Apr 16, 2016, at 04:45, Glen Barber wrote: > > Author: gjb > Date: Sat Apr 16 07:45:30 2016 > New Revision: 298107 > URL: https://svnweb.freebsd.org/changeset/base/298107 > > Log: > Merge the projects/release-pkg branch to head. > > This allows packaging the base system with pkg(8), including > but not limited to providing the ability to provide upstream > binary update possibilities for non-tier-1 architectures. > > This merge is a requirement of the 11.0-RELEASE, and as such, > thank you to everyone that has tested the project branch. > > Documentation in build(7) etc. is still somewhat sparse, but > updates to those parts will follow. > > Sponsored by:The FreeBSD Foundation > Glen, During CFT message you mentioned a patch should be applied to ports-mgmt/pkg to keep track of base shared libraries. Is it still necessary? If yes, do you know when it’s going to be applied in pkg? -- Renato Botelho ___ 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: r296548 - in head/sys: dev/agp dev/drm2 dev/drm2/i915 modules/drm2/i915kms
> On Mar 9, 2016, at 20:10, Renato Botelho wrote: > >> On Mar 9, 2016, at 19:47, Jean-Sébastien Pédron wrote: >> >> On 09/03/2016 16:58, Renato Botelho wrote: >>> After revert it to r296547 and manually apply ZFS fix I can >>> successfully load i915kms during boot. >> >> Yeah, I never test to load DRM drivers from /boot/loader.conf. I confirm >> it doesn't work with Haswell at least. I have no idea how to debug this. >> >> Is it sufficient for you to load the driver from /etc/rc.conf instead? >> You can try the following line: >> kld_list="i915kms" >> >> It achieves the same result, but it's faster to boot and works. > > Didn’t know about it, I’ll start using it and will let you know. Thanks! It works, thanks! -- Renato Botelho signature.asc Description: Message signed with OpenPGP using GPGMail
Re: svn commit: r296548 - in head/sys: dev/agp dev/drm2 dev/drm2/i915 modules/drm2/i915kms
> On Mar 9, 2016, at 19:47, Jean-Sébastien Pédron wrote: > > On 09/03/2016 16:58, Renato Botelho wrote: >> After revert it to r296547 and manually apply ZFS fix I can >> successfully load i915kms during boot. > > Yeah, I never test to load DRM drivers from /boot/loader.conf. I confirm > it doesn't work with Haswell at least. I have no idea how to debug this. > > Is it sufficient for you to load the driver from /etc/rc.conf instead? > You can try the following line: >kld_list="i915kms" > > It achieves the same result, but it's faster to boot and works. Didn’t know about it, I’ll start using it and will let you know. Thanks! -- Renato Botelho signature.asc Description: Message signed with OpenPGP using GPGMail
Re: svn commit: r296548 - in head/sys: dev/agp dev/drm2 dev/drm2/i915 modules/drm2/i915kms
> On Mar 9, 2016, at 12:58, Renato Botelho wrote: > >> On Mar 9, 2016, at 12:33, Renato Botelho wrote: >> >>> On Mar 9, 2016, at 08:07, Jean-Sébastien Pédron >>> wrote: >>> >>> On 09/03/2016 10:48, Renato Botelho wrote: >>>> >>>> I cannot boot anymore after moving to this revision. My laptop is a >>>> ThinkPad T430 (IvyBridge). >>> >>> Hi! >>> >>> Could you please test the following things? >>> >>> 1. Try to boot without loading i915kms from /boot/loader.conf, then >>> kldload it manually and see what happens. >> >> It works fine if I load it after boot. >> >>> 2. Try to boot a kernel built with the parent commit >> >> I’ll revert tree to parent commit, apply ZFS fix manually and rebuild then I >> will let you know > > After revert it to r296547 and manually apply ZFS fix I can successfully load > i915kms during boot. > > Just let me know what I can do to help from now to collect all the data you > need. I’ll move it to recent -current and load i915kms after boot. Here is dmesg output on r296567, loading i915kms after boot and running startx: Copyright (c) 1992-2016 The FreeBSD Project. Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994 The Regents of the University of California. All rights reserved. FreeBSD is a registered trademark of The FreeBSD Foundation. FreeBSD 11.0-CURRENT #6 r296567: Wed Mar 9 15:08:44 BRT 2016 root@:/usr/obj/usr/src/sys/GENERIC amd64 FreeBSD clang version 3.8.0 (tags/RELEASE_380/final 262564) (based on LLVM 3.8.0) WARNING: WITNESS option enabled, expect reduced performance. VT(efifb): resolution 640x480 CPU: Intel(R) Core(TM) i5-3210M CPU @ 2.50GHz (2494.39-MHz K8-class CPU) Origin="GenuineIntel" Id=0x306a9 Family=0x6 Model=0x3a Stepping=9 Features=0xbfebfbff Features2=0x7fbae3bf AMD Features=0x28100800 AMD Features2=0x1 Structured Extended Features=0x281 XSAVE Features=0x1 VT-x: PAT,HLT,MTF,PAUSE,EPT,UG,VPID TSC: P-state invariant, performance statistics real memory = 12884901888 (12288 MB) avail memory = 12233527296 (11666 MB) Event timer "LAPIC" quality 600 ACPI APIC Table: FreeBSD/SMP: Multiprocessor System Detected: 4 CPUs FreeBSD/SMP: 1 package(s) x 2 core(s) x 2 SMT threads cpu0 (BSP): APIC ID: 0 cpu1 (AP): APIC ID: 1 cpu2 (AP): APIC ID: 2 cpu3 (AP): APIC ID: 3 random: unblocking device. ioapic0 irqs 0-23 on motherboard random: entropy device external interface kbd1 at kbdmux0 netmap: loaded module module_register_init: MOD_LOAD (vesa, 0x80efff90, 0) error 19 random: registering fast source Intel Secure Key RNG random: fast provider: "Intel Secure Key RNG" cryptosoft0: on motherboard acpi0: on motherboard acpi_ec0: port 0x62,0x66 on acpi0 acpi0: Power Button (fixed) cpu0: on acpi0 cpu1: on acpi0 cpu2: on acpi0 cpu3: on acpi0 attimer0: port 0x40-0x43 irq 0 on acpi0 Timecounter "i8254" frequency 1193182 Hz quality 0 Event timer "i8254" frequency 1193182 Hz quality 100 hpet0: iomem 0xfed0-0xfed003ff on acpi0 Timecounter "HPET" frequency 14318180 Hz quality 950 Event timer "HPET" frequency 14318180 Hz quality 550 Event timer "HPET1" frequency 14318180 Hz quality 440 Event timer "HPET2" frequency 14318180 Hz quality 440 Event timer "HPET3" frequency 14318180 Hz quality 440 Event timer "HPET4" frequency 14318180 Hz quality 440 atrtc0: port 0x70-0x71 irq 8 on acpi0 Event timer "RTC" frequency 32768 Hz quality 0 Timecounter "ACPI-fast" frequency 3579545 Hz quality 900 acpi_timer0: <24-bit timer at 3.579545MHz> port 0x408-0x40b on acpi0 acpi_lid0: on acpi0 acpi_button0: on acpi0 pcib0: port 0xcf8-0xcff on acpi0 pci0: on pcib0 vgapci0: port 0x6000-0x603f mem 0xf000-0xf03f,0xe000-0xefff at device 2.0 on pci0 agp0: on vgapci0 agp0: aperture size is 256M, detected 65532k stolen memory vgapci0: Boot video device xhci0: mem 0xf252-0xf252 at device 20.0 on pci0 xhci0: 32 bytes context size, 64-bit DMA xhci0: Port routing mask set to 0x usbus0 on xhci0 pci0: at device 22.0 (no driver attached) em0: port 0x6080-0x609f mem 0xf250-0xf251,0xf253b000-0xf253bfff at device 25.0 on pci0 em0: Using an MSI interrupt em0: Ethernet address: 00:21:cc:ca:81:68 em0: netmap queues/slots: TX 1/1024, RX 1/1024 ehci0: mem 0xf253a000-0xf253a3ff at device 26.0 on pci0 usbus1: EHCI version 1.0 usbus1 on ehci0 hdac0: mem 0xf253-0xf2533fff at device 27.0 on pci0 pcib1: at device 28.0 on pci0 pci1: on pcib1 sdhci_pci0: mem 0xf1d0-0xf1d000ff at device 0.0 on pci1 sdhci_pci0: 1 slot(s) allocated pcib2: at device 28.1 on pci0 pci2: on pcib2 rtwn0: port 0x4000-0x40ff mem 0xf1c0-
Re: svn commit: r296548 - in head/sys: dev/agp dev/drm2 dev/drm2/i915 modules/drm2/i915kms
> On Mar 9, 2016, at 12:33, Renato Botelho wrote: > >> On Mar 9, 2016, at 08:07, Jean-Sébastien Pédron wrote: >> >> On 09/03/2016 10:48, Renato Botelho wrote: >>>> Author: dumbbell >>>> Date: Tue Mar 8 20:33:02 2016 >>>> New Revision: 296548 >>>> URL: https://svnweb.freebsd.org/changeset/base/296548 >>>> >>>> Log: >>>> drm/i915: Update to match Linux 3.8.13 >>> >>> I cannot boot anymore after moving to this revision. My laptop is a >>> ThinkPad T430 (IvyBridge). >> >> Hi! >> >> Could you please test the following things? >> >> 1. Try to boot without loading i915kms from /boot/loader.conf, then >> kldload it manually and see what happens. > > It works fine if I load it after boot. > >> 2. Try to boot a kernel built with the parent commit > > I’ll revert tree to parent commit, apply ZFS fix manually and rebuild then I > will let you know After revert it to r296547 and manually apply ZFS fix I can successfully load i915kms during boot. Just let me know what I can do to help from now to collect all the data you need. I’ll move it to recent -current and load i915kms after boot. -- Renato Botelho signature.asc Description: Message signed with OpenPGP using GPGMail
Re: svn commit: r296548 - in head/sys: dev/agp dev/drm2 dev/drm2/i915 modules/drm2/i915kms
> On Mar 9, 2016, at 08:07, Jean-Sébastien Pédron wrote: > > On 09/03/2016 10:48, Renato Botelho wrote: >>> Author: dumbbell >>> Date: Tue Mar 8 20:33:02 2016 >>> New Revision: 296548 >>> URL: https://svnweb.freebsd.org/changeset/base/296548 >>> >>> Log: >>> drm/i915: Update to match Linux 3.8.13 >> >> I cannot boot anymore after moving to this revision. My laptop is a ThinkPad >> T430 (IvyBridge). > > Hi! > > Could you please test the following things? > > 1. Try to boot without loading i915kms from /boot/loader.conf, then > kldload it manually and see what happens. It works fine if I load it after boot. > 2. Try to boot a kernel built with the parent commit I’ll revert tree to parent commit, apply ZFS fix manually and rebuild then I will let you know -- Renato Botelho signature.asc Description: Message signed with OpenPGP using GPGMail
Re: svn commit: r296548 - in head/sys: dev/agp dev/drm2 dev/drm2/i915 modules/drm2/i915kms
> On Mar 9, 2016, at 08:07, Jean-Sébastien Pédron wrote: > > On 09/03/2016 10:48, Renato Botelho wrote: >>> Author: dumbbell >>> Date: Tue Mar 8 20:33:02 2016 >>> New Revision: 296548 >>> URL: https://svnweb.freebsd.org/changeset/base/296548 >>> >>> Log: >>> drm/i915: Update to match Linux 3.8.13 >> >> I cannot boot anymore after moving to this revision. My laptop is a ThinkPad >> T430 (IvyBridge). > > Hi! > > Could you please test the following things? > > 1. Try to boot without loading i915kms from /boot/loader.conf, then > kldload it manually and see what happens. > 2. Try to boot a kernel built with the parent commit Looks like something broke the system completely, I’m getting core dumps on ZFS and cannot mount all my partitions. Maybe this could be the cause of the problems with i915 too. I’ll work on recovering my system to a good state and then I will do a bisect to detect if this particular revision really broke it and will let you know. Thanks -- Renato Botelho signature.asc Description: Message signed with OpenPGP using GPGMail
Re: svn commit: r296548 - in head/sys: dev/agp dev/drm2 dev/drm2/i915 modules/drm2/i915kms
> On Mar 8, 2016, at 17:33, Jean-Sébastien Pédron wrote: > > Author: dumbbell > Date: Tue Mar 8 20:33:02 2016 > New Revision: 296548 > URL: https://svnweb.freebsd.org/changeset/base/296548 > > Log: > drm/i915: Update to match Linux 3.8.13 > > This update brings initial support for Haswell GPUs. > > Tested by: Many users of FreeBSD, PC-BSD and HardenedBSD > Relnotes:yes > Sponsored by:The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D5554 I cannot boot anymore after moving to this revision. My laptop is a ThinkPad T430 (IvyBridge). I got some warnings like info: [drm] MTRR allocation failed. Graphics performance may suffer. and in the end it just stops with these last 3 messages: info: [drm] MSI enabled 1 message(s) info: [drm] Supports vblank timestamp caching Rev 1 (10.10.2010). info: [drm] Driver supports precise vblank timestamp query. And never pass this point. By default I’m using GENERIC-NODEBUG, I’ll boot with old kernel and rebuild it using GENERIC to make sure I can collect more data. -- Renato Botelho ___ 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: r295894 - stable/10/sys/netpfil/pf
Author: garga (ports committer)
Date: Mon Feb 22 17:18:36 2016
New Revision: 295894
URL: https://svnweb.freebsd.org/changeset/base/295894
Log:
MFC r286641 (from oshogbo):
Use correct src/dst ports when removing states.
Submitted by: Milosz Kaniewski ,
UMEZAWA Takeshi (orginal)
Reviewed by: glebius
Approved by: re (marius)
Obtained from:OpenBSD
Sponsored by: Rubicon Communications (Netgate)
Differential revision:https://reviews.freebsd.org/D5392
Modified:
stable/10/sys/netpfil/pf/pf_ioctl.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/netpfil/pf/pf_ioctl.c
==
--- stable/10/sys/netpfil/pf/pf_ioctl.c Mon Feb 22 14:54:50 2016
(r295893)
+++ stable/10/sys/netpfil/pf/pf_ioctl.c Mon Feb 22 17:18:36 2016
(r295894)
@@ -1661,13 +1661,13 @@ relock_DIOCKILLSTATES:
if (s->direction == PF_OUT) {
srcaddr = &sk->addr[1];
dstaddr = &sk->addr[0];
- srcport = sk->port[0];
+ srcport = sk->port[1];
dstport = sk->port[0];
} else {
srcaddr = &sk->addr[0];
dstaddr = &sk->addr[1];
srcport = sk->port[0];
- dstport = sk->port[0];
+ dstport = sk->port[1];
}
if ((!psk->psk_af || sk->af == psk->psk_af)
___
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: r294530 - head/sys/sys
> On Jan 21, 2016, at 18:44, Ed Maste wrote:
>
> Author: emaste
> Date: Thu Jan 21 20:44:21 2016
> New Revision: 294530
> URL: https://svnweb.freebsd.org/changeset/base/294530
>
> Log:
> Add STB_GNU_UNIQUE symbol binding definition
>
> Red Hat created STB_GNU_UNIQUE to handle certain special cases relating
> to dynamically loading C++ DSOs[1].
>
> We don't (currently) have support for STB_GNU_UNIQUE, but ought to
> reserve the value in ELFNN_ST_BIND. This will also be used by an
> upcoming ELF Tool Chain import.
>
> [1] https://www.redhat.com/archives/posix-c++-wg/2009-August/msg2.html
>
> MFC after: 1 week
> Sponsored by:The FreeBSD Foundation
>
> Modified:
> head/sys/sys/elf_common.h
>
> Modified: head/sys/sys/elf_common.h
> ==
> --- head/sys/sys/elf_common.h Thu Jan 21 19:19:24 2016(r294529)
> +++ head/sys/sys/elf_common.h Thu Jan 21 20:44:21 2016(r294530)
> @@ -753,8 +753,9 @@ typedef struct {
> #define STB_LOCAL 0 /* Local symbol */
> #define STB_GLOBAL 1 /* Global symbol */
> #define STB_WEAK2 /* like global - lower precedence */
> -#define STB_LOOS10 /* Reserved range for operating system
> */
> -#define STB_HIOS12 /* specific semantics. */
> +#define STB_LOOS10 /* Start of operating system reserved
> range. */
> +#define STB_GNU_UNIQUE 10 /* Unique symbol (GNU) */
Looks like you meant to use 11 here, no?
> +#define STB_HIOS12 /* End of operating system reserved
> range. */
> #define STB_LOPROC 13 /* reserved range for processor */
> #define STB_HIPROC 15 /* specific semantics. */
>
> ___
> svn-src-h...@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
--
Renato Botelho
___
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: r293932 - stable/10/tools/build/mk
Author: garga (ports committer)
Date: Thu Jan 14 14:21:43 2016
New Revision: 293932
URL: https://svnweb.freebsd.org/changeset/base/293932
Log:
MFC r293357:
Obsolete inetd related files when WITHOUT_INETD is set
Reviewed by: bapt
Approved by: gnn
Sponsored by: Rubiconn Communications (Netgate)
Differential Revision:https://reviews.freebsd.org/D4742
Modified:
stable/10/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Thu Jan 14 14:20:33
2016(r293931)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Thu Jan 14 14:21:43
2016(r293932)
@@ -2204,6 +2204,13 @@ OLD_FILES+=rescue/ping6
# to be filled in
#.endif
+.if ${MK_INETD} == no
+OLD_FILES+=etc/rc.d/inetd
+OLD_FILES+=usr/sbin/inetd
+OLD_FILES+=usr/share/man/man5/inetd.conf.5.gz
+OLD_FILES+=usr/share/man/man8/inetd.8.gz
+.endif
+
.if ${MK_IPFILTER} == no
OLD_FILES+=etc/periodic/security/510.ipfdenied
OLD_FILES+=rescue/ipf
___
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: r293929 - in stable/10: usr.bin/cap_mkdb usr.sbin/services_mkdb
Author: garga (ports committer)
Date: Thu Jan 14 14:18:10 2016
New Revision: 293929
URL: https://svnweb.freebsd.org/changeset/base/293929
Log:
MFC r293312:
Make cap_mkdb and services_mkdb file operations sync
Similar fix was done for passwd and group operations in r285050. When a
temporary file is created and then renamed to replace official file there
are no checks to make sure data was written to disk and if a power cycle
happens at this time, system can end up with a 0 length file
Approved by: bapt
Sponsored by: Netgate
Differential Revision:https://reviews.freebsd.org/D2982
Modified:
stable/10/usr.bin/cap_mkdb/cap_mkdb.c
stable/10/usr.sbin/services_mkdb/services_mkdb.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.bin/cap_mkdb/cap_mkdb.c
==
--- stable/10/usr.bin/cap_mkdb/cap_mkdb.c Thu Jan 14 14:17:05 2016
(r293928)
+++ stable/10/usr.bin/cap_mkdb/cap_mkdb.c Thu Jan 14 14:18:10 2016
(r293929)
@@ -119,7 +119,7 @@ main(int argc, char *argv[])
(void)snprintf(buf, sizeof(buf), "%s.db", capname ? capname : *argv);
if ((capname = strdup(buf)) == NULL)
errx(1, "strdup failed");
- if ((capdbp = dbopen(capname, O_CREAT | O_TRUNC | O_RDWR,
+ if ((capdbp = dbopen(capname, O_CREAT | O_TRUNC | O_RDWR | O_SYNC,
DEFFILEMODE, DB_HASH, &openinfo)) == NULL)
err(1, "%s", buf);
Modified: stable/10/usr.sbin/services_mkdb/services_mkdb.c
==
--- stable/10/usr.sbin/services_mkdb/services_mkdb.cThu Jan 14 14:17:05
2016(r293928)
+++ stable/10/usr.sbin/services_mkdb/services_mkdb.cThu Jan 14 14:18:10
2016(r293929)
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
#include
@@ -91,6 +92,8 @@ main(int argc, char *argv[])
size_t cnt = 0;
StringList *sl, ***svc;
size_t port, proto;
+ char *dbname_dir;
+ int dbname_dir_fd = -1;
setprogname(argv[0]);
@@ -138,7 +141,7 @@ main(int argc, char *argv[])
err(1, "Cannot install exit handler");
(void)snprintf(tname, sizeof(tname), "%s.tmp", dbname);
- db = dbopen(tname, O_RDWR | O_CREAT | O_EXCL,
+ db = dbopen(tname, O_RDWR | O_CREAT | O_EXCL | O_SYNC,
(S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH), DB_HASH, &hinfo);
if (!db)
err(1, "Error opening temporary database `%s'", tname);
@@ -164,8 +167,21 @@ main(int argc, char *argv[])
if ((db->close)(db))
err(1, "Error closing temporary database `%s'", tname);
- if (rename(tname, dbname) == -1)
+ /*
+* Make sure file is safe on disk. To improve performance we will call
+* fsync() to the directory where file lies
+*/
+ if (rename(tname, dbname) == -1 ||
+ (dbname_dir = dirname(dbname)) == NULL ||
+ (dbname_dir_fd = open(dbname_dir, O_RDONLY|O_DIRECTORY)) == -1 ||
+ fsync(dbname_dir_fd) != 0) {
+ if (dbname_dir_fd != -1)
+ close(dbname_dir_fd);
err(1, "Cannot rename `%s' to `%s'", tname, dbname);
+ }
+
+ if (dbname_dir_fd != -1)
+ close(dbname_dir_fd);
return 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: r293357 - head/tools/build/mk
Author: garga (ports committer)
Date: Thu Jan 7 20:37:18 2016
New Revision: 293357
URL: https://svnweb.freebsd.org/changeset/base/293357
Log:
Obsolete inetd related files when WITHOUT_INETD is set
Reviewed by: bapt
Approved by: gnn
MFC after:1 week
Sponsored by: Rubiconn Communications (Netgate)
Differential Revision:https://reviews.freebsd.org/D4742
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Thu Jan 7 20:37:07
2016(r293356)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Thu Jan 7 20:37:18
2016(r293357)
@@ -2834,6 +2834,13 @@ OLD_FILES+=usr/share/man/man8/traceroute
OLD_FILES+=rescue/ping6
.endif
+.if ${MK_INETD} == no
+OLD_FILES+=etc/rc.d/inetd
+OLD_FILES+=usr/sbin/inetd
+OLD_FILES+=usr/share/man/man5/inetd.conf.5.gz
+OLD_FILES+=usr/share/man/man8/inetd.8.gz
+.endif
+
.if ${MK_IPFILTER} == no
OLD_FILES+=etc/periodic/security/510.ipfdenied
OLD_FILES+=etc/periodic/security/610.ipf6denied
___
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: r293312 - in head: usr.bin/cap_mkdb usr.sbin/services_mkdb
Author: garga (ports committer)
Date: Thu Jan 7 10:39:13 2016
New Revision: 293312
URL: https://svnweb.freebsd.org/changeset/base/293312
Log:
Make cap_mkdb and services_mkdb file operations sync
Similar fix was done for passwd and group operations in r285050. When a
temporary file is created and then renamed to replace official file there
are no checks to make sure data was written to disk and if a power cycle
happens at this time, system can end up with a 0 length file
Approved by: bapt
MFC after:1 week
Sponsored by: Netgate
Differential Revision:https://reviews.freebsd.org/D2982
Modified:
head/usr.bin/cap_mkdb/cap_mkdb.c
head/usr.sbin/services_mkdb/services_mkdb.c
Modified: head/usr.bin/cap_mkdb/cap_mkdb.c
==
--- head/usr.bin/cap_mkdb/cap_mkdb.cThu Jan 7 10:20:03 2016
(r293311)
+++ head/usr.bin/cap_mkdb/cap_mkdb.cThu Jan 7 10:39:13 2016
(r293312)
@@ -119,7 +119,7 @@ main(int argc, char *argv[])
(void)snprintf(buf, sizeof(buf), "%s.db", capname ? capname : *argv);
if ((capname = strdup(buf)) == NULL)
errx(1, "strdup failed");
- if ((capdbp = dbopen(capname, O_CREAT | O_TRUNC | O_RDWR,
+ if ((capdbp = dbopen(capname, O_CREAT | O_TRUNC | O_RDWR | O_SYNC,
DEFFILEMODE, DB_HASH, &openinfo)) == NULL)
err(1, "%s", buf);
Modified: head/usr.sbin/services_mkdb/services_mkdb.c
==
--- head/usr.sbin/services_mkdb/services_mkdb.c Thu Jan 7 10:20:03 2016
(r293311)
+++ head/usr.sbin/services_mkdb/services_mkdb.c Thu Jan 7 10:39:13 2016
(r293312)
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
#include
@@ -91,6 +92,8 @@ main(int argc, char *argv[])
size_t cnt = 0;
StringList *sl, ***svc;
size_t port, proto;
+ char *dbname_dir;
+ int dbname_dir_fd = -1;
setprogname(argv[0]);
@@ -138,7 +141,7 @@ main(int argc, char *argv[])
err(1, "Cannot install exit handler");
(void)snprintf(tname, sizeof(tname), "%s.tmp", dbname);
- db = dbopen(tname, O_RDWR | O_CREAT | O_EXCL,
+ db = dbopen(tname, O_RDWR | O_CREAT | O_EXCL | O_SYNC,
(S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH), DB_HASH, &hinfo);
if (!db)
err(1, "Error opening temporary database `%s'", tname);
@@ -164,8 +167,21 @@ main(int argc, char *argv[])
if ((db->close)(db))
err(1, "Error closing temporary database `%s'", tname);
- if (rename(tname, dbname) == -1)
+ /*
+* Make sure file is safe on disk. To improve performance we will call
+* fsync() to the directory where file lies
+*/
+ if (rename(tname, dbname) == -1 ||
+ (dbname_dir = dirname(dbname)) == NULL ||
+ (dbname_dir_fd = open(dbname_dir, O_RDONLY|O_DIRECTORY)) == -1 ||
+ fsync(dbname_dir_fd) != 0) {
+ if (dbname_dir_fd != -1)
+ close(dbname_dir_fd);
err(1, "Cannot rename `%s' to `%s'", tname, dbname);
+ }
+
+ if (dbname_dir_fd != -1)
+ close(dbname_dir_fd);
return 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"
Re: svn commit: r291431 - head/sys/dev/drm2/i915
> On Dec 4, 2015, at 15:49, Navdeep Parhar wrote: > > On 12/04/2015 07:53, Renato Botelho wrote: >>> On Nov 28, 2015, at 15:38, Jean-Sébastien Pédron >>> wrote: >>> >>> Author: dumbbell >>> Date: Sat Nov 28 17:38:27 2015 >>> New Revision: 291431 >>> URL: https://svnweb.freebsd.org/changeset/base/291431 >>> >>> Log: >>> drm/i915: Reduce diff with Linux 3.8 >>> >>> There is no functional change. The goal is to ease the future update to >>> Linux 3.8's i915 driver. >>> >>> MFC after: 2 months >>> >>> Modified: >>> head/sys/dev/drm2/i915/i915_drm.h >> >> After all recent changes I started to get following error when try to >> kldload i915kms.ko: >> >> KLD i915kms.ko: depends on drmn - not available or version mismatch >> linker_load_file: Unsupported file type > > Run kldxref /boot/kernel by hand and see if that fixes it. There was a > problem with installkernel in recent head (now fixed). Problem solved. Thanks! -- Renato Botelho ___ 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: r291431 - head/sys/dev/drm2/i915
> On Nov 28, 2015, at 15:38, Jean-Sébastien Pédron wrote: > > Author: dumbbell > Date: Sat Nov 28 17:38:27 2015 > New Revision: 291431 > URL: https://svnweb.freebsd.org/changeset/base/291431 > > Log: > drm/i915: Reduce diff with Linux 3.8 > > There is no functional change. The goal is to ease the future update to > Linux 3.8's i915 driver. > > MFC after: 2 months > > Modified: > head/sys/dev/drm2/i915/i915_drm.h After all recent changes I started to get following error when try to kldload i915kms.ko: KLD i915kms.ko: depends on drmn - not available or version mismatch linker_load_file: Unsupported file type The latest kernel that worked fine here was r291095 from Nov 20, after that I tried to update it at Dec 1st and the error started Some hardware details: agp0: on vgapci0 agp0: aperture size is 256M, detected 65532k stolen memory vgapci0: Boot video device vgapci0@pci0:0:2:0: class=0x03 card=0x21f317aa chip=0x01668086 rev=0x09 hdr=0x00 vendor = 'Intel Corporation' device = '3rd Gen Core processor Graphics Controller' class = display subclass = VGA -- Renato Botelho ___ 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: r291355 - in stable/10/sys: netinet netipsec
> On Nov 26, 2015, at 00:24, George V. Neville-Neil wrote: > > Author: gnn > Date: Thu Nov 26 02:24:45 2015 > New Revision: 291355 > URL: https://svnweb.freebsd.org/changeset/base/291355 > > Log: > MFC 290028: > Turning on IPSEC used to introduce a slight amount of performance > degradation (7%) for host host TCP connections over 10Gbps links, > even when there were no secuirty policies in place. There is no > change in performance on 1Gbps network links. Testing GENERIC vs. > GENERIC-NOIPSEC vs. GENERIC with this change shows that the new > code removes any overhead introduced by having IPSEC always in the > kernel. > > Differential Revision: D3993 > Sponsored by:Rubicon Communications (Netgate) > > Modified: > stable/10/sys/netinet/ip_ipsec.c > stable/10/sys/netinet/tcp_subr.c > stable/10/sys/netipsec/ipsec.c > Directory Properties: > stable/10/ (props changed) > > Modified: stable/10/sys/netinet/ip_ipsec.c > == > --- stable/10/sys/netinet/ip_ipsec.c Thu Nov 26 02:16:25 2015 > (r291354) > +++ stable/10/sys/netinet/ip_ipsec.c Thu Nov 26 02:24:45 2015 > (r291355) > @@ -230,6 +230,10 @@ ip_ipsec_output(struct mbuf **m, struct > struct secpolicy *sp = NULL; > struct tdb_ident *tdbi; > struct m_tag *mtag; > + > + if (!key_havesp(IPSEC_DIR_OUTBOUND)) > + return 0; > + > /* >* Check the security policy (SP) for the packet and, if >* required, do IPsec-related processing. There are two > > Modified: stable/10/sys/netinet/tcp_subr.c > == > --- stable/10/sys/netinet/tcp_subr.c Thu Nov 26 02:16:25 2015 > (r291354) > +++ stable/10/sys/netinet/tcp_subr.c Thu Nov 26 02:24:45 2015 > (r291355) > @@ -1947,7 +1947,8 @@ ipsec_hdrsiz_tcp(struct tcpcb *tp) > #endif > struct tcphdr *th; > > - if ((tp == NULL) || ((inp = tp->t_inpcb) == NULL)) > + if ((tp == NULL) || ((inp = tp->t_inpcb) == NULL) || > + (!key_havesp(IPSEC_DIR_OUTBOUND))) Looks like style is broken here ^ -- Renato Botelho ___ 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: r291239 - in stable/10/sys: dev/xen/blkfront dev/xen/netfront x86/xen xen
> On Nov 24, 2015, at 06:41, Roger Pau Monné wrote: > > Author: royger > Date: Tue Nov 24 08:41:27 2015 > New Revision: 291239 > URL: https://svnweb.freebsd.org/changeset/base/291239 > > Log: > MFC r286999: > > xen: allow disabling PV disks and nics > > Sponsored by: Citrix Systems R&D Thanks! -- Renato Botelho ___ 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: r286999 - in head/sys: dev/xen/blkfront dev/xen/netfront x86/xen xen
> On Aug 21, 2015, at 12:53, Roger Pau Monné wrote: > > Author: royger > Date: Fri Aug 21 15:53:08 2015 > New Revision: 286999 > URL: https://svnweb.freebsd.org/changeset/base/286999 > > Log: > xen: allow disabling PV disks and nics > > Introduce two new loader tunnables that can be used to disable PV disks and > PV nics at boot time. They default to 0 and should be set to 1 (or any > number different than 0) in order to disable the PV devices: > > hw.xen.disable_pv_disks=1 > hw.xen.disable_pv_nics=1 > > In /boot/loader.conf will disable both PV disks and nics. > > Sponsored by:Citrix Systems R&D > Tested by: Karl Pielorz > MFC after: 1 week Hello Roger, Do you still plan to MFC this one? Thanks -- Renato Botelho ___ 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: r290651 - head/sys/dev/usb/wlan
> On Nov 10, 2015, at 18:19, Renato Botelho wrote:
>
>> On Nov 10, 2015, at 10:52, Andriy Voskoboinyk wrote:
>>
>> Author: avos
>> Date: Tue Nov 10 12:52:26 2015
>> New Revision: 290651
>> URL: https://svnweb.freebsd.org/changeset/base/290651
>>
>> Log:
>> urtwn(4): add IBSS mode support
>>
>> Tested with RTL8188EU, IBSS and STA modes.
>>
>> Reviewed by: kevlo
>> Approved by: adrian (mentor)
>> Differential Revision: https://reviews.freebsd.org/D4038
>>
>> Modified:
>> head/sys/dev/usb/wlan/if_urtwn.c
>> head/sys/dev/usb/wlan/if_urtwnvar.h
>>
>> Modified: head/sys/dev/usb/wlan/if_urtwn.c
>> ==
>> --- head/sys/dev/usb/wlan/if_urtwn.c Tue Nov 10 12:20:22 2015
>> (r290650)
>> +++ head/sys/dev/usb/wlan/if_urtwn.c Tue Nov 10 12:52:26 2015
>> (r290651)
>> @@ -228,10 +228,14 @@ static int urtwn_setup_beacon(struct ur
>> static void urtwn_update_beacon(struct ieee80211vap *, int);
>> static int urtwn_tx_beacon(struct urtwn_softc *sc,
>> struct urtwn_vap *);
>> +static void urtwn_tsf_task_adhoc(void *, int);
>> static void urtwn_tsf_sync_enable(struct urtwn_softc *,
>> struct ieee80211vap *);
>> static void urtwn_set_led(struct urtwn_softc *, int, int);
>> static void urtwn_set_mode(struct urtwn_softc *, uint8_t);
>> +static void urtwn_ibss_recv_mgmt(struct ieee80211_node *,
>> +struct mbuf *, int,
>> +const struct ieee80211_rx_stats *, int, int);
>> static int urtwn_newstate(struct ieee80211vap *,
>> enum ieee80211_state, int);
>> static void urtwn_watchdog(void *);
>> @@ -449,6 +453,7 @@ urtwn_attach(device_t self)
>> ic->ic_caps =
>>IEEE80211_C_STA /* station mode */
>> | IEEE80211_C_MONITOR /* monitor mode */
>> +| IEEE80211_C_IBSS /* adhoc mode */
>> | IEEE80211_C_HOSTAP/* hostap mode */
>> | IEEE80211_C_SHPREAMBLE/* short preamble supported */
>> | IEEE80211_C_SHSLOT/* short slot time supported */
>> @@ -592,13 +597,18 @@ urtwn_vap_create(struct ieee80211com *ic
>> return (NULL);
>> }
>>
>> -if (opmode == IEEE80211_M_HOSTAP)
>> +if (opmode == IEEE80211_M_HOSTAP || opmode == IEEE80211_M_IBSS)
>> urtwn_init_beacon(sc, uvp);
>>
>> /* override state transition machine */
>> uvp->newstate = vap->iv_newstate;
>> vap->iv_newstate = urtwn_newstate;
>> vap->iv_update_beacon = urtwn_update_beacon;
>> +if (opmode == IEEE80211_M_IBSS) {
>> +uvp->recv_mgmt = vap->iv_recv_mgmt;
>> +vap->iv_recv_mgmt = urtwn_ibss_recv_mgmt;
>> +TASK_INIT(&uvp->tsf_task_adhoc, 0, urtwn_tsf_task_adhoc, vap);
>> +}
>>
>> /* complete setup */
>> ieee80211_vap_attach(vap, ieee80211_media_change,
>> @@ -610,13 +620,13 @@ urtwn_vap_create(struct ieee80211com *ic
>> static void
>> urtwn_vap_delete(struct ieee80211vap *vap)
>> {
>> +struct ieee80211com *ic = vap->iv_ic;
>> struct urtwn_vap *uvp = URTWN_VAP(vap);
>> -enum ieee80211_opmode opmode = vap->iv_opmode;
>>
>> -if (opmode == IEEE80211_M_HOSTAP) {
>> -if (uvp->bcn_mbuf != NULL)
>> -m_freem(uvp->bcn_mbuf);
>> -}
>> +if (uvp->bcn_mbuf != NULL)
>> +m_freem(uvp->bcn_mbuf);
>> +if (vap->iv_opmode == IEEE80211_M_IBSS)
>> +ieee80211_draintask(ic, &uvp->tsf_task_adhoc);
>> ieee80211_vap_detach(vap);
>> free(uvp, M_80211_VAP);
>> }
>> @@ -1611,8 +1621,50 @@ urtwn_tx_beacon(struct urtwn_softc *sc,
>> }
>>
>> static void
>> +urtwn_tsf_task_adhoc(void *arg, int pending)
>> +{
>> +struct ieee80211vap *vap = arg;
>> +struct urtwn_softc *sc = vap->iv_ic->ic_softc;
>> +struct ieee80211_node *ni;
>> +uint32_t reg;
>> +
>> +URTWN_LOCK(sc);
>> +ni = ieee80211_ref_node(vap->iv_bss);
>> +reg = urtwn_read_1(sc, R92C_BCN_CTRL);
>> +
>> +/* Accept beacons with the same BSSID. */
>> +urtwn_s
Re: svn commit: r290663 - in head/sys: modules modules/tests modules/tests/callout_test modules/tests/framework tests tests/callout_test tests/framework
> On Nov 11, 2015, at 06:32, Hans Petter Selasky wrote: > > On 11/10/15 17:15, Bjoern A. Zeeb wrote: >> >>> On 10 Nov 2015, at 14:14 , Randall Stewart wrote: >>> >>> Author: rrs >>> Date: Tue Nov 10 14:14:41 2015 >>> New Revision: 290663 >>> URL: https://svnweb.freebsd.org/changeset/base/290663 >>> >>> Log: >>> Add a kernel test framework. The callout_test is a demonstration and will >>> only >>> work with the upcoming async-drain functionality. Tests can be added >>> to the tests directory and then the framework can be used to launch >>> those tests. >>> >>> MFC after: 1 month >>> Sponsored by: Netflix Inc. >>> Differential Revision: https://reviews.freebsd.org/D1755 >>> >> >> >> /scratch/tmp/bz/head.svn/sys/modules/tests/callout_test/../../../tests/callout_test/callout_test.c:75: >> warning: function declaration isn't a prototype [-Wstrict-prototypes] >> /scratch/tmp/bz/head.svn/sys/modules/tests/callout_test/../../../tests/callout_test/callout_test.c:133: >> warning: no previous prototype for ‘execute_the_co_test' >> [-Wmissing-prototypes] >> >> >> /scratch/tmp/bz/head.svn/sys/modules/tests/framework/../../../tests/framework/kern_testfrwk.c:171: >> warning: redundant redeclaration of 'sysctl___kern' [-Wredundant-decls] >> /scratch/tmp/bz/head.svn/sys/sys/sysctl.h:918: warning: previous declaration >> of ‘sysctl___kern' was here >> >> This is on sparc64 but I guess that’s just one of my early kernel compiles. >> >> >>> Added: >>> head/sys/modules/tests/ >>> head/sys/modules/tests/callout_test/ >>> head/sys/modules/tests/callout_test/Makefile (contents, props changed) >>> head/sys/modules/tests/framework/ >>> head/sys/modules/tests/framework/Makefile (contents, props changed) >>> head/sys/tests/ >>> head/sys/tests/callout_test/ >>> head/sys/tests/callout_test.h (contents, props changed) >>> head/sys/tests/callout_test/callout_test.c (contents, props changed) >>> head/sys/tests/framework/ >>> head/sys/tests/framework/kern_testfrwk.c (contents, props changed) >>> head/sys/tests/kern_testfrwk.h (contents, props changed) >>> Modified: >>> head/sys/modules/Makefile >> > > Breaks here too on amd64: > >> /usr/img/freebsd/sys/modules/tests/callout_test/../../../tests/callout_test/callout_test.c:52:9: >> error: >> 'cpu_spinwait' macro redefined [-Werror] >> #define cpu_spinwait() >>^ >> ./machine/cpu.h:50:9: note: previous definition is here >> #define cpu_spinwait() ia32_pause() >>^ >> 1 error generated. > >> /usr/img/freebsd/sys/modules/tests/framework/../../../sys/bus.h:655:10: >> fatal error: >> 'device_if.h' file not found >> #include "device_if.h" >> ^ >> 1 error generated. >> *** Error code 1 +1 -- Renato Botelho ___ 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: r290651 - head/sys/dev/usb/wlan
urtwn_set_rx_bssid_all(sc, 0);
> +
> /* Set gain under link. */
> urtwn_set_gain(sc, 0x32);
> URTWN_UNLOCK(sc);
> @@ -3393,6 +3487,9 @@ urtwn_set_promisc(struct urtwn_softc *sc
> case IEEE80211_M_HOSTAP:
> mask2 |= R92C_RCR_CBSSID_BCN;
> break;
> + case IEEE80211_M_IBSS:
> + mask2 |= R92C_RCR_CBSSID_DATA;
> + break;
> default:
> device_printf(sc->sc_dev, "%s: undefined opmode %d\n",
> __func__, vap->iv_opmode);
>
> Modified: head/sys/dev/usb/wlan/if_urtwnvar.h
> ==
> --- head/sys/dev/usb/wlan/if_urtwnvar.h Tue Nov 10 12:20:22 2015
> (r290650)
> +++ head/sys/dev/usb/wlan/if_urtwnvar.h Tue Nov 10 12:52:26 2015
> (r290651)
> @@ -87,13 +87,18 @@ struct urtwn_fw_info {
> };
>
> struct urtwn_vap {
> - struct ieee80211vap vap;
> + struct ieee80211vap vap;
>
> - struct r92c_tx_desc bcn_desc;
> - struct mbuf *bcn_mbuf;
> -
> - int (*newstate)(struct ieee80211vap *,
> - enum ieee80211_state, int);
> + struct r92c_tx_desc bcn_desc;
> + struct mbuf *bcn_mbuf;
> + struct task tsf_task_adhoc;
> +
> + int (*newstate)(struct ieee80211vap *,
> + enum ieee80211_state, int);
> + void(*recv_mgmt)(struct ieee80211_node *,
> + struct mbuf *, int,
> + const struct ieee80211_rx_stats *,
> + int, int);
> };
> #define URTWN_VAP(vap) ((struct urtwn_vap *)(vap))
>
After this revision, every time I insert my urtwn card into USB port I get this
panic [1]. Moving back to 290650 fixed the problem.
[1] http://imgur.com/6p78GIT
--
Renato Botelho
___
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: r290612 - in head/sys: contrib/dev/ath/ath_hal/ar9300 dev/ath dev/ath/ath_hal dev/ath/ath_hal/ar5210 dev/ath/ath_hal/ar5211 dev/ath/ath_hal/ar5212 dev/ath/ath_hal/ar5312 dev/ath/ath_ha
> On Nov 9, 2015, at 18:03, Adrian Chadd wrote: > > hiya, > > Sorry - Please commit this; I can't commit things right at the moment! Done, r290616 -- Renato Botelho ___ 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: r290616 - in head/sys/dev/ath/ath_hal: ar5212 ar5416
Author: garga (ports committer)
Date: Mon Nov 9 20:22:59 2015
New Revision: 290616
URL: https://svnweb.freebsd.org/changeset/base/290616
Log:
Fix kernel build, broken in r290612
Approved by: adrian
Modified:
head/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c
head/sys/dev/ath/ath_hal/ar5416/ar5416.h
Modified: head/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c
==
--- head/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c Mon Nov 9 18:33:36
2015(r290615)
+++ head/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c Mon Nov 9 20:22:59
2015(r290616)
@@ -117,7 +117,7 @@ HAL_BOOL
ar5212Reset(struct ath_hal *ah, HAL_OPMODE opmode,
struct ieee80211_channel *chan,
HAL_BOOL bChannelChange,
- HAL_RESET_TYPE, resetType,
+ HAL_RESET_TYPE resetType,
HAL_STATUS *status)
{
#defineN(a)(sizeof (a) / sizeof (a[0]))
Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416.h
==
--- head/sys/dev/ath/ath_hal/ar5416/ar5416.hMon Nov 9 18:33:36 2015
(r290615)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416.hMon Nov 9 20:22:59 2015
(r290616)
@@ -193,7 +193,7 @@ extern void ar5416RxMonitor(struct ath_h
const struct ieee80211_channel *);
extern void ar5416AniPoll(struct ath_hal *, const struct ieee80211_channel *);
extern void ar5416AniReset(struct ath_hal *, const struct ieee80211_channel *,
- HAL_OPMODE, HAL_RESET_TYPE, int);
+ HAL_OPMODE, int);
extern void ar5416SetBeaconTimers(struct ath_hal *, const HAL_BEACON_TIMERS *);
extern void ar5416BeaconInit(struct ath_hal *ah,
___
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: r290612 - in head/sys: contrib/dev/ath/ath_hal/ar9300 dev/ath dev/ath/ath_hal dev/ath/ath_hal/ar5210 dev/ath/ath_hal/ar5211 dev/ath/ath_hal/ar5212 dev/ath/ath_hal/ar5312 dev/ath/ath_ha
> On Nov 9, 2015, at 14:58, Bryan Drewery wrote: > > On 11/9/2015 7:59 AM, Adrian Chadd wrote: >> Author: adrian >> Date: Mon Nov 9 15:59:42 2015 >> New Revision: 290612 >> URL: https://svnweb.freebsd.org/changeset/base/290612 >> >> Log: >> ath(4): begin fleshing out a "reset type" extension to force cold/warn >> resets. >> > > /root/git/freebsd/sys/modules/ath/../../dev/ath/ath_hal/ar5212/ar5212_reset.c:120:18: > error: type specifier missing, defaults to 'int' [-Werror,-Wimplicit-int] >HAL_RESET_TYPE, resetType, Attached patch fixed it for me. fix_ath.diff Description: Binary data -- Renato Botelho signature.asc Description: Message signed with OpenPGP using GPGMail
Re: svn commit: r289549 - in head: contrib/wpa/hostapd contrib/wpa/hs20/client contrib/wpa/patches contrib/wpa/src/ap contrib/wpa/src/common contrib/wpa/src/crypto contrib/wpa/src/drivers contrib/wpa/
> On Oct 18, 2015, at 19:38, Rui Paulo wrote: > > Author: rpaulo > Date: Sun Oct 18 21:38:25 2015 > New Revision: 289549 > URL: https://svnweb.freebsd.org/changeset/base/289549 > > Log: > Update hostapd/wpa_supplicant to version 2.5. > > Tested by several people on current@/wireless@. > > Relnotes:yes Thanks Rui! Do you plan to MFC these changes to stable/10? -- Renato Botelho ___ 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: r288109 - stable/10/sys/netinet6
Author: garga (ports committer) Date: Tue Sep 22 14:33:43 2015 New Revision: 288109 URL: https://svnweb.freebsd.org/changeset/base/288109 Log: Remove extra space introduced in r287734. This is a stable/10 only fix since original commit (r287094) is correct. Approved by: loos Sponsored by: Rubicon Communications (Netgate) Modified: stable/10/sys/netinet6/in6.c Modified: stable/10/sys/netinet6/in6.c == --- stable/10/sys/netinet6/in6.cTue Sep 22 12:56:34 2015 (r288108) +++ stable/10/sys/netinet6/in6.cTue Sep 22 14:33:43 2015 (r288109) @@ -2388,7 +2388,7 @@ in6if_do_dad(struct ifnet *ifp) * However, some interfaces can be up before the RUNNING * status. Additionaly, users may try to assign addresses * before the interface becomes up (or running). -* This function returns EAGAIN in that case. +* This function returns EAGAIN in that case. * The caller should mark "tentative" on the address instead of * performing DAD immediately. */ ___ 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: r288101 - in stable/10/sys/dev/usb: . serial
Author: garga (ports committer) Date: Tue Sep 22 09:57:35 2015 New Revision: 288101 URL: https://svnweb.freebsd.org/changeset/base/288101 Log: MFC r287828: Add support for Sierra MC7355 card Submitted by: Jeremy Porter Approved by: loos Obtained from:pfSense Sponsored by: Rubicon Communications (Netgate) Modified: stable/10/sys/dev/usb/serial/u3g.c stable/10/sys/dev/usb/usbdevs Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/usb/serial/u3g.c == --- stable/10/sys/dev/usb/serial/u3g.c Tue Sep 22 09:50:11 2015 (r288100) +++ stable/10/sys/dev/usb/serial/u3g.c Tue Sep 22 09:57:35 2015 (r288101) @@ -522,6 +522,7 @@ static const STRUCT_USB_HOST_ID u3g_devs U3G_DEV(SIERRA, MC5727_2, 0), U3G_DEV(SIERRA, MC5728, 0), U3G_DEV(SIERRA, MC7354, 0), + U3G_DEV(SIERRA, MC7355, 0), U3G_DEV(SIERRA, MC8700, 0), U3G_DEV(SIERRA, MC8755, 0), U3G_DEV(SIERRA, MC8755_2, 0), Modified: stable/10/sys/dev/usb/usbdevs == --- stable/10/sys/dev/usb/usbdevs Tue Sep 22 09:50:11 2015 (r288100) +++ stable/10/sys/dev/usb/usbdevs Tue Sep 22 09:57:35 2015 (r288101) @@ -4010,6 +4010,7 @@ product SIERRA E6892 0x6892 E6892 product SIERRA E6893 0x6893 E6893 product SIERRA MC8700 0x68A3 MC8700 product SIERRA MC7354 0x68C0 MC7354 +product SIERRA MC7355 0x9041 MC7355 product SIERRA AC313U 0x68aa Sierra Wireless AirCard 313U product SIERRA TRUINSTALL 0x0fff Aircard Tru Installer ___ 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"
