git: f8860353d4f4 - main - tcpdump: ppp: Use the buffer stack for the de-escaping buffer
The branch main has been updated by jrm:
URL:
https://cgit.FreeBSD.org/src/commit/?id=f8860353d4f4c25bacdae5bc1cfb7a95edc9bfe0
commit f8860353d4f4c25bacdae5bc1cfb7a95edc9bfe0
Author: Guy Harris
AuthorDate: 2024-09-03 17:11:16 +
Commit: Joseph Mingrone
CommitDate: 2024-09-03 17:24:16 +
tcpdump: ppp: Use the buffer stack for the de-escaping buffer
This both saves the buffer for freeing later and saves the packet
pointer and snapend to be restored when packet processing is complete,
even if an exception is thrown with longjmp.
This means that the hex/ASCII printing in pretty_print_packet()
processes the packet data as captured or read from the savefile, rather
than as modified by the PPP printer, so that the bounds checking is
correct.
That fixes CVE-2024-2397, which was caused by an exception being thrown
by the hex/ASCII printer (which should only happen if those routines are
called by a packet printer, not if they're called for the -X/-x/-A
flag), which jumps back to the setjmp() that surrounds the packet
printer. Hilarity^Winfinite looping ensues.
Also, restore ndo->ndo_packetp before calling the hex/ASCII printing
routine, in case nd_pop_all_packet_info() didn't restore it.
Reviewed by:emaste
---
contrib/tcpdump/print-ppp.c | 31 +--
contrib/tcpdump/print.c | 8 ++--
2 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/contrib/tcpdump/print-ppp.c b/contrib/tcpdump/print-ppp.c
index aba243ddb6f2..e5ae0646ebae 100644
--- a/contrib/tcpdump/print-ppp.c
+++ b/contrib/tcpdump/print-ppp.c
@@ -42,6 +42,8 @@
#include
#endif
+#include
+
#include "netdissect.h"
#include "extract.h"
#include "addrtoname.h"
@@ -1363,7 +1365,6 @@ ppp_hdlc(netdissect_options *ndo,
u_char *b, *t, c;
const u_char *s;
u_int i, proto;
- const void *sb, *se;
if (caplen == 0)
return;
@@ -1371,9 +1372,11 @@ ppp_hdlc(netdissect_options *ndo,
if (length == 0)
return;
- b = (u_char *)nd_malloc(ndo, caplen);
- if (b == NULL)
- return;
+ b = (u_char *)malloc(caplen);
+ if (b == NULL) {
+ (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
+ "%s: malloc", __func__);
+ }
/*
* Unescape all the data into a temporary, private, buffer.
@@ -1394,13 +1397,15 @@ ppp_hdlc(netdissect_options *ndo,
}
/*
-* Change the end pointer, so bounds checks work.
-* Change the pointer to packet data to help debugging.
+* Switch to the output buffer for dissection, and save it
+* on the buffer stack so it can be freed; our caller must
+* pop it when done.
*/
- sb = ndo->ndo_packetp;
- se = ndo->ndo_snapend;
- ndo->ndo_packetp = b;
- ndo->ndo_snapend = t;
+ if (!nd_push_buffer(ndo, b, b, (u_int)(t - b))) {
+ free(b);
+ (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
+ "%s: can't push buffer on buffer stack", __func__);
+ }
length = ND_BYTES_AVAILABLE_AFTER(b);
/* now lets guess about the payload codepoint format */
@@ -1442,13 +1447,11 @@ ppp_hdlc(netdissect_options *ndo,
}
cleanup:
- ndo->ndo_packetp = sb;
- ndo->ndo_snapend = se;
+ nd_pop_packet_info(ndo);
return;
trunc:
- ndo->ndo_packetp = sb;
- ndo->ndo_snapend = se;
+ nd_pop_packet_info(ndo);
nd_print_trunc(ndo);
}
diff --git a/contrib/tcpdump/print.c b/contrib/tcpdump/print.c
index 41a6b524fbf8..96d34b772f08 100644
--- a/contrib/tcpdump/print.c
+++ b/contrib/tcpdump/print.c
@@ -434,10 +434,14 @@ pretty_print_packet(netdissect_options *ndo, const struct
pcap_pkthdr *h,
nd_pop_all_packet_info(ndo);
/*
-* Restore the original snapend, as a printer might have
-* changed it.
+* Restore the originals snapend and packetp, as a printer
+* might have changed them.
+*
+* XXX - nd_pop_all_packet_info() should have restored the
+* original values, but, just in case
*/
ndo->ndo_snapend = sp + h->caplen;
+ ndo->ndo_packetp = sp;
if (ndo->ndo_Xflag) {
/*
* Print the raw packet data in hex and ASCII.
git: afdbf109c6a6 - main - libpcap: Update to 1.10.5
The branch main has been updated by jrm:
URL:
https://cgit.FreeBSD.org/src/commit/?id=afdbf109c6a661a729938f68211054a0a50d38ac
commit afdbf109c6a661a729938f68211054a0a50d38ac
Merge: 92adaa5862d5 025be3f592b9
Author: Joseph Mingrone
AuthorDate: 2024-09-14 17:09:34 +
Commit: Joseph Mingrone
CommitDate: 2024-09-14 17:09:34 +
libpcap: Update to 1.10.5
Changes:
https://git.tcpdump.org/libpcap/blob/bbcbc9174df3298a854daee2b3e666a4b6e5383a:/CHANGES
Reviewed by:emaste
Obtained from: https://www.tcpdump.org/release/libpcap-1.10.5.tar.gz
Sponsored by: The FreeBSD Foundation
contrib/libpcap/CHANGES| 181 +-
contrib/libpcap/CMakeLists.txt | 1021 +-
contrib/libpcap/CREDITS|17 +
contrib/libpcap/INSTALL.md |84 +-
contrib/libpcap/Makefile.in| 168 +-
contrib/libpcap/TODO | 5 -
contrib/libpcap/VERSION| 2 +-
contrib/libpcap/aclocal.m4 | 227 +-
contrib/libpcap/atmuni31.h | 2 +-
contrib/libpcap/autogen.sh |25 +
contrib/libpcap/bpf_dump.c | 2 -
contrib/libpcap/bpf_filter.c |16 +-
contrib/libpcap/bpf_image.c| 6 +-
contrib/libpcap/charconv.c | 4 +-
contrib/libpcap/cmake/Modules/Finddpdk.cmake | 2 +-
contrib/libpcap/cmakeconfig.h.in | 6 +-
contrib/libpcap/config.guess |62 +-
contrib/libpcap/config.h.in|28 +-
contrib/libpcap/config.sub | 230 +-
contrib/libpcap/configure | 10815 ++-
contrib/libpcap/configure.ac | 145 +-
contrib/libpcap/diag-control.h | 174 +-
contrib/libpcap/dlpisubs.c |22 +-
contrib/libpcap/doc/README.haiku.md|57 +
contrib/libpcap/doc/README.hpux| 2 +-
.../doc/{README.Win32.md => README.windows.md} | 0
contrib/libpcap/etherent.c | 6 +-
contrib/libpcap/extract.h | 2 +-
contrib/libpcap/fad-getad.c|30 +-
contrib/libpcap/fad-gifc.c |24 +-
contrib/libpcap/fad-glifc.c|28 +-
contrib/libpcap/fmtutils.c |59 +-
contrib/libpcap/fmtutils.h |10 +-
contrib/libpcap/ftmacros.h | 4 +-
contrib/libpcap/gencode.c | 596 +-
contrib/libpcap/gencode.h | 4 +-
contrib/libpcap/grammar.y.in | 140 +-
contrib/libpcap/install-sh | 689 +-
contrib/libpcap/missing/asprintf.c | 8 +-
contrib/libpcap/missing/strlcat.c | 6 +-
contrib/libpcap/missing/strlcpy.c | 6 +-
contrib/libpcap/missing/strtok_r.c | 4 +-
contrib/libpcap/missing/win_asprintf.c | 6 +-
contrib/libpcap/mkdep |28 +-
contrib/libpcap/msdos/makefile | 2 +-
contrib/libpcap/msdos/makefile.dj | 4 +-
contrib/libpcap/msdos/makefile.wc | 6 +-
contrib/libpcap/msdos/pktdrvr.c| 2 +-
contrib/libpcap/msdos/pktdrvr.h| 2 +-
contrib/libpcap/msdos/readme.dos | 4 +-
contrib/libpcap/nametoaddr.c |57 +-
contrib/libpcap/nlpid.h| 2 +-
contrib/libpcap/optimize.c |34 +-
contrib/libpcap/pcap-airpcap.c |53 +-
contrib/libpcap/pcap-bpf.c | 417 +-
contrib/libpcap/pcap-bt-linux.c|56 +-
contrib/libpcap/pcap-bt-monitor-linux.c|38 +-
contrib/libpcap/pcap-common.c | 405 +-
contrib/libpcap/pcap-config.1 | 108 +-
contrib/libpcap/pcap-config.in |11 +-
contrib/libpcap/pcap-dag.c | 103 +-
contrib/libpcap/pcap-dbus.c|12 +-
contrib/libpcap/pcap-dlpi.c|72 +-
contrib/libpcap/pcap-dos.c |22 +-
contrib/libpcap/pcap-dpdk.c|32 +-
contrib/libpcap/pcap-enet.c| 6 +-
contrib/libpcap/pcap-filter.manmisc.in |15 +-
contrib/libpcap/pcap-haiku.c | 504 +
contrib/libpcap/pcap-haiku.cpp | 305 -
cont
git: 407a9cced684 - main - ObsoleteFiles.inc: Update after libpcap upgrade from 1.10.4 to 1.10.5
The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=407a9cced68440ce86f1c5d86c57e6b4ec3e4618 commit 407a9cced68440ce86f1c5d86c57e6b4ec3e4618 Author: Joseph Mingrone AuthorDate: 2024-09-14 17:13:23 + Commit: Joseph Mingrone CommitDate: 2024-09-14 17:19:26 + ObsoleteFiles.inc: Update after libpcap upgrade from 1.10.4 to 1.10.5 Sponsored by: The FreeBSD Foundation --- ObsoleteFiles.inc | 5 + 1 file changed, 5 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 29cfdc05a3d3..2686086970ce 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,11 @@ # xargs -n1 | sort | uniq -d; # done +# 20240914 libpcap upgrade from 1.10.4 to 1.10.5 +OLD_FILES+=contrib/libpcap/pcap-haiku.cpp +OLD_FILES+=contrib/libpcap/pcap-rpcap-int.h +OLD_FILES+=contrib/libpcap/pcap-usb-linux-common.c + # 20240827: retire fips.so OLD_LIBS+=usr/lib/ossl-modules/fips.so
git: ecb75be376a3 - main - libpcap: Add changes missed in update to 1.10.5
The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=ecb75be376a3e18d3e4836b6ee07015264784694 commit ecb75be376a3e18d3e4836b6ee07015264784694 Author: Joseph Mingrone AuthorDate: 2024-09-14 17:33:19 + Commit: Joseph Mingrone CommitDate: 2024-09-14 17:35:58 + libpcap: Add changes missed in update to 1.10.5 Fixes: afdbf109c6 (libpcap: Update to 1.10.5) Sponsored by: The FreeBSD Foundation --- lib/libpcap/Makefile | 1 - lib/libpcap/config.h | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile index 792f0ff24e8a..9ba91504852b 100644 --- a/lib/libpcap/Makefile +++ b/lib/libpcap/Makefile @@ -19,7 +19,6 @@ SRCS= bpf_dump.c \ pcap-bpf.c \ pcap-common.c \ pcap-netmap.c \ - pcap-usb-linux-common.c \ pcap-util.c \ pcap.c \ savefile.c \ diff --git a/lib/libpcap/config.h b/lib/libpcap/config.h index 132b9bb29183..cea0cc4fd7cb 100644 --- a/lib/libpcap/config.h +++ b/lib/libpcap/config.h @@ -183,7 +183,7 @@ #define PACKAGE_NAME "pcap" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "pcap 1.10.4" +#define PACKAGE_STRING "pcap 1.10.5" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "pcap" @@ -192,7 +192,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.10.4" +#define PACKAGE_VERSION "1.10.5" /* target host supports netmap */ #define PCAP_SUPPORT_NETMAP 1
git: f0bcebe67ef6 - main - pflogd: Define structures removed in libpcap-1.10.5
The branch main has been updated by jrm:
URL:
https://cgit.FreeBSD.org/src/commit/?id=f0bcebe67ef6cf9f104535d6cd9f151c1b61dd6a
commit f0bcebe67ef6cf9f104535d6cd9f151c1b61dd6a
Author: Joseph Mingrone
AuthorDate: 2024-09-14 19:52:36 +
Commit: Joseph Mingrone
CommitDate: 2024-09-14 20:28:27 +
pflogd: Define structures removed in libpcap-1.10.5
In libpcap-1.10.5, two structures that we rely on, pcap_timeval and
pcap_sf_pkthdr, were made private.
https://github.com/the-tcpdump-group/libpcap/commit/c2d8cbb977963be1f6cb07863e5bb59609e87fae
Temporarily define them here to fix the build. kp and I will
investigate a permanent solution at EuroBSDCon in Dublin.
Reviewed by:kp
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D46676
---
contrib/pf/pflogd/pflogd.h | 13 +
1 file changed, 13 insertions(+)
diff --git a/contrib/pf/pflogd/pflogd.h b/contrib/pf/pflogd/pflogd.h
index 596e69692614..6e6b588d24bf 100644
--- a/contrib/pf/pflogd/pflogd.h
+++ b/contrib/pf/pflogd/pflogd.h
@@ -40,6 +40,19 @@ int priv_open_log(void);
intpriv_move_log(void);
pcap_t *pcap_open_live_fd(int fd, int snaplen, char *ebuf);
+/* XXX TODO: Investigate a permanent solution, rather than defining these two
+ structures here. */
+struct pcap_timeval {
+ bpf_u_int32 tv_sec; /* seconds */
+ bpf_u_int32 tv_usec;/* microseconds */
+};
+
+struct pcap_sf_pkthdr {
+ struct pcap_timeval ts; /* time stamp */
+ bpf_u_int32 caplen; /* length of portion present */
+ bpf_u_int32 len;/* length of this packet (off wire) */
+};
+
void set_pcap_filter(void);
/* File descriptor send/recv */
void send_fd(int, int);
git: 5cafc38f1129 - main - adduser: Fix a syntax error
The branch main has been updated by jrm:
URL:
https://cgit.FreeBSD.org/src/commit/?id=5cafc38f11297cb302514f3cedb703a3ed199a22
commit 5cafc38f11297cb302514f3cedb703a3ed199a22
Author: Joseph Mingrone
AuthorDate: 2024-04-22 19:04:13 +
Commit: Joseph Mingrone
CommitDate: 2024-04-22 19:06:38 +
adduser: Fix a syntax error
Reported by:Jose Luis Duran
Fixes: b37333899bd2
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D44871
---
usr.sbin/adduser/adduser.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/usr.sbin/adduser/adduser.sh b/usr.sbin/adduser/adduser.sh
index d1c9e12098f7..9739b2e589fa 100644
--- a/usr.sbin/adduser/adduser.sh
+++ b/usr.sbin/adduser/adduser.sh
@@ -477,8 +477,7 @@ get_zfs_home() {
# check if zfs kernel module is loaded before attempting to run zfs to
# prevent loading the kernel module on systems that don't use ZFS
- if ! "$KLDSTATCMD" -q -m zfs ||
- Zcreate="no"
+ if ! "$KLDSTATCMD" -q -m zfs || Zcreate="no"; then
return
fi
if ! _prefix=$(${ZFSCMD} list -Ho name "${homeprefix}" 2>/dev/null) ||
git: b30a7e5418be - main - bhyve.8: Update and rearrange to improve readability
The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=b30a7e5418be5c5d27ac967f5ce99461ab79c37c commit b30a7e5418be5c5d27ac967f5ce99461ab79c37c Author: Chris Moerz AuthorDate: 2024-04-26 18:23:13 + Commit: Joseph Mingrone CommitDate: 2024-04-28 03:18:35 + bhyve.8: Update and rearrange to improve readability bhyve's man page is a very long block of text that has grown to proportions that make it hard to read. In particular, the level of nesting of various content means man can no longer render the text in a user-friendly way. To remedy this: - move the -s argument documentation into a separate section and reformat the various arguments so they are consistent - add documentation on how to use the -o config.dump feature - make the listing of various arguments more consistent - consolidated duplicate listings of TPM backends - add an example for the config.dump feature - fix various formatting inconsistencies. Reviewed by:emaste, imp, jrm, Pau Amma , rgrimes Differential Revision: https://reviews.freebsd.org/D43940 --- usr.sbin/bhyve/bhyve.8 | 249 ++--- 1 file changed, 151 insertions(+), 98 deletions(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index 42ba328451a9..527ccf720540 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 10, 2024 +.Dd April 26, 2024 .Dt BHYVE 8 .Os .Sh NAME @@ -356,10 +356,45 @@ If not specified, the .Ar bus value defaults to 0. .Pp -The +See +.Sx "PCI EMULATION" +for available options for the +.Ar emulation +argument. +.It Fl U Ar uuid +Set the universally unique identifier +.Pq UUID +in the guest's System Management BIOS System Information structure. +By default a UUID is generated from the host's hostname and +.Ar vmname . +.It Fl u +RTC keeps UTC time. +.It Fl W +Force virtio PCI device emulations to use MSI interrupts instead of MSI-X +interrupts. +.It Fl w +Ignore accesses to unimplemented Model Specific Registers (MSRs). +This is intended for debug purposes. +.It Fl x +The guest's local APIC is configured in x2APIC mode. +This option applies only to the amd64 platform. +.It Fl Y +Disable MPtable generation. +This option applies only to the amd64 platform. +.It Ar vmname +Alphanumeric name of the guest. +This should be the same as that created by +.Xr bhyveload 8 . +.El +.Sh PCI EMULATION +.Nm +provides emulation for various PCI devices. +They are specified by the +.Fl s +.Ar slot,emulation,conf +configuration's .Ar emulation -argument -can be one of the following: +argument, which can be one of the following: .Bl -tag -width "amd_hostbridge" .It Cm hostbridge A simple host bridge. @@ -400,7 +435,7 @@ PCI 16550 serial device. .It Cm lpc LPC PCI-ISA bridge with COM1, COM2, COM3, and COM4 16550 serial ports, a boot ROM, and, -optionally, a fwcfg type and the debug/test device. +optionally, a fwcfg type, and the debug/test device. The LPC bridge emulation can only be configured on bus 0. .It Cm fbuf Raw framebuffer device attached to VNC server. @@ -419,8 +454,7 @@ If .Ar conf is not specified, the device emulation has no backend and can be considered unconnected. -.Pp -Network device backends: +.Ss Network device backends .Sm off .Bl -bullet .It @@ -452,7 +486,7 @@ Network device backends: .Pp If .Cm mac -is not specified, the MAC address is derived from a fixed OUI and the +is not specified, the MAC address is derived from a fixed OUI, and the remaining bytes from an MD5 hash of the slot and function numbers and the device name. .Pp @@ -503,16 +537,15 @@ forwarded to the guest. Multiple rules can be specified, separated by semicolons. Note that semicolons must be escaped or quoted to prevent the shell from interpreting them. -.Pp -Block storage device backends: -.Sm off +.Ss Block storage device backends: .Bl -bullet +.Sm off .It .Ar /filename Op Cm \&, Ar block-device-options .It .Ar /dev/xxx Op Cm \&, Ar block-device-options -.El .Sm on +.El .Pp The .Ar block-device-options @@ -541,14 +574,13 @@ A fwcfg file is used to specify the bootorder. The guest firmware may ignore or doesn't support this fwcfg file. In that case, this feature doesn't work as expected. .El -.Pp -SCSI device backends: -.Sm off +.Ss SCSI device backends .Bl -bullet +.Sm off .It .Pa /dev/cam/ctl Oo Ar pp Cm \&. Ar vp Oc Oo Cm \&, Ar scsi-device-options Oc -.El .Sm on +.El .Pp The .Ar scsi-device-options @@ -564,14 +596,13 @@ A fwcfg file is used to specify the bootorder. The guest firmware may ignore or doesn't support this fwcfg file. In that case, this feature doesn't work as expected. .El -.Pp -9P device backends: -.Sm
git: 27358245644c - main - freebsd-tips: Add fortune to find font providing Unicode character
The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=27358245644c2a8bf2b57182e2fcd8cdf18d6b8d commit 27358245644c2a8bf2b57182e2fcd8cdf18d6b8d Author: Joseph Mingrone AuthorDate: 2024-05-13 18:38:13 + Commit: Joseph Mingrone CommitDate: 2024-05-13 23:02:17 + freebsd-tips: Add fortune to find font providing Unicode character Reviewed by:emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45183 --- usr.bin/fortune/datfiles/freebsd-tips | 14 ++ 1 file changed, 14 insertions(+) diff --git a/usr.bin/fortune/datfiles/freebsd-tips b/usr.bin/fortune/datfiles/freebsd-tips index 028a9e9b1430..e24d3640b8c6 100644 --- a/usr.bin/fortune/datfiles/freebsd-tips +++ b/usr.bin/fortune/datfiles/freebsd-tips @@ -845,3 +845,17 @@ kern.tty_info_kstacks to 0 (off), 1 (on), or 2 (verbose), e.g.: -- Michael Gmelin % + +Under X Windows, you can determine which fonts provide a particular Unicode +character using fc-list from the fontconfig package. For example, if your +friend complains that the emoji you sent won't display, run fc-list with the hex +value of the character to determine which font your friend should install. + +$ fc-list ':charset=0x1F4A1' +/usr/local/share/fonts/noto/NotoColorEmoji.ttf: Noto Color Emoji:style=Regular + +$ pkg which /usr/local/share/fonts/noto/NotoColorEmoji.ttf +/usr/local/share/fonts/noto/NotoColorEmoji.ttf was installed by package noto-emoji-2.042_1 + + -- Joe Mingrone +%
Re: git: 27358245644c - main - freebsd-tips: Add fortune to find font providing Unicode character
On Tue, 2024-05-14 at 08:55, Baptiste Daroussin wrote: > On Mon 13 May 23:02, Joseph Mingrone wrote: >> The branch main has been updated by jrm: >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=27358245644c2a8bf2b57182e2fcd8cdf18d6b8d >> commit 27358245644c2a8bf2b57182e2fcd8cdf18d6b8d >> Author: Joseph Mingrone >> AuthorDate: 2024-05-13 18:38:13 + >> Commit: Joseph Mingrone >> CommitDate: 2024-05-13 23:02:17 + >> freebsd-tips: Add fortune to find font providing Unicode character >> Reviewed by:emaste >> Sponsored by: The FreeBSD Foundation >> Differential Revision: https://reviews.freebsd.org/D45183 >> --- >> usr.bin/fortune/datfiles/freebsd-tips | 14 ++ >> 1 file changed, 14 insertions(+) >> diff --git a/usr.bin/fortune/datfiles/freebsd-tips >> b/usr.bin/fortune/datfiles/freebsd-tips >> index 028a9e9b1430..e24d3640b8c6 100644 >> --- a/usr.bin/fortune/datfiles/freebsd-tips >> +++ b/usr.bin/fortune/datfiles/freebsd-tips >> @@ -845,3 +845,17 @@ kern.tty_info_kstacks to 0 (off), 1 (on), or 2 >> (verbose), e.g.: >> -- Michael Gmelin >> % >> + >> +Under X Windows, you can determine which fonts provide a particular Unicode >> +character using fc-list from the fontconfig package. For example, if your >> +friend complains that the emoji you sent won't display, run fc-list with >> the hex >> +value of the character to determine which font your friend should install. > This has nothing to do with X window, it is valid for anything that can use > fontconfig, which does not include xorg, but the toolkits or the libraries > which > needs to deal with fonts, for instance many non "X windows" applications, > depends on fontconfig and this tips is valide for them, for example for > libraries producing podofo or poppler can use fontconfig to decide which font > to > embeded in the pdf document. > In my opinion the "Under X Windows" should be removed from this tips. The objective was to strike a balance between utmost precision and succinctness, so the tip is helpful. Indeed, fontconfig is not directly tied to X windows, but for practical purposes, I presumed the vast majority of user-facing applications using fontconfig run under X Windows (now that Wayland is a thing, I should have used a more generic phrase like "Under a graphical environment..."). Removing the qualifier seems to imply fc-list will always be useful, which isn't the case. Does the tweaked text that includes 'may be helpful' work for you? Joe ### To determine which fonts provide a particular Unicode character, fc-list from the fontconfig package may be helpful. For example, if your friend complains that the emoji you sent won't display, run fc-list with the hex value of the character to determine which font your friend should install. $ fc-list ':charset=0x1F4A1' /usr/local/share/fonts/noto/NotoColorEmoji.ttf: Noto Color Emoji:style=Regular $ pkg which /usr/local/share/fonts/noto/NotoColorEmoji.ttf /usr/local/share/fonts/noto/NotoColorEmoji.ttf was installed by package noto-emoji-2.042 signature.asc Description: PGP signature
git: ea3751fb53b2 - main - freebsd-tips: Tweak fortune to find font providing Unicode character
The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=ea3751fb53b21a1e8daaf157cb90a69996e4fe2d commit ea3751fb53b21a1e8daaf157cb90a69996e4fe2d Author: Joseph Mingrone AuthorDate: 2024-05-15 14:26:25 + Commit: Joseph Mingrone CommitDate: 2024-05-15 14:34:39 + freebsd-tips: Tweak fortune to find font providing Unicode character While here, remove my name and email address. Reported by:bapt Sponsored by: The FreeBSD Foundation --- usr.bin/fortune/datfiles/freebsd-tips | 13 + 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/usr.bin/fortune/datfiles/freebsd-tips b/usr.bin/fortune/datfiles/freebsd-tips index e24d3640b8c6..c0807405005e 100644 --- a/usr.bin/fortune/datfiles/freebsd-tips +++ b/usr.bin/fortune/datfiles/freebsd-tips @@ -845,17 +845,14 @@ kern.tty_info_kstacks to 0 (off), 1 (on), or 2 (verbose), e.g.: -- Michael Gmelin % - -Under X Windows, you can determine which fonts provide a particular Unicode -character using fc-list from the fontconfig package. For example, if your -friend complains that the emoji you sent won't display, run fc-list with the hex -value of the character to determine which font your friend should install. +To determine which fonts provide a particular Unicode character, fc-list from +the fontconfig package may be helpful. For example, if your friend complains +that the emoji you sent won't display, run fc-list with the hex value of the +character to determine which font your friend should install. $ fc-list ':charset=0x1F4A1' /usr/local/share/fonts/noto/NotoColorEmoji.ttf: Noto Color Emoji:style=Regular $ pkg which /usr/local/share/fonts/noto/NotoColorEmoji.ttf -/usr/local/share/fonts/noto/NotoColorEmoji.ttf was installed by package noto-emoji-2.042_1 - - -- Joe Mingrone +/usr/local/share/fonts/noto/NotoColorEmoji.ttf was installed by package noto-emoji-2.042 %
git: c80c104cbd52 - main - glabel.8: Describe cases related to permissions / existing mounts
The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=c80c104cbd52db994c0f2757bd1c6d014744022c commit c80c104cbd52db994c0f2757bd1c6d014744022c Author: Chris Moerz AuthorDate: 2024-05-21 18:10:11 + Commit: Joseph Mingrone CommitDate: 2024-05-21 18:49:17 + glabel.8: Describe cases related to permissions / existing mounts Specially, note some requirements for label changes: - glabel requires write permission on device - filesystems first need to be unmounted for new labels to persist across reboots - if the affected device node holds the filesystem root, single-user mode with r/o mount will be required. Also, while here, apply some formatting tweaks. PR: 276724 Reported by:Alex Matei Reviewed by:gbe, jrm, Alexander Ziaee Differential Revision: https://reviews.freebsd.org/D44394 --- lib/geom/label/glabel.8 | 25 +++-- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/lib/geom/label/glabel.8 b/lib/geom/label/glabel.8 index d6f253342905..da958b52befd 100644 --- a/lib/geom/label/glabel.8 +++ b/lib/geom/label/glabel.8 @@ -137,7 +137,7 @@ e.g. .Pa /dev/diskid/DISK-6QG3Z026 . .Pp Generic labels created and managed solely by -.Xr glabel 8 +.Nm are created in the .Pa /dev/label/ directory. @@ -164,7 +164,8 @@ device will be one sector smaller than the device from which it was created. .Pp Note that for all label types, nested GEOM classes will cause additional device nodes to be created, with context-specific data appended to their -names. E.g. for every node like +names. +E.g. for every node like .Pa /dev/label/bigdisk there will be additional entries for any partitions which the device contains, like @@ -172,6 +173,17 @@ contains, like and .Pa /dev/label/bigdiskp1a . .Pp +.Nm +requires write access to a device to create, modify, and destroy +"automatic" labels. +It will fail to persist changes if they are applied while a file +system on the device is currently mounted. +To ensure that modifications are stored across a reboot, the file system +needs to be unmounted first. +If the device holds the system's root file system, entering into +single user mode and mounting in read-only mode is required to persist +the change. +.Pp The first argument to .Nm indicates an action to be performed: @@ -252,12 +264,13 @@ Most .Nm LABEL providers implement a .Xr sysctl 8 -flag and a tunable variable named in the above format. This flag -controls if the label provider will be active, tasting devices +flag and a tunable variable named in the above format. +This flag controls if the label provider will be active, tasting devices and creating label nodes in the .Xr devfs 4 -tree. It is sometimes desirable to disable certain label types if -they conflict with other classes in complex GEOM topologies. +tree. +It is sometimes desirable to disable certain label types if they +conflict with other classes in complex GEOM topologies. .El .Sh EXIT STATUS Exit status is 0 on success, and 1 if the command fails.
git: 4b3bf909005a - main - mfc-candidates.sh: Set default target branch for ports
The branch main has been updated by jrm (ports committer):
URL:
https://cgit.FreeBSD.org/src/commit/?id=4b3bf909005a8b89d55fb27b8dde6128dda61751
commit 4b3bf909005a8b89d55fb27b8dde6128dda61751
Author: Joseph Mingrone
AuthorDate: 2022-05-04 19:43:20 +
Commit: Joseph Mingrone
CommitDate: 2022-05-04 19:43:20 +
mfc-candidates.sh: Set default target branch for ports
Approved by:emaste, jhb
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D35096
---
tools/tools/git/mfc-candidates.sh | 39 ++-
1 file changed, 26 insertions(+), 13 deletions(-)
diff --git a/tools/tools/git/mfc-candidates.sh
b/tools/tools/git/mfc-candidates.sh
index 623edc7174a1..45f3b645e4ba 100644
--- a/tools/tools/git/mfc-candidates.sh
+++ b/tools/tools/git/mfc-candidates.sh
@@ -30,21 +30,34 @@
# SUCH DAMAGE.
from_branch=freebsd/main
-to_branch=freebsd/stable/13
author="${USER}"
-# If pwd is a stable or release branch tree, default to it.
-cur_branch=$(git symbolic-ref --short HEAD 2>/dev/null)
-case $cur_branch in
-stable/*)
- to_branch=$cur_branch
- ;;
-releng/*)
- to_branch=$cur_branch
- major=${cur_branch#releng/}
- major=${major%.*}
- from_branch=freebsd/stable/$major
-esac
+# Get the FreeBSD repository
+repo=$(basename "$(git remote get-url freebsd 2>/dev/null)" 2>/dev/null)
+
+if [ "${repo}" = "ports.git" ]; then
+ year=$(date '+%Y')
+ month=$(date '+%m')
+ qtr=$(((month-1) / 3 + 1))
+ to_branch="freebsd/${year}Q${qtr}"
+elif [ "${repo}" = "src.git" ]; then
+ to_branch=freebsd/stable/13
+ # If pwd is a stable or release branch tree, default to it.
+ cur_branch=$(git symbolic-ref --short HEAD 2>/dev/null)
+ case $cur_branch in
+ stable/*)
+ to_branch=$cur_branch
+ ;;
+ releng/*)
+ to_branch=$cur_branch
+ major=${cur_branch#releng/}
+ major=${major%.*}
+ from_branch=freebsd/stable/$major
+ esac
+else
+ echo "pwd is not under a ports or src repository."
+ exit 0
+fi
params()
{
git: 0c59e0b4e581 - main - pflogd: Do not access obsolete structure member pcap.tzoff
The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=0c59e0b4e5817f139ce28486085b2f196351c7a3 commit 0c59e0b4e5817f139ce28486085b2f196351c7a3 Author: Joseph Mingrone AuthorDate: 2023-03-30 16:18:28 + Commit: Joseph Mingrone CommitDate: 2023-03-30 18:58:45 + pflogd: Do not access obsolete structure member pcap.tzoff This change is in preparation for a libpcap update. See also: https://github.com/the-tcpdump-group/libpcap/commit/d4d65e7c4c0a6233784b346dcb0ebb7e23a3feaa Reviewed by:emaste Sponsored by: The FreeBSD Foundation --- contrib/pf/pflogd/pflogd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/pf/pflogd/pflogd.c b/contrib/pf/pflogd/pflogd.c index de8d4acfa585..2b1b0df769a7 100644 --- a/contrib/pf/pflogd/pflogd.c +++ b/contrib/pf/pflogd/pflogd.c @@ -375,7 +375,7 @@ try_reset_dump(int nomove) hdr.magic = TCPDUMP_MAGIC; hdr.version_major = PCAP_VERSION_MAJOR; hdr.version_minor = PCAP_VERSION_MINOR; - hdr.thiszone = hpcap->tzoff; + hdr.thiszone = 0; hdr.snaplen = hpcap->snapshot; hdr.sigfigs = 0; hdr.linktype = hpcap->linktype;
git: 512c553671be - main - tcpdump: Backport a fix required for upcoming libpcap update
The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=512c553671bef26e93342d4ae1ec5f60d8ae112b commit 512c553671bef26e93342d4ae1ec5f60d8ae112b Author: Joseph Mingrone AuthorDate: 2023-03-30 21:41:09 + Commit: Joseph Mingrone CommitDate: 2023-03-30 22:52:10 + tcpdump: Backport a fix required for upcoming libpcap update See also: https://github.com/the-tcpdump-group/tcpdump/commit/51f9c3b947eac89254c4e3662902487e0844a699 Reviewed by:emaste Sponsored by: The FreeBSD Foundation --- contrib/tcpdump/interface.h | 6 ++ 1 file changed, 6 insertions(+) diff --git a/contrib/tcpdump/interface.h b/contrib/tcpdump/interface.h index 46d338b4af24..cbe1851c5bb8 100644 --- a/contrib/tcpdump/interface.h +++ b/contrib/tcpdump/interface.h @@ -73,7 +73,13 @@ extern char *program_name; /* used to generate self-identifying messages */ #ifndef HAVE_BPF_DUMP struct bpf_program; +#endif +/* + * With Capsicum bpf_dump() may be not declared even if HAVE_BPF_DUMP is set. + */ +#if !defined(HAVE_BPF_DUMP) || \ +(defined(HAVE_BPF_DUMP) && HAVE_CAPSICUM && !defined(bpf_dump)) extern void bpf_dump(const struct bpf_program *, int); #endif
git: 6f9cba8f8b5e - main - libpcap: Update to 1.10.3
The branch main has been updated by jrm:
URL:
https://cgit.FreeBSD.org/src/commit/?id=6f9cba8f8b5efd16249633e52483ea351876b67b
commit 6f9cba8f8b5efd16249633e52483ea351876b67b
Merge: d860991a7289 35af88c96350
Author: Joseph Mingrone
AuthorDate: 2023-03-31 19:01:44 +
Commit: Joseph Mingrone
CommitDate: 2023-03-31 19:02:22 +
libpcap: Update to 1.10.3
Local changes:
- In contrib/libpcap/pcap/bpf.h, do not include pcap/dlt.h. Our system
net/dlt.h is pulled in from net/bpf.h.
- sys/net/dlt.h: Incorporate changes from libpcap 1.10.3.
- lib/libpcap/Makefile: Update for libpcap 1.10.3.
Changelog:
https://git.tcpdump.org/libpcap/blob/95691ebe7564afa3faa5c6ba0dbd17e351be455a:/CHANGES
Reviewed by:emaste
Obtained from: https://www.tcpdump.org/release/libpcap-1.10.3.tar.gz
Sponsored by: The FreeBSD Foundation
contrib/libpcap/CHANGES| 448 +-
contrib/libpcap/CMakeLists.txt | 1627 -
contrib/libpcap/CONTRIBUTING.md|6 +-
contrib/libpcap/CREDITS| 83 +-
contrib/libpcap/INSTALL.md | 481 +-
contrib/libpcap/Makefile-devel-adds|4 +-
contrib/libpcap/Makefile.in| 175 +-
contrib/libpcap/README.md | 73 +-
contrib/libpcap/TODO |2 -
contrib/libpcap/VERSION|2 +-
contrib/libpcap/Win32/Prj/wpcap.sln| 28 -
contrib/libpcap/Win32/Prj/wpcap.vcxproj| 233 -
contrib/libpcap/Win32/Prj/wpcap.vcxproj.filters| 107 -
contrib/libpcap/aclocal.m4 | 585 +-
contrib/libpcap/atmuni31.h |2 +-
contrib/libpcap/bpf_filter.c | 86 +-
contrib/libpcap/bpf_image.c| 156 +-
contrib/libpcap/charconv.c | 217 +
contrib/libpcap/charconv.h | 44 +
contrib/libpcap/cmake/Modules/FindAirPcap.cmake| 69 +
contrib/libpcap/cmake/Modules/FindDAG.cmake|7 +
contrib/libpcap/cmake/Modules/FindPacket.cmake | 63 +-
contrib/libpcap/cmake/Modules/FindSNF.cmake|6 +
contrib/libpcap/cmake/Modules/Finddpdk.cmake | 118 +
contrib/libpcap/cmakeconfig.h.in | 85 +-
contrib/libpcap/config.guess | 1510 +++--
contrib/libpcap/config.h.in| 96 +-
contrib/libpcap/config.sub | 1686 ++---
contrib/libpcap/configure | 6968 ++--
contrib/libpcap/configure.ac | 1684 +++--
contrib/libpcap/diag-control.h | 241 +-
contrib/libpcap/dlpisubs.c | 31 +-
contrib/libpcap/doc/DLT_ALLOCATE_HOWTO.md | 29 -
contrib/libpcap/doc/README.Win32.md| 199 +-
contrib/libpcap/doc/README.aix | 24 +-
contrib/libpcap/doc/README.dag |6 +-
contrib/libpcap/doc/README.hpux| 10 +-
contrib/libpcap/doc/README.linux | 36 +
contrib/libpcap/doc/README.linux.md| 108 -
contrib/libpcap/doc/README.septel |4 +-
contrib/libpcap/doc/README.sita| 13 +-
contrib/libpcap/doc/README.solaris.md | 58 +
contrib/libpcap/doc/README.tru64 | 49 -
contrib/libpcap/etherent.c | 20 +-
contrib/libpcap/ethertype.h| 38 +-
contrib/libpcap/extract.h | 302 +-
contrib/libpcap/fad-getad.c|3 +-
contrib/libpcap/fad-gifc.c | 10 +-
contrib/libpcap/fad-glifc.c|3 +-
contrib/libpcap/fmtutils.c | 308 +-
contrib/libpcap/fmtutils.h |8 +
contrib/libpcap/ftmacros.h | 28 +-
contrib/libpcap/gencode.c | 1045 ++-
contrib/libpcap/gencode.h | 82 +-
contrib/libpcap/{grammar.y => grammar.y.in}| 246 +-
contrib/libpcap/ieee80211.h|2 +-
contrib/libpcap/lbl/os-osf4.h |4 +-
contrib/libpcap/lbl/os-osf5.h |6 +-
contrib/libpcap/lbl/os-solaris2.h |2 +-
contrib/libpcap/lbl/os-sunos4.h|2 +-
contrib/libpcap/libpcap.pc.in |5 +-
contrib/libpcap/missing/asprintf.c |2 +-
contrib/libpcap/missing/getopt.c | 17 +-
contrib/libpcap/missing/snprintf.c | 631 --
contrib/libpcap/missing/win_asprintf.c |4 +-
contrib/libpcap/missing/win_snprint
git: dd744a896be3 - main - libpcap: Update to 1.10.4
The branch main has been updated by jrm:
URL:
https://cgit.FreeBSD.org/src/commit/?id=dd744a896be358d6f001766188da6aed80e00378
commit dd744a896be358d6f001766188da6aed80e00378
Merge: b10e100d1696 6b96668d5b49
Author: Joseph Mingrone
AuthorDate: 2023-05-05 13:56:10 +
Commit: Joseph Mingrone
CommitDate: 2023-05-05 13:56:10 +
libpcap: Update to 1.10.4
Changelog:
https://git.tcpdump.org/libpcap/blob/104271ba4a14de6743e43bcf87536786d8fddea4:/CHANGES
Reviewed by:emaste
Obtained from: https://www.tcpdump.org/release/libpcap-1.10.4.tar.gz
Sponsored by: The FreeBSD Foundation
contrib/libpcap/CHANGES | 38 ++-
contrib/libpcap/Makefile.in | 4 +-
contrib/libpcap/README.md | 2 +-
contrib/libpcap/VERSION | 2 +-
contrib/libpcap/aclocal.m4 | 13 +++--
contrib/libpcap/config.guess| 12 +++--
contrib/libpcap/config.sub | 33 +
contrib/libpcap/configure | 64 -
contrib/libpcap/configure.ac| 26 +-
contrib/libpcap/gencode.c | 16 +++
contrib/libpcap/mkdep | 2 +-
contrib/libpcap/msdos/makefile | 8 ++--
contrib/libpcap/nametoaddr.c| 40
contrib/libpcap/optimize.c | 16 +++
contrib/libpcap/pcap-bt-linux.c | 6 +--
contrib/libpcap/pcap-common.c | 4 +-
contrib/libpcap/pcap-libdlpi.c | 2 +-
contrib/libpcap/pcap-linux.c| 8 ++--
contrib/libpcap/pcap-netfilter-linux.c | 4 +-
contrib/libpcap/pcap-npf.c | 6 +--
contrib/libpcap/pcap-sita.c | 2 +-
contrib/libpcap/pcap-sita.html | 22 -
contrib/libpcap/pcap-snf.c | 20
contrib/libpcap/pcap-usb-linux.c| 14 +++---
contrib/libpcap/pcap/bpf.h | 6 +--
contrib/libpcap/pcap/dlt.h | 4 +-
contrib/libpcap/pcap/pcap.h | 4 +-
contrib/libpcap/rpcapd/Makefile.in | 2 +-
contrib/libpcap/rpcapd/org.tcpdump.rpcapd.plist | 2 +-
contrib/libpcap/rpcapd/rpcapd.manadmin.in | 42 +++-
contrib/libpcap/sockutils.c | 2 +-
contrib/libpcap/testprogs/Makefile.in | 2 +-
32 files changed, 252 insertions(+), 176 deletions(-)
diff --cc contrib/libpcap/README.md
index 46c33c24125e,..e38b9a15d6b3
mode 100644,00..100644
--- a/contrib/libpcap/README.md
+++ b/contrib/libpcap/README.md
@@@ -1,76 -1,0 +1,76 @@@
+# LIBPCAP 1.x.y by [The Tcpdump Group](https://www.tcpdump.org)
+
+**To report a security issue please send an e-mail to secur...@tcpdump.org.**
+
+To report bugs and other problems, contribute patches, request a
+feature, provide generic feedback etc please see the
+[guidelines for contributing](CONTRIBUTING.md).
+
+The [documentation directory](doc/) has README files about specific
+operating systems and options.
+
+Anonymous Git is available via:
+
+ https://github.com/the-tcpdump-group/libpcap.git
+
+This directory contains source code for libpcap, a system-independent
+interface for user-level packet capture. libpcap provides a portable
+framework for low-level network monitoring. Applications include
+network statistics collection, security monitoring, network debugging,
+etc. Since almost every system vendor provides a different interface
+for packet capture, and since we've developed several tools that
+require this functionality, we've created this system-independent API
+to ease in porting and to alleviate the need for several
+system-dependent packet capture modules in each application.
+
+```text
- formerly from Lawrence Berkeley National Laboratory
++formerly from Lawrence Berkeley National Laboratory
+ Network Research Group
+ ftp://ftp.ee.lbl.gov/old/libpcap-0.4a7.tar.Z
+```
+
+### Support for particular platforms and BPF
+For some platforms there are `README.{system}` files that discuss issues
+with the OS's interface for packet capture on those platforms, such as
+how to enable support for that interface in the OS, if it's not built in
+by default.
+
+The libpcap interface supports a filtering mechanism based on the
+architecture in the BSD packet filter. BPF is described in the 1993
+Winter Usenix paper ``The BSD Packet Filter: A New Architecture for
+User-level Packet Capture''
+([compressed PostScript](https://www.tcpdump.org/papers/bpf-usenix93.ps.Z),
+[gzipped PostScript](https://www.tcpdump.org/papers/bpf-usenix93.ps.gz),
+[PDF](https://www.tcpdump.org/papers/bpf-usenix93.pdf)).
+
git: 270d20ce91c8 - main - libpcap: Update PACKAGE_STRING to 1.10.4
The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=270d20ce91c898c532ebaff76bb5b71c8544e928 commit 270d20ce91c898c532ebaff76bb5b71c8544e928 Author: Joseph Mingrone AuthorDate: 2023-05-27 01:45:43 + Commit: Joseph Mingrone CommitDate: 2023-05-27 15:38:38 + libpcap: Update PACKAGE_STRING to 1.10.4 Reviewed by:emaste Fixes: 6f9cba8f8b5e (libpcap: Update to 1.10.3) Fixes: dd744a896be3 (libpcap: Update to 1.10.4) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40295 --- lib/libpcap/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libpcap/config.h b/lib/libpcap/config.h index a0e94c76c8b9..7c823a07c3a4 100644 --- a/lib/libpcap/config.h +++ b/lib/libpcap/config.h @@ -184,7 +184,7 @@ #define PACKAGE_NAME "pcap" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "pcap 1.9.1" +#define PACKAGE_STRING "pcap 1.10.4" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "pcap"
git: 67c802c948ab - main - libpcap: Update PACKAGE_VERSION definition to 1.10.4
The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=67c802c948abf6955c3d8b53f4a41293a9caea24 commit 67c802c948abf6955c3d8b53f4a41293a9caea24 Author: Joseph Mingrone AuthorDate: 2023-05-29 17:28:15 + Commit: Joseph Mingrone CommitDate: 2023-05-29 18:41:01 + libpcap: Update PACKAGE_VERSION definition to 1.10.4 Reviewed by:kp Fixes: 6f9cba8f8b5e (libpcap: Update to 1.10.3) Fixes: dd744a896be3 (libpcap: Update to 1.10.4) Sponsored by: The FreeBSD Foundation --- lib/libpcap/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libpcap/config.h b/lib/libpcap/config.h index 7c823a07c3a4..f85b7d76a282 100644 --- a/lib/libpcap/config.h +++ b/lib/libpcap/config.h @@ -193,7 +193,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.9.1" +#define PACKAGE_VERSION "1.10.4" /* target host supports netmap */ #define PCAP_SUPPORT_NETMAP 1
git: 6d1c946e9168 - main - libpcap: Make pcap/bpf.h a wrapper around system net/bpf.h
The branch main has been updated by jrm (ports committer):
URL:
https://cgit.FreeBSD.org/src/commit/?id=6d1c946e916845d01062e146aad5395410da1e54
commit 6d1c946e916845d01062e146aad5395410da1e54
Author: Joseph Mingrone
AuthorDate: 2023-02-13 22:06:51 +
Commit: Joseph Mingrone
CommitDate: 2023-02-16 15:37:51 +
libpcap: Make pcap/bpf.h a wrapper around system net/bpf.h
In the past, we modified pcap/pcap.h to include the system net/bpf.h
rather than libpcap's own pcap/bpf.h. However, starting around 1.10.2,
libpcap requires a few extern functions defined in pcap/bpf.h to build.
Simply reverting that local change and pulling in pcap/bpf.h is not a
solution, because some ports with '#include ' such as mail/spamd
and net/xprobe require the system net/bpf.h to be pulled in. To
accommodate both requirements, make pcap/bpf.h a wrapper around the
system net/bpf.h, but retain the extern function definitions. This is
in preparation for libpcap 1.10.3.
Approved by:cy, philip, emaste, delphij (earlier revision)
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D38575
---
contrib/libpcap/pcap/bpf.h | 16
contrib/libpcap/pcap/pcap.h | 5 -
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/contrib/libpcap/pcap/bpf.h b/contrib/libpcap/pcap/bpf.h
index 9d748952a0e5..1c9d0f56a01a 100644
--- a/contrib/libpcap/pcap/bpf.h
+++ b/contrib/libpcap/pcap/bpf.h
@@ -74,6 +74,18 @@
extern "C" {
#endif
+/*
+ * In the past, we modified pcap/pcap.h to include the system net/bpf.h,
+ * rather than this file. However, starting around 1.10.2, libpcap requires
+ * the extern functions defined here to build. Simply reverting that local
+ * change is not a solution, because some ports with '#include '
+ * such as mail/spamd and net/xprobe require the system net/bpf.h to be
+ * pulled in. To accommodate both requirements, make this header a wrapper
+ * around the system net/bpf.h, but keep the extern function definitions.
+ */
+#if defined(__FreeBSD__)
+#include
+#else
/* BSD style release date */
#define BPF_RELEASE 199606
@@ -244,13 +256,17 @@ struct bpf_insn {
#define BPF_STMT(code, k) { (u_short)(code), 0, 0, k }
#define BPF_JUMP(code, k, jt, jf) { (u_short)(code), jt, jf, k }
+#endif /* defined(__FreeBSD__) */
+
PCAP_API int bpf_validate(const struct bpf_insn *, int);
PCAP_API u_int bpf_filter(const struct bpf_insn *, const u_char *, u_int,
u_int);
+#if !defined(__FreeBSD__)
/*
* Number of scratch memory words (for BPF_LD|BPF_MEM and BPF_ST).
*/
#define BPF_MEMWORDS 16
+#endif
#ifdef __cplusplus
}
diff --git a/contrib/libpcap/pcap/pcap.h b/contrib/libpcap/pcap/pcap.h
index a2d6003cdf61..4e30e77812ef 100644
--- a/contrib/libpcap/pcap/pcap.h
+++ b/contrib/libpcap/pcap/pcap.h
@@ -85,7 +85,10 @@
#endif /* _WIN32/MSDOS/UN*X */
#include/* for SOCKET, as the active-mode rpcap APIs
use it */
-#include
+
+#ifndef PCAP_DONT_INCLUDE_PCAP_BPF_H
+#include
+#endif
#include
git: a0c50eda2987 - main - beinstall.sh: Check correct exit status
The branch main has been updated by jrm (ports committer):
URL:
https://cgit.FreeBSD.org/src/commit/?id=a0c50eda2987334cb165802250b5f5ee9b5cffea
commit a0c50eda2987334cb165802250b5f5ee9b5cffea
Author: Joseph Mingrone
AuthorDate: 2022-12-19 04:07:11 +
Commit: Joseph Mingrone
CommitDate: 2023-01-03 14:27:53 +
beinstall.sh: Check correct exit status
When retrieving the timestamp of the last commit using git-show(1), do
not pipe the output to head(1), otherwise the return value in $? will be
for head(1) and not git-show(1).
Approved by:bapt
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D37742
---
tools/build/beinstall.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/build/beinstall.sh b/tools/build/beinstall.sh
index 46c65d87e61a..dfb3c4d64083 100755
--- a/tools/build/beinstall.sh
+++ b/tools/build/beinstall.sh
@@ -181,7 +181,7 @@
MERGEMASTER_CMD="${srcdir}/usr.sbin/mergemaster/mergemaster.sh"
# May be a worktree, in which case .git is a file, not a directory.
if [ -e .git ] ; then
-commit_time=$(git show --format='%ct' 2>/dev/null | head -1)
+commit_time=$(git show -s --format='%ct' 2>/dev/null)
[ $? -ne 0 ] && errx "Can't lookup git commit timestamp"
commit_ts=$(date -r ${commit_time} '+%Y%m%d.%H%M%S')
elif [ -d .svn ] ; then
Re: git: 8ccd0b876e67 - main - libc: expose execvpe for Linux compat
On Sat, 2023-12-23 at 20:30, Kristof Provost wrote: > Hi Brooks, Joseph, > On 11 Dec 2023, at 20:27, Brooks Davis wrote: >> The branch main has been updated by brooks: >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=8ccd0b876e67fda6249f294ff484798cc1e1569f >> commit 8ccd0b876e67fda6249f294ff484798cc1e1569f >> Author: Brooks Davis >> AuthorDate: 2023-12-11 19:24:53 + >> Commit: Brooks Davis >> CommitDate: 2023-12-11 19:24:53 + >> libc: expose execvpe for Linux compat >> We already implemented execvpe internally with an _ prefix in libc so >> go ahead and expose it for compatibility with Linux. >> This reverts c605eea952146348e5e1ad5cab6c127d7a1bd164. >> Bump __FreeBSD_version for the addition and add definitions to supress >> compat shims in libzfs (zfs changes were merged from upstream). >> PR: 275370 (request and exp-run (thanks antoine!)) >> Reviewed by:kevans >> Differential Revision: https://reviews.freebsd.org/D42846 > I don’t understand why, but this breaks devel/bear (“Tool that generates a > compilation database for clang tooling”). > Rather than generate a list of commands it seems to recursively spawn endless > “wrapper” processes: > ``` > 82661 0 I+ 0:00.18 | | `-- bear -- ls > 82662 0 I+ 0:06.90 | | `-- /usr/local/bin/bear intercept > --library /usr/local/lib/bear/libexec.so --wrapper > /usr/local/lib/bear/wrapper --wrapper-dir /usr/local/lib/bear/wr > 82663 0 I+ 0:00.13 | | `-- /usr/local/lib/bear/wrapper > --destination dns:///localhost:30309 --execute /bin/ls -- ls > 82664 0 I+ 0:00.09 | | `-- /usr/local/lib/bear/wrapper > --destination dns:///localhost:30309 --execute /bin/ls -- ls > 82665 0 I+ 0:00.06 | | `-- /usr/local/lib/bear/wrapper > --destination dns:///localhost:30309 --execute /bin/ls -- ls > 82666 0 I+ 0:00.06 | | `-- /usr/local/lib/bear/wrapper > --destination dns:///localhost:30309 --execute /bin/ls -- ls > ``` > It’s trivially reproducible at least. Without this patch `bear -- ls` returns > immediately and generates a compile_commands.json file (empty, but that’s > fine here). With it it’ll spin endlessly. > Best regards, > Kristof Hi Kristof, Brooks, I'm updating my CURRENT system to after that commit. I'll try to understand the problem after the holidays. If I don't come up with anything helpful, I'll report the issue upstream. Joe signature.asc Description: PGP signature
git: 1cdec2832d05 - main - ndp: Prepare for pending tcpdump update
The branch main has been updated by jrm:
URL:
https://cgit.FreeBSD.org/src/commit/?id=1cdec2832d051ddcb1417f3f2601e6212aff2613
commit 1cdec2832d051ddcb1417f3f2601e6212aff2613
Author: Joseph Mingrone
AuthorDate: 2023-06-07 02:21:27 +
Commit: Joseph Mingrone
CommitDate: 2023-06-08 01:57:20 +
ndp: Prepare for pending tcpdump update
ndp makes use of gmt2local, however that library has been removed from
tcpdump. Add utc_offset() as a substitute.
Reviewed by:emaste, jhb, melifaro
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D40445
---
usr.sbin/ndp/Makefile | 6 ++
usr.sbin/ndp/ndp.c | 20 ++--
usr.sbin/ndp/ndp_netlink.c | 1 -
3 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/usr.sbin/ndp/Makefile b/usr.sbin/ndp/Makefile
index 1722f4a5a2ef..f66c4ec846a8 100644
--- a/usr.sbin/ndp/Makefile
+++ b/usr.sbin/ndp/Makefile
@@ -15,15 +15,13 @@
.include
-.PATH: ${SRCTOP}/contrib/tcpdump
-
PROG= ndp
MAN= ndp.8
-SRCS= ndp.c gmt2local.c
+SRCS= ndp.c
LIBADD=xo
-CFLAGS+= -I. -I${.CURDIR} -I${SRCTOP}/contrib/tcpdump
+CFLAGS+= -I. -I${.CURDIR}
CFLAGS+= -D_U_=""
.if ${MK_EXPERIMENTAL} != "no"
diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c
index 23e186466c22..112fd099e3e0 100644
--- a/usr.sbin/ndp/ndp.c
+++ b/usr.sbin/ndp/ndp.c
@@ -98,6 +98,7 @@
#include
+#include
#include
#include
#include
@@ -107,11 +108,12 @@
#include
#include
#include
+#include
#include
#include
#include
#include
-#include "gmt2local.h"
+#include
#include "ndp.h"
@@ -181,6 +183,20 @@ valid_type(int if_type)
return (false);
}
+static int32_t
+utc_offset(void)
+{
+ time_t t;
+ struct tm *tm;
+
+ t = time(NULL);
+ tm = localtime(&t);
+
+ assert(tm->tm_gmtoff > INT32_MIN && tm->tm_gmtoff < INT32_MAX);
+
+ return (tm->tm_gmtoff);
+}
+
int
main(int argc, char **argv)
{
@@ -188,7 +204,7 @@ main(int argc, char **argv)
char *arg = NULL;
pid = getpid();
- thiszone = gmt2local(0);
+ thiszone = utc_offset();
argc = xo_parse_args(argc, argv);
if (argc < 0)
diff --git a/usr.sbin/ndp/ndp_netlink.c b/usr.sbin/ndp/ndp_netlink.c
index a34359a4343f..ace3e5e5fa11 100644
--- a/usr.sbin/ndp/ndp_netlink.c
+++ b/usr.sbin/ndp/ndp_netlink.c
@@ -33,7 +33,6 @@
#include
#include
#include
-#include "gmt2local.h"
#include
git: ee67461e5682 - main - tpcdump: Update to 4.99.4
The branch main has been updated by jrm:
URL:
https://cgit.FreeBSD.org/src/commit/?id=ee67461e56828dd1f8de165947ba83f6d9148a87
commit ee67461e56828dd1f8de165947ba83f6d9148a87
Merge: f40cd16bfda4 51a183021fce
Author: Joseph Mingrone
AuthorDate: 2023-06-08 17:30:54 +
Commit: Joseph Mingrone
CommitDate: 2023-06-08 17:30:54 +
tpcdump: Update to 4.99.4
Local changes:
- Update some local modifications to fix build
- Synch config.h with upstream as much as possible
Changelog:
https://git.tcpdump.org/tcpdump/blob/55bc126b0216cfe409b8d6bd378f65679d136ddf:/CHANGES
Reviewed by:emaste
Obtained from: https://www.tcpdump.org/release/tcpdump-4.99.4.tar.gz
Sponsored by: The FreeBSD Foundation
contrib/tcpdump/CHANGES| 289 +-
contrib/tcpdump/CMakeLists.txt | 1371
contrib/tcpdump/CONTRIBUTING | 151 -
contrib/tcpdump/CONTRIBUTING.md| 191 ++
contrib/tcpdump/CREDITS| 149 +-
contrib/tcpdump/{INSTALL.txt => INSTALL.md}| 61 +-
contrib/tcpdump/LICENSE|6 +-
contrib/tcpdump/Makefile.in| 230 +-
contrib/tcpdump/PLATFORMS | 16 -
contrib/tcpdump/README |1 -
contrib/tcpdump/README.md | 100 +-
contrib/tcpdump/VERSION|2 +-
contrib/tcpdump/addrtoname.c | 493 +--
contrib/tcpdump/addrtoname.h | 86 +-
contrib/tcpdump/addrtostr.c| 12 +-
contrib/tcpdump/af.c |4 +-
contrib/tcpdump/af.h |2 +-
contrib/tcpdump/ah.h | 46 +-
contrib/tcpdump/appletalk.h| 60 +-
contrib/tcpdump/ascii_strcasecmp.c |6 +-
contrib/tcpdump/atime.awk |2 +-
contrib/tcpdump/bpf_dump.c |5 +-
contrib/tcpdump/chdlc.h|2 +-
contrib/tcpdump/checksum.c | 10 +-
contrib/tcpdump/cmake/Modules/FindCRYPTO.cmake | 24 +
contrib/tcpdump/cmake/Modules/FindPCAP.cmake | 462 +++
contrib/tcpdump/cmake/Modules/FindSMI.cmake| 24 +
contrib/tcpdump/cmake_uninstall.cmake.in | 21 +
contrib/tcpdump/cmakeconfig.h.in | 290 ++
contrib/tcpdump/compiler-tests.h | 196 ++
contrib/tcpdump/config.guess | 1516 +
contrib/tcpdump/config.h.in| 170 +-
contrib/tcpdump/config.sub | 1705 +-
contrib/tcpdump/configure | 3794 +++--
contrib/tcpdump/configure.ac | 508 +--
contrib/tcpdump/cpack.c| 103 +-
contrib/tcpdump/cpack.h| 33 +-
contrib/tcpdump/diag-control.h | 186 +
contrib/tcpdump/doc/README.NetBSD.md | 22 +
contrib/tcpdump/doc/README.Win32.md| 200 ++
contrib/tcpdump/doc/README.aix.md | 17 +
contrib/tcpdump/doc/README.solaris.md | 41 +
contrib/tcpdump/ethertype.h| 32 +-
contrib/tcpdump/extract.h | 754 -
contrib/tcpdump/{ether.h => fptype.c} | 35 +-
contrib/tcpdump/fptype.h | 34 +
contrib/tcpdump/ftmacros.h | 127 +
contrib/tcpdump/funcattrs.h| 110 +-
contrib/tcpdump/getservent.h | 67 +
contrib/tcpdump/gmpls.c|4 +-
contrib/tcpdump/gmt2local.c| 66 -
contrib/tcpdump/gmt2local.h| 25 -
contrib/tcpdump/in_cksum.c | 12 +-
contrib/tcpdump/interface.h| 18 +-
contrib/tcpdump/ip.h |6 +-
contrib/tcpdump/ip6.h | 91 +-
contrib/tcpdump/ipproto.c | 10 +-
contrib/tcpdump/ipproto.h | 15 +-
contrib/tcpdump/l2vpn.c|8 +-
contrib/tcpdump/machdep.c | 24 +-
contrib/tcpdump/missing/datalinks.c|2 +-
contrib/tcpdump/missing/dlnames.c |5 +-
contrib/tcpdump/missing/getopt_long.c | 30 +-
contrib/tcpdump/{ => missing}/getopt_long.h|6 +-
contrib/tcpdump/missing/getservent.c | 143 +
contrib/tcpdump/missing/pcap_dump_ftell.c | 46 +
contrib/tcpdump/missing/snprintf.c | 119 +-
contrib/tcpdump/missing/strlcat.c |8 +-
contrib/tcpdump/missing/strlcpy.c |8 +-
contrib/tcpdump/missing/strsep.c |6 +-
contrib/tcpdump/mkdep | 50 +-
contrib/tcpdump/mpls.h |6 +-
contri
git: a75d93a74d55 - main - tcpdump: Do not hard code HAVE_LIBCRYPTO in config.h
The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=a75d93a74d55d371876f5444075de4ecd685297f commit a75d93a74d55d371876f5444075de4ecd685297f Author: Joseph Mingrone AuthorDate: 2023-06-08 22:51:32 + Commit: Joseph Mingrone CommitDate: 2023-06-09 12:16:11 + tcpdump: Do not hard code HAVE_LIBCRYPTO in config.h Reviewed by:emaste Fixes: ee67461e5682 (tpcdump: Update to 4.99.4) Sponsored by: The FreeBSD Foundation --- usr.sbin/tcpdump/tcpdump/config.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/tcpdump/tcpdump/config.h b/usr.sbin/tcpdump/tcpdump/config.h index 08a7afc9841c..2aa1020af274 100644 --- a/usr.sbin/tcpdump/tcpdump/config.h +++ b/usr.sbin/tcpdump/tcpdump/config.h @@ -66,7 +66,8 @@ /* #undef HAVE_LIBCAP_NG */ /* Define to 1 if you have the `crypto' library (-lcrypto). */ -#define HAVE_LIBCRYPTO 1 +/* See Makefile */ +/* #undef HAVE_LIBCRYPTO */ /* Define to 1 if you have the `rpc' library (-lrpc). */ /* #undef HAVE_LIBRPC */
Re: git: 171a7bbfc048 - main - tcpdump: fix build with WITHOUT_PF=1
Hello Gleb,
Thanks for reporting.
https://reviews.freebsd.org/D40578
Joe
On Tue, 2023-06-13 at 21:01, Gleb Smirnoff wrote:
> Joseph,
> I guess there is also regression with pfsync printing. Didn't check with
> real traffic, but:
> # grep pfsync_if_print *
> grep: cmake: Is a directory
> grep: doc: Is a directory
> grep: lbl: Is a directory
> grep: missing: Is a directory
> netdissect.h:extern u_int pfsync_if_print(netdissect_options *, const struct
> pcap_pkthdr *, const u_char *);
> print-pfsync.c:pfsync_if_print(netdissect_options *ndo, const struct
> pcap_pkthdr *h,
> #
> Doesn't look used.
> On Wed, Jun 14, 2023 at 03:59:04AM +, Gleb Smirnoff wrote:
> T> The branch main has been updated by glebius:
> T>
> T> URL:
> https://cgit.FreeBSD.org/src/commit/?id=171a7bbfc04885150401ab64d96793373a8b2061
> T>
> T> commit 171a7bbfc04885150401ab64d96793373a8b2061
> T> Author: Gleb Smirnoff
> T> AuthorDate: 2023-06-14 03:58:36 +
> T> Commit: Gleb Smirnoff
> T> CommitDate: 2023-06-14 03:58:36 +
> T>
> T> tcpdump: fix build with WITHOUT_PF=1
> T>
> T> Fixes: ee67461e56828dd1f8de165947ba83f6d9148a87
> T> ---
> T> contrib/tcpdump/print.c | 2 +-
> T> 1 file changed, 1 insertion(+), 1 deletion(-)
> T>
> T> diff --git a/contrib/tcpdump/print.c b/contrib/tcpdump/print.c
> T> index 9c0ab8622de1..42a4548e8689 100644
> T> --- a/contrib/tcpdump/print.c
> T> +++ b/contrib/tcpdump/print.c
> T> @@ -185,7 +185,7 @@ static const struct printer printers[] = {
> T> #ifdef DLT_LOOP
> T>{ null_if_print,DLT_LOOP },
> T> #endif
> T> -#ifdef DLT_PFLOG
> T> +#if defined(DLT_PFLOG) && defined(HAVE_NET_IF_PFLOG_H)
> T>{ pflog_if_print, DLT_PFLOG },
> T> #endif
> T> #ifdef DLT_PKTAP
signature.asc
Description: PGP signature
git: 1ad8d2ee1f7d - main - tcpdump: Reconnect pfsync printer
The branch main has been updated by jrm:
URL:
https://cgit.FreeBSD.org/src/commit/?id=1ad8d2ee1f7dec1d747ec955a68fbbb362958315
commit 1ad8d2ee1f7dec1d747ec955a68fbbb362958315
Author: Joseph Mingrone
AuthorDate: 2023-06-16 13:40:00 +
Commit: Joseph Mingrone
CommitDate: 2023-06-17 10:05:58 +
tcpdump: Reconnect pfsync printer
Fixes: ee67461e (tpcdump: Update to 4.99.4)
Reported by:glebius
Reviewed by:kp
Differential Revision: https://reviews.freebsd.org/D40578
---
contrib/tcpdump/netdissect.h | 2 +-
contrib/tcpdump/print-pfsync.c | 4 ++--
contrib/tcpdump/print.c| 3 +++
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/contrib/tcpdump/netdissect.h b/contrib/tcpdump/netdissect.h
index a4b05b557616..7696c4e41cd8 100644
--- a/contrib/tcpdump/netdissect.h
+++ b/contrib/tcpdump/netdissect.h
@@ -698,7 +698,7 @@ extern int ospf_grace_lsa_print(netdissect_options *, const
u_char *, u_int);
extern int ospf_te_lsa_print(netdissect_options *, const u_char *, u_int);
extern void otv_print(netdissect_options *, const u_char *, u_int);
extern void pfsync_ip_print(netdissect_options *, const u_char *, u_int);
-extern u_int pfsync_if_print(netdissect_options *, const struct pcap_pkthdr *,
const u_char *);
+extern void pfsync_if_print(netdissect_options *, const struct pcap_pkthdr *,
const u_char *);
extern void pgm_print(netdissect_options *, const u_char *, u_int, const
u_char *);
extern void pim_print(netdissect_options *, const u_char *, u_int, const
u_char *);
extern void pimv1_print(netdissect_options *, const u_char *, u_int);
diff --git a/contrib/tcpdump/print-pfsync.c b/contrib/tcpdump/print-pfsync.c
index 83670481d40f..5710e36ded6c 100644
--- a/contrib/tcpdump/print-pfsync.c
+++ b/contrib/tcpdump/print-pfsync.c
@@ -57,7 +57,7 @@ static void print_src_dst(netdissect_options *,
const struct pfsync_state_peer *, uint8_t);
static voidprint_state(netdissect_options *, union pfsync_state_union *,
int);
-u_int
+void
pfsync_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
register const u_char *p)
{
@@ -78,7 +78,7 @@ out:
hex_print(ndo, "\n\t", p, caplen);
}
fn_print_char(ndo, '\n');
- return (caplen);
+ return;
}
void
diff --git a/contrib/tcpdump/print.c b/contrib/tcpdump/print.c
index 42a4548e8689..41a6b524fbf8 100644
--- a/contrib/tcpdump/print.c
+++ b/contrib/tcpdump/print.c
@@ -188,6 +188,9 @@ static const struct printer printers[] = {
#if defined(DLT_PFLOG) && defined(HAVE_NET_IF_PFLOG_H)
{ pflog_if_print, DLT_PFLOG },
#endif
+#if defined(DLT_PFSYNC) && defined(HAVE_NET_PFVAR_H)
+ { pfsync_if_print, DLT_PFSYNC},
+#endif
#ifdef DLT_PKTAP
{ pktap_if_print, DLT_PKTAP },
#endif
git: 17839f45d86e - main - pw: Ensure group membership is not duplicated
The branch main has been updated by jrm:
URL:
https://cgit.FreeBSD.org/src/commit/?id=17839f45d86e79065a65ad3e2522dd69b29a652c
commit 17839f45d86e79065a65ad3e2522dd69b29a652c
Author: Naman Sood
AuthorDate: 2023-07-19 12:44:21 +
Commit: Joseph Mingrone
CommitDate: 2023-07-19 13:36:09 +
pw: Ensure group membership is not duplicated
Fix the following problem:
1. A nonexistent user, someuser, is added to somegroup in /etc/group.
2. someuser is then created with membership in somegroup.
The entry for somegroup in /etc/group will then contain
somegroup:*:12345:someuser,someuser
With this fix, the entry will be
somegroup:*:12345:someuser
PR: 238995
Reviewed by:bapt, jrm
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D41076
---
usr.sbin/pw/pw.h | 2 ++
usr.sbin/pw/pw_group.c | 2 +-
usr.sbin/pw/pw_user.c | 3 +++
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/usr.sbin/pw/pw.h b/usr.sbin/pw/pw.h
index fb1ba9a44f84..6eb5a25e56ec 100644
--- a/usr.sbin/pw/pw.h
+++ b/usr.sbin/pw/pw.h
@@ -114,3 +114,5 @@ extern const char *Which[];
uintmax_t strtounum(const char * __restrict, uintmax_t, uintmax_t,
const char ** __restrict);
+
+bool grp_has_member(struct group *grp, const char *name);
diff --git a/usr.sbin/pw/pw_group.c b/usr.sbin/pw/pw_group.c
index 277763041f0a..48f999d3e1d3 100644
--- a/usr.sbin/pw/pw_group.c
+++ b/usr.sbin/pw/pw_group.c
@@ -418,7 +418,7 @@ pw_group_del(int argc, char **argv, char *arg1)
return (EXIT_SUCCESS);
}
-static bool
+bool
grp_has_member(struct group *grp, const char *name)
{
int j;
diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c
index bea248c802ed..9029069c6a9f 100644
--- a/usr.sbin/pw/pw_user.c
+++ b/usr.sbin/pw/pw_user.c
@@ -1408,6 +1408,9 @@ pw_user_add(int argc, char **argv, char *arg1)
if (cmdcnf->groups != NULL) {
for (i = 0; i < cmdcnf->groups->sl_cur; i++) {
grp = GETGRNAM(cmdcnf->groups->sl_str[i]);
+ /* gr_add doesn't check if new member is already in
group */
+ if (grp_has_member(grp, pwd->pw_name))
+ continue;
grp = gr_add(grp, pwd->pw_name);
/*
* grp can only be NULL in 2 cases:
git: 1a8d37b8cffc - main - pw: Use existing group entry, even if it already has members
The branch main has been updated by jrm:
URL:
https://cgit.FreeBSD.org/src/commit/?id=1a8d37b8cffc805626a3954496845b7a14a45bea
commit 1a8d37b8cffc805626a3954496845b7a14a45bea
Author: Naman Sood
AuthorDate: 2023-07-19 13:06:06 +
Commit: Joseph Mingrone
CommitDate: 2023-07-19 13:40:53 +
pw: Use existing group entry, even if it already has members
Fix the following problem:
1. A nonexistent user, someuser, is added to /etc/group as
someuser:*:12345:someuser.
2. someuser is then created with the default login group.
A second group entry for someuser will be created.
someuser:*:12345:someuser
someuser:*:12346:
With this fix, the existing group entry will be used.
PR: 238995
Reviewed by:bapt, jrm
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D41057
---
usr.sbin/pw/pw_user.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c
index 9029069c6a9f..3e5a9841c5f3 100644
--- a/usr.sbin/pw/pw_user.c
+++ b/usr.sbin/pw/pw_user.c
@@ -378,8 +378,7 @@ pw_gidpolicy(struct userconf *cnf, char *grname, char *nam,
gid_t prefer, bool d
grp = GETGRGID(gid);
}
gid = grp->gr_gid;
- } else if ((grp = GETGRNAM(nam)) != NULL &&
- (grp->gr_mem == NULL || grp->gr_mem[0] == NULL)) {
+ } else if ((grp = GETGRNAM(nam)) != NULL) {
gid = grp->gr_gid; /* Already created? Use it anyway... */
} else {
intmax_tgrid = -1;
git: 181692ab0896 - main - pw: Add regression tests for useradd bug fixes
The branch main has been updated by jrm:
URL:
https://cgit.FreeBSD.org/src/commit/?id=181692ab0896637bc174ab3e1ef319991dfa371f
commit 181692ab0896637bc174ab3e1ef319991dfa371f
Author: Naman Sood
AuthorDate: 2023-07-19 13:27:14 +
Commit: Joseph Mingrone
CommitDate: 2023-07-19 13:43:12 +
pw: Add regression tests for useradd bug fixes
PR: 238995
Reviewed by:jrm
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D41080
---
usr.sbin/pw/tests/pw_useradd_test.sh | 25 +
1 file changed, 25 insertions(+)
diff --git a/usr.sbin/pw/tests/pw_useradd_test.sh
b/usr.sbin/pw/tests/pw_useradd_test.sh
index e9d0a3aa20af..ac24b0df6693 100755
--- a/usr.sbin/pw/tests/pw_useradd_test.sh
+++ b/usr.sbin/pw/tests/pw_useradd_test.sh
@@ -463,6 +463,29 @@ user_add_conf_defaultpasswd_body()
grep defaultpasswd ${HOME}/pw.conf
}
+atf_test_case user_add_existing_login_group
+user_add_existing_login_group_body()
+{
+ populate_etc_skel
+
+ atf_check -s exit:0 ${PW} groupadd testuser
+ atf_check -s exit:0 ${PW} useradd user1 -G testuser
+ atf_check -s exit:0 ${PW} useradd testuser
+ atf_check -o match:"1" \
+ sh -c "grep testuser ${HOME}/group | wc -l"
+}
+
+atf_test_case user_add_already_in_group
+user_add_already_in_group_body()
+{
+ populate_etc_skel
+
+ echo "testgroup:*:4242:testuser" >> ${HOME}/group
+ atf_check -s exit:0 ${PW} useradd testuser -G testgroup
+ atf_check -o not-match:"testuser,testuser" \
+ grep testuser ${HOME}/group
+}
+
atf_init_test_cases() {
atf_add_test_case user_add
atf_add_test_case user_add_noupdate
@@ -503,4 +526,6 @@ atf_init_test_cases() {
atf_add_test_case user_add_defaultgroup
atf_add_test_case user_add_conf_defaultpasswd
+ atf_add_test_case user_add_existing_login_group
+ atf_add_test_case user_add_already_in_group
}
git: 53bb5613a8a1 - main - ldd32: place in utilities-lib32 not utilities
The branch main has been updated by jrm:
URL:
https://cgit.FreeBSD.org/src/commit/?id=53bb5613a8a15363718b6e6de8d965bf9a2c5469
commit 53bb5613a8a15363718b6e6de8d965bf9a2c5469
Author: Isaac Freund
AuthorDate: 2024-10-09 13:24:06 +
Commit: Joseph Mingrone
CommitDate: 2024-10-09 13:31:52 +
ldd32: place in utilities-lib32 not utilities
The ldd32 binary is currently in the utilities package but belongs in
utilities-lib32. This patch corrects the situation.
PR: 249145
Reviewed by:emaste
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D47023
---
usr.bin/ldd32/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/usr.bin/ldd32/Makefile b/usr.bin/ldd32/Makefile
index 5b028560ba6b..993fa8f3ff5c 100644
--- a/usr.bin/ldd32/Makefile
+++ b/usr.bin/ldd32/Makefile
@@ -4,6 +4,7 @@ NEED_COMPAT=32
PROG= ldd32
MAN=
MLINKS=ldd.1 ldd32.1
+TAGS+= lib32
.PATH: ${SRCTOP}/usr.bin/ldd
.include "${SRCTOP}/usr.bin/ldd/Makefile"
git: 34aa6f2c2db5 - main - pflogd: Move struct definitions out of header file
The branch main has been updated by jrm:
URL:
https://cgit.FreeBSD.org/src/commit/?id=34aa6f2c2db5cc9655f201a1ef01adbb9fb484d5
commit 34aa6f2c2db5cc9655f201a1ef01adbb9fb484d5
Author: Joseph Mingrone
AuthorDate: 2024-10-03 19:49:51 +
Commit: Joseph Mingrone
CommitDate: 2024-10-04 13:41:53 +
pflogd: Move struct definitions out of header file
In libpcap 1.10.5, two structures that we relied on, pcap_timeval and
pcap_sf_pkthdr, were made private. As a workaround, we initially
defined the structures in pflogd.h. After further investigation, mostly
by kp@, we concluded that it is reasonable to define these structures
ourselves since they represent a file format and thus are unlikely to
change from under us. We will stick with this solution but move the
definitions out of the header file to prevent others from using pflogd.h
to access them.
Another solution that was considered was using libpcap's pcap_dump()
function to write packets, but there are blockers. For example, pflogd
writes to a memory buffer, and libpcap lacks support for this.
Reviewed by:kp
MFC after: 3 days
Event: EuroBSDCon 2024
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D46894
---
contrib/pf/pflogd/pflogd.c | 11 +++
contrib/pf/pflogd/pflogd.h | 13 -
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/contrib/pf/pflogd/pflogd.c b/contrib/pf/pflogd/pflogd.c
index 6df97f8b84f4..e24553dfc37b 100644
--- a/contrib/pf/pflogd/pflogd.c
+++ b/contrib/pf/pflogd/pflogd.c
@@ -74,6 +74,17 @@ char errbuf[PCAP_ERRBUF_SIZE];
int log_debug = 0;
unsigned int delay = FLUSH_DELAY;
+struct pcap_timeval {
+ bpf_u_int32 tv_sec; /* seconds */
+ bpf_u_int32 tv_usec;/* microseconds */
+};
+
+struct pcap_sf_pkthdr {
+ struct pcap_timeval ts; /* time stamp */
+ bpf_u_int32 caplen; /* length of portion present */
+ bpf_u_int32 len;/* length of this packet (off wire) */
+};
+
char *copy_argv(char * const *);
void dump_packet(u_char *, const struct pcap_pkthdr *, const u_char *);
void dump_packet_nobuf(u_char *, const struct pcap_pkthdr *, const u_char *);
diff --git a/contrib/pf/pflogd/pflogd.h b/contrib/pf/pflogd/pflogd.h
index 6e6b588d24bf..596e69692614 100644
--- a/contrib/pf/pflogd/pflogd.h
+++ b/contrib/pf/pflogd/pflogd.h
@@ -40,19 +40,6 @@ int priv_open_log(void);
intpriv_move_log(void);
pcap_t *pcap_open_live_fd(int fd, int snaplen, char *ebuf);
-/* XXX TODO: Investigate a permanent solution, rather than defining these two
- structures here. */
-struct pcap_timeval {
- bpf_u_int32 tv_sec; /* seconds */
- bpf_u_int32 tv_usec;/* microseconds */
-};
-
-struct pcap_sf_pkthdr {
- struct pcap_timeval ts; /* time stamp */
- bpf_u_int32 caplen; /* length of portion present */
- bpf_u_int32 len;/* length of this packet (off wire) */
-};
-
void set_pcap_filter(void);
/* File descriptor send/recv */
void send_fd(int, int);
git: 0a7e5f1f02aa - main - tcpdump: Update to 4.99.5
The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=0a7e5f1f02aad2ff5fff1c60f44c6975fd07e1d9 commit 0a7e5f1f02aad2ff5fff1c60f44c6975fd07e1d9 Merge: f1aaef47a01a 75d9de99aec2 Author: Joseph Mingrone AuthorDate: 2024-09-23 19:23:25 + Commit: Joseph Mingrone CommitDate: 2024-09-23 19:23:25 + tcpdump: Update to 4.99.5 Changes: https://git.tcpdump.org/tcpdump/blob/4a789712f187e3ac7b2c0044c3a3f8c71b83646e:/CHANGES Obtained from: https://www.tcpdump.org/release/tcpdump-4.99.5.tar.xz Sponsored by: The FreeBSD Foundation contrib/tcpdump/CHANGES| 131 +- contrib/tcpdump/CMakeLists.txt | 301 +- contrib/tcpdump/CONTRIBUTING.md| 269 +- contrib/tcpdump/CREDITS| 34 +- contrib/tcpdump/INSTALL.md | 35 +- contrib/tcpdump/Makefile.in| 98 +- contrib/tcpdump/VERSION|2 +- contrib/tcpdump/addrtoname.c |7 +- contrib/tcpdump/addrtostr.c| 24 +- contrib/tcpdump/af.c |2 - contrib/tcpdump/autogen.sh | 25 + contrib/tcpdump/bpf_dump.c |2 - contrib/tcpdump/checksum.c | 39 +- contrib/tcpdump/cmake/Modules/FindCRYPTO.cmake | 185 +- contrib/tcpdump/cmakeconfig.h.in | 14 +- contrib/tcpdump/config.guess | 62 +- contrib/tcpdump/config.h.in| 27 +- contrib/tcpdump/config.sub | 230 +- contrib/tcpdump/configure | 7188 ++-- contrib/tcpdump/configure.ac | 476 +- contrib/tcpdump/cpack.c|2 - contrib/tcpdump/diag-control.h | 95 +- contrib/tcpdump/doc/README.Win32.md| 200 - contrib/tcpdump/doc/README.haiku.md| 33 + contrib/tcpdump/doc/README.solaris.md |5 + contrib/tcpdump/extract.h |2 +- contrib/tcpdump/ftmacros.h |2 +- contrib/tcpdump/funcattrs.h|5 +- contrib/tcpdump/gmpls.c|2 - contrib/tcpdump/in_cksum.c |2 - contrib/tcpdump/install-sh | 689 ++- contrib/tcpdump/instrument-functions.c | 250 + contrib/tcpdump/interface.h|2 +- contrib/tcpdump/ip.h |1 - contrib/tcpdump/ipproto.c |2 - contrib/tcpdump/l2vpn.c|2 - contrib/tcpdump/machdep.c |2 - contrib/tcpdump/makemib|2 +- contrib/tcpdump/mib.h | 12 +- contrib/tcpdump/missing/datalinks.c|2 - contrib/tcpdump/missing/dlnames.c |2 - contrib/tcpdump/missing/getopt_long.c |3 +- contrib/tcpdump/missing/getservent.c |2 - contrib/tcpdump/missing/snprintf.c |2 - contrib/tcpdump/missing/strlcat.c |2 - contrib/tcpdump/missing/strlcpy.c |2 - contrib/tcpdump/missing/strsep.c |2 - contrib/tcpdump/mkdep | 28 +- contrib/tcpdump/nameser.h |8 +- contrib/tcpdump/netdissect-alloc.c |2 - contrib/tcpdump/netdissect.c | 16 +- contrib/tcpdump/netdissect.h | 75 +- contrib/tcpdump/nlpid.c|2 - contrib/tcpdump/ntp.c |2 - contrib/tcpdump/oui.c |2 - contrib/tcpdump/parsenfsfh.c | 53 +- contrib/tcpdump/pflog.h| 45 +- contrib/tcpdump/print-802_11.c | 62 +- contrib/tcpdump/print-802_15_4.c | 32 +- contrib/tcpdump/print-ah.c |2 - contrib/tcpdump/print-ahcp.c |2 - contrib/tcpdump/print-aodv.c |2 - contrib/tcpdump/print-aoe.c|2 - contrib/tcpdump/print-ap1394.c |2 - contrib/tcpdump/print-arcnet.c |2 - contrib/tcpdump/print-arista.c |2 - contrib/tcpdump/print-arp.c|2 - contrib/tcpdump/print-ascii.c |8 +- contrib/tcpdump/print-atalk.c |2 - contrib/tcpdump/print-atm.c|4 +- contrib/tcpdump/print-babel.c |2 - contrib/tcpdump/print-bcm-li.c |2 - contrib/tcpdump/print-beep.c |2 - contrib/tcpdump/print-bfd.c|8 +- contrib/tcpdump/print-bgp.c| 23 +- contrib/tcpdump/print-bootp.c | 43
git: 6651a75af260 - main - ObsoleteFiles.inc: Remove bogus entries
The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=6651a75af260a1c57b787a8146266de4cecd70cf commit 6651a75af260a1c57b787a8146266de4cecd70cf Author: Joseph Mingrone AuthorDate: 2025-01-23 20:19:43 + Commit: Joseph Mingrone CommitDate: 2025-01-23 20:27:54 + ObsoleteFiles.inc: Remove bogus entries Reviewed by:emaste --- ObsoleteFiles.inc | 5 - 1 file changed, 5 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index eea25cc2e489..b406c3e281f1 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -754,11 +754,6 @@ OLD_FILES+=usr/tests/sys/netpfil/pf/divapp # 20240930: libmd bumped to version 7 OLD_LIBS+=lib/libmd.so.6 -# 20240914 libpcap upgrade from 1.10.4 to 1.10.5 -OLD_FILES+=contrib/libpcap/pcap-haiku.cpp -OLD_FILES+=contrib/libpcap/pcap-rpcap-int.h -OLD_FILES+=contrib/libpcap/pcap-usb-linux-common.c - # 20240827: retire fips.so OLD_LIBS+=usr/lib/ossl-modules/fips.so
git: d72f87c0fd14 - main - tcpdump/print-pflog: Print uid with host endianness
The branch main has been updated by jrm:
URL:
https://cgit.FreeBSD.org/src/commit/?id=d72f87c0fd1418bdb814594ea8fc76a202f7d5c6
commit d72f87c0fd1418bdb814594ea8fc76a202f7d5c6
Author: Eric A. Borisch
AuthorDate: 2025-01-03 00:21:52 +
Commit: Joseph Mingrone
CommitDate: 2025-01-03 17:37:45 +
tcpdump/print-pflog: Print uid with host endianness
PR: 283799
Reported by:ebori...@gmail.com
Reviewed by:jrm, kp
Fixes: 0a7e5f1f02aad2ff5fff1c60f44c6975fd07e1d9
---
contrib/tcpdump/print-pflog.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/tcpdump/print-pflog.c b/contrib/tcpdump/print-pflog.c
index e54d33ac13bb..71bf01f07555 100644
--- a/contrib/tcpdump/print-pflog.c
+++ b/contrib/tcpdump/print-pflog.c
@@ -119,8 +119,8 @@ pflog_print(netdissect_options *ndo, const struct pfloghdr
*hdr)
ND_PRINT("%s", tok2str(pf_reasons, "unkn(%u)", GET_U_1(hdr->reason)));
- if (GET_BE_U_4(hdr->uid) != UID_MAX)
- ND_PRINT(" [uid %u]", (unsigned)GET_BE_U_4(hdr->uid));
+ if (GET_HE_U_4(hdr->uid) != UID_MAX)
+ ND_PRINT(" [uid %u]", GET_HE_U_4(hdr->uid));
if (ridentifier != 0)
ND_PRINT(" [ridentifier %u]", ridentifier);
git: ac7a19d41ee5 - main - lualoader: Add distinct brand for installer
The branch main has been updated by jrm:
URL:
https://cgit.FreeBSD.org/src/commit/?id=ac7a19d41ee5eb1271c46fbc620b2f98dffa2230
commit ac7a19d41ee5eb1271c46fbc620b2f98dffa2230
Author: Joseph Mingrone
AuthorDate: 2025-06-23 20:47:20 +
Commit: Joseph Mingrone
CommitDate: 2025-06-24 15:11:15 +
lualoader: Add distinct brand for installer
Make it obvious to users that the system is booting into the installer.
Reviewed by:kevans, manu
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D51001
---
release/Makefile | 3 +++
stand/images/Makefile | 3 ++-
stand/images/freebsd-install-brand-rev.png | Bin 0 -> 7724 bytes
stand/lua/Makefile | 1 +
stand/lua/gfx-install.lua | 24
5 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/release/Makefile b/release/Makefile
index 5875a22a5bfd..d7721cf4ccd8 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -245,6 +245,7 @@ disc1: ${PKGBASE_REPO}
echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf
+ echo loader_brand=\"install\" >> ${.TARGET}/boot/loader.conf
echo loader_menu_multi_user_prompt=\"Installer\" >>
${.TARGET}/boot/loader.conf
cp ${.CURDIR}/rc.local ${.TARGET}/etc
echo "./etc/resolv.conf type=link uname=root gname=wheel mode=0644
link=/tmp/bsdinstall_etc/resolv.conf" >> ${.TARGET}/METALOG
@@ -284,6 +285,7 @@ bootonly:
echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf
+ echo loader_brand=\"install\" >> ${.TARGET}/boot/loader.conf
echo loader_menu_multi_user_prompt=\"Installer\" >>
${.TARGET}/boot/loader.conf
cp ${.CURDIR}/rc.local ${.TARGET}/etc
echo "./etc/resolv.conf type=link uname=root gname=wheel mode=0644
link=/tmp/bsdinstall_etc/resolv.conf" >> ${.TARGET}/METALOG
@@ -338,6 +340,7 @@ dvd: ${PKGBASE_REPO}
echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
+ echo loader_brand=\"install\" >> ${.TARGET}/boot/loader.conf
echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf
echo loader_menu_multi_user_prompt=\"Installer\" >>
${.TARGET}/boot/loader.conf
cp ${.CURDIR}/rc.local ${.TARGET}/etc
diff --git a/stand/images/Makefile b/stand/images/Makefile
index d1e7d124dfa6..2f45b989e0a7 100644
--- a/stand/images/Makefile
+++ b/stand/images/Makefile
@@ -1,6 +1,7 @@
.include
-FILES+=freebsd-brand-rev.png freebsd-brand.png freebsd-logo-rev.png
+FILES+=freebsd-brand-rev.png freebsd-brand.png
freebsd-install-brand-rev.png \
+ freebsd-logo-rev.png
FILESDIR= /boot/images
diff --git a/stand/images/freebsd-install-brand-rev.png
b/stand/images/freebsd-install-brand-rev.png
new file mode 100644
index ..59d173d3f8b3
Binary files /dev/null and b/stand/images/freebsd-install-brand-rev.png differ
diff --git a/stand/lua/Makefile b/stand/lua/Makefile
index 3cec7ae3b050..d319261e18b2 100644
--- a/stand/lua/Makefile
+++ b/stand/lua/Makefile
@@ -24,6 +24,7 @@ FILES=cli.lua \
gfx-beastie.lua \
gfx-beastiebw.lua \
gfx-fbsdbw.lua \
+ gfx-install.lua \
gfx-orb.lua \
gfx-orbbw.lua \
menu.lua \
diff --git a/stand/lua/gfx-install.lua b/stand/lua/gfx-install.lua
new file mode 100644
index ..d4cd34e32e1e
--- /dev/null
+++ b/stand/lua/gfx-install.lua
@@ -0,0 +1,24 @@
+--
+-- Copyright (c) 2025 Joseph Mingrone
+--
+-- SPDX-License-Identifier: BSD-2-Clause
+--
+
+return {
+ brand = {
+ ascii = {
+ image = {
+ " _ ___
__ _",
+ "| ___| __ ___ ___| __ ) ___|| _ \\ |_ _|_ __
___| |_ __ _| | | ___ _ __",
+ "| |_ | '__/ _ \\/ _ \\ _ \\___ \\| | | | | ||
'_ \\/ __| __/ _` | | |/ _ \\ '__|",
+ "| _|| | | __/ __/ |_) |__) | |_| | | || | |
\\__ \\ || (_| | | | __/ |",
+ "|_| |_| \\___|\\___|//|/ |___|_|
|_|___/\\__\\__,_|_|_|\\___|_|",
+ },
+ requires_color = false,
+ },
+ fb = {
+ image = "/boot/images/freebsd-install-brand-rev.png",
+ width = 80,
+ },
+ }
+}
git: 655fcdde1aff - main - release: Install wireless firmware to bootonly media
The branch main has been updated by jrm:
URL:
https://cgit.FreeBSD.org/src/commit/?id=655fcdde1aff164a3a02ad07333467e20d4c
commit 655fcdde1aff164a3a02ad07333467e20d4c
Author: Joseph Mingrone
AuthorDate: 2025-07-16 13:46:34 +
Commit: Joseph Mingrone
CommitDate: 2025-07-18 16:27:32 +
release: Install wireless firmware to bootonly media
Also install wireless firmware packages to the bootonly ISO and the
mini-memstick image so users can fetch installation files over a
wireless connection.
Reported by:Mark Philips
Reviewed by:bz, emaste, imp, releng (cperciva)
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D51348
---
release/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/release/Makefile b/release/Makefile
index 7cafd7ddb787..5d7d1402d6f8 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -276,6 +276,7 @@ bootonly:
.if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG))
# Install packages onto release media.
${PKG_INSTALL} pkg || true
+ ${PKG_INSTALL} wifi-firmware-iwlwifi-kmod wifi-firmware-rtw88-kmod ||
true
${PKG_CLEAN} || true
.endif
# Set up installation environment
