Re: svn commit: r330297 - in head: lib/libc/sys sys/compat/freebsd32 sys/i386/ibcs2 sys/kern sys/sys
In message <201803022325.w22npyiw050...@slippy.cwsent.com>, Cy Schubert writes: > In message <20180302223138.ga83...@spindle.one-eyed-alien.net>, Brooks > Davis wr > ites: > > > > --yrj/dFKFPuw6o+aM > > Content-Type: text/plain; charset=us-ascii > > Content-Disposition: inline > > Content-Transfer-Encoding: quoted-printable > > > > On Fri, Mar 02, 2018 at 10:10:49PM +, Brooks Davis wrote: > > > Author: brooks > > > Date: Fri Mar 2 22:10:48 2018 > > > New Revision: 330297 > > > URL: https://svnweb.freebsd.org/changeset/base/330297 > > >=20 > > > Log: > > > Rename kernel-only members of semid_ds and msgid_ds. > > > =20 > > > This deliberately breaks the API in preperation for future syscall > > > revisions which will remove these nonstandard members. > > > =20 > > > In an exp-run a single port (devel/qemu-user-static) was found to > > > use them which it did becuase it emulates system calls. This has > > > been fixed in the ports tree. > > > =20 > > > PR: 224443 (exp-run) > > > Reviewed by:kib, jhb (previous version) > > > Exp-run by: antoine > > > Sponsored by: DARPA, AFRP > > > Differential Revision: https://reviews.freebsd.org/D14490 > > > > FYI, a __FreeBSD_version bump is coming along with a third commit. > > Hi Brooks, > > This causes ipcrm build to fail: > > /opt/src/svn-current/usr.bin/ipcrm/ipcrm.c:156:14: error: variable has > incomplete type 'union semun' > union semun arg; > ^ > /opt/src/svn-current/usr.bin/ipcrm/ipcrm.c:156:8: note: forward > declaration of 'union semun' > union semun arg; > ^ > > > Index: usr.bin/ipcrm/ipcrm.c > === > --- usr.bin/ipcrm/ipcrm.c (revision 330299) > +++ usr.bin/ipcrm/ipcrm.c (working copy) > @@ -39,6 +39,7 @@ > #define _WANT_SYSVMSG_INTERNALS > #include > #define _WANT_SYSVSEM_INTERNALS > +#define _WANT_SEMUN > #include > #define _WANT_SYSVSHM_INTERNALS > #include > > And: > > /opt/src/svn-current/contrib/netbsd-tests/kernel/t_sysv.c:444:14: > error: variable has incomplete type 'union semun' > union semun sun; > ^ > /opt/src/svn-current/contrib/netbsd-tests/kernel/t_sysv.c:444:8: note: > forward declaration of 'union semun' > union semun sun; > ^ > > Index: /opt/src/svn-current/contrib/netbsd-tests/kernel/t_sysv.c > === > --- /opt/src/svn-current/contrib/netbsd-tests/kernel/t_sysv.c (revision > 330299) > +++ /opt/src/svn-current/contrib/netbsd-tests/kernel/t_sysv.c (working > copy) > @@ -49,6 +49,7 @@ > #include > #include > #include > +#define _WANT_SEMUN > #include > #include > #include > > > I'm not sure if there are more. Sorry, this should be reported against r330299. -- Cheers, Cy Schubert <cy.schub...@cschubert.com> FreeBSD UNIX: <c...@freebsd.org> Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ 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: r335787 - head/etc/rc.d
In message <201806282213.w5smdwta093...@repo.freebsd.org>, Ian Lepore
writes:
> Author: ian
> Date: Thu Jun 28 22:13:32 2018
> New Revision: 335787
> URL: https://svnweb.freebsd.org/changeset/base/335787
>
> Log:
> When being verbose about various leapfile versions, also mention expiration
> .
>
> The expiration date is actually more of a version number than the version
> date, because expiration changes twice a year, whereas the version only
> changes when actual leap second events occur (except in USNO leapfiles,
> which inappropriately bump the version with every expiration date change).
>
> Modified:
> head/etc/rc.d/ntpd
>
> Modified: head/etc/rc.d/ntpd
> =
> =
> --- head/etc/rc.d/ntpdThu Jun 28 22:05:29 2018(r335786)
> +++ head/etc/rc.d/ntpdThu Jun 28 22:13:32 2018(r335787)
> @@ -106,8 +106,8 @@ ntpd_needfetch_leapfile() {
> ntp_expiry_src=$(get_ntp_leapfile_expiry $ntp_src_leapfile)
> ntp_ver_no_db=$(get_ntp_leapfile_ver $ntp_db_leapfile)
> ntp_expiry_db=$(get_ntp_leapfile_expiry $ntp_db_leapfile)
> - $verbose ntp_src_leapfile version is $ntp_ver_no_src
> - $verbose ntp_db_leapfile version is $ntp_ver_no_db
> + $verbose ntp_src_leapfile version is $ntp_ver_no_src expires $ntp_expir
> y_src
> + $verbose ntp_db_leapfile version is $ntp_ver_no_db expires $ntp_expiry_
> db
>
> if [ "$ntp_ver_no_src" -gt "$ntp_ver_no_db" -o \
>"$ntp_ver_no_src" -eq "$ntp_ver_no_db" -a \
>
Thanks.
--
Cheers,
Cy Schubert
FreeBSD UNIX: Web: http://www.FreeBSD.org
The need of the many outweighs the greed of the few.
___
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: r335786 - head/etc/rc.d
In message <201806282205.w5sm5t0c088...@repo.freebsd.org>, Ian Lepore
writes:
> Author: ian
> Date: Thu Jun 28 22:05:29 2018
> New Revision: 335786
> URL: https://svnweb.freebsd.org/changeset/base/335786
>
> Log:
> Rename variable ntp_tmp_leapfile to have a leading underbar, to distinguish
> it from variables with similar names which are set in rc.conf. This will
> make more sense as the script grows more similar-name local variables in
> some upcoming changes.
>
> Modified:
> head/etc/rc.d/ntpd
>
> Modified: head/etc/rc.d/ntpd
> =
> =
> --- head/etc/rc.d/ntpdThu Jun 28 21:59:45 2018(r335785)
> +++ head/etc/rc.d/ntpdThu Jun 28 22:05:29 2018(r335786)
> @@ -20,7 +20,7 @@ fetch_cmd="ntpd_fetch_leapfile"
> needfetch_cmd="ntpd_needfetch_leapfile"
> start_precmd="ntpd_precmd"
>
> -ntp_tmp_leapfile="/var/run/ntpd.leap-seconds.list"
> +_ntp_tmp_leapfile="/var/run/ntpd.leap-seconds.list"
>
> load_rc_config $name
>
> @@ -56,7 +56,7 @@ ntpd_precmd()
> ( cd /dev ; /bin/pax -rw -pe clockctl "${ntpd_chrootdir}/dev" )
> fi
> ln -fs "${ntpd_chrootdir}/var/db/ntp.drift" /var/db/ntp.drift
> - ln -fs "${ntpd_chrootdir}${ntp_tmp_leapfile}" ${ntp_tmp_leapfile}
> + ln -fs "${ntpd_chrootdir}${_ntp_tmp_leapfile}" ${_ntp_tmp_leapfile}
>
> # Change run_rc_commands()'s internal copy of $ntpd_flags
> #
> @@ -140,15 +140,15 @@ ntpd_fetch_leapfile() {
> if ntpd_needfetch_leapfile ; then
> for url in $ntp_leapfile_sources ; do
> $verbose fetching $url
> - fetch $ntp_leapfile_fetch_opts -o $ntp_tmp_leapfile $ur
> l && break
> + fetch $ntp_leapfile_fetch_opts -o $_ntp_tmp_leapfile $u
> rl && break
> done
> - ntp_ver_no_tmp=$(get_ntp_leapfile_ver $ntp_tmp_leapfile)
> - ntp_expiry_tmp=$(get_ntp_leapfile_expiry $ntp_tmp_leapfile)
> + ntp_ver_no_tmp=$(get_ntp_leapfile_ver $_ntp_tmp_leapfile)
> + ntp_expiry_tmp=$(get_ntp_leapfile_expiry $_ntp_tmp_leapfile)
> if [ "$ntp_expiry_tmp" -gt "$ntp_expiry_db" -o \
>"$ntp_expiry_tmp" -eq "$ntp_expiry_db" -a \
>"$ntp_ver_no_tmp" -gt "$ntp_ver_no_db" ]; then
> $verbose using $url as $ntp_db_leapfile
> - mv -f $ntp_tmp_leapfile $ntp_db_leapfile ||
> + mv -f $_ntp_tmp_leapfile $ntp_db_leapfile ||
> $verbose "warning: cannot replace $ntp_db_leapfile
> (read-only fs?)"
> else
> $verbose using existing $ntp_db_leapfile
>
Thank you Ian.
--
Cheers,
Cy Schubert
FreeBSD UNIX: Web: http://www.FreeBSD.org
The need of the many outweighs the greed of the few.
___
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: r339355 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Thank you.
---
Sent using a tiny phone keyboard.
Apologies for any typos and autocorrect.
Also, this old phone only supports top post. Apologies.
Cy Schubert
or
The need of the many outweighs the greed of the few.
---
-Original Message-
From: Mateusz Guzik
Sent: 14/10/2018 10:14
To: src-committ...@freebsd.org; svn-src-all@freebsd.org;
svn-src-h...@freebsd.org
Subject: svn commit: r339355 -
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: mjg
Date: Sun Oct 14 16:14:01 2018
New Revision: 339355
URL: https://svnweb.freebsd.org/changeset/base/339355
Log:
zfs: fix a panic after failed mount
r338927("zfs: depessimize zfs_root with rmlocks") failed to error check
the mount before caching root vnode.
Results in crashes in rrw_enter_read_impl tracing back to zfs_mount.
Reported by: Mike Tancsa
Tested by:allanjude
Approved by: re (kib)
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
==
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.cSun Oct
14 05:09:43 2018(r339354)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.cSun Oct
14 16:14:01 2018(r339355)
@@ -1929,7 +1929,8 @@ zfs_mount(vfs_t *vfsp)
error = zfs_domount(vfsp, osname);
PICKUP_GIANT();
- zfs_root_setvnode((zfsvfs_t *)vfsp->vfs_data);
+ if (error == 0)
+ zfs_root_setvnode((zfsvfs_t *)vfsp->vfs_data);
#ifdef illumos
/*
___
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: r339672 - in head/sys: fs/nfsclient kern sys tools
In message <201810232143.w9nlhfek087...@repo.freebsd.org>, Konstantin Belousov writes: > Author: kib > Date: Tue Oct 23 21:43:41 2018 > New Revision: 339672 > URL: https://svnweb.freebsd.org/changeset/base/339672 > > Log: > Only call sigdeferstop() for NFS. > > Use bypass to catch any NFS VOP dispatch and route it through the > wrapper which does sigdeferstop() and then dispatches original > VOP. NFS does not need a bypass below it, which is not supported. > > The vop offset in the vop_vector is added since otherwise it is > impossible to get vop_op_t from the internal table, and I did not > wanted to create the layered fs only to wrap NFS VOPs. > > VFS_OP()s wrap is straightforward. > > Requested and reviewed by: mjg (previous version) > Tested by: pho > Sponsored by: The FreeBSD Foundation > Differential revision: https://reviews.freebsd.org/D17658 > > Modified: > head/sys/fs/nfsclient/nfs_clvnops.c > head/sys/kern/vfs_default.c > head/sys/kern/vfs_init.c > head/sys/kern/vfs_mount.c > head/sys/sys/mount.h > head/sys/sys/vnode.h > head/sys/tools/vnode_if.awk > Unfortunately this broke amd(8). -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ 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: r339672 - in head/sys: fs/nfsclient kern sys tools
In message <201810241159.w9obxfwg013...@slippy.cwsent.com>, Cy Schubert writes: > In message <201810232143.w9nlhfek087...@repo.freebsd.org>, Konstantin > Belousov > writes: > > Author: kib > > Date: Tue Oct 23 21:43:41 2018 > > New Revision: 339672 > > URL: https://svnweb.freebsd.org/changeset/base/339672 > > > > Log: > > Only call sigdeferstop() for NFS. > > > > Use bypass to catch any NFS VOP dispatch and route it through the > > wrapper which does sigdeferstop() and then dispatches original > > VOP. NFS does not need a bypass below it, which is not supported. > > > > The vop offset in the vop_vector is added since otherwise it is > > impossible to get vop_op_t from the internal table, and I did not > > wanted to create the layered fs only to wrap NFS VOPs. > > > > VFS_OP()s wrap is straightforward. > > > > Requested and reviewed by:mjg (previous version) > > Tested by:pho > > Sponsored by: The FreeBSD Foundation > > Differential revision:https://reviews.freebsd.org/D17658 > > > > Modified: > > head/sys/fs/nfsclient/nfs_clvnops.c > > head/sys/kern/vfs_default.c > > head/sys/kern/vfs_init.c > > head/sys/kern/vfs_mount.c > > head/sys/sys/mount.h > > head/sys/sys/vnode.h > > head/sys/tools/vnode_if.awk > > > > Unfortunately this broke amd(8). I should have included this. Oct 24 00:34:13 slippy amd[2741]: '/home': mount: Operation not supported Oct 24 00:34:13 slippy amd[2742]: '/vol': mount: Operation not supported Oct 24 00:34:13 slippy amd[2743]: '/net': mount: Operation not supported Oct 24 00:34:14 slippy amd[2742]: '/vol': mount: Operation not supported Oct 24 00:34:14 slippy amd[2741]: '/home': mount: Operation not supported Oct 24 00:34:14 slippy amd[2742]: amfs_toplvl_mount: amfs_mount failed: Operation not supported -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ 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: r339672 - in head/sys: fs/nfsclient kern sys tools
In message <201810241159.w9obxfwg013...@slippy.cwsent.com>, Cy Schubert writes: > In message <201810232143.w9nlhfek087...@repo.freebsd.org>, Konstantin > Belousov > writes: > > Author: kib > > Date: Tue Oct 23 21:43:41 2018 > > New Revision: 339672 > > URL: https://svnweb.freebsd.org/changeset/base/339672 > > > > Log: > > Only call sigdeferstop() for NFS. > > > > Use bypass to catch any NFS VOP dispatch and route it through the > > wrapper which does sigdeferstop() and then dispatches original > > VOP. NFS does not need a bypass below it, which is not supported. > > > > The vop offset in the vop_vector is added since otherwise it is > > impossible to get vop_op_t from the internal table, and I did not > > wanted to create the layered fs only to wrap NFS VOPs. > > > > VFS_OP()s wrap is straightforward. > > > > Requested and reviewed by:mjg (previous version) > > Tested by:pho > > Sponsored by: The FreeBSD Foundation > > Differential revision:https://reviews.freebsd.org/D17658 > > > > Modified: > > head/sys/fs/nfsclient/nfs_clvnops.c > > head/sys/kern/vfs_default.c > > head/sys/kern/vfs_init.c > > head/sys/kern/vfs_mount.c > > head/sys/sys/mount.h > > head/sys/sys/vnode.h > > head/sys/tools/vnode_if.awk > > > > Unfortunately this broke amd(8). -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. > > > -- > Cheers, > Cy Schubert > FreeBSD UNIX: Web: http://www.FreeBSD.org > > The need of the many outweighs the greed of the few. > > > ___ 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: r339656 - head/lib/libc/stdio
Author: cy Date: Tue Oct 23 14:16:02 2018 New Revision: 339656 URL: https://svnweb.freebsd.org/changeset/base/339656 Log: Follow up on r331936. gets_s(3) will also fail in the same way that gets(3) does. This was missed in r331936. Reported by: emaste@ MFC after:3 days Modified: head/lib/libc/stdio/fgets.3 Modified: head/lib/libc/stdio/fgets.3 == --- head/lib/libc/stdio/fgets.3 Tue Oct 23 14:11:35 2018(r339655) +++ head/lib/libc/stdio/fgets.3 Tue Oct 23 14:16:02 2018(r339656) @@ -140,6 +140,8 @@ or .Pp The function .Fn gets +and +.Fn gets_s may also fail and set .Va errno for any of the errors specified for the routine ___ 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: r339658 - head/stand/i386/libi386
Thank you Toomas.
---
Sent using a tiny phone keyboard.
Apologies for any typos and autocorrect.
Also, this old phone only supports top post. Apologies.
Cy Schubert
or
The need of the many outweighs the greed of the few.
---
-Original Message-
From: Toomas Soome
Sent: 23/10/2018 07:44
To: src-committ...@freebsd.org; svn-src-all@freebsd.org;
svn-src-h...@freebsd.org
Subject: svn commit: r339658 - head/stand/i386/libi386
Author: tsoome
Date: Tue Oct 23 14:44:32 2018
New Revision: 339658
URL: https://svnweb.freebsd.org/changeset/base/339658
Log:
loader: biosdisk interface should be able to cope with 4k sectors
The 4kn support in current bios specific biosdisk.c is broken, as the code
is only implementing the support for the 512B sector size.
This work is building the support for custom size sectors, we still do assume
the requested data to be multiple of 512B blocks and we only do address the
biosdisk.c interface here.
For reference, see also:
https://www.illumos.org/issues/8303
https://www.illumos.org/rb/r/547
As the GELI is moved above biosdisk "layer", the GELI should just work
Reviewed by: imp
Differential Revision:https://reviews.freebsd.org/D11174
Modified:
head/stand/i386/libi386/biosdisk.c
Modified: head/stand/i386/libi386/biosdisk.c
==
--- head/stand/i386/libi386/biosdisk.c Tue Oct 23 14:38:08 2018
(r339657)
+++ head/stand/i386/libi386/biosdisk.c Tue Oct 23 14:44:32 2018
(r339658)
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
@@ -255,10 +256,11 @@ bd_int13probe(struct bdinfo *bd)
* Sector size must be a multiple of 512 bytes.
* An alternate test would be to check power of 2,
* powerof2(params.sector_size).
+* 4K is largest read buffer we can use at this time.
*/
- if (params.sector_size % BIOSDISK_SECSIZE)
- bd->bd_sectorsize = BIOSDISK_SECSIZE;
- else
+ if (params.sector_size >= 512 &&
+ params.sector_size <= 4096 &&
+ (params.sector_size % BIOSDISK_SECSIZE) == 0)
bd->bd_sectorsize = params.sector_size;
total = bd->bd_sectorsize * params.sectors;
@@ -448,16 +450,29 @@ bd_realstrategy(void *devdata, int rw, daddr_t dblk, s
char *buf, size_t *rsize)
{
struct disk_devdesc *dev = (struct disk_devdesc *)devdata;
- uint64_tdisk_blocks;
- int blks, rc;
+ uint64_t disk_blocks, offset;
+ size_t blks, blkoff, bsize, rest;
+ caddr_t bbuf;
+ int rc;
- if (size % BD(dev).bd_sectorsize) {
- panic("bd_strategy: %d bytes I/O not multiple of block size",
- size);
+ /*
+* First make sure the IO size is a multiple of 512 bytes. While we do
+* process partial reads below, the strategy mechanism is built
+* assuming IO is a multiple of 512B blocks. If the request is not
+* a multiple of 512B blocks, it has to be some sort of bug.
+*/
+ if (size == 0 || (size % BIOSDISK_SECSIZE) != 0) {
+ printf("bd_strategy: %d bytes I/O not multiple of %d\n",
+ size, BIOSDISK_SECSIZE);
+ return (EIO);
}
DEBUG("open_disk %p", dev);
+ offset = dblk * BIOSDISK_SECSIZE;
+ dblk = offset / BD(dev).bd_sectorsize;
+ blkoff = offset % BD(dev).bd_sectorsize;
+
/*
* Check the value of the size argument. We do have quite small
* heap (64MB), but we do not know good upper limit, so we check against
@@ -465,11 +480,14 @@ bd_realstrategy(void *devdata, int rw, daddr_t dblk, s
* while translating block count to bytes.
*/
if (size > INT_MAX) {
- DEBUG("too large read: %zu bytes", size);
+ DEBUG("too large I/O: %zu bytes", size);
return (EIO);
}
blks = size / BD(dev).bd_sectorsize;
+ if (blks == 0 || (size % BD(dev).bd_sectorsize) != 0)
+ blks++;
+
if (dblk > dblk + blks)
return (EIO);
@@ -498,36 +516,75 @@ bd_realstrategy(void *devdata, int rw, daddr_t dblk, s
if (dblk + blks >= dev->d_offset + disk_blocks) {
blks = dev->d_offset + disk_blocks - dblk;
size = blks * BD(dev).bd_sectorsize;
- DEBUG("short read %d", blks);
+ DEBUG("short I/O %d", blks);
}
- switch (rw & F_MASK) {
- case F_READ:
- DEBUG("read %d from %lld to %p", blks, dblk, buf);
Re: svn commit: r339672 - in head/sys: fs/nfsclient kern sys tools
In message <20181024145649.gc5...@kib.kiev.ua>, Konstantin Belousov writes: > On Wed, Oct 24, 2018 at 07:19:33AM -0700, Cy Schubert wrote: > > In message <201810241159.w9obxfwg013...@slippy.cwsent.com>, Cy Schubert > > writes: > > > In message <201810232143.w9nlhfek087...@repo.freebsd.org>, Konstantin > > > Belousov > > > writes: > > > > Author: kib > > > > Date: Tue Oct 23 21:43:41 2018 > > > > New Revision: 339672 > > > > URL: https://svnweb.freebsd.org/changeset/base/339672 > > > > > > > > Log: > > > > Only call sigdeferstop() for NFS. > > > > > > > > Use bypass to catch any NFS VOP dispatch and route it through the > > > > wrapper which does sigdeferstop() and then dispatches original > > > > VOP. NFS does not need a bypass below it, which is not supported. > > > > > > > > The vop offset in the vop_vector is added since otherwise it is > > > > impossible to get vop_op_t from the internal table, and I did not > > > > wanted to create the layered fs only to wrap NFS VOPs. > > > > > > > > VFS_OP()s wrap is straightforward. > > > > > > > > Requested and reviewed by:mjg (previous version) > > > > Tested by:pho > > > > Sponsored by: The FreeBSD Foundation > > > > Differential revision:https://reviews.freebsd.org/D17658 > > > > > > > > Modified: > > > > head/sys/fs/nfsclient/nfs_clvnops.c > > > > head/sys/kern/vfs_default.c > > > > head/sys/kern/vfs_init.c > > > > head/sys/kern/vfs_mount.c > > > > head/sys/sys/mount.h > > > > head/sys/sys/vnode.h > > > > head/sys/tools/vnode_if.awk > > > > > > > > > > Unfortunately this broke amd(8). > > > > I should have included this. > > > > Oct 24 00:34:13 slippy amd[2741]: '/home': mount: Operation not > > supported > > Oct 24 00:34:13 slippy amd[2742]: '/vol': mount: Operation not supported > > Oct 24 00:34:13 slippy amd[2743]: '/net': mount: Operation not supported > > Oct 24 00:34:14 slippy amd[2742]: '/vol': mount: Operation not supported > > Oct 24 00:34:14 slippy amd[2741]: '/home': mount: Operation not > > supported > > Oct 24 00:34:14 slippy amd[2742]: amfs_toplvl_mount: amfs_mount failed: > > Operation not supported > > Try this. > > diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c > index 8d98cb199ec..74bfe733100 100644 > --- a/sys/kern/vfs_mount.c > +++ b/sys/kern/vfs_mount.c > @@ -808,8 +808,10 @@ sys_mount(struct thread *td, struct mount_args *uap) > free(fstype, M_TEMP); > if (vfsp == NULL) > return (ENOENT); > - if (vfsp->vfc_vfsops->vfs_cmount == NULL || ((vfsp->vfc_flags & > - VFCF_SBDRY) != 0 && (vfsp->vfc_vfsops_sd->vfs_cmount == NULL))) > + if (((vfsp->vfc_flags & VFCF_SBDRY) != 0 && > + vfsp->vfc_vfsops_sd->vfs_cmount == NULL) || > + ((vfsp->vfc_flags & VFCF_SBDRY) == 0 && > + vfsp->vfc_vfsops->vfs_cmount == NULL)) > return (EOPNOTSUPP); > > ma = mount_argsu(ma, "fstype", uap->type, MFSNAMELEN); Yes, that fixes it. Thank you. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ 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: r339828 - stable/12/lib/libc/stdio
Author: cy Date: Sun Oct 28 00:57:39 2018 New Revision: 339828 URL: https://svnweb.freebsd.org/changeset/base/339828 Log: Follow up on r331936. gets_s(3) will also fail in the same way that gets(3) does. This was missed in r331936. Reported by: emaste@ Approved by: re (kib@) Modified: stable/12/lib/libc/stdio/fgets.3 Directory Properties: stable/12/ (props changed) Modified: stable/12/lib/libc/stdio/fgets.3 == --- stable/12/lib/libc/stdio/fgets.3Sat Oct 27 23:31:42 2018 (r339827) +++ stable/12/lib/libc/stdio/fgets.3Sun Oct 28 00:57:39 2018 (r339828) @@ -140,6 +140,8 @@ or .Pp The function .Fn gets +and +.Fn gets_s may also fail and set .Va errno for any of the errors specified for the routine ___ 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: r339829 - stable/11/lib/libc/stdio
Author: cy Date: Sun Oct 28 00:57:44 2018 New Revision: 339829 URL: https://svnweb.freebsd.org/changeset/base/339829 Log: Follow up on r331936. gets_s(3) will also fail in the same way that gets(3) does. This was missed in r331936. Reported by: emaste@ Modified: stable/11/lib/libc/stdio/fgets.3 Directory Properties: stable/11/ (props changed) Modified: stable/11/lib/libc/stdio/fgets.3 == --- stable/11/lib/libc/stdio/fgets.3Sun Oct 28 00:57:39 2018 (r339828) +++ stable/11/lib/libc/stdio/fgets.3Sun Oct 28 00:57:44 2018 (r339829) @@ -140,6 +140,8 @@ or .Pp The function .Fn gets +and +.Fn gets_s may also fail and set .Va errno for any of the errors specified for the routine ___ 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: r340413 - in head/sys: kern net sys
Sorry. This should have been a private email. But now that it's in the
wild, if_sk.c calls epoch_enter_preempt() at line 84 which causes panic
early in boot.
--
Cheers,
Cy Schubert
FreeBSD UNIX: Web: http://www.FreeBSD.org
The need of the many outweighs the greed of the few.
In message <201811140933.wae9xxsl003...@slippy.cwsent.com>, Cy Schubert
writes:
> In message <201811132258.wadmwctl063...@repo.freebsd.org>, Gleb
> Smirnoff writes
> :
> > Author: glebius
> > Date: Tue Nov 13 22:58:38 2018
> > New Revision: 340413
> > URL: https://svnweb.freebsd.org/changeset/base/340413
> >
> > Log:
> > For compatibility KPI functions like if_addr_rlock() that used to have
> > mutexes but now are converted to epoch(9) use thread-private epoch_tracke
> r.
> > Embedding tracker into ifnet(9) or ifnet derived structures creates a non
> > reentrable function, that will fail miserably if called simultaneously fr
> om
> > two different contexts.
> > A thread private tracker will provide a single tracker that would allow t
> o
> > call these functions safely. It doesn't allow nested call, but this is no
> t
> > expected from compatibility KPIs.
> >
> > Reviewed by: markj
> >
> > Modified:
> > head/sys/kern/kern_thread.c
> > head/sys/kern/subr_epoch.c
> > head/sys/net/if.c
> > head/sys/net/if_var.h
> > head/sys/sys/epoch.h
> > head/sys/sys/proc.h
> >
> > Modified: head/sys/kern/kern_thread.c
> > ===
> ==
> > =
> > --- head/sys/kern/kern_thread.c Tue Nov 13 22:41:20 2018(r34041
> > 2)
> > +++ head/sys/kern/kern_thread.c Tue Nov 13 22:58:38 2018(r34041
> > 3)
> > @@ -272,6 +272,7 @@ thread_init(void *mem, int size, int flags)
> > td->td_rlqe = NULL;
> > EVENTHANDLER_DIRECT_INVOKE(thread_init, td);
> > umtx_thread_init(td);
> > + epoch_thread_init(td);
> > td->td_kstack = 0;
> > td->td_sel = NULL;
> > return (0);
> > @@ -291,6 +292,7 @@ thread_fini(void *mem, int size)
> > turnstile_free(td->td_turnstile);
> > sleepq_free(td->td_sleepqueue);
> > umtx_thread_fini(td);
> > + epoch_thread_fini(td);
> > seltdfini(td);
> > }
> >
> >
> > Modified: head/sys/kern/subr_epoch.c
> > ===
> ==
> > =
> > --- head/sys/kern/subr_epoch.c Tue Nov 13 22:41:20 2018(r34041
> > 2)
> > +++ head/sys/kern/subr_epoch.c Tue Nov 13 22:58:38 2018(r34041
> > 3)
> > @@ -667,3 +667,17 @@ in_epoch(epoch_t epoch)
> > {
> > return (in_epoch_verbose(epoch, 0));
> > }
> > +
> > +void
> > +epoch_thread_init(struct thread *td)
> > +{
> > +
> > + td->td_et = malloc(sizeof(struct epoch_tracker), M_EPOCH, M_WAITOK);
> > +}
> > +
> > +void
> > +epoch_thread_fini(struct thread *td)
> > +{
> > +
> > + free(td->td_et, M_EPOCH);
> > +}
> >
> > Modified: head/sys/net/if.c
> > ===
> ==
> > =
> > --- head/sys/net/if.c Tue Nov 13 22:41:20 2018(r340412)
> > +++ head/sys/net/if.c Tue Nov 13 22:58:38 2018(r340413)
> > @@ -1767,35 +1767,29 @@ if_data_copy(struct ifnet *ifp, struct if_data *ifd
> )
> > void
> > if_addr_rlock(struct ifnet *ifp)
> > {
> > - MPASS(*(uint64_t *)>if_addr_et == 0);
> > - epoch_enter_preempt(net_epoch_preempt, >if_addr_et);
> > +
> > + epoch_enter_preempt(net_epoch_preempt, curthread->td_et);
> > }
> >
> > void
> > if_addr_runlock(struct ifnet *ifp)
> > {
> > - epoch_exit_preempt(net_epoch_preempt, >if_addr_et);
> > -#ifdef INVARIANTS
> > - bzero(>if_addr_et, sizeof(struct epoch_tracker));
> > -#endif
> > +
> > + epoch_exit_preempt(net_epoch_preempt, curthread->td_et);
> > }
> >
> > void
> > if_maddr_rlock(if_t ifp)
> > {
> >
> > - MPASS(*(uint64_t *)>if_maddr_et == 0);
> > - epoch_enter_preempt(net_epoch_preempt, >if_maddr_et);
> > + epoch_enter_preempt(net_epoch_preempt, curthread->td_et);
>
>
> Hi Gleb,
>
> I was wrong. It's happening here, called from line 084 in if_sk.c.
>
> ~cy
>
> > }
> >
> > void
> > if_madd
Re: svn commit: r340413 - in head/sys: kern net sys
=
> =
> --- head/sys/sys/epoch.h Tue Nov 13 22:41:20 2018(r340412)
> +++ head/sys/sys/epoch.h Tue Nov 13 22:58:38 2018(r340413)
> @@ -82,5 +82,8 @@ void epoch_exit_preempt(epoch_t epoch, epoch_tracker_t
> void epoch_enter(epoch_t epoch);
> void epoch_exit(epoch_t epoch);
>
> +void epoch_thread_init(struct thread *);
> +void epoch_thread_fini(struct thread *);
> +
> #endif /* _KERNEL */
> #endif /* _SYS_EPOCH_H_ */
>
> Modified: head/sys/sys/proc.h
> =
> =
> --- head/sys/sys/proc.h Tue Nov 13 22:41:20 2018(r340412)
> +++ head/sys/sys/proc.h Tue Nov 13 22:58:38 2018(r340413)
> @@ -193,6 +193,7 @@ struct trapframe;
> struct turnstile;
> struct vm_map;
> struct vm_map_entry;
> +struct epoch_tracker;
>
> /*
> * XXX: Does this belong in resource.h or resourcevar.h instead?
> @@ -360,6 +361,7 @@ struct thread {
> int td_lastcpu; /* (t) Last cpu we were on. */
> int td_oncpu; /* (t) Which cpu we are on. */
> void*td_lkpi_task; /* LinuxKPI task struct pointer */
> + struct epoch_tracker *td_et;/* (k) compat KPI spare tracker */
> int td_pmcpend;
> };
>
>
--
Cheers,
Cy Schubert
FreeBSD UNIX: Web: http://www.FreeBSD.org
The need of the many outweighs the greed of the few.
___
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: r340413 - in head/sys: kern net sys
In message <178c3d69-4a3b-49cb-dab4-f6f4139df...@selasky.org>, Hans Petter Sela sky writes: > On 11/14/18 10:33 AM, Cy Schubert wrote: > > + epoch_thread_init(td); > > Did you forget to call epoch_thread_init() for thread0 ? > > --HPS It appears that interfaces that call if_maddr_rlock(ifp) have the issue. This suggests epoch_thread_init() for thread0 hasn't been called yet when interfaces (specifically those that call if_maddr_rlock()) attach. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ 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: r264378 - head/sys/geom/part
+1 --- Sent using a tiny phone keyboard. Apologies for any typos and autocorrect. Also, this old phone only supports top post. Apologies. Cy Schubert or The need of the many outweighs the greed of the few. --- -Original Message- From: Poul-Henning Kamp Sent: 08/10/2018 11:33 To: John Baldwin Cc: Marcel Moolenaar; src-committ...@freebsd.org; svn-src-all@freebsd.org; svn-src-h...@freebsd.org; Josh Paetzel Subject: Re: svn commit: r264378 - head/sys/geom/part In message , John Baldwin writes: >On 4/12/14 1:28 PM, Marcel Moolenaar wrote: >Also, while we may want to create sane layouts by default, we >should probably always provide a way to create less-sane layouts that are >still conformant to the spec. I do wonder if this kind of default >preference shouldn't belong in the userspace gpart tool rather than the >kernel and the kernel should create any compliant layout as requested by >userland instead. Seconded. -- Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 p...@freebsd.org | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe Never attribute to malice what can adequately be explained by incompetence. ___ 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: r338861 - head/lib/libc
In message <201809211749.w8lhnbap091...@repo.freebsd.org>, Ed Maste
writes:
> Author: emaste
> Date: Fri Sep 21 17:49:37 2018
> New Revision: 338861
> URL: https://svnweb.freebsd.org/changeset/base/338861
>
> Log:
> libc: require ifunc-capable linker for amd64/i386
>
> We expect to introduce optimized libc routines in the near future,
> which requires use of a linker that supports ifuncs.
>
> Approved by:re (gjb, kib)
> Sponsored by: The FreeBSD Foundation
>
> Modified:
> head/lib/libc/Makefile
>
> Modified: head/lib/libc/Makefile
> =
> =
> --- head/lib/libc/MakefileFri Sep 21 17:44:05 2018(r338860)
> +++ head/lib/libc/MakefileFri Sep 21 17:49:37 2018(r338861)
> @@ -21,6 +21,11 @@ LIBC_ARCH=${MACHINE_ARCH}
> LIBC_ARCH=${MACHINE_CPUARCH}
> .endif
>
> +.if (${LIBC_ARCH} == amd64 || ${LIBC_ARCH} == i386) && \
> +defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mifunc} == ""
> +.error ${LIBC_ARCH} libc requires linker ifunc support
> +.endif
> +
> # All library objects contain FreeBSD revision strings by default; they may
> be
> # excluded as a space-saving measure. To produce a library that does
> # not contain these strings, add -DSTRIP_FBSDID (see ) to CFLAG
> S
>
Should this require bumping __FreeBSD_version?
--
Cheers,
Cy Schubert
FreeBSD UNIX: Web: http://www.FreeBSD.org
The need of the many outweighs the greed of the few.
___
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: r340478 - head/share/man/man7
In message <201811161804.wagi44wc047...@pdx.rh.cn85.dnsmgr.net>, "Rodney W. Gri mes" writes: > > On Fri, Nov 16, 2018 at 7:29 AM Mateusz Piotrowski <0...@freebsd.org> wrote: > > > > > A few years ago jilles@ proposed changing reboot's default to signallin > g > > > init (preserving reboot -q which just invokes the reboot system call), > > > but > > > this was not accepted. Perhaps this can be tried again for 13.0. > > > > > > > I didn't like it at the time, however I was wrong. Much of my reasoning for > > doing it has become muted as well since then, and the need to do it has > > become more amplified as more rc scripts have grown shutdown > > functionality... > > > > I think if we make what's now reboot 'fastreboot' or 'reboot -q' (both of > > which are historic replacements), we can make 'reboot' what's now 'shutdown > > -r now'. > > I support this position. reboot(2) should be changed to signal init(8). RB_AUTOBOOT should signal init while a new RB_FASTBOOT or RB_LEGACY (or pick a name) would preserve traditional behavior. RB_POWEROFF, RB_POWERCYCLE and RB_HALT would also signal init except when RB_FASTBOOT flag is set. This aligns us better with what Linux is currently doing. IIRC Solaris still uses the legacy behavior however Solaris isn't relevant any more. Linux is pretty much the standard and we should endeavour to conform as much as we can. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ 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: r340478 - head/share/man/man7
In message , =?utf-8?Q?Edward _Tomasz_Napiera=C5=82a?= writes: > > > > On 16 Nov 2018, at 18:40, Cy Schubert wrote: > > > > In message <201811161804.wagi44wc047...@pdx.rh.cn85.dnsmgr.net>, > > "Rodney W. Gri > > mes" writes: > >>>> On Fri, Nov 16, 2018 at 7:29 AM Mateusz Piotrowski <0...@freebsd.org> wro > te: > >>>> > >>>> A few years ago jilles@ proposed changing reboot's default to signallin > >> g > >>>> init (preserving reboot -q which just invokes the reboot system call), > >>>> but > >>>> this was not accepted. Perhaps this can be tried again for 13.0. > >>>> > >>> > >>> I didn't like it at the time, however I was wrong. Much of my reasoning f > or > >>> doing it has become muted as well since then, and the need to do it has > >>> become more amplified as more rc scripts have grown shutdown > >>> functionality... > >>> > >>> I think if we make what's now reboot 'fastreboot' or 'reboot -q' (both of > >>> which are historic replacements), we can make 'reboot' what's now 'shutdo > wn > >>> -r now'. > >> > >> I support this position. > > > > reboot(2) should be changed to signal init(8). RB_AUTOBOOT should > > signal init while a new RB_FASTBOOT or RB_LEGACY (or pick a name) would > > preserve traditional behavior. RB_POWEROFF, RB_POWERCYCLE and RB_HALT > > would also signal init except when RB_FASTBOOT flag is set. > > Wouldnât this break rebooting when UID 1 is not init(8)? You mean PID 1, right? This would obviously require special case handling when the caller is PID 1. Tangentially, though Linux vaguely documents RB_*, they document LINUX_REBOOT_* in their man page, which obviously doesn't work here. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ 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: r342596 - head/sys/contrib/ipfilter/netinet
Author: cy Date: Sat Dec 29 18:11:17 2018 New Revision: 342596 URL: https://svnweb.freebsd.org/changeset/base/342596 Log: Remove duplicate include of sys/mbuf.h. Reported by: Trond Endrest MFC after:3 days Modified: head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Modified: head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c == --- head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Dec 29 15:55:44 2018(r342595) +++ head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Dec 29 18:11:17 2018(r342596) @@ -39,7 +39,6 @@ static const char rcsid[] = "@(#)$Id$"; # include # include # include -# include #include # include # include ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r342608 - in stable: 10/sys/contrib/ipfilter/netinet 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet
Author: cy Date: Sun Dec 30 04:42:01 2018 New Revision: 342608 URL: https://svnweb.freebsd.org/changeset/base/342608 Log: MFC r342547: Remove another empty #ifdef block. This empty block also exists in the upstream HEAD. Modified: stable/11/sys/contrib/ipfilter/netinet/fil.c Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/contrib/ipfilter/netinet/fil.c stable/12/sys/contrib/ipfilter/netinet/fil.c Directory Properties: stable/10/ (props changed) stable/12/ (props changed) Modified: stable/11/sys/contrib/ipfilter/netinet/fil.c == --- stable/11/sys/contrib/ipfilter/netinet/fil.cSun Dec 30 04:37:49 2018(r342607) +++ stable/11/sys/contrib/ipfilter/netinet/fil.cSun Dec 30 04:42:01 2018(r342608) @@ -4266,8 +4266,6 @@ copyoutptr(softc, src, dst, size) } return error; } -#ifdef _KERNEL -#endif /* */ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r342606 - in stable: 10/sys/contrib/ipfilter/netinet 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet
Author: cy Date: Sun Dec 30 04:31:51 2018 New Revision: 342606 URL: https://svnweb.freebsd.org/changeset/base/342606 Log: MFC r341279: Clean up a redundant non-redefinition of IFNAMSIZ. IFNAMSIZ is defined in net/if.h, therefore the condition is never met and confusing to those who follow. Modified: stable/11/sys/contrib/ipfilter/netinet/ip_compat.h Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/contrib/ipfilter/netinet/ip_compat.h stable/12/sys/contrib/ipfilter/netinet/ip_compat.h Directory Properties: stable/10/ (props changed) stable/12/ (props changed) Modified: stable/11/sys/contrib/ipfilter/netinet/ip_compat.h == --- stable/11/sys/contrib/ipfilter/netinet/ip_compat.h Sun Dec 30 04:25:48 2018(r342605) +++ stable/11/sys/contrib/ipfilter/netinet/ip_compat.h Sun Dec 30 04:31:51 2018(r342606) @@ -1400,10 +1400,6 @@ typedef struct tcpiphdrtcpiphdr_t; #undef ICMP_MAXTYPE #defineICMP_MAXTYPE18 -#ifndefIFNAMSIZ -#defineIFNAMSIZ16 -#endif - #ifndefLOG_FTP # define LOG_FTP (11<<3) #endif ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r342794 - in stable: 10/contrib/ipfilter 11/contrib/ipfilter 12/contrib/ipfilter
Author: cy Date: Sun Jan 6 00:32:14 2019 New Revision: 342794 URL: https://svnweb.freebsd.org/changeset/base/342794 Log: MFC r342605: TCP_PAWS_IDLE is does not exist in NetBSD and illumos. In FreeBSD TCP_PAWS_IDLE is defined in netinet/tcp_seq.h, however this header isn't included explicitly or implicitly at this point therefore as far ipfilter is concerned TCP_PAWS_IDLE is not defined. Remove the #ifdef and include netinet/tcp.h unconditionally. Modified: stable/10/contrib/ipfilter/ipf.h Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/11/contrib/ipfilter/ipf.h stable/12/contrib/ipfilter/ipf.h Directory Properties: stable/11/ (props changed) stable/12/ (props changed) Modified: stable/10/contrib/ipfilter/ipf.h == --- stable/10/contrib/ipfilter/ipf.hSat Jan 5 22:45:20 2019 (r342793) +++ stable/10/contrib/ipfilter/ipf.hSun Jan 6 00:32:14 2019 (r342794) @@ -49,9 +49,7 @@ struct file; #include #include #include -#ifndefTCP_PAWS_IDLE /* IRIX */ # include -#endif #include #include ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r342794 - in stable: 10/contrib/ipfilter 11/contrib/ipfilter 12/contrib/ipfilter
Author: cy Date: Sun Jan 6 00:32:14 2019 New Revision: 342794 URL: https://svnweb.freebsd.org/changeset/base/342794 Log: MFC r342605: TCP_PAWS_IDLE is does not exist in NetBSD and illumos. In FreeBSD TCP_PAWS_IDLE is defined in netinet/tcp_seq.h, however this header isn't included explicitly or implicitly at this point therefore as far ipfilter is concerned TCP_PAWS_IDLE is not defined. Remove the #ifdef and include netinet/tcp.h unconditionally. Modified: stable/11/contrib/ipfilter/ipf.h Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/10/contrib/ipfilter/ipf.h stable/12/contrib/ipfilter/ipf.h Directory Properties: stable/10/ (props changed) stable/12/ (props changed) Modified: stable/11/contrib/ipfilter/ipf.h == --- stable/11/contrib/ipfilter/ipf.hSat Jan 5 22:45:20 2019 (r342793) +++ stable/11/contrib/ipfilter/ipf.hSun Jan 6 00:32:14 2019 (r342794) @@ -47,9 +47,7 @@ struct file; #include #include #include -#ifndefTCP_PAWS_IDLE /* IRIX */ # include -#endif #include #include ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r342794 - in stable: 10/contrib/ipfilter 11/contrib/ipfilter 12/contrib/ipfilter
Author: cy Date: Sun Jan 6 00:32:14 2019 New Revision: 342794 URL: https://svnweb.freebsd.org/changeset/base/342794 Log: MFC r342605: TCP_PAWS_IDLE is does not exist in NetBSD and illumos. In FreeBSD TCP_PAWS_IDLE is defined in netinet/tcp_seq.h, however this header isn't included explicitly or implicitly at this point therefore as far ipfilter is concerned TCP_PAWS_IDLE is not defined. Remove the #ifdef and include netinet/tcp.h unconditionally. Modified: stable/12/contrib/ipfilter/ipf.h Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/10/contrib/ipfilter/ipf.h stable/11/contrib/ipfilter/ipf.h Directory Properties: stable/10/ (props changed) stable/11/ (props changed) Modified: stable/12/contrib/ipfilter/ipf.h == --- stable/12/contrib/ipfilter/ipf.hSat Jan 5 22:45:20 2019 (r342793) +++ stable/12/contrib/ipfilter/ipf.hSun Jan 6 00:32:14 2019 (r342794) @@ -47,9 +47,7 @@ struct file; #include #include #include -#ifndefTCP_PAWS_IDLE /* IRIX */ # include -#endif #include #include ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r342812 - head/share/skel
In message <201901061623.x06gns1w057...@repo.freebsd.org>, Edward Tomasz Napier ala writes: > Author: trasz > Date: Sun Jan 6 16:23:28 2019 > New Revision: 342812 > URL: https://svnweb.freebsd.org/changeset/base/342812 > > Log: > Give sh(1) a proper default prompt instead of just "$". > > Reviewed by:jilles > MFC after: 2 weeks > Relnotes: totally > Sponsored by: DARPA, AFRL > Differential Revision: https://reviews.freebsd.org/D18697 > > Modified: > head/share/skel/dot.shrc > > Modified: head/share/skel/dot.shrc > = > = > --- head/share/skel/dot.shrc Sun Jan 6 05:07:52 2019(r342811) > +++ head/share/skel/dot.shrc Sun Jan 6 16:23:28 2019(r342812) > @@ -32,8 +32,8 @@ alias g='egrep -i' > # alias rm='rm -i' > > > -# # set prompt: ``username@hostname:directory $ '' > -# PS1="`whoami`@\h:\w \\$ " > +# set prompt: ``username@hostname:directory $ '' > +PS1="`whoami`@\h:\w \\$ " > > # search path for cd(1) > # CDPATH=:$HOME > Hmmm. At $JOB the RHEL servers use this prompt. IMO the prompt is unwieldy and distracting. Instead of \w could we use \W instead? -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ 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: r342815 - in head/contrib/ipfilter/ipsd: . Celler
Author: cy Date: Sun Jan 6 21:24:44 2019 New Revision: 342815 URL: https://svnweb.freebsd.org/changeset/base/342815 Log: Remove ipsd (IP Scan Detetor). It is unused and to my knowledge has never been used on any platform that ipfilter has been on. However it looks like it could be a useful utility, therefore there are plans to make it a port one day. It lacks a man page as well. MFC after:1 month Deleted: head/contrib/ipfilter/ipsd/Celler/ip_compat.h head/contrib/ipfilter/ipsd/Makefile head/contrib/ipfilter/ipsd/README head/contrib/ipfilter/ipsd/ipsd.c head/contrib/ipfilter/ipsd/ipsd.h head/contrib/ipfilter/ipsd/ipsdr.c head/contrib/ipfilter/ipsd/linux.h head/contrib/ipfilter/ipsd/sbpf.c head/contrib/ipfilter/ipsd/sdlpi.c head/contrib/ipfilter/ipsd/slinux.c head/contrib/ipfilter/ipsd/snit.c ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r343103 - head/contrib/ipfilter
Author: cy Date: Wed Jan 16 20:46:39 2019 New Revision: 343103 URL: https://svnweb.freebsd.org/changeset/base/343103 Log: Remove redundant ipfilter version of pcap-bpf.h. As of r214535 it was no longer needed. MFC after:1 week Deleted: head/contrib/ipfilter/pcap-bpf.h ___ 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: r343118 - in head/usr.sbin: . trim
In message <201901171808.x0hi80jc068...@repo.freebsd.org>, Eugene Grosbein writ es: > Author: eugen > Date: Thu Jan 17 18:07:59 2019 > New Revision: 343118 > URL: https://svnweb.freebsd.org/changeset/base/343118 > > Log: > Re-add new small tool trim(8) to delete contents for blocks > on devices using wear-leveling algorithms as a few weeks passed > after review and discussion of trim(8) ceased and > we still have no utility to perform the job. > > Reviewed by:hackers@ > MFC after: 2 weeks > > Added: > head/usr.sbin/trim/ > head/usr.sbin/trim/Makefile (contents, props changed) > head/usr.sbin/trim/trim.8 (contents, props changed) > head/usr.sbin/trim/trim.c (contents, props changed) > Modified: > head/usr.sbin/Makefile > This is wrong. IIRC there was discussion that this should be in dd(1). Why not submit a revision to add the functionality to dd? -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ 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: r343118 - in head/usr.sbin: . trim
In message , Conrad Meyer writes: > On Thu, Jan 17, 2019 at 12:22 PM Cy Schubert wrot > e: > > This is wrong. IIRC there was discussion that this should be in dd(1). > > Why not submit a revision to add the functionality to dd? > > Well, it's wrong, but not because we need another weird dd mode. dd > is hard enough to use already. I've never found dd confusing. What's wrong conv=erase? If it must stay, sderase is a better name. That's really what it does. Ports maybe? -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ 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: r343118 - in head/usr.sbin: . trim
In message <81bb343b-ad8a-371d-d94f-f72c8dbce...@grosbein.net>, Eugene Grosbein writes: > 18.01.2019 5:25, Maxim Sobolev wrote: > > > Using usr.sbin/trim as an example. > > We still lack a command usable at installation stage (escape to shell) to tri > m a device or partition > dedicated to ZFS Cache/ZFS Intention Log/zvol any other use when ports/packag > es are not yet available. OK, I will put a review together for dd. Do you realize that what you just said? Your statement is inconsistent with where trim is installed? Then it should have been installed in /sbin not where you put it. I don't want to start yet another bikeshed arguing the merits of this or that -- I'm intentionally being vague here because I really don't want to stat a different bikeshed thread. But suffice it to say, dd is the place for it because it lives in /bin and dd is already included in /rescue. Everything about trim is wrong, even where it is put. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ 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: r343118 - in head/usr.sbin: . trim
On January 18, 2019 7:11:05 AM PST, Eugene Grosbein wrote: >On 18.01.2019 19:54, Cy Schubert wrote: > >> In message <81bb343b-ad8a-371d-d94f-f72c8dbce...@grosbein.net>, >Eugene >> Grosbein >> writes: >>> 18.01.2019 5:25, Maxim Sobolev wrote: >>> >>>> Using usr.sbin/trim as an example. >>> >>> We still lack a command usable at installation stage (escape to >shell) to tri >>> m a device or partition >>> dedicated to ZFS Cache/ZFS Intention Log/zvol any other use when >ports/packag >>> es are not yet available. >> >> OK, I will put a review together for dd. >> >> Do you realize that what you just said? Your statement is >inconsistent >> with where trim is installed? Then it should have been installed in >> /sbin not where you put it. I don't want to start yet another >bikeshed >> arguing the merits of this or that -- I'm intentionally being vague >> here because I really don't want to stat a different bikeshed thread. > >> But suffice it to say, dd is the place for it because it lives in >/bin >> and dd is already included in /rescue. > >Modern FreeBSD installation media have usr/bin and usr/sbin ready for >shell session >as they contain live system. I'm not against dd conv=trim but it has >different usage pattern >and it is not easy replacement for trim(8). What do you not understand? We do not want it in base without a proper review. This second attempt at commit without a proper review is IMO disrespectful. Remove it now and submit a proper review. -- Pardon the typos and autocorrect, small keyboard in use. Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ 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: r343011 - in head/kerberos5: lib/libasn1 lib/libgssapi_krb5 lib/libhdb lib/libheimntlm lib/libhx509 lib/libkadm5clnt lib/libkadm5srv lib/libkdc lib/libkrb5 lib/libwind libexec/diges
In message <201901141617.x0eghwqq035...@pdx.rh.cn85.dnsmgr.net>,
"Rodney W. Gri
mes" writes:
> > Author: nyan
> > Date: Mon Jan 14 06:34:54 2019
> > New Revision: 343011
> > URL: https://svnweb.freebsd.org/changeset/base/343011
> >
> > Log:
> > Use ${SRCTOP}/contrib/com_err/com_err.h instead of the installed com_err.
> h.
> > This fixes build when com_err.h is not installed.
>
> Isn't this the general state of affairs for almost all
> of the source tree? I would rather see this solved
> in a general way, rather than sprinkly all this
> -I${SRCTOP} all over in the tree.
Agreed however in practice this is fixed when discovered while working
on other issues/problems/projects.
>
> It use to be (and maybe still is) required that you run
> cd $DRCTOP && make includes
> if you expected new source code to compile. I expect
> this has changed, but the just of it should work in
> some aspect.
This fixes the potential bug of requiring a header file to be
installed. I suspect this to be an oversight at the time.
Good that it's fixed now.
--
Cheers,
Cy Schubert
FreeBSD UNIX: Web: http://www.FreeBSD.org
The need of the many outweighs the greed of the few.
___
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: r343011 - in head/kerberos5: lib/libasn1 lib/libgssapi_krb5 lib/libhdb lib/libheimntlm lib/libhx509 lib/libkadm5clnt lib/libkadm5srv lib/libkdc lib/libkrb5 lib/libwind libexec/digest-s
On January 14, 2019 12:31:26 PM PST, "Rodney W. Grimes"
wrote:
>> In message <201901141617.x0eghwqq035...@pdx.rh.cn85.dnsmgr.net>,
>> "Rodney W. Gri
>> mes" writes:
>> > > Author: nyan
>> > > Date: Mon Jan 14 06:34:54 2019
>> > > New Revision: 343011
>> > > URL: https://svnweb.freebsd.org/changeset/base/343011
>> > >
>> > > Log:
>> > > Use ${SRCTOP}/contrib/com_err/com_err.h instead of the
>installed com_err.
>> > h.
>> > > This fixes build when com_err.h is not installed.
>> >
>> > Isn't this the general state of affairs for almost all
>> > of the source tree? I would rather see this solved
>> > in a general way, rather than sprinkly all this
>> > -I${SRCTOP} all over in the tree.
>>
>> Agreed however in practice this is fixed when discovered while
>working
>> on other issues/problems/projects.
>
>This adds another special case that should not exist.
>
>> >
>> > It use to be (and maybe still is) required that you run
>> > cd $DRCTOP && make includes
>> > if you expected new source code to compile. I expect
>> > this has changed, but the just of it should work in
>> > some aspect.
>>
>> This fixes the potential bug of requiring a header file to be
>> installed. I suspect this to be an oversight at the time.
>>
>> Good that it's fixed now.
>
>Something is wrong, as infact com_err.h *IS*
>installed as /usr/include/com_err.h
>
>diff /usr/include/com_err.h /usr/src/contrib/com_err/com_err.h
This is the typical location krb5 puts this file. There is a project branch
that moves this file by making kerberos private. It's currently blocked by a
number of ports this breaks, most of which are addressed.
--
Pardon the typos and autocorrect, small keyboard in use.
Cheers,
Cy Schubert
FreeBSD UNIX: Web: http://www.FreeBSD.org
The need of the many outweighs the greed of the few.
___
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: r343073 - head/contrib/ipfilter
Author: cy Date: Wed Jan 16 02:05:42 2019 New Revision: 343073 URL: https://svnweb.freebsd.org/changeset/base/343073 Log: Remove an IRIX-only source file. MFC after:1 week Deleted: head/contrib/ipfilter/mli_ipl.c ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r343262 - head/sys/amd64/linux
On January 21, 2019 8:25:41 AM PST, Ed Maste wrote:
>Author: emaste
>Date: Mon Jan 21 16:25:40 2019
>New Revision: 343262
>URL: https://svnweb.freebsd.org/changeset/base/343262
>
>Log:
> linuxulator: fix stack memory disclosure in linux_sigaltstack
>
> admbugs: 765
> Reported by: Vlad Tsyrklevich
> Reviewed by: andrew
> MFC after: 1 day
> Security:Kernel memory disclosure
> Sponsored by: The FreeBSD Foundation
>
>Modified:
> head/sys/amd64/linux/linux_machdep.c
>
>Modified: head/sys/amd64/linux/linux_machdep.c
>==
>--- head/sys/amd64/linux/linux_machdep.c Mon Jan 21 16:21:03
>2019 (r343261)
>+++ head/sys/amd64/linux/linux_machdep.c Mon Jan 21 16:25:40
>2019 (r343262)
>@@ -201,6 +201,7 @@ linux_sigaltstack(struct thread *td, struct
>linux_siga
> l_stack_t lss;
> int error;
>
>+ memset(, 0, sizeof(lss));
> LINUX_CTR2(sigaltstack, "%p, %p", uap->uss, uap->uoss);
>
> if (uap->uss != NULL) {
Do we have a CVE for this?
--
Pardon the typos and autocorrect, small keyboard in use.
Cheers,
Cy Schubert
FreeBSD UNIX: Web: http://www.FreeBSD.org
The need of the many outweighs the greed of the few.
___
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: r343337 - in stable: 10/contrib/ipfilter 11/contrib/ipfilter 12/contrib/ipfilter
Author: cy Date: Wed Jan 23 02:43:49 2019 New Revision: 343337 URL: https://svnweb.freebsd.org/changeset/base/343337 Log: MFC r343103: Remove redundant ipfilter version of pcap-bpf.h. As of r214535 it was no longer needed. Deleted: stable/12/contrib/ipfilter/pcap-bpf.h Modified: Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Deleted: stable/10/contrib/ipfilter/pcap-bpf.h stable/11/contrib/ipfilter/pcap-bpf.h Modified: Directory Properties: stable/10/ (props changed) stable/11/ (props changed) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r343337 - in stable: 10/contrib/ipfilter 11/contrib/ipfilter 12/contrib/ipfilter
Author: cy Date: Wed Jan 23 02:43:49 2019 New Revision: 343337 URL: https://svnweb.freebsd.org/changeset/base/343337 Log: MFC r343103: Remove redundant ipfilter version of pcap-bpf.h. As of r214535 it was no longer needed. Deleted: stable/11/contrib/ipfilter/pcap-bpf.h Modified: Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Deleted: stable/10/contrib/ipfilter/pcap-bpf.h stable/12/contrib/ipfilter/pcap-bpf.h Modified: Directory Properties: stable/10/ (props changed) stable/12/ (props changed) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r343336 - in stable: 10/contrib/ipfilter 11/contrib/ipfilter 12/contrib/ipfilter
Author: cy Date: Wed Jan 23 02:40:29 2019 New Revision: 343336 URL: https://svnweb.freebsd.org/changeset/base/343336 Log: MFC r343073: Remove an IRIX-only source file. Deleted: stable/10/contrib/ipfilter/mli_ipl.c Modified: Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Deleted: stable/11/contrib/ipfilter/mli_ipl.c stable/12/contrib/ipfilter/mli_ipl.c Modified: Directory Properties: stable/11/ (props changed) stable/12/ (props changed) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r343337 - in stable: 10/contrib/ipfilter 11/contrib/ipfilter 12/contrib/ipfilter
Author: cy Date: Wed Jan 23 02:43:49 2019 New Revision: 343337 URL: https://svnweb.freebsd.org/changeset/base/343337 Log: MFC r343103: Remove redundant ipfilter version of pcap-bpf.h. As of r214535 it was no longer needed. Deleted: stable/10/contrib/ipfilter/pcap-bpf.h Modified: Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Deleted: stable/11/contrib/ipfilter/pcap-bpf.h stable/12/contrib/ipfilter/pcap-bpf.h Modified: Directory Properties: stable/11/ (props changed) stable/12/ (props changed) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r343118 - in head/usr.sbin: . trim
In message , Enji Cooper writes : > > > --Apple-Mail=_6CB1620B-6707-4F06-B7FF-9F1ECBA36F56 > Content-Transfer-Encoding: quoted-printable > Content-Type: text/plain; > charset=utf-8 > > > > On Jan 17, 2019, at 2:25 PM, Maxim Sobolev = > wrote: > >=20 > > What I think we really need is some way to easily porti-ze useful = > stuff that would otherwise go into /usr/[s]bin, so adding things would = > be just as easy as hooking up SUBDIR into usr.[s]bin/Makefile. Yes, I = > know, this is topic almost as old as the FreeBSD Project itself, but = > perhaps we just did not approach it the right way. It was always the = > idea that we would just move bunch of stuff from src/usr.[s]bin repo = > into ports/. Which brings several important question such as "who is to = > host the distfile"? "where sources hosted", "who is to update the port = > when changes happen?" etc. > > Projects like this could be hosted on GitHub. Ports supports GitHub out = > of the box, so this seems like a low barrier for entry (the bonus of = > doing this is that the projects could potentially be used by other = > non-FreeBSD projects, and contributed by others outside the FreeBSD = > project; the downside is having to deal with FreeBSD CI, as Travis CI = > only supports Linux (IIRC making Travis support FreeBSD is a non-trivial = > project, but it=E2=80=99s likely a very worthwhile goal, as it would = > make it easier to catch issues upfront with third-party projects that = > FreeBSD consumes, like llvm), enforcing style (can be done with git = > commit hooks and GitHub checks), etc. I would really like to do these = > things because it=E2=80=99s difficult getting folks to support FreeBSD = > in third-party projects as-is. Lowering the barrier of entry would allow = > FreeBSD and its developers to better scale (and make FreeBSD more of a = > first-class OS). Yes. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ 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: r343118 - in head/usr.sbin: . trim
In message , Maxim Sobolev writes: > > What I think we really need is some way to easily porti-ze useful stuff > that would otherwise go into /usr/[s]bin, so adding things would be just as > easy as hooking up SUBDIR into usr.[s]bin/Makefile. Yes, I know, this is > topic almost as old as the FreeBSD Project itself, but perhaps we just did > not approach it the right way. It was always the idea that we would just > move bunch of stuff from src/usr.[s]bin repo into ports/. Which brings > several important question such as "who is to host the distfile"? "where > sources hosted", "who is to update the port when changes happen?" etc. pkgbase might address some of the above. Ports and base might install in a homogeneous manner. > > Perhaps even by forking the whole ports idea into a smaller closely-guarged > subset. Something like a new baseports repository, which might have > structure like baseports/usr.bin/xxx, baseports/usr.sbin/yyy etc. Then add > some automagic glue to kick in on every commit and transfer this into valid > ports, which is going to be packaged by the poudriere and such. This way we > could reduce amount of port-foo average src committer needs in order to > maintain code. I am almost tempted to sit and write something over the next > weekend or few of thereofs. Using usr.sbin/trim as an example. If it's external it should should live in ports and be installed in $LOCALBASE. A quasi src repo in ports to install software outside of $LOCALBASE doesn't make any sense. ALso see my comment about pkgbase. I expect pkgbase to homogenize base and ports into a seamless install. Alternatively pkgbase and ports could use different package repos. For example when I was an MVS sysprog, MVS and JES were installed in one repo while CICS and IMS were installed each in their own repos. That was site specific but not out of the realm of possibilities here either. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ 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: r343118 - in head/usr.sbin: . trim
In message <201901180008.x0i08thg052...@pdx.rh.cn85.dnsmgr.net>, "Rodney W. Gri mes" writes: > > What I think we really need is some way to easily porti-ze useful stuff > > that would otherwise go into /usr/[s]bin, so adding things would be just as > > easy as hooking up SUBDIR into usr.[s]bin/Makefile. Yes, I know, this is > > topic almost as old as the FreeBSD Project itself, but perhaps we just did > > not approach it the right way. It was always the idea that we would just > > move bunch of stuff from src/usr.[s]bin repo into ports/. Which brings > > several important question such as "who is to host the distfile"? "where > > sources hosted", "who is to update the port when changes happen?" etc. > > > > Perhaps even by forking the whole ports idea into a smaller closely-guarged > > subset. Something like a new baseports repository, which might have > > structure like baseports/usr.bin/xxx, baseports/usr.sbin/yyy etc. Then add > > some automagic glue to kick in on every commit and transfer this into valid > > ports, which is going to be packaged by the poudriere and such. This way we > > could reduce amount of port-foo average src committer needs in order to > > maintain code. I am almost tempted to sit and write something over the next > > weekend or few of thereofs. Using usr.sbin/trim as an example. > > Couldnt the "distribution" just live as files commited into > the ports tree as a "work" hierarcy and the top level file > be marked as no fetch. We use to stick small stuff in ports > by putting there files in files/ and having that work IIRC. If it must live in one of our repositories, then a users, projects or other hierarchy in ports might be acceptable. However there would be too great a temptation to fork a random piece of software on the internet. baseports/usr.bin/whatever doesn't make much sense. If it's in ports it should use the ports infrastructure and install in $LOCALBASE. If it's in ports, it's not in base and should not be installed outside of $LOCALBASE. If it's to be installed in for instance, /usr/bin, then it must live in usr.bin. > > I really really dislike the idea of putting stuff from base in > external repositories and then fetching them, something just > feels fundementally wrong about that. Trim should not be in base/. If it's in ports it should be installed in $LOCALBASE not outside it. The point is, trim should not be in base. It should not live in /usr/src nor should it be installed outside of $LOCALBASE. If anything, as is it could be a port. It should not live in a user or project branch of base nor should it be sourced out of some hypothetical quasi FreeBSD source repository in ports or any other FreeBSD repo for that matter. It doesn't belong here at all. It's function can however be provided by dd. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ 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: r343336 - in stable: 10/contrib/ipfilter 11/contrib/ipfilter 12/contrib/ipfilter
Author: cy Date: Wed Jan 23 02:40:29 2019 New Revision: 343336 URL: https://svnweb.freebsd.org/changeset/base/343336 Log: MFC r343073: Remove an IRIX-only source file. Deleted: stable/12/contrib/ipfilter/mli_ipl.c Modified: Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Deleted: stable/10/contrib/ipfilter/mli_ipl.c stable/11/contrib/ipfilter/mli_ipl.c Modified: Directory Properties: stable/10/ (props changed) stable/11/ (props changed) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r343336 - in stable: 10/contrib/ipfilter 11/contrib/ipfilter 12/contrib/ipfilter
Author: cy Date: Wed Jan 23 02:40:29 2019 New Revision: 343336 URL: https://svnweb.freebsd.org/changeset/base/343336 Log: MFC r343073: Remove an IRIX-only source file. Deleted: stable/11/contrib/ipfilter/mli_ipl.c Modified: Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Deleted: stable/10/contrib/ipfilter/mli_ipl.c stable/12/contrib/ipfilter/mli_ipl.c Modified: Directory Properties: stable/10/ (props changed) stable/12/ (props changed) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r342023 - in stable: 10/contrib/ipfilter/ipsend 10/sys/contrib/ipfilter/netinet 11/contrib/ipfilter/ipsend 11/sys/contrib/ipfilter/netinet 12/contrib/ipfilter/ipsend 12/sys/contrib/ipfi...
Author: cy
Date: Thu Dec 13 03:12:15 2018
New Revision: 342023
URL: https://svnweb.freebsd.org/changeset/base/342023
Log:
MFC r341650:
Remove an ugly Ultrix hack. Ultrix has been AWOL since the last ice
age, more to come.
Modified:
stable/11/contrib/ipfilter/ipsend/ip.c
stable/11/contrib/ipfilter/ipsend/resend.c
stable/11/sys/contrib/ipfilter/netinet/ip_compat.h
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/10/contrib/ipfilter/ipsend/ip.c
stable/10/contrib/ipfilter/ipsend/resend.c
stable/10/sys/contrib/ipfilter/netinet/ip_compat.h
stable/12/contrib/ipfilter/ipsend/ip.c
stable/12/contrib/ipfilter/ipsend/resend.c
stable/12/sys/contrib/ipfilter/netinet/ip_compat.h
Directory Properties:
stable/10/ (props changed)
stable/12/ (props changed)
Modified: stable/11/contrib/ipfilter/ipsend/ip.c
==
--- stable/11/contrib/ipfilter/ipsend/ip.c Thu Dec 13 00:42:26 2018
(r342022)
+++ stable/11/contrib/ipfilter/ipsend/ip.c Thu Dec 13 03:12:15 2018
(r342023)
@@ -67,9 +67,9 @@ int send_ether(nfd, buf, len, gwip)
bcopy((char *)buf, s + sizeof(*eh), len);
if (gwip.s_addr == last_gw.s_addr)
{
- bcopy(last_arp, (char *)A_A eh->ether_dhost, 6);
+ bcopy(last_arp, (char *) >ether_dhost, 6);
}
- else if (arp((char *), (char *)A_A eh->ether_dhost) == -1)
+ else if (arp((char *), (char *) >ether_dhost) == -1)
{
perror("arp");
return -2;
@@ -109,17 +109,17 @@ int send_ip(nfd, mtu, ip, gwip, frag)
eh = (ether_header_t *)ipbuf;
- bzero((char *)A_A eh->ether_shost, sizeof(eh->ether_shost));
+ bzero((char *) >ether_shost, sizeof(eh->ether_shost));
if (last_gw.s_addr && (gwip.s_addr == last_gw.s_addr))
{
- bcopy(last_arp, (char *)A_A eh->ether_dhost, 6);
+ bcopy(last_arp, (char *) >ether_dhost, 6);
}
- else if (arp((char *), (char *)A_A eh->ether_dhost) == -1)
+ else if (arp((char *), (char *) >ether_dhost) == -1)
{
perror("arp");
return -2;
}
- bcopy((char *)A_A eh->ether_dhost, last_arp, sizeof(last_arp));
+ bcopy((char *) >ether_dhost, last_arp, sizeof(last_arp));
eh->ether_type = htons(ETHERTYPE_IP);
bcopy((char *)ip, (char *), sizeof(*ip));
@@ -136,11 +136,11 @@ int send_ip(nfd, mtu, ip, gwip, frag)
}
if (ip->ip_src.s_addr != local_ip.s_addr) {
- (void) arp((char *)>ip_src, (char *)A_A local_arp);
- bcopy(local_arp, (char *)A_A eh->ether_shost,sizeof(last_arp));
+ (void) arp((char *)>ip_src, (char *) _arp);
+ bcopy(local_arp, (char *) >ether_shost,sizeof(last_arp));
local_ip = ip->ip_src;
} else
- bcopy(local_arp, (char *)A_A eh->ether_shost, 6);
+ bcopy(local_arp, (char *) >ether_shost, 6);
if (!frag || (sizeof(*eh) + iplen < mtu))
{
Modified: stable/11/contrib/ipfilter/ipsend/resend.c
==
--- stable/11/contrib/ipfilter/ipsend/resend.c Thu Dec 13 00:42:26 2018
(r342022)
+++ stable/11/contrib/ipfilter/ipsend/resend.c Thu Dec 13 03:12:15 2018
(r342023)
@@ -97,7 +97,7 @@ int ip_resend(dev, mtu, r, gwip, datain)
return -2;
}
- bzero((char *)A_A eh->ether_shost, sizeof(eh->ether_shost));
+ bzero((char *) >ether_shost, sizeof(eh->ether_shost));
if (gwip.s_addr && (arp((char *), dhost) == -1))
{
perror("arp");
@@ -113,12 +113,12 @@ int ip_resend(dev, mtu, r, gwip, datain)
eh->ether_type = htons((u_short)ETHERTYPE_IP);
if (!gwip.s_addr) {
if (arp((char *),
- (char *)A_A eh->ether_dhost) == -1) {
+ (char *) >ether_dhost) == -1) {
perror("arp");
continue;
}
} else
- bcopy(dhost, (char *)A_A eh->ether_dhost,
+ bcopy(dhost, (char *) >ether_dhost,
sizeof(dhost));
if (!ip->ip_sum)
ip->ip_sum = chksum((u_short *)ip,
Modified: stable/11/sys/contrib/ipfilter/netinet/ip_compat.h
==
--- stable/11/sys/contrib/ipfilter/netinet/ip_compat.h Thu Dec 13 00:42:26
2018(r342022)
+++
svn commit: r342023 - in stable: 10/contrib/ipfilter/ipsend 10/sys/contrib/ipfilter/netinet 11/contrib/ipfilter/ipsend 11/sys/contrib/ipfilter/netinet 12/contrib/ipfilter/ipsend 12/sys/contrib/ipfi...
Author: cy
Date: Thu Dec 13 03:12:15 2018
New Revision: 342023
URL: https://svnweb.freebsd.org/changeset/base/342023
Log:
MFC r341650:
Remove an ugly Ultrix hack. Ultrix has been AWOL since the last ice
age, more to come.
Modified:
stable/10/contrib/ipfilter/ipsend/ip.c
stable/10/contrib/ipfilter/ipsend/resend.c
stable/10/sys/contrib/ipfilter/netinet/ip_compat.h
Directory Properties:
stable/10/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/contrib/ipfilter/ipsend/ip.c
stable/11/contrib/ipfilter/ipsend/resend.c
stable/11/sys/contrib/ipfilter/netinet/ip_compat.h
stable/12/contrib/ipfilter/ipsend/ip.c
stable/12/contrib/ipfilter/ipsend/resend.c
stable/12/sys/contrib/ipfilter/netinet/ip_compat.h
Directory Properties:
stable/11/ (props changed)
stable/12/ (props changed)
Modified: stable/10/contrib/ipfilter/ipsend/ip.c
==
--- stable/10/contrib/ipfilter/ipsend/ip.c Thu Dec 13 00:42:26 2018
(r342022)
+++ stable/10/contrib/ipfilter/ipsend/ip.c Thu Dec 13 03:12:15 2018
(r342023)
@@ -70,9 +70,9 @@ int send_ether(nfd, buf, len, gwip)
bcopy((char *)buf, s + sizeof(*eh), len);
if (gwip.s_addr == last_gw.s_addr)
{
- bcopy(last_arp, (char *)A_A eh->ether_dhost, 6);
+ bcopy(last_arp, (char *) >ether_dhost, 6);
}
- else if (arp((char *), (char *)A_A eh->ether_dhost) == -1)
+ else if (arp((char *), (char *) >ether_dhost) == -1)
{
perror("arp");
return -2;
@@ -112,17 +112,17 @@ int send_ip(nfd, mtu, ip, gwip, frag)
eh = (ether_header_t *)ipbuf;
- bzero((char *)A_A eh->ether_shost, sizeof(eh->ether_shost));
+ bzero((char *) >ether_shost, sizeof(eh->ether_shost));
if (last_gw.s_addr && (gwip.s_addr == last_gw.s_addr))
{
- bcopy(last_arp, (char *)A_A eh->ether_dhost, 6);
+ bcopy(last_arp, (char *) >ether_dhost, 6);
}
- else if (arp((char *), (char *)A_A eh->ether_dhost) == -1)
+ else if (arp((char *), (char *) >ether_dhost) == -1)
{
perror("arp");
return -2;
}
- bcopy((char *)A_A eh->ether_dhost, last_arp, sizeof(last_arp));
+ bcopy((char *) >ether_dhost, last_arp, sizeof(last_arp));
eh->ether_type = htons(ETHERTYPE_IP);
bcopy((char *)ip, (char *), sizeof(*ip));
@@ -139,11 +139,11 @@ int send_ip(nfd, mtu, ip, gwip, frag)
}
if (ip->ip_src.s_addr != local_ip.s_addr) {
- (void) arp((char *)>ip_src, (char *)A_A local_arp);
- bcopy(local_arp, (char *)A_A eh->ether_shost,sizeof(last_arp));
+ (void) arp((char *)>ip_src, (char *) _arp);
+ bcopy(local_arp, (char *) >ether_shost,sizeof(last_arp));
local_ip = ip->ip_src;
} else
- bcopy(local_arp, (char *)A_A eh->ether_shost, 6);
+ bcopy(local_arp, (char *) >ether_shost, 6);
if (!frag || (sizeof(*eh) + iplen < mtu))
{
Modified: stable/10/contrib/ipfilter/ipsend/resend.c
==
--- stable/10/contrib/ipfilter/ipsend/resend.c Thu Dec 13 00:42:26 2018
(r342022)
+++ stable/10/contrib/ipfilter/ipsend/resend.c Thu Dec 13 03:12:15 2018
(r342023)
@@ -100,7 +100,7 @@ int ip_resend(dev, mtu, r, gwip, datain)
return -2;
}
- bzero((char *)A_A eh->ether_shost, sizeof(eh->ether_shost));
+ bzero((char *) >ether_shost, sizeof(eh->ether_shost));
if (gwip.s_addr && (arp((char *), dhost) == -1))
{
perror("arp");
@@ -116,12 +116,12 @@ int ip_resend(dev, mtu, r, gwip, datain)
eh->ether_type = htons((u_short)ETHERTYPE_IP);
if (!gwip.s_addr) {
if (arp((char *),
- (char *)A_A eh->ether_dhost) == -1) {
+ (char *) >ether_dhost) == -1) {
perror("arp");
continue;
}
} else
- bcopy(dhost, (char *)A_A eh->ether_dhost,
+ bcopy(dhost, (char *) >ether_dhost,
sizeof(dhost));
if (!ip->ip_sum)
ip->ip_sum = chksum((u_short *)ip,
Modified: stable/10/sys/contrib/ipfilter/netinet/ip_compat.h
==
--- stable/10/sys/contrib/ipfilter/netinet/ip_compat.h Thu Dec 13 00:42:26
2018(r342022)
+++
svn commit: r342023 - in stable: 10/contrib/ipfilter/ipsend 10/sys/contrib/ipfilter/netinet 11/contrib/ipfilter/ipsend 11/sys/contrib/ipfilter/netinet 12/contrib/ipfilter/ipsend 12/sys/contrib/ipfi...
Author: cy
Date: Thu Dec 13 03:12:15 2018
New Revision: 342023
URL: https://svnweb.freebsd.org/changeset/base/342023
Log:
MFC r341650:
Remove an ugly Ultrix hack. Ultrix has been AWOL since the last ice
age, more to come.
Modified:
stable/12/contrib/ipfilter/ipsend/ip.c
stable/12/contrib/ipfilter/ipsend/resend.c
stable/12/sys/contrib/ipfilter/netinet/ip_compat.h
Directory Properties:
stable/12/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/10/contrib/ipfilter/ipsend/ip.c
stable/10/contrib/ipfilter/ipsend/resend.c
stable/10/sys/contrib/ipfilter/netinet/ip_compat.h
stable/11/contrib/ipfilter/ipsend/ip.c
stable/11/contrib/ipfilter/ipsend/resend.c
stable/11/sys/contrib/ipfilter/netinet/ip_compat.h
Directory Properties:
stable/10/ (props changed)
stable/11/ (props changed)
Modified: stable/12/contrib/ipfilter/ipsend/ip.c
==
--- stable/12/contrib/ipfilter/ipsend/ip.c Thu Dec 13 00:42:26 2018
(r342022)
+++ stable/12/contrib/ipfilter/ipsend/ip.c Thu Dec 13 03:12:15 2018
(r342023)
@@ -67,9 +67,9 @@ int send_ether(nfd, buf, len, gwip)
bcopy((char *)buf, s + sizeof(*eh), len);
if (gwip.s_addr == last_gw.s_addr)
{
- bcopy(last_arp, (char *)A_A eh->ether_dhost, 6);
+ bcopy(last_arp, (char *) >ether_dhost, 6);
}
- else if (arp((char *), (char *)A_A eh->ether_dhost) == -1)
+ else if (arp((char *), (char *) >ether_dhost) == -1)
{
perror("arp");
return -2;
@@ -109,17 +109,17 @@ int send_ip(nfd, mtu, ip, gwip, frag)
eh = (ether_header_t *)ipbuf;
- bzero((char *)A_A eh->ether_shost, sizeof(eh->ether_shost));
+ bzero((char *) >ether_shost, sizeof(eh->ether_shost));
if (last_gw.s_addr && (gwip.s_addr == last_gw.s_addr))
{
- bcopy(last_arp, (char *)A_A eh->ether_dhost, 6);
+ bcopy(last_arp, (char *) >ether_dhost, 6);
}
- else if (arp((char *), (char *)A_A eh->ether_dhost) == -1)
+ else if (arp((char *), (char *) >ether_dhost) == -1)
{
perror("arp");
return -2;
}
- bcopy((char *)A_A eh->ether_dhost, last_arp, sizeof(last_arp));
+ bcopy((char *) >ether_dhost, last_arp, sizeof(last_arp));
eh->ether_type = htons(ETHERTYPE_IP);
bcopy((char *)ip, (char *), sizeof(*ip));
@@ -136,11 +136,11 @@ int send_ip(nfd, mtu, ip, gwip, frag)
}
if (ip->ip_src.s_addr != local_ip.s_addr) {
- (void) arp((char *)>ip_src, (char *)A_A local_arp);
- bcopy(local_arp, (char *)A_A eh->ether_shost,sizeof(last_arp));
+ (void) arp((char *)>ip_src, (char *) _arp);
+ bcopy(local_arp, (char *) >ether_shost,sizeof(last_arp));
local_ip = ip->ip_src;
} else
- bcopy(local_arp, (char *)A_A eh->ether_shost, 6);
+ bcopy(local_arp, (char *) >ether_shost, 6);
if (!frag || (sizeof(*eh) + iplen < mtu))
{
Modified: stable/12/contrib/ipfilter/ipsend/resend.c
==
--- stable/12/contrib/ipfilter/ipsend/resend.c Thu Dec 13 00:42:26 2018
(r342022)
+++ stable/12/contrib/ipfilter/ipsend/resend.c Thu Dec 13 03:12:15 2018
(r342023)
@@ -97,7 +97,7 @@ int ip_resend(dev, mtu, r, gwip, datain)
return -2;
}
- bzero((char *)A_A eh->ether_shost, sizeof(eh->ether_shost));
+ bzero((char *) >ether_shost, sizeof(eh->ether_shost));
if (gwip.s_addr && (arp((char *), dhost) == -1))
{
perror("arp");
@@ -113,12 +113,12 @@ int ip_resend(dev, mtu, r, gwip, datain)
eh->ether_type = htons((u_short)ETHERTYPE_IP);
if (!gwip.s_addr) {
if (arp((char *),
- (char *)A_A eh->ether_dhost) == -1) {
+ (char *) >ether_dhost) == -1) {
perror("arp");
continue;
}
} else
- bcopy(dhost, (char *)A_A eh->ether_dhost,
+ bcopy(dhost, (char *) >ether_dhost,
sizeof(dhost));
if (!ip->ip_sum)
ip->ip_sum = chksum((u_short *)ip,
Modified: stable/12/sys/contrib/ipfilter/netinet/ip_compat.h
==
--- stable/12/sys/contrib/ipfilter/netinet/ip_compat.h Thu Dec 13 00:42:26
2018(r342022)
+++
svn commit: r342183 - in head/contrib/sqlite3: . tea
Author: cy
Date: Tue Dec 18 01:12:30 2018
New Revision: 342183
URL: https://svnweb.freebsd.org/changeset/base/342183
Log:
MFV r342175:
Update sqlite3-3.23.1 --> sqlite3-3.26.0 (326)
MFC after:3 days
Security: https://blade.tencent.com/magellan/index_en.html
No known CVE was apparently registered.
Added:
head/contrib/sqlite3/Makefile.fallback
- copied unchanged from r342177, vendor/sqlite3/dist/Makefile.fallback
head/contrib/sqlite3/tea/
- copied from r342177, vendor/sqlite3/dist/tea/
Modified:
head/contrib/sqlite3/Makefile.am
head/contrib/sqlite3/Makefile.in
head/contrib/sqlite3/Makefile.msc
head/contrib/sqlite3/configure
head/contrib/sqlite3/configure.ac
head/contrib/sqlite3/shell.c
head/contrib/sqlite3/sqlite3.c
head/contrib/sqlite3/sqlite3.h
head/contrib/sqlite3/sqlite3ext.h
Directory Properties:
head/contrib/sqlite3/ (props changed)
Modified: head/contrib/sqlite3/Makefile.am
==
--- head/contrib/sqlite3/Makefile.amMon Dec 17 21:48:20 2018
(r342182)
+++ head/contrib/sqlite3/Makefile.amTue Dec 18 01:12:30 2018
(r342183)
@@ -1,6 +1,5 @@
-AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@
@JSON1_FLAGS@ @ZLIB_FLAGS@ @SESSION_FLAGS@ -DSQLITE_ENABLE_FTS3
-DSQLITE_ENABLE_RTREE
-
+AM_CFLAGS = @BUILD_CFLAGS@
lib_LTLIBRARIES = libsqlite3.la
libsqlite3_la_SOURCES = sqlite3.c
libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
@@ -14,7 +13,7 @@ sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_
include_HEADERS = sqlite3.h sqlite3ext.h
-EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc README.txt Replace.cs
+EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc README.txt Replace.cs
Makefile.fallback
pkgconfigdir = ${libdir}/pkgconfig
pkgconfig_DATA = sqlite3.pc
Copied: head/contrib/sqlite3/Makefile.fallback (from r342177,
vendor/sqlite3/dist/Makefile.fallback)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/sqlite3/Makefile.fallback Tue Dec 18 01:12:30 2018
(r342183, copy of r342177, vendor/sqlite3/dist/Makefile.fallback)
@@ -0,0 +1,19 @@
+#!/usr/bin/make
+#
+# If the configure script does not work, then this Makefile is available
+# as a backup. Manually configure the variables below.
+#
+# Note: This makefile works out-of-the-box on MacOS 10.2 (Jaguar)
+#
+CC = gcc
+CFLAGS = -O0 -I.
+LIBS = -lz
+COPTS += -D_BSD_SOURCE
+COPTS += -DSQLITE_ENABLE_LOCKING_STYLE=0
+COPTS += -DSQLITE_THREADSAFE=0
+COPTS += -DSQLITE_OMIT_LOAD_EXTENSION
+COPTS += -DSQLITE_WITHOUT_ZONEMALLOC
+COPTS += -DSQLITE_ENABLE_RTREE
+
+sqlite3: shell.c sqlite3.c
+ $(CC) $(CFLAGS) $(COPTS) -o sqlite3 shell.c sqlite3.c $(LIBS)
Modified: head/contrib/sqlite3/Makefile.in
==
--- head/contrib/sqlite3/Makefile.inMon Dec 17 21:48:20 2018
(r342182)
+++ head/contrib/sqlite3/Makefile.inTue Dec 18 01:12:30 2018
(r342183)
@@ -260,7 +260,6 @@ DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
-DYNAMIC_EXTENSION_FLAGS = @DYNAMIC_EXTENSION_FLAGS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -268,14 +267,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXTRA_SHELL_OBJ = @EXTRA_SHELL_OBJ@
FGREP = @FGREP@
-FTS5_FLAGS = @FTS5_FLAGS@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-JSON1_FLAGS = @JSON1_FLAGS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
@@ -305,14 +302,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
SED = @SED@
-SESSION_FLAGS = @SESSION_FLAGS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SHELL_CFLAGS = @SHELL_CFLAGS@
STRIP = @STRIP@
-THREADSAFE_FLAGS = @THREADSAFE_FLAGS@
VERSION = @VERSION@
-ZLIB_FLAGS = @ZLIB_FLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -365,7 +359,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@
@JSON1_FLAGS@ @ZLIB_FLAGS@ @SESSION_FLAGS@ -DSQLITE_ENABLE_FTS3
-DSQLITE_ENABLE_RTREE
+AM_CFLAGS = @BUILD_CFLAGS@
lib_LTLIBRARIES = libsqlite3.la
libsqlite3_la_SOURCES = sqlite3.c
libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
@@ -375,7 +369,7 @@ sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@
sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@
sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS
-DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_ENABLE_STMTVTAB
-DSQLITE_ENABLE_DBSTAT_VTAB $(SHELL_CFLAGS)
include_HEADERS =
svn commit: r342175 - in vendor/sqlite3/dist: . tea tea/doc tea/generic tea/tclconfig tea/win
Author: cy
Date: Mon Dec 17 20:19:35 2018
New Revision: 342175
URL: https://svnweb.freebsd.org/changeset/base/342175
Log:
Import sqlite3-3.26.0 (326)
Obtained from:
https://www.sqlite.org/2018/sqlite-autoconf-326.tar.gz
Added:
vendor/sqlite3/dist/Makefile.fallback (contents, props changed)
vendor/sqlite3/dist/tea/
vendor/sqlite3/dist/tea/Makefile.in (contents, props changed)
vendor/sqlite3/dist/tea/README
vendor/sqlite3/dist/tea/aclocal.m4
vendor/sqlite3/dist/tea/configure (contents, props changed)
vendor/sqlite3/dist/tea/configure.ac
vendor/sqlite3/dist/tea/doc/
vendor/sqlite3/dist/tea/doc/sqlite3.n
vendor/sqlite3/dist/tea/generic/
vendor/sqlite3/dist/tea/generic/tclsqlite3.c (contents, props changed)
vendor/sqlite3/dist/tea/license.terms
vendor/sqlite3/dist/tea/pkgIndex.tcl.in (contents, props changed)
vendor/sqlite3/dist/tea/tclconfig/
vendor/sqlite3/dist/tea/tclconfig/install-sh
vendor/sqlite3/dist/tea/tclconfig/tcl.m4
vendor/sqlite3/dist/tea/win/
vendor/sqlite3/dist/tea/win/makefile.vc (contents, props changed)
vendor/sqlite3/dist/tea/win/nmakehlp.c (contents, props changed)
vendor/sqlite3/dist/tea/win/rules.vc
Modified:
vendor/sqlite3/dist/Makefile.am
vendor/sqlite3/dist/Makefile.in
vendor/sqlite3/dist/Makefile.msc
vendor/sqlite3/dist/configure
vendor/sqlite3/dist/configure.ac
vendor/sqlite3/dist/shell.c
vendor/sqlite3/dist/sqlite3.c
vendor/sqlite3/dist/sqlite3.h
vendor/sqlite3/dist/sqlite3ext.h
Modified: vendor/sqlite3/dist/Makefile.am
==
--- vendor/sqlite3/dist/Makefile.am Mon Dec 17 20:18:42 2018
(r342174)
+++ vendor/sqlite3/dist/Makefile.am Mon Dec 17 20:19:35 2018
(r342175)
@@ -1,6 +1,5 @@
-AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@
@JSON1_FLAGS@ @ZLIB_FLAGS@ @SESSION_FLAGS@ -DSQLITE_ENABLE_FTS3
-DSQLITE_ENABLE_RTREE
-
+AM_CFLAGS = @BUILD_CFLAGS@
lib_LTLIBRARIES = libsqlite3.la
libsqlite3_la_SOURCES = sqlite3.c
libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
@@ -14,7 +13,7 @@ sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_
include_HEADERS = sqlite3.h sqlite3ext.h
-EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc README.txt Replace.cs
+EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc README.txt Replace.cs
Makefile.fallback
pkgconfigdir = ${libdir}/pkgconfig
pkgconfig_DATA = sqlite3.pc
Added: vendor/sqlite3/dist/Makefile.fallback
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ vendor/sqlite3/dist/Makefile.fallback Mon Dec 17 20:19:35 2018
(r342175)
@@ -0,0 +1,19 @@
+#!/usr/bin/make
+#
+# If the configure script does not work, then this Makefile is available
+# as a backup. Manually configure the variables below.
+#
+# Note: This makefile works out-of-the-box on MacOS 10.2 (Jaguar)
+#
+CC = gcc
+CFLAGS = -O0 -I.
+LIBS = -lz
+COPTS += -D_BSD_SOURCE
+COPTS += -DSQLITE_ENABLE_LOCKING_STYLE=0
+COPTS += -DSQLITE_THREADSAFE=0
+COPTS += -DSQLITE_OMIT_LOAD_EXTENSION
+COPTS += -DSQLITE_WITHOUT_ZONEMALLOC
+COPTS += -DSQLITE_ENABLE_RTREE
+
+sqlite3: shell.c sqlite3.c
+ $(CC) $(CFLAGS) $(COPTS) -o sqlite3 shell.c sqlite3.c $(LIBS)
Modified: vendor/sqlite3/dist/Makefile.in
==
--- vendor/sqlite3/dist/Makefile.in Mon Dec 17 20:18:42 2018
(r342174)
+++ vendor/sqlite3/dist/Makefile.in Mon Dec 17 20:19:35 2018
(r342175)
@@ -260,7 +260,6 @@ DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
-DYNAMIC_EXTENSION_FLAGS = @DYNAMIC_EXTENSION_FLAGS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -268,14 +267,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXTRA_SHELL_OBJ = @EXTRA_SHELL_OBJ@
FGREP = @FGREP@
-FTS5_FLAGS = @FTS5_FLAGS@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-JSON1_FLAGS = @JSON1_FLAGS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
@@ -305,14 +302,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
SED = @SED@
-SESSION_FLAGS = @SESSION_FLAGS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SHELL_CFLAGS = @SHELL_CFLAGS@
STRIP = @STRIP@
-THREADSAFE_FLAGS = @THREADSAFE_FLAGS@
VERSION = @VERSION@
-ZLIB_FLAGS = @ZLIB_FLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -365,7 +359,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@
@JSON1_FLAGS@ @ZLIB_FLAGS@ @SESSION_FLAGS@ -DSQLITE_ENABLE_FTS3
svn commit: r342174 - svnadmin/conf
Author: cy Date: Mon Dec 17 20:18:42 2018 New Revision: 342174 URL: https://svnweb.freebsd.org/changeset/base/342174 Log: Prepare for the import of sqlite3-3.26.0 (326) into the vendor branch: temporarily bump my sizelimit. Modified: svnadmin/conf/sizelimit.conf Modified: svnadmin/conf/sizelimit.conf == --- svnadmin/conf/sizelimit.confMon Dec 17 18:35:32 2018 (r342173) +++ svnadmin/conf/sizelimit.confMon Dec 17 20:18:42 2018 (r342174) @@ -16,6 +16,7 @@ # First field is username, second field is the raised limit required. achim bapt +cy davidcs dim2048 imp ___ 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: r342176 - vendor/sqlite3/sqlite-3260000
Author: cy Date: Mon Dec 17 20:22:27 2018 New Revision: 342176 URL: https://svnweb.freebsd.org/changeset/base/342176 Log: Tag Tag import of sqlite3-3.26.0 (326). Added: vendor/sqlite3/sqlite-326/ - copied from r342175, vendor/sqlite3/dist/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r342177 - svnadmin/conf
Author: cy Date: Mon Dec 17 20:23:27 2018 New Revision: 342177 URL: https://svnweb.freebsd.org/changeset/base/342177 Log: Return to regularly scheduled programming. Modified: svnadmin/conf/sizelimit.conf Modified: svnadmin/conf/sizelimit.conf == --- svnadmin/conf/sizelimit.confMon Dec 17 20:22:27 2018 (r342176) +++ svnadmin/conf/sizelimit.confMon Dec 17 20:23:27 2018 (r342177) @@ -16,7 +16,6 @@ # First field is username, second field is the raised limit required. achim bapt -cy davidcs dim2048 imp ___ 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: r342139 - in head: . bin/date libexec/rc/rc.d share/man/man5 tools/build/mk tools/build/options usr.sbin usr.sbin/timed
In message <7a528b98-f554-4d34-a5cb-aa5496a89...@grosbein.net>, Eugene Grosbein writes: > 16.12.2018 4:34, George V. Neville-Neil wrote: > > > Author: gnn > > Date: Sat Dec 15 21:34:40 2018 > > New Revision: 342139 > > URL: https://svnweb.freebsd.org/changeset/base/342139 > > > > Log: > > Remove, the now very outdated, timed. > > > +20181211: > > + Remove the timed and netdate programs from the base tree. Setting > > + the time with these deamons has been obsolete for over a decade. > > + > > Is there any replacement software arounnd for timed protocol? > > I still run some telco hardware that uses my FreeBSD/timed as time source > because it cannot use any other protocol, not NTP nor SNTP. > > Maybe someone could add it to ports. Ideally maintaining upstream on github. My initial thought was we could port the NetBSD version but theirs is arguably just as ancient as ours. On a juxtaposed topic, how would one export an eclectic set of directories from svn to git? My last experience doing that was painful because there was more than one subdirectory involved and most of the doc out there talks about only one. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ 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: r342139 - in head: . bin/date libexec/rc/rc.d share/man/man5 tools/build/mk tools/build/options usr.sbin usr.sbin/timed
In message , Warner Losh writes: > --fca822057d19b03f > Content-Type: text/plain; charset="UTF-8" > > On Sat, Dec 15, 2018, 5:54 PM Cy Schubert > > In message <7a528b98-f554-4d34-a5cb-aa5496a89...@grosbein.net>, Eugene > > Grosbein > > writes: > > > 16.12.2018 4:34, George V. Neville-Neil wrote: > > > > > > > Author: gnn > > > > Date: Sat Dec 15 21:34:40 2018 > > > > New Revision: 342139 > > > > URL: https://svnweb.freebsd.org/changeset/base/342139 > > > > > > > > Log: > > > > Remove, the now very outdated, timed. > > > > > > > +20181211: > > > > + Remove the timed and netdate programs from the base tree. Setting > > > > + the time with these deamons has been obsolete for over a decade. > > > > + > > > > > > Is there any replacement software arounnd for timed protocol? > > > > > > I still run some telco hardware that uses my FreeBSD/timed as time source > > > because it cannot use any other protocol, not NTP nor SNTP. > > > > > > > > > > Maybe someone could add it to ports. Ideally maintaining upstream on > > github. > > > > My initial thought was we could port the NetBSD version but theirs is > > arguably just as ancient as ours. > > > > On a juxtaposed topic, how would one export an eclectic set of > > directories from svn to git? My last experience doing that was painful > > because there was more than one subdirectory involved and most of the > > doc out there talks about only one. > > > > I did it for CTM. If people want, I can do it for this too... But CTM was > only one dir... > > Warner Personally, I'm less interested in timed and more interested in how to. Last time I tried it the first directory was easy. Adding the second subtree was the hard part. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ 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: r342140 - head/tools/build/mk
Author: cy
Date: Sat Dec 15 22:02:02 2018
New Revision: 342140
URL: https://svnweb.freebsd.org/changeset/base/342140
Log:
Repair build post-r342139
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Sat Dec 15 21:34:40
2018(r342139)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Sat Dec 15 22:02:02
2018(r342140)
@@ -8513,6 +8513,7 @@ OLD_FILES+=usr/share/man/man1/tftp.1.gz
OLD_FILES+=usr/share/man/man8/tftpd.8.gz
.endif
+.if ${MK_TOOLCHAIN} == no
OLD_FILES+=usr/bin/addr2line
OLD_FILES+=usr/bin/as
OLD_FILES+=usr/bin/byacc
___
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: r342292 - in stable/11/contrib/sqlite3: . tea
Author: cy
Date: Fri Dec 21 02:04:15 2018
New Revision: 342292
URL: https://svnweb.freebsd.org/changeset/base/342292
Log:
MFC r52 & r342183:
r52: Update private sqlite from sqlite3-3.20.0 to sqlite3-3.23.1
r342183: Update sqlite3-3.23.1 --> sqlite3-3.26.0 (326)
PR: 234113
Security: https://blade.tencent.com/magellan/index_en.html
No known CVE was apparently registered.
Added:
stable/11/contrib/sqlite3/Makefile.fallback
- copied unchanged from r342183, head/contrib/sqlite3/Makefile.fallback
Replaced:
stable/11/contrib/sqlite3/tea/
- copied from r342183, head/contrib/sqlite3/tea/
Modified:
stable/11/contrib/sqlite3/Makefile.am
stable/11/contrib/sqlite3/Makefile.in
stable/11/contrib/sqlite3/Makefile.msc
stable/11/contrib/sqlite3/configure
stable/11/contrib/sqlite3/configure.ac
stable/11/contrib/sqlite3/shell.c
stable/11/contrib/sqlite3/sqlite3.c
stable/11/contrib/sqlite3/sqlite3.h
stable/11/contrib/sqlite3/sqlite3ext.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/contrib/sqlite3/Makefile.am
==
--- stable/11/contrib/sqlite3/Makefile.am Fri Dec 21 01:58:01 2018
(r342291)
+++ stable/11/contrib/sqlite3/Makefile.am Fri Dec 21 02:04:15 2018
(r342292)
@@ -1,6 +1,5 @@
-AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@
@JSON1_FLAGS@ @SESSION_FLAGS@ -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE
-
+AM_CFLAGS = @BUILD_CFLAGS@
lib_LTLIBRARIES = libsqlite3.la
libsqlite3_la_SOURCES = sqlite3.c
libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
@@ -10,11 +9,11 @@ sqlite3_SOURCES = shell.c sqlite3.h
EXTRA_sqlite3_SOURCES = sqlite3.c
sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@
sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@
-sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS
-DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_ENABLE_STMTVTAB
-DSQLITE_ENABLE_DBSTAT_VTAB $(SHELL_CFLAGS)
include_HEADERS = sqlite3.h sqlite3ext.h
-EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc README.txt Replace.cs
+EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc README.txt Replace.cs
Makefile.fallback
pkgconfigdir = ${libdir}/pkgconfig
pkgconfig_DATA = sqlite3.pc
Copied: stable/11/contrib/sqlite3/Makefile.fallback (from r342183,
head/contrib/sqlite3/Makefile.fallback)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/11/contrib/sqlite3/Makefile.fallback Fri Dec 21 02:04:15 2018
(r342292, copy of r342183, head/contrib/sqlite3/Makefile.fallback)
@@ -0,0 +1,19 @@
+#!/usr/bin/make
+#
+# If the configure script does not work, then this Makefile is available
+# as a backup. Manually configure the variables below.
+#
+# Note: This makefile works out-of-the-box on MacOS 10.2 (Jaguar)
+#
+CC = gcc
+CFLAGS = -O0 -I.
+LIBS = -lz
+COPTS += -D_BSD_SOURCE
+COPTS += -DSQLITE_ENABLE_LOCKING_STYLE=0
+COPTS += -DSQLITE_THREADSAFE=0
+COPTS += -DSQLITE_OMIT_LOAD_EXTENSION
+COPTS += -DSQLITE_WITHOUT_ZONEMALLOC
+COPTS += -DSQLITE_ENABLE_RTREE
+
+sqlite3: shell.c sqlite3.c
+ $(CC) $(CFLAGS) $(COPTS) -o sqlite3 shell.c sqlite3.c $(LIBS)
Modified: stable/11/contrib/sqlite3/Makefile.in
==
--- stable/11/contrib/sqlite3/Makefile.in Fri Dec 21 01:58:01 2018
(r342291)
+++ stable/11/contrib/sqlite3/Makefile.in Fri Dec 21 02:04:15 2018
(r342292)
@@ -260,7 +260,6 @@ DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
-DYNAMIC_EXTENSION_FLAGS = @DYNAMIC_EXTENSION_FLAGS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -268,14 +267,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXTRA_SHELL_OBJ = @EXTRA_SHELL_OBJ@
FGREP = @FGREP@
-FTS5_FLAGS = @FTS5_FLAGS@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-JSON1_FLAGS = @JSON1_FLAGS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
@@ -305,11 +302,10 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
SED = @SED@
-SESSION_FLAGS = @SESSION_FLAGS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+SHELL_CFLAGS = @SHELL_CFLAGS@
STRIP = @STRIP@
-THREADSAFE_FLAGS = @THREADSAFE_FLAGS@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -363,7 +359,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@
@JSON1_FLAGS@ @SESSION_FLAGS@ -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE
+AM_CFLAGS =
svn commit: r342291 - in stable/12/contrib/sqlite3: . tea
Author: cy
Date: Fri Dec 21 01:58:01 2018
New Revision: 342291
URL: https://svnweb.freebsd.org/changeset/base/342291
Log:
MFC r342183:
Update sqlite3-3.23.1 --> sqlite3-3.26.0 (326)
PR: 234113
Security: https://blade.tencent.com/magellan/index_en.html
No known CVE was apparently registered.
Added:
stable/12/contrib/sqlite3/Makefile.fallback
- copied unchanged from r342183, head/contrib/sqlite3/Makefile.fallback
stable/12/contrib/sqlite3/tea/
- copied from r342183, head/contrib/sqlite3/tea/
Modified:
stable/12/contrib/sqlite3/Makefile.am
stable/12/contrib/sqlite3/Makefile.in
stable/12/contrib/sqlite3/Makefile.msc
stable/12/contrib/sqlite3/configure
stable/12/contrib/sqlite3/configure.ac
stable/12/contrib/sqlite3/shell.c
stable/12/contrib/sqlite3/sqlite3.c
stable/12/contrib/sqlite3/sqlite3.h
stable/12/contrib/sqlite3/sqlite3ext.h
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/contrib/sqlite3/Makefile.am
==
--- stable/12/contrib/sqlite3/Makefile.am Fri Dec 21 01:09:25 2018
(r342290)
+++ stable/12/contrib/sqlite3/Makefile.am Fri Dec 21 01:58:01 2018
(r342291)
@@ -1,6 +1,5 @@
-AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@
@JSON1_FLAGS@ @ZLIB_FLAGS@ @SESSION_FLAGS@ -DSQLITE_ENABLE_FTS3
-DSQLITE_ENABLE_RTREE
-
+AM_CFLAGS = @BUILD_CFLAGS@
lib_LTLIBRARIES = libsqlite3.la
libsqlite3_la_SOURCES = sqlite3.c
libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
@@ -14,7 +13,7 @@ sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_
include_HEADERS = sqlite3.h sqlite3ext.h
-EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc README.txt Replace.cs
+EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc README.txt Replace.cs
Makefile.fallback
pkgconfigdir = ${libdir}/pkgconfig
pkgconfig_DATA = sqlite3.pc
Copied: stable/12/contrib/sqlite3/Makefile.fallback (from r342183,
head/contrib/sqlite3/Makefile.fallback)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/12/contrib/sqlite3/Makefile.fallback Fri Dec 21 01:58:01 2018
(r342291, copy of r342183, head/contrib/sqlite3/Makefile.fallback)
@@ -0,0 +1,19 @@
+#!/usr/bin/make
+#
+# If the configure script does not work, then this Makefile is available
+# as a backup. Manually configure the variables below.
+#
+# Note: This makefile works out-of-the-box on MacOS 10.2 (Jaguar)
+#
+CC = gcc
+CFLAGS = -O0 -I.
+LIBS = -lz
+COPTS += -D_BSD_SOURCE
+COPTS += -DSQLITE_ENABLE_LOCKING_STYLE=0
+COPTS += -DSQLITE_THREADSAFE=0
+COPTS += -DSQLITE_OMIT_LOAD_EXTENSION
+COPTS += -DSQLITE_WITHOUT_ZONEMALLOC
+COPTS += -DSQLITE_ENABLE_RTREE
+
+sqlite3: shell.c sqlite3.c
+ $(CC) $(CFLAGS) $(COPTS) -o sqlite3 shell.c sqlite3.c $(LIBS)
Modified: stable/12/contrib/sqlite3/Makefile.in
==
--- stable/12/contrib/sqlite3/Makefile.in Fri Dec 21 01:09:25 2018
(r342290)
+++ stable/12/contrib/sqlite3/Makefile.in Fri Dec 21 01:58:01 2018
(r342291)
@@ -260,7 +260,6 @@ DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
-DYNAMIC_EXTENSION_FLAGS = @DYNAMIC_EXTENSION_FLAGS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -268,14 +267,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXTRA_SHELL_OBJ = @EXTRA_SHELL_OBJ@
FGREP = @FGREP@
-FTS5_FLAGS = @FTS5_FLAGS@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-JSON1_FLAGS = @JSON1_FLAGS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
@@ -305,14 +302,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
SED = @SED@
-SESSION_FLAGS = @SESSION_FLAGS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SHELL_CFLAGS = @SHELL_CFLAGS@
STRIP = @STRIP@
-THREADSAFE_FLAGS = @THREADSAFE_FLAGS@
VERSION = @VERSION@
-ZLIB_FLAGS = @ZLIB_FLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -365,7 +359,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@
@JSON1_FLAGS@ @ZLIB_FLAGS@ @SESSION_FLAGS@ -DSQLITE_ENABLE_FTS3
-DSQLITE_ENABLE_RTREE
+AM_CFLAGS = @BUILD_CFLAGS@
lib_LTLIBRARIES = libsqlite3.la
libsqlite3_la_SOURCES = sqlite3.c
libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
@@ -375,7 +369,7 @@ sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@
sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@
sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS
-DSQLITE_ENABLE_DBPAGE_VTAB
svn commit: r342377 - head/sys/contrib/ipfilter/netinet
Author: cy
Date: Sun Dec 23 05:10:36 2018
New Revision: 342377
URL: https://svnweb.freebsd.org/changeset/base/342377
Log:
Remove NETBSD_PF. NETBSD_PF is a flag that defines whether the pfil(9)
framework is available. pfil(9) has been in FreeBSD since FreeBSD 5
and according to svn log was first committed to HEAD in 2000, therefore
it is safe to say the check is no longer needed in FreeBSD.
pfil(9) first appeared in NetBSD 1.3 (hence the name NETBSD_PF).
Therefore it is safe to say that it is supported by every NetBSD system
today. The framework also exists in illumos.
As ipfilter code is shared and exchanged between FreeBSD and NetBSD, and
at some point in the future illumos too, and as all three platforms have
pfil(9), the redundant NETBSD_PF #defines and #ifdefs are removed.
MFC after:1 week
Modified:
head/sys/contrib/ipfilter/netinet/ip_compat.h
head/sys/contrib/ipfilter/netinet/ip_fil.h
head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
Modified: head/sys/contrib/ipfilter/netinet/ip_compat.h
==
--- head/sys/contrib/ipfilter/netinet/ip_compat.h Sun Dec 23 01:05:52
2018(r342376)
+++ head/sys/contrib/ipfilter/netinet/ip_compat.h Sun Dec 23 05:10:36
2018(r342377)
@@ -146,7 +146,6 @@ struct ether_addr {
# define COPYIN(a,b,c) copyin((caddr_t)(a), (caddr_t)(b), (c))
# define COPYOUT(a,b,c) copyout((caddr_t)(a), (caddr_t)(b), (c))
-# define NETBSD_PF
# else
# include
# endif /* _KERNEL */
Modified: head/sys/contrib/ipfilter/netinet/ip_fil.h
==
--- head/sys/contrib/ipfilter/netinet/ip_fil.h Sun Dec 23 01:05:52 2018
(r342376)
+++ head/sys/contrib/ipfilter/netinet/ip_fil.h Sun Dec 23 05:10:36 2018
(r342377)
@@ -1435,22 +1435,6 @@ typedef struct ipftune {
# define CDEV_MAJOR 79
#endif
-/*
- * Post NetBSD 1.2 has the PFIL interface for packet filters. This turns
- * on those hooks. We don't need any special mods in non-IP Filter code
- * with this!
- */
-#if (defined(NetBSD) && (NetBSD > 199609) && (NetBSD <= 1991011)) || \
-(defined(NetBSD1_2) && NetBSD1_2 > 1) || \
-(defined(__FreeBSD__) && (__FreeBSD_version >= 500043))
-# if (defined(NetBSD) && NetBSD >= 199905)
-# define PFIL_HOOKS
-# endif
-# ifdef PFIL_HOOKS
-# define NETBSD_PF
-# endif
-#endif
-
#ifdef _KERNEL
# define FR_VERBOSE(verb_pr)
# define FR_DEBUG(verb_pr)
Modified: head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
==
--- head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sun Dec 23 01:05:52
2018(r342376)
+++ head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sun Dec 23 05:10:36
2018(r342377)
@@ -97,9 +97,7 @@ VNET_DEFINE(ipf_main_softc_t, ipfmain) = {
#defineV_ipfmain VNET(ipfmain)
# include
-# if defined(NETBSD_PF)
# include
-# endif /* NETBSD_PF */
static eventhandler_tag ipf_arrivetag, ipf_departtag;
#if 0
@@ -1336,14 +1334,11 @@ ipf_inject(fin, m)
}
int ipf_pfil_unhook(void) {
-#if defined(NETBSD_PF) && (__FreeBSD_version >= 500011)
struct pfil_head *ph_inet;
-# ifdef USE_INET6
+#ifdef USE_INET6
struct pfil_head *ph_inet6;
-# endif
#endif
-#ifdef NETBSD_PF
ph_inet = pfil_head_get(PFIL_TYPE_AF, AF_INET);
if (ph_inet != NULL)
pfil_remove_hook((void *)ipf_check_wrapper, NULL,
@@ -1354,20 +1349,16 @@ int ipf_pfil_unhook(void) {
pfil_remove_hook((void *)ipf_check_wrapper6, NULL,
PFIL_IN|PFIL_OUT|PFIL_WAITOK, ph_inet6);
# endif
-#endif
return (0);
}
int ipf_pfil_hook(void) {
-#if defined(NETBSD_PF) && (__FreeBSD_version >= 500011)
struct pfil_head *ph_inet;
-# ifdef USE_INET6
+#ifdef USE_INET6
struct pfil_head *ph_inet6;
-# endif
#endif
-# ifdef NETBSD_PF
ph_inet = pfil_head_get(PFIL_TYPE_AF, AF_INET);
#ifdef USE_INET6
ph_inet6 = pfil_head_get(PFIL_TYPE_AF, AF_INET6);
@@ -1388,7 +1379,6 @@ int ipf_pfil_hook(void) {
pfil_add_hook((void *)ipf_check_wrapper6, NULL,
PFIL_IN|PFIL_OUT|PFIL_WAITOK, ph_inet6);
# endif
-# endif
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: r342547 - head/sys/contrib/ipfilter/netinet
Author: cy Date: Thu Dec 27 04:53:53 2018 New Revision: 342547 URL: https://svnweb.freebsd.org/changeset/base/342547 Log: Remove another empty #ifdef block. This empty block also exists in the upstream HEAD. MFC after:3 days Modified: head/sys/contrib/ipfilter/netinet/fil.c Modified: head/sys/contrib/ipfilter/netinet/fil.c == --- head/sys/contrib/ipfilter/netinet/fil.c Wed Dec 26 23:41:52 2018 (r342546) +++ head/sys/contrib/ipfilter/netinet/fil.c Thu Dec 27 04:53:53 2018 (r342547) @@ -4266,8 +4266,6 @@ copyoutptr(softc, src, dst, size) } return error; } -#ifdef _KERNEL -#endif /* */ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r341804 - in stable: 10/contrib/ipfilter 11/contrib/ipfilter 12/contrib/ipfilter
Author: cy Date: Tue Dec 11 01:49:06 2018 New Revision: 341804 URL: https://svnweb.freebsd.org/changeset/base/341804 Log: As part of the general cleanup of the ipfilter code, special cases are committed separately to document fixing them separately from the general cleanup. In this case we don't want to hide the utter brokenness of what is being fixed. Clean up a discombobulated block of #if's, with one block unreachable. ip_fil.c is used in ipftest which is used to dry-run test ipfilter rules in userspace without loading them in the kernel. The call to (*ifp->if_output) matches that in the FreeBSD kernel. Further testing and work will be required to make ipftest fully functional. Modified: stable/11/contrib/ipfilter/ip_fil.c Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/10/contrib/ipfilter/ip_fil.c stable/12/contrib/ipfilter/ip_fil.c Directory Properties: stable/10/ (props changed) stable/12/ (props changed) Modified: stable/11/contrib/ipfilter/ip_fil.c == --- stable/11/contrib/ipfilter/ip_fil.c Tue Dec 11 01:38:50 2018 (r341803) +++ stable/11/contrib/ipfilter/ip_fil.c Tue Dec 11 01:49:06 2018 (r341804) @@ -482,14 +482,7 @@ ipf_fastroute(m, mpp, fin, fdp) m->mb_ifp = ifp; printpacket(fin->fin_out, m); -#if defined(__sgi) && (IRIX < 60500) - (*ifp->if_output)(ifp, (void *)ip, NULL); -# if TRU64 >= 1885 - (*ifp->if_output)(ifp, (void *)m, NULL, 0, 0); -# else (*ifp->if_output)(ifp, (void *)m, NULL, 0); -# endif -#endif done: fin->fin_ifp = sifp; fin->fin_out = sout; ___ 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: r341804 - in stable: 10/contrib/ipfilter 11/contrib/ipfilter 12/contrib/ipfilter
Author: cy Date: Tue Dec 11 01:49:06 2018 New Revision: 341804 URL: https://svnweb.freebsd.org/changeset/base/341804 Log: As part of the general cleanup of the ipfilter code, special cases are committed separately to document fixing them separately from the general cleanup. In this case we don't want to hide the utter brokenness of what is being fixed. Clean up a discombobulated block of #if's, with one block unreachable. ip_fil.c is used in ipftest which is used to dry-run test ipfilter rules in userspace without loading them in the kernel. The call to (*ifp->if_output) matches that in the FreeBSD kernel. Further testing and work will be required to make ipftest fully functional. Modified: stable/10/contrib/ipfilter/ip_fil.c Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/11/contrib/ipfilter/ip_fil.c stable/12/contrib/ipfilter/ip_fil.c Directory Properties: stable/11/ (props changed) stable/12/ (props changed) Modified: stable/10/contrib/ipfilter/ip_fil.c == --- stable/10/contrib/ipfilter/ip_fil.c Tue Dec 11 01:38:50 2018 (r341803) +++ stable/10/contrib/ipfilter/ip_fil.c Tue Dec 11 01:49:06 2018 (r341804) @@ -479,14 +479,7 @@ ipf_fastroute(m, mpp, fin, fdp) m->mb_ifp = ifp; printpacket(fin->fin_out, m); -#if defined(__sgi) && (IRIX < 60500) - (*ifp->if_output)(ifp, (void *)ip, NULL); -# if TRU64 >= 1885 - (*ifp->if_output)(ifp, (void *)m, NULL, 0, 0); -# else (*ifp->if_output)(ifp, (void *)m, NULL, 0); -# endif -#endif done: fin->fin_ifp = sifp; fin->fin_out = sout; ___ 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: r341804 - in stable: 10/contrib/ipfilter 11/contrib/ipfilter 12/contrib/ipfilter
Author: cy Date: Tue Dec 11 01:49:06 2018 New Revision: 341804 URL: https://svnweb.freebsd.org/changeset/base/341804 Log: As part of the general cleanup of the ipfilter code, special cases are committed separately to document fixing them separately from the general cleanup. In this case we don't want to hide the utter brokenness of what is being fixed. Clean up a discombobulated block of #if's, with one block unreachable. ip_fil.c is used in ipftest which is used to dry-run test ipfilter rules in userspace without loading them in the kernel. The call to (*ifp->if_output) matches that in the FreeBSD kernel. Further testing and work will be required to make ipftest fully functional. Modified: stable/12/contrib/ipfilter/ip_fil.c Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/10/contrib/ipfilter/ip_fil.c stable/11/contrib/ipfilter/ip_fil.c Directory Properties: stable/10/ (props changed) stable/11/ (props changed) Modified: stable/12/contrib/ipfilter/ip_fil.c == --- stable/12/contrib/ipfilter/ip_fil.c Tue Dec 11 01:38:50 2018 (r341803) +++ stable/12/contrib/ipfilter/ip_fil.c Tue Dec 11 01:49:06 2018 (r341804) @@ -482,14 +482,7 @@ ipf_fastroute(m, mpp, fin, fdp) m->mb_ifp = ifp; printpacket(fin->fin_out, m); -#if defined(__sgi) && (IRIX < 60500) - (*ifp->if_output)(ifp, (void *)ip, NULL); -# if TRU64 >= 1885 - (*ifp->if_output)(ifp, (void *)m, NULL, 0, 0); -# else (*ifp->if_output)(ifp, (void *)m, NULL, 0); -# endif -#endif done: fin->fin_ifp = sifp; fin->fin_out = sout; ___ 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: r341759 - in head: contrib/wpa contrib/wpa/hostapd contrib/wpa/hs20/client contrib/wpa/src/ap contrib/wpa/src/common contrib/wpa/src/crypto contrib/wpa/src/drivers contrib/wpa/src/e
In message , Jung-uk Kim writ es: > This is an OpenPGP/MIME signed message (RFC 4880 and 3156) > --1WzVlQChcwPiBmKooCiYuMNrbS28KVujs > Content-Type: multipart/mixed; boundary="mK5ijTqRdq36SSbJEKLOKtLDhMyjY2IRB"; > protected-headers="v1" > From: Jung-uk Kim > To: Cy Schubert , src-committ...@freebsd.org, > svn-src-all@freebsd.org, svn-src-h...@freebsd.org > Message-ID: > Subject: Re: svn commit: r341759 - in head: contrib/wpa contrib/wpa/hostapd > contrib/wpa/hs20/client contrib/wpa/src/ap contrib/wpa/src/common > contrib/wpa/src/crypto contrib/wpa/src/drivers contrib/wpa/src/eap_c... > References: <201812090645.wb96jnso066...@repo.freebsd.org> > In-Reply-To: <201812090645.wb96jnso066...@repo.freebsd.org> > > --mK5ijTqRdq36SSbJEKLOKtLDhMyjY2IRB > Content-Type: multipart/mixed; > boundary="875BC694AF1AFD327ADF2704" > Content-Language: en-US > > This is a multi-part message in MIME format. > --875BC694AF1AFD327ADF2704 > Content-Type: text/plain; charset=utf-8 > Content-Transfer-Encoding: quoted-printable > > On 18. 12. 9., Cy Schubert wrote: > > Author: cy > > Date: Sun Dec 9 06:45:49 2018 > > New Revision: 341759 > > URL: https://svnweb.freebsd.org/changeset/base/341759 > >=20 > > Log: > > MFV r341618: > > =20 > > Update wpa 2.6 --> 2.7. > > =2E.. > > This broke my network configuration and I found the following messages > from /dev/log/message. > > =2E.. bge0: CTRL-EVENT-EAP-PROPOSED-METHOD vendor=3D0 method=3D25 > =2E.. bge0: CTRL-EVENT-EAP-METHOD EAP vendor 0 method 25 (PEAP) selected > =2E.. SSL: SSL3 alert: write (local SSL3 detected an error):fatal:interna= > l > error > =2E.. OpenSSL: openssl_handshake - SSL_connect error:141A90B5:SSL > routines:ssl_cipher_list_to_bytes:no ciphers available > =2E.. bge0: CTRL-EVENT-EAP-FAILURE EAP authentication failed > > I tracked it down and found default ciphers were not set because > usr.sbin/wpa/Makefile.inc added an empty string, i.e., > -DTLS_DEFAULT_CIPHERS=3D\"\". > > With the attached patch, I got my connection back. > > Jung-uk Kim Thanks for that jkim@. It's in r341839 now. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ 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: r341839 - head/usr.sbin/wpa
Author: cy
Date: Wed Dec 12 05:18:53 2018
New Revision: 341839
URL: https://svnweb.freebsd.org/changeset/base/341839
Log:
Set default ciphers.
Submitted by: jkim@
Modified:
head/usr.sbin/wpa/Makefile.inc
Modified: head/usr.sbin/wpa/Makefile.inc
==
--- head/usr.sbin/wpa/Makefile.inc Wed Dec 12 04:23:00 2018
(r341838)
+++ head/usr.sbin/wpa/Makefile.inc Wed Dec 12 05:18:53 2018
(r341839)
@@ -32,6 +32,6 @@ CFLAGS+=-I${WPA_DISTDIR}/src/wps
CFLAGS+= -DCONFIG_CTRL_IFACE
CFLAGS+= -DCONFIG_CTRL_IFACE_UNIX
CFLAGS+= -DNEED_AP_MLME
-CFLAGS+= -DTLS_DEFAULT_CIPHERS=\"$(CONFIG_TLS_DEFAULT_CIPHERS)\"
+CFLAGS+= -DTLS_DEFAULT_CIPHERS=\"DEFAULT:!EXP:!LOW\"
.include
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r342150 - head/share/man/man4
Author: cy Date: Sun Dec 16 04:06:53 2018 New Revision: 342150 URL: https://svnweb.freebsd.org/changeset/base/342150 Log: Add a missing leading / in a filename. MFC after:3 days Modified: head/share/man/man4/ses.4 Modified: head/share/man/man4/ses.4 == --- head/share/man/man4/ses.4 Sun Dec 16 02:46:51 2018(r342149) +++ head/share/man/man4/ses.4 Sun Dec 16 04:06:53 2018(r342150) @@ -107,7 +107,7 @@ Initialize the enclosure. .El .Sh EXAMPLE USAGE The files contained in -.In usr/share/examples/ses +.In /usr/share/examples/ses show simple mechanisms for how to use these interfaces, as well as a very stupid simple monitoring daemon. .Sh FILES ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r342385 - head/sys/contrib/ipfilter/netinet
Author: cy Date: Mon Dec 24 01:12:43 2018 New Revision: 342385 URL: https://svnweb.freebsd.org/changeset/base/342385 Log: Remove an empty #if block. The interesting thing is that looking through Darren's commit logs, the line containing an extern ppsratecheck() definition was removed from the v5-1-RELEASE branch but not from HEAD (I have taken his CVS tree and converted it to GIT). There is a commit adding an additional #if defined to the empty block. I can only assume that this was intentional for something later. Looking through HEAD the extern ppsratecheck() is there. However if we put it back it would conflict with a static ppsratecheck() definition in fil.c when building ipftest. Therefore we remove this empty block. ppsratecheck() is a function in the FreeBSD kernel. However ipftest cannot call the ppsratecheck() in the kernel. Therefore one exists in fil.c for use when building the userland ipftest utility which approximates the packet filter in userland for testing of ipfilter rules against packets captured with tcpdump. MFC after:1 week Modified: head/sys/contrib/ipfilter/netinet/ip_fil.h Modified: head/sys/contrib/ipfilter/netinet/ip_fil.h == --- head/sys/contrib/ipfilter/netinet/ip_fil.h Mon Dec 24 01:12:22 2018 (r342384) +++ head/sys/contrib/ipfilter/netinet/ip_fil.h Mon Dec 24 01:12:43 2018 (r342385) @@ -1813,9 +1813,6 @@ externint ipf_resolvefunc __P((ipf_main_softc_t *, vo extern void*ipf_resolvenic __P((ipf_main_softc_t *, char *, int)); extern int ipf_send_icmp_err __P((int, fr_info_t *, int)); extern int ipf_send_reset __P((fr_info_t *)); -#if (defined(__FreeBSD_version) && (__FreeBSD_version < 501000)) || \ - !defined(_KERNEL) || defined(linux) -#endif extern voidipf_apply_timeout __P((ipftq_t *, u_int)); extern ipftq_t *ipf_addtimeoutqueue __P((ipf_main_softc_t *, ipftq_t **, u_int)); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r342384 - head
Author: cy Date: Mon Dec 24 01:12:22 2018 New Revision: 342384 URL: https://svnweb.freebsd.org/changeset/base/342384 Log: Register a pre-commit review for ipfilter. Modified: head/MAINTAINERS Modified: head/MAINTAINERS == --- head/MAINTAINERSSun Dec 23 20:51:13 2018(r342383) +++ head/MAINTAINERSMon Dec 24 01:12:22 2018(r342384) @@ -38,6 +38,7 @@ subsystem login notes atffreebsd-testing,jmmv,ngie Pre-commit review requested. ath(4) adrian Pre-commit review requested, send to freebsd-wirel...@freebsd.org contrib/compiler-rtdim Pre-commit review preferred. +contrib/ipfilter cy Pre-commit review requested. contrib/libc++ dim Pre-commit review preferred. contrib/libcxxrt dim Pre-commit review preferred. contrib/llvm dim Pre-commit review preferred. @@ -88,6 +89,7 @@ share/mk/*.test.mkfreebsd-testing,ngie (same list as stand/forthdteske Pre-commit review requested. stand/lua kevans Pre-commit review requested sys/compat/linuxkpihselaskyIf in doubt, ask. +sys/contrib/ipfilter cy Pre-commit review requested. sys/dev/e1000 erj Pre-commit phabricator review requested. sys/dev/ixgbe erj Pre-commit phabricator review requested. sys/dev/ixlerj Pre-commit phabricator review requested. ___ 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: r342374 - head/sys/contrib/ipfilter/netinet
Author: cy Date: Sat Dec 22 21:49:25 2018 New Revision: 342374 URL: https://svnweb.freebsd.org/changeset/base/342374 Log: Remove the last vestiges of HP/UX from a FreeBSD-only ipfilter source file. MFC after:1 week Modified: head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Modified: head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c == --- head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Dec 22 21:32:37 2018(r342373) +++ head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Dec 22 21:49:25 2018(r342374) @@ -39,9 +39,7 @@ static const char rcsid[] = "@(#)$Id$"; # include # include # include -#if !defined(__hpux) # include -#endif #include # include # include ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r341280 - head/sys/contrib/ipfilter/netinet
Author: cy
Date: Fri Nov 30 04:15:56 2018
New Revision: 341280
URL: https://svnweb.freebsd.org/changeset/base/341280
Log:
Clean up a rather useless conditional structure member definition.
MFC after:1 week
Modified:
head/sys/contrib/ipfilter/netinet/ip_fil.h
Modified: head/sys/contrib/ipfilter/netinet/ip_fil.h
==
--- head/sys/contrib/ipfilter/netinet/ip_fil.h Fri Nov 30 04:15:42 2018
(r341279)
+++ head/sys/contrib/ipfilter/netinet/ip_fil.h Fri Nov 30 04:15:56 2018
(r341280)
@@ -1026,11 +1026,7 @@ typedef struct iplog {
#defineIPLOG_SIZE sizeof(iplog_t)
typedefstruct ipflog {
-#if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199603)) || \
-(defined(OpenBSD) && (OpenBSD >= 199603))
-#else
- u_int fl_unit;
-#endif
+ u_int fl_unit;
u_32_t fl_rule;
u_32_t fl_flags;
u_32_t fl_lflags;
___
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: r341279 - head/sys/contrib/ipfilter/netinet
Author: cy Date: Fri Nov 30 04:15:42 2018 New Revision: 341279 URL: https://svnweb.freebsd.org/changeset/base/341279 Log: Clean up a redundant non-redefinition of IFNAMSIZ. IFNAMSIZ is defined in net/if.h, therefore the condition is never met and confusing to those who follow. MFC after:1 month Modified: head/sys/contrib/ipfilter/netinet/ip_compat.h Modified: head/sys/contrib/ipfilter/netinet/ip_compat.h == --- head/sys/contrib/ipfilter/netinet/ip_compat.h Fri Nov 30 03:02:49 2018(r341278) +++ head/sys/contrib/ipfilter/netinet/ip_compat.h Fri Nov 30 04:15:42 2018(r341279) @@ -1411,10 +1411,6 @@ typedef struct tcpiphdrtcpiphdr_t; #undef ICMP_MAXTYPE #defineICMP_MAXTYPE18 -#ifndefIFNAMSIZ -#defineIFNAMSIZ16 -#endif - #ifndefLOG_FTP # define LOG_FTP (11<<3) #endif ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
RE: svn: head/usr.bin: . trim
Agreed.
---
Sent using a tiny phone keyboard.
Apologies for any typos and autocorrect.
Also, this old phone only supports top post. Apologies.
Cy Schubert
or
The need of the many outweighs the greed of the few.
---
-Original Message-
From: Alexey Dokuchaev
Sent: 29/11/2018 17:01
To: Maxim Sobolev
Cc: eu...@freebsd.org; svn-src-h...@freebsd.org; svn-src-all@freebsd.org;
src-committers
Subject: Re: svn: head/usr.bin: . trim
On Thu, Nov 29, 2018 at 10:36:02AM -0800, Maxim Sobolev wrote:
> Interesting. I have a similar functionality implemented as an option for
> the dd utility in my pipeline (conv=erase).
Which probably makes a better place rather than adding 4-letter program,
commonly named ("trim" is a simple word), into global namespace. :-/
./danfe
___
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: r341265 - head/sys/contrib/ipfilter/netinet
Author: cy Date: Thu Nov 29 21:20:53 2018 New Revision: 341265 URL: https://svnweb.freebsd.org/changeset/base/341265 Log: Remove an old comment/code and replace with a comment that directly references a NetBSD commit. MFC after:1 week Modified: head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Modified: head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c == --- head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Thu Nov 29 21:10:18 2018(r341264) +++ head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Thu Nov 29 21:20:53 2018(r341265) @@ -542,12 +542,7 @@ ipf_send_icmp_err(type, fin, dst) code = fin->fin_icode; #ifdef USE_INET6 -#if 0 - /* XXX Fix an off by one error: s/>/>=/ -was: -if ((code < 0) || (code > sizeof(icmptoicmp6unreach)/sizeof(int))) -Fix obtained from NetBSD ip_fil_netbsd.c r1.4: */ -#endif + /* See NetBSD ip_fil_netbsd.c r1.4: */ if ((code < 0) || (code >= sizeof(icmptoicmp6unreach)/sizeof(int))) return -1; #endif ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r341377 - head/sys/contrib/ipfilter/netinet
In message <20181201214705.7d2dca977d720467db57e...@bidouilliste.com>, Emmanuel Vadot writes: > > > Hi Cy, > > On Sat, 1 Dec 2018 17:59:42 +0000 (UTC) > Cy Schubert wrote: > > > Author: cy > > Date: Sat Dec 1 17:59:41 2018 > > New Revision: 341377 > > URL: https://svnweb.freebsd.org/changeset/base/341377 > > > > Log: > > Restore handling of PMTU discovery, removed through an unifdef(1) > > following the MFV of r254219 into r255332. In addition the 'FreeBSD' > > macro was never defined in ipfilter 5.1.2 thus it never would have > > been enabled in the first place. > > > > This work is prompted by a general cleanup of the IP Filter code > > prompted by working to resolve a PR. More to follow. > > > > MFC after:1 week > > > > Modified: > > head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c > > > > Modified: head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c > > This breaks a lot of things : https://ci.freebsd.org/tinderbox/ I see, gcc platforms. Thanks cem@ for the quick fix. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ 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: r341456 - head/contrib/ipfilter
Author: cy Date: Tue Dec 4 06:11:04 2018 New Revision: 341456 URL: https://svnweb.freebsd.org/changeset/base/341456 Log: As part of the general cleanup of the ipfilter code, special cases are committed separately to document fixing them separately from the general cleanup. In this case we don't want to hide the utter brokenness of what is being fixed. Clean up a discombobulated block of #if's, with one block unreachable. ip_fil.c is used in ipftest which is used to dry-run test ipfilter rules in userspace without loading them in the kernel. The call to (*ifp->if_output) matches that in the FreeBSD kernel. Further testing and work will be required to make ipftest fully functional. MFC after:1 week Modified: head/contrib/ipfilter/ip_fil.c Modified: head/contrib/ipfilter/ip_fil.c == --- head/contrib/ipfilter/ip_fil.c Tue Dec 4 04:55:49 2018 (r341455) +++ head/contrib/ipfilter/ip_fil.c Tue Dec 4 06:11:04 2018 (r341456) @@ -482,14 +482,7 @@ ipf_fastroute(m, mpp, fin, fdp) m->mb_ifp = ifp; printpacket(fin->fin_out, m); -#if defined(__sgi) && (IRIX < 60500) - (*ifp->if_output)(ifp, (void *)ip, NULL); -# if TRU64 >= 1885 - (*ifp->if_output)(ifp, (void *)m, NULL, 0, 0); -# else (*ifp->if_output)(ifp, (void *)m, NULL, 0); -# endif -#endif done: fin->fin_ifp = sifp; fin->fin_out = sout; ___ 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: r341708 - in stable: 10/sys/contrib/ipfilter/netinet 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet
Author: cy
Date: Fri Dec 7 21:42:41 2018
New Revision: 341708
URL: https://svnweb.freebsd.org/changeset/base/341708
Log:
MFC r341280:
Clean up a rather useless conditional structure member definition.
Modified:
stable/11/sys/contrib/ipfilter/netinet/ip_fil.h
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/10/sys/contrib/ipfilter/netinet/ip_fil.h
stable/12/sys/contrib/ipfilter/netinet/ip_fil.h
Directory Properties:
stable/10/ (props changed)
stable/12/ (props changed)
Modified: stable/11/sys/contrib/ipfilter/netinet/ip_fil.h
==
--- stable/11/sys/contrib/ipfilter/netinet/ip_fil.h Fri Dec 7 21:40:35
2018(r341707)
+++ stable/11/sys/contrib/ipfilter/netinet/ip_fil.h Fri Dec 7 21:42:41
2018(r341708)
@@ -1026,11 +1026,7 @@ typedef struct iplog {
#defineIPLOG_SIZE sizeof(iplog_t)
typedefstruct ipflog {
-#if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199603)) || \
-(defined(OpenBSD) && (OpenBSD >= 199603))
-#else
- u_int fl_unit;
-#endif
+ u_int fl_unit;
u_32_t fl_rule;
u_32_t fl_flags;
u_32_t fl_lflags;
___
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: r341708 - in stable: 10/sys/contrib/ipfilter/netinet 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet
Author: cy
Date: Fri Dec 7 21:42:41 2018
New Revision: 341708
URL: https://svnweb.freebsd.org/changeset/base/341708
Log:
MFC r341280:
Clean up a rather useless conditional structure member definition.
Modified:
stable/10/sys/contrib/ipfilter/netinet/ip_fil.h
Directory Properties:
stable/10/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/sys/contrib/ipfilter/netinet/ip_fil.h
stable/12/sys/contrib/ipfilter/netinet/ip_fil.h
Directory Properties:
stable/11/ (props changed)
stable/12/ (props changed)
Modified: stable/10/sys/contrib/ipfilter/netinet/ip_fil.h
==
--- stable/10/sys/contrib/ipfilter/netinet/ip_fil.h Fri Dec 7 21:40:35
2018(r341707)
+++ stable/10/sys/contrib/ipfilter/netinet/ip_fil.h Fri Dec 7 21:42:41
2018(r341708)
@@ -1026,11 +1026,7 @@ typedef struct iplog {
#defineIPLOG_SIZE sizeof(iplog_t)
typedefstruct ipflog {
-#if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199603)) || \
-(defined(OpenBSD) && (OpenBSD >= 199603))
-#else
- u_int fl_unit;
-#endif
+ u_int fl_unit;
u_32_t fl_rule;
u_32_t fl_flags;
u_32_t fl_lflags;
___
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: r341708 - in stable: 10/sys/contrib/ipfilter/netinet 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet
Author: cy
Date: Fri Dec 7 21:42:41 2018
New Revision: 341708
URL: https://svnweb.freebsd.org/changeset/base/341708
Log:
MFC r341280:
Clean up a rather useless conditional structure member definition.
Modified:
stable/12/sys/contrib/ipfilter/netinet/ip_fil.h
Directory Properties:
stable/12/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/10/sys/contrib/ipfilter/netinet/ip_fil.h
stable/11/sys/contrib/ipfilter/netinet/ip_fil.h
Directory Properties:
stable/10/ (props changed)
stable/11/ (props changed)
Modified: stable/12/sys/contrib/ipfilter/netinet/ip_fil.h
==
--- stable/12/sys/contrib/ipfilter/netinet/ip_fil.h Fri Dec 7 21:40:35
2018(r341707)
+++ stable/12/sys/contrib/ipfilter/netinet/ip_fil.h Fri Dec 7 21:42:41
2018(r341708)
@@ -1026,11 +1026,7 @@ typedef struct iplog {
#defineIPLOG_SIZE sizeof(iplog_t)
typedefstruct ipflog {
-#if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199603)) || \
-(defined(OpenBSD) && (OpenBSD >= 199603))
-#else
- u_int fl_unit;
-#endif
+ u_int fl_unit;
u_32_t fl_rule;
u_32_t fl_flags;
u_32_t fl_lflags;
___
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: r341739 - in stable: 10/sys/contrib/ipfilter/netinet 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet
Author: cy Date: Sat Dec 8 17:28:52 2018 New Revision: 341739 URL: https://svnweb.freebsd.org/changeset/base/341739 Log: MFC r341384: Remove IFF_DRVRLOCK as it is used in IRIX only (and we all know IRIX is dead). This includes collaterally removing code shared by HP/UX, SGI, and Linux, where IP Filter will in all likelihood for various reasons never run again. Modified: stable/12/sys/contrib/ipfilter/netinet/ip_log.c Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/contrib/ipfilter/netinet/ip_log.c stable/11/sys/contrib/ipfilter/netinet/ip_log.c Directory Properties: stable/10/ (props changed) stable/11/ (props changed) Modified: stable/12/sys/contrib/ipfilter/netinet/ip_log.c == --- stable/12/sys/contrib/ipfilter/netinet/ip_log.c Sat Dec 8 14:58:17 2018(r341738) +++ stable/12/sys/contrib/ipfilter/netinet/ip_log.c Sat Dec 8 17:28:52 2018(r341739) @@ -97,14 +97,8 @@ struct file; #include #ifdef __sgi # include -# ifdef IFF_DRVRLOCK /* IRIX6 */ -# include -# endif #endif -#if !defined(__hpux) && !defined(linux) && \ -!(defined(__sgi) && !defined(IFF_DRVRLOCK)) /*IRIX<6*/ # include -#endif #include #include #include ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r341739 - in stable: 10/sys/contrib/ipfilter/netinet 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet
Author: cy Date: Sat Dec 8 17:28:52 2018 New Revision: 341739 URL: https://svnweb.freebsd.org/changeset/base/341739 Log: MFC r341384: Remove IFF_DRVRLOCK as it is used in IRIX only (and we all know IRIX is dead). This includes collaterally removing code shared by HP/UX, SGI, and Linux, where IP Filter will in all likelihood for various reasons never run again. Modified: stable/10/sys/contrib/ipfilter/netinet/ip_log.c Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/11/sys/contrib/ipfilter/netinet/ip_log.c stable/12/sys/contrib/ipfilter/netinet/ip_log.c Directory Properties: stable/11/ (props changed) stable/12/ (props changed) Modified: stable/10/sys/contrib/ipfilter/netinet/ip_log.c == --- stable/10/sys/contrib/ipfilter/netinet/ip_log.c Sat Dec 8 14:58:17 2018(r341738) +++ stable/10/sys/contrib/ipfilter/netinet/ip_log.c Sat Dec 8 17:28:52 2018(r341739) @@ -97,14 +97,8 @@ struct file; #include #ifdef __sgi # include -# ifdef IFF_DRVRLOCK /* IRIX6 */ -# include -# endif #endif -#if !defined(__hpux) && !defined(linux) && \ -!(defined(__sgi) && !defined(IFF_DRVRLOCK)) /*IRIX<6*/ # include -#endif #include #include #include ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r341739 - in stable: 10/sys/contrib/ipfilter/netinet 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet
Author: cy Date: Sat Dec 8 17:28:52 2018 New Revision: 341739 URL: https://svnweb.freebsd.org/changeset/base/341739 Log: MFC r341384: Remove IFF_DRVRLOCK as it is used in IRIX only (and we all know IRIX is dead). This includes collaterally removing code shared by HP/UX, SGI, and Linux, where IP Filter will in all likelihood for various reasons never run again. Modified: stable/11/sys/contrib/ipfilter/netinet/ip_log.c Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/contrib/ipfilter/netinet/ip_log.c stable/12/sys/contrib/ipfilter/netinet/ip_log.c Directory Properties: stable/10/ (props changed) stable/12/ (props changed) Modified: stable/11/sys/contrib/ipfilter/netinet/ip_log.c == --- stable/11/sys/contrib/ipfilter/netinet/ip_log.c Sat Dec 8 14:58:17 2018(r341738) +++ stable/11/sys/contrib/ipfilter/netinet/ip_log.c Sat Dec 8 17:28:52 2018(r341739) @@ -97,14 +97,8 @@ struct file; #include #ifdef __sgi # include -# ifdef IFF_DRVRLOCK /* IRIX6 */ -# include -# endif #endif -#if !defined(__hpux) && !defined(linux) && \ -!(defined(__sgi) && !defined(IFF_DRVRLOCK)) /*IRIX<6*/ # include -#endif #include #include #include ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r341740 - in stable: 10/sys/contrib/ipfilter/netinet 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet
Author: cy Date: Sat Dec 8 17:50:00 2018 New Revision: 341740 URL: https://svnweb.freebsd.org/changeset/base/341740 Log: MFC r341377, r341388 (fixup): Restore handling of PMTU discovery, removed through an unifdef(1) following the MFV of r254219 into r255332. In addition the 'FreeBSD' macro was never defined in ipfilter 5.1.2 thus it never would have been enabled in the first place. This work is prompted by a general cleanup of the IP Filter code prompted by working to resolve a PR. More to follow. Modified: stable/11/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Directory Properties: stable/10/ (props changed) stable/12/ (props changed) Modified: stable/11/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c == --- stable/11/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Dec 8 17:28:52 2018(r341739) +++ stable/11/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Dec 8 17:50:00 2018(r341740) @@ -85,7 +85,6 @@ static const char rcsid[] = "@(#)$Id$"; #endif extern int ip_optcopy __P((struct ip *, struct ip *)); - # ifdef IPFILTER_M_IPFILTER MALLOC_DEFINE(M_IPFILTER, "ipfilter", "IP Filter packet filter data structures"); # endif @@ -477,11 +476,7 @@ ipf_send_ip(fin, m) IP_HL_A(ip, sizeof(*oip) >> 2); ip->ip_tos = oip->ip_tos; ip->ip_id = fin->fin_ip->ip_id; -#if defined(FreeBSD) && (__FreeBSD_version > 46) - ip->ip_off = htons(path_mtu_discovery ? IP_DF : 0); -#else - ip->ip_off = 0; -#endif + ip->ip_off = htons(V_path_mtu_discovery ? IP_DF : 0); ip->ip_ttl = V_ip_defttl; ip->ip_sum = 0; 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: r341740 - in stable: 10/sys/contrib/ipfilter/netinet 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet
Author: cy Date: Sat Dec 8 17:50:00 2018 New Revision: 341740 URL: https://svnweb.freebsd.org/changeset/base/341740 Log: MFC r341377, r341388 (fixup): Restore handling of PMTU discovery, removed through an unifdef(1) following the MFV of r254219 into r255332. In addition the 'FreeBSD' macro was never defined in ipfilter 5.1.2 thus it never would have been enabled in the first place. This work is prompted by a general cleanup of the IP Filter code prompted by working to resolve a PR. More to follow. Modified: stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c stable/11/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Directory Properties: stable/10/ (props changed) stable/11/ (props changed) Modified: stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c == --- stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Dec 8 17:28:52 2018(r341739) +++ stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Dec 8 17:50:00 2018(r341740) @@ -85,7 +85,6 @@ static const char rcsid[] = "@(#)$Id$"; #endif extern int ip_optcopy __P((struct ip *, struct ip *)); - # ifdef IPFILTER_M_IPFILTER MALLOC_DEFINE(M_IPFILTER, "ipfilter", "IP Filter packet filter data structures"); # endif @@ -477,11 +476,7 @@ ipf_send_ip(fin, m) IP_HL_A(ip, sizeof(*oip) >> 2); ip->ip_tos = oip->ip_tos; ip->ip_id = fin->fin_ip->ip_id; -#if defined(FreeBSD) && (__FreeBSD_version > 46) - ip->ip_off = htons(path_mtu_discovery ? IP_DF : 0); -#else - ip->ip_off = 0; -#endif + ip->ip_off = htons(V_path_mtu_discovery ? IP_DF : 0); ip->ip_ttl = V_ip_defttl; ip->ip_sum = 0; 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: r341740 - in stable: 10/sys/contrib/ipfilter/netinet 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet
Author: cy Date: Sat Dec 8 17:50:00 2018 New Revision: 341740 URL: https://svnweb.freebsd.org/changeset/base/341740 Log: MFC r341377, r341388 (fixup): Restore handling of PMTU discovery, removed through an unifdef(1) following the MFV of r254219 into r255332. In addition the 'FreeBSD' macro was never defined in ipfilter 5.1.2 thus it never would have been enabled in the first place. This work is prompted by a general cleanup of the IP Filter code prompted by working to resolve a PR. More to follow. Modified: stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/11/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Directory Properties: stable/11/ (props changed) stable/12/ (props changed) Modified: stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c == --- stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Dec 8 17:28:52 2018(r341739) +++ stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Dec 8 17:50:00 2018(r341740) @@ -88,7 +88,6 @@ static const char rcsid[] = "@(#)$Id$"; #endif extern int ip_optcopy __P((struct ip *, struct ip *)); - # ifdef IPFILTER_M_IPFILTER MALLOC_DEFINE(M_IPFILTER, "ipfilter", "IP Filter packet filter data structures"); # endif @@ -472,11 +471,7 @@ ipf_send_ip(fin, m) IP_HL_A(ip, sizeof(*oip) >> 2); ip->ip_tos = oip->ip_tos; ip->ip_id = fin->fin_ip->ip_id; -#if defined(FreeBSD) && (__FreeBSD_version > 46) - ip->ip_off = htons(path_mtu_discovery ? IP_DF : 0); -#else - ip->ip_off = 0; -#endif + ip->ip_off = htons(V_path_mtu_discovery ? IP_DF : 0); ip->ip_ttl = V_ip_defttl; ip->ip_sum = 0; 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: r341615 - in stable: 10/sys/contrib/ipfilter/netinet 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet
Author: cy Date: Thu Dec 6 04:28:39 2018 New Revision: 341615 URL: https://svnweb.freebsd.org/changeset/base/341615 Log: MFC r341265: Remove an old comment/code and replace with a comment that directly references a NetBSD commit. Modified: stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/11/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Directory Properties: stable/11/ (props changed) stable/12/ (props changed) Modified: stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c == --- stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Thu Dec 6 04:25:12 2018(r341614) +++ stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Thu Dec 6 04:28:39 2018(r341615) @@ -537,12 +537,7 @@ ipf_send_icmp_err(type, fin, dst) code = fin->fin_icode; #ifdef USE_INET6 -#if 0 - /* XXX Fix an off by one error: s/>/>=/ -was: -if ((code < 0) || (code > sizeof(icmptoicmp6unreach)/sizeof(int))) -Fix obtained from NetBSD ip_fil_netbsd.c r1.4: */ -#endif + /* See NetBSD ip_fil_netbsd.c r1.4: */ if ((code < 0) || (code >= sizeof(icmptoicmp6unreach)/sizeof(int))) return -1; #endif ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r341615 - in stable: 10/sys/contrib/ipfilter/netinet 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet
Author: cy Date: Thu Dec 6 04:28:39 2018 New Revision: 341615 URL: https://svnweb.freebsd.org/changeset/base/341615 Log: MFC r341265: Remove an old comment/code and replace with a comment that directly references a NetBSD commit. Modified: stable/11/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Directory Properties: stable/10/ (props changed) stable/12/ (props changed) Modified: stable/11/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c == --- stable/11/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Thu Dec 6 04:25:12 2018(r341614) +++ stable/11/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Thu Dec 6 04:28:39 2018(r341615) @@ -542,12 +542,7 @@ ipf_send_icmp_err(type, fin, dst) code = fin->fin_icode; #ifdef USE_INET6 -#if 0 - /* XXX Fix an off by one error: s/>/>=/ -was: -if ((code < 0) || (code > sizeof(icmptoicmp6unreach)/sizeof(int))) -Fix obtained from NetBSD ip_fil_netbsd.c r1.4: */ -#endif + /* See NetBSD ip_fil_netbsd.c r1.4: */ if ((code < 0) || (code >= sizeof(icmptoicmp6unreach)/sizeof(int))) return -1; #endif ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r341619 - vendor/wpa/2.7
Author: cy Date: Thu Dec 6 05:06:14 2018 New Revision: 341619 URL: https://svnweb.freebsd.org/changeset/base/341619 Log: Tag wpa_supplicant/hostapd 2.7. Added: vendor/wpa/2.7/ - copied from r341618, vendor/wpa/dist/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r341615 - in stable: 10/sys/contrib/ipfilter/netinet 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet
Author: cy Date: Thu Dec 6 04:28:39 2018 New Revision: 341615 URL: https://svnweb.freebsd.org/changeset/base/341615 Log: MFC r341265: Remove an old comment/code and replace with a comment that directly references a NetBSD commit. Modified: stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c stable/11/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Directory Properties: stable/10/ (props changed) stable/11/ (props changed) Modified: stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c == --- stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Thu Dec 6 04:25:12 2018(r341614) +++ stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Thu Dec 6 04:28:39 2018(r341615) @@ -542,12 +542,7 @@ ipf_send_icmp_err(type, fin, dst) code = fin->fin_icode; #ifdef USE_INET6 -#if 0 - /* XXX Fix an off by one error: s/>/>=/ -was: -if ((code < 0) || (code > sizeof(icmptoicmp6unreach)/sizeof(int))) -Fix obtained from NetBSD ip_fil_netbsd.c r1.4: */ -#endif + /* See NetBSD ip_fil_netbsd.c r1.4: */ if ((code < 0) || (code >= sizeof(icmptoicmp6unreach)/sizeof(int))) return -1; #endif ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r341618 - in vendor/wpa/dist: . hostapd hs20/client src/ap src/common src/crypto src/drivers src/eap_common src/eap_peer src/eap_server src/eapol_auth src/eapol_supp src/fst src/l2_pack...
Author: cy Date: Thu Dec 6 05:04:28 2018 New Revision: 341618 URL: https://svnweb.freebsd.org/changeset/base/341618 Log: Import wpa_supplicant/hostapd 2.7 Added: vendor/wpa/dist/src/ap/dpp_hostapd.c (contents, props changed) vendor/wpa/dist/src/ap/dpp_hostapd.h (contents, props changed) vendor/wpa/dist/src/ap/eth_p_oui.c (contents, props changed) vendor/wpa/dist/src/ap/eth_p_oui.h (contents, props changed) vendor/wpa/dist/src/ap/fils_hlp.c (contents, props changed) vendor/wpa/dist/src/ap/fils_hlp.h (contents, props changed) vendor/wpa/dist/src/ap/gas_query_ap.c (contents, props changed) vendor/wpa/dist/src/ap/gas_query_ap.h (contents, props changed) vendor/wpa/dist/src/ap/ieee802_11_he.c (contents, props changed) vendor/wpa/dist/src/common/dhcp.h (contents, props changed) vendor/wpa/dist/src/common/dpp.c (contents, props changed) vendor/wpa/dist/src/common/dpp.h (contents, props changed) vendor/wpa/dist/src/common/gas_server.c (contents, props changed) vendor/wpa/dist/src/common/gas_server.h (contents, props changed) vendor/wpa/dist/src/crypto/crypto_linux.c (contents, props changed) vendor/wpa/dist/src/crypto/crypto_nettle.c (contents, props changed) vendor/wpa/dist/src/crypto/crypto_wolfssl.c (contents, props changed) vendor/wpa/dist/src/crypto/fips_prf_wolfssl.c (contents, props changed) vendor/wpa/dist/src/crypto/sha384-kdf.c (contents, props changed) vendor/wpa/dist/src/crypto/sha384.c (contents, props changed) vendor/wpa/dist/src/crypto/sha512-kdf.c (contents, props changed) vendor/wpa/dist/src/crypto/sha512-prf.c (contents, props changed) vendor/wpa/dist/src/crypto/sha512.h (contents, props changed) vendor/wpa/dist/src/crypto/tls_wolfssl.c (contents, props changed) vendor/wpa/dist/src/drivers/driver_macsec_linux.c (contents, props changed) vendor/wpa/dist/src/drivers/driver_wired_common.c (contents, props changed) vendor/wpa/dist/src/drivers/driver_wired_common.h (contents, props changed) vendor/wpa/dist/src/utils/crc32.c (contents, props changed) vendor/wpa/dist/src/utils/crc32.h (contents, props changed) vendor/wpa/dist/src/utils/json.c (contents, props changed) vendor/wpa/dist/src/utils/json.h (contents, props changed) vendor/wpa/dist/wpa_supplicant/dpp_supplicant.c (contents, props changed) vendor/wpa/dist/wpa_supplicant/dpp_supplicant.h (contents, props changed) vendor/wpa/dist/wpa_supplicant/examples/dpp-qrcode.py (contents, props changed) vendor/wpa/dist/wpa_supplicant/op_classes.c (contents, props changed) vendor/wpa/dist/wpa_supplicant/rrm.c (contents, props changed) Deleted: vendor/wpa/dist/src/ap/peerkey_auth.c vendor/wpa/dist/src/rsn_supp/peerkey.c vendor/wpa/dist/src/rsn_supp/peerkey.h Modified: vendor/wpa/dist/CONTRIBUTIONS vendor/wpa/dist/COPYING vendor/wpa/dist/README vendor/wpa/dist/hostapd/Android.mk vendor/wpa/dist/hostapd/ChangeLog vendor/wpa/dist/hostapd/Makefile vendor/wpa/dist/hostapd/README vendor/wpa/dist/hostapd/android.config vendor/wpa/dist/hostapd/config_file.c vendor/wpa/dist/hostapd/config_file.h vendor/wpa/dist/hostapd/ctrl_iface.c vendor/wpa/dist/hostapd/defconfig vendor/wpa/dist/hostapd/hlr_auc_gw.c vendor/wpa/dist/hostapd/hostapd.android.rc vendor/wpa/dist/hostapd/hostapd.conf vendor/wpa/dist/hostapd/hostapd.eap_user_sqlite vendor/wpa/dist/hostapd/hostapd_cli.c vendor/wpa/dist/hostapd/main.c vendor/wpa/dist/hs20/client/est.c vendor/wpa/dist/hs20/client/oma_dm_client.c vendor/wpa/dist/hs20/client/osu_client.c vendor/wpa/dist/hs20/client/osu_client.h vendor/wpa/dist/src/ap/Makefile vendor/wpa/dist/src/ap/acs.c vendor/wpa/dist/src/ap/acs.h vendor/wpa/dist/src/ap/ap_config.c vendor/wpa/dist/src/ap/ap_config.h vendor/wpa/dist/src/ap/ap_drv_ops.c vendor/wpa/dist/src/ap/ap_drv_ops.h vendor/wpa/dist/src/ap/ap_mlme.c vendor/wpa/dist/src/ap/authsrv.c vendor/wpa/dist/src/ap/beacon.c vendor/wpa/dist/src/ap/beacon.h vendor/wpa/dist/src/ap/bss_load.c vendor/wpa/dist/src/ap/ctrl_iface_ap.c vendor/wpa/dist/src/ap/ctrl_iface_ap.h vendor/wpa/dist/src/ap/dfs.c vendor/wpa/dist/src/ap/dfs.h vendor/wpa/dist/src/ap/dhcp_snoop.c vendor/wpa/dist/src/ap/drv_callbacks.c vendor/wpa/dist/src/ap/eap_user_db.c vendor/wpa/dist/src/ap/gas_serv.c vendor/wpa/dist/src/ap/gas_serv.h vendor/wpa/dist/src/ap/hostapd.c vendor/wpa/dist/src/ap/hostapd.h vendor/wpa/dist/src/ap/hs20.c vendor/wpa/dist/src/ap/hs20.h vendor/wpa/dist/src/ap/hw_features.c vendor/wpa/dist/src/ap/ieee802_11.c vendor/wpa/dist/src/ap/ieee802_11.h vendor/wpa/dist/src/ap/ieee802_11_auth.c vendor/wpa/dist/src/ap/ieee802_11_auth.h vendor/wpa/dist/src/ap/ieee802_11_ht.c vendor/wpa/dist/src/ap/ieee802_11_shared.c vendor/wpa/dist/src/ap/ieee802_11_vht.c vendor/wpa/dist/src/ap/ieee802_1x.c vendor/wpa/dist/src/ap/ieee802_1x.h vendor/wpa/dist/src/ap/ndisc_snoop.c
svn commit: r341650 - in head: contrib/ipfilter/ipsend sys/contrib/ipfilter/netinet
Author: cy
Date: Thu Dec 6 20:15:54 2018
New Revision: 341650
URL: https://svnweb.freebsd.org/changeset/base/341650
Log:
Remove an ugly Ultrix hack. Ultrix has been AWOL since the last ice
age, more to come.
MFC after:1 week
Modified:
head/contrib/ipfilter/ipsend/ip.c
head/contrib/ipfilter/ipsend/resend.c
head/sys/contrib/ipfilter/netinet/ip_compat.h
Modified: head/contrib/ipfilter/ipsend/ip.c
==
--- head/contrib/ipfilter/ipsend/ip.c Thu Dec 6 20:04:01 2018
(r341649)
+++ head/contrib/ipfilter/ipsend/ip.c Thu Dec 6 20:15:54 2018
(r341650)
@@ -67,9 +67,9 @@ int send_ether(nfd, buf, len, gwip)
bcopy((char *)buf, s + sizeof(*eh), len);
if (gwip.s_addr == last_gw.s_addr)
{
- bcopy(last_arp, (char *)A_A eh->ether_dhost, 6);
+ bcopy(last_arp, (char *) >ether_dhost, 6);
}
- else if (arp((char *), (char *)A_A eh->ether_dhost) == -1)
+ else if (arp((char *), (char *) >ether_dhost) == -1)
{
perror("arp");
return -2;
@@ -109,17 +109,17 @@ int send_ip(nfd, mtu, ip, gwip, frag)
eh = (ether_header_t *)ipbuf;
- bzero((char *)A_A eh->ether_shost, sizeof(eh->ether_shost));
+ bzero((char *) >ether_shost, sizeof(eh->ether_shost));
if (last_gw.s_addr && (gwip.s_addr == last_gw.s_addr))
{
- bcopy(last_arp, (char *)A_A eh->ether_dhost, 6);
+ bcopy(last_arp, (char *) >ether_dhost, 6);
}
- else if (arp((char *), (char *)A_A eh->ether_dhost) == -1)
+ else if (arp((char *), (char *) >ether_dhost) == -1)
{
perror("arp");
return -2;
}
- bcopy((char *)A_A eh->ether_dhost, last_arp, sizeof(last_arp));
+ bcopy((char *) >ether_dhost, last_arp, sizeof(last_arp));
eh->ether_type = htons(ETHERTYPE_IP);
bcopy((char *)ip, (char *), sizeof(*ip));
@@ -136,11 +136,11 @@ int send_ip(nfd, mtu, ip, gwip, frag)
}
if (ip->ip_src.s_addr != local_ip.s_addr) {
- (void) arp((char *)>ip_src, (char *)A_A local_arp);
- bcopy(local_arp, (char *)A_A eh->ether_shost,sizeof(last_arp));
+ (void) arp((char *)>ip_src, (char *) _arp);
+ bcopy(local_arp, (char *) >ether_shost,sizeof(last_arp));
local_ip = ip->ip_src;
} else
- bcopy(local_arp, (char *)A_A eh->ether_shost, 6);
+ bcopy(local_arp, (char *) >ether_shost, 6);
if (!frag || (sizeof(*eh) + iplen < mtu))
{
Modified: head/contrib/ipfilter/ipsend/resend.c
==
--- head/contrib/ipfilter/ipsend/resend.c Thu Dec 6 20:04:01 2018
(r341649)
+++ head/contrib/ipfilter/ipsend/resend.c Thu Dec 6 20:15:54 2018
(r341650)
@@ -97,7 +97,7 @@ int ip_resend(dev, mtu, r, gwip, datain)
return -2;
}
- bzero((char *)A_A eh->ether_shost, sizeof(eh->ether_shost));
+ bzero((char *) >ether_shost, sizeof(eh->ether_shost));
if (gwip.s_addr && (arp((char *), dhost) == -1))
{
perror("arp");
@@ -113,12 +113,12 @@ int ip_resend(dev, mtu, r, gwip, datain)
eh->ether_type = htons((u_short)ETHERTYPE_IP);
if (!gwip.s_addr) {
if (arp((char *),
- (char *)A_A eh->ether_dhost) == -1) {
+ (char *) >ether_dhost) == -1) {
perror("arp");
continue;
}
} else
- bcopy(dhost, (char *)A_A eh->ether_dhost,
+ bcopy(dhost, (char *) >ether_dhost,
sizeof(dhost));
if (!ip->ip_sum)
ip->ip_sum = chksum((u_short *)ip,
Modified: head/sys/contrib/ipfilter/netinet/ip_compat.h
==
--- head/sys/contrib/ipfilter/netinet/ip_compat.h Thu Dec 6 20:04:01
2018(r341649)
+++ head/sys/contrib/ipfilter/netinet/ip_compat.h Thu Dec 6 20:15:54
2018(r341650)
@@ -758,16 +758,6 @@ typedefstruct tcpiphdrtcpiphdr_t;
#endif
#defineIPMINLEN(i, h) ((i)->ip_len >= (IP_HL(i) * 4 + sizeof(struct
h)))
-
-/*
- * XXX - This is one of those *awful* hacks which nobody likes
- */
-#ifdef ultrix
-#defineA_A
-#else
-#defineA_A &
-#endif
-
#defineTCPF_ALL(TH_FIN|TH_SYN|TH_RST|TH_PUSH|TH_ACK|TH_URG|\
svn commit: r341287 - stable/12/libexec/rc/rc.d
Author: cy
Date: Fri Nov 30 06:44:32 2018
New Revision: 341287
URL: https://svnweb.freebsd.org/changeset/base/341287
Log:
MFC r340754:
Allow forced start of ipmon in special cases where testing is desired
(or other special cases) and when ipfilter is disabled in rc.conf but
started by other means.
Modified:
stable/12/libexec/rc/rc.d/ipmon
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/libexec/rc/rc.d/ipmon
==
--- stable/12/libexec/rc/rc.d/ipmon Fri Nov 30 05:54:30 2018
(r341286)
+++ stable/12/libexec/rc/rc.d/ipmon Fri Nov 30 06:44:32 2018
(r341287)
@@ -21,7 +21,7 @@ ipmon_precmd()
# Continue only if ipfilter or ipnat is enabled and the
# ipfilter module is loaded.
#
- if ! checkyesno ipfilter_enable && ! checkyesno ipnat_enable ; then
+ if ! checkyesno ipfilter_enable && ! checkyesno ipnat_enable && !
checkyesno rc_force ; then
err 1 "${name} requires either ipfilter or ipnat enabled"
fi
if ! ${ipfilter_program:-/sbin/ipf} -V | grep -q 'Running: yes'
>/dev/null 2>&1; then
___
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: r341289 - stable/10/etc/rc.d
Author: cy
Date: Fri Nov 30 06:47:01 2018
New Revision: 341289
URL: https://svnweb.freebsd.org/changeset/base/341289
Log:
This is a direct commit to the stable/10 branch. This would have been
MFC r340754 except that etc/rc.d has been moved in HEAD which would
have resulted in a tree conflict if merged.
Allow forced start of ipmon in special cases where testing is desired
(or other special cases) and when ipfilter is disabled in rc.conf but
started by other means.
Modified:
stable/10/etc/rc.d/ipmon
Modified: stable/10/etc/rc.d/ipmon
==
--- stable/10/etc/rc.d/ipmonFri Nov 30 06:45:53 2018(r341288)
+++ stable/10/etc/rc.d/ipmonFri Nov 30 06:47:01 2018(r341289)
@@ -20,7 +20,7 @@ ipmon_precmd()
# Continue only if ipfilter or ipnat is enabled and the
# ipfilter module is loaded.
#
- if ! checkyesno ipfilter_enable && ! checkyesno ipnat_enable ; then
+ if ! checkyesno ipfilter_enable && ! checkyesno ipnat_enable && !
checkyesno rc_force ; then
err 1 "${name} requires either ipfilter or ipnat enabled"
fi
if ! ${ipfilter_program:-/sbin/ipf} -V | grep -q 'Running: yes'
>/dev/null 2>&1; then
___
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: r341288 - stable/11/etc/rc.d
Author: cy
Date: Fri Nov 30 06:45:53 2018
New Revision: 341288
URL: https://svnweb.freebsd.org/changeset/base/341288
Log:
This is a direct commit to the stable/11 branch. This would have been
MFC r340754 except that etc/rc.d has been moved in HEAD which would
have resulted in a tree conflict if merged.
Allow forced start of ipmon in special cases where testing is desired
(or other special cases) and when ipfilter is disabled in rc.conf but
started by other means.
Modified:
stable/11/etc/rc.d/ipmon
Modified: stable/11/etc/rc.d/ipmon
==
--- stable/11/etc/rc.d/ipmonFri Nov 30 06:44:32 2018(r341287)
+++ stable/11/etc/rc.d/ipmonFri Nov 30 06:45:53 2018(r341288)
@@ -21,7 +21,7 @@ ipmon_precmd()
# Continue only if ipfilter or ipnat is enabled and the
# ipfilter module is loaded.
#
- if ! checkyesno ipfilter_enable && ! checkyesno ipnat_enable ; then
+ if ! checkyesno ipfilter_enable && ! checkyesno ipnat_enable && !
checkyesno rc_force ; then
err 1 "${name} requires either ipfilter or ipnat enabled"
fi
if ! ${ipfilter_program:-/sbin/ipf} -V | grep -q 'Running: yes'
>/dev/null 2>&1; then
___
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: r341379 - in stable: 10/sys/contrib/ipfilter/netinet 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet
Author: cy Date: Sat Dec 1 18:17:51 2018 New Revision: 341379 URL: https://svnweb.freebsd.org/changeset/base/341379 Log: MFC r340868: An OSF/1 ifdef makes absolutley no sense in a FreeBSD specific source file. Modified: stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c stable/11/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Directory Properties: stable/10/ (props changed) stable/11/ (props changed) Modified: stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c == --- stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Dec 1 18:09:17 2018(r341378) +++ stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Dec 1 18:17:51 2018(r341379) @@ -66,9 +66,6 @@ static const char rcsid[] = "@(#)$Id$"; #defineVNET_DECLARE(_t, _v)extern _t _v #defineVNET(arg) arg #endif -#if defined(__osf__) -# include -#endif #include #include #include ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r341379 - in stable: 10/sys/contrib/ipfilter/netinet 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet
Author: cy Date: Sat Dec 1 18:17:51 2018 New Revision: 341379 URL: https://svnweb.freebsd.org/changeset/base/341379 Log: MFC r340868: An OSF/1 ifdef makes absolutley no sense in a FreeBSD specific source file. Modified: stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/11/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Directory Properties: stable/11/ (props changed) stable/12/ (props changed) Modified: stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c == --- stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Dec 1 18:09:17 2018(r341378) +++ stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Dec 1 18:17:51 2018(r341379) @@ -61,9 +61,6 @@ static const char rcsid[] = "@(#)$Id$"; #define CURVNET_SET(arg) #define CURVNET_RESTORE() #endif -#if defined(__osf__) -# include -#endif #include #include #include ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r341377 - head/sys/contrib/ipfilter/netinet
Author: cy Date: Sat Dec 1 17:59:41 2018 New Revision: 341377 URL: https://svnweb.freebsd.org/changeset/base/341377 Log: Restore handling of PMTU discovery, removed through an unifdef(1) following the MFV of r254219 into r255332. In addition the 'FreeBSD' macro was never defined in ipfilter 5.1.2 thus it never would have been enabled in the first place. This work is prompted by a general cleanup of the IP Filter code prompted by working to resolve a PR. More to follow. MFC after:1 week Modified: head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Modified: head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c == --- head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Dec 1 17:48:28 2018(r341376) +++ head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Dec 1 17:59:41 2018(r341377) @@ -85,6 +85,8 @@ static const char rcsid[] = "@(#)$Id$"; #endif extern int ip_optcopy __P((struct ip *, struct ip *)); +VNET_DECLARE(int, path_mtu_discovery); +#defineV_path_mtu_discoveryVNET(path_mtu_discovery) # ifdef IPFILTER_M_IPFILTER MALLOC_DEFINE(M_IPFILTER, "ipfilter", "IP Filter packet filter data structures"); @@ -477,11 +479,7 @@ ipf_send_ip(fin, m) IP_HL_A(ip, sizeof(*oip) >> 2); ip->ip_tos = oip->ip_tos; ip->ip_id = fin->fin_ip->ip_id; -#if defined(FreeBSD) && (__FreeBSD_version > 46) - ip->ip_off = htons(path_mtu_discovery ? IP_DF : 0); -#else - ip->ip_off = 0; -#endif + ip->ip_off = htons(V_path_mtu_discovery ? IP_DF : 0); ip->ip_ttl = V_ip_defttl; ip->ip_sum = 0; 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: r341378 - in stable: 10/sys/contrib/ipfilter/netinet 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet
Author: cy Date: Sat Dec 1 18:09:17 2018 New Revision: 341378 URL: https://svnweb.freebsd.org/changeset/base/341378 Log: MFC r340909: Combine two lines into one following unifdef for r255332. Modified: stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c stable/11/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Directory Properties: stable/10/ (props changed) stable/11/ (props changed) Modified: stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c == --- stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Dec 1 17:59:41 2018(r341377) +++ stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Dec 1 18:09:17 2018(r341378) @@ -299,8 +299,7 @@ ipfdetach(softc) * Filter ioctl interface. */ int -ipfioctl(dev, cmd, data, mode -, p) +ipfioctl(dev, cmd, data, mode, p) struct thread *p; #definep_cred td_ucred #definep_uid td_ucred->cr_ruid ___ 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: r341378 - in stable: 10/sys/contrib/ipfilter/netinet 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet
Author: cy Date: Sat Dec 1 18:09:17 2018 New Revision: 341378 URL: https://svnweb.freebsd.org/changeset/base/341378 Log: MFC r340909: Combine two lines into one following unifdef for r255332. Modified: stable/11/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Directory Properties: stable/10/ (props changed) stable/12/ (props changed) Modified: stable/11/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c == --- stable/11/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Dec 1 17:59:41 2018(r341377) +++ stable/11/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Dec 1 18:09:17 2018(r341378) @@ -299,8 +299,7 @@ ipfdetach(softc) * Filter ioctl interface. */ int -ipfioctl(dev, cmd, data, mode -, p) +ipfioctl(dev, cmd, data, mode, p) struct thread *p; #definep_cred td_ucred #definep_uid td_ucred->cr_ruid ___ 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: r341378 - in stable: 10/sys/contrib/ipfilter/netinet 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet
Author: cy Date: Sat Dec 1 18:09:17 2018 New Revision: 341378 URL: https://svnweb.freebsd.org/changeset/base/341378 Log: MFC r340909: Combine two lines into one following unifdef for r255332. Modified: stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/11/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Directory Properties: stable/11/ (props changed) stable/12/ (props changed) Modified: stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c == --- stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Dec 1 17:59:41 2018(r341377) +++ stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Dec 1 18:09:17 2018(r341378) @@ -289,8 +289,7 @@ ipfdetach(softc) * Filter ioctl interface. */ int -ipfioctl(dev, cmd, data, mode -, p) +ipfioctl(dev, cmd, data, mode, p) struct thread *p; #definep_cred td_ucred #definep_uid td_ucred->cr_ruid ___ 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: r341379 - in stable: 10/sys/contrib/ipfilter/netinet 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet
Author: cy Date: Sat Dec 1 18:17:51 2018 New Revision: 341379 URL: https://svnweb.freebsd.org/changeset/base/341379 Log: MFC r340868: An OSF/1 ifdef makes absolutley no sense in a FreeBSD specific source file. Modified: stable/11/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Directory Properties: stable/10/ (props changed) stable/12/ (props changed) Modified: stable/11/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c == --- stable/11/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Dec 1 18:09:17 2018(r341378) +++ stable/11/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Dec 1 18:17:51 2018(r341379) @@ -66,9 +66,6 @@ static const char rcsid[] = "@(#)$Id$"; #defineVNET_DECLARE(_t, _v)extern _t _v #defineVNET(arg) arg #endif -#if defined(__osf__) -# include -#endif #include #include #include ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
