From nobody Mon May 5 07:03:08 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZrXY90Gq2z5v2LR; Mon, 05 May 2025 07:03:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZrXY86FjFz3D4h; Mon, 05 May 2025 07:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746428588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NpQlLgEDFuIkBgk3y/KMdvLn+KfoTXTO8uqINcAfIt0=; b=dGEMBSob3GjsIgKRFJLumdxrWpX8Ra5rclY8ym8IO/db+BTfDS5RC9497LTqAHHjii3Q3H 3c9ys9xzhpd/f4CWKOFKA9V7hyBzZMjbFIXVUYG6OmiLcvj9Z1fdx4NC2LlAIbPG53UDxc lVQe4dZsfcpKzF6MGyPbPgdvSalrsWVIarvhwR5B8qIw/lAX6fJveYXBGXbSk+C3geiT0P qdT94nYzGhG7+9nxuYqIYSGgaUqAfqCyKlHlcFghp3Fu6gjKa7Cqz2w0E5n5OHLd1l1NH8 N9Bq2zeoG3TdB3IJvAYLfdSa6CiKeAqKrY0UGisvA6n1qXqnyniNF5KaJTQXpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746428588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NpQlLgEDFuIkBgk3y/KMdvLn+KfoTXTO8uqINcAfIt0=; b=oQdy9kOQjsHF1RYBO+iFb6kQiWNLd2y/Ywav+gblyJvMAbqs4s3OAcAa+NLTzlw0uRwYVF IhkgzKW3Qr3vfkV0/mAv5GmisVNGTCaE6DcX/7pbj5zEK73CrR3V2gtzngK7KsiYSMC7tD C+pwaJ32Ua7ADpARo1Pt0TCD8wniEOL7N7lCASSNiehxW/NJ9b8a2QxbGLj053UQ0Lj6vQ FOxquDIRrjWQ4M89oXvoH6JYvsMehKF9AriilrpotamhzV4U7STlNH4Yr9GulJ0YQfFitO 2JCHz3vdktMwZVQ3dufHyv/J5LIx6tZflWTbKQxBsEugsHtfDdQFJcL9wqEeSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746428588; a=rsa-sha256; cv=none; b=TEgiGtp2qbWyBvBP0sRN/LHzrFmk28YAJo0P7Xf3Rjd6EVVNIXK87rKZTzb2gWrDCnkuvE 5yAygep49swICo3+JNE8HpDOrsIkfXc4dIMmrSYM/koiQo8iT1AzQGtYj1BOuAgQb5fz4u hGQW061MtV+Vr16kf0nQHNdudeCj1YF8KEYNDaxHDw/jsIFfFgXbBUeB+jnRJbg5Cgtint GKF0nNzbue3qfw8ufRSjqzRYy0awekUI47dMacqK0herxBpKyIy5n8T8SYvvzIHadRc9I4 E7c5DKuuSVLnYQMm2SnKVYK2WEtV8yZHWi34y7AB3laf1cl6u33YhNI096e/Sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZrXY85lGDz13hp; Mon, 05 May 2025 07:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 545738rF036987; Mon, 5 May 2025 07:03:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 545738gj036984; Mon, 5 May 2025 07:03:08 GMT (envelope-from git) Date: Mon, 5 May 2025 07:03:08 GMT Message-Id: <202505050703.545738gj036984@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 95d87d5f5655 - releng/14.3 - arm: Improve the creation of kernel.bin List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 95d87d5f5655008def3f7658820ee7dd6191236f Auto-Submitted: auto-generated The branch releng/14.3 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=95d87d5f5655008def3f7658820ee7dd6191236f commit 95d87d5f5655008def3f7658820ee7dd6191236f Author: Michal Meloun AuthorDate: 2024-11-03 12:15:33 +0000 Commit: Colin Percival CommitDate: 2025-05-05 07:01:44 +0000 arm: Improve the creation of kernel.bin Instead of relinking the kernel without elf headers, replace them with a binary blob of the same length starting with a jump to the kernel's start address. This ensures that all symbols stay at the same offsets as in the original kernel, so kernel.debug remains valid also for kernel.bin. Also ensure that the awk script used runs with the neutral locale defined. Awk 'write' is a locale compilant, and script is used to write binary data to a file, so it needs to ensure that bytes > 127 are written unchanged. While I'm on, set the neutral locale also for arm64, where the same script is used to generate the kernel booti image. Reviewed by: emaste, imp Approved by: re (cperciva) Differential Revision: https://reviews.freebsd.org/D47488 (cherry picked from commit ba045ba49dedb068ba2f0e13fbb1c1a91fde8333) (cherry picked from commit bec5167645b5d157a1c980099162362f115ccbfe) --- sys/conf/Makefile.arm | 39 ++++++++++++++++++++------------------- sys/conf/Makefile.arm64 | 1 + 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm index 5195191e0156..3f4248c85cd0 100644 --- a/sys/conf/Makefile.arm +++ b/sys/conf/Makefile.arm @@ -59,6 +59,7 @@ KERNVIRTADDR= 0xc0000000 # "ELF for the ARM architecture" for more info on the mapping symbols. SYSTEM_LD= \ ${SYSTEM_LD_BASECMD} \ + --Map=/usr2/Meloun/ld.map \ --defsym='text_start=kernbase + SIZEOF_HEADERS' \ -o ${.TARGET} ${SYSTEM_OBJS} vers.o; \ $(OBJCOPY) \ @@ -66,25 +67,6 @@ SYSTEM_LD= \ --strip-symbol='$$[adt]*' \ ${.TARGET} -# Generate the .bin (no elf headers) kernel as an extra build output. -# We must relink to generate the .bin kernel, because without headers the -# location of everything changes. We also strip the ARM marker symbols. -KERNEL_EXTRA+= ${KERNEL_KO}.bin -KERNEL_EXTRA_INSTALL+= ${KERNEL_KO}.bin - -${KERNEL_KO}.bin: ${SYSTEM_DEP} vers.o - @echo "linking ${.TARGET}" - @${SYSTEM_LD_BASECMD} \ - --defsym='text_start=kernbase' \ - -o ${.TARGET} ${SYSTEM_OBJS} vers.o - ${SIZE} ${.TARGET} - @${OBJCOPY} \ - --wildcard \ - --strip-symbol='$$[adt]*' \ - --output-target=binary \ - ${.TARGET} - @chmod 755 ${.TARGET} - # hack because genassym.c includes sys/bus.h which includes these. genassym.o: bus_if.h device_if.h @@ -105,3 +87,22 @@ CLEAN+= ${KERNEL_KO}.bin %RULES .include "$S/conf/kern.post.mk" + +# Generate the .bin (no elf headers) kernel +# Copy the kernel to directly executable format (the elf headers are +# stripped and a binary head blob with jump to kernel start address is +# prepended), saving the output in a temp file. +# We also strip arm "marker" symbols which are used only by elf toolchains. Read +# the symbols from kernel.full and pass them to arm_kernel_boothdr.awk, which +# generates a binary header blob that goes on the front of the stripped kernel. +# Cat the header blob and the temp file together to make the kernel.bin file. +${KERNEL_KO}.bin: ${FULLKERNEL} + @${OBJCOPY} --wildcard --strip-symbol='$$[adtx]*' \ + --output-target=binary ${FULLKERNEL} ${.TARGET}.temp + @{ ${NM} ${FULLKERNEL} | \ + LC_ALL=C \ + ${AWK} -f $S/tools/arm_kernel_boothdr.awk -v hdrtype=v7jump && \ + cat ${.TARGET}.temp; \ + } > ${.TARGET} + @rm ${.TARGET}.temp + @echo "created ${.TARGET} from ${.ALLSRC}" diff --git a/sys/conf/Makefile.arm64 b/sys/conf/Makefile.arm64 index 5e706549486a..69717e98a889 100644 --- a/sys/conf/Makefile.arm64 +++ b/sys/conf/Makefile.arm64 @@ -95,6 +95,7 @@ ${KERNEL_KO}.bin: ${FULLKERNEL} @${OBJCOPY} --wildcard --strip-symbol='$$[adtx]*' \ --output-target=binary ${FULLKERNEL} ${.TARGET}.temp @{ ${NM} ${FULLKERNEL} | \ + LC_ALL=C \ ${AWK} -f $S/tools/arm_kernel_boothdr.awk -v hdrtype=v8booti && \ cat ${.TARGET}.temp; \ } > ${.TARGET} From nobody Mon May 5 07:03:09 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZrXYB3LjMz5v2pT; Mon, 05 May 2025 07:03:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZrXYB0HFqz3D0G; Mon, 05 May 2025 07:03:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746428590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Wf00t9CrzqpSI6vPAhgUdFbQkwC83/u1lHGPMkrKzU=; b=wxdp1jKTQpugP0rE0EUaL8//blcv1zydzmafGUWB8A5kWoH4k12yAz1El8wofCuIbv6msl ZEwd2eLTt7zAeHealp2CYeSw4AHdzD4eQIQ3k8ykvjKLdVguHMH/KHWxsOH6UITaHkCWQJ so1gnafVIYJpJANa00ViVDZ9x/Q44Vuq4yDg2ku1elPZ+NA1R+1Rv7GxIf4gZsIn6OKSqI i2FI7rh/fMM64fs3qlctpxjx7nZKVyUmrqyE7sD0uw6eK89g2MtxoUuAFnsx3gkGwFLGbZ 7uUvdFVH9SPlsrzs7Ij6PRFthNBAl5MFuQKt8Nfz1T41IYdr3R7yX9q5vzpZSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746428590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Wf00t9CrzqpSI6vPAhgUdFbQkwC83/u1lHGPMkrKzU=; b=ouIWVWkQ4myy4Ay/wFrr15n4l93mk0sLjDve0mmSQFiNMWxzdcsp6UjI5WsNSwLEikjZeU oEV0yOTQdttiBbPUUD3zHErgyEZxgGqnBl+IUjs4G9hp+2VFz7XeP84wc1aUg67HkLlMjv sPQmH6u31wlpJhmYhW/Cl5IsfBtLRXo/iBel4EYHDFIxwkWwBHLDCB3lZHeMucoPE3hEGw uL9UH6RJ79/htIQVA/AMVVoT9ROaBG9X8FJ4LtJpjYbINwpFd/aoB0tQ6e94PUC+31eZRF zP48Iba7RlXtl2PamethEu5Ls5Ti/PakdzIxSuiWhfSyHWoF8MD2jlxCfTRU0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746428590; a=rsa-sha256; cv=none; b=GMoWaLj/3r1ta1y8tAmFSC5VmkmuKE/Q0bE6Teth7f/s3Oyly7L8OdG5ELSvRR4GlysGUR F7z/QsX9z2/6qxLFXs4YIp7hYolKEbwZ4QGYj1eVedWztRfr/rqDu3iGqukucVt/aH+Pwy y3VGtO9fTJq/bR696Bb6UCuEhNRyOuvB5eGTqLGTomhGF3SKvAP5SRJBldYMSdN95rbzOW 71wW9YPmHP9hzMUbxkJuKlH1BrZ8mP8zbr/VvTKMtc0p54D9K+8l5TG5ad5GHF+zvZkj+R PJ3DNoiD23CtXbF+w/KXZNxI+tK7G23Zizy1zancXrJq9fX8MP4EyQEU1q1/+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZrXY96gRQz13mW; Mon, 05 May 2025 07:03:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 545739N2037021; Mon, 5 May 2025 07:03:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 545739MQ037018; Mon, 5 May 2025 07:03:09 GMT (envelope-from git) Date: Mon, 5 May 2025 07:03:09 GMT Message-Id: <202505050703.545739MQ037018@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: c3ecee5b38e3 - releng/14.3 - arm: remove accidentally added -Map switch to linker List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: c3ecee5b38e31f127ce6f185110ca0690f708e90 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c3ecee5b38e31f127ce6f185110ca0690f708e90 commit c3ecee5b38e31f127ce6f185110ca0690f708e90 Author: Michal Meloun AuthorDate: 2024-11-09 07:25:15 +0000 Commit: Colin Percival CommitDate: 2025-05-05 07:02:29 +0000 arm: remove accidentally added -Map switch to linker Approved by: re (cperciva) Fixes: ba045ba49ded (cherry picked from commit 0283eebb4a54c7270f9ac03bb4ed2742cb959c28) (cherry picked from commit 0aca1d4e7c766fea577129fdae5796244998b7d6) --- sys/conf/Makefile.arm | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm index 3f4248c85cd0..0e71f8b2f8df 100644 --- a/sys/conf/Makefile.arm +++ b/sys/conf/Makefile.arm @@ -59,7 +59,6 @@ KERNVIRTADDR= 0xc0000000 # "ELF for the ARM architecture" for more info on the mapping symbols. SYSTEM_LD= \ ${SYSTEM_LD_BASECMD} \ - --Map=/usr2/Meloun/ld.map \ --defsym='text_start=kernbase + SIZEOF_HEADERS' \ -o ${.TARGET} ${SYSTEM_OBJS} vers.o; \ $(OBJCOPY) \ From nobody Mon May 5 09:38:32 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zrc0S4LpMz5vDM6; Mon, 05 May 2025 09:38:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zrc0S3cX9z4LTv; Mon, 05 May 2025 09:38:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746437912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ui3dmUFhZEhrgTGzzyYUM6cF3LpSH6O8X78IQEGudQc=; b=lyp22tP7Ikl6SvTF5qudq7jUKUdDskIryHhzx1Hw0fikPHrNNP/U7+lBSqZslKl8o6eN+t HroRCMeHZHF52REzeEnYv3qVnPbdtqVYQXyANgZmcIMro8QyN0PlFDTPZgt9F0x5ppeeOx GsA8IJhYVcADBvo06t85RvGJKo0+u7mnAEuxMCohICC72pokwMhWQqOof0knXurmnoamOk E28Kc2vryupKEkluPwAlOIz340VfqWlZrAeaCxHt7YhZFe8FoKoIxJTkFDu8rRINpzPUWz C4R1efBIQBo6vf7Si5mgPtlWW9ZiXI0CUfU6pPVj1HLoYKZG6ihqFrcnoZqpng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746437912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ui3dmUFhZEhrgTGzzyYUM6cF3LpSH6O8X78IQEGudQc=; b=jY5aOjCmbRq+SmNDHNmKe5bU3vfF1LTfMGjvpYJTTwK7A+vF8F2wWcDkpMCuk2WXe//V5H 6im79SkC5tNINZPLJ1F4mgPod9M3kNe9178+HvX/9gaMa2HQgWkJK8yO279PqD9+PzhpgG vAN1VHHynsWwJv5Xqw5/+J+V0BsMFm7WZosvkrDkYFRs9vWkpAPYwPbYeN95xKiBQokQ+R i3WO9HhkVQ/LtGaeXvFVxcXaf0h6dOHzYdGD0E4bnerQL1E/NPPUnYszh5+ardnahfx3/o 53KQkqEyAvD+jd6ldGzW2rTUp4vHJvUKi8NLurMyqljyqHhGLwi4o1QSP71T6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746437912; a=rsa-sha256; cv=none; b=pGnb9WG4sakpENiv/HDlWZHjbRgIULvEip11K/Pxv0O1MkVEqY169dP4eryhPD1ITnheU7 G1FYumIsxDTHCgtNazNZ9QZT9OSGMh/XaZBCPNkitamuMSQlNc7HZbyjA/GLYhk/jaJ9ks NXzw2RXwXXSlVRUzl5xwwkIrvpzyRAfd670RZICpy7S8qAPNR98+tgkabhNMJLNnbTPfRo cC45Z9wA0EtYbIlhkZ/grSWvMgu9MyrwYq7malm2LI3vCLSNWFxbwqTy++KWfVD4vsQ9CB T++iPtGpsEYd9C5sqK8oMw/q/+usRSHL1eYHU+NNx9coL/LB12e0MP0ERNk2rA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zrc0S3Crbz17Y0; Mon, 05 May 2025 09:38:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5459cWms020447; Mon, 5 May 2025 09:38:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5459cWDO020444; Mon, 5 May 2025 09:38:32 GMT (envelope-from git) Date: Mon, 5 May 2025 09:38:32 GMT Message-Id: <202505050938.5459cWDO020444@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 4939a4a9cd14 - stable/14 - Use .pieo extension for WITH_PIE bsd.prog.mk output List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4939a4a9cd14a2a746a689f7b26fc9fff615326d Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=4939a4a9cd14a2a746a689f7b26fc9fff615326d commit 4939a4a9cd14a2a746a689f7b26fc9fff615326d Author: Dimitry Andric AuthorDate: 2025-04-21 19:52:29 +0000 Commit: Dimitry Andric CommitDate: 2025-05-05 08:57:54 +0000 Use .pieo extension for WITH_PIE bsd.prog.mk output When object files for programs are built using bsd.prog.mk, and WITH_PIE is enabled, the extension used is still plain ".o". To be consistent with bsd.lib.mk, and to allow changes in WITH_PIE settings to propagate correctly, the extension should be ".pieo" instead. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49966 (cherry picked from commit 245bb0110639fe963086fb2903143dbd4e6ac48c) --- share/mk/bsd.prog.mk | 15 ++++++++------- share/mk/bsd.progs.mk | 2 +- tests/sys/fs/fusefs/Makefile | 8 +++++++- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 8c3ba69af73d..3895ff67a787 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -4,7 +4,7 @@ .include .include -.SUFFIXES: .out .o .bc .c .cc .cpp .cxx .C .m .y .l .ll .ln .s .S .asm +.include # XXX The use of COPTS in modern makefiles is discouraged. .if defined(COPTS) @@ -47,13 +47,14 @@ LDFLAGS+= -Wl,-znorelro LDFLAGS+= -Wl,-zrelro .endif .endif -.if ${MK_PIE} != "no" # Static PIE is not yet supported/tested. -.if !defined(NO_SHARED) || ${NO_SHARED:tl} == "no" +.if ${MK_PIE} != "no" && (!defined(NO_SHARED) || ${NO_SHARED:tl} == "no") CFLAGS+= -fPIE CXXFLAGS+= -fPIE LDFLAGS+= -pie -.endif +OBJ_EXT=pieo +.else +OBJ_EXT=o .endif .if ${MK_RETPOLINE} != "no" .if ${COMPILER_FEATURES:Mretpoline} && ${LINKER_FEATURES:Mretpoline} @@ -153,7 +154,7 @@ PROGNAME?= ${PROG} .if defined(SRCS) -OBJS+= ${SRCS:N*.h:${OBJS_SRCS_FILTER:ts:}:S/$/.o/g} +OBJS+= ${SRCS:N*.h:${OBJS_SRCS_FILTER:ts:}:S/$/.${OBJ_EXT}/g} # LLVM bitcode / textual IR representations of the program BCOBJS+=${SRCS:N*.[hsS]:N*.asm:${OBJS_SRCS_FILTER:ts:}:S/$/.bco/g} @@ -189,10 +190,10 @@ SRCS= ${PROG}.c # - the name of the object gets put into the executable symbol table instead of # the name of a variable temporary object. # - it's useful to keep objects around for crunching. -OBJS+= ${PROG}.o +OBJS+= ${PROG}.${OBJ_EXT} BCOBJS+= ${PROG}.bc LLOBJS+= ${PROG}.ll -CLEANFILES+= ${PROG}.o ${PROG}.bc ${PROG}.ll +CLEANFILES+= ${PROG}.${OBJ_EXT} ${PROG}.bc ${PROG}.ll .if target(beforelinking) beforelinking: ${OBJS} diff --git a/share/mk/bsd.progs.mk b/share/mk/bsd.progs.mk index 2c8baa02b9e6..378767eef4e2 100644 --- a/share/mk/bsd.progs.mk +++ b/share/mk/bsd.progs.mk @@ -109,7 +109,7 @@ _PROGS_ALL_SRCS+= ${s} .if !empty(_PROGS_COMMON_SRCS) _PROGS_COMMON_OBJS= ${_PROGS_COMMON_SRCS:M*.[dhly]} .if !empty(_PROGS_COMMON_SRCS:N*.[dhly]) -_PROGS_COMMON_OBJS+= ${_PROGS_COMMON_SRCS:N*.[dhly]:${OBJS_SRCS_FILTER:ts:}:S/$/.o/g} +_PROGS_COMMON_OBJS+= ${_PROGS_COMMON_SRCS:N*.[dhly]:${OBJS_SRCS_FILTER:ts:}:S/$/.${OBJ_EXT}/g} .endif .endif diff --git a/tests/sys/fs/fusefs/Makefile b/tests/sys/fs/fusefs/Makefile index 00e2e208989e..cff8a0a483ad 100644 --- a/tests/sys/fs/fusefs/Makefile +++ b/tests/sys/fs/fusefs/Makefile @@ -57,6 +57,7 @@ GTESTS+= xattr .for p in ${GTESTS} SRCS.$p+= ${p}.cc SRCS.$p+= getmntopts.c +SRCS.$p+= mntopts.h SRCS.$p+= mockfs.cc SRCS.$p+= utils.cc .endfor @@ -89,9 +90,14 @@ CXXWARNFLAGS+= -Wno-vla-cxx-extension CXXFLAGS+= -I${SRCTOP}/tests CXXFLAGS+= -I${FUSEFS} CXXFLAGS+= -I${MOUNT} -.PATH: ${MOUNT} CXXSTD= c++14 +.for f in getmntopts.c mntopts.h +CLEANFILES+= ${f} +${f}: ${MOUNT}/${f} .NOMETA + ln -sf ${.ALLSRC} ${.TARGET} +.endfor + LIBADD+= pthread LIBADD+= gmock gtest LIBADD+= util From nobody Mon May 5 09:38:47 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zrc0l5d4xz5vDM8; Mon, 05 May 2025 09:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zrc0l53nyz4LbY; Mon, 05 May 2025 09:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746437927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rPlflGdh+QWIBmmZfSL5lAo3LzVR3XQkit8QthkEZvs=; b=UDVSZluE9n3VX22HMjMxQ0hwqhyS6roTGuEqVfG1v/ZqT2ncMZO0gWAZdCr+J+Tw2Yphcr ZNSyA0Iskb9aAtkbMkoIuKhNmEaFgt+xLS1YVyTcDYpwjMMqJJ58acG++VtgbFpRHfhuOk hkk6txf6NzTIrUEX2qa3Sj6W6R1UZzwSL78ZllWJXM5xV2bDraroMbv+QwWXG46+zB9eVA kCOrvfgIP8k1+oiPdI/ZSI0Cu72uq08ei9rSEJgUw/rVg5sgYDlhedy/FXbUrh1Y1p/CM2 qzcSWLCf+SA9fWsnTD/QjivFFcKCKDELmyP0unGz/tF/7VakEahCnTy77DIm8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746437927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rPlflGdh+QWIBmmZfSL5lAo3LzVR3XQkit8QthkEZvs=; b=Wy8rl5dOC+6aU9l2+3zRhRvhxKUyw94x+4dTilSjZ6seSzm/aCV795XWMeWnM6iUG/r4OF 893KSRRNECs5Oupjmd8RbVA7uA+4iLrLUteOwOY9sHqgW14A7q0fUp1E9k5f/wnBcMy4jl aoNTN8ggI1tDt1RVDo34ZLIDa9rlFttjQnP/8T20TQoBPmY+E/c+LkwjLUHcdtiS3ADQT7 XmfDSb9C3iM0lgu+FKeDEdvs1+48zG1ntUT3lYmWcJPlWY8JVXX8cMbUAiHwCRLbUUUU6O TgLbk4NBa7fWl/0Af1UJYBRl61AQAbOmAiutyPHbueBk9ULr/PWVufXZITLQBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746437927; a=rsa-sha256; cv=none; b=PhLwlbtMcwPmnvE+yny7SzOyiQiruAnxI/Qee1uCR6H/7xrkHKa2NallMh1gqqoW/vO96x OVEAZ2+Pyh70uR0De0MpXMuDEr1S8qe6UZ16oYAD6hwSbNh5iRC2aq2Ow0Oty7lMKyZgmk hPS8saBcm+ZC8Bp40XIIGgK7g4KW+VXbsB/ga4W07qEroo14ylQ9LBmPOBskkspOgzHii4 CFL3nJBHu1yWZiYbCowbjWB2NKeP3uHH65hLw8d2lLlZLHA6MQSTj/CgJGkbB5zBGHtNB4 M+PAeFEFtTEXVanoKkLelQTwRoJc4q3IqIUKyaB7OhJHPIpRcvzm4H+8vZJLSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zrc0l4g03z17Y1; Mon, 05 May 2025 09:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5459clRR020642; Mon, 5 May 2025 09:38:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5459cl3a020639; Mon, 5 May 2025 09:38:47 GMT (envelope-from git) Date: Mon, 5 May 2025 09:38:47 GMT Message-Id: <202505050938.5459cl3a020639@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 979864eef41b - stable/13 - Use .pieo extension for WITH_PIE bsd.prog.mk output List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 979864eef41b5f8e4d201c2b37e0733c33cf41b2 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=979864eef41b5f8e4d201c2b37e0733c33cf41b2 commit 979864eef41b5f8e4d201c2b37e0733c33cf41b2 Author: Dimitry Andric AuthorDate: 2025-04-21 19:52:29 +0000 Commit: Dimitry Andric CommitDate: 2025-05-05 08:59:30 +0000 Use .pieo extension for WITH_PIE bsd.prog.mk output When object files for programs are built using bsd.prog.mk, and WITH_PIE is enabled, the extension used is still plain ".o". To be consistent with bsd.lib.mk, and to allow changes in WITH_PIE settings to propagate correctly, the extension should be ".pieo" instead. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49966 (cherry picked from commit 245bb0110639fe963086fb2903143dbd4e6ac48c) --- share/mk/bsd.prog.mk | 15 ++++++++------- share/mk/bsd.progs.mk | 2 +- tests/sys/fs/fusefs/Makefile | 8 +++++++- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 8c7de9be4093..ee6282de4f8a 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -4,7 +4,7 @@ .include .include -.SUFFIXES: .out .o .bc .c .cc .cpp .cxx .C .m .y .l .ll .ln .s .S .asm +.include # XXX The use of COPTS in modern makefiles is discouraged. .if defined(COPTS) @@ -47,13 +47,14 @@ LDFLAGS+= -Wl,-znorelro LDFLAGS+= -Wl,-zrelro .endif .endif -.if ${MK_PIE} != "no" # Static PIE is not yet supported/tested. -.if !defined(NO_SHARED) || ${NO_SHARED:tl} == "no" +.if ${MK_PIE} != "no" && (!defined(NO_SHARED) || ${NO_SHARED:tl} == "no") CFLAGS+= -fPIE CXXFLAGS+= -fPIE LDFLAGS+= -pie -.endif +OBJ_EXT=pieo +.else +OBJ_EXT=o .endif .if ${MK_RETPOLINE} != "no" .if ${COMPILER_FEATURES:Mretpoline} && ${LINKER_FEATURES:Mretpoline} @@ -149,7 +150,7 @@ PROGNAME?= ${PROG} .if defined(SRCS) -OBJS+= ${SRCS:N*.h:${OBJS_SRCS_FILTER:ts:}:S/$/.o/g} +OBJS+= ${SRCS:N*.h:${OBJS_SRCS_FILTER:ts:}:S/$/.${OBJ_EXT}/g} # LLVM bitcode / textual IR representations of the program BCOBJS+=${SRCS:N*.[hsS]:N*.asm:${OBJS_SRCS_FILTER:ts:}:S/$/.bco/g} @@ -185,10 +186,10 @@ SRCS= ${PROG}.c # - the name of the object gets put into the executable symbol table instead of # the name of a variable temporary object. # - it's useful to keep objects around for crunching. -OBJS+= ${PROG}.o +OBJS+= ${PROG}.${OBJ_EXT} BCOBJS+= ${PROG}.bc LLOBJS+= ${PROG}.ll -CLEANFILES+= ${PROG}.o ${PROG}.bc ${PROG}.ll +CLEANFILES+= ${PROG}.${OBJ_EXT} ${PROG}.bc ${PROG}.ll .if target(beforelinking) beforelinking: ${OBJS} diff --git a/share/mk/bsd.progs.mk b/share/mk/bsd.progs.mk index f86e95bed749..15e359ac72c0 100644 --- a/share/mk/bsd.progs.mk +++ b/share/mk/bsd.progs.mk @@ -109,7 +109,7 @@ _PROGS_ALL_SRCS+= ${s} .if !empty(_PROGS_COMMON_SRCS) _PROGS_COMMON_OBJS= ${_PROGS_COMMON_SRCS:M*.[dhly]} .if !empty(_PROGS_COMMON_SRCS:N*.[dhly]) -_PROGS_COMMON_OBJS+= ${_PROGS_COMMON_SRCS:N*.[dhly]:${OBJS_SRCS_FILTER:ts:}:S/$/.o/g} +_PROGS_COMMON_OBJS+= ${_PROGS_COMMON_SRCS:N*.[dhly]:${OBJS_SRCS_FILTER:ts:}:S/$/.${OBJ_EXT}/g} .endif .endif diff --git a/tests/sys/fs/fusefs/Makefile b/tests/sys/fs/fusefs/Makefile index 8e6fdd10c377..c5101be6026f 100644 --- a/tests/sys/fs/fusefs/Makefile +++ b/tests/sys/fs/fusefs/Makefile @@ -57,6 +57,7 @@ GTESTS+= xattr .for p in ${GTESTS} SRCS.$p+= ${p}.cc SRCS.$p+= getmntopts.c +SRCS.$p+= mntopts.h SRCS.$p+= mockfs.cc SRCS.$p+= utils.cc .endfor @@ -88,9 +89,14 @@ CXXWARNFLAGS+= -Wno-vla-cxx-extension CXXFLAGS+= -I${SRCTOP}/tests CXXFLAGS+= -I${FUSEFS} CXXFLAGS+= -I${MOUNT} -.PATH: ${MOUNT} CXXSTD= c++14 +.for f in getmntopts.c mntopts.h +CLEANFILES+= ${f} +${f}: ${MOUNT}/${f} .NOMETA + ln -sf ${.ALLSRC} ${.TARGET} +.endfor + LIBADD+= pthread LIBADD+= gmock gtest LIBADD+= util From nobody Mon May 5 12:13:06 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZrgQy5SQFz5vQfc; Mon, 05 May 2025 12:13:14 +0000 (UTC) (envelope-from olce@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZrgQy4pBDz3JJ1; Mon, 05 May 2025 12:13:14 +0000 (UTC) (envelope-from olce@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746447194; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=3VJHABaLEtAVJ19BepKzdOljYjf4YAcuZ/tqG2LYFFo=; b=Zheg2JkumJl6z4Fx+im2U64Mc72GNEPD4j8tQ5RntJTvrDSRejEBePLR4OosEy7kt542YJ KqRMVoNHenxkufIOcL1xBGzK9HExUuuuPvRUKcEUTq0tXKkpsqgq3kr1h6CIRnUC7uDPy7 8pd3S6GxAFjMiE3LQ87RFai5txacNIh2F0Q1E7s30ZQwYHYGsNIFn7tMkYAMZW4+vp2UKA qGHuhqbPPX3YUpozoKrwY/YCUsjr07PC7ROGzdwVmxWwEeRbzqTRmCntlD5/IYnVAVDOiu g2T/Z6SxKlwu+tgqg7RVqei0T4QygVoYmtmwQl1f+zAXnpiIIEgASAQQ2fMXrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746447194; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=3VJHABaLEtAVJ19BepKzdOljYjf4YAcuZ/tqG2LYFFo=; b=lrPAg+5wtyT20jirj2CwV8EyWZldTtZM/52FRepjTT/c8fNGDfv2LgbuW2hmWX3UCWjr1h AkyDV8hS1ArBMSE9G+8ZApLUWhuof9P/LtDncKqJPsdGIWJ60wcKnZ2X/JXUGtmE96Htb2 u0EmPs6qq2yGKO2p6LLod+zaD40H/XErChCuDwAmdt+mWWepRJL2wjRmFFTbv5AsZ3N/aS oagATPPXoY2uK6/d6ejqNDYy22BzPB3sDBm6fTCqiIIrRkHrIPWeglGURX850+HFEGrleo pWBshXz5YkWNVPzHaJzd7BsYGhPKA7DJ2ZVF4SI06VLsyg97jPHLd2/NQ8XwAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746447194; a=rsa-sha256; cv=none; b=XRvnBITRUzf8mGN+BjyjwNsXZX04Jd1cw/8PJx9x0XO32d7wqbejrXiWSlen2C51ox3mMA t4T4eplYnoJ4CoZF9n7hEUgfJ27pDMhZm/84VpqgEFF53PUWx2Rc5KfnfWBM0kPlXdDJgx WvZlB/8LjNEZMrtjy5KN3h5KtLIOEICjaUBIkNFIIzgBshyHd5he0XqOIVXi4Scd9Rj00a za7rBhs8UsuNIm7blIa9gbrbxLdrGrS3vh85xNaf+BbcZr9DNL4HNUFP9/KZHTaxJZaLAD q8OUaYuMH67Va9xccQ5NlvVxgD2JDSYNyp/DOZ8e6aJOlviQErNhLS6Dne9duw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from ravel.localnet (aclermont-ferrand-653-1-222-123.w90-14.abo.wanadoo.fr [90.14.66.123]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: olce/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4ZrgQy0Y0Zz1BP7; Mon, 05 May 2025 12:13:13 +0000 (UTC) (envelope-from olce@freebsd.org) From: Olivier Certner To: "Piotr P. Stefaniak" Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Subject: Re: git: 154ccb0196cd - stable/14 - ps(1): Update some options' conformance/practice comments Date: Mon, 05 May 2025 14:13:06 +0200 Message-ID: <2988597.slGk94SIus@ravel> In-Reply-To: References: <202505011951.541JpiQV068751@gitrepo.freebsd.org> List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart3040517.hHqAuc6tWs"; micalg="pgp-sha384"; protocol="application/pgp-signature" --nextPart3040517.hHqAuc6tWs Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="UTF-8"; protected-headers="v1" From: Olivier Certner To: "Piotr P. Stefaniak" Date: Mon, 05 May 2025 14:13:06 +0200 Message-ID: <2988597.slGk94SIus@ravel> In-Reply-To: MIME-Version: 1.0 > >- /*- > >+ /* > > No opinion on which it should be, but the minus character is meaningful > within the context of indent(1) - it won't reformat "block" comments. Thanks for pointing that out, I didn't know. I think removing them was OK, as these block comments are really nothing special. Actually, I probably should have reformatted them to eliminate the margin for all but the first line. -- Olivier Certner --nextPart3040517.hHqAuc6tWs Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQIzBAABCQAdFiEEmNCxHjkosai0LYIujKEwQJceJicFAmgYq1IACgkQjKEwQJce JicOFhAAif9Ov4h0k77xALGwZ3sLw8NUb16x7Psgw//N0K2J1SCxLslugmpUx8IZ elzcAMr2/Z3HcqwpegFiygxAv08xPhilIdwn6bzWsiN/sX/KYQeX9Ex9a8OwUo30 6HbSa57/TIYcKGH2gzoFtWffGaG1QT15zpT/HjXb+X700Zo390Y0YU3ycP9GUJE0 SRlMv7kFV6x/TaRRxG+yGSD+Gk0x03AsKT5k4Ofu2BFKWb9z/kSBlWcKgluBFHYu NGw5QM8Zk2zMBiA+nK+m5ROvlxP6uK3gNtnEJLxNm/1Or4nN6d+9JXByvm7rRHkH ahyopQDA5wZdHMu/CZHgea7jz38loCZ/pvmVFQQx3diM9TFV6KsH9ymW9OHi9d/0 aE7O8esc9h5hs3rFLMrUJhs82oNhO57LszHuaX1ZMFnnOmRzwBuNwtFC+Mm8Crmr cgYYO4ycRxI9m6RTzdHCcvjYvq4qsnIcPfl+85hENhMFVHj/OI0sbH46dqRo8X/F qukmPnbh4nbKkrHSdw9G0RJsvWfUWVRM3BSUfeDgxKxb1tb7Q8iks8qAVQSXXjtk 4TRThMIpggYoLfinbXDfqFNe+Kh3RsUpXmOUlzV9Mps1Fd7KEgI2ABKyEd/ijLOA lxobVJ76oTyUdFl5Z6+DvajwoQI0V5NI46w2EcCqPgu9FNo1qwQ= =SOyf -----END PGP SIGNATURE----- --nextPart3040517.hHqAuc6tWs-- From nobody Mon May 5 13:29:02 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zrj6h29rlz5vWWY for ; Mon, 05 May 2025 13:29:16 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pg1-x530.google.com (mail-pg1-x530.google.com [IPv6:2607:f8b0:4864:20::530]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zrj6h0KQfz3tNh for ; Mon, 05 May 2025 13:29:16 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pg1-x530.google.com with SMTP id 41be03b00d2f7-af548cb1f83so4249480a12.3 for ; Mon, 05 May 2025 06:29:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1746451755; x=1747056555; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=HHftlqA2UFwdJ3edysHrE0hA+iNYug0DSD6mic0LMi0=; b=RA4tv+AtpT3xg0ZjuThHjONP55dYn/rCZR0vh/4biPrw5Ychwb+8jEW59sKoN2amzy VhaaiUT5gF7I5l+3PZzdGse49wYC6V+REJgMDDqwJ9PQChdqAtL2WIdTEiIOycztlyY/ y1/3j67F/4MOqUEUUL2pdx/tubBcS8LKUmAX765nMFzN5S/JI7C0w+2mmQR1c+W3Epfm YKfSHrhaSK6uM2V/KvaFg4fiHDZivAyVblDi2RS75hAgikzULJ8mfGNp2DtT9HuAyT1b WwmZbRMzHqulbXd7nBXJ8WqiqQ5T6C8C4aiV52Tmo7z2ip94pzfxGgwYkFG9zGcgb999 bz7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746451755; x=1747056555; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=HHftlqA2UFwdJ3edysHrE0hA+iNYug0DSD6mic0LMi0=; b=jwn+lJDOm0lXdquGjFSV9ri6Z2UWIW7RUn8DdfHUqdI6+DG4IoD8ktKAhQQ4XUjc0M jHeNcC9vtB1PjvsrNea0+561Sn4u+gi4kjdnz+oBcnYnKPioK8r+bNgYL4ZEf/6wDKKl h7xbLO1CNklwXWlW6BoTHPj/s+X9P+L2GTFkokPZe/kB8SwCxJeLIG+oQ3nnbscJNQrE 2ghV5XPGAaenEIN0LEvkGcNCRQ4YNzpWiG0dzPtEzkMel3GOByQdXKcz2KLy2i/CMy49 MIb42yCcz/lS5PJvL7XNJhXAjoHEBuo2TOCGNRh13GAKROtauhVtDFmGxU59FrpTOhau lxVA== X-Forwarded-Encrypted: i=1; AJvYcCU5cUJJC1MEkqe+J7PVSIHzElLTD4C5z++0zji63Hh0ZCJAQcSP8hERuhDKYgWE8DFkgLAYkdEgLs4Gg5TbcsjabKmMDQ/gvvc=@freebsd.org X-Gm-Message-State: AOJu0Yxza2rUFkHSL4H93z0JZ4OtFoQH8xubBDFNVb3jP162+GIY0r+Q kBoFkCtdhP0YG02ivXpvkN7SISiMtgDGKR/5zbuQ/dSlYvmhucxfcHH54TbGigiBc0IHryWwLqk cyrsyQ+9pi0p372XL6seY7T0Y7eANndJ0imFtWw== X-Gm-Gg: ASbGncur14gDSHBcGTZ9et7XyVjMfrbrgsQMBafN352apU9+mO/zwvO/65hC2rthUAo 5TE8hh5rh1CeoMhu/TeEZiDXI4MgMUeEFuGpzVbryCUnFklAGq81L9LXQIBLLgoh9VsJ5lwB/M2 Atoey06UojI//mNvFpAn/UjhwAa5EYzU31+ut5Me7pk+J/3xrQwe+W X-Google-Smtp-Source: AGHT+IGseVImANxbT/1G6M8buXZCoIa5HCob2DZWVLuguAIT9yAYQpRj1fVyOTuQlCQPKg3g2r2wtYZF1EEtCoQi4Ug= X-Received: by 2002:a17:90b:2dcb:b0:305:2d68:8d57 with SMTP id 98e67ed59e1d1-30a619549c1mr10665826a91.5.1746451754627; Mon, 05 May 2025 06:29:14 -0700 (PDT) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 References: <202505011951.541JpiQV068751@gitrepo.freebsd.org> <2988597.slGk94SIus@ravel> In-Reply-To: <2988597.slGk94SIus@ravel> From: Warner Losh Date: Mon, 5 May 2025 07:29:02 -0600 X-Gm-Features: ATxdqUHeDAjZw66mi_dilkF-TpxtMrqPolAW_87TV4AU5epZl3SLx4YnX_4zRFo Message-ID: Subject: Re: git: 154ccb0196cd - stable/14 - ps(1): Update some options' conformance/practice comments To: Olivier Certner Cc: "Piotr P. Stefaniak" , src-committers , "" , dev-commits-src-branches@freebsd.org Content-Type: multipart/alternative; boundary="00000000000073c2fb0634637cc4" X-Rspamd-Queue-Id: 4Zrj6h0KQfz3tNh X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Spamd-Bar: ---- --00000000000073c2fb0634637cc4 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, May 5, 2025, 6:13=E2=80=AFAM Olivier Certner wro= te: > > >- /*- > > >+ /* > > > > No opinion on which it should be, but the minus character is meaningful > > within the context of indent(1) - it won't reformat "block" comments. > > Thanks for pointing that out, I didn't know. I think removing them was > OK, as these block comments are really nothing special. Actually, I > probably should have reformatted them to eliminate the margin for all but > the first line. > Almost nobody uses indent these days on a regular basis. We can drop it for that reason alone, even if the comments were formatted by hand... we likely need to start tagging those with clang format tags.. Warner --00000000000073c2fb0634637cc4 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Mon, May 5, 2025, 6:13=E2=80=AFAM Olivier Certner &= lt;olce@freebsd.org> wrote:
&g= t; >-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 /*-
> >+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 /*
>
> No opinion on which it should be, but the minus character is meaningfu= l
> within the context of indent(1) - it won't reformat "block&qu= ot; comments.

Thanks for pointing that out, I didn't know.=C2=A0 I think removing the= m was OK, as these block comments are really nothing special.=C2=A0 Actuall= y, I probably should have reformatted them to eliminate the margin for all = but the first line.

Almost nobody uses indent these days on a regular basis.= We can drop it for that reason alone, even if the comments were formatted = by hand... we likely need to start tagging those with clang format tags..

Warner
--00000000000073c2fb0634637cc4-- From nobody Mon May 5 16:37:04 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZrnHN4hd1z5vk0s; Mon, 05 May 2025 16:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZrnHN42w4z3bVX; Mon, 05 May 2025 16:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746463024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SM3s3hoD+1GCYtnodIUNY5SLgQJADSjypKDnGCxj1d0=; b=SVAnQR50019YuhIS6smPUKYJOmgF1SbEcxa8x1SWGgLXFOFRQXls5hrAwPPOXAy0Q9OyBj O31JM61OutZM/dAXLTS5Ju7qAGOtnUeILeGJnPcEiCOLltfurscg/JzhAz+2swOT9FnMpn 9EkwISpu9ODKIiCRAeIo4FAy2UGTKuSZ7k/hx5pi9LS/IPC+edYeHj6WAloPAmvsUnxSkH r+0lstSadDeJoHSlz1KFicTrw9IfMdoATLGlhK1PGlm8xCtV/LGNFLxNeIcgmnK4JfGUer phenn15MiXM3AalW1I6Jey4fhRrzzlOoW870hao97L1DW29dtWA4pRB+hpQi3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746463024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SM3s3hoD+1GCYtnodIUNY5SLgQJADSjypKDnGCxj1d0=; b=cvsGQcowxXZYOtpjUko99urYingJClmaMI/ErlJfjYdKchT9hOkWih4mQoQBlY7Xdy2nku qN/uwOwI2uRzkrqnsDbOT5a9uB1wvEWiCcC+7+hr6rUTFD8U+kSX1xMqJfOVW6bsq6CBzj ZFUhK5s8YMgm0bJrV5B1z7m35o4q1VpjBcRfZVSWrFb+0HX1WyxFigv3oAGWk5qUv0Whkl HE+vBdl8sKE0DbCz+GoWPON3pGXwtiJONBy+LKIS04rsNvOpayD24balgE7XjTHLxqsXJA wG34xLVsECN5WwVv7gangr4EvR3N4bNq0Vys8FNTQq8RWIsmTrIaoYsObPVZNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746463024; a=rsa-sha256; cv=none; b=d0/fVurYdtTsGJDA1BmxoRTZFuGhzMmdbRZW8nIpY5ZxY5V/xzyl1xT0bHZDvwwACjBd1f XNdJTale/pGJievCxdwvvlIrUNZrQnYuPqAkDyq45qF/w4ojiBPeegTJkDXElz4Qs6vUx0 d9pVE5iyxR15/EgWTP4C4NXwmK0ye6/Q/H0a2aEDXckctiB90nkkJq48eKU68RnTc5b3U0 J67WuBe43G+wZ2tX6jInpz17gcPKwmZSeE5K7QtskCTjSlAKDrC09TIIow/veHlzZunmW+ h4LCGPHWcqpMc7e/x8zsrTe2yVRU6iE1WReMymLE7z7v9BJZLSzX4wg6IPqCog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZrnHN371Qz69b; Mon, 05 May 2025 16:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 545Gb4Ct009178; Mon, 5 May 2025 16:37:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 545Gb4tV009175; Mon, 5 May 2025 16:37:04 GMT (envelope-from git) Date: Mon, 5 May 2025 16:37:04 GMT Message-Id: <202505051637.545Gb4tV009175@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 3ab24f211ae8 - stable/14 - src.conf.5: Correct LLVM_BINUTILS comment about strings(1) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3ab24f211ae89cea051796f8fa2971947ddb55a5 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3ab24f211ae89cea051796f8fa2971947ddb55a5 commit 3ab24f211ae89cea051796f8fa2971947ddb55a5 Author: Ed Maste AuthorDate: 2025-04-30 13:38:29 +0000 Commit: Ed Maste CommitDate: 2025-05-05 16:32:56 +0000 src.conf.5: Correct LLVM_BINUTILS comment about strings(1) Reported by: olivier Fixes: 81fa5c4a828b ("llvm-strings: Install as strings when WITH_LLVM_BINUTILS=YES") Sponsored by: The FreeBSD Foundation (cherry picked from commit 7ca3db1999cd967f9d6d7b259aa7af54aae14a5f) --- share/man/man5/src.conf.5 | 4 +--- tools/build/options/WITH_LLVM_BINUTILS | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 5dd61a50329d..53264e4034b4 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd October 30, 2024 +.Dd April 30, 2025 .Dt SRC.CONF 5 .Os .Sh NAME @@ -959,8 +959,6 @@ Regardless of this setting, LLVM tools are used for .Xr c++filt 1 and .Xr objdump 1 . -.Xr strings 1 -is always provided by ELF Tool Chain. .It Va WITHOUT_LLVM_COV Do not build the .Xr llvm-cov 1 diff --git a/tools/build/options/WITH_LLVM_BINUTILS b/tools/build/options/WITH_LLVM_BINUTILS index 164e6e8ffabd..130997b7e9bf 100644 --- a/tools/build/options/WITH_LLVM_BINUTILS +++ b/tools/build/options/WITH_LLVM_BINUTILS @@ -14,5 +14,3 @@ Regardless of this setting, LLVM tools are used for .Xr c++filt 1 and .Xr objdump 1 . -.Xr strings 1 -is always provided by ELF Tool Chain. From nobody Tue May 6 04:58:43 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zs5l86BGjz5vS5r; Tue, 06 May 2025 04:58:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zs5l75yZ8z47GZ; Tue, 06 May 2025 04:58:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746507523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ax0+YX2SZ9waQMLOcAyzlJzGTi3kUvpiq6UXTNHgl5o=; b=D+bwiFVT8EEGlQ6+iUKTtG0e3Z6+ox3Yg+7jfR5W40r+txvigdm2wUtNv2IeNXKbGwqQ7F jmatbBdZiBy6ZGea7gVAcqsZt1oI6N1x59w6YAC1L0mcjypLDOL4uXAttx8pxG7s1dOPPh H6S7bCykJXz0zy6XSOGD4x2Sd3AOuCkUpGv3eDgCWaDlfdlZ5McODDsAxlFVzHbF9EeGHc w/+NPoc1OjrwXywtDEZJnbQ3tl1hal9iWKtUEEP7G9jDWc0W2J0DnHATKHjfKp5VS9zEat 1OQp/7WI6pyGTdUx9knfNbkS7hqL7FTmcu7yM7H0Ld8mk1HCJBVwy3CC3BpoDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746507523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ax0+YX2SZ9waQMLOcAyzlJzGTi3kUvpiq6UXTNHgl5o=; b=LO120e+3wizdcuSRKTvh3zlhSI1+g7KsHI9rsey+xV/sTM7y8HIOG23KDA3WRFbJMAMacF lw/EuEY7NqLtQt+384WpwwB63eCXtym430cO4fvdhm4gZNgFQDFWEGWatyIue7xZ0bfg+5 RP4E3CSssMtccrrETBSkc57FrHRAyGTC7Ko4l0vdopjWn9wRfkRP0EqLNSMzr5EJsELQGY 36dMTdRnb55wDkHZ9tLR8JE6GvDZ+eeuFVUdKCM1r7mp7FtwuKuF4pTwth8y08THws5/7T ig4mcLgKMdYfVlRAaLizuFnrKydQXqqGJAM62/EWMNgdiCIlWUfwqqPmsC195Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746507523; a=rsa-sha256; cv=none; b=AJwB53OPvyVZ3sa81c1vAxfAzRFQ5gST0aj9iDDuQhRj9Xvgyv8w26qZUNa/SK8z3u1/Q4 pQK/q23QSH/3624YWKZ20GMmJkkvmzOjOS/h3uu91uPxuXjtsf2fmj19bDaN/3xGvGb7Ij QdYi5CgUrdqZo1r0oQEhuBCr01Fmkh+36Z2trYZDzs0QCcxStYzkQx8v8emgk6+bQNBmQF TkeWwkMSVUEwA5uffIryBEjfAHCKWJGkRYeRC6UOfRBnXIgCpxlWubCBXrIe/jw4eaINzl 3QJAGtDB3t5tCIae10BzKQ13ZGogwHKiB5fvaIPYs9PQYtYT/pOjgE+08bytvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zs5l751Cxzm3l; Tue, 06 May 2025 04:58:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5464wh4A096496; Tue, 6 May 2025 04:58:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5464whSm096493; Tue, 6 May 2025 04:58:43 GMT (envelope-from git) Date: Tue, 6 May 2025 04:58:43 GMT Message-Id: <202505060458.5464whSm096493@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Philip Paeps Subject: git: 3502f06c6686 - stable/13 - zoneinfo: also install tzdata.zi and version List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: philip X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3502f06c6686fbb8335872b8bb3b951b549d8b2f Auto-Submitted: auto-generated The branch stable/13 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=3502f06c6686fbb8335872b8bb3b951b549d8b2f commit 3502f06c6686fbb8335872b8bb3b951b549d8b2f Author: Philip Paeps AuthorDate: 2025-04-01 08:09:37 +0000 Commit: Philip Paeps CommitDate: 2025-05-06 01:57:32 +0000 zoneinfo: also install tzdata.zi and version Build and install the shrunk version of the time zone database required by libc++ 19 std::chrono::current_zone (etc). While here, also install the tzdata 'version' file to align more closely with other vendors. PR: 282377 Reviewed by: dim, emaste, imp Differential Revision: https://reviews.freebsd.org/D49577 (cherry picked from commit 91506dba7f2eb147eeb55ec30640bc11755a1e8e) --- share/zoneinfo/Makefile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile index d52ddb7c768d..e903a66dcfab 100644 --- a/share/zoneinfo/Makefile +++ b/share/zoneinfo/Makefile @@ -87,6 +87,20 @@ zoneinfo: ${TDATA} umask 022; cd ${.CURDIR}; \ zic -D -d ${TZBUILDDIR} ${ZICFLAGS} -m ${NOBINMODE} \ ${LEAPFILE} ${TZFILES} + umask 022; cd ${TZBUILDDIR}; \ + read -r version <${CONTRIBDIR}version && \ + LC_ALL=C awk \ + -v DATAFORM='main' \ + -v PACKRATDATA='' \ + -v PACKRATLIST='' \ + -f ${CONTRIBDIR}ziguard.awk ${TZFILES} >${TZBUILDDIR}/main.zi; \ + LC_ALL=C awk \ + -v dataform='main' \ + -v deps='zishrink.awk' \ + -v redo='posix_only' \ + -v version="$$version" \ + -f ${CONTRIBDIR}zishrink.awk \ + main.zi >tzdata.zi; rm main.zi # # Sort TZS to ensure they are the same every build. find -s might @@ -110,6 +124,8 @@ install-zoneinfo: ${CONTRIBDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/ ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ ${CONTRIBDIR}/zone1970.tab ${DESTDIR}/usr/share/zoneinfo/ + ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ + ${CONTRIBDIR}/version ${DESTDIR}/usr/share/zoneinfo/ afterinstall: # From nobody Tue May 6 11:02:33 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZsFpx73fvz5tdkj; Tue, 06 May 2025 11:02:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsFpx6Yswz3m9F; Tue, 06 May 2025 11:02:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746529353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cRAWhPBFw7wcP7+IaOOjYpJGdv9Zhw3oWkVxwj78ta8=; b=VRvY3R4ic5La8WNCZhwGEruBHtQUDd93XmRd/J+jubpcr7BPvpB99fRZvV1bxvIjF2/1Xv 5swrmsoyBWRW13QyH1Jn1uk70TD9uk5pms/Hz05JZrHPH70NDcyzehd9VeTNttz2r58Ee9 t9VSrMv2YVi1yOhfDMu2StVwSBa5RLEorTfGu4YM0u8mFpt7EVopdvTd50gdbm2LWTANjQ lFMrYQJQSMEZplBJm0JPqUitaX9/XWwOP1ggI0uH1kfaWHE4VvUhT/coqov4V7FtXDjqA9 KlfP58AfeeDGMVoe7jFqFBQqDOBrQ1T2OxgEtnc3bC/M6ifGXBqJzWtp4hoEcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746529353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cRAWhPBFw7wcP7+IaOOjYpJGdv9Zhw3oWkVxwj78ta8=; b=rjTGNP39HgH8SsgNnQVSn2JcEzHP3UVg9fUUxtyBBUeAD895w1TOZEAXK3YIMMfh7h/353 x/FUYht78U8C4u1JZKBFJizFpOi3rwXAe1qO8J+a5zcHIrnPsv874YrfrbtHyIqAmHKBTS Lk0oPlsXpsmR/f5eKO4pHsFOnl344BQR0UX00lb4kikyoYEZNLnkUXzvFEIWtCuBzqWuax jZxaS0YTcTwFRVp4NgCTmz+npno38cETXHQbxwjmiIgPtLucYL1L7i8wzIlIbfSlwlWqHq 8MoxZQq5h9zqZ9BKieNtE+G0lvhO8iGn/IMw2EkQdgm+UyOYNtUi19Uj5e/XmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746529353; a=rsa-sha256; cv=none; b=YiRYpVNOaLwNPrAj8x7/aCHmXyQyUOqlrPeKO0XT5bYadnh7yhSU6ZcenHCKeRgVFx4o09 yzmLAeHYHY6Y9+d/lpd8L94w6JyGa8hbsKaRNG8s/+TA8Hvs8+hJXKQpKlaXdcJV9EkdoA oENz106+KA6oA/sRRr7g80QhLbiD0qve7xK7AsSCu7njjE/II3EP55VUU+MSc8M0Rwcvma esHIZBUXhM9NUPzTVh4W5RMSJSH54XqFM9hUDhs3lqnHWfTxPasVwaCU+8hO5zgYyb0xrI F/d/OK3j+vpOt0LNQO86OrKto/7KCUdaIr3KV2HJwo2gVAZG8n8C2MvFEpPd3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZsFpx5xZ7zwxC; Tue, 06 May 2025 11:02:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 546B2XvB091460; Tue, 6 May 2025 11:02:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546B2XWm091457; Tue, 6 May 2025 11:02:33 GMT (envelope-from git) Date: Tue, 6 May 2025 11:02:33 GMT Message-Id: <202505061102.546B2XWm091457@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 5bc4143b95ac - stable/14 - .cirrus.yml: Refactor List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5bc4143b95acc8a2b757cb287d15431f333bb53b Auto-Submitted: auto-generated The branch stable/14 has been updated by bofh: URL: https://cgit.FreeBSD.org/src/commit/?id=5bc4143b95acc8a2b757cb287d15431f333bb53b commit 5bc4143b95acc8a2b757cb287d15431f333bb53b Author: Muhammad Moinur Rahman AuthorDate: 2025-05-01 22:55:59 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2025-05-06 11:01:34 +0000 .cirrus.yml: Refactor Most of the matrix options are manually triggered ones but some of those do not specifically mention them in the name. So add the string ' (manual)` in the name of the jobs for better clarity in the web interface of cirrus CI. These are mostly cosmetic changes and have no effects on the build itself. Will be merged in all stable versions. Approved by: emaste MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50110 (cherry picked from commit 5c67180ffa931242a98b1a747e811f2acbd351db) --- .cirrus.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 2bcb1985e68e..bab6c600ba9b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -14,7 +14,7 @@ env: task: matrix: - - name: amd64-llvm16 World and kernel build and boot smoke test + - name: amd64-llvm16 World and kernel build and boot smoke test (manual) only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual env: @@ -22,7 +22,7 @@ task: TARGET_ARCH: amd64 TOOLCHAIN: llvm16 TOOLCHAIN_PKG: ${TOOLCHAIN}-lite - - name: amd64-llvm17 World and kernel build and boot smoke test + - name: amd64-llvm17 World and kernel build and boot smoke test (manual) only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual env: @@ -30,7 +30,7 @@ task: TARGET_ARCH: amd64 TOOLCHAIN: llvm17 TOOLCHAIN_PKG: ${TOOLCHAIN}-lite - - name: amd64-llvm18 World and kernel build and boot smoke test + - name: amd64-llvm18 World and kernel build and boot smoke test (manual) only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual env: @@ -45,7 +45,7 @@ task: TARGET_ARCH: amd64 TOOLCHAIN: llvm19 TOOLCHAIN_PKG: ${TOOLCHAIN}-lite - - name: arm64-llvm16 World and kernel build and boot smoke test + - name: arm64-llvm16 World and kernel build and boot smoke test (manual) only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual env: @@ -53,7 +53,7 @@ task: TARGET_ARCH: aarch64 TOOLCHAIN: llvm16 TOOLCHAIN_PKG: ${TOOLCHAIN} - - name: arm64-llvm17 World and kernel build and boot smoke test + - name: arm64-llvm17 World and kernel build and boot smoke test (manual) only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual env: @@ -61,7 +61,7 @@ task: TARGET_ARCH: aarch64 TOOLCHAIN: llvm17 TOOLCHAIN_PKG: ${TOOLCHAIN} - - name: arm64-llvm18 World and kernel build and boot smoke test + - name: arm64-llvm18 World and kernel build and boot smoke test (manual) only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual env: @@ -69,7 +69,7 @@ task: TARGET_ARCH: aarch64 TOOLCHAIN: llvm18 TOOLCHAIN_PKG: ${TOOLCHAIN} - - name: arm64-llvm19 World and kernel build and boot smoke test + - name: arm64-llvm19 World and kernel build and boot smoke test (manual) only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual env: From nobody Tue May 6 11:02:34 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZsFpz1KGjz5tdKM; Tue, 06 May 2025 11:02:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsFpz0TGMz3mLY; Tue, 06 May 2025 11:02:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746529355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4EKUKIQFaqVML0KEQqrFpg6OJynGAA7y1suPmKTi11k=; b=l6FCqkK/sxAAYPWoz1r9zp+VuTypXIShVMMAK1AzkQxYrCpT1a0UYWRh+qi68G2ZiL6SAH FoomQqAa/0dBMR75EI1PBXFVD8BYihvbFl+4YxD5rFGfRzh8ExBOQn/mX9QYZ7SAAnFo2P HpUrCsxBLNlTCfgTXEoHpWBXIKJVfpa9Bi77UCBoUBhYzoLA96d0neS5zLGvCldFIfGOsZ PWLitW4UtET6ZHGtfXIqziXUIk9RFaVDJ6RAkZxw0miExu3lyXcNb0rPvC7wCF+AiJ7kU3 //FRvJIsxZy2xPpCjOIcl8Lly6WLBkiCYCjStq/HYLOVm5Bq3CFsMHAR9uWWzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746529355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4EKUKIQFaqVML0KEQqrFpg6OJynGAA7y1suPmKTi11k=; b=yqugivdttund7omfujBWMbqAO9/kfyrF57Tq5qRxbHfFL3tDIEnZqL1Ws5lMG8WlzSvZcP apHbWd4H5ZAvEjoNyfiXNZLvD1p2k26H/yiP3b57ICae6GZs0yqoSYmvln+Kl7PGE1xBr9 tIBFegZv5I4zUWlAG/U4VIFq4dYEx2Gl6w6xS9wTFKaMn82ZjLHOwyKlDfDeqJ/cVD/0Kz wlup/Pp15Rmlwzeb1JB66boGdXhYBPY8FSGdKFIzxZbGTg79qO7OqPbLBNp7M+PoZraCML lm8CnAzYs/4MWO6rZ5/i0CefIWISRu05dW3b0BJWWMv9yqRknvqeuhZ95Lnv7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746529355; a=rsa-sha256; cv=none; b=TuF/dt7ieQJm1NTnzUdm9ZePXa5wk3QAXKSmKYLvG6LqK61C/llijqHFRu80V2dkLUNwVn JDEe0LjFSw2mmOwFh6kTDadbGaXQX53QWDwnVJGKLwv+GBPMO4w7G1MXPYGg8oLQu2ds5f 6qq6wyoeVVlFDtjeS4hjLhau7o/QMKl9CfZjG/9cjXgTTkMmoihj5XRmG9oZ/wKGPzThqE +pU6+Gmiaiqjs6jssIYzZjqXDspsxULJ5hKU2Ps1P+vAO7A9xi14mOHY1JHG9wzFao6zoT tsb/c60uLDPIJjuMkRIMh19B2KkYO1zZiePiWuoL6PUet0ECulRG4lptSBk2ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZsFpz04tkzxZx; Tue, 06 May 2025 11:02:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 546B2Yl9091498; Tue, 6 May 2025 11:02:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546B2Y2P091495; Tue, 6 May 2025 11:02:34 GMT (envelope-from git) Date: Tue, 6 May 2025 11:02:34 GMT Message-Id: <202505061102.546B2Y2P091495@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: bf2ccfcbac03 - stable/14 - .cirrus.yml: Switch image to 14 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bf2ccfcbac03765c682960e85fecdd6164f92c6f Auto-Submitted: auto-generated The branch stable/14 has been updated by bofh: URL: https://cgit.FreeBSD.org/src/commit/?id=bf2ccfcbac03765c682960e85fecdd6164f92c6f commit bf2ccfcbac03765c682960e85fecdd6164f92c6f Author: Muhammad Moinur Rahman AuthorDate: 2025-05-01 22:56:46 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2025-05-06 11:02:14 +0000 .cirrus.yml: Switch image to 14 The current default image is set to 13.4 which is going to reach EOL soon so switch the default CI image to 14. Will be merged into stable/14 only. This has no operational effect on the build itself. Approved by: emaste MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50110 (cherry picked from commit 3740606f2641e2784eca9fe75428b7de46596d3e) --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index bab6c600ba9b..472fab9423a8 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -4,7 +4,7 @@ compute_engine_instance: # gcloud compute images list --project freebsd-org-cloud-dev --no-standard-images platform: freebsd image_project: freebsd-org-cloud-dev - image: freebsd-13-4-release-amd64 + image: freebsd-14-2-release-amd64-ufs cpu: 8 memory: 8G disk: 40 From nobody Tue May 6 12:19:47 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZsHX40F5Rz5tkR9; Tue, 06 May 2025 12:19:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsHX36Yc0z4QXN; Tue, 06 May 2025 12:19:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746533988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LMQKDEWMTbQ1SxOdTjOH5Y3n6j3BMqIJPPTGQrNRzGY=; b=pgemQxAbj2xzHnKVJ4zercQ662xbVSn/Dfk1+DTU0rQYJXlpdbwXBFJiIqidtX2MRw+bwk 1BsGIHDn+Qw96QEK5QsScDeJPaLUJ/cILEdtwhHYhSbGgRhnziXiYuyz0pN5Y0PBOiQxFu QAO63SkzIeeDXLdWn84BMf3sB8a9iBVXmz+spivIonDCeVDlBGNxhALrcG5y1aYwPbFybX a5IhIj8JWvuiE5bQElB0qVbI2wZUWiZW6drSJ9vJGOL5DqnUX/5dGscoPyCm7JtVQQkwQX Qvr6vRA8L4YNDwlEksGTx7ZLLa8IJSeLBfnY83MoEwI0QWsS1ywP2LHCOzqVKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746533987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LMQKDEWMTbQ1SxOdTjOH5Y3n6j3BMqIJPPTGQrNRzGY=; b=exu0uejmzg3njG1JBsVEUpbvD4rJahklTobOVpDLUkW0BUF4jT7VfpRBgxGv9hGX3QsLEQ Ap6gDKFs7fLBL5MpELFk792bJ/gOivjb5TQda1RlYfa6wwpD7hNwurX48lECBl4F8cEN1h r/Y9cvLQrsaTBH2Z95mDOI+hrjbDL2L5Tqcc1lI1W9fg55woOpA0XGoyMzPTsGfiQxhWR7 lpmq0zEcILJUyalh8DFMcwk/gKytk+/8GcK/UOUXFsL4cQXQsLyDdQdkJGMyIqcK15Z8Du GutJm758QEjKKDAFz0BGwNcDnQl10SOV/BSoc3hgLyAQJig8oPc9pEXP9TepKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746533987; a=rsa-sha256; cv=none; b=sFvkycum5IDf91FrfJunE4R63rgjX2Tz8iJ/+k2LSB3ypSEav5Dr3oPO5SOrUEGpDBYuTB AAnIpIt6KID6TlrWxss4RrXxW3/nKx2G0Ah+mlQmCrz7LbZMU1IL1tmi4Tz/bsexX1hzdL cs1kHaDgAvz8xf2GtJ5Hw1+1Z4hclR032mR2gErZRxcgaqVNfRXr177QwawVGS/uU6TyV6 vKLAYXqICDlXqBDqjA6SzBt92bqt2H4xWRyrHOIuHqOeeFVtuDMe/sLivB5mGDKN8lexab PXTjoS38IjeLdn2rMcDktQMJMF1oRU08IyottSMIYBMv6S6uqhHS21IAGfAY0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZsHX35hF9z10Jr; Tue, 06 May 2025 12:19:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 546CJlan026831; Tue, 6 May 2025 12:19:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546CJlQc026828; Tue, 6 May 2025 12:19:47 GMT (envelope-from git) Date: Tue, 6 May 2025 12:19:47 GMT Message-Id: <202505061219.546CJlQc026828@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: f5125f695aeb - stable/14 - arch.7: Replace 13.x with 13.5 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f5125f695aebbec4d03d8415a828b7d0b002407c Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f5125f695aebbec4d03d8415a828b7d0b002407c commit f5125f695aebbec4d03d8415a828b7d0b002407c Author: Ed Maste AuthorDate: 2025-04-12 18:13:14 +0000 Commit: Ed Maste CommitDate: 2025-05-06 12:19:31 +0000 arch.7: Replace 13.x with 13.5 13.5 is the final FreeBSD 13.x release. Sponsored by: The FreeBSD Foundation (cherry picked from commit 2cb892c0b6a525ed604f3abdb3fc62e05af4a60b) --- share/man/man7/arch.7 | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/share/man/man7/arch.7 b/share/man/man7/arch.7 index f87eacfff54f..beb3e434c624 100644 --- a/share/man/man7/arch.7 +++ b/share/man/man7/arch.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 4, 2025 +.Dd April 12, 2025 .Dt ARCH 7 .Os .Sh NAME @@ -104,17 +104,17 @@ Discontinued architectures are shown in the following table. .It arm Ta 6.0 Ta 12.4 .It armeb Ta 8.0 Ta 11.4 .It ia64 Ta 5.0 Ta 10.4 -.It mips Ta 8.0 Ta 13.x -.It mipsel Ta 9.0 Ta 13.x -.It mipselhf Ta 12.0 Ta 13.x -.It mipshf Ta 12.0 Ta 13.x -.It mipsn32 Ta 9.0 Ta 13.x -.It mips64 Ta 9.0 Ta 13.x -.It mips64el Ta 9.0 Ta 13.x -.It mips64elhf Ta 12.0 Ta 13.x -.It mips64hf Ta 12.0 Ta 13.x +.It mips Ta 8.0 Ta 13.5 +.It mipsel Ta 9.0 Ta 13.5 +.It mipselhf Ta 12.0 Ta 13.5 +.It mipshf Ta 12.0 Ta 13.5 +.It mipsn32 Ta 9.0 Ta 13.5 +.It mips64 Ta 9.0 Ta 13.5 +.It mips64el Ta 9.0 Ta 13.5 +.It mips64elhf Ta 12.0 Ta 13.5 +.It mips64hf Ta 12.0 Ta 13.5 .It pc98 Ta 2.2 Ta 11.4 -.It riscv64sf Ta 12.0 Ta 13.x +.It riscv64sf Ta 12.0 Ta 13.5 .It sparc64 Ta 5.0 Ta 12.4 .El .Ss Type sizes From nobody Tue May 6 14:16:03 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZsL6D1v7jz5tspZ; Tue, 06 May 2025 14:16:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsL6D1FqSz497N; Tue, 06 May 2025 14:16:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746540964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WleD1uXpNduxMOlxU4OgsYPlQhhuuU6K5/wSgI7cb0k=; b=xfHNxygTzwGt3lNLQS61hf5lGZpiE1cVQLT7uUZeJW8uzyI3BbOPxoZlKXaMRP10t47p0Y 3UQn+AJKdGJU8GTg6Z0iPyROJfXokxTF34tiuwCSZv6GvnV3DuAkqonhKA6VD2v/6WKddA shP/L9TO+mcLpsBoSUfS6ZglybayBN6weqW59Mk7B5KNFjf07ffh5DJ+AuiAcCjevwsgn2 3arP58J4nBRYRF6BAUeWxDcYNVrIOnTFXedIYDD4t6yrrJ05Tou/qxvkLAQ7XYv5PfITeG DjwfCeElxbO0pt9Hksw6DRHoAlsXnOcstsC81TSnczICQVBywSR4myELSWIKGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746540964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WleD1uXpNduxMOlxU4OgsYPlQhhuuU6K5/wSgI7cb0k=; b=DANipuOGj8FNCgLIKeHpGWijED7K2dSkcb0CPth/cwVej5GME1AvTK4HtBPMkcKX7zbbE3 zpp8hYDczCmXhX/DX0yCUry3vI0tYQpV2U9LlFFGqZZGedE1g3mawwxMp4P7POlhaOS34B +uOuZQlfMb+ZVmkmlmuuifM5O8g8YC5VqUomllE/E2bYhJA8D4S0ipf8qkKDaE4eXMwaF5 XfFmVsMj9SNfImF4tug5CcmFE2T2tirsoamkku/75d+CEvrKN6mtNqbrLdJ4+PNsPvELhy Ky1p+0CnMygDnvsJsJG6AVqslIvzSg8Q+B/O8GeeSMh1NwMKtx0YWhISkcF1Fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746540964; a=rsa-sha256; cv=none; b=CVJ4xlJ+8Y/iXg7JRUSRKmMEag39DFxeA6E9rFeAIvZiBzX7Et+zMJOjCDgX57lMHgQ1OJ V/1cNDktA80A/0FW9yHp6m3wr4j3futQXyOLYhOM7I99OiHPy8wR/EDXFNoJckbBuJslaG 0S92PE7Bo5PqpoPqEm77+s+pIEhwwY+l8SY8wc3KDMwiWTa5R7ZUG/BGTmvUYxIRBrLDsv febDA+1sSfBgHNLbjyLUg0OH4pSNxVuZAyQx682PL+KbbX19JxZeGySCnIJRYdwKYgkQAz GJx0aE+D2da3OFStNjJoFTuGzCNT9QoyuOL4DYa/bEF3vSgAnQ9W9AeSTXtyMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZsL6D0JyYz13Sm; Tue, 06 May 2025 14:16:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 546EG35W051166; Tue, 6 May 2025 14:16:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546EG37u051163; Tue, 6 May 2025 14:16:03 GMT (envelope-from git) Date: Tue, 6 May 2025 14:16:03 GMT Message-Id: <202505061416.546EG37u051163@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 773ef40696c6 - stable/14 - exec: Remove parameter 'segflg' from exec_copyin_args() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 773ef40696c6335a1ed8ffaa6401777ac0ce716d Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=773ef40696c6335a1ed8ffaa6401777ac0ce716d commit 773ef40696c6335a1ed8ffaa6401777ac0ce716d Author: Wuyang Chung AuthorDate: 2025-02-05 06:54:54 +0000 Commit: Mark Johnston CommitDate: 2025-05-06 14:15:38 +0000 exec: Remove parameter 'segflg' from exec_copyin_args() In kern "copyin" means copy data from user address space to kernel address space. But in the function exec_copyin_args() there is a parameter 'segflg' that is used to specify the address space of the parameter 'fname'. In the source code there are two places where 'segflg' are not UIO_USERSPACE. In both cases the 'fname' argument are NULL so the argument 'segflg' are not important there. So it is safe to remove the parameter 'segflg' from the function exec_copyin_args(). Reviewed by: markj, jhb MFC after: 2 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/1590 (cherry picked from commit 15581af7c2d30360313dcad74dc5dc83c02f9df0) --- sys/compat/freebsd32/freebsd32_misc.c | 11 +++++------ sys/compat/freebsd32/freebsd32_util.h | 2 +- sys/compat/linux/linux_misc.c | 8 ++++---- sys/kern/kern_exec.c | 13 +++++-------- sys/sys/imgact.h | 3 +-- 5 files changed, 16 insertions(+), 21 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 81715ed102b3..a8331897316d 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -401,7 +401,7 @@ freebsd32_sigaltstack(struct thread *td, */ int freebsd32_exec_copyin_args(struct image_args *args, const char *fname, - enum uio_seg segflg, uint32_t *argv, uint32_t *envv) + uint32_t *argv, uint32_t *envv) { char *argp, *envp; uint32_t *p32, arg; @@ -422,7 +422,7 @@ freebsd32_exec_copyin_args(struct image_args *args, const char *fname, /* * Copy the file name. */ - error = exec_args_add_fname(args, fname, segflg); + error = exec_args_add_fname(args, fname, UIO_USERSPACE); if (error != 0) goto err_exit; @@ -477,8 +477,8 @@ freebsd32_execve(struct thread *td, struct freebsd32_execve_args *uap) error = pre_execve(td, &oldvmspace); if (error != 0) return (error); - error = freebsd32_exec_copyin_args(&eargs, uap->fname, UIO_USERSPACE, - uap->argv, uap->envv); + error = freebsd32_exec_copyin_args(&eargs, uap->fname, uap->argv, + uap->envv); if (error == 0) error = kern_execve(td, &eargs, NULL, oldvmspace); post_execve(td, error, oldvmspace); @@ -496,8 +496,7 @@ freebsd32_fexecve(struct thread *td, struct freebsd32_fexecve_args *uap) error = pre_execve(td, &oldvmspace); if (error != 0) return (error); - error = freebsd32_exec_copyin_args(&eargs, NULL, UIO_SYSSPACE, - uap->argv, uap->envv); + error = freebsd32_exec_copyin_args(&eargs, NULL, uap->argv, uap->envv); if (error == 0) { eargs.fd = uap->fd; error = kern_execve(td, &eargs, NULL, oldvmspace); diff --git a/sys/compat/freebsd32/freebsd32_util.h b/sys/compat/freebsd32/freebsd32_util.h index 93b574ec9422..d18dd50e4951 100644 --- a/sys/compat/freebsd32/freebsd32_util.h +++ b/sys/compat/freebsd32/freebsd32_util.h @@ -120,7 +120,7 @@ void freebsd32_rusage_out(const struct rusage *s, struct rusage32 *s32); struct image_args; int freebsd32_exec_copyin_args(struct image_args *args, const char *fname, - enum uio_seg segflg, uint32_t *argv, uint32_t *envv); + uint32_t *argv, uint32_t *envv); struct kinfo_knote; struct kinfo_knote32; diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index b87c05322e16..855c1d885164 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -2586,7 +2586,7 @@ linux_seccomp(struct thread *td, struct linux_seccomp_args *args) */ static int linux_exec_copyin_args(struct image_args *args, const char *fname, - enum uio_seg segflg, l_uintptr_t *argv, l_uintptr_t *envv) + l_uintptr_t *argv, l_uintptr_t *envv) { char *argp, *envp; l_uintptr_t *ptr, arg; @@ -2607,7 +2607,7 @@ linux_exec_copyin_args(struct image_args *args, const char *fname, /* * Copy the file name. */ - error = exec_args_add_fname(args, fname, segflg); + error = exec_args_add_fname(args, fname, UIO_USERSPACE); if (error != 0) goto err_exit; @@ -2670,8 +2670,8 @@ linux_execve(struct thread *td, struct linux_execve_args *args) LINUX_CTR(execve); - error = linux_exec_copyin_args(&eargs, args->path, UIO_USERSPACE, - args->argp, args->envp); + error = linux_exec_copyin_args(&eargs, args->path, args->argp, + args->envp); if (error == 0) error = linux_common_execve(td, &eargs); AUDIT_SYSCALL_EXIT(error == EJUSTRETURN ? 0 : error, td); diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 6727872b5b10..f4197609a700 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -225,8 +225,7 @@ sys_execve(struct thread *td, struct execve_args *uap) error = pre_execve(td, &oldvmspace); if (error != 0) return (error); - error = exec_copyin_args(&args, uap->fname, UIO_USERSPACE, - uap->argv, uap->envv); + error = exec_copyin_args(&args, uap->fname, uap->argv, uap->envv); if (error == 0) error = kern_execve(td, &args, NULL, oldvmspace); post_execve(td, error, oldvmspace); @@ -251,8 +250,7 @@ sys_fexecve(struct thread *td, struct fexecve_args *uap) error = pre_execve(td, &oldvmspace); if (error != 0) return (error); - error = exec_copyin_args(&args, NULL, UIO_SYSSPACE, - uap->argv, uap->envv); + error = exec_copyin_args(&args, NULL, uap->argv, uap->envv); if (error == 0) { args.fd = uap->fd; error = kern_execve(td, &args, NULL, oldvmspace); @@ -282,8 +280,7 @@ sys___mac_execve(struct thread *td, struct __mac_execve_args *uap) error = pre_execve(td, &oldvmspace); if (error != 0) return (error); - error = exec_copyin_args(&args, uap->fname, UIO_USERSPACE, - uap->argv, uap->envv); + error = exec_copyin_args(&args, uap->fname, uap->argv, uap->envv); if (error == 0) error = kern_execve(td, &args, uap->mac_p, oldvmspace); post_execve(td, error, oldvmspace); @@ -1319,7 +1316,7 @@ out: */ int exec_copyin_args(struct image_args *args, const char *fname, - enum uio_seg segflg, char **argv, char **envv) + char **argv, char **envv) { u_long arg, env; int error; @@ -1339,7 +1336,7 @@ exec_copyin_args(struct image_args *args, const char *fname, /* * Copy the file name. */ - error = exec_args_add_fname(args, fname, segflg); + error = exec_args_add_fname(args, fname, UIO_USERSPACE); if (error != 0) goto err_exit; diff --git a/sys/sys/imgact.h b/sys/sys/imgact.h index 4f0c8aff9f42..c1c94a2eabfd 100644 --- a/sys/sys/imgact.h +++ b/sys/sys/imgact.h @@ -119,8 +119,7 @@ int exec_map_stack(struct image_params *); int exec_new_vmspace(struct image_params *, struct sysentvec *); void exec_setregs(struct thread *, struct image_params *, uintptr_t); int exec_shell_imgact(struct image_params *); -int exec_copyin_args(struct image_args *, const char *, enum uio_seg, - char **, char **); +int exec_copyin_args(struct image_args *, const char *, char **, char **); int pre_execve(struct thread *td, struct vmspace **oldvmspace); void post_execve(struct thread *td, int error, struct vmspace *oldvmspace); #endif From nobody Tue May 6 14:16:05 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZsL6F2m3hz5tsjs; Tue, 06 May 2025 14:16:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsL6F15XWz48jr; Tue, 06 May 2025 14:16:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746540965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K/o1cSnNAneEufTiWy1nVxV1XwZ54z43QNwyTF8nwBk=; b=vPzG4KeLWl/AXigj8FlG7HXBDNtRT4G6qvdcnmdrN3IAaNvnqSjgoUrR4x5DpUeIVBz4QY 9dLNZdHzflFvJUlobPbX0FJlvZ2X8L0g8Hjywc/4pPaVdozi9w+T6BW4HMWC43TBJd5ZzE plmkFH+QI02Xs1guh6W0vEswnF1buN/cISIijbrr1xPCVw218xgZDhmnISxZTNCkU1AZfk bp6tY8103AshMYnDZ+aqZrpeVqZeSW9ygQXugu6QPu5Hj227A7sX7r4e3dtNjsrbdt0O9w Qr0TeWlIe5NJaKKclLZKUzyNsxoVpZgNnzktBK31Z+KUTxoXGGZnhQIZD2X+cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746540965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K/o1cSnNAneEufTiWy1nVxV1XwZ54z43QNwyTF8nwBk=; b=PvhAN9tkSr3Yfw8lEXAhv3qtU+/OzWax1XjDOEOMPL/IDHcvV8kXFPDkfrTkq5sUvxPuEe qAyzF/hsPK5V3uQdSj/Um8JHwFLQJZcJBUc5KJaoekj87P8ongRVbLL30PV0m63gAvisVt qlgBTKHwjR5jKvWLBG977N72WG5xq3AchIjVV9iUlnQmZN6zZOaz+CEIJ+r1Pc5plxyVpu OECuRwML6Lj/PbPCUkzazBwZedVrUOjkIlfdOxLd+hUqMr1f6OUreQzHU7bexrl5RZ2Pu3 JKN/KfjAo4SKpTUosF5rM+Gkw+PO4ASvU9gYDqf9GC6vo3t26ktmvam4Q/jSag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746540965; a=rsa-sha256; cv=none; b=BsUt8L2+LZWcKIQLZp0wb4FGztW2Vyp0lHYQuAMYkjTNbtjM21lgNmZqSu/pRmtsFZw+zn uxOABQdmHP36ysmCQQMmBh/2ZFUsW2Zdaztz5IjM76l/rTVPAW4g+BBVz7DEGwZjs0MUHj OwSZhRjlb4poIlGXb5xXSjZ21LHr3AZulfltcIoAwG8t+rup2BNfc0lDOWRMH1tzj6pY18 Ayp/0DK2CAFD029obRlxwlujFKDUm4MJ4YtEw2knkMjPCQEFAvefx8m8RKeZsnImGOGOnL IYXGvz7FJYS0BD+a+edBfrXVkzEY74p7iaoRRNSq51b8hRQSFykkLEytxE8pwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZsL6F0jRKz1317; Tue, 06 May 2025 14:16:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 546EG5bm051204; Tue, 6 May 2025 14:16:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546EG5Xf051201; Tue, 6 May 2025 14:16:05 GMT (envelope-from git) Date: Tue, 6 May 2025 14:16:05 GMT Message-Id: <202505061416.546EG5Xf051201@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 4f3ce62ff7ef - stable/14 - sysctl: Panic on OID reuse List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4f3ce62ff7ef930eddaf3c7de59195092eee3e00 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4f3ce62ff7ef930eddaf3c7de59195092eee3e00 commit 4f3ce62ff7ef930eddaf3c7de59195092eee3e00 Author: Mark Johnston AuthorDate: 2025-04-05 16:22:20 +0000 Commit: Mark Johnston CommitDate: 2025-05-06 14:15:38 +0000 sysctl: Panic on OID reuse In CheriBSD we had a conflict in the KERN_PROC OID space and didn't notice for some time. Let's panic instead to make such conflicts easier to detect. Note that this doesn't affect conflicts arising from name collisions in OID_AUTO sysctls, which happen sometimes due to driver bugs. Reviewed by: brooks, kib, jhb MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D49351 (cherry picked from commit d35c4cfad5800b15ab730af5246df0366f2be558) --- sys/kern/kern_sysctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index b9ca0e7e5041..479792b4fff1 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -518,7 +518,7 @@ sysctl_register_oid(struct sysctl_oid *oidp) /* check for non-auto OID number collision */ if (oidp->oid_number >= 0 && oidp->oid_number < CTL_AUTO_START && oid_number >= CTL_AUTO_START) { - printf("sysctl: OID number(%d) is already in use for '%s'\n", + panic("sysctl: OID number(%d) is already in use for '%s'\n", oidp->oid_number, oidp->oid_name); } /* update the OID number, if any */ From nobody Tue May 6 14:16:06 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZsL6G5qrXz5tsjx; Tue, 06 May 2025 14:16:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsL6G3jZ4z498l; Tue, 06 May 2025 14:16:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746540966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wL5EZo2RyT6+bpvT4ahZZNCP38YENwB5swXy/ITDZ/M=; b=D6fItSgKdLFUFvtu+gqf7kKYHgqfGOMKmCpuSVuTrluBlepwE5WWXWwlw98w1tlr9K0A9j x9M9mqGC8R72no2GG961vpA5FbYMu08QHnjTNxmAjg8fdWSXDapM9gFPsyApRj915tksbC 9vXq3MqjUJmG03MF+/Uqv8mKb7lp5KXMDyKd4wCFfBNfJ/9V49ByDCEaDWot2jEaDbAXSB tIRSgio/DiCHAUifFOOoFTqNg2d+s+TkTXwaK3wIDzzpnCL6N0dEmto1+NPRRCFTg3NXvs whq8WIbvgR793uOCUPwFrZS3+Zdpmp9mIIceElujlSYWEV3y2M8DAmI6bXiD4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746540966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wL5EZo2RyT6+bpvT4ahZZNCP38YENwB5swXy/ITDZ/M=; b=Bf3f9oTyxRHGWrcGU7Or6d9ykOBUDpSfmt4uuVeZbMKeU96b5sEkL8Ubj0eko3e6AXWT44 WseRcc1+/hjENpUUIK1+3hDE4172wLBzYGPwybjmk48f6PIbsPbqk7U2cWXBoiDW8X4r0Q 3+3TsmBBEO+V4qhYeNl8eDQBecH2BX9+2wVcxfSUkZRw7fllzjn/k3p/+lSuABSt+4Dzly dC1cd5bWc+f3/tkg3HVyN8JeInRB+64XIx5P5JNCtOiPErDWJhDz2ggtYvz4EBVtfCF/tx 1w47/OAJJtx6ig3MtQVGiXW8593KYXHz7x0jbF7Xc38xFYmlRXgtG/gQtY5BHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746540966; a=rsa-sha256; cv=none; b=aorbYWP5kgdxkyJRT1d6HpK6feGLku0PM8S8dZIY9MGkyoUT/kx7TxURnBvjgbox9D9AkA wOa8fVeFn/JfmnQ5fzzZXGmdvDqlODApPUffazThNywG+DCO6HgFKlbCbsZK2MEJy5pgsc BZ3dIgX2FLvr7FZjul2IctMHtLUsiEJ9yTIjDnUbGeAw4P4xDVR6vYkakaHIhXAoTLeKSJ Vbcy2H0BM2EgLJtstl7lm21ZLfGUAm9g06zbIEdsL+BHlUyykNJWazgc0NQNMZY5wauQYL JgMj0iv9r7kZ0h/a5wX8qdq6rinOlcEUZleetUeS3KF74fPrHLh6wneh+PnH7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZsL6G1hscz1318; Tue, 06 May 2025 14:16:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 546EG6HF051247; Tue, 6 May 2025 14:16:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546EG6Hf051244; Tue, 6 May 2025 14:16:06 GMT (envelope-from git) Date: Tue, 6 May 2025 14:16:06 GMT Message-Id: <202505061416.546EG6Hf051244@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 1fe14252227d - stable/14 - so_splice: Disallow splicing with KTLS-enabled sockets List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1fe14252227d594f5f7c8e924925a113ea487dd9 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1fe14252227d594f5f7c8e924925a113ea487dd9 commit 1fe14252227d594f5f7c8e924925a113ea487dd9 Author: Mark Johnston AuthorDate: 2025-04-22 14:53:34 +0000 Commit: Mark Johnston CommitDate: 2025-05-06 14:15:38 +0000 so_splice: Disallow splicing with KTLS-enabled sockets Suppose the sink socket in a splice has KTLS enabled. When data is transmitted from the source socket, sosend_generic_locked() receives an mbuf rather than a UIO as it would if userspace were transferring data. In this case, ktls_frame() expects the mbuf to be unmapped, but in general this won't be the case. Simply disallow the combination for now. Modify so_unsplice() to handle dismantling a partially initialized splice, in order to simplify error handling in so_splice(). Make sure that one can't enable KTLS on a spliced socket, or more specifically, that one can't enable RXTLS on the source side of a splice, or TXTLS on the sink side of a splice. Reported by: syzbot+9cc248c4b0ca9b931ab4@syzkaller.appspotmail.com Reviewed by: gallatin MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D49920 (cherry picked from commit 1000cc4a0d39faeb3e681bb167ed38f164c56604) --- sys/kern/uipc_ktls.c | 14 +++++++++++--- sys/kern/uipc_socket.c | 42 ++++++++++++++++++++++++++---------------- 2 files changed, 37 insertions(+), 19 deletions(-) diff --git a/sys/kern/uipc_ktls.c b/sys/kern/uipc_ktls.c index 294a196db60d..60ec05d3d94a 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -1255,7 +1255,11 @@ ktls_enable_rx(struct socket *so, struct tls_enable *en) /* Mark the socket as using TLS offload. */ SOCK_RECVBUF_LOCK(so); - if (__predict_false(so->so_rcv.sb_tls_info != NULL)) { + if (__predict_false(so->so_rcv.sb_tls_info != NULL)) + error = EALREADY; + else if ((so->so_rcv.sb_flags & SB_SPLICED) != 0) + error = EINVAL; + if (error != 0) { SOCK_RECVBUF_UNLOCK(so); SOCK_IO_RECV_UNLOCK(so); ktls_free(tls); @@ -1355,12 +1359,16 @@ ktls_enable_tx(struct socket *so, struct tls_enable *en) inp = so->so_pcb; INP_WLOCK(inp); SOCK_SENDBUF_LOCK(so); - if (__predict_false(so->so_snd.sb_tls_info != NULL)) { + if (__predict_false(so->so_snd.sb_tls_info != NULL)) + error = EALREADY; + else if ((so->so_snd.sb_flags & SB_SPLICED) != 0) + error = EINVAL; + if (error != 0) { SOCK_SENDBUF_UNLOCK(so); INP_WUNLOCK(inp); SOCK_IO_SEND_UNLOCK(so); ktls_free(tls); - return (EALREADY); + return (error); } so->so_snd.sb_tls_seqno = be64dec(en->rec_seq); so->so_snd.sb_tls_info = tls; diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 6468b3001b3e..5d0a8b4d8f80 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1678,10 +1678,16 @@ so_splice(struct socket *so, struct socket *so2, struct splice *splice) uma_zfree(splice_zone, sp); return (error); } - soref(so); - so->so_splice = sp; SOCK_RECVBUF_LOCK(so); + if (so->so_rcv.sb_tls_info != NULL) { + SOCK_RECVBUF_UNLOCK(so); + SOCK_UNLOCK(so); + uma_zfree(splice_zone, sp); + return (EINVAL); + } so->so_rcv.sb_flags |= SB_SPLICED; + so->so_splice = sp; + soref(so); SOCK_RECVBUF_UNLOCK(so); SOCK_UNLOCK(so); @@ -1695,20 +1701,19 @@ so_splice(struct socket *so, struct socket *so2, struct splice *splice) error = EBUSY; if (error != 0) { SOCK_UNLOCK(so2); - SOCK_LOCK(so); - so->so_splice = NULL; - SOCK_RECVBUF_LOCK(so); - so->so_rcv.sb_flags &= ~SB_SPLICED; - SOCK_RECVBUF_UNLOCK(so); - SOCK_UNLOCK(so); - sorele(so); - uma_zfree(splice_zone, sp); + so_unsplice(so, false); return (error); } - soref(so2); - so2->so_splice_back = sp; SOCK_SENDBUF_LOCK(so2); + if (so->so_snd.sb_tls_info != NULL) { + SOCK_SENDBUF_UNLOCK(so2); + SOCK_UNLOCK(so2); + so_unsplice(so, false); + return (EINVAL); + } so2->so_snd.sb_flags |= SB_SPLICED; + so2->so_splice_back = sp; + soref(so2); mtx_lock(&sp->mtx); SOCK_SENDBUF_UNLOCK(so2); SOCK_UNLOCK(so2); @@ -1733,7 +1738,7 @@ so_unsplice(struct socket *so, bool timeout) { struct socket *so2; struct so_splice *sp; - bool drain; + bool drain, so2rele; /* * First unset SB_SPLICED and hide the splice structure so that @@ -1772,11 +1777,14 @@ so_unsplice(struct socket *so, bool timeout) SOCK_LOCK(so2); KASSERT(!SOLISTENING(so2), ("%s: so2 is listening", __func__)); SOCK_SENDBUF_LOCK(so2); - KASSERT((so2->so_snd.sb_flags & SB_SPLICED) != 0, + KASSERT(sp->state == SPLICE_INIT || + (so2->so_snd.sb_flags & SB_SPLICED) != 0, ("%s: so2 is not spliced", __func__)); - KASSERT(so2->so_splice_back == sp, + KASSERT(sp->state == SPLICE_INIT || + so2->so_splice_back == sp, ("%s: so_splice_back != sp", __func__)); so2->so_snd.sb_flags &= ~SB_SPLICED; + so2rele = so2->so_splice_back != NULL; so2->so_splice_back = NULL; SOCK_SENDBUF_UNLOCK(so2); SOCK_UNLOCK(so2); @@ -1794,6 +1802,7 @@ so_unsplice(struct socket *so, bool timeout) while (sp->state == SPLICE_CLOSING) msleep(sp, &sp->mtx, PSOCK, "unsplice", 0); break; + case SPLICE_INIT: case SPLICE_IDLE: case SPLICE_EXCEPTION: sp->state = SPLICE_CLOSED; @@ -1819,7 +1828,8 @@ so_unsplice(struct socket *so, bool timeout) CURVNET_SET(so->so_vnet); sorele(so); sowwakeup(so2); - sorele(so2); + if (so2rele) + sorele(so2); CURVNET_RESTORE(); so_splice_free(sp); return (0); From nobody Tue May 6 14:16:07 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZsL6J0qV4z5tsph; Tue, 06 May 2025 14:16:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsL6H49kRz49Bc; Tue, 06 May 2025 14:16:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746540967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1SVkc3npx3lCmAVHF4sPO9xXXuYw7WlsE7Vm2hkVE80=; b=hdbVA48zR1Gfahf4RTSsb/E6PerAHXn/dmG/DMaxTyGiaBR6cgyxnpd8EVyOnzwvbgjeMo cdvZzByz2genxm4HRJueeXqShmwnzg30H8saAIJXCWl2W4hEL/ShJjEUlB28BfAbBqDIbm TUnFPyYg9Sz9KNDq8A6BFUfpskMV9hjAhzvwhku+S0KkK/5GAqgbPsmXlDs6yK+NFDB6q0 iArLO+B76/WpuWKVNOHrAffE3cQW1McttRdRjUgJOpMaV4wA9toYHAXtZu3JaIMC961UkG a/+Jk1mxCk1QgptHoXYbHn9JiFRpgXUgGzLPH1Eg26hx2XSh3Kv2oHuP/sG/RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746540967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1SVkc3npx3lCmAVHF4sPO9xXXuYw7WlsE7Vm2hkVE80=; b=jEBaSN5V5yD3ZDGYpjUooNx3ypuNkPD34566KqM1jJpg2W9WNh9HDB4ocofsvwwJAx25xI fsdoh2K9cYRtl/tZIDTgkPH0qrlY6KNiykIaPHemseinoQl+IN4RKzEn0kyTuyRMHbrhUk HXljSsajIIM7R2x+SieNk0jWQ5EdmjiM/qm9RabhB7cuzE06bDv+/HdcigRJ0coWTtf5zv TJHm1LVAi9mjzq2OrVGkeg4EyCZZ9zpf11kHiTRI76L/E3liEPFNjyRnLM97bVoR0pSFFE g9eIZx18pQtboWeRifrIYusksz8LcDi0wbt6xaNlad0ZF7bT/GaR0PbrXjI/kA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746540967; a=rsa-sha256; cv=none; b=Uap+fWqF4sS/fY5OJNka4d+irJxYuyCr5eztkcnzsD9O1Dj3xGrRwrhM78MuAsuIp0Yfeu KElnkdTjtHsm/W0x+/+z45S8401nHAK/NZuiRwnOnuJZHjdbz6Ccp/2AkQv6aIhZB8AoPc yskV6iEvX1SAFCBvPSswf+JCszTJVaSOxukt4GCB3QbNBAqouoHFCTXlb7vhQ1qqLYATH6 C8r0ubVhrMtB6Wtt95pE5Tn5n9+ulkLLfybet8sL3OLnd82jhgERY5LfOkA1YsS+TDMGiq xFLM72FBBuZbRglgHQDyxy8ZePBE6Vt9Nh/xK+QcvCuVdrP32wnis9vAXW5ACg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZsL6H2Zwrz1319; Tue, 06 May 2025 14:16:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 546EG7cP051280; Tue, 6 May 2025 14:16:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546EG7xd051277; Tue, 6 May 2025 14:16:07 GMT (envelope-from git) Date: Tue, 6 May 2025 14:16:07 GMT Message-Id: <202505061416.546EG7xd051277@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 02dde7c43fe7 - stable/14 - netinet: Make in_systm.h self-contained List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 02dde7c43fe76a5dcdc170de1c2740a31629e106 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=02dde7c43fe76a5dcdc170de1c2740a31629e106 commit 02dde7c43fe76a5dcdc170de1c2740a31629e106 Author: Mark Johnston AuthorDate: 2025-05-03 20:44:13 +0000 Commit: Mark Johnston CommitDate: 2025-05-06 14:15:38 +0000 netinet: Make in_systm.h self-contained PR: 286539 MFC after: 3 days (cherry picked from commit 75d173a84836d14b12a0f747ffed7d37766dd274) --- sys/netinet/in_systm.h | 2 ++ tools/build/test-includes/badfiles.inc | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/in_systm.h b/sys/netinet/in_systm.h index 77c66c479b75..e61101916ee7 100644 --- a/sys/netinet/in_systm.h +++ b/sys/netinet/in_systm.h @@ -34,6 +34,8 @@ #ifndef _NETINET_IN_SYSTM_H_ #define _NETINET_IN_SYSTM_H_ +#include + /* * Miscellaneous internetwork * definitions for kernel. diff --git a/tools/build/test-includes/badfiles.inc b/tools/build/test-includes/badfiles.inc index 21657bfef4ed..297b00207885 100644 --- a/tools/build/test-includes/badfiles.inc +++ b/tools/build/test-includes/badfiles.inc @@ -257,7 +257,6 @@ BADHDRS= \ netinet/in_pcb.h \ netinet/in_pcb_var.h \ netinet/in_rss.h \ - netinet/in_systm.h \ netinet/in_var.h \ netinet/ip.h \ netinet/ip6.h \ From nobody Tue May 6 14:16:08 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZsL6K2DfYz5tsv8; Tue, 06 May 2025 14:16:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsL6J3Y63z49F1; Tue, 06 May 2025 14:16:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746540968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UWcQEJIrgzkg2rizf5ydyyMDucWVQv8rcOkiXhgulA8=; b=uLPMcp8glSe2KGwLdyvTHgv/OLvCXkzTZ0LoD6qp9zQJngGl/otIaQ4pk4UuuRWOeveXyx c2Ehl+YKKDCwHtRwbE/k7ABb81+oQXtoqmfSywY62udnPzJfhaRm0sL4I/e3PjzDpHjPPa 9+igPR9OlQmwTy+BjO8dw/viMpCH3dVDCz957wNvv7mRwWOaIyWwo3/UKbzfX2hCsoQ31F lYOKQZPyFcR9YlH+TPhLPwiv0IDZCjXS+GoqRakMgcuzGNRd2yhYFHuWz4VsNygqph9L5Q Q1F6u0JFuWPQR5QAKjB2L0AtcbwcOUOquQKRYhiioDYbmkrE9QN5zX5lqLcF8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746540968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UWcQEJIrgzkg2rizf5ydyyMDucWVQv8rcOkiXhgulA8=; b=R5A0MJ0SbpsU+MQ7YCngolDOMKcdIWuQAeLg1AeyGRIbLJg5MjmQnSe1DVtiVXzmLUr1cL 9KnHVeTeoqoY6hjKQ86IwGVUYY5ESKtaSAFMTohRmd0sopXfch796ji2ugIsEYi84udhgg BW5pbMdYFXGwpj6CY14JJu8x5cNbV/0XK4rompV91c/YGAFAAplS/pej0e59zNyMVJ/1/J kNj493cvxfszE2319dHCVYDQ8/xvZarTKYyYo1SX34CoDIz33/KOfVRVQYK4h9Axca2bMK 5cflDJax9XON4fCXQv0dxNlZnfK4LYDxS2TZ+MsZz6KfrXcOoI8OE1HBl62x/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746540968; a=rsa-sha256; cv=none; b=TxRvKsIAPAZS6Dz4jasVGLwONo0mPu8Fnr8Qtuc5YpyZnnCAApwMBSkzWmeEQz88XKnQ3o WXq2rs+aZ9YN9txtWE39lXw20NfP5sEVfaLgRJ2DFzn7n0hKLIbhgsjPNcyg/HB518NBqb Bc089hWJ1HJIQYmZRoHxCBnDDWC4IkdqMbGG8sgIEjHJpC8BhAZaT2Rc/N1IyRgPmHmmf8 fGZBXvp5LKGry5dXsUi9LEIDhXtyT4/FiftGMaRBbEIx4N1j9uU4SRL6t/fMkqVr2IJlVq OgVOn3qci+NI4oNwSvYjkjgOwoqStyhc8YABE15kD/TX8He3rHnC2gAzJxWLUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZsL6J38nNz131B; Tue, 06 May 2025 14:16:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 546EG8QM051312; Tue, 6 May 2025 14:16:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546EG8Td051309; Tue, 6 May 2025 14:16:08 GMT (envelope-from git) Date: Tue, 6 May 2025 14:16:08 GMT Message-Id: <202505061416.546EG8Td051309@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 48881a2680ab - stable/14 - bpf: Make bpf.h self-contained List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 48881a2680ab42ea1b06d1c9685df9d295991d16 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=48881a2680ab42ea1b06d1c9685df9d295991d16 commit 48881a2680ab42ea1b06d1c9685df9d295991d16 Author: Mark Johnston AuthorDate: 2025-05-03 20:43:42 +0000 Commit: Mark Johnston CommitDate: 2025-05-06 14:15:38 +0000 bpf: Make bpf.h self-contained PR: 286539 MFC after: 3 days (cherry picked from commit 981af1192cfa5ecd7bee9fe47386ed9d45397828) --- sys/net/bpf.h | 1 + tools/build/test-includes/badfiles.inc | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/bpf.h b/sys/net/bpf.h index c4132d2e633c..8ee8a841a96d 100644 --- a/sys/net/bpf.h +++ b/sys/net/bpf.h @@ -40,6 +40,7 @@ #ifndef _NET_BPF_H_ #define _NET_BPF_H_ +#include #include #include #include diff --git a/tools/build/test-includes/badfiles.inc b/tools/build/test-includes/badfiles.inc index 297b00207885..496eaf70b9c3 100644 --- a/tools/build/test-includes/badfiles.inc +++ b/tools/build/test-includes/badfiles.inc @@ -141,7 +141,6 @@ BADHDRS= \ sys/vdso.h \ sys/vmmeter.h \ sys/vnode.h \ - net/bpf.h \ net/bpf_buffer.h \ net/bpf_jitter.h \ net/bpf_zerocopy.h \ From nobody Tue May 6 19:16:45 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZsSnB0lFbz5vHfb; Tue, 06 May 2025 19:16:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsSn946Tpz3f4L; Tue, 06 May 2025 19:16:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746559005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ujZD17JTS7gb6gsxof3mslO7dXah85s+lc/k310Vnhc=; b=E20PAQswI11i4LpLwAUiRFo3v4fsz8k/xc7kySjDHvKeaFOe4k3kO6YhV4zAB0O2JfQyd6 R2Dc/IuRC1Tbco1/12Q+W75vOiy2VuIge6JqLaxreGO35GEw6/fHzG0mBdbUs/z2o8imEw uPRxcPbbzxibiOZkbAU1k1PuVo/E/j/DE5GDyuDXAAFWCwmHl6yfZfDOg8NGoxAf7csK2C iOjyX3OGf58MFs5TSIetXOHyiDhUyKKup0NHyQlsppEhWEK688/wtutRrGlakkBTS5jcMR TuVOH+Wj0COlBCntZnhnMb9hDNp/gbmC0hmqWPTmDsBK1khvOX+hMqYu//fTKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746559005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ujZD17JTS7gb6gsxof3mslO7dXah85s+lc/k310Vnhc=; b=phLXjcwrqV82pGynOQh2eB+RmT7ol1DwgEAbaVva1B4nqcMwJ6+c2vhCtWBtDCI60NaW7Z ElXbIQlwf/zGWtOu3NN1lgL+y/xu2xaH1m/gPts/A+UMtcQpfc69Kn/7MTeshz+BfOL5rx jbXRsnLkWp4PeTq3d4IiPu1OUynEvwtOaMzWvb3neGMrEWHN6mlysSxl1qCAHD/B0JZK2c j7Wgak2ALukqghOPfKeCL/taXDNGDLCwJXtZqKfJOol/0Bn8zI+fd8z0bySz2Vu4BFN7by 9EBkja6Jn0E7IWtGTjgAG+TkMRmKGQwHfjIrbr4ud3vrrXs60PFXt1PU9fvcVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746559005; a=rsa-sha256; cv=none; b=BgYFL286RZ/O/wXr4GCbxADK+riD8N6OTDA3x8Xcw/vAi0hstFKNtMe/p1iFL7q6N3JeKi fg9TH6pkTdTYAp32vau3EDPdmKy+pN10jbg1DZsmHwxg9SWwfcbrRjiEBU5xrvskEDr41v WTOqHoMVXZolifH0ZOteE38YwGmRbxKXMmhQSaJsvB+qWsRgKM3v0xA0dD+Kb2EgHzAaHL 04xzdvFhs4KQRCCRj8Jh4ZyMMAj6mcSryjPhFGzup0b5EQfUgkh7OEfgip1PFurz4qEYd4 KlumcMaPj4aoHEbKgs+uOzqEkvcdZrQBbMExLLJFrlznKAqg43/5TFadZI3I3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZsSn92QKJz1BpH; Tue, 06 May 2025 19:16:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 546JGjlG018267; Tue, 6 May 2025 19:16:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546JGjAX018264; Tue, 6 May 2025 19:16:45 GMT (envelope-from git) Date: Tue, 6 May 2025 19:16:45 GMT Message-Id: <202505061916.546JGjAX018264@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 0906658c3409 - stable/14 - tcp: improve KASSERT in limited retransmit List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0906658c3409996b26518e67df48c01052ef934c Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=0906658c3409996b26518e67df48c01052ef934c commit 0906658c3409996b26518e67df48c01052ef934c Author: Michael Tuexen AuthorDate: 2025-05-01 16:11:03 +0000 Commit: Michael Tuexen CommitDate: 2025-05-06 19:15:39 +0000 tcp: improve KASSERT in limited retransmit When doing a limited retransmit, allow up to 2 * MSS - 1 if the Nagle algorithm has been disabled. PR: 282605 Reviewed by: cc, Peter Lei Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D49922 (cherry picked from commit 934caaec3afc43638c2a1da8fbe3b672566db4fe) --- sys/netinet/tcp_input.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index bd491a116fff..b4c77c303df7 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -2794,9 +2794,11 @@ enter_recovery: KASSERT((tp->t_dupacks == 2 && tp->snd_limited == 0) || (sent == maxseg + 1 && - tp->t_flags & TF_SENTFIN), - ("%s: sent too much", - __func__)); + tp->t_flags & TF_SENTFIN) || + (sent < 2 * maxseg && + tp->t_flags & TF_NODELAY), + ("%s: sent too much: %u>%u", + __func__, sent, maxseg)); tp->snd_limited = 2; } else if (sent > 0) ++tp->snd_limited; From nobody Tue May 6 21:58:20 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZsXMd1wplz5vW5v; Tue, 06 May 2025 21:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsXMd1M0qz3KRf; Tue, 06 May 2025 21:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746568701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vPQPxofjpC94Jnw3JIQw6ry71sOUVTbCyDAD2jWOtaA=; b=xXkPQBIvg/FR0eA5r9YVytIGp2TIwrnBCq6V4fqwuQaK4ya41ebemjmNzFJLc3Geq4d+DY p2O6R4Lm83wobPbjD189LleDLgvbB7lFXP4AKnSU4rZG/CmC6WaNbiATjljkMKAwFKj9le IH5r9a7bH1qKE2BEBcYfJK4FpzCtd4u58hQlI/H7bOrPvDMsCCO0KPcYK83EZH3ABUtII7 H3Uz5vq1Zu8O/Ox4vUiBycDj4XC5gbSiN+ZCArznDgYe++wJczM6W20zHVZux95UeQorJ8 RyiPdfxftz410S/+Bw1KDD3eJ8sb3OBhPOOlY5wg/l8wPQ128gySIUpdARgrrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746568701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vPQPxofjpC94Jnw3JIQw6ry71sOUVTbCyDAD2jWOtaA=; b=CcuDmNKzaOGP5Lse/hEHaym1LnuhCLEQmqxEAp7flg6DV8MroD/GX85V8Mx42ZSvZd++do tBQv9apC3bdUTItus3zxGrP45Ixuswa+nSU6RJMOgR5bIz6CW3btUVvelraP2smmGna+Xf uga1r0ntvwzb1uqDZ1/c9MpcTAR+YKpbhpjYtMnc+UTgWWtcOVB4eaHNHk8g1olXRivJdE azXMvvJ2dYpWzFCrROx0fhX1HmTe+HWvyFZccP8h+kSgGdhU2C/jEUziHG3Y39PDZuxQjW uxSI+g5TJMTKv/FqU2qq8K4moe2b8q/AcS7/AGEWOKJOn7Xi3fDXYfwxsdADvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746568701; a=rsa-sha256; cv=none; b=jVi96dFFoC3oUpUUIXIeOBz+zKFTbeKohthccjGj+nir/ENZUCssO9BGAuaSyuDst07GFw IHwwR6Yml1H/ymyZ73SM/orkb0FLa9MQxzwJi6J8r2Eq87rUFJ6So9hyKL6IBJnEx+O3F6 q4W/G6A2l+wzzizpAA1532gFk9XSraAziQ2lZwzyGveYiTlcwVLXngqHHnq/xhk28Xyl+U wc+SmKeYvBtKcYFc8pFk5vRz4ARvUfS2Afo9ldjYXwajAq7J3TEzJLa4cuJ+TyH9l3ZC78 TH5cDtcTnIFTeVf7EfzbPYzZitrGms4URwWBvghtp5vZoKzmw+dfjr1Q32YlJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZsXMd0jdVz1Gqm; Tue, 06 May 2025 21:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 546LwL28024371; Tue, 6 May 2025 21:58:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546LwK9E024368; Tue, 6 May 2025 21:58:20 GMT (envelope-from git) Date: Tue, 6 May 2025 21:58:20 GMT Message-Id: <202505062158.546LwK9E024368@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 976aa65e3ea4 - releng/14.3 - tcp: improve KASSERT in limited retransmit List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 976aa65e3ea48f8864149dcbfc6f912a7ca2b67a Auto-Submitted: auto-generated The branch releng/14.3 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=976aa65e3ea48f8864149dcbfc6f912a7ca2b67a commit 976aa65e3ea48f8864149dcbfc6f912a7ca2b67a Author: Michael Tuexen AuthorDate: 2025-05-01 16:11:03 +0000 Commit: Michael Tuexen CommitDate: 2025-05-06 19:18:24 +0000 tcp: improve KASSERT in limited retransmit When doing a limited retransmit, allow up to 2 * MSS - 1 if the Nagle algorithm has been disabled. PR: 282605 Approved by: re (cperciva) Reviewed by: cc, Peter Lei Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D49922 (cherry picked from commit 934caaec3afc43638c2a1da8fbe3b672566db4fe) (cherry picked from commit 0906658c3409996b26518e67df48c01052ef934c) --- sys/netinet/tcp_input.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index bd491a116fff..b4c77c303df7 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -2794,9 +2794,11 @@ enter_recovery: KASSERT((tp->t_dupacks == 2 && tp->snd_limited == 0) || (sent == maxseg + 1 && - tp->t_flags & TF_SENTFIN), - ("%s: sent too much", - __func__)); + tp->t_flags & TF_SENTFIN) || + (sent < 2 * maxseg && + tp->t_flags & TF_NODELAY), + ("%s: sent too much: %u>%u", + __func__, sent, maxseg)); tp->snd_limited = 2; } else if (sent > 0) ++tp->snd_limited; From nobody Tue May 6 22:10:35 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZsXdl5Qg1z5vX18; Tue, 06 May 2025 22:10:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsXdl4cmMz3Xn6; Tue, 06 May 2025 22:10:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746569435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rTWPBgN2QjwSG64SvVJ6LofJMXw0Z5A1zk5otNQUCkQ=; b=Ml5UJ75ivncoMIsd2k06zT5deQpfMUjz6GXkNg37xZhTURdTFdVFYZt4nEIFfxyb1EQG/F u7ux5Djjtgn+WaoNbZO+z9fFpcLLXeHEQ04H2zqMx/IK1HdSXem5XlfNVn8uBvszYOQzdR ziJtD1/f+CaDrWRnYq8UgFY4mwM+1A3jlUofHOUT52T44FKtEBxUF9fTmVHVCedOQLIJOX y3rU6RkASNyr+5GXFBoCiNAPGMB+yEqkU1ZMdoNY1ZO6ZEKDdOU4yQjIbL+MAlV9ZllYpk +VC7HmbrtUVZzAAA1R/5rEYD/J+13bvlDjmgaiFGLe5xtHzW4mXAhwkWayksvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746569435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rTWPBgN2QjwSG64SvVJ6LofJMXw0Z5A1zk5otNQUCkQ=; b=Fz70X2MUIFVuhqx+v6oMKDAWqa2pVQI9PiTKXOI6HLO79tDFSvqxw+cf8ehPLXcv1R8J7T Bea+X1Y+L33/J/QYh3pKIngg4BKx40UL21Qbqz9g82PeieU9bZAubyH4YiCV9VxxAPivn3 H34jrGCZ1Ap+28svO0X/ejYEErV0Q8AxTcycdjpVtgohsD79TLK0m2ClTixWTMOgqa2oIT vdIlY8roI/azXcTW7ojuEPZ1tpbcsEiz9FX+25H0icYBhYk1dD4ODbhHumKW5baLAftJhM gQ++yIbh5bJ2tNnzKuXbPadaP3LxaOo8zPHmFzjskWA4izaU5SCHJnz1x/jOHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746569435; a=rsa-sha256; cv=none; b=kW4h2BeGe5lXZpMWQosilKRadrP2mlCcVGMsq3qYoVUC3+xRWawV30i0e/VjHmOtvrqbQE nxjjumMXX/mF6asaMGtWLVWwCBWfdS0TWJ9CV4ip3sbUpEN6eaQ6eEiL0xK3plzBjGVkBu bvLIkfh0ZPbGjCSZnToISnwhHNNLGY4/Z1RErbFFgnAFQw5GhtKCD4UPJmUiY7kgHBfnlW H/MOPsQ6h80nQVxzJQMlBl+fc/sAOLzaSCLju0l/1ko2jULxSmeQZAGgkelKn59J2/vyyw 0j15AOPTqDvknPV0cyMhALT6uW08mLYVAd4UxlgWlqBSVogOCSARGZDQQb8+TA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZsXdl48C6z1H6L; Tue, 06 May 2025 22:10:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 546MAZhE056825; Tue, 6 May 2025 22:10:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546MAZZK056822; Tue, 6 May 2025 22:10:35 GMT (envelope-from git) Date: Tue, 6 May 2025 22:10:35 GMT Message-Id: <202505062210.546MAZZK056822@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: e0c3bfb3f70b - stable/14 - pkg: Fix two typos in visible error messages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e0c3bfb3f70b1db5e8a7581357ef9c1f3da23aa5 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e0c3bfb3f70b1db5e8a7581357ef9c1f3da23aa5 commit e0c3bfb3f70b1db5e8a7581357ef9c1f3da23aa5 Author: Benedict Reuschling AuthorDate: 2025-01-14 12:58:53 +0000 Commit: Ed Maste CommitDate: 2025-05-06 22:10:06 +0000 pkg: Fix two typos in visible error messages No functional changes. (cherry picked from commit 49f4e3d297d26ce6b8e2a2b790bc6357edd064c4) --- usr.sbin/pkg/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/pkg/config.c b/usr.sbin/pkg/config.c index 44543f304657..5ceaaa5021eb 100644 --- a/usr.sbin/pkg/config.c +++ b/usr.sbin/pkg/config.c @@ -352,7 +352,7 @@ parse_signature_type(struct repository *repo, const char *st) else if (strcasecmp(st, "NONE") == 0) repo->signature_type = SIGNATURE_NONE; else { - warnx("Signature type %s is not supported for bootstraping," + warnx("Signature type %s is not supported for bootstrapping," " ignoring repository %s", st, repo->name); return (false); } @@ -484,7 +484,7 @@ read_conf_file(const char *confpath, const char *requested_repo, if (uname(&uts)) err(EXIT_FAILURE, "uname"); if (abi == NULL) - errx(EXIT_FAILURE, "Fail do determine ABI"); + errx(EXIT_FAILURE, "Failed to determine ABI"); p = ucl_parser_new(0); asprintf(&major, "%d", __FreeBSD_version/100000); From nobody Tue May 6 22:11:50 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZsXgB6Kv5z5vX9X; Tue, 06 May 2025 22:11:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsXgB5sblz3YrJ; Tue, 06 May 2025 22:11:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746569510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8GDnh+P/aWtRdxHA2RYNInhVWibApVwD4CGbw9rgT8I=; b=EPPHqj13qp8Vla3zUm80DGvl97NKNkfAyBdxgWfJKuD/3zqGCV+Bnh7Ir06l6uDblQRipu 2g//GVnekWMubCdvm9uplbyjV18AmuIjydSIbaf5sMH5yYr/lm1/1mXNM3L3j/4CpRRGrR ymOD8oh9ZZFyIKhuNQslFAQmgMz6cd8FK6t24FmER9i24mOp2T9NcoNKGZ64NvxVu4ezAX +OzQUVnX1ubbZ5+rpYHVPBN3Hr+NVdI5HpqQ61QTZoYzq5z0d6byecVh47uqO2S5w6B5yG b5SH/MaSqnMExfT4DhIMfh+tCVmmIK3SV12LFQeLbTCrjFXwjlgoMDFFkU07HQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746569510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8GDnh+P/aWtRdxHA2RYNInhVWibApVwD4CGbw9rgT8I=; b=im9KHARBmEdw/5+W6AK7vIODWd/eFV2XM71MeZfXqL54F/mdHZvCKqC6JqV4z3RQ2Y6OXw n8KsV3VuWL6mLVG9ED0h+QSnq90BcRn1YNsjLb8zlGWe09ysz8pZ3lkSV9sqUcTWyRDH6R aRQFjjNt8Fqm0V4KtVpRwY00V8QC4O5hRGPIEwBijrf/6+lxNOZbKUt43QF8sH2o833rOx fq1AijwOW4U26qsgftILlWDw8qUzoU/RpQuKxUG0y7BGHI6xwBbJ0cU/SHiCcWaTA73TSU GkrGH+bFwOD/4hQRVOKCQEK0Np2rGH5kVfqbsq207S+KLNA2nnEXHyFuRcSxmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746569510; a=rsa-sha256; cv=none; b=pyFkXVRm6fReb7lu3rblz7WnhRn5OMwJbc+2Zrpfv8VkzruRwIFQCgiv/4RDzN0ey0U05k 7pXcbZO4Jnh9GwswsyXnozwlXQDHobWkBWmVWkVswselhc3yLFhrYTedZcPQjvSvZpoZmJ iCDTDsITXKkmZRAmIVtZB8bcCYMPWwpwTCRIY8+BslouSMI3LBAhjYx8rtHOnVVPVn7fuP 5+BrOOsuyqAOPA9r5a1C/Zke/tjlh964AfQZcKX7Hqf8l13GQTEbh5AJJ4Do92hwbUHfFT 9mR93vv3tgkjHoMsgRAnPZheonBGgqXZ71VYTksc4nl8rsgsjQP9V8LaffrrWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZsXgB5B9Dz1Gv8; Tue, 06 May 2025 22:11:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 546MBoCR061556; Tue, 6 May 2025 22:11:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546MBoum061553; Tue, 6 May 2025 22:11:50 GMT (envelope-from git) Date: Tue, 6 May 2025 22:11:50 GMT Message-Id: <202505062211.546MBoum061553@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: b802c2f0a8a0 - stable/14 - pkg: update references to pkg.txz in man page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b802c2f0a8a0c520a09e8ca5be79aac725af8918 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b802c2f0a8a0c520a09e8ca5be79aac725af8918 commit b802c2f0a8a0c520a09e8ca5be79aac725af8918 Author: Isaac Freund AuthorDate: 2025-04-24 07:05:37 +0000 Commit: Ed Maste CommitDate: 2025-05-06 22:10:06 +0000 pkg: update references to pkg.txz in man page Only pkg.pkg is supported since 0cd9513a5ba5b. Reviewed by: emaste, ziaee Fixes: 0cd9513a5ba5 ("pkg: retire backwards compatibility bootstrap support") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49994 (cherry picked from commit 14704a7fdb77e92fdea11fc4b1e4e7479b0effbc) --- usr.sbin/pkg/pkg.7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/pkg/pkg.7 b/usr.sbin/pkg/pkg.7 index 982fd8ecaeb3..467f62d5747b 100644 --- a/usr.sbin/pkg/pkg.7 +++ b/usr.sbin/pkg/pkg.7 @@ -36,7 +36,7 @@ .Cm add .Op Fl dfy .Op Fl r Ar reponame -.Ar pkg.txz +.Ar pkg.pkg .Nm .Fl N .Nm @@ -67,7 +67,7 @@ is not installed yet, it will be fetched, have its signature verified, installed, and then have the original command forwarded to it. If already installed, the command requested will be forwarded to the real .Xr pkg 8 . -.It Nm Cm add Oo Fl fy Oc Oo Fl r Ar reponame Oc Ar pkg.txz +.It Nm Cm add Oo Fl fy Oc Oo Fl r Ar reponame Oc Ar pkg.pkg Install .Xr pkg 8 from a local package instead of fetching from remote. From nobody Wed May 7 11:50:27 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zstqm2bMSz5wB8j; Wed, 07 May 2025 11:50:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zstql3hwFz3Vfw; Wed, 07 May 2025 11:50:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746618627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EtwqAbIPvlHZGfJNtzDD7iabV11QqUDwMJNraGdq95o=; b=rEE+TNdd3UTpDrQPaL9aRCCDowcZiR+ZR60jbWzkJS+P20VWvK45vgHLLUHZwYYNVJ+zRk Fm8swLJQSJ4CV+lSySGnJaZS0WFUSaOqiZAlM3UtXTO5Vp7KhRu+mFqP4EMP4EE2byqBkF j5WGjlMd2oZTcaKxc9zqdps1DPFzT8rk8ergP08C3r0ncFpch7/vEg7i3uDBLqDFfhyWCx RrjcroljYEz1ItNjRXhgVMZopezIsgmnV1ONcAY9fwaIsD8QV/ZWA0ao6ZC7Y2rosUb9Yo GLZlio2+ACHxLH32I7HH1VwDtwlP7av4vSoKB97lBC03pznErCSfTHA1jhN33w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746618627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EtwqAbIPvlHZGfJNtzDD7iabV11QqUDwMJNraGdq95o=; b=bHIkTrieF+TxLA8t8D228KzLDifuftVRAgrq8Yhiwx2QqpjHw7CJs6PS79VkML7faEY5m2 9ZbYLHxsq44Vfb7qH9368g4ehp0URNybl+CW4A4ThbMyijVPKofs3Qq+ZsXM5UcMcmgZno U7pahCLqpXq6ZBQI8lHeBrKccLc9oaG/BsZLtAT4RnGeEtoJp6uKUGRw7ZlIGiryrJZjGi WZQbbSSt81yndz18fnLw8T/LEwvzwNnv/M21ZYbPXAImvyCK6TVIKxUXomXzpWs51peir2 1C07ns62r54nUAwawHmZGePK/rOuIvgglG2xgOrfaFnSf5v1fhHSmo32mLODsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746618627; a=rsa-sha256; cv=none; b=BH4I6l7L1zGJnaSi3jomdqY2i0N85jajOjn8Okf3baF8vCmCNeo33LJBzKKPO43bvkfw5N zlcQVmRaTPDMjbTi2LDTRb8p2zyM+VXGnUcMUlY1s84vRu4TebJMG+NgN8St3Ah/iOjZt6 +k78XNkjFPB1golAXVsjWq3K+FLVeDfHzob70e3EqdzO5/RR/nscSj/rxO+oU1ABvWAdrY kCONuNyex9EFY93yEC/1EnNEP2nDgzVaHiqnJ3wvzwLof6UykfC6oD1ka5NxaOAvSqBVBI 7RRkBWj2fMvJ6JEihtVuyr5gCHrA/2GueCCNLYijF50fvt/GiCo7tyKf41RwEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zstql3HwCzCXn; Wed, 07 May 2025 11:50:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547BoRe6089079; Wed, 7 May 2025 11:50:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547BoRjo089076; Wed, 7 May 2025 11:50:27 GMT (envelope-from git) Date: Wed, 7 May 2025 11:50:27 GMT Message-Id: <202505071150.547BoRjo089076@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 1499bb2e7783 - stable/14 - LinuxKPI: netdev: add NETIF_F_HW_TC List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1499bb2e77833df7f5b32bc09d62de66516b5c55 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1499bb2e77833df7f5b32bc09d62de66516b5c55 commit 1499bb2e77833df7f5b32bc09d62de66516b5c55 Author: Bjoern A. Zeeb AuthorDate: 2025-05-02 20:09:31 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-07 08:51:47 +0000 LinuxKPI: netdev: add NETIF_F_HW_TC Add a new flag needed by mt76. Sponsored by: The FreeBSD Foundation (cherry picked from commit 9c05d6320cc091ffb43002a149c04c122ccb798c) --- sys/compat/linuxkpi/common/include/linux/netdev_features.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/netdev_features.h b/sys/compat/linuxkpi/common/include/linux/netdev_features.h index 06e88d107708..51d2586e8aac 100644 --- a/sys/compat/linuxkpi/common/include/linux/netdev_features.h +++ b/sys/compat/linuxkpi/common/include/linux/netdev_features.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2020-2021 The FreeBSD Foundation + * Copyright (c) 2020-2025 The FreeBSD Foundation * * Portions of this software were developed by Björn Zeeb * under sponsorship from the FreeBSD Foundation. @@ -41,6 +41,7 @@ typedef uint32_t netdev_features_t; #define NETIF_F_TSO6 BIT(5) #define NETIF_F_RXCSUM BIT(6) #define NETIF_F_HW_CSUM BIT(7) +#define NETIF_F_HW_TC BIT(8) #define NETIF_F_CSUM_MASK (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM) From nobody Wed May 7 11:50:26 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zstqk4cjSz5wBF0; Wed, 07 May 2025 11:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zstqk3Ywgz3VlW; Wed, 07 May 2025 11:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746618626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x/TQK619d94Zge9iB6QMcKh/5BGOrz1fMPuuEKK3Ufc=; b=t3NIiWjiEUFHEmY00De0T2Q/FMd7IZIoGwnSxswmv9CVG2BdAsgIEsuB3ARFJ4WkhsX/cP W8KHk1/KqBWrS1lGWpGzYD2IAjVBMW+8rZH6/rRmaKwSjHhIwf4dkoF6IuWSRJFZe3HyAm XOgf4SVku+FN4O7tH9VbbDtNsy6u8j6o9PNldMQqwtTxyHQX2akYpzGOULSjIxOw9peXFb D/uOSPlOX+Ug+Iw0yM19esNHfjssOUxBcyueSUJ9Mlc8QLe3xDo21KQHAFROwzGVcM4z93 36QHOmZFps1RGT15IB7RmErr9M+JT4bNGdfZQ7WnfD1b3ef6u2L5dFhRCkwLRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746618626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x/TQK619d94Zge9iB6QMcKh/5BGOrz1fMPuuEKK3Ufc=; b=PYMVMTqlNdKtD+jacicLMurVKs9iFaVZqDo2ONNrWEA5Ye7Il3jZLU8Btmg4tgqnQ1hKWv A2v7/5AhqJxDU9QRl2eEJDZyRtB9uE7JkTsUc/UpuJEM6qDd8vQ+h1x3Qk5iEm2yS4s/Hg aXtP67H/TSz2eH0ajrgb8ijTJai0V/m3lh2wFANnEcZMko9EPdsCdH71S7TyDFN1SNDExl U5aXFreaS0DNO7qdmhYg9tJk0+a2DpTwYWDDkA9lg0JGUt4SzgVjphEn3kntwxOL4c/pfl 4fVOqHrcpaRthykVvNNWeFJ/cSMNsijmLFIYRd3FemnKjKVzlVN1lz0uuJgCLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746618626; a=rsa-sha256; cv=none; b=B0IChw33urHEJrq24hnmBixvqymphh1REaAVixGUELPY2yuQsNkzySJPUp/ECTJfBRCCKZ Ng2HyMw7SYMcCXVgkohwaSBloXpHzbAxfCU48zOXhT2bI3eEEoZwc7AAeaBdtccuin4MFL IxwE5cJKLI/OMCvC1sR/VDzUncwkajMx/NHBFG1K4A17NgMvP9K/RNowTStEjoSQfMA62J EgTnEYcBUTOxVluRIDr3S9PZpG9LtdE9Bjgrfcxe3umTJl0eMQ2WCe3qcgVC3Ai0zZxC7x RBhIOryCVcQEb6oI3p6f1T5gOJpx3lspBKM2Kl+GHMlAuLVZRAPUilqLo6bh/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zstqk2ThqzBqN; Wed, 07 May 2025 11:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547BoQnG089036; Wed, 7 May 2025 11:50:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547BoQY7089033; Wed, 7 May 2025 11:50:26 GMT (envelope-from git) Date: Wed, 7 May 2025 11:50:26 GMT Message-Id: <202505071150.547BoQY7089033@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: a21addc7a013 - stable/14 - LinuxKPI: 802.11: fix wiphy_info[_once] List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a21addc7a0137c5938414df322dbf5f929729834 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a21addc7a0137c5938414df322dbf5f929729834 commit a21addc7a0137c5938414df322dbf5f929729834 Author: Bjoern A. Zeeb AuthorDate: 2025-05-02 20:14:35 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-07 08:51:40 +0000 LinuxKPI: 802.11: fix wiphy_info[_once] The dev field in wiphy is a pointer already; no need for &. Sponsored by: The FreeBSD Foundation Fixes: ac1d519c01ca8 (cherry picked from commit 845b81cf908002b14ac08ce8c42246720a5b30d9) --- sys/compat/linuxkpi/common/include/net/cfg80211.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index 328563b4a125..aae60983f5f6 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -2281,9 +2281,9 @@ wiphy_delayed_work_cancel(struct wiphy *wiphy, struct wiphy_delayed_work *wdwk) #define wiphy_err(_wiphy, _fmt, ...) \ dev_err((_wiphy)->dev, _fmt, __VA_ARGS__) #define wiphy_info(wiphy, fmt, ...) \ - dev_info(&(wiphy)->dev, fmt, ##__VA_ARGS__) + dev_info((wiphy)->dev, fmt, ##__VA_ARGS__) #define wiphy_info_once(wiphy, fmt, ...) \ - dev_info_once(&(wiphy)->dev, fmt, ##__VA_ARGS__) + dev_info_once((wiphy)->dev, fmt, ##__VA_ARGS__) #ifndef LINUXKPI_NET80211 #define ieee80211_channel linuxkpi_ieee80211_channel From nobody Wed May 7 11:50:28 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zstqn0WPkz5wBKq; Wed, 07 May 2025 11:50:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zstqm4xZ6z3VcV; Wed, 07 May 2025 11:50:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746618628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=plRddll6YYNaK4pyugMEUMxI/Sv4Bz4vxdZ923CrIec=; b=JQ0FaF9wdvAC8X/ctYx1FtsOiKVYPsW5X1wbDdD+DJc12Jl1LmqSqF9vjymsT2TEpN7XF3 YaLAMRRO3TYu7gAatkjdcHHtuTVsqD9ORtnRJW0OeE6C/F6EVsa0ZqIxL7jmak3Sry6Pz6 j/KxOXid4PmJpki2r3xNhpFLDWp4hVC2rlcKNnO/Adu66KNNs4gwiw4jlIPuwifaLcLjOl rY8gAZhp1woOskAkXzEkqu7W3wPxHiL8UvFA8W2GxutkFT6/SqS68ki+Wl/BPVvjRdeITV /g2Ho4LlzSdFAATebpzafvhFrHwJctntqf4sFzYOFtcRGIL4RKcSoeV3CDwPvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746618628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=plRddll6YYNaK4pyugMEUMxI/Sv4Bz4vxdZ923CrIec=; b=szFWAHEBYIWdjFZe39EGdk+lSc7Vy9mcWeh7azCfUcWd+HK3zygF7HZOFS2omIc5F69uBz +OZPxNcKz/193OFWI34jEV9ChUr7JFYxqIbbN/PTgAQ6L8ZekNpO3snMWzqSx6AnFMlFrN ioT4NxYsVhqsjRNvestSe7NFhcpMEcXQCcEhapSxo5tybqm+gRwMZWtghWmHD04cgJnlhn iBBGM4nt5AzkE+Xbr53P0RI5er1NAMu+99BwtBUo9sOVBV2Z1cQomHWjuDkvUf1a/5NzEa kw0VWsdDMHUJCyygyc0SXC/lM5bquSBppYQLW0p+jlv2Uu0xsus/7ESLCeAQyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746618628; a=rsa-sha256; cv=none; b=kfPkWDaum/jUFE7JkB8uJbMI7bm+wPeZs4BsZMqo6IqbHh1W2iVCl5Yqtqy0A1sTYVqpHR u6yEdBICy0JLkNPlTB4AhfO4NnBVffDrZ3OgZZnVlAq6FwHI7C0Z8NYY+9dhg9Lneyz+0A ylGFic0tdKNhEhZDR9peTi7nEjNDO+1y/E1QwGmXRZ+2wcUhLlnCEYLxY43ZdZ1IjzH4C4 TWivuTqupQ+6pW8uejCeXzAG5+kqdEYEgiEkdln5e1ihQUZgaGoZCk4TaUE39suXFkXH+m oEExawguX7ahMj+iDXcNSDcNAIdZqnJh3hqi4WcUvwJNn8DUvNrd06srRT5ADw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zstqm4GVbzCXp; Wed, 07 May 2025 11:50:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547BoS8W089115; Wed, 7 May 2025 11:50:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547BoSfN089112; Wed, 7 May 2025 11:50:28 GMT (envelope-from git) Date: Wed, 7 May 2025 11:50:28 GMT Message-Id: <202505071150.547BoSfN089112@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 5eb9006e6aa8 - stable/14 - fwget / mt76: update script to extra firmware and update fget(8) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5eb9006e6aa8eaecaeb8dbdd70bea6c605c19d50 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5eb9006e6aa8eaecaeb8dbdd70bea6c605c19d50 commit 5eb9006e6aa8eaecaeb8dbdd70bea6c605c19d50 Author: Bjoern A. Zeeb AuthorDate: 2025-05-05 00:09:46 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-07 08:51:53 +0000 fwget / mt76: update script to extra firmware and update fget(8) Update the script to support all the sub-drivers we compile now. Some minor polishing as well. Update fwget(8) as more IDs were added. Sponsored by: The FreeBSD Foundation (cherry picked from commit 91f53f4e062715d869f2cb7e957707255390b704) --- sys/contrib/dev/mediatek/mt76/zzz_fw_ports_fwget.sh | 14 ++++++++------ usr.sbin/fwget/pci/pci_network_mediatek | 6 +++++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/sys/contrib/dev/mediatek/mt76/zzz_fw_ports_fwget.sh b/sys/contrib/dev/mediatek/mt76/zzz_fw_ports_fwget.sh index 8747daeba35f..fa836b4b500d 100644 --- a/sys/contrib/dev/mediatek/mt76/zzz_fw_ports_fwget.sh +++ b/sys/contrib/dev/mediatek/mt76/zzz_fw_ports_fwget.sh @@ -2,7 +2,7 @@ #- # SPDX-License-Identifier: BSD-2-Clause # -# Copyright (c) 2024 The FreeBSD Foundation +# Copyright (c) 2024-2025 The FreeBSD Foundation # # This software was developed by Björn Zeeb # under sponsorship from the FreeBSD Foundation. @@ -14,8 +14,8 @@ # USAGE: please check out the correct tag/hash for ports in the # linux-firmware.git repository you point this script to. # -# Valid flavors: mt7915 mt792x {for the drivers with x=[15]} mt7996 -# To add a new one you need to add the mappings in the help functions. +# Valid flavors: mt7615 mt7915 mt792x {for the drivers with x=[15]} mt7996 +# To add a new one you need to add the mappings in the helper functions. # set -e @@ -51,9 +51,10 @@ fi get_device_ids_by_flav() { - for d in mt7915 mt7921 mt7925 mt7996; do + for d in mt7615 mt7915 mt7921 mt7925 mt7996; do case ${d} in + mt7615) flav=${d} ;; mt7915) flav=${d} ;; mt7921) flav=mt792x ;; mt7925) flav=mt792x ;; @@ -79,9 +80,10 @@ get_device_ids_by_flav() get_firmwares_by_flavor() { - for h in mt7915/mt7915.h mt792x.h mt7996/mt7996.h; do + for h in mt7615/mt7615.h mt7915/mt7915.h mt792x.h mt7996/mt7996.h; do case ${h} in + mt7615/mt7615.h) flav=mt7615 ;; mt7915/mt7915.h) flav=mt7915 ;; mt792x.h) flav=mt792x ;; mt7996/mt7996.h) flav=mt7996 ;; @@ -287,6 +289,6 @@ if test ${fn} -gt 0; then done fi -printf "INFO: fwget pci_network_qca %s template at %s\n" ${DRIVER} ${fwgetfile} >&2 +printf "INFO: fwget pci_network_mediatek %s template at %s\n" ${DRIVER} ${fwgetfile} >&2 # end diff --git a/usr.sbin/fwget/pci/pci_network_mediatek b/usr.sbin/fwget/pci/pci_network_mediatek index 3ed6c8b95b47..653c87c410eb 100644 --- a/usr.sbin/fwget/pci/pci_network_mediatek +++ b/usr.sbin/fwget/pci/pci_network_mediatek @@ -2,7 +2,7 @@ # SPDX-License-Identifier: BSD-2-Clause # # Copyright 2023 Bjoern A. Zeeb -# Copyright (c) 2024 The FreeBSD Foundation +# Copyright (c) 2024-2025 The FreeBSD Foundation # # Portions of this software were developed by Björn Zeeb # under sponsorship from the FreeBSD Foundation. @@ -41,10 +41,14 @@ pci_network_mediatek_mt76() 0x0608) addpkg "wifi-firmware-mediatek-kmod-mt792x"; return 1 ;; 0x0616) addpkg "wifi-firmware-mediatek-kmod-mt792x"; return 1 ;; 0x0717) addpkg "wifi-firmware-mediatek-kmod-mt792x"; return 1 ;; + 0x7611) addpkg "wifi-firmware-mediatek-kmod-mt7615"; return 1 ;; + 0x7615) addpkg "wifi-firmware-mediatek-kmod-mt7615"; return 1 ;; + 0x7663) addpkg "wifi-firmware-mediatek-kmod-mt7615"; return 1 ;; 0x7906) addpkg "wifi-firmware-mediatek-kmod-mt7915"; return 1 ;; 0x790a) addpkg "wifi-firmware-mediatek-kmod-mt7915"; return 1 ;; 0x7915) addpkg "wifi-firmware-mediatek-kmod-mt7915"; return 1 ;; 0x7916) addpkg "wifi-firmware-mediatek-kmod-mt7915"; return 1 ;; + 0x7920) addpkg "wifi-firmware-mediatek-kmod-mt792x"; return 1 ;; 0x7922) addpkg "wifi-firmware-mediatek-kmod-mt792x"; return 1 ;; 0x7925) addpkg "wifi-firmware-mediatek-kmod-mt792x"; return 1 ;; 0x7961) addpkg "wifi-firmware-mediatek-kmod-mt792x"; return 1 ;; From nobody Wed May 7 11:50:29 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zstqp0bD1z5wB3X; Wed, 07 May 2025 11:50:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zstqn5qG0z3Vlp; Wed, 07 May 2025 11:50:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746618629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yJ2Lfu8ocT/hwbEzm2xI6qSBDGkyN42U6+Hd6ENuvBU=; b=pXV5AAdqwUBBbp4HBcjR5ZhClkJxl6mCm6tIDrXao39AYtoEA+Cy7V2XwQfj0w7A8uq+WA gI3gn4h+RMrmcJi/0wBsJaWBiPWE4ofiBzoGrFz/fq2dfpwpeLjMyDQqhF+JdJuKBdywh9 19wVb542wtJmln73AWkFMTeEblyMcW1EF4BZD6V8+CXQBRBzMyS3+JKIGGl4tGHqbYnGDN C5okeuNAlVSO6n9z9ervh+9H3ogqzb4+R396da90dZASkoiGwBdzxtzcgY9heC59crFUzb mvMlTP+2208lMgFCy5aBaPn5ytA/jBiH2AAqj0jyGgnS8V1FPyeRHsdzzJNBdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746618629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yJ2Lfu8ocT/hwbEzm2xI6qSBDGkyN42U6+Hd6ENuvBU=; b=Hwq24WjlbDRt/b+y4df4PKq/ONdulyc7r3KpHFddV9JUF+dCwmz/nmRvgHSKltj0CvcADX 4EHd3E5EUJ+Y8X9Q4hjjoQ1PwV8nK10IVyLqlXkIRddbmTLIPLAPZjfMxR3WXbT6/hTYhX VQTUmWAip//1sp4praHrhFwh6ICWAxf2LMTCCI2uP1gibBMxYpFD0ioUGxTdl9swcjtd5G GWHdwOktk97o0wYk/89DBzoGiRPamy9xgQ6/wBsypOV0N2SGkAVGTE/cd5P+24f+HCTotq EA89O28mcMd52kJP7c5cb/rZx6P/RtGrVhZo0eIiC/5t67JQq3AvqL1iLMT1bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746618629; a=rsa-sha256; cv=none; b=NgcjMhUQLBwcfkkmWFLgPZUEaAMPrcRfWPWm+NK5UYstsIKmaCF7fJfbUL233gs+fJsLlu W5Pf51wtYnrkUqo8L/MGYqbZlPFuPjQCa9Usfo/bUp3Kt/BPVTUzih6+Q5Mfj/hvLQ/GIL N079/bmh+vOvLqPbvncZp44JYNOt7GtQEfpAfJD7gR5oAbMP+eNv0SEhoK1rGMr72xVCxQ VIdJjkt3Fnw3RrcobckgYk6w9UylR2KdqO6otkAk6uR8e4zbJYzxsUYM5J+flOBuK79ZNX IHi7fa5dI/nR4ghDfKy6BBdA9AKbwKPDbvsw1wCtY5kJY5aK4k7xMccx6qwDaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zstqn5D59zBqP; Wed, 07 May 2025 11:50:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547BoTwO089151; Wed, 7 May 2025 11:50:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547BoT4B089148; Wed, 7 May 2025 11:50:29 GMT (envelope-from git) Date: Wed, 7 May 2025 11:50:29 GMT Message-Id: <202505071150.547BoT4B089148@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 7b540fa547e7 - stable/14 - LinuxKPI: dummy: add more dummy hreader files List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7b540fa547e7122c74d78dd427f262c8a8bd1a73 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7b540fa547e7122c74d78dd427f262c8a8bd1a73 commit 7b540fa547e7122c74d78dd427f262c8a8bd1a73 Author: Bjoern A. Zeeb AuthorDate: 2025-05-02 20:08:24 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-07 08:52:05 +0000 LinuxKPI: dummy: add more dummy hreader files These are needed for mt76. Sponsored by: The FreeBSD Foundation (cherry picked from commit e8e2ed66f0978c439c7e93ff3d30a86ffad5bf56) --- sys/compat/linuxkpi/dummy/include/linux/regmap.h | 0 sys/compat/linuxkpi/dummy/include/net/page_pool/helpers.h | 0 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/sys/compat/linuxkpi/dummy/include/linux/regmap.h b/sys/compat/linuxkpi/dummy/include/linux/regmap.h new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sys/compat/linuxkpi/dummy/include/net/page_pool/helpers.h b/sys/compat/linuxkpi/dummy/include/net/page_pool/helpers.h new file mode 100644 index 000000000000..e69de29bb2d1 From nobody Wed May 7 11:50:30 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zstqq4RRgz5wB8r; Wed, 07 May 2025 11:50:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zstqq1Jmbz3VVM; Wed, 07 May 2025 11:50:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746618631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T7oHvgVdCYtrcNwuChX2Tj3cfeQZvyBy9/TGBVOOjAU=; b=RrNH80C3nfwSgXZwSFYENq6y9celEjsh3acy/pdmcTy9/ANcSTnDaNmZl0zLa/r4nzUBRc WuVi3tMIrGMm0uIKehOBzf5bGETiIrpZiY14l9tm6deKeCy6TkhRzdbDTmIMttCtnUy8Q4 8k7IMexQ9NdmJdrrhajKvXazFZXzW7eyPF0PbtqUoWEhKd/BXHBbuFXT2bqtFRKqUSrnU0 Gb9oYVavIk9VUrj88cs5/HmKTR8FruMaZqtdP608KOQdtmL12wTv19B6QNwysSuaCePA4c Vni3IdAEed93L8SuouGqEgC2X/KY8vX4Gpf59mXjGfgx+Ep93bRvmd+3LThN+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746618631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T7oHvgVdCYtrcNwuChX2Tj3cfeQZvyBy9/TGBVOOjAU=; b=qwP4w0BCFZ6QAIudu6trrZahy0FKIOiR/EnIN7iHJR74z/do/R/zdMR14UyLR9XPmLqUF4 IHqxeS5J7S4wwtaZYecMberkgo5J27vvhu1Awx4FhP2iCrEh1l7fCBdIbHVu0C2cg0YstZ 4PQGBcBgxIqT+RewLhD3OC8g7GRc74R/bf+2peAjd6gg8apSY7Axh4HMcxvEBFQElGJc6L ouzo8lQMRWKsTaO0rhUVN262hYI0YEO0IZQ1bvrlj2OGJX9w8+V1K9h9+LefWIv0RH7Pjn 8xETx1bDu82Hve1ELH7V0HbaeIg+yMQXm/w3msOwc3qEBhBhp74MYCATjJDvpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746618631; a=rsa-sha256; cv=none; b=Nsh3FfkpNsH8lXl+j7T3LHgb2NmMaWXGRR/a6iFmnJvpTjU4CdrtfBEeVBpmZ/iA/6eMTu R1MYK5FpOCa3/+U8zWZPQr6AM9f6AYkvnIocJ3KE1XnE/TqZQWVK5n1t7KuaVAlnFGVOIH e8ZjVFCuD4O5Dzs5r8IO7mXJyXTaBq0TcKtST6L6mm/rUcAI7Z0Popfy7u6Vtsrw66jp/M CE3AVaXC2XMUYongB5jQSWvtGmb6V+uR19tXzjsljigDd6L9/inxPwqPMBT094SRXXH7TD E+OfDvsbS9yFIR9mgV0KD0nNmpOzFbjXSfOZlQjrXQ0qrDwAKqKbNDOi/1rXbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zstqp6BfKzCVL; Wed, 07 May 2025 11:50:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547BoU6g089187; Wed, 7 May 2025 11:50:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547BoUeH089184; Wed, 7 May 2025 11:50:30 GMT (envelope-from git) Date: Wed, 7 May 2025 11:50:30 GMT Message-Id: <202505071150.547BoUeH089184@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 6a0dbc0a1246 - stable/14 - LinuxKPI: 802.11: header updates for mt76 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6a0dbc0a1246c9825f0892bb6dd957f5d081057a Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6a0dbc0a1246c9825f0892bb6dd957f5d081057a commit 6a0dbc0a1246c9825f0892bb6dd957f5d081057a Author: Bjoern A. Zeeb AuthorDate: 2025-05-02 20:13:33 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-07 08:52:09 +0000 LinuxKPI: 802.11: header updates for mt76 Add more structs, fields, flags, defines. Sponsored by: The FreeBSD Foundation (cherry picked from commit 675e6b1c68ba71af1853952f7df4d84399340009) --- .../linuxkpi/common/include/linux/ieee80211.h | 6 ++ sys/compat/linuxkpi/common/include/net/cfg80211.h | 96 +++++++++++++++------- sys/compat/linuxkpi/common/include/net/mac80211.h | 36 ++++++-- 3 files changed, 100 insertions(+), 38 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index 8a33ad002e09..396204c3c484 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -295,6 +295,7 @@ enum ieee80211_ac_numbers { #define IEEE80211_HT_MCS_MASK_LEN 10 #define IEEE80211_MLD_MAX_NUM_LINKS 15 +#define IEEE80211_MLD_CAP_OP_MAX_SIMUL_LINKS 0xf #define IEEE80211_MLD_CAP_OP_TID_TO_LINK_MAP_NEG_SUPP 0x0060 #define IEEE80211_MLD_CAP_OP_TID_TO_LINK_MAP_NEG_SUPP_SAME 1 @@ -427,6 +428,7 @@ enum ieee80211_tx_control_flags { IEEE80211_TX_CTRL_PORT_CTRL_PROTO = BIT(0), IEEE80211_TX_CTRL_PS_RESPONSE = BIT(1), IEEE80211_TX_CTRL_RATE_INJECT = BIT(2), + IEEE80211_TX_CTRL_DONT_USE_RATE_MASK = BIT(3), IEEE80211_TX_CTRL_MLO_LINK = 0xF0000000, /* This is IEEE80211_LINK_UNSPECIFIED on the high bits. */ }; @@ -493,6 +495,10 @@ enum ieee80211_category { WLAN_CATEGORY_SA_QUERY = 8, /* net80211::IEEE80211_ACTION_CAT_SA_QUERY */ }; +struct ieee80211_he_6ghz_capa { + uint16_t capa; +}; + /* 80211-2020 9.3.3.2 Format of Management frames */ struct ieee80211_mgmt { __le16 frame_control; diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index aae60983f5f6..1e4f917a2796 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -744,6 +744,8 @@ struct linuxkpi_ieee80211_regdomain { #define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_4 0x20 #define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_MASK 0x40 #define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_MASK 0x80 +#define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_5 0x80 +#define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_5 0x80 #define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_2 0x1 #define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_2 0x2 @@ -931,11 +933,6 @@ struct ieee80211_he_obss_pd { uint8_t partial_bssid_bitmap[8]; }; -struct ieee80211_sta_he_6ghz_capa { - /* TODO FIXME */ - int capa; -}; - struct ieee80211_eht_mcs_nss_supp_20mhz_only { union { struct { @@ -989,7 +986,7 @@ struct ieee80211_sband_iftype_data { /* TODO FIXME */ enum nl80211_iftype types_mask; struct ieee80211_sta_he_cap he_cap; - struct ieee80211_sta_he_6ghz_capa he_6ghz_capa; + struct ieee80211_he_6ghz_capa he_6ghz_capa; struct ieee80211_sta_eht_cap eht_cap; struct { const uint8_t *data; @@ -1182,6 +1179,18 @@ enum cfg80211_regulatory { REGULATORY_COUNTRY_IE_FOLLOW_POWER = BIT(6), }; +struct wiphy_radio_freq_range { + uint32_t start_freq; + uint32_t end_freq; +}; + +struct wiphy_radio { + int n_freq_range; + int n_iface_combinations; + const struct wiphy_radio_freq_range *freq_range; + const struct ieee80211_iface_combination *iface_combinations; +}; + enum wiphy_flags { WIPHY_FLAG_AP_UAPSD = BIT(0), WIPHY_FLAG_HAS_CHANNEL_SWITCH = BIT(1), @@ -1246,6 +1255,9 @@ struct wiphy { uint8_t available_antennas_rx; uint8_t available_antennas_tx; + int n_radio; + const struct wiphy_radio *radio; + int features, hw_version; int interface_modes, max_match_sets, max_remain_on_channel_duration, max_scan_ssids, max_sched_scan_ie_len, max_sched_scan_plan_interval, max_sched_scan_plan_iterations, max_sched_scan_plans, max_sched_scan_reqs, max_sched_scan_ssids; int num_iftype_ext_capab; @@ -1259,6 +1271,7 @@ struct wiphy { unsigned long ext_features[BITS_TO_LONGS(NUM_NL80211_EXT_FEATURES)]; struct dentry *debugfsdir; + const struct wiphy_wowlan_support *wowlan; struct cfg80211_wowlan *wowlan_config; /* Lower layer (driver/mac80211) specific data. */ @@ -1271,8 +1284,9 @@ struct wiphy { struct wireless_dev { /* XXX TODO, like ic? */ - int iftype; - int address; + enum nl80211_iftype iftype; + uint32_t radio_mask; + uint8_t address[ETH_ALEN]; struct net_device *netdev; struct wiphy *wiphy; }; @@ -1542,6 +1556,43 @@ cfg80211_chandef_create(struct cfg80211_chan_def *chandef, }; } +static __inline bool +cfg80211_chandef_valid(const struct cfg80211_chan_def *chandef) +{ + TODO(); + return (false); +} + +static __inline bool +cfg80211_chandef_dfs_usable(struct wiphy *wiphy, const struct cfg80211_chan_def *chandef) +{ + TODO(); + return (false); +} + +static __inline unsigned int +cfg80211_chandef_dfs_cac_time(struct wiphy *wiphy, const struct cfg80211_chan_def *chandef) +{ + TODO(); + return (0); +} + +static __inline bool +cfg80211_chandef_identical(const struct cfg80211_chan_def *chandef_1, + const struct cfg80211_chan_def *chandef_2) +{ + TODO(); + return (false); +} + +static __inline bool +cfg80211_chandef_usable(struct wiphy *wiphy, + const struct cfg80211_chan_def *chandef, uint32_t flags) +{ + TODO(); + return (false); +} + static __inline void cfg80211_bss_iter(struct wiphy *wiphy, struct cfg80211_chan_def *chandef, void (*iterfunc)(struct wiphy *, struct cfg80211_bss *, void *), void *data) @@ -2077,27 +2128,6 @@ cfg80211_find_ext_ie(uint8_t eid, const uint8_t *p, size_t len) return (NULL); } -static __inline bool -cfg80211_chandef_valid(const struct cfg80211_chan_def *chandef) -{ - TODO(); - return (false); -} - -static __inline bool -cfg80211_chandef_dfs_usable(struct wiphy *wiphy, const struct cfg80211_chan_def *chandef) -{ - TODO(); - return (false); -} - -static __inline unsigned int -cfg80211_chandef_dfs_cac_time(struct wiphy *wiphy, const struct cfg80211_chan_def *chandef) -{ - TODO(); - return (0); -} - static inline void _ieee80211_set_sband_iftype_data(struct ieee80211_supported_band *band, struct ieee80211_sband_iftype_data *iftype_data, size_t nitems) @@ -2189,6 +2219,14 @@ cfg80211_get_iftype_ext_capa(struct wiphy *wiphy, enum nl80211_iftype iftype) return (NULL); } +static inline uint16_t +ieee80211_get_he_6ghz_capa(const struct ieee80211_supported_band *sband, + enum nl80211_iftype iftype) +{ + TODO(); + return (0); +} + static inline int nl80211_chan_width_to_mhz(enum nl80211_chan_width width) { diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index c6cdcbc43269..f8eb180d63a1 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -473,6 +473,7 @@ enum ieee80211_hw_flags { IEEE80211_HW_DISALLOW_PUNCTURING_5GHZ, IEEE80211_HW_TX_STATUS_NO_AMPDU_LEN, IEEE80211_HW_HANDLES_QUIET_CSA, + IEEE80211_HW_NO_VIRTUAL_MONITOR, /* Keep last. */ NUM_IEEE80211_HW_FLAGS @@ -708,9 +709,10 @@ struct ieee80211_sta_rates { /* XXX TODO */ /* XXX some _rcu thing */ struct { - int idx; - int flags; - } rate[1]; /* XXX what is the real number? */ + uint8_t idx; + uint8_t count; + uint16_t flags; + } rate[4]; /* XXX what is the real number? */ }; struct ieee80211_sta_txpwr { @@ -734,7 +736,7 @@ struct ieee80211_link_sta { struct ieee80211_sta_ht_cap ht_cap; struct ieee80211_sta_vht_cap vht_cap; struct ieee80211_sta_he_cap he_cap; - struct ieee80211_sta_he_6ghz_capa he_6ghz_capa; + struct ieee80211_he_6ghz_capa he_6ghz_capa; struct ieee80211_sta_eht_cap eht_cap; uint8_t rx_nss; enum ieee80211_sta_rx_bw bandwidth; @@ -1093,7 +1095,7 @@ struct ieee80211_ops { void (*update_vif_offload)(struct ieee80211_hw *, struct ieee80211_vif *); - int (*get_txpower)(struct ieee80211_hw *, struct ieee80211_vif *, int *); + int (*get_txpower)(struct ieee80211_hw *, struct ieee80211_vif *, unsigned int, int *); int (*get_stats)(struct ieee80211_hw *, struct ieee80211_low_level_stats *); int (*set_radar_background)(struct ieee80211_hw *, struct cfg80211_chan_def *); @@ -1870,13 +1872,13 @@ ieee80211_rate_set_vht(struct ieee80211_tx_rate *r, uint8_t mcs, uint8_t nss) } static inline uint8_t -ieee80211_rate_get_vht_nss(struct ieee80211_tx_rate *r) +ieee80211_rate_get_vht_nss(const struct ieee80211_tx_rate *r) { return (((r->idx >> 4) & 0x07) + 1); } static inline uint8_t -ieee80211_rate_get_vht_mcs(struct ieee80211_tx_rate *r) +ieee80211_rate_get_vht_mcs(const struct ieee80211_tx_rate *r) { return (r->idx & 0x0f); } @@ -2180,12 +2182,27 @@ ieee80211_queue_work(struct ieee80211_hw *hw, struct work_struct *w) linuxkpi_ieee80211_queue_work(hw, w); } +static __inline bool +ieee80211_tx_prepare_skb(struct ieee80211_hw *hw, struct ieee80211_vif *vif, + struct sk_buff *skb, enum nl80211_band band, struct ieee80211_sta **sta) +{ + TODO(); + return (false); +} + static __inline void ieee80211_tx_status_skb(struct ieee80211_hw *hw, struct sk_buff *skb) { linuxkpi_ieee80211_tx_status(hw, skb); } +static inline void +ieee80211_tx_status_noskb(struct ieee80211_hw *hw, struct ieee80211_sta *sta, + struct ieee80211_tx_info *info) +{ + TODO(); +} + static __inline void ieee80211_tx_status_irqsafe(struct ieee80211_hw *hw, struct sk_buff *skb) { @@ -2267,7 +2284,8 @@ ieee80211_txq_may_transmit(struct ieee80211_hw *hw, struct ieee80211_txq *txq) } static __inline void -ieee80211_radar_detected(struct ieee80211_hw *hw) +ieee80211_radar_detected(struct ieee80211_hw *hw, + struct ieee80211_chanctx_conf *chanctx_conf) { TODO(); } @@ -2327,7 +2345,7 @@ ieee80211_get_tx_rates(struct ieee80211_vif *vif, struct ieee80211_sta *sta, } static __inline void -ieee80211_color_change_finish(struct ieee80211_vif *vif) +ieee80211_color_change_finish(struct ieee80211_vif *vif, uint8_t link_id) { TODO(); } From nobody Wed May 7 11:50:31 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zstqr5Y4Kz5wBHl; Wed, 07 May 2025 11:50:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zstqr0T9Vz3VVd; Wed, 07 May 2025 11:50:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746618632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3fDEzHEifSV/4yEhT3sv5a5ihlWZ3kv7uxuppVMOWqk=; b=ZWfrGg377HmnH9JUYYFQBmjApTgpqsu1Twly4eTKQx17OIoIr8GuLMcBFQf1HH/iZzhNPQ PMg0Gnji6t/uwXm6GhKgNY/ONLtmQajfkzkXVloR6wEmDuC5Yld5BgTA5bHlbF5dyoytU5 KqCd+2OpOauJ4/qE20WZvYjJYclRBqBuwbalR5MYhOSALWPRs17QqS9Bt11BpOhmdmFOv7 wOxfn1JkA7VKVp0YeeSn+nAA5MVqqDF2W3Xqzt1EEjROpOSpD8+8vZjCvk7tVRqtKIL1E8 jjwUA6DV0Uxi/xuwL4jwibKMkU7LdD/Ehcvs2f4d4iyT+ugsMr8zRbUbRGnA5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746618632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3fDEzHEifSV/4yEhT3sv5a5ihlWZ3kv7uxuppVMOWqk=; b=lxRHvgXNb1DO3jp1QQVREObyI8spLxa0abHZhETY3MzpDawbLy+gzA8yBlrTKTOYgdfTRA F87QGm46oovTz/aJ3BzInfEl/n9W2ja+Y36MqiFicxMFDlQ2zkl3fFfflOczZjhyEi9RVp OZbynqDQsVvvFTyb7kgewNK007UHdoEqpRJ17O81jj0S3ykfl71PtOhO5kZuj88N1Cdwgc MP6LSiOx3aYfxSyDPoOhG/4QqdnPeC687YinhRpHbL9xloK2Gt84WQPyQt7bGsR9iSzsmf 0uF8mhdzZzxJVgKiCEYbtr7xPuWo/MRo8sa54ZCnXgbUrrcguShihRmEyf1LcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746618632; a=rsa-sha256; cv=none; b=yAD1JCHndjiNzEk12pGBs2vYWLj75kaD2ZHnMDQIIARC9dhM6I6/FwfN9f7AK8ODB6QEvd QxW+LNKm5fCaI9hGGIUpOcO5PVuTxrGsMGLLfyKqZEHlT3aEQJKGciY2auGpvg9J1LTa6t DX+8qMl+AQ0y78JoT7mgu7KCJoTLb4gUejt4GNWrujXvzbUSqF5yfq1Wsnf4463opV9tBr K11lAebINzjFiPFNL1lT6uOhh0y8sw2U1R6DRK6fcH0g+swExUDWisxHmeg+qdY0IRa48A rYQGkP9HmT3KHnC1HzkX69qY0w9xfQGC6YAMhLoSUMt/BSvce1KjisVx6STEag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zstqr04XMzC79; Wed, 07 May 2025 11:50:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547BoVKE089223; Wed, 7 May 2025 11:50:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547BoVq0089220; Wed, 7 May 2025 11:50:31 GMT (envelope-from git) Date: Wed, 7 May 2025 11:50:31 GMT Message-Id: <202505071150.547BoVq0089220@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 033e97bababe - stable/14 - LinuxKPI: style List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 033e97bababed3fc6b4f183d8a0969598fa52d05 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=033e97bababed3fc6b4f183d8a0969598fa52d05 commit 033e97bababed3fc6b4f183d8a0969598fa52d05 Author: Bjoern A. Zeeb AuthorDate: 2025-05-04 19:52:11 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-07 08:52:14 +0000 LinuxKPI: style Check results of non-bool to be != 0. No functional changes intended. Sponsored by: The FreeBSD Foundation Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D50158 (cherry picked from commit 76b66ac45ea804f23ffb35712b0ceaa98864c06f) --- sys/compat/linuxkpi/common/src/linux_kobject.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_kobject.c b/sys/compat/linuxkpi/common/src/linux_kobject.c index ddd0a58660f1..8e71b5d69073 100644 --- a/sys/compat/linuxkpi/common/src/linux_kobject.c +++ b/sys/compat/linuxkpi/common/src/linux_kobject.c @@ -114,10 +114,10 @@ kobject_add_complete(struct kobject *kobj, struct kobject *parent) for (attr = t->default_attrs; *attr != NULL; attr++) { error = sysfs_create_file(kobj, *attr); - if (error) + if (error != 0) break; } - if (error) + if (error != 0) sysfs_remove_dir(kobj); } return (error); From nobody Wed May 7 11:50:33 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zstqs4WZ8z5wB6Z; Wed, 07 May 2025 11:50:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zstqs1ZDhz3VrW; Wed, 07 May 2025 11:50:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746618633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Wrh7S6NMy7Tpqnn4vQ+W45n4tgRaGqdD/2E8d7QTNE=; b=sJ8e4YkQ3YbOwvO0CeH9gDInmWns+dDyHU2lo4xVxtKQMPGZkPEtYddB+fnjo6sH1TdFC6 NoP7h7l9ywY9KHdYY+F1Z2jb4l75BZaRq+VF1qLRIhOtOj1HD1RWFITf+qc887SCGTGgRx eZpBxcE/oDdzH9AiQ9dHHpurFX9f9FBczY+TNlRy57NPRqWDaz66HB5ZoRGnIm1X8zkPiL hvGbYAm5acbEAmPZE6V564FxYvYEAEzr+VdnQz64DeYXm6w9DZ12rpphsk3voZDdjf3x8S TQYMROOaTwGsbdjJoHc2OaJKrAxLLS0CL72T+6tHHQZy7Brj8/0kEiVN0vsVVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746618633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Wrh7S6NMy7Tpqnn4vQ+W45n4tgRaGqdD/2E8d7QTNE=; b=Kz4fY94jqzB89ZIR7UXhLUGRlqDEHF9lH/L+oaFXYesB8b3mQq/n/2J10N6m54c9Ie1LM9 y+92G7PCM2gPAVQDMhxKE0n7WAjMmW6I1VLwP1kNG95FW7ScPIahLhNez3YqHgu2/wcjt7 0FqLrq6vT6F0nnwhY0hHuKsGk8hs5eagUvfvMU7iq+6Fl03KC+nFolPazCQPzeUBSPAYoi nVbAZVYO3MYrV/OUrF0zJcC6Hh+FKGMRk6o9ngLnxuOfVl7C00n3X8tpceuBIj+Bjq0aAz N14yreQnQ5uYu33+NwINl+r6/PMUefdb7daDQYkFFsLiDYhGjNupFHw+yCd/Wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746618633; a=rsa-sha256; cv=none; b=OcndBZTVtWGnLiA9/3HzI9K4J0lX6YH3kcCj3KIltH1W9N8S+ZD/R5zFWTQldY9jIruNmk bFSjQmNu6k/LBxPOItEsMqyLWDc/LHCawsaiHK/eaothbhEARyA5lNBhHsvYr56mxO7DCa gdxmEkp8+I2U8ACp83xfmGD6KOXPt/2dzsHw3TADHtnQcl4JQuFvZolvUOSxd8YjcwSD9J yrCVFUmd0X39MD3nnCo3WbudzGTf7/7tX27E4nYhrjSTfd0LTYF2kAI5nvWstMlAicGVA0 sI/NrUolo5IVw+QyrXQBsIcEkxor754OBRODLvcPexob9E2x009k1E8q12VHnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zstqs0lbkzCXq; Wed, 07 May 2025 11:50:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547BoXXQ089270; Wed, 7 May 2025 11:50:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547BoXBR089267; Wed, 7 May 2025 11:50:33 GMT (envelope-from git) Date: Wed, 7 May 2025 11:50:33 GMT Message-Id: <202505071150.547BoXBR089267@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 707cfc54f8f3 - stable/14 - LinuxKPI: add is_unicast_ether_addr() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 707cfc54f8f3abcf04212960757a3f844773990e Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=707cfc54f8f3abcf04212960757a3f844773990e commit 707cfc54f8f3abcf04212960757a3f844773990e Author: Bjoern A. Zeeb AuthorDate: 2025-05-03 23:44:52 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-07 08:52:22 +0000 LinuxKPI: add is_unicast_ether_addr() Needed by mediatek/mt76 wireless driver. While here adjust the way is_multicast_ether_addr() is implemented to not look weird. [1] Sponsored by: The FreeBSD Foundation Suggested by: emaste [1] Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D50152 (cherry picked from commit a4618caa43c16e6e672c27dac1943fd833f8bd8f) --- sys/compat/linuxkpi/common/include/linux/etherdevice.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/etherdevice.h b/sys/compat/linuxkpi/common/include/linux/etherdevice.h index 5d3df744ae0e..1f2d6cf22d7e 100644 --- a/sys/compat/linuxkpi/common/include/linux/etherdevice.h +++ b/sys/compat/linuxkpi/common/include/linux/etherdevice.h @@ -57,10 +57,16 @@ is_zero_ether_addr(const u8 * addr) 0x00); } +static inline bool +is_unicast_ether_addr(const u8 * addr) +{ + return ((addr[0] & 0x01) == 0x00); +} + static inline bool is_multicast_ether_addr(const u8 * addr) { - return (0x01 & addr[0]); + return ((addr[0] & 0x01) == 0x01); } static inline bool From nobody Wed May 7 11:50:34 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zstqv18YLz5wBDP; Wed, 07 May 2025 11:50:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zstqt2W1bz3Vrl; Wed, 07 May 2025 11:50:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746618634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xiyJWBG6Nvwb8g/KpchxDoQ6xEgLTJFAD2mmtTd5JJ4=; b=EKjJg9QT0qTjn16M4DuFOQtiKLo2esszD4ur8MOpt2V897a1BmMIZkWWZHQPFU+nBEhEqL mkHgWf7BWTE7wbLlinzURiW9+15pmhwr6PrtY0X1owh+Yz1+cPASybpxwDT4mmkeO3Hsqd sOw4ZVkn2Rkjhmz1+uls7uGoLJjjqzSzrQG7XimN7nDOkkL9js78h0t2foMh9I3oplVyBI x9ircBDeiXUgckgyJCJMVEZz85opILmrW4DTCR2QP5sxL+ifY0TF8hApw/ZG05KVgcoxFb uBjKRlKcRGLBwyoXKfPjUULMSjVDUX82M1d3BwwO+HLyZ3TDN/FChLEMqyt0Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746618634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xiyJWBG6Nvwb8g/KpchxDoQ6xEgLTJFAD2mmtTd5JJ4=; b=cty6vQQyGSfJnozUO31fsWrurXgqJP3lxDJESn2B1uH4dsrgc2KnnmiSuOy3qc6RUOg6Uc oEzJHCo4EzBULVJYJH1oPnnY/YK3f2op0Le9Jph0tHtXs8eaOUl88Xnl+U1R+7FWp/pCOA XSUSVStL506NH5gpvNfw6ox+9e1/r87rMQym45q48y/fXnS3oLIz4dD/SFvZSn/0xmlxnL fEeuBfYCWd4y6sd7yp666WY2cXMBUx70QNLXizAMt4hM9CPNuId3FGWkRJo0g+V8Rx9oWz V/eZSl0CasYixmc/N+YTqhJf4S4GdVnQihrB0cPZoQYKfbaCoRywxRjUk0s0RQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746618634; a=rsa-sha256; cv=none; b=gvw5gQDt6FB+VLJxZD74D9q7YQxvbyW/ut2sFU0CfKOZznI4tUaZUJhBly3SDk9GfCRMVN msJ37VFRGmdCYFmPnM/qntXfU8mzzYKjqEcBa4QPiC4UNjiLHqJaHceW1xZskGW5A3wjXn 85ELYAgUmS/hcKSac4eBKh8V/MeYiy92Fvedmg3r5vCDg8HeYCmu5ilsSWxP95vQsRkNrS wv52UdSxYicrzGRXzFZ2vr4fblPx1WIyJSZs/sLnJU+oT+7JPDDXO6+p9f6EyO5RUUDDrM OnsOemIyzqaSmcdfjeK2B10N4BMmMA6KIizc0dYJcJQTNFq3ATjU5UiWfBADtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zstqt1YflzC7B; Wed, 07 May 2025 11:50:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547BoYC0089311; Wed, 7 May 2025 11:50:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547BoYYe089308; Wed, 7 May 2025 11:50:34 GMT (envelope-from git) Date: Wed, 7 May 2025 11:50:34 GMT Message-Id: <202505071150.547BoYYe089308@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 34cd36918652 - stable/14 - net80211: fix a race between ieee80211_sta_join and scan entries List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 34cd36918652f07ea8a36a62115349781e457fc6 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=34cd36918652f07ea8a36a62115349781e457fc6 commit 34cd36918652f07ea8a36a62115349781e457fc6 Author: Bjoern A. Zeeb AuthorDate: 2025-04-16 19:10:58 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-07 08:52:29 +0000 net80211: fix a race between ieee80211_sta_join and scan entries We were seeing panics during ieee80211_sta_join() which seemed that the ni->ni_chan was not valid anymore, which was true. We also saw errors indicating data put into ni_ies became inalid. The problem was that the ieee80211_scan_entry passed into ieee80211_sta_join() (in the observed case from setmlme_assoc_sta()) became invalid during ieee80211_alloc_node(). As a result for the ni_chan case the the rateset and len in rates[1] became invalid. Similarly for the IEs. Make a (deep)copy of the scan entry in setmlme_assoc_sta() and return the copy as once we leave ieee80211_scan_iterate() we can no longer rely on the scan entry to be valid. Sponsored by: The FreeBSD Foundation Reported by: rm, ziaee, bz Tested by: rm, ziaee, bz PR: 286063 Reviewed by: adrian (,emaste) Differential Revision: https://reviews.freebsd.org/D49865 (cherry picked from commit aff56b4f0b25c44c9c2cae9a3f816c4277057a71) --- sys/net80211/ieee80211_ioctl.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c index 3b57e7d8cd8e..7447e3a05ed3 100644 --- a/sys/net80211/ieee80211_ioctl.c +++ b/sys/net80211/ieee80211_ioctl.c @@ -1534,7 +1534,8 @@ struct scanlookup { const uint8_t *mac; int esslen; const uint8_t *essid; - const struct ieee80211_scan_entry *se; + bool found; + struct ieee80211_scan_entry se; }; /* @@ -1544,6 +1545,10 @@ static void mlmelookup(void *arg, const struct ieee80211_scan_entry *se) { struct scanlookup *look = arg; + int rv; + + if (look->found) + return; if (!IEEE80211_ADDR_EQ(look->mac, se->se_macaddr)) return; @@ -1553,7 +1558,14 @@ mlmelookup(void *arg, const struct ieee80211_scan_entry *se) if (memcmp(look->essid, se->se_ssid+2, look->esslen)) return; } - look->se = se; + /* + * First copy everything and then ensure we get our own copy of se_ies. */ + look->se = *se; + look->se.se_ies.data = 0; + look->se.se_ies.len = 0; + rv = ieee80211_ies_init(&look->se.se_ies, se->se_ies.data, se->se_ies.len); + if (rv != 0) /* No error */ + look->found = true; } static int @@ -1562,21 +1574,25 @@ setmlme_assoc_sta(struct ieee80211vap *vap, const uint8_t ssid[IEEE80211_NWID_LEN]) { struct scanlookup lookup; + int rv; KASSERT(vap->iv_opmode == IEEE80211_M_STA, ("expected opmode STA not %s", ieee80211_opmode_name[vap->iv_opmode])); /* NB: this is racey if roaming is !manual */ - lookup.se = NULL; lookup.mac = mac; lookup.esslen = ssid_len; lookup.essid = ssid; + memset(&lookup.se, 0, sizeof(lookup.se)); + lookup.found = false; ieee80211_scan_iterate(vap, mlmelookup, &lookup); - if (lookup.se == NULL) + if (!lookup.found) return ENOENT; mlmedebug(vap, mac, IEEE80211_MLME_ASSOC, 0); - if (!ieee80211_sta_join(vap, lookup.se->se_chan, lookup.se)) + rv = ieee80211_sta_join(vap, lookup.se.se_chan, &lookup.se); + ieee80211_ies_cleanup(&lookup.se.se_ies); + if (rv == 0) return EIO; /* XXX unique but could be better */ return 0; } From nobody Wed May 7 12:09:55 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZsvGD2Mzyz5wCMY; Wed, 07 May 2025 12:09:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsvGD1pMCz3fRc; Wed, 07 May 2025 12:09:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746619796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hn42UT7BdkSaRR2mJ3D4zwSCq+tHjmPOLoRG80wmCsw=; b=xU8pIzgfnwsw9K5s9a9uFCFRBghEss27w+qPrPFzGK2dqJ7mLt3ykYMuL+QhqpnhmmNNxy mVkIZinC4xWpQMBJP4WmcdZwZkQsHRWWlQ6DzM44lkWu2rWJbB5/tAIq0f/tOzye6tHDgW Z5BrEk1uLTF9Wjdj6/VJccL5XdzNDxzqVoo06GfOm0y5bcujR/bG99gY5AHjPzkqC8MTxy pZtEGHRDlC23UQN+MsDeETnlRCG1T5Jp5CcMQbN6WhAZ6nXWfufb0M1hO6fV1nePpUICr5 3si3sImQJUxZPBU4z9n/uFA5Yphi8t5kWsiUwEgQophMFtpr0W0gXNH1KG2AwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746619796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hn42UT7BdkSaRR2mJ3D4zwSCq+tHjmPOLoRG80wmCsw=; b=ebNYKz7ZaGI6Val06fYHdPjlgZeNXWzhXYugLPCrz765ymO/oaG9zmR7m7ipY/7CWe/Xr7 gOg5+MQ63rDJweb1zfrAyRsQE75XxGy3vpN1iCYb/2xMl3ruQn4bHuJrusFR88hlxxXfW3 tDwe9IRMQIjIGwL0Nkk4H48z1aS7HII/FXAPwvgY5ANHrLg7DpBJltQGyOPODKm+wWqVRq Urft6jpmDMDBFCg3CMkyH/XDKxXgvOSMYFOwDM8CU7WVCLPJY6Bpj1GhFj/TyXaqCjYyrH 85ZYNK2JtP/afvyInJODx3LvCelHFh3s66T81c8DmDLzSux8zCnsv1VOsk9fFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746619796; a=rsa-sha256; cv=none; b=hp1O7SWlUI/rjPqbogiy09jgYldnuUIhv+Nx88s6kK49DlkFBw9PQVFlzwuDa7/Yy3MIsg h39/skkBfUthkpLrVpEopVWIgccL5tCE28kP6ojkKxDbM02wY3GMgnaOlnVTLwaztmrkSc BB/hsUOpHZL680DWvNJAWH6hvTz+o5SNzxR/c8T9kYQdtFybK0GV3sq0hPvJJ/jzS1XPkB M7J6HsMzP2DOvoAQ9ebZ1vqj/5xgoUz/n9K4Ma4d9GywwwDi5NCp1pn1YchMevznW0vPZX jV2573lXqqQc7CJfBImT50K1lgmQPY3WpPCwoMYDlLajjbWvmHerAJU91+TP7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZsvGD15nCzD1K; Wed, 07 May 2025 12:09:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547C9tSr019426; Wed, 7 May 2025 12:09:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547C9tMD019423; Wed, 7 May 2025 12:09:55 GMT (envelope-from git) Date: Wed, 7 May 2025 12:09:55 GMT Message-Id: <202505071209.547C9tMD019423@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 399bc0c1823c - releng/14.3 - netinet: Make in_systm.h self-contained List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 399bc0c1823c4643abbe3089bc6ed2f3ddf7bef7 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=399bc0c1823c4643abbe3089bc6ed2f3ddf7bef7 commit 399bc0c1823c4643abbe3089bc6ed2f3ddf7bef7 Author: Mark Johnston AuthorDate: 2025-05-03 20:44:13 +0000 Commit: Mark Johnston CommitDate: 2025-05-07 12:04:59 +0000 netinet: Make in_systm.h self-contained PR: 286539 MFC after: 3 days Approved by: re (cperciva) (cherry picked from commit 75d173a84836d14b12a0f747ffed7d37766dd274) (cherry picked from commit 02dde7c43fe76a5dcdc170de1c2740a31629e106) --- sys/netinet/in_systm.h | 2 ++ tools/build/test-includes/badfiles.inc | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/in_systm.h b/sys/netinet/in_systm.h index 77c66c479b75..e61101916ee7 100644 --- a/sys/netinet/in_systm.h +++ b/sys/netinet/in_systm.h @@ -34,6 +34,8 @@ #ifndef _NETINET_IN_SYSTM_H_ #define _NETINET_IN_SYSTM_H_ +#include + /* * Miscellaneous internetwork * definitions for kernel. diff --git a/tools/build/test-includes/badfiles.inc b/tools/build/test-includes/badfiles.inc index 21657bfef4ed..297b00207885 100644 --- a/tools/build/test-includes/badfiles.inc +++ b/tools/build/test-includes/badfiles.inc @@ -257,7 +257,6 @@ BADHDRS= \ netinet/in_pcb.h \ netinet/in_pcb_var.h \ netinet/in_rss.h \ - netinet/in_systm.h \ netinet/in_var.h \ netinet/ip.h \ netinet/ip6.h \ From nobody Wed May 7 12:09:57 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZsvGF22qgz5wC90; Wed, 07 May 2025 12:09:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsvGF1R2gz3f9k; Wed, 07 May 2025 12:09:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746619797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=72ldNn+8GFnqqZS4qdkCGDIHHfD5ikUFbKhjWcbkZfI=; b=w220D+GKdDBHekANXCSBDHfrzox4EG/+cPki2rXrEJXah6jarDOQApt4x113AHyG0olVip aEImIk+jaR1KkHs9XsT8kWWUVFPL9YWyH8Ww8zpcRbrxcX/KqzYDS6VWbu58FUYmzxzrvK pfu8qgS/4b5CVvDf8KlIMr+aQ6pdQ+utFxOiUIgC8ZhOb/GIzM1M+8t5RNZtarahhNC286 b11ibwCWk6uEbibtneVYv8Aeok2l354u1DQl7TVoteGM/pTeH6Kev4GpV390xPT+rW/EU6 /gWsjMSmbvQYzd92I77eX4Jib3yMKxjd2AS8Gf6w3tJ2XIpZK2YyXrpQXYgobA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746619797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=72ldNn+8GFnqqZS4qdkCGDIHHfD5ikUFbKhjWcbkZfI=; b=Aii/BhbhDWUd56ZSPLOizxQEcrBdM5Rq3mOTS+qkS90te1IEcxI8QQuk3Dc5NomvuscM7+ AEGTXguwEErrOqMQFbYKo+P4hxpyOjZNh6gILvZ1kzzznsICvyiCm6J3sW9iKWSynIjRew R0bdFfd2J8Dyck2vAJ0GFgS75xYf6l61GriEmMeWDWydlMRaAR0vPWv4r0u318R0SYCgFq l+EQzmn1ROZ/n6wabKoSz+U8cIYcaGSCVPH43XOPYmwBLjVSE7MBfJQ4KaU+jSK/5uidGJ +RMvywaUz+fqjkuOlhOt9HUQqGa9UoO67JMUriHU4GjiDQRf2yTDrHfsuO7g9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746619797; a=rsa-sha256; cv=none; b=TQqTrAgvtTVQGvHgd38onGE/Urrxf4wdQOg7Mx9kCCEoxrjZjiJqD1Cya95UZArsXVSIru yINQrRFEBS1BtysNGFqOIig5KmfNOtcvrZwkDhjujzI1B1kTHJ2GWkCsZK9cUwXuDGIxVk 3p37vbkb3N0Ckjfh8Z56pazwdRLNH/60pNji2ThjwmY6t29+wxIASQ0EFyOTYn5ZP8V6Ae 2O+YceXKiJp5/+AXpRO7vugyCM9/QIMCMChRBidl9Wp9FKwK+RyLhOuyOD1OeWGG482XWq /IexogxgsmDj62cKr/KZ6Pj6UvEJtwQGJ5Iu4UbhVH/AYMnaWlxoXZAACwCK5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZsvGF10H5zCj6; Wed, 07 May 2025 12:09:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547C9vvO019468; Wed, 7 May 2025 12:09:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547C9vLX019465; Wed, 7 May 2025 12:09:57 GMT (envelope-from git) Date: Wed, 7 May 2025 12:09:57 GMT Message-Id: <202505071209.547C9vLX019465@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f30669ba9725 - releng/14.3 - bpf: Make bpf.h self-contained List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: f30669ba9725c37ea4336b4236a2f117276848a1 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f30669ba9725c37ea4336b4236a2f117276848a1 commit f30669ba9725c37ea4336b4236a2f117276848a1 Author: Mark Johnston AuthorDate: 2025-05-03 20:43:42 +0000 Commit: Mark Johnston CommitDate: 2025-05-07 12:05:08 +0000 bpf: Make bpf.h self-contained PR: 286539 MFC after: 3 days Approved by: re (cperciva) (cherry picked from commit 981af1192cfa5ecd7bee9fe47386ed9d45397828) (cherry picked from commit 48881a2680ab42ea1b06d1c9685df9d295991d16) --- sys/net/bpf.h | 1 + tools/build/test-includes/badfiles.inc | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/bpf.h b/sys/net/bpf.h index c4132d2e633c..8ee8a841a96d 100644 --- a/sys/net/bpf.h +++ b/sys/net/bpf.h @@ -40,6 +40,7 @@ #ifndef _NET_BPF_H_ #define _NET_BPF_H_ +#include #include #include #include diff --git a/tools/build/test-includes/badfiles.inc b/tools/build/test-includes/badfiles.inc index 297b00207885..496eaf70b9c3 100644 --- a/tools/build/test-includes/badfiles.inc +++ b/tools/build/test-includes/badfiles.inc @@ -141,7 +141,6 @@ BADHDRS= \ sys/vdso.h \ sys/vmmeter.h \ sys/vnode.h \ - net/bpf.h \ net/bpf_buffer.h \ net/bpf_jitter.h \ net/bpf_zerocopy.h \ From nobody Wed May 7 12:33:32 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZsvnS60V0z5wDry; Wed, 07 May 2025 12:33:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsvnS1XsMz3nRW; Wed, 07 May 2025 12:33:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746621212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FgDLAZAK1hZgSynxnybEo+B1TVqGaCpM36gsaZ4LoMw=; b=URLr3+Ni9uD4cUAR7ODn/XujWWzTFUuRP2IQeMKJEvI4CCNXP4Z8j2tMr2k+3ib55s1jdk uMiPxCrvbCdpajmoUpG3HI10sOFnx2vEn82g3QkepY28e+ZwMTX+mM1RxL+O3H0oqI3QDZ FRFMN3whMGUw32y4qAWNSKQp8R/JKNpamAhbpY05F/Ko15iMQ05aDm2sHvQUzDefnVdvPl P1RNFcBN6XSR7XBT4aquSt/etnK7tV42WeB+ZdwmDM3rb+SYzqbWbzhggzAp2ZMGLDQ+sJ AkzQCBZmvNithqp6pfhXIPEcHUY8Qp3Mbr9Hb3xzKyN+bssP984L28enS0F/fA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746621212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FgDLAZAK1hZgSynxnybEo+B1TVqGaCpM36gsaZ4LoMw=; b=FAo9jGL/QMSpvuS9JOzAO1XK/BCiznwIQCMzBh97UhCTk24xgh+yCoAsyGkXqUQBD4iyQ7 OGvxoLnfBEYOxfnik7ewBq1y+2E3ii6m1z0GZvGQhj89DiE1KIej0WasDCHTsbdPno4Oaf jLAM0W6LLv9Wpt3Do/hpuzefi6T2tOBecDQ+fmufKDrn8LcWbtyZ2oIYIafu5h3EmY8qtH 3jTpxnNDOerBseRh4EK30n20IDRIHXeuOJ1gyCMV+XbxgDs+jicS+hWzt50/Hw/eEyp5c0 mt6t85Y/xYPlNz2lDnf4PS9cKXjjf8W/WeSByYLFg+gyAL9pFx0aiRm8w/k1tQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746621212; a=rsa-sha256; cv=none; b=Rya3PgBhKqe32x0+w5uAUi4D+BKAiqP0bLp6C96ubpWDiEHdZtaOghvjjmG6miFefRqVt9 BXuoRCs5NzBr4p89xIcKSMetVip9HqQ5+RS3oXSXQWxdTq9F2H/wbsGKnzJ6oIB0Pm4bgG TlFBByhJ6xWGncx3NRLvRN/k6zvUhUBRcKhTS7KWT6J0px4PDtlMDPkLFZwgoFhd26AS/v BkL1eOdxI8i9GEDpgASSK3wWAHhub5QLTrZ6Qh5tABaovyM4Q8QfZ9gQjYyf9pG+n/fHlR O0RuE4Mmemxzhopx9TOFBMyiCc6g8bYbrh1KUlry0WePTl1a5KQJMCHQs7SJ1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZsvnS18PHzDN0; Wed, 07 May 2025 12:33:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547CXWmu072584; Wed, 7 May 2025 12:33:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547CXWdk072581; Wed, 7 May 2025 12:33:32 GMT (envelope-from git) Date: Wed, 7 May 2025 12:33:32 GMT Message-Id: <202505071233.547CXWdk072581@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 6c912470030b - stable/14 - nuageinit: implement chpasswd List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6c912470030ba958f2e41a00b44f6430919b1389 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=6c912470030ba958f2e41a00b44f6430919b1389 commit 6c912470030ba958f2e41a00b44f6430919b1389 Author: Baptiste Daroussin AuthorDate: 2025-04-25 15:16:22 +0000 Commit: Baptiste Daroussin CommitDate: 2025-05-07 12:33:22 +0000 nuageinit: implement chpasswd Add support for chpasswd, with all possible syntaxes, including deprecated one: chpasswd.list as a list or as a multiline string as some providers are still only providing this deprecated form Sponsored by: OVHCloud MFC After: 1 week Reviewed by: kevans, jlduran Differential Revision: https://reviews.freebsd.org/D50021 (cherry picked from commit c201a1198ad70e7d096ee32c364d539eed2dfec4) --- libexec/nuageinit/nuage.lua | 105 ++++++++++++++++++++- libexec/nuageinit/nuageinit | 6 +- libexec/nuageinit/tests/nuageinit.sh | 175 +++++++++++++++++++++++++++++++++++ 3 files changed, 283 insertions(+), 3 deletions(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index e58069164130..15af5afbd9f0 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -1,7 +1,7 @@ --- -- SPDX-License-Identifier: BSD-2-Clause -- --- Copyright(c) 2022 Baptiste Daroussin +-- Copyright(c) 2022-2025 Baptiste Daroussin local unistd = require("posix.unistd") local sys_stat = require("posix.sys.stat") @@ -261,6 +261,106 @@ local function update_sshd_config(key, value) os.rename(sshd_config .. ".nuageinit", sshd_config) end +local function exec_change_password(user, password, type, expire) + local root = os.getenv("NUAGE_FAKE_ROOTDIR") + local cmd = "pw " + if root then + cmd = cmd .. "-R " .. root .. " " + end + local postcmd = " -H 0" + local input = password + if type ~= nil and type == "text" then + postcmd = " -h 0" + else + if password == "RANDOM" then + input = nil + postcmd = " -w random" + end + end + cmd = cmd .. "usermod " .. user .. postcmd + if expire then + cmd = cmd .. " -p 1" + else + cmd = cmd .. " -p 0" + end + local f = io.popen(cmd .. " >/dev/null", "w") + if input then + f:write(input) + end + -- ignore stdout to avoid printing the password in case of random password + local r = f:close(cmd) + if not r then + warnmsg("fail to change user password ".. user) + warnmsg(cmd) + end +end + +local function change_password_from_line(line, expire) + local user, password = line:match("%s*(%w+):(%S+)%s*") + local type = nil + if user and password then + if password == "R" then + password = "RANDOM" + end + if not password:match("^%$%d+%$%w+%$") then + if password ~= "RANDOM" then + type = "text" + end + end + exec_change_password(user, password, type, expire) + end +end + +local function chpasswd(obj) + if type(obj) ~= "table" then + warnmsg("Invalid chpasswd entry, expecting an object") + return + end + local expire = false + if obj.expire ~= nil then + if type(obj.expire) == "boolean" then + expire = obj.expire + else + warnmsg("Invalid type for chpasswd.expire, expecting a boolean, got a ".. type(obj.expire)) + end + end + if obj.users ~= nil then + if type(obj.users) ~= "table" then + warnmsg("Invalid type for chpasswd.users, expecting a list, got a ".. type(obj.users)) + goto list + end + for _, u in ipairs(obj.users) do + if type(u) ~= "table" then + warnmsg("Invalid chpasswd.users entry, expecting an object, got a " .. type(u)) + goto next + end + if not u.name then + warnmsg("Invalid entry for chpasswd.users: missing 'name'") + goto next + end + if not u.password then + warnmsg("Invalid entry for chpasswd.users: missing 'password'") + goto next + end + exec_change_password(u.name, u.password, u.type, expire) + ::next:: + end + end + ::list:: + if obj.list ~= nil then + warnmsg("chpasswd.list is deprecated consider using chpasswd.users") + if type(obj.list) == "string" then + for line in obj.list:gmatch("[^\n]+") do + change_password_from_line(line, expire) + end + elseif type(obj.list) == "table" then + for _, u in ipairs(obj.list) do + change_password_from_line(u, expire) + end + end + end +end + local n = { warn = warnmsg, err = errmsg, @@ -270,7 +370,8 @@ local n = { adduser = adduser, addgroup = addgroup, addsshkey = addsshkey, - update_sshd_config = update_sshd_config + update_sshd_config = update_sshd_config, + chpasswd = chpasswd } return n diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 341330e68128..74a75c88098a 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -2,7 +2,7 @@ --- -- SPDX-License-Identifier: BSD-2-Clause-FreeBSD -- --- Copyright(c) 2022 Baptiste Daroussin +-- Copyright(c) 2022-2025 Baptiste Daroussin local nuage = require("nuage") local ucl = require("ucl") @@ -359,6 +359,10 @@ if line == "#cloud-config" then end nuage.update_sshd_config("PasswordAuthentication", value) end + if obj.chpasswd ~= nil then + nuage.chpasswd(obj.chpasswd) + end + else local res, err = os.execute(path .. "/" .. ud) if not res then diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index d3b1d5e6df2e..1b67468971a6 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -20,6 +20,9 @@ atf_test_case config2_network atf_test_case config2_network_static_v4 atf_test_case config2_ssh_keys atf_test_case nocloud_userdata_cloudconfig_ssh_pwauth +atf_test_case nocloud_userdata_cloudconfig_chpasswd +atf_test_case nocloud_userdata_cloudconfig_chpasswd_list_string +atf_test_case nocloud_userdata_cloudconfig_chpasswd_list_list args_body() { @@ -512,6 +515,175 @@ EOF atf_check -o inline:"PasswordAuthentication no\n" cat etc/ssh/sshd_config } +nocloud_userdata_cloudconfig_chpasswd_head() +{ + atf_set "require.user" root +} +nocloud_userdata_cloudconfig_chpasswd_body() +{ + mkdir -p etc + cat > etc/master.passwd << EOF +root:*:0:0::0:0:Charlie &:/root:/bin/sh +sys:*:1:0::0:0:Sys:/home/sys:/bin/sh +user:*:1:0::0:0:Sys:/home/sys:/bin/sh +EOF + pwd_mkdb -d etc "${PWD}"/etc/master.passwd + cat > etc/group << EOF +wheel:*:0:root +users:*:1: +EOF + mkdir -p media/nuageinit + printf "instance-id: iid-local01\n" > "${PWD}"/media/nuageinit/meta-data + cat > media/nuageinit/user-data << 'EOF' +#cloud-config +chpasswd: + expire: true + users: + - { user: "sys", password: RANDOM } +EOF + + atf_check -o empty -e inline:"nuageinit: Invalid entry for chpasswd.users: missing 'name'\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + # nothing modified + atf_check -o inline:"sys:*:1:0::0:0:Sys:/home/sys:/bin/sh\n" pw -R $(pwd) usershow sys + + cat > media/nuageinit/user-data << 'EOF' +#cloud-config +chpasswd: + expire: true + users: + - { name: "sys", pwd: RANDOM } +EOF + atf_check -o empty -e inline:"nuageinit: Invalid entry for chpasswd.users: missing 'password'\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + # nothing modified + atf_check -o inline:"sys:*:1:0::0:0:Sys:/home/sys:/bin/sh\n" pw -R $(pwd) usershow sys + + cat > media/nuageinit/user-data << 'EOF' +#cloud-config +chpasswd: + expire: false + users: + - { name: "sys", password: RANDOM } +EOF + # not empty because the password is printed to stdout + atf_check -o empty -e empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + atf_check -o match:'sys:\$.*:1:0::0:0:Sys:/home/sys:/bin/sh$' pw -R $(pwd) usershow sys + + cat > media/nuageinit/user-data << 'EOF' +#cloud-config +chpasswd: + expire: true + users: + - { name: "sys", password: RANDOM } +EOF + # not empty because the password is printed to stdout + atf_check -o empty -e empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + atf_check -o match:'sys:\$.*:1:0::1:0:Sys:/home/sys:/bin/sh$' pw -R $(pwd) usershow sys + + cat > media/nuageinit/user-data << 'EOF' +#cloud-config +chpasswd: + expire: true + users: + - { name: "user", password: "$6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/" } +EOF + # not empty because the password is printed to stdout + atf_check -o empty -e empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + atf_check -o inline:'user:$6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/:1:0::1:0:Sys:/home/sys:/bin/sh\n' pw -R $(pwd) usershow user +} + + +nocloud_userdata_cloudconfig_chpasswd_list_string_head() +{ + atf_set "require.user" root +} +nocloud_userdata_cloudconfig_chpasswd_list_string_body() +{ + mkdir -p etc + cat > etc/master.passwd << EOF +root:*:0:0::0:0:Charlie &:/root:/bin/sh +sys:*:1:0::0:0:Sys:/home/sys:/bin/sh +user:*:1:0::0:0:Sys:/home/sys:/bin/sh +EOF + pwd_mkdb -d etc "${PWD}"/etc/master.passwd + cat > etc/group << EOF +wheel:*:0:root +users:*:1: +EOF + mkdir -p media/nuageinit + printf "instance-id: iid-local01\n" > "${PWD}"/media/nuageinit/meta-data + cat > media/nuageinit/user-data << 'EOF' +#cloud-config +chpasswd: + expire: true + list: | + sys:RANDOM +EOF + + atf_check -o empty -e inline:"nuageinit: chpasswd.list is deprecated consider using chpasswd.users\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + atf_check -o match:'sys:\$.*:1:0::1:0:Sys:/home/sys:/bin/sh$' pw -R $(pwd) usershow sys + + cat > media/nuageinit/user-data << 'EOF' +#cloud-config +chpasswd: + expire: false + list: | + sys:plop + user:$6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/ + root:R +EOF + + atf_check -o empty -e ignore /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + atf_check -o match:'sys:\$.*:1:0::0:0:Sys:/home/sys:/bin/sh$' pw -R $(pwd) usershow sys + atf_check -o inline:'user:$6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/:1:0::0:0:Sys:/home/sys:/bin/sh\n' pw -R $(pwd) usershow user + atf_check -o match:'root:\$.*:0:0::0:0:Charlie &:/root:/bin/sh$' pw -R $(pwd) usershow root +} + +nocloud_userdata_cloudconfig_chpasswd_list_list_head() +{ + atf_set "require.user" root +} +nocloud_userdata_cloudconfig_chpasswd_list_list_body() +{ + mkdir -p etc + cat > etc/master.passwd << EOF +root:*:0:0::0:0:Charlie &:/root:/bin/sh +sys:*:1:0::0:0:Sys:/home/sys:/bin/sh +user:*:1:0::0:0:Sys:/home/sys:/bin/sh +EOF + pwd_mkdb -d etc "${PWD}"/etc/master.passwd + cat > etc/group << EOF +wheel:*:0:root +users:*:1: +EOF + mkdir -p media/nuageinit + printf "instance-id: iid-local01\n" > "${PWD}"/media/nuageinit/meta-data + cat > media/nuageinit/user-data << 'EOF' +#cloud-config +chpasswd: + expire: true + list: + - sys:RANDOM +EOF + + atf_check -o empty -e inline:"nuageinit: chpasswd.list is deprecated consider using chpasswd.users\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + atf_check -o match:'sys:\$.*:1:0::1:0:Sys:/home/sys:/bin/sh$' pw -R $(pwd) usershow sys + + cat > media/nuageinit/user-data << 'EOF' +#cloud-config +chpasswd: + expire: false + list: + - sys:plop + - user:$6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/ + - root:R +EOF + + atf_check -o empty -e ignore /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + atf_check -o match:'sys:\$.*:1:0::0:0:Sys:/home/sys:/bin/sh$' pw -R $(pwd) usershow sys + atf_check -o inline:'user:$6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/:1:0::0:0:Sys:/home/sys:/bin/sh\n' pw -R $(pwd) usershow user + atf_check -o match:'root:\$.*:0:0::0:0:Charlie &:/root:/bin/sh$' pw -R $(pwd) usershow root +} + atf_init_test_cases() { atf_add_test_case args @@ -528,4 +700,7 @@ atf_init_test_cases() atf_add_test_case config2_network_static_v4 atf_add_test_case config2_ssh_keys atf_add_test_case nocloud_userdata_cloudconfig_ssh_pwauth + atf_add_test_case nocloud_userdata_cloudconfig_chpasswd + atf_add_test_case nocloud_userdata_cloudconfig_chpasswd_list_string + atf_add_test_case nocloud_userdata_cloudconfig_chpasswd_list_list } From nobody Wed May 7 12:41:25 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zsvyl3tCrz5wDdV; Wed, 07 May 2025 12:41:35 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from mail.bsd4all.net (mail.bsd4all.net [IPv6:2a01:4f8:13b:240c::25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail.bsd4all.net", Issuer "E6" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zsvyk37jjz3tbJ; Wed, 07 May 2025 12:41:34 +0000 (UTC) (envelope-from herbert@gojira.at) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gojira.at header.s=mail202005 header.b=l9PxTWY8; spf=pass (mx1.freebsd.org: domain of herbert@gojira.at designates 2a01:4f8:13b:240c::25 as permitted sender) smtp.mailfrom=herbert@gojira.at; dmarc=none Date: Wed, 07 May 2025 14:41:25 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=gojira.at; s=mail202005; t=1746621686; bh=CsKm11Tqr/fvrzBATlnaZuUYJmJvyjj2NGJJAFMmneo=; h=Date:Message-ID:From:To:Cc:Subject:MIME-Version:Content-Type; b=l9PxTWY8AFMwW58hfDsEwH0a29CijzeQVMsY1dmx750ZWg07MMwTaZHxpvQcX2Mu5 hqdl8obQQSlGpezprzjRhjGeA0efuOqUE5nie+HSo1AHeJAcGG2DpvkugzPBQ0fpBc CejcX+ZIr2gcvkZGLfeOJ+Ue48o/PFMxIXUVG+OLklLAGeRI+AgfPKdUs9zaFhV9pa kHBHK7Mzse82Lrwq9zgFQBjU3lG1+EVMbxMQ1k03yc+0Ov4F+O4BRbsVXEAX/99Pb0 oZLYzBUM9j/UbU3z4YStsfMae8xBXuLc+eGcbRefIZ0xNKJERvxJVgj4zaR3hGj+aO EsCu2N4VTgolg== Message-ID: <878qn8r3t6.wl-herbert@gojira.at> From: "Herbert J. Skuhra" To: Warner Losh Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: Re: git: 80b069913d49 - stable/14 - mpi3mr: Divert large WriteSame IOs to firmware if unmap and ndob bits are set In-Reply-To: <202504301721.53UHLjlw095104@gitrepo.freebsd.org> References: <202504301721.53UHLjlw095104@gitrepo.freebsd.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/30.1 Mule/6.0 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 4Zsvyk37jjz3tbJ X-Spamd-Bar: / X-Spamd-Result: default: False [-0.52 / 15.00]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_SHORT(-0.99)[-0.994]; NEURAL_HAM_MEDIUM(-0.76)[-0.756]; NEURAL_SPAM_LONG(0.73)[0.727]; R_SPF_ALLOW(-0.20)[+ip6:2a01:4f8:13b:240c::25]; R_DKIM_ALLOW(-0.20)[gojira.at:s=mail202005]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/32, country:DE]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; DMARC_NA(0.00)[gojira.at]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-branches@FreeBSD.org]; DKIM_TRACE(0.00)[gojira.at:+] On Wed, 30 Apr 2025 19:21:45 +0200, Warner Losh wrote: > > The branch stable/14 has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=80b069913d496bd73b0ea8e515b6bf3706530ea1 > > commit 80b069913d496bd73b0ea8e515b6bf3706530ea1 > Author: Chandrakanth patil > AuthorDate: 2024-06-06 08:38:52 +0000 > Commit: Warner Losh > CommitDate: 2025-04-30 17:05:52 +0000 > > mpi3mr: Divert large WriteSame IOs to firmware if unmap and ndob bits are set > > Firmware advertises the transfer lenght for writesame commands to driver during init. > So for any writesame IOs with ndob and unmap bit set and transfer lengh is greater > than the max write same length specified by the firmware, then direct those commands > to firmware instead of hardware otherwise hardware will break. > > Reviewed by: imp > Approved by: imp > Differential revision: https://reviews.freebsd.org/D44452 > > (cherry picked from commit 3f3a15543a6721100dda0e4219eb48ecbe35731a) > --- > sys/dev/mpi3mr/mpi3mr.c | 16 ++++++++++++++++ > sys/dev/mpi3mr/mpi3mr.h | 2 ++ > sys/dev/mpi3mr/mpi3mr_cam.c | 35 +++++++++++++++++++++++++++++++++++ > sys/dev/mpi3mr/mpi3mr_cam.h | 1 + > sys/modules/mpi3mr/Makefile | 3 +++ > 5 files changed, 57 insertions(+) > > diff --git a/sys/dev/mpi3mr/mpi3mr.c b/sys/dev/mpi3mr/mpi3mr.c > index 03fea4bdfcc7..a7bc459c1db8 100644 > --- a/sys/dev/mpi3mr/mpi3mr.c > +++ b/sys/dev/mpi3mr/mpi3mr.c > @@ -2177,6 +2177,8 @@ static int mpi3mr_issue_iocinit(struct mpi3mr_softc *sc) > time_in_msec = (now.tv_sec * 1000 + now.tv_usec/1000); > iocinit_req.TimeStamp = htole64(time_in_msec); > > + iocinit_req.MsgFlags |= MPI3_IOCINIT_MSGFLAGS_WRITESAMEDIVERT_SUPPORTED; > + > init_completion(&sc->init_cmds.completion); > retval = mpi3mr_submit_admin_cmd(sc, &iocinit_req, > sizeof(iocinit_req)); > @@ -3340,6 +3342,19 @@ void mpi3mr_update_device(struct mpi3mr_softc *sc, > break; > } > > + switch (flags & MPI3_DEVICE0_FLAGS_MAX_WRITE_SAME_MASK) { > + case MPI3_DEVICE0_FLAGS_MAX_WRITE_SAME_256_LB: > + tgtdev->ws_len = 256; > + break; > + case MPI3_DEVICE0_FLAGS_MAX_WRITE_SAME_2048_LB: > + tgtdev->ws_len = 2048; > + break; > + case MPI3_DEVICE0_FLAGS_MAX_WRITE_SAME_NO_LIMIT: > + default: > + tgtdev->ws_len = 0; > + break; > + } > + > switch (tgtdev->dev_type) { > case MPI3_DEVICE_DEVFORM_SAS_SATA: > { > @@ -5649,6 +5664,7 @@ static void mpi3mr_invalidate_devhandles(struct mpi3mr_softc *sc) > target->io_throttle_enabled = 0; > target->io_divert = 0; > target->throttle_group = NULL; > + target->ws_len = 0; > } > } > mtx_unlock_spin(&sc->target_lock); > diff --git a/sys/dev/mpi3mr/mpi3mr.h b/sys/dev/mpi3mr/mpi3mr.h > index 2f91b0b702dd..fa50ed035fc2 100644 > --- a/sys/dev/mpi3mr/mpi3mr.h > +++ b/sys/dev/mpi3mr/mpi3mr.h > @@ -232,6 +232,8 @@ extern char fmt_os_ver[16]; > > #define MPI3MR_PERIODIC_DELAY 1 /* 1 second heartbeat/watchdog check */ > > +#define WRITE_SAME_32 0x0d > + > struct completion { > unsigned int done; > struct mtx lock; > diff --git a/sys/dev/mpi3mr/mpi3mr_cam.c b/sys/dev/mpi3mr/mpi3mr_cam.c > index d4cb7e9265dd..dca194a5c8cd 100644 > --- a/sys/dev/mpi3mr/mpi3mr_cam.c > +++ b/sys/dev/mpi3mr/mpi3mr_cam.c > @@ -83,6 +83,7 @@ > #include "mpi3mr.h" > #include /* XXX for pcpu.h */ > #include /* XXX for PCPU_GET */ > +#include > > #define smp_processor_id() PCPU_GET(cpuid) > > @@ -102,6 +103,37 @@ extern void mpi3mr_add_sg_single(void *paddr, U8 flags, U32 length, > > static U32 event_count; > > +static > +inline void mpi3mr_divert_ws(Mpi3SCSIIORequest_t *req, > + struct ccb_scsiio *csio, > + U16 ws_len) > +{ > + U8 unmap = 0, ndob = 0; > + U32 num_blocks = 0; > + U8 opcode = scsiio_cdb_ptr(csio)[0]; > + U16 service_action = ((scsiio_cdb_ptr(csio)[8] << 8) | scsiio_cdb_ptr(csio)[9]); > + > + > + if (opcode == WRITE_SAME_16 || > + (opcode == VARIABLE_LEN_CDB && > + service_action == WRITE_SAME_32)) { > + > + int unmap_ndob_index = (opcode == WRITE_SAME_16) ? 1 : 10; > + > + unmap = scsiio_cdb_ptr(csio)[unmap_ndob_index] & 0x08; > + ndob = scsiio_cdb_ptr(csio)[unmap_ndob_index] & 0x01; > + num_blocks = get_unaligned_be32(scsiio_cdb_ptr(csio) + > + ((opcode == WRITE_SAME_16) ? 10 : 28)); > + > + /* Check conditions for diversion to firmware */ > + if (unmap && ndob && num_blocks > ws_len) { > + req->MsgFlags |= MPI3_SCSIIO_MSGFLAGS_DIVERT_TO_FIRMWARE; > + req->Flags = htole32(le32toh(req->Flags) | > + MPI3_SCSIIO_FLAGS_DIVERT_REASON_WRITE_SAME_TOO_LARGE); > + } > + } > +} > + > static void mpi3mr_prepare_sgls(void *arg, > bus_dma_segment_t *segs, int nsegs, int error) > { > @@ -1080,6 +1112,9 @@ mpi3mr_action_scsiio(struct mpi3mr_cam_softc *cam_sc, union ccb *ccb) > break; > } > > + if (targ->ws_len) > + mpi3mr_divert_ws(req, csio, targ->ws_len); > + > req->Flags = htole32(mpi_control); > > if (csio->ccb_h.flags & CAM_CDB_POINTER) > diff --git a/sys/dev/mpi3mr/mpi3mr_cam.h b/sys/dev/mpi3mr/mpi3mr_cam.h > index 3a0526217f86..115ce0c4b8d7 100644 > --- a/sys/dev/mpi3mr/mpi3mr_cam.h > +++ b/sys/dev/mpi3mr/mpi3mr_cam.h > @@ -121,6 +121,7 @@ struct mpi3mr_target { > struct mpi3mr_throttle_group_info *throttle_group; > uint64_t q_depth; > enum mpi3mr_target_state state; > + uint16_t ws_len; > }; > > struct mpi3mr_cam_softc { > diff --git a/sys/modules/mpi3mr/Makefile b/sys/modules/mpi3mr/Makefile > index 3f1f63a94ac3..39aa2e3f0ddd 100644 > --- a/sys/modules/mpi3mr/Makefile > +++ b/sys/modules/mpi3mr/Makefile > @@ -6,6 +6,9 @@ SRCS= mpi3mr_pci.c mpi3mr.c mpi3mr_cam.c mpi3mr_app.c > SRCS+= opt_cam.h > SRCS+= device_if.h bus_if.h pci_if.h > > +CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include > +DEBUG_FLAGS= -g ^^^^^^^^^^^^^^^^ > + > .include > > CWARNFLAGS.mpi3mr_sas.c= ${NO_WUNNEEDED_INTERNAL_DECL} https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=249068#c2 -- Herbert From nobody Wed May 7 14:08:57 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZsxvY37lgz5wK8k; Wed, 07 May 2025 14:08:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsxvY2KMPz3K9H; Wed, 07 May 2025 14:08:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746626937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x1/N/Pu49jZ5Tx8xU4X6sHmHQBfR92ZB8gEh6A3TKAM=; b=nzFoQG/5GukCuoaQ1kCgwU/ffJk89r1O/Tu5vwJo1FV9wL2BL6ni0NcDL2UpfsekhiuFFx N8rcFrAO7K83uEDlUAH5RW7T9qnxb3AEEoRrEPFyHh2b0/FKwWJaSLP7uSggx7oGSLbG21 cHQL58nSM/D0Y8DnI4Ds4sZrQF3clP0+mjFca5T7ZWNRPeJU4RqVHPeQTpcYv4/y9ExaAN VPSspX3AzHJUWygQsdb9NjwdJd4YYiq30P4HJesL9N7Rx4xThDXRhwZm9GT5HpK23yMVUz Qkm2S87ww8LswokVx7DzwZLTnHrLVruR3li0+bfx616ekYUfQ28pMJdzLJBtZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746626937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x1/N/Pu49jZ5Tx8xU4X6sHmHQBfR92ZB8gEh6A3TKAM=; b=BpkFkcqj+0gtN9WRaUl/z7Hef5v8zOdCaSrhopjnJuurYuEz0nBuMcPti+nLyLzM33iZIZ fHReq4lDZS11PvRi1xxrcA0USER80tipgXiIxc9e4Al37DwGZhPqiWdVvrWeQXX/CIowPE dBGS2UxHnniwznzSL1dVbjxYYa8RoIBl23prjtINig2LmGTr6GXdM+oonLd4XI8ySlsjyA RXAkQ9P+0/gF1wqIf0QNvUZborNF1erDpNzaLjouhxucEECUg17gEpbxFBUEoqPbX+E8ys JpAz6dv9HvHXE4lGdBbjOEqH6nsymrB7sFkADVGIe24X95eUouBoa/Wj5vXeiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746626937; a=rsa-sha256; cv=none; b=MTg96rZxBavE1fYHBQFP+Ywj7JEpdoHvoAXbiCaq99Fx9Qd1nMs4VN6wgloPIl7b2npXgL joKIqkHKbGTiBNpzfYEmou6zeOGekXSUB4QSscr8EE/5UBJgyXneWq/AmYr8N5enXvRDFk WRlnu6c1rm+cohmcl4dR6dfZN31H4knBVRDA+fojJ89t8Pij60dx+H3Y+BO3dnz7+cmfmc fjaRUGWFAXOsLBki7/rPdZ/EtfV62VZLW4DAhuOWp5k+uZTEvwaTtiz5IDUhJaMjd8rMVP qbIfTzqliW9IHnlj30Buqb6qwc9Uzv2LbsoQEG0dZjc0hTGletLBqkT3EVYh6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZsxvY1vWNzYvM; Wed, 07 May 2025 14:08:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547E8vZx047423; Wed, 7 May 2025 14:08:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547E8vYd047420; Wed, 7 May 2025 14:08:57 GMT (envelope-from git) Date: Wed, 7 May 2025 14:08:57 GMT Message-Id: <202505071408.547E8vYd047420@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 6060830201d6 - stable/14 - rc.conf.5: add a missing word in the description of $ipv6_enable List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6060830201d61a42c64612630a1e4c28ccb7c45e Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=6060830201d61a42c64612630a1e4c28ccb7c45e commit 6060830201d61a42c64612630a1e4c28ccb7c45e Author: Lexi Winter AuthorDate: 2025-05-07 13:49:47 +0000 Commit: Lexi Winter CommitDate: 2025-05-07 13:49:47 +0000 rc.conf.5: add a missing word in the description of $ipv6_enable Reviewed by: ziaee, kevans Approved by: kevans (mentor) Differential Revision: https://reviews.freebsd.org/D50113 (cherry picked from commit dd2d270923884f0bb272da71cf76397ec5e8539c) --- share/man/man5/rc.conf.5 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 2bab31e9d9fe..c3c009c3961e 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 6, 2025 +.Dd May 7, 2025 .Dt RC.CONF 5 .Os .Sh NAME @@ -1710,7 +1710,7 @@ is added to all of .Va ifconfig_ Ns Ao Ar interface Ac Ns _ipv6 and the .Va ipv6_activate_all_interfaces -is defined as +variable is defined as .Dq Li YES . .It Va ipv6_prefer .Pq Vt bool From nobody Wed May 7 14:10:56 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zsxxr2zfrz5wKbR; Wed, 07 May 2025 14:10:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zsxxr2Px3z3Kmx; Wed, 07 May 2025 14:10:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746627056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zAXZ0AA3Ao9CYxn4tPGmxVVV405HqTSI06zuiJdm4LY=; b=Fot+g80AExZ8qexPI5LjnQYdZoVQ0e0606PhObBEUZsTsp7Z7aJJrZ5qgxwemhUOgwrwtW GBhn+AI95sP6AmgvcmJxjBco5Efp1PlDNlF+vMG+oVTahSK/22K6wucN3ogK8KL5NUzZiM dr222waTuUTSLu7IWMhfJAPyFFy+TM5UdhO0GLu+K7q3zG5nhsqRQBut1hZbUCa5c0oXxV L1apyjrv9lKl1m7LlIIsTVC9VfQS8t0Btff+K4n2XOLLg4py/+48mSlplFp1iFIIrDAvQN 3oCZ9x/NkHM/olDfkN0yQBxyatYPIT9svbBDUNkMvu155JDprM2HkeZ1Ads/uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746627056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zAXZ0AA3Ao9CYxn4tPGmxVVV405HqTSI06zuiJdm4LY=; b=v8QKkjCCzI9bcFvunIcCG3/2Mj3FM0SZXrYcFrfezhYYfkd9QwI+5r01Pgi3SwFrYBv/O+ Uhh/H2OaOvyrb60mxn9FYx9dZP4jw06lpB11LryMNvgTcuA2OiErd8/mGBX4/xNavQlzmL W0tT2w8K/oxUjbZbWbqhdzrvuiTAsc9hSTjS6wdoQ48JcVDF+4TrDLZZeTKyV7s95A/8IP knWwOfd87p0lNX9m1ifLMF1Jcylb/7rDMjA7Dj7rrr69rxwDtoFM3z0XbTSDJA79MzFg1V 20UakAbJI3NQLghDkvooO63HJOqR/TaSOV/xQHkdCjozyo4PqE7dj41MWq3jAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746627056; a=rsa-sha256; cv=none; b=s4CZnKvhta/vxZ4XOoB14UEFjXo8oNbZEFGi227suP2VdfbOCESZ2Dx2tXnRT/Px5yO/rr ezkl0MeueQ4JU8XZ6Lfjijb0W9FO7liRfuuGyD1X6B/yT0cBEivlS3bpR05XBL3LS4sWlT 3T/jvVw1JafyQtbwvF3JiSvVinZWu1i5NF8sAWzhxRMyYP2ro8nEO5i3nbZ0Bh9/rDoTBB 3KR99eEcysJrH+Oitdn9l8hxpjQqFBEyVm59NLQo3gaylyhlBI4g6jxRCuH+hg3xNztHEF bZJVDdDRPLNc4t9vcfgmpXdAZZJmcGKVIQEq45p2dqHokUB41O29kXnmB1PwFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zsxxr1lxCzYl5; Wed, 07 May 2025 14:10:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547EAuaC057888; Wed, 7 May 2025 14:10:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547EAuBM057885; Wed, 7 May 2025 14:10:56 GMT (envelope-from git) Date: Wed, 7 May 2025 14:10:56 GMT Message-Id: <202505071410.547EAuBM057885@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: cc6b1138519d - stable/13 - rc.conf.5: add a missing word in the description of $ipv6_enable List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cc6b1138519d75402be8f948dd858c028c3a5005 Auto-Submitted: auto-generated The branch stable/13 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=cc6b1138519d75402be8f948dd858c028c3a5005 commit cc6b1138519d75402be8f948dd858c028c3a5005 Author: Lexi Winter AuthorDate: 2025-05-07 14:00:16 +0000 Commit: Lexi Winter CommitDate: 2025-05-07 14:00:16 +0000 rc.conf.5: add a missing word in the description of $ipv6_enable Reviewed by: ziaee, kevans Approved by: kevans (mentor) Differential Revision: https://reviews.freebsd.org/D50113 (cherry picked from commit dd2d270923884f0bb272da71cf76397ec5e8539c) --- share/man/man5/rc.conf.5 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 4e7140540420..f588f12eee59 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 2, 2023 +.Dd May 7, 2025 .Dt RC.CONF 5 .Os .Sh NAME @@ -1674,7 +1674,7 @@ is added to all of .Va ifconfig_ Ns Ao Ar interface Ac Ns _ipv6 and the .Va ipv6_activate_all_interfaces -is defined as +variable is defined as .Dq Li YES . .It Va ipv6_prefer .Pq Vt bool From nobody Wed May 7 18:14:40 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zt3M61srcz5wYn2; Wed, 07 May 2025 18:14:42 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zt3M616Kzz3HpH; Wed, 07 May 2025 18:14:42 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746641682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ixUgCpOWvfBUGO7ldjqj9mdYjryA3oVScArQ01EBBso=; b=vGtaffuRNKoaKcUt61uEgs/j1UUqqGEwU1RWgmYLZTSlAF4u6nUkbYyByXLtcW4U/LkbcO RxsTMszjiaSElwMAm4memHAVkkC46ghLNewh+9v1xqJ5AjssQZ0PfiuyEVGudaAUfCMT5n 94UJy+/BLa6vxEHhHoxqyWf0M/LlDfQfyUUgTPxtOR+xhhyAavZfIEukl/beDvV3KwwAUS NON74Zm5+dEod4Lgdwxx2eFl95BwDd4Abmug7m6U4+hCi//4iUun5HVhpY3Z1CWrlumSZg RXu+MFXeQ89cheGr7YECA6Bmupcz8PcZLKnoTlEuMRCPcYL8pVZCDvmqLKEmeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746641682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ixUgCpOWvfBUGO7ldjqj9mdYjryA3oVScArQ01EBBso=; b=gYfTmOSaQBmuRJzxyW/xQ7smukM7+jBhde4MGUwl/M5lMM6t97eDnMZR5bC5NFgGEzY33H QtbdB5d1QDDc16uuHn32eoGhzdYgVtiVP2GNZrPP9B5ssYH2bjaGfwGn6nECySKZdt+fYY If/SCgi6vUNeo0WWWPBVGnyTN29egVigcht7qBmaBGZ/cJ+9MVRIUx9CGug9fw/FmFH6tm mRSb3wNaYNOQnu5NHEIrQKSzp12pYutK3sGUSzYjIx+uzwTDxES5qBzwBkEPMZQsZKvfTT j5P0mMqBCEePkkLiSmuQyFb0ESiK+xuJF7SL/Kb25wFK7TaWR1T+AOiS17vIJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746641682; a=rsa-sha256; cv=none; b=t1UbQNZ5FZ0tfGi3sa9MYQoyiugyDzFPeUYcCb+KZSev84d9ObJkBWRBEfDEO3mLl+ep9y ruYumh9W2NJaKX4xpJ5fdLZGxDblXa50/l1ce45+lAu80rZK2v2akUUsGjwI2W6s/VA7V9 FZyn228+UIoQtzLfl/DDb+6Z7AWV5pIr38xXTY5/z/FqoOC3VrjsV56cf+Kv4jmuZwpi2W Zxge/QiD8UFdO87hWWxu+qVWNk7wv8U74Id1SSyxOI7trNgl3EivHs4zJ/vukeWDOAqC+U ti7UKye6OrH8Cz+BFN18z69InDtvAbCV55jDsartrFWhDGZGC3P4DLiBP2TeRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:5c0:4200:b830:a58c:2073:452d:c9f2] (unknown [IPv6:2601:5c0:4200:b830:a58c:2073:452d:c9f2]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Zt3M55SBwzCrp; Wed, 07 May 2025 18:14:41 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <175576a0-78fc-4d5f-a3f4-f940d083dec8@FreeBSD.org> Date: Wed, 7 May 2025 14:14:40 -0400 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 154ccb0196cd - stable/14 - ps(1): Update some options' conformance/practice comments Content-Language: en-US To: Warner Losh , Olivier Certner Cc: "Piotr P. Stefaniak" , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org References: <202505011951.541JpiQV068751@gitrepo.freebsd.org> <2988597.slGk94SIus@ravel> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 5/5/25 09:29, Warner Losh wrote: > On Mon, May 5, 2025, 6:13 AM Olivier Certner wrote: > >>>> - /*- >>>> + /* >>> >>> No opinion on which it should be, but the minus character is meaningful >>> within the context of indent(1) - it won't reformat "block" comments. >> >> Thanks for pointing that out, I didn't know. I think removing them was >> OK, as these block comments are really nothing special. Actually, I >> probably should have reformatted them to eliminate the margin for all but >> the first line. >> > > Almost nobody uses indent these days on a regular basis. We can drop it for > that reason alone, even if the comments were formatted by hand... we likely > need to start tagging those with clang format tags.. Eh, the clang format tags are ugly for this use case. If using CommentPragmas doesn't already handle this case, I'd rather add a new option to clang-format to disable reflowing comments when this is present. We already have this widely used throughout the tree, and it would better to fix the tool than gratuitous churn. We probably clear clang-format's bar of being a project of a sufficient size that they will accept patches from us for new formatting options. -- John Baldwin From nobody Wed May 7 18:43:26 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zt40G1zzXz5v6Zt; Wed, 07 May 2025 18:43:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zt40G1HD4z3cxs; Wed, 07 May 2025 18:43:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746643406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p4T65KYtYQ3ShznkKFUGmdP1HfGJBNhSFIcsos0Kac8=; b=SN8fKcEpXzXKJuCUjV2zoP8BWa1IiVoeh6FmDorV81PhhOGp39pM9J4C8ykqudA64btwnS g1ZwrWBngLk/C8nx/2u1ZOWZP0Aktq3j8iRk0fCo1QNCUgEFpKFVV/eQt8orX3b9aBQCRm FNV3wNUaXlOrySzestZWdk6lUFrOGv6E/bfImqlfpmESXoNGCpp4bijqecrQap6wBPHAzP zPTDoq8sj3BpmdUNOTKL0Ztcz0lqHNxfch248uMEOkh8hh/duoN8qMr3Z53WXZkUQ/5FOb zIM1/3gWKcrHWU3Tt9yF+LamLihp8jkuvrR0zYJ9LUPrNGMTXCC9fBOV33xuwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746643406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p4T65KYtYQ3ShznkKFUGmdP1HfGJBNhSFIcsos0Kac8=; b=STiOkDp98mpzZ+k5Hy7c2UNJLZmZY0x5OeIGr/ibFcZpvop2O2yol3vrKOMg0jrGmuXRy/ x1/UeKKRgCNTAvvLkC+rTAZ/BSnMYuPprq3org6bo4Wx1n0KPkz6qUHEiebxS2Ctns/GLg ecZgkaAeqCVW2z/jgUUOldaCskhxov2WCOYVypJ4S1tpJrRAiMSLY9b3vjyO72Y+L0Zvrb UIAhLwWlDJf8VQFBLR7D03V34QTi+06jj/Fmuh5hjBo84eut7cNOGGbvZvABlWbrWQcZVV jS3VNPFnESrXIXRjPWv0ZTF4QA5RS38qgTkPJ+1fkoNEC9dxFup34rqxKBNRAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746643406; a=rsa-sha256; cv=none; b=ufKTDUEvBiZ1scf1EQ+xAc/NUy/pEFxAsMZz+VWhBKq4qPcs/JD8pAZTmmyZ8CENAR7IDR Spb0ZRK3Ta8iYZo6bqqjI9m+kZcMiK31O0hWRcai0jSSFvjMGaAGDL7DqXSjLqQIbw2bPg yaUBj0BKJWU/2vmdpN69ZDcrhGX9j6j4vFp3kPwECMSs+iTLn4+ofv51z/CVRGZThy7tSe R62ywECjU68RuLclHOUcP0VsgYKzg+qYUKf/xbdzSBYyvHEfEQWjY7BNmhdtaFXalIj8oy LUt3heJdmUZabDWQmPg0wQjb0bc3CbPr2UpRDKnC1a630gi/90sz1zpbY9W7fA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zt40G0qZ9zhjv; Wed, 07 May 2025 18:43:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547IhQKX070018; Wed, 7 May 2025 18:43:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547IhQF9070016; Wed, 7 May 2025 18:43:26 GMT (envelope-from git) Date: Wed, 7 May 2025 18:43:26 GMT Message-Id: <202505071843.547IhQF9070016@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 2109eff09897 - stable/14 - etc: add config tag to /root/.k5login List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2109eff098971a30c38384418bd019bcb7a6dc23 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=2109eff098971a30c38384418bd019bcb7a6dc23 commit 2109eff098971a30c38384418bd019bcb7a6dc23 Author: Lexi Winter AuthorDate: 2025-04-23 04:38:13 +0000 Commit: Lexi Winter CommitDate: 2025-05-07 14:16:31 +0000 etc: add config tag to /root/.k5login this prevents the file being overwritten every time FreeBSD-runtime is upgraded. Reviewed by: des Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D49907 (cherry picked from commit eef0c78e435d5e38392c239d878784fda80b1fb8) --- etc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/Makefile b/etc/Makefile index 27070e726943..5793e276b025 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -72,7 +72,7 @@ distribution: .if ${MK_KERBEROS} != "no" cd ${.CURDIR}/root; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ - -T "package=runtime" \ + -T "package=runtime,config" \ dot.k5login ${DESTDIR}/root/.k5login; .endif From nobody Wed May 7 18:45:56 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zt4392mbgz5v7D4; Wed, 07 May 2025 18:45:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zt4386lTQz3g8x; Wed, 07 May 2025 18:45:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746643557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=na+cDqAa0tHhC6xlfdvlIVL3WGZ+ylkyzrXdjV1q22k=; b=AkQ3Cy7M6R+FOBxk7tSI8Bn5ewsDx1Mjaac77GGyrSh0/DUcGtuCGBaYyiGfgZ8xax+c7c u/54lKIaO2QfU+vEgh4piy5eQ77gRGaMzhYPUwhMGht+G15zphDi3WQx4DuwC/FSJakAZJ 4dX+IROpvmkbo2NQnsRXbcx/Q3BIHoahpb2hcFDd3J1kjxxsbojjLtwYHo3K8Xx4KeISlN 8AWLERvzlnPpmlwYN6STqJM73M42rbrda7fumeqNN0e6KmtqCvI6ZlSkyg2ZgtYzY+ApMg kmSiSIatJL2HVsT1XpEGdrMLZeHOpP8VSG/BwReqp8ybB0KuSqa7TTJRmbhDfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746643557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=na+cDqAa0tHhC6xlfdvlIVL3WGZ+ylkyzrXdjV1q22k=; b=NhfAoe/4F5Gqs1jW2aUYgGKJREhh+gA2MtLBzdksQkyszMcdFs/H7BbEk236vuikoFTNhO wkfs4UvwDxWaTfG9y6oMGNg4fAuXVRNAuYLYHXidQItkMJUWwv02yLQdfvJSKvxUWXPKGT Mzs7Lh1Gs+w6OnDA3IDXeSZBYJOa3xQS5cZyTC6cIaUP9Vx7Lf0WEVqtlkKs8dX1f7+hwy OnkNMCfT/X+GICyKga66c5B2bBRr2bUA6+AhZpX1OpOEyNe8kUi9OrrF8W2EhW2B6AiDHE g0KzfcE9OyJixbNUaCYcp0K3jZLJ/Z/FqUcSaLc5nTK2cv0b/b4yu7gV00iuug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746643557; a=rsa-sha256; cv=none; b=athBOhK5SywwJw+nhVKSvYFWYjfD6MtxbV7tHt5WH7jeEMEbLWZJeojupnJq7KUw/rJtYV SdNgVBjqd2wt4vDLo2cRfsuwpys1kwqmfAjSz2IEKhBLFQT7c18mlmznPPjI21uJ2ejsqV w2mtaDbesHw8CkktTrDW3uw4u6ubu0E7AWEXuXOlEOE8a4K2f7M7cH28pdXbeIt6nD7w+f EX+8G1IXy0mCCWKds5Fs1ic81E37GYZp1G+OTkob7pZKiquOvgndoVp9MNraLqm4gCDr9h 1WySvrOnMzMMyAUheN6AjDqE2jsQT0nSyx/d/OuULutnLGktTMqJ5nBFKqhyHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zt4385nCKzhjx; Wed, 07 May 2025 18:45:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547Ijuir070879; Wed, 7 May 2025 18:45:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547IjulO070876; Wed, 7 May 2025 18:45:56 GMT (envelope-from git) Date: Wed, 7 May 2025 18:45:56 GMT Message-Id: <202505071845.547IjulO070876@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 77e0f080b2f8 - stable/13 - etc: add config tag to /root/.k5login List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 77e0f080b2f821b76b2cecd843aafffb234d45b8 Auto-Submitted: auto-generated The branch stable/13 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=77e0f080b2f821b76b2cecd843aafffb234d45b8 commit 77e0f080b2f821b76b2cecd843aafffb234d45b8 Author: Lexi Winter AuthorDate: 2025-04-23 04:38:13 +0000 Commit: Lexi Winter CommitDate: 2025-05-07 14:17:26 +0000 etc: add config tag to /root/.k5login this prevents the file being overwritten every time FreeBSD-runtime is upgraded. Reviewed by: des Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D49907 (cherry picked from commit eef0c78e435d5e38392c239d878784fda80b1fb8) --- etc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/Makefile b/etc/Makefile index 42d9e4763da0..b769192c5e19 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -69,7 +69,7 @@ distribution: .if ${MK_KERBEROS} != "no" cd ${.CURDIR}/root; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ - -T "package=runtime" \ + -T "package=runtime,config" \ dot.k5login ${DESTDIR}/root/.k5login; .endif From nobody Wed May 7 18:58:30 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zt4Kg0jKvz5v7k1; Wed, 07 May 2025 18:58:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zt4Kg00Mhz3qc3; Wed, 07 May 2025 18:58:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746644311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nOWY7x5qKNDZRNmLOquUPTxDLIfstIJrWNiLkHTKkzQ=; b=UOBacN7FrS9ZKXb1MbyFT3vn34KbIfNYHhCJZE1NwX+hIobuVwBFumleDzW7eP8U2bVWI2 tD9VCem+86i+GB7tkoGHY4a1MnSoqxxVXcncLJ7f7WuiUBk2UmjFN6992ixfV8nFJjx2zz aNH0cg8Ic5mYjznfzF29/1wCfcnP1x2tDX6uGMoIZ0f1lavi1cvrCo7rsKgkKMcfEEXP/H zouE/t04K1n8tnXusZf262N+sbCo/JrH9bmSJsQNI6HH72Af7i5UKrcdbLdCDH21Ao1Kny Bv8iNVHaFIeLQX83pexBTt26qSGK5WuzoWZOeno1Tq/Nyy2llfRJmQl9NSSsRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746644311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nOWY7x5qKNDZRNmLOquUPTxDLIfstIJrWNiLkHTKkzQ=; b=dzoR0d10Eh5pLxQXQF/0K5wq/7zfWTibUftvPLaGq3ZPH8rCUSefCoXKSC0pj9MluBvmOj v/zxrl5DUukG1mDSx1/YxryTx3wxYwHpgvxncW6LT+nEC7Zx3tqgSH1m806ZpU+GAQ1ouk O1qC3C+5SmHOb6+9oeMqPYX56qO8MgOjyO/l9bm7xmmvwxmzheef5jN5+uRPrjN2Avf6t/ RmVFG93gUDW/0SbyDJtLU5Wma4JdC6uOY71xvqu30B0klfqKWojp8s5W2ko2g0x9YykZbP v/IFlqwZEI/TS3Y5vICRl4+TeEfQfi9INZ7a3E/OqsooUNfGVFBicifOzwgAFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746644311; a=rsa-sha256; cv=none; b=Ng0I8HQMLPcZS7+o7PBWgu8LhmX3jeDBowYjNOAD7+2YeIlsak2gVNni0SKaC/K8YCkgtu KZvjuz6PL0IhgXzaga0xSZCe3tzp14dOB6bA0CwDUh+vAK2TVhvJe3FBlgwBvKCxRpAIjR t5oN4kqhB2NlajlJ6E0lm20XP0UxeLA7P/1YPIZZgde/8+KJU0wxvLiM+ebRyuRcfv5D2g BQTpkjmTjW3u2pblCUQTqjpST7kHwm0Ti5hXDNWj3/tltnyjnaOOx4BJtdamur/1RkItTO OTBUW4wWV0G/4YYOGBPiz1yFL7TfEQEHOk2xR4gwkE+SXxjkiD4VGZUaPk2rdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zt4Kf6gM9zj81; Wed, 07 May 2025 18:58:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547IwU7h089793; Wed, 7 May 2025 18:58:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547IwUHW089790; Wed, 7 May 2025 18:58:30 GMT (envelope-from git) Date: Wed, 7 May 2025 18:58:30 GMT Message-Id: <202505071858.547IwUHW089790@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 7e98bfd666c4 - stable/13 - netstat(1): add description for option -o and -O. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7e98bfd666c42ec91491f0739d15da57cc5389c7 Auto-Submitted: auto-generated The branch stable/13 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=7e98bfd666c42ec91491f0739d15da57cc5389c7 commit 7e98bfd666c42ec91491f0739d15da57cc5389c7 Author: K Rin AuthorDate: 2025-04-06 18:15:07 +0000 Commit: Lexi Winter CommitDate: 2025-05-07 18:53:52 +0000 netstat(1): add description for option -o and -O. Reviewed by: kevans, ziaee, ivy Approved by: kevans (mentor) Fixes: fedeb08b6a58 ("Introduce scalable route multipath.") Fixes: a666325282ea ("Introduce nexthop objects and new routing KPI.") Pull Request: https://github.com/freebsd/freebsd-src/pull/1643 (cherry picked from commit afa30c5dec5afc8496172a062c93e96d78f5b9b9) --- usr.bin/netstat/netstat.1 | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1 index 6767d48a279e..e789a626b634 100644 --- a/usr.bin/netstat/netstat.1 +++ b/usr.bin/netstat/netstat.1 @@ -27,7 +27,7 @@ .\" .\" @(#)netstat.1 8.8 (Berkeley) 4/18/94 .\" -.Dd July 29, 2024 +.Dd April 30, 2025 .Dt NETSTAT 1 .Os .Sh NAME @@ -109,6 +109,10 @@ .It Nm Fl Q .Op Fl j Ar jail .Op Fl -libxo +.It Nm Fl o +.Fl 4 | Fl 6 +.It Nm Fl O +.Fl 4 | Fl 6 .El .Ek .Sh DESCRIPTION @@ -410,6 +414,34 @@ See .El .It Xo .Bk -words +.Nm netstat +.Fl o +.Fl 4 | Fl 6 +.Ek +.Xc +Print nexthop (nhops) information associated with routing entries. +When used with +.Fl 4 +or +.Fl 6 , +limit the output to IPv4 or IPv6 routes respectively. +This option provides details about individual nexthop addresses used in routing decisions. +.It Xo +.Bk -words +.Nm netstat +.Fl O +.Fl 4 | Fl 6 +.Ek +.Xc +Print nexthop groups (nhgrp) information associated with routing entries. +When used with +.Fl 4 +or +.Fl 6 , +restrict the output to IPv4 or IPv6 nexthop groups respectively. +This option shows grouped nexthop entries for multipath or load-balanced routing setups. +.It Xo +.Bk -words .Nm .Fl s .Op Fl 46sz From nobody Wed May 7 18:59:11 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zt4LR1y0qz5v7NB; Wed, 07 May 2025 18:59:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zt4LR1MHCz3rD5; Wed, 07 May 2025 18:59:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746644351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s0BGvtiJaZLQ1KFXlCFNGLpAMvekGT4a9pduh1An4Eg=; b=gAnq/4VRBn+IXAOxO1rcg6Yz+rQhuQKvCOmB9vBdIFqVSGl7oEETn1ohK33/0rQWteCl7o Jz0+B+9HcK8I94Z0L1la4cuU0VJnibePPzLLelaQy9/PozRYQFYpXd7NdZlgRbakISdKLb doPirchQtaMXQD6LlqvHMgXkZ3p0zQmkAwEIlcPEBeBrW1cEO4u1I6L/sxaXdrQlxYjkl2 eI6HmAy4epYvGk2M9W1hgD8DWeADszJujrkG/tjyag9djtWA8RMkdcRwsduAXhGt9jPuyQ q/IPQOdTsy7/teNtFz1gnSheEEg+FWGF7PH68BTIeYhivyz00xCIdoxs9e0SBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746644351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s0BGvtiJaZLQ1KFXlCFNGLpAMvekGT4a9pduh1An4Eg=; b=cZzvriGQWJaEgdTtuxYnrVuBbbGojFdpIOjvsQas0/pUNLRD0vAoHqkGszaa8tn/Az9C4E 1i/iyp7QSROTgtqrdDuRyD3L2M38aivOqMGmBDu5Q5O73XSCGAJaOhSSFCfqKt29bKrHfx bYHWqrof4UxHoS1CTF8qg0xoJ3PDuSO4iQ8OeF7wUma+ez3SA3TO5I5QOXpCJx6TnJOVB8 z2ODdU6VkZnsuIcJvQaDGFaV741a8XPC74VRzYHYakNQDiekd7AYwj0CvRgOgMvBQw0yl9 nMvNu4ZGpVk/gK+arvRkQtXtOB5ATzH5rcqUqvQr6TFcczbRFOwgRFG/8X52HA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746644351; a=rsa-sha256; cv=none; b=SqW15/doJR9APM5njJojF5/0DA3uLVdIYI0J/4wFEdGHR3wk79bMe4lQ1N3QOije8qQgqq bE4AKPsgWAz2u8m/LofWr9OieeM9Sr+2rrLFyirQGC6KXvJqP8rhrGBFyywMk7S2IS2j5L 56R+wyICQ7oNWdxtMR1hlJLaE1uSzyG/0UMsC4LFf/Luusc6lF0ESW4uNu+0fFqVRdL/91 2Qa04r2dfVQbP1DlQk3w81PSco9ljS9TpegchmHa6cLdnrXfY0h2LiRXEkdMU6OmOx++q4 JdKX7IxQ3iMReGC/xtwK6PAamaFr16s6HSl2eL3Ic9T/1Y/vmunonAWUny5ZCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zt4LR0s4Wzhwh; Wed, 07 May 2025 18:59:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547IxBB0090163; Wed, 7 May 2025 18:59:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547IxBGf090160; Wed, 7 May 2025 18:59:11 GMT (envelope-from git) Date: Wed, 7 May 2025 18:59:11 GMT Message-Id: <202505071859.547IxBGf090160@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 3de5e282e52c - stable/14 - netstat(1): add description for option -o and -O. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3de5e282e52c87bd2d17b6e17c483b6f5826922d Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=3de5e282e52c87bd2d17b6e17c483b6f5826922d commit 3de5e282e52c87bd2d17b6e17c483b6f5826922d Author: K Rin AuthorDate: 2025-04-06 18:15:07 +0000 Commit: Lexi Winter CommitDate: 2025-05-07 18:53:06 +0000 netstat(1): add description for option -o and -O. Reviewed by: kevans, ziaee, ivy Approved by: kevans (mentor) Fixes: fedeb08b6a58 ("Introduce scalable route multipath.") Fixes: a666325282ea ("Introduce nexthop objects and new routing KPI.") Pull Request: https://github.com/freebsd/freebsd-src/pull/1643 (cherry picked from commit afa30c5dec5afc8496172a062c93e96d78f5b9b9) --- usr.bin/netstat/netstat.1 | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1 index 0a1f3342168c..9b476e6825e6 100644 --- a/usr.bin/netstat/netstat.1 +++ b/usr.bin/netstat/netstat.1 @@ -27,7 +27,7 @@ .\" .\" @(#)netstat.1 8.8 (Berkeley) 4/18/94 .\" -.Dd July 29, 2024 +.Dd April 30, 2025 .Dt NETSTAT 1 .Os .Sh NAME @@ -107,6 +107,10 @@ .It Nm Fl Q .Op Fl j Ar jail .Op Fl -libxo +.It Nm Fl o +.Fl 4 | Fl 6 +.It Nm Fl O +.Fl 4 | Fl 6 .El .Ek .Sh DESCRIPTION @@ -403,6 +407,34 @@ See .El .It Xo .Bk -words +.Nm netstat +.Fl o +.Fl 4 | Fl 6 +.Ek +.Xc +Print nexthop (nhops) information associated with routing entries. +When used with +.Fl 4 +or +.Fl 6 , +limit the output to IPv4 or IPv6 routes respectively. +This option provides details about individual nexthop addresses used in routing decisions. +.It Xo +.Bk -words +.Nm netstat +.Fl O +.Fl 4 | Fl 6 +.Ek +.Xc +Print nexthop groups (nhgrp) information associated with routing entries. +When used with +.Fl 4 +or +.Fl 6 , +restrict the output to IPv4 or IPv6 nexthop groups respectively. +This option shows grouped nexthop entries for multipath or load-balanced routing setups. +.It Xo +.Bk -words .Nm .Fl s .Op Fl 46sz From nobody Wed May 7 19:02:07 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zt4Pr31qmz5v7xH; Wed, 07 May 2025 19:02:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zt4Pq675Gz3tsv; Wed, 07 May 2025 19:02:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746644527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7yTt2SPqGQBIQ2qbQmWCu7VPYNnBbtJK15J9f0HmGhI=; b=I4W9jmEcVDDZx7iOhdLvjFQCBid6C9GI3K6i99TBw0TY2p/togKVz8JmaOSFTaJIyIYwxb hEyRglH0Nsy6lsHMCOeIMiGLWuBXrCUbzUezG2F/pu/1oca9aSFvoaYPmeqqWGV1iivBFM 8DPQfSvk+vDpYWt+bFEMZdWw9EFrDS5NbooUOb5QXlC5LEBZFjqsH+F4/TDbIdUshhTnJz xzYbv4VhEHuLPL8oTpSKYqnLcujBlBF4WXZV+GMEsA19PYKeW2kRlnfwAq7CF1iP1onM2U d5TJ+SU30TfwwlV5+6EXQfo7I6TCQ6Le3oVHSJGvYG+7pR6Zw4uwiIRaPaAerQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746644527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7yTt2SPqGQBIQ2qbQmWCu7VPYNnBbtJK15J9f0HmGhI=; b=FWF1Fi2mDfPxLNDC5y+UTqzeHhkA7k0aw81Coev3P8nQIvl/wnnWChxFINrv0Ee//MNzFr SN6M1FVcwN5UMB6vIewPMrlk1Eac93wv4OC1JryhHOxPsPJ4tIvxT6+LY44VFUwvJdGpxm gLXB8AkxVvAGUFY3bQcW/a4ZxRWGOxpeRiNrLeIIn6OkAvBu+W/7770VKjC2fB8hhNXpAO KvlhF23F2Ryq8O9o7oW7jvs8PbOTmHMEufhzWl9JJptUxjriG4f8BkVWwVU6asfBixkZei hQ0LL2sbptkosK6ieegM8mF4IxOxATdrw+KuD0YbdvzXkmA3WW1X+kbiPa4glA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746644527; a=rsa-sha256; cv=none; b=GwhI/BrWYRLUBlh8b6Tl7ElQXZieCmmr4n7Tv7Wc4zNVfrAtfPw5KGy5dn1w93CO1Nl91U 8POTYbLy+RN2heWHObHNEihdxUCYhR3zFQqjP48aQpWGTAd+Iju/t1R73ho2qnAceu/cPf qnxRoVDsx0RhM+8rK9P+HWgV8NtUmXeos4NlXPDFe8gCWJ22+TxFY9gKGx20TcrE9WvBcZ gwJx5GJ6mYt4OoFJSdLjCBDGLaOmK23M2OOuyxS3Na8MOy+RPcZZoZdzjBu1lCugjHl+mv KwdWTKC3oZ8vbPSx9aRVz3dGD8mDIzDgC9ktuRPeog7UBSx+cJQqJg2VVWi9bQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zt4Pq5hDXzjCV; Wed, 07 May 2025 19:02:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547J2747006594; Wed, 7 May 2025 19:02:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547J27p6006591; Wed, 7 May 2025 19:02:07 GMT (envelope-from git) Date: Wed, 7 May 2025 19:02:07 GMT Message-Id: <202505071902.547J27p6006591@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 9a6a287c8b92 - stable/13 - tty.4: see also: cross-reference pts(4) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9a6a287c8b924f837ae6ef5d45db5081a496549c Auto-Submitted: auto-generated The branch stable/13 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=9a6a287c8b924f837ae6ef5d45db5081a496549c commit 9a6a287c8b924f837ae6ef5d45db5081a496549c Author: Graham Perrin AuthorDate: 2025-03-18 04:55:29 +0000 Commit: Lexi Winter CommitDate: 2025-05-07 18:59:47 +0000 tty.4: see also: cross-reference pts(4) pts(4) already refers to tty(4). Add a cross-reference. Reviewed by: kevans Approved by: kevans (mentor) Pull Request: https://github.com/freebsd/freebsd-src/pull/1617 (cherry picked from commit 6f4c4cfe4b138297957d80c0887f99a83d9facf7) --- share/man/man4/tty.4 | 1 + 1 file changed, 1 insertion(+) diff --git a/share/man/man4/tty.4 b/share/man/man4/tty.4 index 7c86be6aa62b..8d4ce0cb20bd 100644 --- a/share/man/man4/tty.4 +++ b/share/man/man4/tty.4 @@ -374,6 +374,7 @@ variables. .Xr stty 1 , .Xr ioctl 2 , .Xr ng_tty 4 , +.Xr pts 4 , .Xr pty 4 , .Xr termios 4 , .Xr getty 8 From nobody Wed May 7 19:02:17 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zt4Q16Tsmz5v8JB; Wed, 07 May 2025 19:02:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zt4Q14mdyz3tyk; Wed, 07 May 2025 19:02:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746644537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J6A7p4Fg4br2Z4rgUp6OgdabRDAxtm5sGOJmFMppoSc=; b=UblymEfLjm2ysr/CFviVHsKczStWakspMqZON+swC7zS0gD85XzT2etIgMxF9F+3C1oN79 POfsvCeGivmddVuII3Be8gSJrWHyk/EYZMBQQhvw1oRMLg4dFJJoo3/jD8XevVzbltDbdS BlafM3Uqab3DnxloUQk6F3EfKkrhcteOnfBo260vTxlQkz4w0QDTRydgkeQ7NHn7256Mcq 8X2UVh68Ty4+ANHImWHYEVFlbESYY6FDXO4fT8A8MWdw3MXFoSwpisyynEVFzCrbG+eq5Y LXqx2zb2/m0yIbhBk5YUEkFEU9m58nDaG4unQjE+Bvw/M41lnC0lxAGVvxN/WA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746644537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J6A7p4Fg4br2Z4rgUp6OgdabRDAxtm5sGOJmFMppoSc=; b=ne6NRyzPK1gEygGH8gpCCiR+OF2a+d//dS2NDsDc6AtLeeqEz5Rf08kTT144B7FlMb3F4Q BayC8NgC5VZ+MLixRWiu6XgbkXsJldelr+0WqiCRBtQRYgoscvs+2wtpXTd0/cLkzHWlNj lBcil3pqmHCNc2DhCbJWyauMYCm+MGiS/Gcg9nBzINs4QI7CLjUCogWf57t1Da6GGnTC92 DjUO5FeQsDVI3OiujTlYPXhB+EAN2FJH9sHi7uzBgKHhVIQYKBS5865V069B7VCxNGz8Wr d2ly1P/2xDV2ArR+sbjPnDByySMQ5JfAmNWwIiUugR5+x447C43paS6Cj4J6Ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746644537; a=rsa-sha256; cv=none; b=m7kge22lg357NRzR7i6XyETeURADD902WhT+iJTvdsxqMEcJg1g0ezcY2k5WlELoRak3Yj Dp8YZSxFs6x9SdHNnbjm5aKXA5ztToOKFavulcnmnI4i6os0qcDps0u1Gw2Ugbnm6ngAEc 2UsT7b00QMZ1sYRJCaWZICSkuBAswWR+G/C03sAw+cP/B3cP5jfJTA03GGHjg4mmyAyPpJ 0HHdOcK0EU3mH4j7SUhCb3bIaPQq3SjJg9nxxIJ4Bxzde7eeNGLI0+CNSfmERd21jKxBYE Ya+TTL+minhKYLQNzI7e+xpCCruTjImPKBFCvn5x3UR7f2k2IVlBJHQb6NDuog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zt4Q14LxSzhTj; Wed, 07 May 2025 19:02:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547J2HOm006743; Wed, 7 May 2025 19:02:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547J2Hf5006740; Wed, 7 May 2025 19:02:17 GMT (envelope-from git) Date: Wed, 7 May 2025 19:02:17 GMT Message-Id: <202505071902.547J2Hf5006740@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 18d777f13e12 - stable/14 - tty.4: see also: cross-reference pts(4) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 18d777f13e124cd6b4f0d49dc96793efbc6ad2aa Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=18d777f13e124cd6b4f0d49dc96793efbc6ad2aa commit 18d777f13e124cd6b4f0d49dc96793efbc6ad2aa Author: Graham Perrin AuthorDate: 2025-03-18 04:55:29 +0000 Commit: Lexi Winter CommitDate: 2025-05-07 18:59:36 +0000 tty.4: see also: cross-reference pts(4) pts(4) already refers to tty(4). Add a cross-reference. Reviewed by: kevans Approved by: kevans (mentor) Pull Request: https://github.com/freebsd/freebsd-src/pull/1617 (cherry picked from commit 6f4c4cfe4b138297957d80c0887f99a83d9facf7) --- share/man/man4/tty.4 | 1 + 1 file changed, 1 insertion(+) diff --git a/share/man/man4/tty.4 b/share/man/man4/tty.4 index 76595c7d9b4e..7fd0955df44a 100644 --- a/share/man/man4/tty.4 +++ b/share/man/man4/tty.4 @@ -374,6 +374,7 @@ variables. .Xr stty 1 , .Xr ioctl 2 , .Xr ng_tty 4 , +.Xr pts 4 , .Xr pty 4 , .Xr termios 4 , .Xr getty 8 From nobody Wed May 7 19:15:11 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zt4hw053hz5v8j6; Wed, 07 May 2025 19:15:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zt4hv5qyWz43hD; Wed, 07 May 2025 19:15:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746645311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aFrUIHJwSkzBV9mOtiwU6RpEjGoEOyloI5Vh2IdMgIY=; b=y0BtPun98mTgNVqz490HxKV0sUwoh7eWuaENIGB0LQcPj0YXKGlTR2m+NfV3WrMOPdT+i5 z4rpusbr3vC9PphwdlcCfRfyAFle4oUKAbm2FdvYQJo+W5KkD5X9Rp30ScFUw4r+yt+vUq 6gXT4f3+Ldda5QcjwMm5x3woJtDD3Pl6bsqh+vr9gWacHbl4LNKd5mQNhMUwUnnVYD/u5h 48WfTdgfDVi5YKLKYtgGNajtJpzr8G82dOMP/o8IfZAp8HbKxTYW1jba/ntMwkHA5IAC8g +8VL+QE/lIQHquhJw4EyFrrWm0ymJFKV1PdagNAjSSaIvvhQSHNKaU8DWpmsjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746645311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aFrUIHJwSkzBV9mOtiwU6RpEjGoEOyloI5Vh2IdMgIY=; b=STOQXyGIpMk66BLgRxKCny4jj91AxEMkbls3KN4X1Z4ry4xZGJVM2ud07OLWKlXlzqPlTe UtEylwHS6EPNqP2sEvKPr1ByNhqujICX7TiN23dfQ9BPCgrH5WYXnnX/zv5c6JNZMf+YYR tKvYdOqFrZHiUXI2VvCLi07fgq98Jy8L8Ki3+dTCmAjP0NnQQfNpyzGFp20xOfKONuKvwb dmQ8G7XvMMbYC2IwNOxSp5TAemyaY0kDHOkm2n8+FZFhV+e7kd57XR2Au2NRqyn1jHWmRH sTaILyOEhukCtgcvlYWCak3FOZ9Kk4WK204X/NrVZ/DOem/dN4mIVuW54NTiog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746645311; a=rsa-sha256; cv=none; b=bi8W8p8Q6wzp+9dlJZmLiWpwnSDv0ThXJRENUBJGEgHWZZmUYRcGhGm1NYhZxX5NZgKxZD KGNjn4OKbopP1mNIbb/Ay8lhEcF+jsv8Iy51Gx04dj2s5u6lvASgS5+y8YAifeIbZnrMw2 JpBte8qmRCRNHZfrgG7v4Xxzz49NJAGcDWd1mjEkJSbMQap432rAiqIBMb/uvJL/lhc0jv wnGx2TIxdii+XTmXI25c4bUKRgfIYNPLKafIpdcli16+VqXyiApXw9Qgk5mBBdnNvn3S9Y P9V7nTDl/q+qVPFdwSMKMszUPQ2F4m2CEDPoq+qWzpOBeIDRDVhSc4ZwEkl+qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zt4hv598YzjRp; Wed, 07 May 2025 19:15:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547JFBDJ027690; Wed, 7 May 2025 19:15:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547JFBV4027687; Wed, 7 May 2025 19:15:11 GMT (envelope-from git) Date: Wed, 7 May 2025 19:15:11 GMT Message-Id: <202505071915.547JFBV4027687@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: a2070ebfaf04 - stable/14 - bridge: define VLANTAGOF correctly List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a2070ebfaf0461ec57f78abe2704dc014a74e552 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=a2070ebfaf0461ec57f78abe2704dc014a74e552 commit a2070ebfaf0461ec57f78abe2704dc014a74e552 Author: Lexi Winter AuthorDate: 2025-04-04 15:05:01 +0000 Commit: Lexi Winter CommitDate: 2025-05-07 19:07:51 +0000 bridge: define VLANTAGOF correctly to avoid strange precedence errors, enclose the macro body in parentheses. this fixes constructs like: if (VLANTAGOF(m) == i) Reviewed by: kp (cherry picked from commit f36292f010fcc6391605182f2973fdc12a3bd15f) --- sys/net/if_bridge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 5cb4a033e325..79561bc4c9cd 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -419,7 +419,7 @@ static void bridge_linkcheck(struct bridge_softc *sc); * to indicate untagged frames. */ #define VLANTAGOF(_m) \ - (_m->m_flags & M_VLANTAG) ? EVL_VLANOFTAG(_m->m_pkthdr.ether_vtag) : DOT1Q_VID_NULL + ((_m->m_flags & M_VLANTAG) ? EVL_VLANOFTAG(_m->m_pkthdr.ether_vtag) : DOT1Q_VID_NULL) static struct bstp_cb_ops bridge_ops = { .bcb_state = bridge_state_change, From nobody Wed May 7 19:16:23 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zt4kH5BHfz5v8WQ; Wed, 07 May 2025 19:16:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zt4kH2z9Qz44xH; Wed, 07 May 2025 19:16:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746645383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QMS6wzCz9VnU622t/W/8OfJfvUhTESZWHkpweKP2K+Q=; b=f15EfCSQSdJ2uJUpAnpL7WHlFu+5Eibmvu6+GDhc9wGGGASI+pMKfL7Y1STAz93e47aTG3 msmtrrb0ID8foi1LtwI3z7PaKqlpvSm3DfYjj9tOaRxf+xhmGWQ32RIggijw4t9OsV7tVf l7vtMCtchtTvyw4OQvaBCOveMIK9HiB/1QCr8DgjfNLyTFO4iC8tDFFUvaW/8VuanMct4B 33e82WegFUVQDNHPrJp7XZ0Jlm67Bmzn7/mr+QeVzyDuL98jjxg7lHrj0K2bubwG512XJE ufYCrrHBNvw+CqdNxmwqUg24uqAMCXfMnUppNar6kwmTqGOgzXoPElJMfic69g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746645383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QMS6wzCz9VnU622t/W/8OfJfvUhTESZWHkpweKP2K+Q=; b=GjsDc2OJ6l6lFrfnentKcazbYQwpoyqrCJab08PH5WUuWQDuQAk/Nh/WUY3hYIE/ohCXnV w3xTFn5BmQQO5qxP3XVBcs7lAgiIvie+0lLPK4x5nh1/01mdFqlitm+v0Jt6J2E4H6Kh2z laGK0UmFhuNd9FGGUPD/ozSQN4KLW4RgxmU3+UBcDzGYrF6BMXcChMK2lTKxiTqYKwpg/X kaQkC4wLSV2+uuXI3UF6vYkw7taGKxKE2iZFBX67WldOdEDPZ3UHqnSRuhLrfAEq2MJl2X CqeKrdNlOu6bG/KO5AYRuhWtMCCoBXibI8UzBaIDHzZ/bb5DE6sLaaNdinUevA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746645383; a=rsa-sha256; cv=none; b=fvziH8XeFn58YRGVW2Bh6o4D43apC44A8R8hcBZqzlCxeiUeovR3QhNYUQu1Uvcuo3g4S0 9Y21AnRbBFjXvLk+c0osMqC4dI0RV4wZ1Hz9KSUaYaMdA8bCwT/7Y5ZiRfHxtAAsD7lpIC FJj7ru0CDnJdWyRbRGLIh/HxyPcrt4VC+C63WLYAIPThcqwU8VC4/3Pk8zOmueGx66aI78 1fw0hvmBHep/NHKtJwxHyrgSEkV8XaHpmr21h9Yig0jjrmwaIPtKB1AuRvZFjEYiNK3xsV JzyywbH1q8NXUOlwRTSMYGkUltghlLWDZ5GuRQZEFCTXzG4EzJE3VEOUt9u7PQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zt4kH2VgLzjDX; Wed, 07 May 2025 19:16:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547JGNw7028156; Wed, 7 May 2025 19:16:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547JGNel028153; Wed, 7 May 2025 19:16:23 GMT (envelope-from git) Date: Wed, 7 May 2025 19:16:23 GMT Message-Id: <202505071916.547JGNel028153@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: a13702f04aff - stable/13 - bridge: define VLANTAGOF correctly List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a13702f04affcafb98840553599f7a5267adc791 Auto-Submitted: auto-generated The branch stable/13 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=a13702f04affcafb98840553599f7a5267adc791 commit a13702f04affcafb98840553599f7a5267adc791 Author: Lexi Winter AuthorDate: 2025-04-04 15:05:01 +0000 Commit: Lexi Winter CommitDate: 2025-05-07 19:09:59 +0000 bridge: define VLANTAGOF correctly to avoid strange precedence errors, enclose the macro body in parentheses. this fixes constructs like: if (VLANTAGOF(m) == i) Reviewed by: kp (cherry picked from commit f36292f010fcc6391605182f2973fdc12a3bd15f) --- sys/net/if_bridge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index b392a9c69a7f..dd506d558c99 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -420,7 +420,7 @@ static void bridge_linkcheck(struct bridge_softc *sc); /* The default bridge vlan is 1 (IEEE 802.1Q-2003 Table 9-2) */ #define VLANTAGOF(_m) \ - (_m->m_flags & M_VLANTAG) ? EVL_VLANOFTAG(_m->m_pkthdr.ether_vtag) : 1 + ((_m->m_flags & M_VLANTAG) ? EVL_VLANOFTAG(_m->m_pkthdr.ether_vtag) : 1) static struct bstp_cb_ops bridge_ops = { .bcb_state = bridge_state_change, From nobody Wed May 7 21:07:29 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zt7BT6WRGz5vHmd; Wed, 07 May 2025 21:07:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zt7BT5tTbz3JFX; Wed, 07 May 2025 21:07:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746652049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pwy5wlvkxbEHZjRv1WaGl6hTd4Ut9pmc5h24/GM6mAk=; b=Q6aR84nWzcMnjOs+ScKlIbiNBZaWFl+y93ATBTKnxfaCC1uLMuDZJln10PqgjjiOwsjwcu 9iCICjxT7PYeUR36ZWWbI2uOvlaKGGFotHhNKuqaQlmDsKLs8fZbqlsMcMJ392s0lnImz5 kidZToC+n+QszitXkKGxxsgg+NPtG41Tb34ttKhIzFSCQz2xUHryHEvAes7bY7oKb/lILk yWJqIWz2fmYWlnEx70PclKyAfuBaaELGYoPyWwpKiBcswZqbsUioqt+XrmzsqsdeeIWLAc 2OFwnkjVe0j5Q6gD8LT3hrzTV0AEzA0H+bhPeUfkPs+75WpBDVc8evhROsU3fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746652049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pwy5wlvkxbEHZjRv1WaGl6hTd4Ut9pmc5h24/GM6mAk=; b=jcFBtOJ1BH4DGbBohZpSkzTUNHznCti3zOkUMjttszszZ6zPmoRxyCTEJ49iu8R+tgzGdL YV0u8pGk4VKsoGr5bS6xQLa1GqjM4pvSbL1j07SQpNDHgYKwSlanKkvs8suVkL7L98T54l canU88IeWVcJ16UdlS8CEJMHytm60/TbD20mn8jDDF76KUJe619ym5wl8k5ZLdbhihKgwA jyHfP/unjOJr+o9Au7W01F92e+NGoODKvIdOqiKQ0WzvOrmWAnHproQlqmOkezwQKfK9cU FnEqr7KTapQQTpqfTT/zHeyG6L+hevEgIfQIa0S+8ZmLfgNfOLMvwwQjQ+E0SQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746652049; a=rsa-sha256; cv=none; b=ZX2TIvdY28FOSxsFVt2KWPSkFE1mKI+vrhC1t1z6N3qjXo7oGb3kaRRNJNjO5icgD1Box/ PGz9/ewM/eASVc1z82xAAdX0mdac+fcFUfe6Zz4NbzPBgL6dRwc80+BwuaRN2Y+bRdRj/0 YLn6+PThiY48DWxnJc/xj85BHzFSlR+epuWEkkT+RknsWSMQbrHt2p5R1+p1lqJ++8Ox/b 7s9ywzb88LpGcfWZCDJu5tOABPieosicKwt3Kt2a+vBchvsaTelLqsEHEtwnATLAhUu10U Ez5zSFDHaUOEJ9mUj/aoU1xBu2dHQNIuyvumGEiZQZE7lCZRufae7yVNTVNwVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zt7BT5Svvzm8v; Wed, 07 May 2025 21:07:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547L7TFh035740; Wed, 7 May 2025 21:07:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547L7THU035737; Wed, 7 May 2025 21:07:29 GMT (envelope-from git) Date: Wed, 7 May 2025 21:07:29 GMT Message-Id: <202505072107.547L7THU035737@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 243de2ac1545 - stable/13 - net/if_dl.h: put kernel decls behind _KERNEL List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 243de2ac15455d58311046981e55b718af5723d4 Auto-Submitted: auto-generated The branch stable/13 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=243de2ac15455d58311046981e55b718af5723d4 commit 243de2ac15455d58311046981e55b718af5723d4 Author: Lexi Winter AuthorDate: 2025-05-06 10:18:43 +0000 Commit: Lexi Winter CommitDate: 2025-05-07 19:21:25 +0000 net/if_dl.h: put kernel decls behind _KERNEL Reviewed by: des Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50063 (cherry picked from commit a5ba03f6e4f003022968b50161abac24c7ec1d38) --- sys/net/if_dl.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/net/if_dl.h b/sys/net/if_dl.h index e0ceb61741b3..035a3346dc08 100644 --- a/sys/net/if_dl.h +++ b/sys/net/if_dl.h @@ -71,12 +71,14 @@ struct sockaddr_dl { #define CLLADDR(s) ((c_caddr_t)((s)->sdl_data + (s)->sdl_nlen)) #define LLINDEX(s) ((s)->sdl_index) +#ifdef _KERNEL + struct ifnet; struct sockaddr_dl *link_alloc_sdl(size_t, int); void link_free_sdl(struct sockaddr *sa); struct sockaddr_dl *link_init_sdl(struct ifnet *, struct sockaddr *, u_char); -#ifndef _KERNEL +#else /* !_KERNEL */ #include From nobody Wed May 7 21:07:30 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zt7BW1vX0z5vHn1; Wed, 07 May 2025 21:07:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zt7BW0NHhz3JJ2; Wed, 07 May 2025 21:07:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746652051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z3llp6pmz1oYXtZC8xwr+xw4k2H/LU0epjJhSVXokww=; b=XBHkz6g0ackbuIfSbuw3aKu6rTOI8TJtlUwKJp6A+tJe7Jg/UqEQ+qI+LbQGBdGDaeqlgt Sl/uVzEhyxojBraFfgGOc1EJlExUCjGjuumkMYuqevwNmBDnQEP2XOXWZupjIgIg75XMWI ZQvPfAcXyX/7goEaATn6wvrfBCHDnmycSFZ5teoVZTuEYc+xhqwfO5eeYaqQMnwPLu1fW7 9H4OHZducCuFIgDLrvflJNJvLTdX0abmdGBjoiUrHLY954OTdQH+bym3HM8BbRgPEOi3Od BdX895FOcQ+sdZR6HKAGryScbz50RaoFWtYCWYKdKqzFNzbbggltqK4gnGk8YA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746652051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z3llp6pmz1oYXtZC8xwr+xw4k2H/LU0epjJhSVXokww=; b=jG+3aUmR6nTpD0kOk/PX3EzrSvFWF2hQoUmJXULK1eE2xKML3ZZ+lY84HNTf+Zz/MVd6LO HjWCt/qQZRxH17XO0IB0GZk17wHQSGAu4IMQlwPSifVaITOAX2VQK1aNj8bRWcgxcR3qXR 5hbkFXwk/87951+LWAJE2ZMuKFPN/FhM6yPDPRZ+Mlqketav5yOzt7Saxhbqg46iBtlzfg P/hBWfxBhfaYsaV52OqeUnrP+zRfS5NbPL45h5zufY+8ZQbpHFAY/hYOKhGKqblmpyEP+k a0BI8qbEmC0kEjtkzO5thTJV4YVbaOHktoYv2xi4mSzABP/O66UiOP90OUVagw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746652051; a=rsa-sha256; cv=none; b=YEZ7GF4MNZ+CW6/2gssXfpspUTyM5BKure5fKgVMpDAsLXRaFvrJGzMVifNVuQgoAggyxT Fg30cw3qpXjrf4LdKdrikycDAi8F0QbGjXUPDEtHeYMkCBLqMlrm0ZJNkBGoQiZOE5udhV pay/Udas46pQKuBzMmvuFg0PUBL9RnN0EokI0yyykEYP72U1vdq8SpdgOFURmGq+ckvlR9 PX4wIAD1VbpPlVWldfRlpZqW/VdhHZCZp4eiVHabN/6ifVLCda0F2PWHT8sTNPRpEE7r9h KmlbZY1SAij+rukvcvMqR2T9dFAoL56rC+Vm8vvq8ivxoUiGbh5A2QKvmxlYEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zt7BV6QgZzmFS; Wed, 07 May 2025 21:07:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547L7UrK035773; Wed, 7 May 2025 21:07:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547L7UGI035770; Wed, 7 May 2025 21:07:30 GMT (envelope-from git) Date: Wed, 7 May 2025 21:07:30 GMT Message-Id: <202505072107.547L7UGI035770@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: b18da5008e97 - stable/13 - net/if_dl.h: make self-contained List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b18da5008e97446db7238bcfa310d2c576e5e52f Auto-Submitted: auto-generated The branch stable/13 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=b18da5008e97446db7238bcfa310d2c576e5e52f commit b18da5008e97446db7238bcfa310d2c576e5e52f Author: Lexi Winter AuthorDate: 2025-05-06 10:20:44 +0000 Commit: Lexi Winter CommitDate: 2025-05-07 21:01:28 +0000 net/if_dl.h: make self-contained include for u_char and u_short. to avoid including , remove the caddr_t cast from LLADDR. we are trying to get rid of caddr_t anyway, and since sdl_data is already an array of char, the cast is unnecessary. this also makes LLADDR const-correct, i.e. passing a const sockaddr_dl will return a const pointer. Reviewed by: des Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50065 (cherry picked from commit 70b5c918571b6c79459ee6de66ceb4c83974d542) --- sys/net/if_dl.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/net/if_dl.h b/sys/net/if_dl.h index 035a3346dc08..ee9ace3803f0 100644 --- a/sys/net/if_dl.h +++ b/sys/net/if_dl.h @@ -34,6 +34,8 @@ #ifndef _NET_IF_DL_H_ #define _NET_IF_DL_H_ +#include + /* * A Link-Level Sockaddr may specify the interface in one of two * ways: either by means of a system-provided index number (computed @@ -67,8 +69,8 @@ struct sockaddr_dl { contains both if name and ll address */ }; -#define LLADDR(s) ((caddr_t)((s)->sdl_data + (s)->sdl_nlen)) -#define CLLADDR(s) ((c_caddr_t)((s)->sdl_data + (s)->sdl_nlen)) +#define LLADDR(s) (&(s)->sdl_data[(s)->sdl_nlen]) +#define CLLADDR(s) ((const char *)LLADDR(s)) #define LLINDEX(s) ((s)->sdl_index) #ifdef _KERNEL From nobody Wed May 7 21:07:48 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zt7Br6RP9z5vHkW; Wed, 07 May 2025 21:07:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zt7Br31Zjz3Jl7; Wed, 07 May 2025 21:07:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746652068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SpszmgK1brIPSkfuroI9G/Tv6rFN4fTuLW5zzgdYnOU=; b=XVcSEFL2xyTdGlKYqS3Z7z0w1wwlEp88zVRf/c7pDEjC2JZJO/k/EnnE47EqjUS2fEqNZM 4PBzLBCWgRKpRQEgzCLr9oWYm7n1UyTDINdcGmjWC/eg9ns/On1wdsh0u51xvh+5z4m4su 0DuSrSY1dtTWT1kkAIF4KEPl1n0oKbGsu7nRn6jgz4B4VL+n7Uv9ig0bouUcuYmq9wSYvj 2mVRsgnfomaA9imGm3zsFwHUzFqnBpZUo5PLbe0vq0oHLZg4tZjJg4zdjB31SBSqY6i1LW QKVi+j3F5hU2ROnXsLoc0z7gBPaQOEFbkjNiB+BVNa97BUSXgX8+jEzdhCxD+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746652068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SpszmgK1brIPSkfuroI9G/Tv6rFN4fTuLW5zzgdYnOU=; b=kZ07osKahYiUYRpoWe8WLMPlxJVRsYFvnY804EYsQ/w07UmqnaxKy40MGLoMwyFe21RYH9 NXYbjnQPhflZWTFwV9XXogFaigDVI8OUV+CDVQMUcpNMLsL6NRNQ8JSikRpwf0BcwXzsnb HfAsphenDvFGilBo6bIFfTynYgE/BtoqaVTpk4RzhWOiLplnV6+rk14lHt0k7jVQb71Szz u66XuOYFPcd65hi07aOjK7BLuU2zCfNVvOrouEda+c4lJy2xVa2XKsFvCR2oBT347zI0ZT 36B2iCptj92vaUKM+hXRvMjBdLB1/qFxgot31CRF7gJcuo/D5IsyUXLV4E1atA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746652068; a=rsa-sha256; cv=none; b=d2hiujkl+qYons+GFBZ+yFhfNnySyCdTgjH67Hhf1scNa0Uk/Vgaukt+cwf4uoI6AMfbRX JIqZykchuvFTTUiX/zZUlLVumximcQ9U5nD5xdSODHvwShMfQ5QaxoPnjSKLnolI14oIcP pmTLcAMT+BL5NANk0CctnNGRhbrf5zfJsGfsXMbzh78wfswU6Fh8VijBPLmhkvP+S56KF1 vg0f9Dh/Q9Ty4L65wipNjqzrcST9fAOIOMQxsZzoDgmmw9N5bbBBrkEakoS3B+h60htvME wdGZo5CgZDFxSG4kTPgRa42BhcthxYWG8ITz63k6YeBqT3p0pRX4970U4Fg3hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zt7Br2bJWzm8w; Wed, 07 May 2025 21:07:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547L7miW035991; Wed, 7 May 2025 21:07:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547L7mSN035989; Wed, 7 May 2025 21:07:48 GMT (envelope-from git) Date: Wed, 7 May 2025 21:07:48 GMT Message-Id: <202505072107.547L7mSN035989@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 66a734854e10 - stable/14 - net/if_dl.h: put kernel decls behind _KERNEL List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 66a734854e10d8d88777215ccc696b8e973ed252 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=66a734854e10d8d88777215ccc696b8e973ed252 commit 66a734854e10d8d88777215ccc696b8e973ed252 Author: Lexi Winter AuthorDate: 2025-05-06 10:18:43 +0000 Commit: Lexi Winter CommitDate: 2025-05-07 19:18:38 +0000 net/if_dl.h: put kernel decls behind _KERNEL Reviewed by: des Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50063 (cherry picked from commit a5ba03f6e4f003022968b50161abac24c7ec1d38) --- sys/net/if_dl.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/net/if_dl.h b/sys/net/if_dl.h index e0ceb61741b3..035a3346dc08 100644 --- a/sys/net/if_dl.h +++ b/sys/net/if_dl.h @@ -71,12 +71,14 @@ struct sockaddr_dl { #define CLLADDR(s) ((c_caddr_t)((s)->sdl_data + (s)->sdl_nlen)) #define LLINDEX(s) ((s)->sdl_index) +#ifdef _KERNEL + struct ifnet; struct sockaddr_dl *link_alloc_sdl(size_t, int); void link_free_sdl(struct sockaddr *sa); struct sockaddr_dl *link_init_sdl(struct ifnet *, struct sockaddr *, u_char); -#ifndef _KERNEL +#else /* !_KERNEL */ #include From nobody Wed May 7 21:07:49 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zt7Bt1qHwz5vHnD; Wed, 07 May 2025 21:07:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zt7Bs3fj9z3JyQ; Wed, 07 May 2025 21:07:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746652069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zZM04kX7qkqg3tsqyCUFwBuIwkv6OJWjqdjLgGPtycI=; b=k+EXHclQJ1xvHYOL8+h6RQSJeHkHu5XIyo49KoqGAcDFlAGouRi37h8oWLu/jfAwQOpBgX mdYQdmM8wjh/TvshMg2/M+MoHg2Sci2GzeCWpHwSiChXQ+CgrjdGjTUIxFUiNpZCJsxfmG le+MHFDAu/QM4YiATLdjW+d76Q/CzIEKBRclkBcJYlZZi8PUtOgEGPIrpqBDNsFOBoXcPW FtvA+1+RrjB5gJXqiiVbJVXD/ccQoVJeOW8MsDdx6t8Z1r5H/ALGDmpQNZAru36RpSntEJ Yy6IBV/C+j/JX0CTeTaRJzBMc5WyEcBk5QlYqSGrFxojSgoao7dUAw/+AMCCJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746652069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zZM04kX7qkqg3tsqyCUFwBuIwkv6OJWjqdjLgGPtycI=; b=oL0TMv/xyAcBTbx+odFASf1oUB8cFGYREtoLdjBZX+1lBNl3EPyJ4cRe5LBe+bs3LHwKR3 M1eQooAL5Eqkt1EuH309pGE0v5cUAyNoLaOzCxVUHENFzYwhTUz2CHdxsmxa6mWk8MLvdY hFN/u+CnegWe5KYWRdYg10TB2xtv5s9BdnKciIa9Ek9xeb6cMhsZOzaMqlYRkMNuZf5Lng Y1UwV3seoI2Iv5a5EybB/FzwOYJ3/B2zZezvhTsvMocfEjTh8WM4FivxRhGTkOkRB+MTnv zQb9wjvk5CI2wdO7iYfTHD0mfqF7MmhRbdIStnb0HpqdzGVqPuTRjUUp7N0izA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746652069; a=rsa-sha256; cv=none; b=U9wh8RHHHC6GhbHqtXuwg1sXO+oqWhc4bg7mTjcCMQg3+aZtvdN0ZcuAVTl6J6/cuJboQ5 Q41coCvEOZbnbi+ivymtcJ6u0H3O96uv+qBuZJqg2i8DjrGDMBOfn5jCBhkABUaWxHckM8 9BUZ+B9F5jCaSZE8bCvBai/7T8Th+jJRlSKg20RF2cK4qjK3oIef7rihxmd1xi1DsbCoon 3i+Fqnjc8ekSElleW9TaquErHdRLJ4sIUuhjqh4RZ6RYwe0oUEFlJD4EcxODSWzOZARcse UaGJ3eiz3byCxIQuFBljmmD3xr+CRV5B6Im7d8RBQrGZ06puIxeOqVXwbZDOTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zt7Bs3BmDzmK5; Wed, 07 May 2025 21:07:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547L7nQN036028; Wed, 7 May 2025 21:07:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547L7nPP036025; Wed, 7 May 2025 21:07:49 GMT (envelope-from git) Date: Wed, 7 May 2025 21:07:49 GMT Message-Id: <202505072107.547L7nPP036025@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 4b0b2b5650ed - stable/14 - net/if_dl.h: make self-contained List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4b0b2b5650ed2edeac00d3c6d1e1b402914ff032 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=4b0b2b5650ed2edeac00d3c6d1e1b402914ff032 commit 4b0b2b5650ed2edeac00d3c6d1e1b402914ff032 Author: Lexi Winter AuthorDate: 2025-05-06 10:20:44 +0000 Commit: Lexi Winter CommitDate: 2025-05-07 19:20:44 +0000 net/if_dl.h: make self-contained include for u_char and u_short. to avoid including , remove the caddr_t cast from LLADDR. we are trying to get rid of caddr_t anyway, and since sdl_data is already an array of char, the cast is unnecessary. this also makes LLADDR const-correct, i.e. passing a const sockaddr_dl will return a const pointer. Reviewed by: des Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50065 (cherry picked from commit 70b5c918571b6c79459ee6de66ceb4c83974d542) --- sys/net/if_dl.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/net/if_dl.h b/sys/net/if_dl.h index 035a3346dc08..31579efdeda4 100644 --- a/sys/net/if_dl.h +++ b/sys/net/if_dl.h @@ -34,6 +34,8 @@ #ifndef _NET_IF_DL_H_ #define _NET_IF_DL_H_ +#include + /* * A Link-Level Sockaddr may specify the interface in one of two * ways: either by means of a system-provided index number (computed @@ -67,8 +69,8 @@ struct sockaddr_dl { contains both if name and ll address */ }; -#define LLADDR(s) ((caddr_t)((s)->sdl_data + (s)->sdl_nlen)) -#define CLLADDR(s) ((c_caddr_t)((s)->sdl_data + (s)->sdl_nlen)) +#define LLADDR(s) (&(s)->sdl_data[(s)->sdl_nlen]) +#define CLLADDR(s) ((const char *)LLADDR(s)) #define LLINDEX(s) ((s)->sdl_index) #ifdef _KERNEL From nobody Wed May 7 21:23:42 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zt7YB6WsYz5vJcL; Wed, 07 May 2025 21:23:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zt7YB5ztzz3XwF; Wed, 07 May 2025 21:23:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746653022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CHKPlmGl0qryydy0Zy5A6UiWHCJykUODBbjea0EodH8=; b=x4BZx6wSnW4eQ7QQ4k1l3sVARbG+UjRXVpMEAtCn6L5cZYpnmdZAFn32gbVHcNABQ5TT07 CLLpWlrIuUwC3iEGeZevQYfmliVipZ1KfdTgCaCnQ1okENPXDtOWexkydNNRHsa3p8gJ0T gn2srGSPi+K7qr2PryuTjpuMG/a2qJ6sK/hPVMy1G/Hoz44VMOgvaqErCFaE3s0bMnBNgW ZxTFfc2+UPzNTzFFQgmVd14mDTz3YLm0dNCeNiBJ07/F0OaHAqoQGOesXSEBNzee8hYjlh bCWEfyEVBMosvNckCSvkQ/Mdpy+knZdigZ3YmHu73XJVsPUgXr+TOVCbymP5iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746653022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CHKPlmGl0qryydy0Zy5A6UiWHCJykUODBbjea0EodH8=; b=A+Tvv0XKxm4HWSIBreuv7Fxgxyf37QAjz7Ro87TelIvh94hAZM67+1SBg3qU/HxF4+PelF i76dMj/6DPZgDE0A4OzyJHkqtgCO+PdfQvSKp5XbriqHxaxKQsNje1DFOg7wRmwHopau7v AJd6OGhhzoSnny9y0JRmwjuPTLT5y9gJ9unzqE2qit/M/eGDIyJkRif448dHcRsbLIYu8Q chpwLTeh15ZE5aAsocIVn8V6Os37/VrsFKR/dI0hQ1QMR4PnJNBOUm+ZwO1K59R1C3F3Yl OztFabW/uDk41gzsuBZumCDe5HRTYuUq/KkEWhYB5SQ4M9uYYUDi0y4xSuHB0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746653022; a=rsa-sha256; cv=none; b=acphWyfhPzgRRotc1A+B4r2If76FMqmljLiyfgc5G0bMuL/zL+14zocz1FfYBtk2qLXtEl YA6a+AzZFTRq0IOa/c2vWXrc/+A3LwWCj/Va+5E3hy6ifvQDp1TtmqDl4Mob7gPcuPivLu /vopdtAj8rMhsX8JAss1L+pplj+Wc7EoMoa7IRFZtZ21JU5sRVRjurIGdm2hwGolGcT29y dsJTY3qAQ1Eo8GmvdAJE3xMqyPMTxXsp0TeKT1kO+pLsfPsFzyWDFVCLy72VP647RyoAIv xvhgYBNT0KnJ8dcPPNRMAJ4xkAuvJG5ALR/tIReAA8XD6AuoGKcUNsYTAf6LoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zt7YB5LF6zmyl; Wed, 07 May 2025 21:23:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547LNgdD071669; Wed, 7 May 2025 21:23:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547LNg7x071666; Wed, 7 May 2025 21:23:42 GMT (envelope-from git) Date: Wed, 7 May 2025 21:23:42 GMT Message-Id: <202505072123.547LNg7x071666@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 73b29b47f75b - stable/14 - sys/net: add DOT1Q_VID_{MIN,MAX} List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 73b29b47f75b3a7565f7831ea020be3d51c4e542 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=73b29b47f75b3a7565f7831ea020be3d51c4e542 commit 73b29b47f75b3a7565f7831ea020be3d51c4e542 Author: Lexi Winter AuthorDate: 2025-04-15 16:13:33 +0000 Commit: Lexi Winter CommitDate: 2025-05-07 21:14:43 +0000 sys/net: add DOT1Q_VID_{MIN,MAX} add a new typedef in if_vlan_var.h to represent the lowest (1) and highest (4095) valid VLAN IDs in a .1q tag. change if_vlan to use DOT1Q_VID_MAX instead of a magic number. Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D49837 (cherry picked from commit c59492025073bd57c7dc3bb5bd843ab0a1391c7a) --- sys/net/if_vlan.c | 2 +- sys/net/if_vlan_var.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index c586b513e008..dce1cff5bc69 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1272,7 +1272,7 @@ vlan_clone_create_nl(struct if_clone *ifc, char *name, size_t len, error = nl_parse_nested(lattrs->ifla_idata, &vlan_parser, npt, &attrs); if (error != 0) return (error); - if (attrs.vlan_id > 4095) { + if (attrs.vlan_id > DOT1Q_VID_MAX) { nlmsg_report_err_msg(npt, "Invalid VID: %d", attrs.vlan_id); return (EINVAL); } diff --git a/sys/net/if_vlan_var.h b/sys/net/if_vlan_var.h index b86ff2efac60..e7171974289b 100644 --- a/sys/net/if_vlan_var.h +++ b/sys/net/if_vlan_var.h @@ -130,6 +130,8 @@ struct vlanreq { #define DOT1Q_VID_DEF_PVID 0x1 #define DOT1Q_VID_DEF_SR_PVID 0x2 #define DOT1Q_VID_RSVD_IMPL 0xfff +#define DOT1Q_VID_MIN 1 /* minimum valid vlan id */ +#define DOT1Q_VID_MAX 4095 /* maximum valid vlan id */ /* * 802.1q full tag. Proto and vid are stored in host byte order. From nobody Wed May 7 21:25:59 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zt7bq63R2z5vK66; Wed, 07 May 2025 21:25:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zt7bq5g7mz3ZmC; Wed, 07 May 2025 21:25:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746653159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fyIhCnANAJF+zSMdF9hBO7M87+rIRjXzfmeGG/33Ff8=; b=cyO3QpgotSP4VPFsiB3nduVoyz7XuogklQ6574wBsRM8E6wwPmubLfGspyBV71fFakKz3p N/NTaghe6b/XHZKaitFqu3alMCk93x8FksDexUMUgCmtr2BM1fZsWSOCcW+57zDrc9GFRD bdfNs3M1rNkpOlvzCkcHHYQfZr+eMlPW3r5Eo5ZQ4qnHxIK2K94ArLtrF56p8iOiVpck8n CNq9eWaUssLPcj0yi8v3qmzwTgL7KUyqsgUW2z3d5u9XJGShgh/qDe4aU2KxIr3XVFz89w yFH2xAtoAlzoFHPPSoMNOvohu4VAFDoGk9G/KIIqEaVdIzY2Q0qE5qrXjlyNcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746653159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fyIhCnANAJF+zSMdF9hBO7M87+rIRjXzfmeGG/33Ff8=; b=tcGoof2JxXAOsygcBonFyPpEdX55qNiiqx3qNmza738NYBZVDpdTMHKCCDDoO5F5jWYMnd wC9jOnDXJiWyMj+tvecQitxCuHepU/2NcrMvoSvTZj8nrYtm0iQAlaBmDv7lSfzVTR6XsX ujHPVP+eoASeu6el6LzwsVf2Wa/HJnrYUuvB02J2ovBBPhyfaJTz0v0bDkRxXJKgfnuVTP kHw74KZFWRRQzo31R8xQb7la+ixXwTqMgpJBc0TWZyXpfRLJCSwxew7mqXw+okHJXTziXi J64zO4+LWVLuKaQQUDTWPCh4rSBuB5b/eNS7HBxToDGGDj0CAhVdRkWInwZZ5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746653159; a=rsa-sha256; cv=none; b=qDrH0Pud4ZSgfoExol0TD7BUlFhdrSpRBBg1Ta93gsYxeXWpg4LmILxfdFnwoY2uzIyi0Q chiQfGbECHXjcM9zfzLBB12OH9EqeHnlg3RuN/74pgyJEWFJJJgLT/PA84e3QiahWrHmQM oUkSXyIzB8I7EYGYVzbNmfRPqi8BkBA+5MfoOg8X9+PCF9fS64E4SUS8aVfKXYPn//mUGx 8xjU6mC/wwAh9dZWN7ydN5QlSAc23k1XWTqqAWkMzc7oGo3YN+Vaha0350LiDR0jRaxnJN 8u3OZr/Q7wXohtacL+K+ZS/W1kAiSxsRg7YjH9WQPO93ti1GkzNwGGAuojv6Cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zt7bq4qTPzmsy; Wed, 07 May 2025 21:25:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547LPxjB072503; Wed, 7 May 2025 21:25:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547LPxS5072496; Wed, 7 May 2025 21:25:59 GMT (envelope-from git) Date: Wed, 7 May 2025 21:25:59 GMT Message-Id: <202505072125.547LPxS5072496@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 346bb5d3fe19 - stable/13 - MFV: xz 5.8.1. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 346bb5d3fe19024e48976cd4705f45ab60cb9faf Auto-Submitted: auto-generated The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=346bb5d3fe19024e48976cd4705f45ab60cb9faf commit 346bb5d3fe19024e48976cd4705f45ab60cb9faf Author: Xin LI AuthorDate: 2025-05-04 07:06:22 +0000 Commit: Xin LI CommitDate: 2025-05-07 21:23:44 +0000 MFV: xz 5.8.1. PR: bin/286252 (cherry picked from commit 128836d304d93f2d00eb14069c27089ab46c38d4) --- contrib/xz/AUTHORS | 2 +- contrib/xz/COPYING | 25 +- contrib/xz/ChangeLog | 6031 +++++++++++++++----- contrib/xz/README | 107 +- contrib/xz/THANKS | 37 + contrib/xz/TODO | 25 +- contrib/xz/src/common/my_landlock.h | 141 + contrib/xz/src/common/sysdefs.h | 58 +- contrib/xz/src/common/tuklib_common.h | 11 +- contrib/xz/src/common/tuklib_gettext.h | 11 + contrib/xz/src/common/tuklib_mbstr.h | 25 +- contrib/xz/src/common/tuklib_mbstr_nonprint.c | 162 + contrib/xz/src/common/tuklib_mbstr_nonprint.h | 71 + contrib/xz/src/common/tuklib_mbstr_width.c | 34 +- contrib/xz/src/common/tuklib_mbstr_wrap.c | 294 + contrib/xz/src/common/tuklib_mbstr_wrap.h | 204 + contrib/xz/src/common/tuklib_physmem.c | 11 +- contrib/xz/src/liblzma/api/lzma/bcj.h | 97 + contrib/xz/src/liblzma/api/lzma/container.h | 2 +- contrib/xz/src/liblzma/api/lzma/lzma12.h | 2 +- contrib/xz/src/liblzma/api/lzma/version.h | 4 +- contrib/xz/src/liblzma/check/check.h | 18 - contrib/xz/src/liblzma/check/crc32_arm64.h | 55 +- contrib/xz/src/liblzma/check/crc32_fast.c | 46 +- contrib/xz/src/liblzma/check/crc32_loongarch.h | 65 + contrib/xz/src/liblzma/check/crc32_small.c | 3 + contrib/xz/src/liblzma/check/crc32_table.c | 42 - contrib/xz/src/liblzma/check/crc32_x86.S | 14 +- contrib/xz/src/liblzma/check/crc64_fast.c | 39 +- contrib/xz/src/liblzma/check/crc64_table.c | 37 - contrib/xz/src/liblzma/check/crc64_x86.S | 14 +- .../xz/src/liblzma/check/crc_clmul_consts_gen.c | 160 + contrib/xz/src/liblzma/check/crc_common.h | 111 +- contrib/xz/src/liblzma/check/crc_x86_clmul.h | 519 +- contrib/xz/src/liblzma/common/alone_decoder.c | 3 +- contrib/xz/src/liblzma/common/auto_decoder.c | 5 +- contrib/xz/src/liblzma/common/block_decoder.c | 6 +- contrib/xz/src/liblzma/common/block_encoder.c | 6 +- contrib/xz/src/liblzma/common/common.c | 8 +- contrib/xz/src/liblzma/common/file_info.c | 22 +- contrib/xz/src/liblzma/common/index_decoder.c | 9 +- contrib/xz/src/liblzma/common/index_encoder.c | 6 +- contrib/xz/src/liblzma/common/index_hash.c | 7 +- contrib/xz/src/liblzma/common/lzip_decoder.c | 14 +- contrib/xz/src/liblzma/common/memcmplen.h | 12 +- contrib/xz/src/liblzma/common/stream_decoder.c | 16 +- contrib/xz/src/liblzma/common/stream_decoder_mt.c | 140 +- contrib/xz/src/liblzma/common/stream_encoder_mt.c | 10 +- contrib/xz/src/liblzma/common/string_conversion.c | 99 +- contrib/xz/src/liblzma/liblzma_generic.map | 10 + contrib/xz/src/liblzma/liblzma_linux.map | 10 + contrib/xz/src/liblzma/lz/lz_decoder.c | 21 +- contrib/xz/src/liblzma/lz/lz_decoder.h | 103 +- contrib/xz/src/liblzma/lz/lz_encoder.c | 2 +- contrib/xz/src/liblzma/lz/lz_encoder_hash.h | 30 +- contrib/xz/src/liblzma/lzma/lzma2_encoder.c | 9 +- contrib/xz/src/liblzma/lzma/lzma_decoder.c | 2 +- contrib/xz/src/liblzma/simple/arm.c | 4 +- contrib/xz/src/liblzma/simple/arm64.c | 22 +- contrib/xz/src/liblzma/simple/armthumb.c | 7 +- contrib/xz/src/liblzma/simple/ia64.c | 4 +- contrib/xz/src/liblzma/simple/powerpc.c | 4 +- contrib/xz/src/liblzma/simple/riscv.c | 18 + contrib/xz/src/liblzma/simple/sparc.c | 5 +- contrib/xz/src/liblzma/simple/x86.c | 24 + contrib/xz/src/lzmainfo/lzmainfo.c | 52 +- contrib/xz/src/xz/args.c | 41 +- contrib/xz/src/xz/args.h | 2 +- contrib/xz/src/xz/coder.c | 28 +- contrib/xz/src/xz/file_io.c | 260 +- contrib/xz/src/xz/file_io.h | 10 +- contrib/xz/src/xz/list.c | 39 +- contrib/xz/src/xz/main.c | 10 +- contrib/xz/src/xz/message.c | 506 +- contrib/xz/src/xz/options.c | 15 +- contrib/xz/src/xz/private.h | 1 + contrib/xz/src/xz/sandbox.c | 78 +- contrib/xz/src/xz/suffix.c | 12 +- contrib/xz/src/xz/util.c | 10 +- contrib/xz/src/xz/xz.1 | 94 +- contrib/xz/src/xzdec/xzdec.c | 75 +- lib/liblzma/Makefile | 9 +- lib/liblzma/Symbol.map | 9 + lib/liblzma/Versions.def | 5 +- lib/liblzma/config.h | 18 +- usr.bin/lzmainfo/Makefile | 5 +- usr.bin/xz/Makefile | 4 +- usr.bin/xzdec/Makefile | 3 +- 88 files changed, 7849 insertions(+), 2552 deletions(-) diff --git a/contrib/xz/AUTHORS b/contrib/xz/AUTHORS index 5eff238ae413..f805a204ecb7 100644 --- a/contrib/xz/AUTHORS +++ b/contrib/xz/AUTHORS @@ -24,7 +24,7 @@ Authors of XZ Utils by Michał Górny. Architecture-specific CRC optimizations were contributed by - Ilya Kurdyukov, Hans Jansen, and Chenxi Mao. + Ilya Kurdyukov, Chenxi Mao, and Xi Ruoyao. Other authors: - Jonathan Nieder diff --git a/contrib/xz/COPYING b/contrib/xz/COPYING index aed21531497c..ef3371389d7d 100644 --- a/contrib/xz/COPYING +++ b/contrib/xz/COPYING @@ -40,6 +40,12 @@ XZ Utils Licensing free software licenses. These aren't built or installed as part of XZ Utils. + The following command may be helpful in finding per-file license + information. It works on xz.git and on a clean file tree extracted + from a release tarball. + + sh build-aux/license-check.sh -v + For the files under the BSD Zero Clause License (0BSD), if a copyright notice is needed, the following is sufficient: @@ -59,25 +65,6 @@ XZ Utils Licensing - COPYING.GPLv2: GNU General Public License version 2 - COPYING.GPLv3: GNU General Public License version 3 - A note about old XZ Utils releases: - - XZ Utils releases 5.4.6 and older and 5.5.1alpha have a - significant amount of code put into the public domain and - that obviously remains so. The switch from public domain to - 0BSD for newer releases was made in Febrary 2024 because - public domain has (real or perceived) legal ambiguities in - some jurisdictions. - - There is very little *practical* difference between public - domain and 0BSD. The main difference likely is that one - shouldn't claim that 0BSD-licensed code is in the public - domain; 0BSD-licensed code is copyrighted but available under - an extremely permissive license. Neither 0BSD nor public domain - require retaining or reproducing author, copyright holder, or - license notices when distributing the software. (Compare to, - for example, BSD 2-Clause "Simplified" License which does have - such requirements.) - If you have questions, don't hesitate to ask for more information. The contact information is in the README file. diff --git a/contrib/xz/ChangeLog b/contrib/xz/ChangeLog index 2d36d7bb1043..577dce5e12a2 100644 --- a/contrib/xz/ChangeLog +++ b/contrib/xz/ChangeLog @@ -1,834 +1,4468 @@ -commit 9331ce4009ddc839f5191d234cc41b2d4797376d +commit a522a226545730551f7e7c2685fab27cf567746c Author: Lasse Collin -Date: 2024-10-01 12:21:22 +0300 +Date: 2025-04-03 14:34:43 +0300 - Bump version and soname for 5.6.3 + Bump version and soname for 5.8.1 src/liblzma/Makefile.am | 2 +- src/liblzma/api/lzma/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -commit f52857ffde768058db0e0e13f68a2660ca9f1330 +commit 1c462c2ad86ff85766928638431029cd0b0dc995 Author: Lasse Collin -Date: 2024-10-01 12:17:39 +0300 +Date: 2025-04-03 14:34:43 +0300 - Add NEWS for 5.6.3 + Add NEWS for 5.8.1 - NEWS | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 125 insertions(+) + NEWS | 30 ++++++++++++++++++++++++++++++ + 1 file changed, 30 insertions(+) -commit b8f52990b5d47a50902bf33cd2305ce985457bac +commit 513cabcf7f5ce1c3ed0619e791393fc53d1dbbd0 Author: Lasse Collin -Date: 2024-10-01 12:10:23 +0300 +Date: 2025-04-03 14:34:43 +0300 - Update THANKS + Tests: Call lzma_code() in smaller chunks in fuzz_common.h - (cherry picked from commit 1ebbe915d4e0d877154261b5f8103719a6722975) + This makes it easy to crash fuzz_decode_stream_mt when tested + against the code from 5.8.0. + + Obviously this might make it harder to reach some other code path now. + The previous code has been in use since 2018 when fuzzing was added + in 106d1a663d4b ("Tests: Add a fuzz test program and a config file + for OSS-Fuzz."). - THANKS | 2 ++ - 1 file changed, 2 insertions(+) + tests/ossfuzz/fuzz_common.h | 31 ++++++++++++++++++++++++------- + 1 file changed, 24 insertions(+), 7 deletions(-) -commit 51f6f455873911894f155e6997bc23a9be8f42ba +commit 48440e24a25911ae59e8518b67a1e0f6f1c293bf Author: Lasse Collin -Date: 2024-10-01 12:10:23 +0300 +Date: 2025-04-03 14:34:43 +0300 - Tests/Windows: Add the application manifest to the test programs - - This ensures that the test programs get executed the same way as - the binaries that are installed. + Tests: Add a fuzzing target for the multithreaded .xz decoder - (cherry picked from commit 74702ee00ecfd080d8ab11118cd25dbe6c437ec0) + It doesn't seem possible to trigger the CVE-2025-31115 bug with this + fuzzing target at the moment. It's because the code in fuzz_common.h + passes the whole input buffer to lzma_code() at once. - CMakeLists.txt | 14 ++++++++++---- - tests/Makefile.am | 10 ++++++++++ - tests/tests.cmake | 33 ++++++++++++++++++++++++++++++++- - tests/tests_w32res.rc | 18 ++++++++++++++++++ - 4 files changed, 70 insertions(+), 5 deletions(-) + tests/ossfuzz/fuzz_decode_stream_mt.c | 47 +++++++++++++++++++++++++++++++++++ + 1 file changed, 47 insertions(+) -commit bf518b9ba446327a062ddfe67e7e0a5baed2394f +commit 0c80045ab82c406858d9d5bcea9f48ebc3d0a81d Author: Lasse Collin -Date: 2024-10-01 12:10:23 +0300 +Date: 2025-04-03 14:34:42 +0300 - Windows: Embed an application manifest in the EXE files - - IMPORTANT: This includes a security fix to command line tool - argument handling. - - Some toolchains embed an application manifest by default to declare - UAC-compliance. Some also declare compatibility with Vista/8/8.1/10/11 - to let the app access features newer than those of Vista. - - We want all the above but also two more things: - - - Declare that the app is long path aware to support paths longer - than 259 characters (this may also require a registry change). - - - Force the code page to UTF-8. This allows the command line tools - to access files whose names contain characters that don't exist - in the current legacy code page (except unpaired surrogates). - The UTF-8 code page also fixes security issues in command line - argument handling which can be exploited with malicious filenames. - See the new file w32_application.manifest.comments.txt. + liblzma: mt dec: Fix lack of parallelization in single-shot decoding - Thanks to Orange Tsai and splitline from DEVCORE Research Team - for discovering this issue. - - Thanks to Vijay Sarvepalli for reporting the issue to me. + Single-shot decoding means calling lzma_code() by giving it the whole + input at once and enough output buffer space to store the uncompressed + data, and combining this with LZMA_FINISH and no timeout + (lzma_mt.timeout = 0). This way the file is decoded with a single + lzma_code() call if possible. - Thanks to Kelvin Lee for testing with MSVC and helping with - the required build system fixes. + The bug prevented the decoder from starting more than one worker thread + in single-shot mode. The issue was noticed when reviewing the code; + there are no bug reports. Thus maybe few have tried this mode. - (cherry picked from commit 46ee0061629fb075d61d83839e14dd193337af59) + Fixes: 64b6d496dc81 ("liblzma: Threaded decoder: Always wait for output if LZMA_FINISH is used.") - CMakeLists.txt | 18 +++ - src/Makefile.am | 4 +- - src/common/common_w32res.rc | 5 + - src/common/w32_application.manifest | 28 ++++ - src/common/w32_application.manifest.comments.txt | 178 +++++++++++++++++++++++ - 5 files changed, 232 insertions(+), 1 deletion(-) + src/liblzma/common/stream_decoder_mt.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) -commit 5718ce932e6ad4262d5fffc9e2a7a838f963d7e5 +commit 8188048854e8d11071b8a50d093c74f4c030acc9 Author: Lasse Collin -Date: 2024-09-29 14:46:52 +0300 +Date: 2025-04-03 14:34:42 +0300 - Windows: Set DLL name accurately in StringFileInfo on Cygwin and MSYS2 + liblzma: mt dec: Don't modify thr->in_size in the worker thread - Now the information in the "Details" tab in the file properties - dialog matches the naming convention of Cygwin and MSYS2. This - is only a cosmetic change. + Don't set thr->in_size = 0 when returning the thread to the stack of + available threads. Not only is it useless, but the main thread may + read the value in SEQ_BLOCK_THR_RUN. With valid inputs, it made + no difference if the main thread saw the original value or 0. With + invalid inputs (when worker thread stops early), thr->in_size was + no longer modified after the previous commit with the security fix + ("Don't free the input buffer too early"). - (cherry picked from commit dad153091552b52a41b95ec4981c6951f1cae487) + So while the bug appears harmless now, it's important to fix it because + the variable was being modified without proper locking. It's trivial + to fix because there is no need to change the value. Only main thread + needs to set the value in (in SEQ_BLOCK_THR_INIT) when starting a new + Block before the worker thread is activated. + + Fixes: 4cce3e27f529 ("liblzma: Add threaded .xz decompressor.") + Reviewed-by: Sebastian Andrzej Siewior + Thanks-to: Sam James - src/liblzma/liblzma_w32res.rc | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) + src/liblzma/common/stream_decoder_mt.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) -commit e77c0ca61d12ebac433b7661840cb18d7031700a +commit d5a2ffe41bb77b918a8c96084885d4dbe4bf6480 Author: Lasse Collin -Date: 2024-09-25 15:47:55 +0300 +Date: 2025-04-03 14:34:42 +0300 - common_w32res.rc: White space edits + liblzma: mt dec: Don't free the input buffer too early (CVE-2025-31115) - LANGUAGE and VS_VERSION_INFO begin new statements so put an empty line - between them. + The input buffer must be valid as long as the main thread is writing + to the worker-specific input buffer. Fix it by making the worker + thread not free the buffer on errors and not return the worker thread to + the pool. The input buffer will be freed when threads_end() is called. - (cherry picked from commit 8940ecb96fe9f0f2a9cfb8b66fe9ed31ffbea904) - - src/common/common_w32res.rc | 15 ++++++++------- - 1 file changed, 8 insertions(+), 7 deletions(-) - -commit e0ba0f26d9f3f53cedc92fb13303924c39d00392 -Author: Lasse Collin -Date: 2024-09-28 20:09:50 +0300 - - CMake: Add the resource files to the Cygwin and MSYS2 builds + With invalid input, the bug could at least result in a crash. The + effects include heap use after free and writing to an address based + on the null pointer plus an offset. - Autotools-based build has always done this so this is for consistency. + The bug has been there since the first committed version of the threaded + decoder and thus affects versions from 5.3.3alpha to 5.8.0. - However, the CMake build won't create the DEF file when building - for Cygwin or MSYS2 because in that context it should be useless. - (If Cygwin or MSYS2 is used to host building of normal Windows - binaries then the DEF file is still created.) + As the commit message in 4cce3e27f529 says, I had made significant + changes on top of Sebastian's patch. This bug was indeed introduced + by my changes; it wasn't in Sebastian's version. + + Thanks to Harri K. Koskinen for discovering and reporting this issue. - (cherry picked from commit c3b9dad07d3fd9319f88386b7095019bcea45ce1) + Fixes: 4cce3e27f529 ("liblzma: Add threaded .xz decompressor.") + Reported-by: Harri K. Koskinen + Reviewed-by: Sebastian Andrzej Siewior + Thanks-to: Sam James - CMakeLists.txt | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) + src/liblzma/common/stream_decoder_mt.c | 31 ++++++++++++++++++++++--------- + 1 file changed, 22 insertions(+), 9 deletions(-) -commit 69637d0c323c0d7d9619cff637c7ce97dabc4f02 +commit c0c835964dfaeb2513a3c0bdb642105152fe9f34 Author: Lasse Collin -Date: 2024-09-28 15:19:14 +0300 +Date: 2025-04-03 14:34:42 +0300 - CMake: Fix Windows resource file dependencies + liblzma: mt dec: Simplify by removing the THR_STOP state - If common_w32res.rc is modified, the resource files need to be rebuilt. - In contrast, the liblzma*.map files truly are link dependencies. + The main thread can directly set THR_IDLE in threads_stop() which is + called when errors are detected. threads_stop() won't return the stopped + threads to the pool or free the memory pointed by thr->in anymore, but + it doesn't matter because the existing workers won't be reused after + an error. The resources will be cleaned up when threads_end() is + called (reinitializing the decoder always calls threads_end()). - (cherry picked from commit da4f275bd1c18b897e5c2dd0043546de3accce0a) + Reviewed-by: Sebastian Andrzej Siewior + Thanks-to: Sam James - CMakeLists.txt | 17 +++++++++-------- - 1 file changed, 9 insertions(+), 8 deletions(-) + src/liblzma/common/stream_decoder_mt.c | 75 +++++++++++++--------------------- + 1 file changed, 29 insertions(+), 46 deletions(-) -commit af8533459c60d7bc5b55f2f516251af4572169e4 +commit 831b55b971cf579ee16a854f177c36b20d3c6999 Author: Lasse Collin -Date: 2024-09-29 01:20:03 +0300 +Date: 2025-04-03 14:34:42 +0300 - CMake: Checking for CYGWIN covers MSYS2 too - - On MSYS2, both CYGWIN and MSYS are set. + liblzma: mt dec: Fix a comment - (cherry picked from commit 1c673c0aac7f7dee8dda2c1140351c8417a71e47) + Reviewed-by: Sebastian Andrzej Siewior + Thanks-to: Sam James - CMakeLists.txt | 2 +- + src/liblzma/common/stream_decoder_mt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit eca08e4c204db404911e513f95110dcb0fb919bd +commit b9d168eee4fb6393b4fe207c0aeb5faee316ca1a Author: Lasse Collin -Date: 2024-09-28 09:37:30 +0300 +Date: 2025-04-03 14:34:30 +0300 - Translations: Add the SPDX license identifier to pt_BR.po - - (cherry picked from commit 6aaa0173b839e28429d43a8b62d257ad2f3b4521) + liblzma: Add assertions to lzma_bufcpy() - po/pt_BR.po | 2 ++ - 1 file changed, 2 insertions(+) + src/liblzma/common/common.c | 6 ++++++ + 1 file changed, 6 insertions(+) -commit 85801c96c32456300177fbbad1506b07f5dd0a47 +commit c8e0a4897b4d0f906966f5d4d4f662221d64f3ae Author: Lasse Collin -Date: 2024-09-25 16:41:37 +0300 +Date: 2025-04-02 16:40:22 +0300 - Windows/CMake: Use the correct resource file for lzmadec.exe - - CMakeLists.txt was using xzdec_w32res.rc for both xzdec and lzmadec. - - Fixes: 998d0b29536094a89cf385a3b894e157db1ccefe - (cherry picked from commit dc7b9f24b737e4e55bcbbdde6754883f991c2cfb) + DOS: Update Makefile to fix the build - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + dos/Makefile | 2 ++ + 1 file changed, 2 insertions(+) -commit a341d19c835a8c10fcf561b00b548c53af43381e +commit 307c02ed698a69763ef1c9c0df4ff24727442118 Author: Lasse Collin -Date: 2024-09-25 21:29:59 +0300 +Date: 2025-03-29 12:41:32 +0200 - Translations: Update the Brazilian Portuguese translation + sysdefs.h: Avoid even with C11 compilers + + Oracle Developer Studio 12.6 on Solaris 10 claims C11 support in + __STDC_VERSION__ and supports _Alignas. However, is missing. + We only need alignas, so define it to _Alignas with C11/C17 compilers. + If something included later, it shouldn't cause problems. - (cherry picked from commit b834ae5f80911a3819d6cdb484f61b257174c544) + Thanks to Ihsan Dogan for reporting the issue and testing the fix. + + Fixes: c0e7eaae8d6eef1e313c9d0da20ccf126ec61f38 - po/pt_BR.po | 144 ++++++++++++++++++++++-------------------------------------- - 1 file changed, 53 insertions(+), 91 deletions(-) + src/common/sysdefs.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) -commit e69c0b9b2e00ade984393ef9cabac57342072328 +commit 7ce38b318339d6c01378a77585e08169ca3a604e Author: Lasse Collin -Date: 2024-09-17 01:21:15 +0300 +Date: 2025-03-29 12:32:05 +0200 Update THANKS - - (cherry picked from commit eceb023d4c129fd63ee881a2d8696eaf52ad1532) THANKS | 1 + 1 file changed, 1 insertion(+) -commit aef9a25b3200457c16846b046222fb2c7967afe0 -Author: Tobias Stoeckmann -Date: 2024-09-16 23:19:46 +0200 +commit 688e51bde4c987589717b2be1a1fde9576c604fc +Author: Lasse Collin +Date: 2025-03-29 12:21:51 +0200 - lzmainfo: Avoid integer overflow - - The MB output can overflow with huge numbers. Most likely these are - invalid .lzma files anyway, but let's avoid garbage output. - - lzmadec was adapted from LZMA Utils. The original code with this bug - was written in 2005, over 19 years ago. - - Co-authored-by: Lasse Collin - Closes: https://github.com/tukaani-project/xz/pull/144 - (cherry picked from commit 76cfd0a9bb33ae8e534b1f73f6359dc825589f2f) + Translations: Update the Croatian translation - src/lzmainfo/lzmainfo.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) + po/hr.po | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) -commit 40a7f163f56aca6b3c8b83e9382f5e5cb4f8e93b -Author: Tobias Stoeckmann -Date: 2024-09-16 22:04:40 +0200 +commit 173fb5c68b08a8c1369550267be258132b7760c6 +Author: Lasse Collin +Date: 2025-03-25 18:23:57 +0200 - xzdec: Remove unused short option -M - - "xzdec -M123" exited with exit status 1 without printing - any messages. The "M:" entry should have been removed when - the memory usage limiter support was removed from xzdec. - - Fixes: 792331bdee706aa852a78b171040ebf814c6f3ae - Closes: https://github.com/tukaani-project/xz/pull/143 - [ Lasse: Commit message edits ] - - (cherry picked from commit 78355aebb7fb654302e5e33692ba109909dacaff) + doc/SHA256SUMS: Add 5.8.0 - src/xzdec/xzdec.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + doc/SHA256SUMS | 6 ++++++ + 1 file changed, 6 insertions(+) -commit c98714a57058ac381365c2ff1e1d1cd63a5742c4 +commit db9258e828bc2cd96e3954f1ddcc9d3530589025 Author: Lasse Collin -Date: 2024-09-10 13:54:47 +0300 +Date: 2025-03-25 15:18:32 +0200 - Update THANKS + Bump version and soname for 5.8.0 - (cherry picked from commit e5758db7bd75587a2499e0771907521a4aa86908) + Also remove the LZMA_UNSTABLE macro. - THANKS | 1 + - 1 file changed, 1 insertion(+) + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/bcj.h | 2 -- + src/liblzma/api/lzma/version.h | 6 +++--- + src/liblzma/common/common.h | 2 -- + src/liblzma/liblzma_generic.map | 2 +- + src/liblzma/liblzma_linux.map | 2 +- + 6 files changed, 6 insertions(+), 10 deletions(-) -commit 4ed449517817b3659b35d19f39703e3c460f46c2 -Author: Firas Khalil Khana -Date: 2024-09-10 12:30:32 +0300 +commit bfb752a38f89ed03fc93d54f11c09f43fda64bc2 +Author: Lasse Collin +Date: 2025-03-25 15:18:32 +0200 - Build: Fix a typo in autogen.sh - - Fixes: e9be74f5b129fe8a5388d588e68b1b7f5168a310 - Closes: https://github.com/tukaani-project/xz/pull/141 - (cherry picked from commit 80ffa38f56657257ed4d90d76f6bd2f2bcb8163c) + Add NEWS for 5.8.0 - autogen.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + NEWS | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 62 insertions(+) -commit 3b83577a1547e72cb78a905ad3d308a799ded485 +commit 6ccbb904da851eb0c174c8dbd43e84da31739720 Author: Lasse Collin -Date: 2024-09-02 20:08:40 +0300 +Date: 2025-03-25 15:18:31 +0200 - Translations: Update Chinese (simplified) translation - - Differences to the zh_CN.po file from the Translation Project: - - - Two uses of \v were fixed. + Translations: Run "make -C po update-po" - - Missing "OPTS" translation in --riscv[=OPTS] was copied from - previous lines. + POT-Creation-Date is set to match the timestamp in 5.7.2beta which + in the Translation Project is known as 5.8.0-pre1. The strings + haven't changed since 5.7.1alpha but a few comments have. + + This is a very noisy commit, but this helps keeping the PO files + similar between the Git repository and stable release tarballs. + + po/ca.po | 964 ++++++++++++++++++++++++++++++++++++++++++++--------------- + po/cs.po | 935 ++++++++++++++++++++++++++++++++++++++++++---------------- + po/da.po | 663 ++++++++++++++++++++++++++++++----------- + po/de.po | 7 +- + po/eo.po | 966 +++++++++++++++++++++++++++++++++++++++++++++--------------- + po/es.po | 7 +- + po/fi.po | 2 +- + po/fr.po | 916 +++++++++++++++++++++++++++++++++++++++++--------------- + po/hu.po | 966 +++++++++++++++++++++++++++++++++++++++++++++--------------- + po/ka.po | 7 +- + po/ko.po | 7 +- + po/nl.po | 7 +- + po/pl.po | 7 +- + po/pt_BR.po | 962 ++++++++++++++++++++++++++++++++++++++++++++--------------- + po/sr.po | 2 +- + po/sv.po | 7 +- + po/tr.po | 7 +- + po/uk.po | 7 +- + po/vi.po | 948 +++++++++++++++++++++++++++++++++++++++++++--------------- + po/zh_CN.po | 940 ++++++++++++++++++++++++++++++++++++++++++++-------------- + po/zh_TW.po | 2 +- + 21 files changed, 6209 insertions(+), 2120 deletions(-) + +commit 891a5f057a6bb2dd2e3ce5e3bdd7a1f1ee03b800 +Author: Lasse Collin +Date: 2025-03-25 15:18:31 +0200 + + Translations: Run po4a/update-po - - "make update-po" was run to remove line numbers from comments. + Also remove the trivial obsolete messages like man page dates. - (cherry picked from commit 68c54e45d042add64a4cb44bfc87ca74d29b87e2) + This is a noisy commit, but this helps keeping the PO files similar + between the Git repository and stable release tarballs. - po/zh_CN.po | 102 ++++++++++++++++++++++++------------------------------------ - 1 file changed, 40 insertions(+), 62 deletions(-) + po4a/fr.po | 82 +++++++++++++++++++++++++++++++++++++------------------ + po4a/pt_BR.po | 88 +++++++++++++++++++++++++++++++++++++++++------------------ + po4a/sr.po | 79 ++++++++++++++++++++++++++++++++++------------------- + 3 files changed, 167 insertions(+), 82 deletions(-) -commit 06f4c7edda0387eb6a2d6303804b59dcf4d3db1f +commit 4f52e7387012cb3510b01c937dd9b3a0c6a3ac6c Author: Lasse Collin -Date: 2024-09-02 19:40:50 +0300 +Date: 2025-03-25 15:18:31 +0200 - Translations: Update the Catalan translation - - Differences to the ca.po file from the Translation Project: - - - An overlong line translating --filters-help was wrapped. - - - "make update-po" was used to remove line numbers from the comments - to match the changes in fccebe2b4fd513488fc920e4dac32562ed3c7637 - and 093490b58271e9424ce38a7b1b38bcf61b9c86c6. xz.pot in the TP - is older than these commits. + Translations: Partially fix overtranslation in Serbian man pages - (cherry picked from commit 2230692aa1bcebb586100183831e3daf1714d60a) + Names of environment variables and some other strings must be present + in the original form. The translator couldn't be reached so I'm + changing some of the strings myself. In the "Robot mode" section, + occurrences in the middle of sentences weren't changed to reduce + the chance of grammar breakage, but I kept the translated strings in + parenthesis in the headings. It's not ideal, but now people shouldn't + need to look at the English man page to find the English strings. - po/ca.po | 171 ++++++++++++++++++++++++++------------------------------------- - 1 file changed, 69 insertions(+), 102 deletions(-) + po4a/sr.po | 66 ++++++++++++++++++++++++++++++++++++++++++-------------------- + 1 file changed, 45 insertions(+), 21 deletions(-) -commit 406cb5b669e47c0e45c98f1afb7be998084a93d0 +commit ff5d944749b99eb5ab35e2ebaf01d05a59e7169b Author: Lasse Collin -Date: 2024-08-22 11:01:07 +0300 +Date: 2025-03-25 15:18:31 +0200 - Update THANKS - - (cherry picked from commit 5e375987509fab484b7bef0b90be92f241c58c91) + liblzma: Count the extra bytes in LZMA/LZMA2 decoder memory usage - THANKS | 1 + - 1 file changed, 1 insertion(+) + src/liblzma/lz/lz_decoder.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) -commit 3a4a05d75eb41ddc41899324df0511670ceaaf1e -Author: Yifeng Li -Date: 2024-08-22 02:18:49 +0000 +commit 943b012d09f717f7b44284c4e4976ea41264c731 +Author: Lasse Collin +Date: 2025-03-25 15:18:31 +0200 - liblzma: Fix x86-64 movzw compatibility in range_decoder.h + liblzma: Use SSE2 intrinsics instead of memcpy() in dict_repeat() - Support for instruction "movzw" without suffix in "GNU as" was - added in commit [1] and stabilized in binutils 2.27, released - in August 2016. Earlier systems don't accept this instruction - without a suffix, making range_decoder.h's inline assembly - unable to build on old systems such as Ubuntu 16.04, creating - error messages like: + SSE2 is supported on every x86-64 processor. The SSE2 code is used on + 32-bit x86 if compiler options permit unconditional use of SSE2. - lzma_decoder.c: Assembler messages: - lzma_decoder.c:371: Error: no such instruction: `movzw 2(%r11),%esi' - lzma_decoder.c:373: Error: no such instruction: `movzw 4(%r11),%edi' - lzma_decoder.c:388: Error: no such instruction: `movzw 6(%r11),%edx' - lzma_decoder.c:398: Error: no such instruction: `movzw (%r11,%r14,4),%esi' + dict_repeat() copies short random-sized unaligned buffers. At least + on glibc, FreeBSD, and Windows (MSYS2, UCRT, MSVCRT), memcpy() is + clearly faster than byte-by-byte copying in this use case. Compared + to the memcpy() version, the new SSE2 version reduces decompression + time by 0-5 % depending on the machine and libc. It should never be + slower than the memcpy() version. - Change "movzw" to "movzwl" for compatibility. + However, on musl 1.2.5 on x86-64, the memcpy() version is the slowest. + Compared to the memcpy() version: - [1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=c07315e0c610e0e3317b4c02266f81793df253d2 + - The byte-by-version takes 6-7 % less time to decompress. + - The SSE2 version takes 16-18 % less time to decompress. - Suggested-by: Lasse Collin - Tested-by: Yifeng Li - Signed-off-by: Yifeng Li - Fixes: 3182a330c1512cc1f5c87b5c5a272578e60a5158 - Fixes: https://github.com/tukaani-project/xz/issues/121 - Closes: https://github.com/tukaani-project/xz/pull/136 - (cherry picked from commit 6cd7c8607843c337edfe2c472aa316602a393754) + The numbers are from decompressing a Linux kernel source tarball in + single-threaded mode on older AMD and Intel systems. The tarball + compresses well, and thus dict_repeat() performance matters more + than with some other files. - src/liblzma/rangecoder/range_decoder.h | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) + src/liblzma/lz/lz_decoder.c | 14 ++++++-- + src/liblzma/lz/lz_decoder.h | 87 ++++++++++++++++++++++++++++++++++++++++----- + 2 files changed, 90 insertions(+), 11 deletions(-) -commit 4669f06d1a8d31de4b8b5861b5e8afd82cacd721 +commit bc14e4c94e788d42eeab984298391fc0ca46f969 Author: Lasse Collin -Date: 2024-07-19 20:02:43 +0300 +Date: 2025-03-25 15:18:31 +0200 - Build: Comment that elf_aux_info(3) will be available on OpenBSD >= 7.6 + liblzma: Add "restrict" to a few functions in lz_decoder.h + + This doesn't make any difference in practice because compilers can + already see that writing through the dict->buf pointer cannot modify + the contents of *dict itself: The LZMA decoder makes a local copy of + the lzma_dict structure, and even if it didn't, the pointer to + lzma_dict in the LZMA decoder is already "restrict". - (cherry picked from commit bf901dee5d4c46609645e50311c0cb2dfdcf9738) + It's nice to add "restrict" anyway. uint8_t is typically unsigned char + which can alias anything. Without the above conditions or "restrict", + compilers could need to assume that writing through dict->buf might + modify *dict. This would matter in dict_repeat() because the loops + refer to dict->buf and dict->pos instead of making local copies of + those members for the duration of the loops. If compilers had to + assume that writing through dict->buf can affect *dict, then compilers + would need to emit code that reloads dict->buf and dict->pos after + every write through dict->buf. - CMakeLists.txt | 2 +- - configure.ac | 17 +++++++++++------ - 2 files changed, 12 insertions(+), 7 deletions(-) + src/liblzma/lz/lz_decoder.h | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) -commit 9edddda5636d7b3504a033c31e8ea763e293fd35 +commit e82ee090c567e560f51a056775a17f534d159d65 Author: Lasse Collin -Date: 2024-07-13 22:10:37 +0300 +Date: 2025-03-25 15:18:30 +0200 - liblzma: Tweak a comment + liblzma: Define LZ_DICT_INIT_POS for initial dictionary position - (cherry picked from commit 7c292dd0bf23cefcdf4b1509f3666322e08a7ede) + It's more readable. - src/liblzma/simple/arm64.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + src/liblzma/lz/lz_decoder.c | 4 ++-- + src/liblzma/lz/lz_decoder.h | 9 ++++++--- + 2 files changed, 8 insertions(+), 5 deletions(-) -commit 1a93ab55d1563f5eb9b2c1b8240384046fe4bb97 +commit 8e7cd0091e5239334437decbe1989662d45a2f47 Author: Lasse Collin -Date: 2024-07-11 22:17:56 +0300 +Date: 2025-03-25 15:18:30 +0200 - CMake: Bump maximum policy version to 3.30 + Windows: Update README-Windows.txt about UCRT - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + windows/README-Windows.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) -commit cfe4465742ad2963fb0d9795e258615d7c1cf32d +commit 2c24292d341e505e5579fccac3bce5bc71d839ef Author: Lasse Collin -Date: 2024-07-09 14:27:51 +0300 +Date: 2025-03-25 15:18:15 +0200 Update THANKS - - (cherry picked from commit 028185dd4889e3d6235ff13560160ebca6985021) THANKS | 1 + 1 file changed, 1 insertion(+) -commit 0f47db18d04434203b350bde4909a5e468f197cc +commit 48053c90898fa191a216aefca01626520a7413f4 Author: Lasse Collin -Date: 2024-07-06 14:04:48 +0300 +Date: 2025-03-17 15:33:25 +0200 - xz: Remove the TODO comment about --recursive - - It won't be implemented. find + xargs is more flexible, for example, - it allows compressing small files in parallel. An example for that - has been included in the xz man page since 2010. - - (cherry picked from commit baecfa142644eb5f5c6dd6f8e2f531c362fa3747) + Translations: Update the Italian translation - src/xz/args.c | 1 - - 1 file changed, 1 deletion(-) + po/it.po | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) -commit 07f52c3528e43c4a925a3fc59a933c89f5604d92 +commit 8d6f06a65f50358fad13567f5dd8af41ef1d2b58 Author: Lasse Collin -Date: 2024-07-03 20:45:48 +0300 +Date: 2025-03-17 15:28:56 +0200 - CMake: Link xz against Threads::Threads if using pthreads + Translations: Update the Portuguese translation - The liblzma target was recently changed to link against Threads::Threads - with the PRIVATE keyword. I had forgotten that xz itself depends on - pthreads too due to pthread_sigmask(). Thus, the build broke when - building shared liblzma and pthread_sigmask() wasn't in libc. - - Thanks to Peter Seiderer for the bug report. - - Fixes: ac05f1b0d7cda1e7ae79775a8dfecc54601d7f1c - Fixes: https://github.com/tukaani-project/xz/issues/129#issuecomment-2204522994 - (cherry picked from commit b3e53122f42796aaebd767bab920cf7bedf69966) + The language tag in the Translation Project is pt, not pt_PT, + thus I changed the "Language:" line to pt. - CMakeLists.txt | 13 +++++++++++++ - 1 file changed, 13 insertions(+) + po/pt.po | 1045 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 526 insertions(+), 519 deletions(-) -commit eccb4d258b01651d06a2a31b8b68be9b04b7998c +commit c3439b039f46fe547ad603e16dc3bd63c1ca9b0c Author: Lasse Collin -Date: 2024-07-02 22:49:33 +0300 +Date: 2025-03-14 13:02:21 +0200 - Update THANKS - - (cherry picked from commit 5742ec1fc7f2cf1c82cfe3477bb90594a4658374) + Translations: Update the Italian translation - THANKS | 1 + - 1 file changed, 1 insertion(+) + po/it.po | 1020 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 516 insertions(+), 504 deletions(-) -commit c9bd00327f064778babb014302718a18d65cf7d3 -Author: Sam James -Date: 2024-06-28 14:18:35 +0300 +commit 79b4ab8d79528dd633a84df2d29e63f5d13ccbdf +Author: Lasse Collin +Date: 2025-03-12 20:48:39 +0200 - CI: Speed up Valgrind job by using --trace-children-skip-by-arg=... - - This addresses the issue I mentioned in - 6c095a98fbec70b790253a663173ecdb669108c4 and speeds up the Valgrind - job a bit, because non-xz tools aren't run unnecessarily with - Valgrind by the script tests. + Translations: Update the Italian man page translations - (cherry picked from commit 7e99856f66c07852c4e0de7aa01951e9147d86b0) + Only trivial additions but this keeps the file in sync with the TP. - .github/workflows/ci.yml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + po4a/it.po | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) -commit 495de6ec9d7834c4ef4d5286844ef7b784eb951b +commit 515b6fc8557825e1335012b3b1c8cf71e2c38775 Author: Lasse Collin -Date: 2024-06-25 16:00:22 +0300 +Date: 2025-03-12 19:38:54 +0200 - Build: Prepend, not append, PTHREAD_CFLAGS to LIBS - - It shouldn't make any difference because LIBS should be empty - at that point in configure. But prepending is the correct way - because in general the libraries being added might require other - libraries that come later on the command line. - - (cherry picked from commit 2402e8a1ae92676fa0d4cb1b761d7f62f005c098) + Translations: Update the Italian man page translations - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + po4a/it.po | 129 ++++++++++++++++++++++++++++++++++++------------------------- + 1 file changed, 77 insertions(+), 52 deletions(-) -commit 55bf3f49a812e20a21e42323e39526bb31d9341a +commit 333b7c0b776295f0941269b4e6cdb1a0ba5f6218 Author: Lasse Collin -Date: 2024-06-25 14:24:29 +0300 +Date: 2025-03-10 21:00:31 +0200 - Build: Use AC_LINK_IFELSE to handle implicit function declarations - - It's more robust in case the compiler allows pre-C99 implicit function - declarations. If an x86 intrinsic is missing and gets treated as - implicit function, the linking step will very probably fail. This - isn't the only way to workaround implicit function declarations but - it might be the simplest and cleanest. - - The problem hasn't been observed in the wild. - - There are a couple more AC_COMPILE_IFELSE uses in configure.ac. - Of these, Landlock check calls prctl() and in theory could have - the same problem. In practice it doesn't as the check program - looks for several other things too. However, it was changed to - AC_LINK_IFELSE still to look more correct. - - Similarly, m4/tuklib_cpucores.m4 and m4/tuklib_physmem.m4 were - updated although they haven't given any trouble either. They - have worked all these years because those check programs rely - on specific headers and types: if headers or types are missing, - compilation will fail. Using the linker makes these checks more - similar to the ones in cmake/tuklib_*.cmake which always link. - - (cherry picked from commit 7bb46f2b7b3989c1b589a247a251470f65e91cda) + Translations: Update the Korean man page translations - configure.ac | 8 ++++++-- - m4/tuklib_cpucores.m4 | 8 ++++---- - m4/tuklib_physmem.m4 | 17 +++++++++++------ *** 14818 LINES SKIPPED *** From nobody Wed May 7 21:26:00 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zt7bs2pQ2z5vJgW; Wed, 07 May 2025 21:26:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zt7br6F34z3ZmK; Wed, 07 May 2025 21:26:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746653160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BJ5TbwYusaesXHITjfkbF0z8pNPlwvvOfAXOXudYYKc=; b=N6Rv6FrbCv02JmK12qoB978qV3wdLyawHwwtzQn5z027a8yKdtt36kqn/bvp17YHNT0+5R eQ7e6TZ/kSpnaPr4kjLRK7WQuheD6P18WrEodlPIGmoR8QJNzcPhMUpG4veIlnqas6Jl1f U27ZPXvtyO+oHwTVr8X2vFxVCCDVRe6jRjXlqSlWN6RllQ8LL7Um1xW/oCVCERBLXBQTBv f3fb3dFHDYTik15rfo6xXKiZG3Ts30WHWfKd3DmyrV/RP5CUx1GL3G69nUkvY1/VVAoC/5 X1JImJUYTbNs2AEOfLiWQc0Z++kqtrH1HpdgtduhSyaG80LW0jKaGbD2hHC1ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746653160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BJ5TbwYusaesXHITjfkbF0z8pNPlwvvOfAXOXudYYKc=; b=DluhqaDIRt/FonFL9zj4AKGBcLuTu7AUGkT4DGrY7odKTwzkxCrxAdlZkQP9Z9JAGgCrwH Qztk2BY92DTZV3OvhxhFPDM81vTZNJIzZrYxW+UQOLVFCxsQ/V89QsBPdkHC6p5l7zKlP1 SXyyOUdpP89DzMGdKfQg0S1Zc5SLRwquveLowI1oKsiowI3FYarZVWe2wXVj0VFhE59PX9 jFWvwPlh4f/x9JFfiNvlyf63UOy/ML6ISUWDAC6wI2mRziMAZYC50rHuGWsBl9nyi1gprt ippM4D3VyChhL/v9hr0VYHgrVuBhoPij0bmCFECS0Pq6X/ZQegwM6LpTVxk5aA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746653160; a=rsa-sha256; cv=none; b=obU/McZHaSpyNWcv2KEJctEJcCh6VMs4US32wxkAioyVEFyJS0EJN2nDKlwEjr12Cg9SsN 6dJyHie0nYRBP3CD5wF9Cxvi9IWDTysHCq5ycpD2Ue4u1YY2d8lLhppaP7zagYXph9wpsb nOEtchgHja1Qu32MnX0mUxjsppL9bF7HVSrOVUzZsUoMWGmRXfUo2HJ+jbVSze57ymw5hV 9O1jPLQ3Jnc8npLdDQAmo2Cur0x5o76QwCgCrTpxxzirEBtTHLT6nc+PKAHmMoRFSjkBjI XRBwh+uOmcANsWMoJmHPjihLBZwVGe2d3v7oeXC8N5gQ6unz+1sjDZsVrcARTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zt7br5md9zmt0; Wed, 07 May 2025 21:26:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547LQ0gf072555; Wed, 7 May 2025 21:26:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547LQ0mH072552; Wed, 7 May 2025 21:26:00 GMT (envelope-from git) Date: Wed, 7 May 2025 21:26:00 GMT Message-Id: <202505072126.547LQ0mH072552@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 5cf27a49a2de - stable/14 - MFV: xz 5.8.1. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5cf27a49a2de91ae1f369912a7bf3859fbc79355 Auto-Submitted: auto-generated The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=5cf27a49a2de91ae1f369912a7bf3859fbc79355 commit 5cf27a49a2de91ae1f369912a7bf3859fbc79355 Author: Xin LI AuthorDate: 2025-05-04 07:06:22 +0000 Commit: Xin LI CommitDate: 2025-05-07 21:24:11 +0000 MFV: xz 5.8.1. PR: bin/286252 (cherry picked from commit 128836d304d93f2d00eb14069c27089ab46c38d4) --- contrib/xz/AUTHORS | 2 +- contrib/xz/COPYING | 25 +- contrib/xz/ChangeLog | 6031 +++++++++++++++----- contrib/xz/README | 107 +- contrib/xz/THANKS | 37 + contrib/xz/TODO | 25 +- contrib/xz/src/common/my_landlock.h | 141 + contrib/xz/src/common/sysdefs.h | 58 +- contrib/xz/src/common/tuklib_common.h | 11 +- contrib/xz/src/common/tuklib_gettext.h | 11 + contrib/xz/src/common/tuklib_mbstr.h | 25 +- contrib/xz/src/common/tuklib_mbstr_nonprint.c | 162 + contrib/xz/src/common/tuklib_mbstr_nonprint.h | 71 + contrib/xz/src/common/tuklib_mbstr_width.c | 34 +- contrib/xz/src/common/tuklib_mbstr_wrap.c | 294 + contrib/xz/src/common/tuklib_mbstr_wrap.h | 204 + contrib/xz/src/common/tuklib_physmem.c | 11 +- contrib/xz/src/liblzma/api/lzma/bcj.h | 97 + contrib/xz/src/liblzma/api/lzma/container.h | 2 +- contrib/xz/src/liblzma/api/lzma/lzma12.h | 2 +- contrib/xz/src/liblzma/api/lzma/version.h | 4 +- contrib/xz/src/liblzma/check/check.h | 18 - contrib/xz/src/liblzma/check/crc32_arm64.h | 55 +- contrib/xz/src/liblzma/check/crc32_fast.c | 46 +- contrib/xz/src/liblzma/check/crc32_loongarch.h | 65 + contrib/xz/src/liblzma/check/crc32_small.c | 3 + contrib/xz/src/liblzma/check/crc32_table.c | 42 - contrib/xz/src/liblzma/check/crc32_x86.S | 14 +- contrib/xz/src/liblzma/check/crc64_fast.c | 39 +- contrib/xz/src/liblzma/check/crc64_table.c | 37 - contrib/xz/src/liblzma/check/crc64_x86.S | 14 +- .../xz/src/liblzma/check/crc_clmul_consts_gen.c | 160 + contrib/xz/src/liblzma/check/crc_common.h | 111 +- contrib/xz/src/liblzma/check/crc_x86_clmul.h | 519 +- contrib/xz/src/liblzma/common/alone_decoder.c | 3 +- contrib/xz/src/liblzma/common/auto_decoder.c | 5 +- contrib/xz/src/liblzma/common/block_decoder.c | 6 +- contrib/xz/src/liblzma/common/block_encoder.c | 6 +- contrib/xz/src/liblzma/common/common.c | 8 +- contrib/xz/src/liblzma/common/file_info.c | 22 +- contrib/xz/src/liblzma/common/index_decoder.c | 9 +- contrib/xz/src/liblzma/common/index_encoder.c | 6 +- contrib/xz/src/liblzma/common/index_hash.c | 7 +- contrib/xz/src/liblzma/common/lzip_decoder.c | 14 +- contrib/xz/src/liblzma/common/memcmplen.h | 12 +- contrib/xz/src/liblzma/common/stream_decoder.c | 16 +- contrib/xz/src/liblzma/common/stream_decoder_mt.c | 140 +- contrib/xz/src/liblzma/common/stream_encoder_mt.c | 10 +- contrib/xz/src/liblzma/common/string_conversion.c | 99 +- contrib/xz/src/liblzma/liblzma_generic.map | 10 + contrib/xz/src/liblzma/liblzma_linux.map | 10 + contrib/xz/src/liblzma/lz/lz_decoder.c | 21 +- contrib/xz/src/liblzma/lz/lz_decoder.h | 103 +- contrib/xz/src/liblzma/lz/lz_encoder.c | 2 +- contrib/xz/src/liblzma/lz/lz_encoder_hash.h | 30 +- contrib/xz/src/liblzma/lzma/lzma2_encoder.c | 9 +- contrib/xz/src/liblzma/lzma/lzma_decoder.c | 2 +- contrib/xz/src/liblzma/simple/arm.c | 4 +- contrib/xz/src/liblzma/simple/arm64.c | 22 +- contrib/xz/src/liblzma/simple/armthumb.c | 7 +- contrib/xz/src/liblzma/simple/ia64.c | 4 +- contrib/xz/src/liblzma/simple/powerpc.c | 4 +- contrib/xz/src/liblzma/simple/riscv.c | 18 + contrib/xz/src/liblzma/simple/sparc.c | 5 +- contrib/xz/src/liblzma/simple/x86.c | 24 + contrib/xz/src/lzmainfo/lzmainfo.c | 52 +- contrib/xz/src/xz/args.c | 41 +- contrib/xz/src/xz/args.h | 2 +- contrib/xz/src/xz/coder.c | 28 +- contrib/xz/src/xz/file_io.c | 260 +- contrib/xz/src/xz/file_io.h | 10 +- contrib/xz/src/xz/list.c | 39 +- contrib/xz/src/xz/main.c | 10 +- contrib/xz/src/xz/message.c | 506 +- contrib/xz/src/xz/options.c | 15 +- contrib/xz/src/xz/private.h | 1 + contrib/xz/src/xz/sandbox.c | 78 +- contrib/xz/src/xz/suffix.c | 12 +- contrib/xz/src/xz/util.c | 10 +- contrib/xz/src/xz/xz.1 | 94 +- contrib/xz/src/xzdec/xzdec.c | 75 +- lib/liblzma/Makefile | 9 +- lib/liblzma/Symbol.map | 9 + lib/liblzma/Versions.def | 5 +- lib/liblzma/config.h | 18 +- usr.bin/lzmainfo/Makefile | 5 +- usr.bin/xz/Makefile | 4 +- usr.bin/xzdec/Makefile | 3 +- 88 files changed, 7849 insertions(+), 2552 deletions(-) diff --git a/contrib/xz/AUTHORS b/contrib/xz/AUTHORS index 5eff238ae413..f805a204ecb7 100644 --- a/contrib/xz/AUTHORS +++ b/contrib/xz/AUTHORS @@ -24,7 +24,7 @@ Authors of XZ Utils by Michał Górny. Architecture-specific CRC optimizations were contributed by - Ilya Kurdyukov, Hans Jansen, and Chenxi Mao. + Ilya Kurdyukov, Chenxi Mao, and Xi Ruoyao. Other authors: - Jonathan Nieder diff --git a/contrib/xz/COPYING b/contrib/xz/COPYING index aed21531497c..ef3371389d7d 100644 --- a/contrib/xz/COPYING +++ b/contrib/xz/COPYING @@ -40,6 +40,12 @@ XZ Utils Licensing free software licenses. These aren't built or installed as part of XZ Utils. + The following command may be helpful in finding per-file license + information. It works on xz.git and on a clean file tree extracted + from a release tarball. + + sh build-aux/license-check.sh -v + For the files under the BSD Zero Clause License (0BSD), if a copyright notice is needed, the following is sufficient: @@ -59,25 +65,6 @@ XZ Utils Licensing - COPYING.GPLv2: GNU General Public License version 2 - COPYING.GPLv3: GNU General Public License version 3 - A note about old XZ Utils releases: - - XZ Utils releases 5.4.6 and older and 5.5.1alpha have a - significant amount of code put into the public domain and - that obviously remains so. The switch from public domain to - 0BSD for newer releases was made in Febrary 2024 because - public domain has (real or perceived) legal ambiguities in - some jurisdictions. - - There is very little *practical* difference between public - domain and 0BSD. The main difference likely is that one - shouldn't claim that 0BSD-licensed code is in the public - domain; 0BSD-licensed code is copyrighted but available under - an extremely permissive license. Neither 0BSD nor public domain - require retaining or reproducing author, copyright holder, or - license notices when distributing the software. (Compare to, - for example, BSD 2-Clause "Simplified" License which does have - such requirements.) - If you have questions, don't hesitate to ask for more information. The contact information is in the README file. diff --git a/contrib/xz/ChangeLog b/contrib/xz/ChangeLog index 2d36d7bb1043..577dce5e12a2 100644 --- a/contrib/xz/ChangeLog +++ b/contrib/xz/ChangeLog @@ -1,834 +1,4468 @@ -commit 9331ce4009ddc839f5191d234cc41b2d4797376d +commit a522a226545730551f7e7c2685fab27cf567746c Author: Lasse Collin -Date: 2024-10-01 12:21:22 +0300 +Date: 2025-04-03 14:34:43 +0300 - Bump version and soname for 5.6.3 + Bump version and soname for 5.8.1 src/liblzma/Makefile.am | 2 +- src/liblzma/api/lzma/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -commit f52857ffde768058db0e0e13f68a2660ca9f1330 +commit 1c462c2ad86ff85766928638431029cd0b0dc995 Author: Lasse Collin -Date: 2024-10-01 12:17:39 +0300 +Date: 2025-04-03 14:34:43 +0300 - Add NEWS for 5.6.3 + Add NEWS for 5.8.1 - NEWS | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 125 insertions(+) + NEWS | 30 ++++++++++++++++++++++++++++++ + 1 file changed, 30 insertions(+) -commit b8f52990b5d47a50902bf33cd2305ce985457bac +commit 513cabcf7f5ce1c3ed0619e791393fc53d1dbbd0 Author: Lasse Collin -Date: 2024-10-01 12:10:23 +0300 +Date: 2025-04-03 14:34:43 +0300 - Update THANKS + Tests: Call lzma_code() in smaller chunks in fuzz_common.h - (cherry picked from commit 1ebbe915d4e0d877154261b5f8103719a6722975) + This makes it easy to crash fuzz_decode_stream_mt when tested + against the code from 5.8.0. + + Obviously this might make it harder to reach some other code path now. + The previous code has been in use since 2018 when fuzzing was added + in 106d1a663d4b ("Tests: Add a fuzz test program and a config file + for OSS-Fuzz."). - THANKS | 2 ++ - 1 file changed, 2 insertions(+) + tests/ossfuzz/fuzz_common.h | 31 ++++++++++++++++++++++++------- + 1 file changed, 24 insertions(+), 7 deletions(-) -commit 51f6f455873911894f155e6997bc23a9be8f42ba +commit 48440e24a25911ae59e8518b67a1e0f6f1c293bf Author: Lasse Collin -Date: 2024-10-01 12:10:23 +0300 +Date: 2025-04-03 14:34:43 +0300 - Tests/Windows: Add the application manifest to the test programs - - This ensures that the test programs get executed the same way as - the binaries that are installed. + Tests: Add a fuzzing target for the multithreaded .xz decoder - (cherry picked from commit 74702ee00ecfd080d8ab11118cd25dbe6c437ec0) + It doesn't seem possible to trigger the CVE-2025-31115 bug with this + fuzzing target at the moment. It's because the code in fuzz_common.h + passes the whole input buffer to lzma_code() at once. - CMakeLists.txt | 14 ++++++++++---- - tests/Makefile.am | 10 ++++++++++ - tests/tests.cmake | 33 ++++++++++++++++++++++++++++++++- - tests/tests_w32res.rc | 18 ++++++++++++++++++ - 4 files changed, 70 insertions(+), 5 deletions(-) + tests/ossfuzz/fuzz_decode_stream_mt.c | 47 +++++++++++++++++++++++++++++++++++ + 1 file changed, 47 insertions(+) -commit bf518b9ba446327a062ddfe67e7e0a5baed2394f +commit 0c80045ab82c406858d9d5bcea9f48ebc3d0a81d Author: Lasse Collin -Date: 2024-10-01 12:10:23 +0300 +Date: 2025-04-03 14:34:42 +0300 - Windows: Embed an application manifest in the EXE files - - IMPORTANT: This includes a security fix to command line tool - argument handling. - - Some toolchains embed an application manifest by default to declare - UAC-compliance. Some also declare compatibility with Vista/8/8.1/10/11 - to let the app access features newer than those of Vista. - - We want all the above but also two more things: - - - Declare that the app is long path aware to support paths longer - than 259 characters (this may also require a registry change). - - - Force the code page to UTF-8. This allows the command line tools - to access files whose names contain characters that don't exist - in the current legacy code page (except unpaired surrogates). - The UTF-8 code page also fixes security issues in command line - argument handling which can be exploited with malicious filenames. - See the new file w32_application.manifest.comments.txt. + liblzma: mt dec: Fix lack of parallelization in single-shot decoding - Thanks to Orange Tsai and splitline from DEVCORE Research Team - for discovering this issue. - - Thanks to Vijay Sarvepalli for reporting the issue to me. + Single-shot decoding means calling lzma_code() by giving it the whole + input at once and enough output buffer space to store the uncompressed + data, and combining this with LZMA_FINISH and no timeout + (lzma_mt.timeout = 0). This way the file is decoded with a single + lzma_code() call if possible. - Thanks to Kelvin Lee for testing with MSVC and helping with - the required build system fixes. + The bug prevented the decoder from starting more than one worker thread + in single-shot mode. The issue was noticed when reviewing the code; + there are no bug reports. Thus maybe few have tried this mode. - (cherry picked from commit 46ee0061629fb075d61d83839e14dd193337af59) + Fixes: 64b6d496dc81 ("liblzma: Threaded decoder: Always wait for output if LZMA_FINISH is used.") - CMakeLists.txt | 18 +++ - src/Makefile.am | 4 +- - src/common/common_w32res.rc | 5 + - src/common/w32_application.manifest | 28 ++++ - src/common/w32_application.manifest.comments.txt | 178 +++++++++++++++++++++++ - 5 files changed, 232 insertions(+), 1 deletion(-) + src/liblzma/common/stream_decoder_mt.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) -commit 5718ce932e6ad4262d5fffc9e2a7a838f963d7e5 +commit 8188048854e8d11071b8a50d093c74f4c030acc9 Author: Lasse Collin -Date: 2024-09-29 14:46:52 +0300 +Date: 2025-04-03 14:34:42 +0300 - Windows: Set DLL name accurately in StringFileInfo on Cygwin and MSYS2 + liblzma: mt dec: Don't modify thr->in_size in the worker thread - Now the information in the "Details" tab in the file properties - dialog matches the naming convention of Cygwin and MSYS2. This - is only a cosmetic change. + Don't set thr->in_size = 0 when returning the thread to the stack of + available threads. Not only is it useless, but the main thread may + read the value in SEQ_BLOCK_THR_RUN. With valid inputs, it made + no difference if the main thread saw the original value or 0. With + invalid inputs (when worker thread stops early), thr->in_size was + no longer modified after the previous commit with the security fix + ("Don't free the input buffer too early"). - (cherry picked from commit dad153091552b52a41b95ec4981c6951f1cae487) + So while the bug appears harmless now, it's important to fix it because + the variable was being modified without proper locking. It's trivial + to fix because there is no need to change the value. Only main thread + needs to set the value in (in SEQ_BLOCK_THR_INIT) when starting a new + Block before the worker thread is activated. + + Fixes: 4cce3e27f529 ("liblzma: Add threaded .xz decompressor.") + Reviewed-by: Sebastian Andrzej Siewior + Thanks-to: Sam James - src/liblzma/liblzma_w32res.rc | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) + src/liblzma/common/stream_decoder_mt.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) -commit e77c0ca61d12ebac433b7661840cb18d7031700a +commit d5a2ffe41bb77b918a8c96084885d4dbe4bf6480 Author: Lasse Collin -Date: 2024-09-25 15:47:55 +0300 +Date: 2025-04-03 14:34:42 +0300 - common_w32res.rc: White space edits + liblzma: mt dec: Don't free the input buffer too early (CVE-2025-31115) - LANGUAGE and VS_VERSION_INFO begin new statements so put an empty line - between them. + The input buffer must be valid as long as the main thread is writing + to the worker-specific input buffer. Fix it by making the worker + thread not free the buffer on errors and not return the worker thread to + the pool. The input buffer will be freed when threads_end() is called. - (cherry picked from commit 8940ecb96fe9f0f2a9cfb8b66fe9ed31ffbea904) - - src/common/common_w32res.rc | 15 ++++++++------- - 1 file changed, 8 insertions(+), 7 deletions(-) - -commit e0ba0f26d9f3f53cedc92fb13303924c39d00392 -Author: Lasse Collin -Date: 2024-09-28 20:09:50 +0300 - - CMake: Add the resource files to the Cygwin and MSYS2 builds + With invalid input, the bug could at least result in a crash. The + effects include heap use after free and writing to an address based + on the null pointer plus an offset. - Autotools-based build has always done this so this is for consistency. + The bug has been there since the first committed version of the threaded + decoder and thus affects versions from 5.3.3alpha to 5.8.0. - However, the CMake build won't create the DEF file when building - for Cygwin or MSYS2 because in that context it should be useless. - (If Cygwin or MSYS2 is used to host building of normal Windows - binaries then the DEF file is still created.) + As the commit message in 4cce3e27f529 says, I had made significant + changes on top of Sebastian's patch. This bug was indeed introduced + by my changes; it wasn't in Sebastian's version. + + Thanks to Harri K. Koskinen for discovering and reporting this issue. - (cherry picked from commit c3b9dad07d3fd9319f88386b7095019bcea45ce1) + Fixes: 4cce3e27f529 ("liblzma: Add threaded .xz decompressor.") + Reported-by: Harri K. Koskinen + Reviewed-by: Sebastian Andrzej Siewior + Thanks-to: Sam James - CMakeLists.txt | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) + src/liblzma/common/stream_decoder_mt.c | 31 ++++++++++++++++++++++--------- + 1 file changed, 22 insertions(+), 9 deletions(-) -commit 69637d0c323c0d7d9619cff637c7ce97dabc4f02 +commit c0c835964dfaeb2513a3c0bdb642105152fe9f34 Author: Lasse Collin -Date: 2024-09-28 15:19:14 +0300 +Date: 2025-04-03 14:34:42 +0300 - CMake: Fix Windows resource file dependencies + liblzma: mt dec: Simplify by removing the THR_STOP state - If common_w32res.rc is modified, the resource files need to be rebuilt. - In contrast, the liblzma*.map files truly are link dependencies. + The main thread can directly set THR_IDLE in threads_stop() which is + called when errors are detected. threads_stop() won't return the stopped + threads to the pool or free the memory pointed by thr->in anymore, but + it doesn't matter because the existing workers won't be reused after + an error. The resources will be cleaned up when threads_end() is + called (reinitializing the decoder always calls threads_end()). - (cherry picked from commit da4f275bd1c18b897e5c2dd0043546de3accce0a) + Reviewed-by: Sebastian Andrzej Siewior + Thanks-to: Sam James - CMakeLists.txt | 17 +++++++++-------- - 1 file changed, 9 insertions(+), 8 deletions(-) + src/liblzma/common/stream_decoder_mt.c | 75 +++++++++++++--------------------- + 1 file changed, 29 insertions(+), 46 deletions(-) -commit af8533459c60d7bc5b55f2f516251af4572169e4 +commit 831b55b971cf579ee16a854f177c36b20d3c6999 Author: Lasse Collin -Date: 2024-09-29 01:20:03 +0300 +Date: 2025-04-03 14:34:42 +0300 - CMake: Checking for CYGWIN covers MSYS2 too - - On MSYS2, both CYGWIN and MSYS are set. + liblzma: mt dec: Fix a comment - (cherry picked from commit 1c673c0aac7f7dee8dda2c1140351c8417a71e47) + Reviewed-by: Sebastian Andrzej Siewior + Thanks-to: Sam James - CMakeLists.txt | 2 +- + src/liblzma/common/stream_decoder_mt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit eca08e4c204db404911e513f95110dcb0fb919bd +commit b9d168eee4fb6393b4fe207c0aeb5faee316ca1a Author: Lasse Collin -Date: 2024-09-28 09:37:30 +0300 +Date: 2025-04-03 14:34:30 +0300 - Translations: Add the SPDX license identifier to pt_BR.po - - (cherry picked from commit 6aaa0173b839e28429d43a8b62d257ad2f3b4521) + liblzma: Add assertions to lzma_bufcpy() - po/pt_BR.po | 2 ++ - 1 file changed, 2 insertions(+) + src/liblzma/common/common.c | 6 ++++++ + 1 file changed, 6 insertions(+) -commit 85801c96c32456300177fbbad1506b07f5dd0a47 +commit c8e0a4897b4d0f906966f5d4d4f662221d64f3ae Author: Lasse Collin -Date: 2024-09-25 16:41:37 +0300 +Date: 2025-04-02 16:40:22 +0300 - Windows/CMake: Use the correct resource file for lzmadec.exe - - CMakeLists.txt was using xzdec_w32res.rc for both xzdec and lzmadec. - - Fixes: 998d0b29536094a89cf385a3b894e157db1ccefe - (cherry picked from commit dc7b9f24b737e4e55bcbbdde6754883f991c2cfb) + DOS: Update Makefile to fix the build - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + dos/Makefile | 2 ++ + 1 file changed, 2 insertions(+) -commit a341d19c835a8c10fcf561b00b548c53af43381e +commit 307c02ed698a69763ef1c9c0df4ff24727442118 Author: Lasse Collin -Date: 2024-09-25 21:29:59 +0300 +Date: 2025-03-29 12:41:32 +0200 - Translations: Update the Brazilian Portuguese translation + sysdefs.h: Avoid even with C11 compilers + + Oracle Developer Studio 12.6 on Solaris 10 claims C11 support in + __STDC_VERSION__ and supports _Alignas. However, is missing. + We only need alignas, so define it to _Alignas with C11/C17 compilers. + If something included later, it shouldn't cause problems. - (cherry picked from commit b834ae5f80911a3819d6cdb484f61b257174c544) + Thanks to Ihsan Dogan for reporting the issue and testing the fix. + + Fixes: c0e7eaae8d6eef1e313c9d0da20ccf126ec61f38 - po/pt_BR.po | 144 ++++++++++++++++++++++-------------------------------------- - 1 file changed, 53 insertions(+), 91 deletions(-) + src/common/sysdefs.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) -commit e69c0b9b2e00ade984393ef9cabac57342072328 +commit 7ce38b318339d6c01378a77585e08169ca3a604e Author: Lasse Collin -Date: 2024-09-17 01:21:15 +0300 +Date: 2025-03-29 12:32:05 +0200 Update THANKS - - (cherry picked from commit eceb023d4c129fd63ee881a2d8696eaf52ad1532) THANKS | 1 + 1 file changed, 1 insertion(+) -commit aef9a25b3200457c16846b046222fb2c7967afe0 -Author: Tobias Stoeckmann -Date: 2024-09-16 23:19:46 +0200 +commit 688e51bde4c987589717b2be1a1fde9576c604fc +Author: Lasse Collin +Date: 2025-03-29 12:21:51 +0200 - lzmainfo: Avoid integer overflow - - The MB output can overflow with huge numbers. Most likely these are - invalid .lzma files anyway, but let's avoid garbage output. - - lzmadec was adapted from LZMA Utils. The original code with this bug - was written in 2005, over 19 years ago. - - Co-authored-by: Lasse Collin - Closes: https://github.com/tukaani-project/xz/pull/144 - (cherry picked from commit 76cfd0a9bb33ae8e534b1f73f6359dc825589f2f) + Translations: Update the Croatian translation - src/lzmainfo/lzmainfo.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) + po/hr.po | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) -commit 40a7f163f56aca6b3c8b83e9382f5e5cb4f8e93b -Author: Tobias Stoeckmann -Date: 2024-09-16 22:04:40 +0200 +commit 173fb5c68b08a8c1369550267be258132b7760c6 +Author: Lasse Collin +Date: 2025-03-25 18:23:57 +0200 - xzdec: Remove unused short option -M - - "xzdec -M123" exited with exit status 1 without printing - any messages. The "M:" entry should have been removed when - the memory usage limiter support was removed from xzdec. - - Fixes: 792331bdee706aa852a78b171040ebf814c6f3ae - Closes: https://github.com/tukaani-project/xz/pull/143 - [ Lasse: Commit message edits ] - - (cherry picked from commit 78355aebb7fb654302e5e33692ba109909dacaff) + doc/SHA256SUMS: Add 5.8.0 - src/xzdec/xzdec.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + doc/SHA256SUMS | 6 ++++++ + 1 file changed, 6 insertions(+) -commit c98714a57058ac381365c2ff1e1d1cd63a5742c4 +commit db9258e828bc2cd96e3954f1ddcc9d3530589025 Author: Lasse Collin -Date: 2024-09-10 13:54:47 +0300 +Date: 2025-03-25 15:18:32 +0200 - Update THANKS + Bump version and soname for 5.8.0 - (cherry picked from commit e5758db7bd75587a2499e0771907521a4aa86908) + Also remove the LZMA_UNSTABLE macro. - THANKS | 1 + - 1 file changed, 1 insertion(+) + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/bcj.h | 2 -- + src/liblzma/api/lzma/version.h | 6 +++--- + src/liblzma/common/common.h | 2 -- + src/liblzma/liblzma_generic.map | 2 +- + src/liblzma/liblzma_linux.map | 2 +- + 6 files changed, 6 insertions(+), 10 deletions(-) -commit 4ed449517817b3659b35d19f39703e3c460f46c2 -Author: Firas Khalil Khana -Date: 2024-09-10 12:30:32 +0300 +commit bfb752a38f89ed03fc93d54f11c09f43fda64bc2 +Author: Lasse Collin +Date: 2025-03-25 15:18:32 +0200 - Build: Fix a typo in autogen.sh - - Fixes: e9be74f5b129fe8a5388d588e68b1b7f5168a310 - Closes: https://github.com/tukaani-project/xz/pull/141 - (cherry picked from commit 80ffa38f56657257ed4d90d76f6bd2f2bcb8163c) + Add NEWS for 5.8.0 - autogen.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + NEWS | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 62 insertions(+) -commit 3b83577a1547e72cb78a905ad3d308a799ded485 +commit 6ccbb904da851eb0c174c8dbd43e84da31739720 Author: Lasse Collin -Date: 2024-09-02 20:08:40 +0300 +Date: 2025-03-25 15:18:31 +0200 - Translations: Update Chinese (simplified) translation - - Differences to the zh_CN.po file from the Translation Project: - - - Two uses of \v were fixed. + Translations: Run "make -C po update-po" - - Missing "OPTS" translation in --riscv[=OPTS] was copied from - previous lines. + POT-Creation-Date is set to match the timestamp in 5.7.2beta which + in the Translation Project is known as 5.8.0-pre1. The strings + haven't changed since 5.7.1alpha but a few comments have. + + This is a very noisy commit, but this helps keeping the PO files + similar between the Git repository and stable release tarballs. + + po/ca.po | 964 ++++++++++++++++++++++++++++++++++++++++++++--------------- + po/cs.po | 935 ++++++++++++++++++++++++++++++++++++++++++---------------- + po/da.po | 663 ++++++++++++++++++++++++++++++----------- + po/de.po | 7 +- + po/eo.po | 966 +++++++++++++++++++++++++++++++++++++++++++++--------------- + po/es.po | 7 +- + po/fi.po | 2 +- + po/fr.po | 916 +++++++++++++++++++++++++++++++++++++++++--------------- + po/hu.po | 966 +++++++++++++++++++++++++++++++++++++++++++++--------------- + po/ka.po | 7 +- + po/ko.po | 7 +- + po/nl.po | 7 +- + po/pl.po | 7 +- + po/pt_BR.po | 962 ++++++++++++++++++++++++++++++++++++++++++++--------------- + po/sr.po | 2 +- + po/sv.po | 7 +- + po/tr.po | 7 +- + po/uk.po | 7 +- + po/vi.po | 948 +++++++++++++++++++++++++++++++++++++++++++--------------- + po/zh_CN.po | 940 ++++++++++++++++++++++++++++++++++++++++++++-------------- + po/zh_TW.po | 2 +- + 21 files changed, 6209 insertions(+), 2120 deletions(-) + +commit 891a5f057a6bb2dd2e3ce5e3bdd7a1f1ee03b800 +Author: Lasse Collin +Date: 2025-03-25 15:18:31 +0200 + + Translations: Run po4a/update-po - - "make update-po" was run to remove line numbers from comments. + Also remove the trivial obsolete messages like man page dates. - (cherry picked from commit 68c54e45d042add64a4cb44bfc87ca74d29b87e2) + This is a noisy commit, but this helps keeping the PO files similar + between the Git repository and stable release tarballs. - po/zh_CN.po | 102 ++++++++++++++++++++++++------------------------------------ - 1 file changed, 40 insertions(+), 62 deletions(-) + po4a/fr.po | 82 +++++++++++++++++++++++++++++++++++++------------------ + po4a/pt_BR.po | 88 +++++++++++++++++++++++++++++++++++++++++------------------ + po4a/sr.po | 79 ++++++++++++++++++++++++++++++++++------------------- + 3 files changed, 167 insertions(+), 82 deletions(-) -commit 06f4c7edda0387eb6a2d6303804b59dcf4d3db1f +commit 4f52e7387012cb3510b01c937dd9b3a0c6a3ac6c Author: Lasse Collin -Date: 2024-09-02 19:40:50 +0300 +Date: 2025-03-25 15:18:31 +0200 - Translations: Update the Catalan translation - - Differences to the ca.po file from the Translation Project: - - - An overlong line translating --filters-help was wrapped. - - - "make update-po" was used to remove line numbers from the comments - to match the changes in fccebe2b4fd513488fc920e4dac32562ed3c7637 - and 093490b58271e9424ce38a7b1b38bcf61b9c86c6. xz.pot in the TP - is older than these commits. + Translations: Partially fix overtranslation in Serbian man pages - (cherry picked from commit 2230692aa1bcebb586100183831e3daf1714d60a) + Names of environment variables and some other strings must be present + in the original form. The translator couldn't be reached so I'm + changing some of the strings myself. In the "Robot mode" section, + occurrences in the middle of sentences weren't changed to reduce + the chance of grammar breakage, but I kept the translated strings in + parenthesis in the headings. It's not ideal, but now people shouldn't + need to look at the English man page to find the English strings. - po/ca.po | 171 ++++++++++++++++++++++++++------------------------------------- - 1 file changed, 69 insertions(+), 102 deletions(-) + po4a/sr.po | 66 ++++++++++++++++++++++++++++++++++++++++++-------------------- + 1 file changed, 45 insertions(+), 21 deletions(-) -commit 406cb5b669e47c0e45c98f1afb7be998084a93d0 +commit ff5d944749b99eb5ab35e2ebaf01d05a59e7169b Author: Lasse Collin -Date: 2024-08-22 11:01:07 +0300 +Date: 2025-03-25 15:18:31 +0200 - Update THANKS - - (cherry picked from commit 5e375987509fab484b7bef0b90be92f241c58c91) + liblzma: Count the extra bytes in LZMA/LZMA2 decoder memory usage - THANKS | 1 + - 1 file changed, 1 insertion(+) + src/liblzma/lz/lz_decoder.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) -commit 3a4a05d75eb41ddc41899324df0511670ceaaf1e -Author: Yifeng Li -Date: 2024-08-22 02:18:49 +0000 +commit 943b012d09f717f7b44284c4e4976ea41264c731 +Author: Lasse Collin +Date: 2025-03-25 15:18:31 +0200 - liblzma: Fix x86-64 movzw compatibility in range_decoder.h + liblzma: Use SSE2 intrinsics instead of memcpy() in dict_repeat() - Support for instruction "movzw" without suffix in "GNU as" was - added in commit [1] and stabilized in binutils 2.27, released - in August 2016. Earlier systems don't accept this instruction - without a suffix, making range_decoder.h's inline assembly - unable to build on old systems such as Ubuntu 16.04, creating - error messages like: + SSE2 is supported on every x86-64 processor. The SSE2 code is used on + 32-bit x86 if compiler options permit unconditional use of SSE2. - lzma_decoder.c: Assembler messages: - lzma_decoder.c:371: Error: no such instruction: `movzw 2(%r11),%esi' - lzma_decoder.c:373: Error: no such instruction: `movzw 4(%r11),%edi' - lzma_decoder.c:388: Error: no such instruction: `movzw 6(%r11),%edx' - lzma_decoder.c:398: Error: no such instruction: `movzw (%r11,%r14,4),%esi' + dict_repeat() copies short random-sized unaligned buffers. At least + on glibc, FreeBSD, and Windows (MSYS2, UCRT, MSVCRT), memcpy() is + clearly faster than byte-by-byte copying in this use case. Compared + to the memcpy() version, the new SSE2 version reduces decompression + time by 0-5 % depending on the machine and libc. It should never be + slower than the memcpy() version. - Change "movzw" to "movzwl" for compatibility. + However, on musl 1.2.5 on x86-64, the memcpy() version is the slowest. + Compared to the memcpy() version: - [1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=c07315e0c610e0e3317b4c02266f81793df253d2 + - The byte-by-version takes 6-7 % less time to decompress. + - The SSE2 version takes 16-18 % less time to decompress. - Suggested-by: Lasse Collin - Tested-by: Yifeng Li - Signed-off-by: Yifeng Li - Fixes: 3182a330c1512cc1f5c87b5c5a272578e60a5158 - Fixes: https://github.com/tukaani-project/xz/issues/121 - Closes: https://github.com/tukaani-project/xz/pull/136 - (cherry picked from commit 6cd7c8607843c337edfe2c472aa316602a393754) + The numbers are from decompressing a Linux kernel source tarball in + single-threaded mode on older AMD and Intel systems. The tarball + compresses well, and thus dict_repeat() performance matters more + than with some other files. - src/liblzma/rangecoder/range_decoder.h | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) + src/liblzma/lz/lz_decoder.c | 14 ++++++-- + src/liblzma/lz/lz_decoder.h | 87 ++++++++++++++++++++++++++++++++++++++++----- + 2 files changed, 90 insertions(+), 11 deletions(-) -commit 4669f06d1a8d31de4b8b5861b5e8afd82cacd721 +commit bc14e4c94e788d42eeab984298391fc0ca46f969 Author: Lasse Collin -Date: 2024-07-19 20:02:43 +0300 +Date: 2025-03-25 15:18:31 +0200 - Build: Comment that elf_aux_info(3) will be available on OpenBSD >= 7.6 + liblzma: Add "restrict" to a few functions in lz_decoder.h + + This doesn't make any difference in practice because compilers can + already see that writing through the dict->buf pointer cannot modify + the contents of *dict itself: The LZMA decoder makes a local copy of + the lzma_dict structure, and even if it didn't, the pointer to + lzma_dict in the LZMA decoder is already "restrict". - (cherry picked from commit bf901dee5d4c46609645e50311c0cb2dfdcf9738) + It's nice to add "restrict" anyway. uint8_t is typically unsigned char + which can alias anything. Without the above conditions or "restrict", + compilers could need to assume that writing through dict->buf might + modify *dict. This would matter in dict_repeat() because the loops + refer to dict->buf and dict->pos instead of making local copies of + those members for the duration of the loops. If compilers had to + assume that writing through dict->buf can affect *dict, then compilers + would need to emit code that reloads dict->buf and dict->pos after + every write through dict->buf. - CMakeLists.txt | 2 +- - configure.ac | 17 +++++++++++------ - 2 files changed, 12 insertions(+), 7 deletions(-) + src/liblzma/lz/lz_decoder.h | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) -commit 9edddda5636d7b3504a033c31e8ea763e293fd35 +commit e82ee090c567e560f51a056775a17f534d159d65 Author: Lasse Collin -Date: 2024-07-13 22:10:37 +0300 +Date: 2025-03-25 15:18:30 +0200 - liblzma: Tweak a comment + liblzma: Define LZ_DICT_INIT_POS for initial dictionary position - (cherry picked from commit 7c292dd0bf23cefcdf4b1509f3666322e08a7ede) + It's more readable. - src/liblzma/simple/arm64.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + src/liblzma/lz/lz_decoder.c | 4 ++-- + src/liblzma/lz/lz_decoder.h | 9 ++++++--- + 2 files changed, 8 insertions(+), 5 deletions(-) -commit 1a93ab55d1563f5eb9b2c1b8240384046fe4bb97 +commit 8e7cd0091e5239334437decbe1989662d45a2f47 Author: Lasse Collin -Date: 2024-07-11 22:17:56 +0300 +Date: 2025-03-25 15:18:30 +0200 - CMake: Bump maximum policy version to 3.30 + Windows: Update README-Windows.txt about UCRT - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + windows/README-Windows.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) -commit cfe4465742ad2963fb0d9795e258615d7c1cf32d +commit 2c24292d341e505e5579fccac3bce5bc71d839ef Author: Lasse Collin -Date: 2024-07-09 14:27:51 +0300 +Date: 2025-03-25 15:18:15 +0200 Update THANKS - - (cherry picked from commit 028185dd4889e3d6235ff13560160ebca6985021) THANKS | 1 + 1 file changed, 1 insertion(+) -commit 0f47db18d04434203b350bde4909a5e468f197cc +commit 48053c90898fa191a216aefca01626520a7413f4 Author: Lasse Collin -Date: 2024-07-06 14:04:48 +0300 +Date: 2025-03-17 15:33:25 +0200 - xz: Remove the TODO comment about --recursive - - It won't be implemented. find + xargs is more flexible, for example, - it allows compressing small files in parallel. An example for that - has been included in the xz man page since 2010. - - (cherry picked from commit baecfa142644eb5f5c6dd6f8e2f531c362fa3747) + Translations: Update the Italian translation - src/xz/args.c | 1 - - 1 file changed, 1 deletion(-) + po/it.po | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) -commit 07f52c3528e43c4a925a3fc59a933c89f5604d92 +commit 8d6f06a65f50358fad13567f5dd8af41ef1d2b58 Author: Lasse Collin -Date: 2024-07-03 20:45:48 +0300 +Date: 2025-03-17 15:28:56 +0200 - CMake: Link xz against Threads::Threads if using pthreads + Translations: Update the Portuguese translation - The liblzma target was recently changed to link against Threads::Threads - with the PRIVATE keyword. I had forgotten that xz itself depends on - pthreads too due to pthread_sigmask(). Thus, the build broke when - building shared liblzma and pthread_sigmask() wasn't in libc. - - Thanks to Peter Seiderer for the bug report. - - Fixes: ac05f1b0d7cda1e7ae79775a8dfecc54601d7f1c - Fixes: https://github.com/tukaani-project/xz/issues/129#issuecomment-2204522994 - (cherry picked from commit b3e53122f42796aaebd767bab920cf7bedf69966) + The language tag in the Translation Project is pt, not pt_PT, + thus I changed the "Language:" line to pt. - CMakeLists.txt | 13 +++++++++++++ - 1 file changed, 13 insertions(+) + po/pt.po | 1045 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 526 insertions(+), 519 deletions(-) -commit eccb4d258b01651d06a2a31b8b68be9b04b7998c +commit c3439b039f46fe547ad603e16dc3bd63c1ca9b0c Author: Lasse Collin -Date: 2024-07-02 22:49:33 +0300 +Date: 2025-03-14 13:02:21 +0200 - Update THANKS - - (cherry picked from commit 5742ec1fc7f2cf1c82cfe3477bb90594a4658374) + Translations: Update the Italian translation - THANKS | 1 + - 1 file changed, 1 insertion(+) + po/it.po | 1020 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 516 insertions(+), 504 deletions(-) -commit c9bd00327f064778babb014302718a18d65cf7d3 -Author: Sam James -Date: 2024-06-28 14:18:35 +0300 +commit 79b4ab8d79528dd633a84df2d29e63f5d13ccbdf +Author: Lasse Collin +Date: 2025-03-12 20:48:39 +0200 - CI: Speed up Valgrind job by using --trace-children-skip-by-arg=... - - This addresses the issue I mentioned in - 6c095a98fbec70b790253a663173ecdb669108c4 and speeds up the Valgrind - job a bit, because non-xz tools aren't run unnecessarily with - Valgrind by the script tests. + Translations: Update the Italian man page translations - (cherry picked from commit 7e99856f66c07852c4e0de7aa01951e9147d86b0) + Only trivial additions but this keeps the file in sync with the TP. - .github/workflows/ci.yml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + po4a/it.po | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) -commit 495de6ec9d7834c4ef4d5286844ef7b784eb951b +commit 515b6fc8557825e1335012b3b1c8cf71e2c38775 Author: Lasse Collin -Date: 2024-06-25 16:00:22 +0300 +Date: 2025-03-12 19:38:54 +0200 - Build: Prepend, not append, PTHREAD_CFLAGS to LIBS - - It shouldn't make any difference because LIBS should be empty - at that point in configure. But prepending is the correct way - because in general the libraries being added might require other - libraries that come later on the command line. - - (cherry picked from commit 2402e8a1ae92676fa0d4cb1b761d7f62f005c098) + Translations: Update the Italian man page translations - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + po4a/it.po | 129 ++++++++++++++++++++++++++++++++++++------------------------- + 1 file changed, 77 insertions(+), 52 deletions(-) -commit 55bf3f49a812e20a21e42323e39526bb31d9341a +commit 333b7c0b776295f0941269b4e6cdb1a0ba5f6218 Author: Lasse Collin -Date: 2024-06-25 14:24:29 +0300 +Date: 2025-03-10 21:00:31 +0200 - Build: Use AC_LINK_IFELSE to handle implicit function declarations - - It's more robust in case the compiler allows pre-C99 implicit function - declarations. If an x86 intrinsic is missing and gets treated as - implicit function, the linking step will very probably fail. This - isn't the only way to workaround implicit function declarations but - it might be the simplest and cleanest. - - The problem hasn't been observed in the wild. - - There are a couple more AC_COMPILE_IFELSE uses in configure.ac. - Of these, Landlock check calls prctl() and in theory could have - the same problem. In practice it doesn't as the check program - looks for several other things too. However, it was changed to - AC_LINK_IFELSE still to look more correct. - - Similarly, m4/tuklib_cpucores.m4 and m4/tuklib_physmem.m4 were - updated although they haven't given any trouble either. They - have worked all these years because those check programs rely - on specific headers and types: if headers or types are missing, - compilation will fail. Using the linker makes these checks more - similar to the ones in cmake/tuklib_*.cmake which always link. - - (cherry picked from commit 7bb46f2b7b3989c1b589a247a251470f65e91cda) + Translations: Update the Korean man page translations - configure.ac | 8 ++++++-- - m4/tuklib_cpucores.m4 | 8 ++++---- - m4/tuklib_physmem.m4 | 17 +++++++++++------ *** 14818 LINES SKIPPED *** From nobody Thu May 8 02:11:40 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZtFxS298Dz5vf97; Thu, 08 May 2025 02:11:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZtFxS1XYWz3r1R; Thu, 08 May 2025 02:11:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746670300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zARKt3/F9YdAmpFSSk/v7fbye+eexWzgCrjMTAP/HUs=; b=YvEBnQ2DTAejhPiA43go1Ad2IoQhlzrtmaen0a3rDex+dIEHGJoTFzXGJzXnO7yrGVGTUX Oxb/5eQUts/RwlQZbu6xMZ6b0xWUpNjpGTsN5TBO70lXugwlzSTzwM5I6yP4CwvQrTlftq /S6zSRwotED0LmARAjfUpTs7vz3D3VIBcKw/AW5P8hNHGmI+B36Mps4CIOMRQ34T/wiCrR idLIAQp3diwCYSXfk3yF9ojnjne3hM2jCVtczPa97LedLF4hyVgG8yBhwWdlupI3/NeRr6 5gaM8/mIeHoRCSXZpN1eoPZY763lMm4xtoL1XBN50mkuqHx0MNvNuZ074LwMtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746670300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zARKt3/F9YdAmpFSSk/v7fbye+eexWzgCrjMTAP/HUs=; b=H11agVSw3eI63Sss8hsXaH1DMYvU96ngROno8uP257Xq2J9Dg8Q2+0+UPnd8QG6Fi3uVNv lNEuixcPNT17H+IKyi6LVxDWjtEBXlygKMVaOmWKgCDT3cpaW3caAQxvXaSYHqMekcWl0Z bRvXN/pHIKHF3CIZDDhbDz7NZlFsU38/E75VdXxFEZ+04WROzVy+nI1fzdKcj1qaMAEsWW YgAzw6PKEE+EcmlrIeuCHcjFey+zk5pdCeGRnxs6+vZFSr9hC61+jbZ8CzBIdYNYdTrwzQ q4oe4DH2+IWlaAFbfggDAv6sv2B006CiacfaUGeR9+vJu4o91PvVjITjOn+auQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746670300; a=rsa-sha256; cv=none; b=fokjhiV+Ejm54/28eJrcB8UoTh8hIKvgDqup3GZPTHCINGHdFc9ph0zk0dziDX/4VoUqrR O8L8tYQFvED4fsqxfLLagHEBrbFiudxYddGRuOo3jqg8DQFQP7+ZXVLln8rcVi8RZn9Zu0 3yemm9HN+o8qpFp2j5XsngSc1/RwVB+Fz4j0UicVdortgDky9X0tQzuziilLuj9u2nWGmL e3sWD4pjGXuCFwd9BDi8uOlB1U6QssolhJmu/2OkaOyBmBmvz+1E587wKKmvGo9IU6dl6h GdEiPG3Ao3SycncQRlBxnvf92tFhJUZEJCAz1ncsaDFer+XCCA4BL9EzIjH6Yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZtFxS12SDzw48; Thu, 08 May 2025 02:11:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5482BeDf014943; Thu, 8 May 2025 02:11:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5482BeK9014940; Thu, 8 May 2025 02:11:40 GMT (envelope-from git) Date: Thu, 8 May 2025 02:11:40 GMT Message-Id: <202505080211.5482BeK9014940@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 22ebbdea3f33 - stable/14 - mpi3mr: Remove -g List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 22ebbdea3f33fdeae5ee83077ea9c25979705f2f Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=22ebbdea3f33fdeae5ee83077ea9c25979705f2f commit 22ebbdea3f33fdeae5ee83077ea9c25979705f2f Author: Warner Losh AuthorDate: 2025-05-08 02:09:45 +0000 Commit: Warner Losh CommitDate: 2025-05-08 02:11:13 +0000 mpi3mr: Remove -g This -g was introduce when I didn't review all the cahnges to mpi3mr I was MFCing. Remove it. This is a direct commit. PR: 249068 Fixes: 80b069913d496 Sponsored by: Netflix --- sys/modules/mpi3mr/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/modules/mpi3mr/Makefile b/sys/modules/mpi3mr/Makefile index 39aa2e3f0ddd..81d2e86afc7f 100644 --- a/sys/modules/mpi3mr/Makefile +++ b/sys/modules/mpi3mr/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mpi3mr KMOD= mpi3mr @@ -7,7 +6,6 @@ SRCS+= opt_cam.h SRCS+= device_if.h bus_if.h pci_if.h CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include -DEBUG_FLAGS= -g .include From nobody Thu May 8 06:45:20 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZtN1F0Mr0z5vwrQ; Thu, 08 May 2025 06:45:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZtN1D6FWgz41jj; Thu, 08 May 2025 06:45:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746686720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SeR73Fp36CyN/plpq+fvWzzNHfOG6zpjtjWdAgLuiZg=; b=XKQC3X5ZtMrBzZq0hR8vimuBgIbzUpqlQtnds2BZySGWrcJv+x5rMFLs86wZBZFeCIkHcM hEjPBL1Y6ZnqJb53rzDyu2wJxCwCEbfD2ZO1VghokuRdqr9vYLEVox1uFC7tnnK6Z2eDsU 8wwFfloM6Bcnjy3m7/STHumWrne5TnpPv/Bni6Ao2UeSbtgQjv+x4pMTQ22WjLHfMjmKNM CUt9bUZqNYfwAyI+y12eoZup5ezqc2luLkwghECzFf8C9ULkZI18WOaiWjQq889tShgJ3Q KXQcpuOxqGluOsl5nbJJNiHvrykSbYx8hLjiaQ8bPU/qeuCXuKDGS3cSCcjffw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746686720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SeR73Fp36CyN/plpq+fvWzzNHfOG6zpjtjWdAgLuiZg=; b=uidD1U+LNOFjyEkiAJVYxP8YsN+gEgwryukaaFdDP7j6NXCVMQFibCYFh/reRmWq+hiwwg LtbMmQXJ6G/8TrEeRo6QRUqLy472hf0vWnjKlpoPN11YHCkBDy0RcZ/jk7EBpB+lM2tdMA AcNS+UC3Hc8rbcYrPxGNISraoa7b5P7GUoq5Z9XQKlCQ0MF0l6NYYkbZQWeaHlJ1iQRkPf 3OU+IqWzsC0VOI99wVCqUXwhIfLpOeLfYbyLMzFnRWMOxnCtBbNmn3+Gw6TEf5rmgeCj38 Db+TnS0a9PBTREaDimmuKD9QCaybDrkpX5/3n8yhAJq193IaonTjs63YMxLumw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746686720; a=rsa-sha256; cv=none; b=oHOrinYmWrVhd8jkpeV5evwt2AjZHm/fG8czl/ga8B/wF785a5vMre6isYzu4OUSiu3cIC Bq1qN4DU4aeQFQ+lzdxWoO7YH3lEoMdvWXi+lGI+DsWfoB0eLykmgFXaW85szr9BDwe/Gm dnB9i+oH3NM1br2xjMz5BLyKksLm+n1wnqeYCtHPI7wC6VirBXw4vZc/1Qp1ta0v8iqqEo +4T5bf+Q/LUdllKM6+koLgPvcngGzfo1hN9rgvFLz2jqWTsn36qLhR4mH2NBFCt4/3WsHZ TAWDdp4cWUuGRho0iJo/RTjpQ9UrdagzRpLuIlOpp3ESvfiEpB2CCpN/zcP0JQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZtN1D5qhGz14C5; Thu, 08 May 2025 06:45:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5486jKOu023413; Thu, 8 May 2025 06:45:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5486jKxE023410; Thu, 8 May 2025 06:45:20 GMT (envelope-from git) Date: Thu, 8 May 2025 06:45:20 GMT Message-Id: <202505080645.5486jKxE023410@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 2fc0540469cb - stable/14 - udf: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2fc0540469cb188d88b762ced19b1c059cb95ebb Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=2fc0540469cb188d88b762ced19b1c059cb95ebb commit 2fc0540469cb188d88b762ced19b1c059cb95ebb Author: Gordon Bergling AuthorDate: 2025-05-05 08:47:23 +0000 Commit: Gordon Bergling CommitDate: 2025-05-08 06:45:07 +0000 udf: Fix a typo in a source code comment - s/demostrates/demonstrates/ (cherry picked from commit f6674f74fb299821d0f159b9f11cf7dd9b3e70ad) --- sys/fs/udf/udf_vfsops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/udf/udf_vfsops.c b/sys/fs/udf/udf_vfsops.c index 866d0172f745..c7438147c0a0 100644 --- a/sys/fs/udf/udf_vfsops.c +++ b/sys/fs/udf/udf_vfsops.c @@ -32,7 +32,7 @@ /* * Ok, here's how it goes. The UDF specs are pretty clear on how each data * structure is made up, but not very clear on how they relate to each other. - * Here is the skinny... This demostrates a filesystem with one file in the + * Here is the skinny... This demonstrates a filesystem with one file in the * root directory. Subdirectories are treated just as normal files, but they * have File Id Descriptors of their children as their file data. As for the * Anchor Volume Descriptor Pointer, it can exist in two of the following three From nobody Thu May 8 06:45:39 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZtN1b4JP6z5vwxb; Thu, 08 May 2025 06:45:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZtN1b1gGwz42Wq; Thu, 08 May 2025 06:45:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746686739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dVgCD2ihdki1Nk36x4c6tZKO2DmCxdM8CZpJNbQ3myM=; b=h7tb/mzca8Q/EPlI/JqcFS1cOUo29I006ru2yo38fn2shIHBYSWFnX09V25aA3I1zaIKAx DiQjd6xU7xzacPNiHNsqevC3qyWc5e922N5sr9Bh/W8L3rQp0f8Kbx2ljVZU8j0re3/jLX Zy+uuJ0chMDKBTxfGrji5hygszWi6fKpHo1rheQCOmZGCI/Mhd3f9y2iX0aNMo/fAzwr+9 b698VZV3HnIjqmR/MzaW8e60wrQB3Ad8Iur6uPTS3BFDSComhZFBG0O7JnnE/EYv+xPI4C kC2GZ6rIWHPmHo/+YGUaRw0A8LwGp3OOMtZt0J/LfV2IfajQxbMTmoKEWXkR1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746686739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dVgCD2ihdki1Nk36x4c6tZKO2DmCxdM8CZpJNbQ3myM=; b=RByrIV5mF131/3kUXEIwa5Z/1Oxlqr4EVSS2bfHngQl4Mt8co2g3r6FWL2cBJlTu6sabkd GEDeUNq3DkZniz2X/Kb0xzbrdyt7vzbwgQZbVbCYYdpPxeCv/8m/k2FpWPG+OODiR4lEV2 mhyi4/v2qgBrGN9gZrusqdsvNvt1P6gFn91ox4rqR0VkeYaQmjcM4YTwA/8hGU9GBYnqrV 520ItYfJMv+D9ES3HaL1H3X0eMGtjmBCDNHerZMUx5wjpvYTsA059RZQpWz22ir4vcOP8g fnf012i6MGBIai/toVxTvfKcEgMYLJE5hkeZzsBWcrJqA1FCcyA+SfioJR4f9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746686739; a=rsa-sha256; cv=none; b=QEnXo1zt358G/qz67CGT4lO2cyjfmAtUUhe7ZCYNjM/eypEJAqgvp9iDYg+IP7DK8WMNQq +uSgVjzJCgwP7Q4LJSzzV2ukcFkbgS1w9xdBsVwk0bkufmhzis9ql20HbWhNtWJJQtQugr 6GDSyC7b6uRAfdggLExCo+XnkUsyuwpjHAo2rSiXtlKNsuWlh28v9qVOAE3o3EQLozmstT Un822ko6Oaj5gA+julVZUhN4aZPo97BDp9VjWLYjmMRPl7zzLz1Ay7BO+I156Ky44vWCng yE+3ci5kFelM2KUmOrhp00V4mgq2s3QW9uztEjXihDr4GboUvl4Y279aH9Tdww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZtN1b13fxz13lC; Thu, 08 May 2025 06:45:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5486jdxf023629; Thu, 8 May 2025 06:45:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5486jdxL023626; Thu, 8 May 2025 06:45:39 GMT (envelope-from git) Date: Thu, 8 May 2025 06:45:39 GMT Message-Id: <202505080645.5486jdxL023626@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: faf7c4ad59df - stable/13 - udf: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: faf7c4ad59df3a6870a9aa8d80767bd750991817 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=faf7c4ad59df3a6870a9aa8d80767bd750991817 commit faf7c4ad59df3a6870a9aa8d80767bd750991817 Author: Gordon Bergling AuthorDate: 2025-05-05 08:47:23 +0000 Commit: Gordon Bergling CommitDate: 2025-05-08 06:45:28 +0000 udf: Fix a typo in a source code comment - s/demostrates/demonstrates/ (cherry picked from commit f6674f74fb299821d0f159b9f11cf7dd9b3e70ad) --- sys/fs/udf/udf_vfsops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/udf/udf_vfsops.c b/sys/fs/udf/udf_vfsops.c index efc216bc7635..4c9208642dea 100644 --- a/sys/fs/udf/udf_vfsops.c +++ b/sys/fs/udf/udf_vfsops.c @@ -32,7 +32,7 @@ /* * Ok, here's how it goes. The UDF specs are pretty clear on how each data * structure is made up, but not very clear on how they relate to each other. - * Here is the skinny... This demostrates a filesystem with one file in the + * Here is the skinny... This demonstrates a filesystem with one file in the * root directory. Subdirectories are treated just as normal files, but they * have File Id Descriptors of their children as their file data. As for the * Anchor Volume Descriptor Pointer, it can exist in two of the following three From nobody Thu May 8 13:09:20 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZtXXK1ScNz5wJS6; Thu, 08 May 2025 13:09:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZtXXK0bsvz3Kbc; Thu, 08 May 2025 13:09:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746709761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9uzSU9VtMBxLdOSiHPkcL1R+sas7HOHN0A2OY0oX5Gc=; b=gBC6Z1NuTq5hxpgvra5GqW62KrKzsKr8lDbTIwSc2Xpwh0isdVWxnWmMPg/YpnOXin3WHT A9tDa13TlBiC1CfKNz/M/NdIfnRsNX3zLg0KeX4N4hjoEq9LDkbKXX3CFI1bJKzmSieCRu MdI7PuDU16uhZsAsQOEbTUoWB2znqVQO/YiBjKYOjCAshCm3S8yEDjN0of4w/WPDQVsQfJ xwXQ4HPWIiwVHlrMfM/0WIXv95d3GjKWJM6fmexrMfOYcsrJmFnGtakprzN8Dtoag3ztfR Ika4dPOhu1KXklg+NAPYQwmxvbUtiyTmEOvlP6CRTZeZriEkV/Bjv094I3wUJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746709761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9uzSU9VtMBxLdOSiHPkcL1R+sas7HOHN0A2OY0oX5Gc=; b=iYaObQ3qDALjcISliRkg73Iiion7U5O0ZmUOqXZoSX6W/hmHJJqUTUnGFvQx60kppQkzW0 +F1Igiea9NpjiZPFjg+ptsazrr+Ain0vuQBnQZK4rzKXKsFsjiqMkgQyHVmUtlO0lVEhLq JJcDzCf1qSKxbWtSgl23WHwRcmvhfin6D34NvqPAAHkahGICNGQWDS7tC7Fc8YD1/zHabJ d3gmqV7heeqKdlYlyzrJedEOWsrSvHxZkdq0pNUT2nYy4h4QRktF9anGWQ9YEsoLxSxwIT FeHouv2EdsKyZ+dy3Yd8+rbuKFnV34yhtxXW/ghKLs9aBtWMZPWAzhHhEunjow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746709761; a=rsa-sha256; cv=none; b=wrElf/8qk9Dx8DmzzI9DhY6BYuOHbAJgBV4YnXzRY17ekkcHFV/9GHBO9IUpl5a54qS8MU L5Za/0e8L8w7g5ppGRhLznUQSMMUa9zmRNTgi2m/nUQGxZvRTuk154SK10RWa0pWr/Kqk3 IzadShDWWZlyeYZB9HD/X8rnIafEu+mhQJmX162LzC2+VK3SVxjZ+sb62+4VDzagV8Yjap O/YBpEfIzBlFiBl+ItUzor+J5IcjRMfXLCx2sKvOfRfEg9zBJDIzTUmmriYl4eCVNMKqIS K23ZG7q8pO9195yVv8j2XrdIO2ZbIvhhZS1SRQLLEYWSq6z87k9IacSnp5Yhdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZtXXJ6zrcz1H1; Thu, 08 May 2025 13:09:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 548D9KnF036789; Thu, 8 May 2025 13:09:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 548D9KbL036786; Thu, 8 May 2025 13:09:20 GMT (envelope-from git) Date: Thu, 8 May 2025 13:09:20 GMT Message-Id: <202505081309.548D9KbL036786@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: b64d3fc8844f - releng/14.3 - nuageinit: implement chpasswd List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: b64d3fc8844f09100eef9a8d26919a6d5cc98d93 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=b64d3fc8844f09100eef9a8d26919a6d5cc98d93 commit b64d3fc8844f09100eef9a8d26919a6d5cc98d93 Author: Baptiste Daroussin AuthorDate: 2025-04-25 15:16:22 +0000 Commit: Baptiste Daroussin CommitDate: 2025-05-08 13:08:55 +0000 nuageinit: implement chpasswd Add support for chpasswd, with all possible syntaxes, including deprecated one: chpasswd.list as a list or as a multiline string as some providers are still only providing this deprecated form Approved by: re (cperciva) Sponsored by: OVHCloud MFC After: 1 week Reviewed by: kevans, jlduran Differential Revision: https://reviews.freebsd.org/D50021 (cherry picked from commit c201a1198ad70e7d096ee32c364d539eed2dfec4) (cherry picked from commit 6c912470030ba958f2e41a00b44f6430919b1389) --- libexec/nuageinit/nuage.lua | 105 ++++++++++++++++++++- libexec/nuageinit/nuageinit | 6 +- libexec/nuageinit/tests/nuageinit.sh | 175 +++++++++++++++++++++++++++++++++++ 3 files changed, 283 insertions(+), 3 deletions(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index e58069164130..15af5afbd9f0 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -1,7 +1,7 @@ --- -- SPDX-License-Identifier: BSD-2-Clause -- --- Copyright(c) 2022 Baptiste Daroussin +-- Copyright(c) 2022-2025 Baptiste Daroussin local unistd = require("posix.unistd") local sys_stat = require("posix.sys.stat") @@ -261,6 +261,106 @@ local function update_sshd_config(key, value) os.rename(sshd_config .. ".nuageinit", sshd_config) end +local function exec_change_password(user, password, type, expire) + local root = os.getenv("NUAGE_FAKE_ROOTDIR") + local cmd = "pw " + if root then + cmd = cmd .. "-R " .. root .. " " + end + local postcmd = " -H 0" + local input = password + if type ~= nil and type == "text" then + postcmd = " -h 0" + else + if password == "RANDOM" then + input = nil + postcmd = " -w random" + end + end + cmd = cmd .. "usermod " .. user .. postcmd + if expire then + cmd = cmd .. " -p 1" + else + cmd = cmd .. " -p 0" + end + local f = io.popen(cmd .. " >/dev/null", "w") + if input then + f:write(input) + end + -- ignore stdout to avoid printing the password in case of random password + local r = f:close(cmd) + if not r then + warnmsg("fail to change user password ".. user) + warnmsg(cmd) + end +end + +local function change_password_from_line(line, expire) + local user, password = line:match("%s*(%w+):(%S+)%s*") + local type = nil + if user and password then + if password == "R" then + password = "RANDOM" + end + if not password:match("^%$%d+%$%w+%$") then + if password ~= "RANDOM" then + type = "text" + end + end + exec_change_password(user, password, type, expire) + end +end + +local function chpasswd(obj) + if type(obj) ~= "table" then + warnmsg("Invalid chpasswd entry, expecting an object") + return + end + local expire = false + if obj.expire ~= nil then + if type(obj.expire) == "boolean" then + expire = obj.expire + else + warnmsg("Invalid type for chpasswd.expire, expecting a boolean, got a ".. type(obj.expire)) + end + end + if obj.users ~= nil then + if type(obj.users) ~= "table" then + warnmsg("Invalid type for chpasswd.users, expecting a list, got a ".. type(obj.users)) + goto list + end + for _, u in ipairs(obj.users) do + if type(u) ~= "table" then + warnmsg("Invalid chpasswd.users entry, expecting an object, got a " .. type(u)) + goto next + end + if not u.name then + warnmsg("Invalid entry for chpasswd.users: missing 'name'") + goto next + end + if not u.password then + warnmsg("Invalid entry for chpasswd.users: missing 'password'") + goto next + end + exec_change_password(u.name, u.password, u.type, expire) + ::next:: + end + end + ::list:: + if obj.list ~= nil then + warnmsg("chpasswd.list is deprecated consider using chpasswd.users") + if type(obj.list) == "string" then + for line in obj.list:gmatch("[^\n]+") do + change_password_from_line(line, expire) + end + elseif type(obj.list) == "table" then + for _, u in ipairs(obj.list) do + change_password_from_line(u, expire) + end + end + end +end + local n = { warn = warnmsg, err = errmsg, @@ -270,7 +370,8 @@ local n = { adduser = adduser, addgroup = addgroup, addsshkey = addsshkey, - update_sshd_config = update_sshd_config + update_sshd_config = update_sshd_config, + chpasswd = chpasswd } return n diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 341330e68128..74a75c88098a 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -2,7 +2,7 @@ --- -- SPDX-License-Identifier: BSD-2-Clause-FreeBSD -- --- Copyright(c) 2022 Baptiste Daroussin +-- Copyright(c) 2022-2025 Baptiste Daroussin local nuage = require("nuage") local ucl = require("ucl") @@ -359,6 +359,10 @@ if line == "#cloud-config" then end nuage.update_sshd_config("PasswordAuthentication", value) end + if obj.chpasswd ~= nil then + nuage.chpasswd(obj.chpasswd) + end + else local res, err = os.execute(path .. "/" .. ud) if not res then diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index d3b1d5e6df2e..1b67468971a6 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -20,6 +20,9 @@ atf_test_case config2_network atf_test_case config2_network_static_v4 atf_test_case config2_ssh_keys atf_test_case nocloud_userdata_cloudconfig_ssh_pwauth +atf_test_case nocloud_userdata_cloudconfig_chpasswd +atf_test_case nocloud_userdata_cloudconfig_chpasswd_list_string +atf_test_case nocloud_userdata_cloudconfig_chpasswd_list_list args_body() { @@ -512,6 +515,175 @@ EOF atf_check -o inline:"PasswordAuthentication no\n" cat etc/ssh/sshd_config } +nocloud_userdata_cloudconfig_chpasswd_head() +{ + atf_set "require.user" root +} +nocloud_userdata_cloudconfig_chpasswd_body() +{ + mkdir -p etc + cat > etc/master.passwd << EOF +root:*:0:0::0:0:Charlie &:/root:/bin/sh +sys:*:1:0::0:0:Sys:/home/sys:/bin/sh +user:*:1:0::0:0:Sys:/home/sys:/bin/sh +EOF + pwd_mkdb -d etc "${PWD}"/etc/master.passwd + cat > etc/group << EOF +wheel:*:0:root +users:*:1: +EOF + mkdir -p media/nuageinit + printf "instance-id: iid-local01\n" > "${PWD}"/media/nuageinit/meta-data + cat > media/nuageinit/user-data << 'EOF' +#cloud-config +chpasswd: + expire: true + users: + - { user: "sys", password: RANDOM } +EOF + + atf_check -o empty -e inline:"nuageinit: Invalid entry for chpasswd.users: missing 'name'\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + # nothing modified + atf_check -o inline:"sys:*:1:0::0:0:Sys:/home/sys:/bin/sh\n" pw -R $(pwd) usershow sys + + cat > media/nuageinit/user-data << 'EOF' +#cloud-config +chpasswd: + expire: true + users: + - { name: "sys", pwd: RANDOM } +EOF + atf_check -o empty -e inline:"nuageinit: Invalid entry for chpasswd.users: missing 'password'\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + # nothing modified + atf_check -o inline:"sys:*:1:0::0:0:Sys:/home/sys:/bin/sh\n" pw -R $(pwd) usershow sys + + cat > media/nuageinit/user-data << 'EOF' +#cloud-config +chpasswd: + expire: false + users: + - { name: "sys", password: RANDOM } +EOF + # not empty because the password is printed to stdout + atf_check -o empty -e empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + atf_check -o match:'sys:\$.*:1:0::0:0:Sys:/home/sys:/bin/sh$' pw -R $(pwd) usershow sys + + cat > media/nuageinit/user-data << 'EOF' +#cloud-config +chpasswd: + expire: true + users: + - { name: "sys", password: RANDOM } +EOF + # not empty because the password is printed to stdout + atf_check -o empty -e empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + atf_check -o match:'sys:\$.*:1:0::1:0:Sys:/home/sys:/bin/sh$' pw -R $(pwd) usershow sys + + cat > media/nuageinit/user-data << 'EOF' +#cloud-config +chpasswd: + expire: true + users: + - { name: "user", password: "$6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/" } +EOF + # not empty because the password is printed to stdout + atf_check -o empty -e empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + atf_check -o inline:'user:$6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/:1:0::1:0:Sys:/home/sys:/bin/sh\n' pw -R $(pwd) usershow user +} + + +nocloud_userdata_cloudconfig_chpasswd_list_string_head() +{ + atf_set "require.user" root +} +nocloud_userdata_cloudconfig_chpasswd_list_string_body() +{ + mkdir -p etc + cat > etc/master.passwd << EOF +root:*:0:0::0:0:Charlie &:/root:/bin/sh +sys:*:1:0::0:0:Sys:/home/sys:/bin/sh +user:*:1:0::0:0:Sys:/home/sys:/bin/sh +EOF + pwd_mkdb -d etc "${PWD}"/etc/master.passwd + cat > etc/group << EOF +wheel:*:0:root +users:*:1: +EOF + mkdir -p media/nuageinit + printf "instance-id: iid-local01\n" > "${PWD}"/media/nuageinit/meta-data + cat > media/nuageinit/user-data << 'EOF' +#cloud-config +chpasswd: + expire: true + list: | + sys:RANDOM +EOF + + atf_check -o empty -e inline:"nuageinit: chpasswd.list is deprecated consider using chpasswd.users\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + atf_check -o match:'sys:\$.*:1:0::1:0:Sys:/home/sys:/bin/sh$' pw -R $(pwd) usershow sys + + cat > media/nuageinit/user-data << 'EOF' +#cloud-config +chpasswd: + expire: false + list: | + sys:plop + user:$6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/ + root:R +EOF + + atf_check -o empty -e ignore /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + atf_check -o match:'sys:\$.*:1:0::0:0:Sys:/home/sys:/bin/sh$' pw -R $(pwd) usershow sys + atf_check -o inline:'user:$6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/:1:0::0:0:Sys:/home/sys:/bin/sh\n' pw -R $(pwd) usershow user + atf_check -o match:'root:\$.*:0:0::0:0:Charlie &:/root:/bin/sh$' pw -R $(pwd) usershow root +} + +nocloud_userdata_cloudconfig_chpasswd_list_list_head() +{ + atf_set "require.user" root +} +nocloud_userdata_cloudconfig_chpasswd_list_list_body() +{ + mkdir -p etc + cat > etc/master.passwd << EOF +root:*:0:0::0:0:Charlie &:/root:/bin/sh +sys:*:1:0::0:0:Sys:/home/sys:/bin/sh +user:*:1:0::0:0:Sys:/home/sys:/bin/sh +EOF + pwd_mkdb -d etc "${PWD}"/etc/master.passwd + cat > etc/group << EOF +wheel:*:0:root +users:*:1: +EOF + mkdir -p media/nuageinit + printf "instance-id: iid-local01\n" > "${PWD}"/media/nuageinit/meta-data + cat > media/nuageinit/user-data << 'EOF' +#cloud-config +chpasswd: + expire: true + list: + - sys:RANDOM +EOF + + atf_check -o empty -e inline:"nuageinit: chpasswd.list is deprecated consider using chpasswd.users\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + atf_check -o match:'sys:\$.*:1:0::1:0:Sys:/home/sys:/bin/sh$' pw -R $(pwd) usershow sys + + cat > media/nuageinit/user-data << 'EOF' +#cloud-config +chpasswd: + expire: false + list: + - sys:plop + - user:$6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/ + - root:R +EOF + + atf_check -o empty -e ignore /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + atf_check -o match:'sys:\$.*:1:0::0:0:Sys:/home/sys:/bin/sh$' pw -R $(pwd) usershow sys + atf_check -o inline:'user:$6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/:1:0::0:0:Sys:/home/sys:/bin/sh\n' pw -R $(pwd) usershow user + atf_check -o match:'root:\$.*:0:0::0:0:Charlie &:/root:/bin/sh$' pw -R $(pwd) usershow root +} + atf_init_test_cases() { atf_add_test_case args @@ -528,4 +700,7 @@ atf_init_test_cases() atf_add_test_case config2_network_static_v4 atf_add_test_case config2_ssh_keys atf_add_test_case nocloud_userdata_cloudconfig_ssh_pwauth + atf_add_test_case nocloud_userdata_cloudconfig_chpasswd + atf_add_test_case nocloud_userdata_cloudconfig_chpasswd_list_string + atf_add_test_case nocloud_userdata_cloudconfig_chpasswd_list_list } From nobody Thu May 8 15:44:59 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ztc092dzsz5vFQM for ; Thu, 08 May 2025 15:45:13 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ztc083JFFz47T0 for ; Thu, 08 May 2025 15:45:12 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20230601.gappssmtp.com header.s=20230601 header.b=dgCVSMMO; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::42b) smtp.mailfrom=wlosh@bsdimp.com; dmarc=none Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-7398d65476eso1043836b3a.1 for ; Thu, 08 May 2025 08:45:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1746719110; x=1747323910; darn=freebsd.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=/wsLL/mXCVyXysM2BK/5IsqlNJlty3piTZGhe66EkV4=; b=dgCVSMMOWyl+/jOjZXjngK8lvUbNWTL5I36aXwY+DVwI03+xx/8rpx/oTC5+61GaEx jLAIAn4Plp/Qh+NvUaPpO7ASk7fVPC3cOghxgQ0MN/uvITYV/LNmw4S4H3EX3BMJab/f OTd3Bmd4pjZz8h1M3loo7iJiTWEd3sGzsGqoFbiDF0WNaW1qix1/xZuOS1dkCsABC8lD FiCevYcaLIFscrpzCUjECyvPxM0MRV4xiPZEPWwHWpGNAUblf4zXsjBrW8dD6Pq3MAfQ /ry98Er3Ht2cVMthEMJ5vyjr8IHbEsGW47C/sPB9tfuqGNDqt/FOkWLWi0gW1/q9rGfP TEqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746719110; x=1747323910; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/wsLL/mXCVyXysM2BK/5IsqlNJlty3piTZGhe66EkV4=; b=EAqB9xzIdfMWb8fRgmrDOoWqkvNrwyXVo8AM4eA/+U4Dd+cUbPQ17l09nRMmGYx3sF N4lQo8XGhDMozkakfAuJv+hIQfZs1G7KqOWPltErtMMzBKRE5UvhPbx5dM9Q/4uXDjfB pL92jPqbtKk6vKFEPvXPu8hOUgRY6nqa8D+UzFjHBh/dDM+VGCx9mO/E94rUzQboe/Se xBowOke5s8JLfqN+uLUri5ZiT2XDZiLgCswb9Z2Keus6REbQuZavaNtgxQDQ+hI7n26j 1bWGBCfW9zmhbBggggcNfnvfr5nUi5siaOwzhlfVj7Y0cHtq7l6kxhIjL2tjp/IrAk1X fecw== X-Forwarded-Encrypted: i=1; AJvYcCUSlSycdEBSY4z2bqTc46aCIRA5lLMTMfEp3P1Vnum1AGBi47er1EIQnt5a1ttjwxlNpj56r3pGKWeBV1dBzuMmNEsm4JzAQoc=@freebsd.org X-Gm-Message-State: AOJu0YyAR7MNK4TWnABPe/v6awqOGvaOdgBMy1PJ6IaWc4TpW69GtALC OKuP6l9I1O4QYgJzCfVdXM7grlGCdqIlZ1uMx1d/Hdi7Azyrr4RuyWhtAOpYDCK9O3B4PEyGZH4 fmfzSdx2A7M+N23dUnZW0Fj0xLVpKWnDSKp6XUQ== X-Gm-Gg: ASbGncuyNy+w2g0g1SyfNb7Jtvfq538FzYdVT0pTOot7MRDYLjgCBunkfcj8ClUy/0o EwL2iGGP0OaD0ORqcTxmxh85EJtYkbjpYrq7m3CcXLEaX8JfrIKYMHR397sasV4+0199WwB3Wow mhbB9PbB3h0wD3g0yxTPJ+ng== X-Google-Smtp-Source: AGHT+IFmk9vrN5Khhk23qXfFPrBCJa/bDa2B9JhhBwx1fB4tOsRL52+z+ESuqMCcFJLrZxtFpr1OB30KtkyeoPnsPhU= X-Received: by 2002:a05:6a00:6383:b0:737:cd8:2484 with SMTP id d2e1a72fcca58-740a9318f65mr4957554b3a.6.1746719110492; Thu, 08 May 2025 08:45:10 -0700 (PDT) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 References: <202504301721.53UHLjlw095104@gitrepo.freebsd.org> <878qn8r3t6.wl-herbert@gojira.at> In-Reply-To: <878qn8r3t6.wl-herbert@gojira.at> From: Warner Losh Date: Thu, 8 May 2025 09:44:59 -0600 X-Gm-Features: ATxdqUHLbjc1DY600n_4qds0iHOY07LrG6JmIjFMnqvosqJ9SOa_H-KFtTqhdT4 Message-ID: Subject: Re: git: 80b069913d49 - stable/14 - mpi3mr: Divert large WriteSame IOs to firmware if unmap and ndob bits are set To: "Herbert J. Skuhra" Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4Ztc083JFFz47T0 X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.42 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.985]; NEURAL_HAM_MEDIUM(-0.44)[-0.438]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20230601.gappssmtp.com:s=20230601]; MIME_GOOD(-0.10)[text/plain]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; MISSING_XM_UA(0.00)[]; R_SPF_NA(0.00)[no SPF record]; DMARC_NA(0.00)[bsdimp.com]; MLMMJ_DEST(0.00)[dev-commits-src-branches@freebsd.org]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::42b:from]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-branches@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20230601.gappssmtp.com:+] I think that I've fixed this. Warner On Wed, May 7, 2025 at 6:41=E2=80=AFAM Herbert J. Skuhra wrote: > > On Wed, 30 Apr 2025 19:21:45 +0200, Warner Losh wrote: > > > > The branch stable/14 has been updated by imp: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D80b069913d496bd73b0ea8e5= 15b6bf3706530ea1 > > > > commit 80b069913d496bd73b0ea8e515b6bf3706530ea1 > > Author: Chandrakanth patil > > AuthorDate: 2024-06-06 08:38:52 +0000 > > Commit: Warner Losh > > CommitDate: 2025-04-30 17:05:52 +0000 > > > > mpi3mr: Divert large WriteSame IOs to firmware if unmap and ndob bi= ts are set > > > > Firmware advertises the transfer lenght for writesame commands to d= river during init. > > So for any writesame IOs with ndob and unmap bit set and transfer l= engh is greater > > than the max write same length specified by the firmware, then dire= ct those commands > > to firmware instead of hardware otherwise hardware will break. > > > > Reviewed by: imp > > Approved by: imp > > Differential revision: https://reviews.freebsd.org/D44452 > > > > (cherry picked from commit 3f3a15543a6721100dda0e4219eb48ecbe35731a= ) > > --- > > sys/dev/mpi3mr/mpi3mr.c | 16 ++++++++++++++++ > > sys/dev/mpi3mr/mpi3mr.h | 2 ++ > > sys/dev/mpi3mr/mpi3mr_cam.c | 35 +++++++++++++++++++++++++++++++++++ > > sys/dev/mpi3mr/mpi3mr_cam.h | 1 + > > sys/modules/mpi3mr/Makefile | 3 +++ > > 5 files changed, 57 insertions(+) > > > > diff --git a/sys/dev/mpi3mr/mpi3mr.c b/sys/dev/mpi3mr/mpi3mr.c > > index 03fea4bdfcc7..a7bc459c1db8 100644 > > --- a/sys/dev/mpi3mr/mpi3mr.c > > +++ b/sys/dev/mpi3mr/mpi3mr.c > > @@ -2177,6 +2177,8 @@ static int mpi3mr_issue_iocinit(struct mpi3mr_sof= tc *sc) > > time_in_msec =3D (now.tv_sec * 1000 + now.tv_usec/1000); > > iocinit_req.TimeStamp =3D htole64(time_in_msec); > > > > + iocinit_req.MsgFlags |=3D MPI3_IOCINIT_MSGFLAGS_WRITESAMEDIVERT_S= UPPORTED; > > + > > init_completion(&sc->init_cmds.completion); > > retval =3D mpi3mr_submit_admin_cmd(sc, &iocinit_req, > > sizeof(iocinit_req)); > > @@ -3340,6 +3342,19 @@ void mpi3mr_update_device(struct mpi3mr_softc *s= c, > > break; > > } > > > > + switch (flags & MPI3_DEVICE0_FLAGS_MAX_WRITE_SAME_MASK) { > > + case MPI3_DEVICE0_FLAGS_MAX_WRITE_SAME_256_LB: > > + tgtdev->ws_len =3D 256; > > + break; > > + case MPI3_DEVICE0_FLAGS_MAX_WRITE_SAME_2048_LB: > > + tgtdev->ws_len =3D 2048; > > + break; > > + case MPI3_DEVICE0_FLAGS_MAX_WRITE_SAME_NO_LIMIT: > > + default: > > + tgtdev->ws_len =3D 0; > > + break; > > + } > > + > > switch (tgtdev->dev_type) { > > case MPI3_DEVICE_DEVFORM_SAS_SATA: > > { > > @@ -5649,6 +5664,7 @@ static void mpi3mr_invalidate_devhandles(struct m= pi3mr_softc *sc) > > target->io_throttle_enabled =3D 0; > > target->io_divert =3D 0; > > target->throttle_group =3D NULL; > > + target->ws_len =3D 0; > > } > > } > > mtx_unlock_spin(&sc->target_lock); > > diff --git a/sys/dev/mpi3mr/mpi3mr.h b/sys/dev/mpi3mr/mpi3mr.h > > index 2f91b0b702dd..fa50ed035fc2 100644 > > --- a/sys/dev/mpi3mr/mpi3mr.h > > +++ b/sys/dev/mpi3mr/mpi3mr.h > > @@ -232,6 +232,8 @@ extern char fmt_os_ver[16]; > > > > #define MPI3MR_PERIODIC_DELAY 1 /* 1 second heartbeat/wat= chdog check */ > > > > +#define WRITE_SAME_32 0x0d > > + > > struct completion { > > unsigned int done; > > struct mtx lock; > > diff --git a/sys/dev/mpi3mr/mpi3mr_cam.c b/sys/dev/mpi3mr/mpi3mr_cam.c > > index d4cb7e9265dd..dca194a5c8cd 100644 > > --- a/sys/dev/mpi3mr/mpi3mr_cam.c > > +++ b/sys/dev/mpi3mr/mpi3mr_cam.c > > @@ -83,6 +83,7 @@ > > #include "mpi3mr.h" > > #include /* XXX for pcpu.h */ > > #include /* XXX for PCPU_GET */ > > +#include > > > > #define smp_processor_id() PCPU_GET(cpuid) > > > > @@ -102,6 +103,37 @@ extern void mpi3mr_add_sg_single(void *paddr, U8 f= lags, U32 length, > > > > static U32 event_count; > > > > +static > > +inline void mpi3mr_divert_ws(Mpi3SCSIIORequest_t *req, > > + struct ccb_scsiio *csio, > > + U16 ws_len) > > +{ > > + U8 unmap =3D 0, ndob =3D 0; > > + U32 num_blocks =3D 0; > > + U8 opcode =3D scsiio_cdb_ptr(csio)[0]; > > + U16 service_action =3D ((scsiio_cdb_ptr(csio)[8] << 8) | scsiio_c= db_ptr(csio)[9]); > > + > > + > > + if (opcode =3D=3D WRITE_SAME_16 || > > + (opcode =3D=3D VARIABLE_LEN_CDB && > > + service_action =3D=3D WRITE_SAME_32)) { > > + > > + int unmap_ndob_index =3D (opcode =3D=3D WRITE_SAME_16) ? = 1 : 10; > > + > > + unmap =3D scsiio_cdb_ptr(csio)[unmap_ndob_index] & 0x08; > > + ndob =3D scsiio_cdb_ptr(csio)[unmap_ndob_index] & 0x01; > > + num_blocks =3D get_unaligned_be32(scsiio_cdb_ptr(csio) + > > + ((opcode =3D=3D WRITE_SAM= E_16) ? 10 : 28)); > > + > > + /* Check conditions for diversion to firmware */ > > + if (unmap && ndob && num_blocks > ws_len) { > > + req->MsgFlags |=3D MPI3_SCSIIO_MSGFLAGS_DIVERT_TO= _FIRMWARE; > > + req->Flags =3D htole32(le32toh(req->Flags) | > > + MPI3_SCSIIO_FLAGS_DIVERT_REA= SON_WRITE_SAME_TOO_LARGE); > > + } > > + } > > +} > > + > > static void mpi3mr_prepare_sgls(void *arg, > > bus_dma_segment_t *segs, int nsegs, int error) > > { > > @@ -1080,6 +1112,9 @@ mpi3mr_action_scsiio(struct mpi3mr_cam_softc *cam= _sc, union ccb *ccb) > > break; > > } > > > > + if (targ->ws_len) > > + mpi3mr_divert_ws(req, csio, targ->ws_len); > > + > > req->Flags =3D htole32(mpi_control); > > > > if (csio->ccb_h.flags & CAM_CDB_POINTER) > > diff --git a/sys/dev/mpi3mr/mpi3mr_cam.h b/sys/dev/mpi3mr/mpi3mr_cam.h > > index 3a0526217f86..115ce0c4b8d7 100644 > > --- a/sys/dev/mpi3mr/mpi3mr_cam.h > > +++ b/sys/dev/mpi3mr/mpi3mr_cam.h > > @@ -121,6 +121,7 @@ struct mpi3mr_target { > > struct mpi3mr_throttle_group_info *throttle_group; > > uint64_t q_depth; > > enum mpi3mr_target_state state; > > + uint16_t ws_len; > > }; > > > > struct mpi3mr_cam_softc { > > diff --git a/sys/modules/mpi3mr/Makefile b/sys/modules/mpi3mr/Makefile > > index 3f1f63a94ac3..39aa2e3f0ddd 100644 > > --- a/sys/modules/mpi3mr/Makefile > > +++ b/sys/modules/mpi3mr/Makefile > > @@ -6,6 +6,9 @@ SRCS=3D mpi3mr_pci.c mpi3mr.c mpi3mr_cam.c mpi3mr_app.c > > SRCS+=3D opt_cam.h > > SRCS+=3D device_if.h bus_if.h pci_if.h > > > > +CFLAGS+=3D -I${SRCTOP}/sys/compat/linuxkpi/common/include > > +DEBUG_FLAGS=3D -g > ^^^^^^^^^^^^^^^^ > > + > > .include > > > > CWARNFLAGS.mpi3mr_sas.c=3D ${NO_WUNNEEDED_INTERNAL_DECL} > > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D249068#c2 > > -- > Herbert From nobody Thu May 8 16:25:58 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZtcvB5tFQz5vHyt; Thu, 08 May 2025 16:25:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZtcvB5j6Wz3KXq; Thu, 08 May 2025 16:25:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746721558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8FDyc/MWdTeN4+Uw+YEXQviuPRxy9pmxc5ytdfFqrLo=; b=RFBLWKYQfKjmAui93Oea8LkSRu2odQGHbLaHol78yugQnzHlQrybJd08fcgskQEDg6O0z1 SFkfhwYUHjp7jMPA4VNTUj63wlbw4S6qK50j/yiL9VP4ufP3sm/x7ZZo25th+Rq3YvQ39+ QVFaj04YLhajGUSXiBFyQtbcbMG210pcH6X+pxYp/LvWvaEkuvAtonfCAtSS5mza50+qP5 L/QTNvES0D8bP1LUr7O8SOxo+OPnhUhIRx+tvzUpOikmW62kUQNUkAuIx2P2q3MVoUSU0C A3sGdq8OnnKuuF69n6utUnl7qiZRlcJqzFMtsUpWRN3SlYvR4ehHVSR6gLLr6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746721558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8FDyc/MWdTeN4+Uw+YEXQviuPRxy9pmxc5ytdfFqrLo=; b=JxXG1qwEt2ZJdXGqAlRDakXK4j0Hzej/o/e2jfeyntfAyscrmdKzIYTTx8dNgJvHhpEV5W rZU0EYJeKtGzoPR/k8Fbzi5PlRNl51uhRPLaNLnHX75UossLRm386J87XQJNNVEBa/Uunt 6aLVwaQxdEUCEVAQO5Hk37RZaV1tGPOZtzKS7511fFmAHdL5UM4Z5r+pAm872Mm4viMJaI 17AZGnLlPBzcgycUrPE1CA/h4iyw1wf5GZltg7Lxx2s2325E2+tmdU4n8GkUKhHNNKPaD2 nNDkupZQuwjA9Cr8Hpy4rmKIaGQqMcfF032uYJugAiRJBd6m9UnmyHLnctge6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746721558; a=rsa-sha256; cv=none; b=xgYFd94cJ7AhoqaU62glkqWT87YR7pbntH1ixP/V27pimA/Jbwoa0aM6UtaEfoR3HzKD3E RmFx2ETMJLILpdSe2Ig8fr/v3Ra4/2nc8UBtOAvjrGp5e5mvSRQNGRgi29q/CNUnNGFsJT Iq9aODffLfeu8KhArxQpG78Js0BVfV6jW1HfpiQMQ7rgl1eEmk8Q6a4najvKcq3g8bMzK6 DNVdxOkvljnU+TUE6xYEusTvZjgO+G8AYrLM8QR8QZDclp9+ig5QtEQ2J3yLeNGQydYsl+ YY6l4J1IOb/IIfMeQDgZv2KrhpDbMOltGrU+G5yHJ6gnTyvL9nxDZOqJkwJkKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZtcvB4yyWz775; Thu, 08 May 2025 16:25:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 548GPwEi011828; Thu, 8 May 2025 16:25:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 548GPwvL011825; Thu, 8 May 2025 16:25:58 GMT (envelope-from git) Date: Thu, 8 May 2025 16:25:58 GMT Message-Id: <202505081625.548GPwvL011825@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 9679eedea94c - releng/14.3 - MFV: xz 5.8.1. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 9679eedea94c9d60c372c67350242acfe18e2b22 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=9679eedea94c9d60c372c67350242acfe18e2b22 commit 9679eedea94c9d60c372c67350242acfe18e2b22 Author: Xin LI AuthorDate: 2025-05-04 07:06:22 +0000 Commit: Xin LI CommitDate: 2025-05-08 16:24:51 +0000 MFV: xz 5.8.1. PR: bin/286252 Approved by: re (cperciva) (cherry picked from commit 128836d304d93f2d00eb14069c27089ab46c38d4) (cherry picked from commit 5cf27a49a2de91ae1f369912a7bf3859fbc79355) --- contrib/xz/AUTHORS | 2 +- contrib/xz/COPYING | 25 +- contrib/xz/ChangeLog | 6031 +++++++++++++++----- contrib/xz/README | 107 +- contrib/xz/THANKS | 37 + contrib/xz/TODO | 25 +- contrib/xz/src/common/my_landlock.h | 141 + contrib/xz/src/common/sysdefs.h | 58 +- contrib/xz/src/common/tuklib_common.h | 11 +- contrib/xz/src/common/tuklib_gettext.h | 11 + contrib/xz/src/common/tuklib_mbstr.h | 25 +- contrib/xz/src/common/tuklib_mbstr_nonprint.c | 162 + contrib/xz/src/common/tuklib_mbstr_nonprint.h | 71 + contrib/xz/src/common/tuklib_mbstr_width.c | 34 +- contrib/xz/src/common/tuklib_mbstr_wrap.c | 294 + contrib/xz/src/common/tuklib_mbstr_wrap.h | 204 + contrib/xz/src/common/tuklib_physmem.c | 11 +- contrib/xz/src/liblzma/api/lzma/bcj.h | 97 + contrib/xz/src/liblzma/api/lzma/container.h | 2 +- contrib/xz/src/liblzma/api/lzma/lzma12.h | 2 +- contrib/xz/src/liblzma/api/lzma/version.h | 4 +- contrib/xz/src/liblzma/check/check.h | 18 - contrib/xz/src/liblzma/check/crc32_arm64.h | 55 +- contrib/xz/src/liblzma/check/crc32_fast.c | 46 +- contrib/xz/src/liblzma/check/crc32_loongarch.h | 65 + contrib/xz/src/liblzma/check/crc32_small.c | 3 + contrib/xz/src/liblzma/check/crc32_table.c | 42 - contrib/xz/src/liblzma/check/crc32_x86.S | 14 +- contrib/xz/src/liblzma/check/crc64_fast.c | 39 +- contrib/xz/src/liblzma/check/crc64_table.c | 37 - contrib/xz/src/liblzma/check/crc64_x86.S | 14 +- .../xz/src/liblzma/check/crc_clmul_consts_gen.c | 160 + contrib/xz/src/liblzma/check/crc_common.h | 111 +- contrib/xz/src/liblzma/check/crc_x86_clmul.h | 519 +- contrib/xz/src/liblzma/common/alone_decoder.c | 3 +- contrib/xz/src/liblzma/common/auto_decoder.c | 5 +- contrib/xz/src/liblzma/common/block_decoder.c | 6 +- contrib/xz/src/liblzma/common/block_encoder.c | 6 +- contrib/xz/src/liblzma/common/common.c | 8 +- contrib/xz/src/liblzma/common/file_info.c | 22 +- contrib/xz/src/liblzma/common/index_decoder.c | 9 +- contrib/xz/src/liblzma/common/index_encoder.c | 6 +- contrib/xz/src/liblzma/common/index_hash.c | 7 +- contrib/xz/src/liblzma/common/lzip_decoder.c | 14 +- contrib/xz/src/liblzma/common/memcmplen.h | 12 +- contrib/xz/src/liblzma/common/stream_decoder.c | 16 +- contrib/xz/src/liblzma/common/stream_decoder_mt.c | 140 +- contrib/xz/src/liblzma/common/stream_encoder_mt.c | 10 +- contrib/xz/src/liblzma/common/string_conversion.c | 99 +- contrib/xz/src/liblzma/liblzma_generic.map | 10 + contrib/xz/src/liblzma/liblzma_linux.map | 10 + contrib/xz/src/liblzma/lz/lz_decoder.c | 21 +- contrib/xz/src/liblzma/lz/lz_decoder.h | 103 +- contrib/xz/src/liblzma/lz/lz_encoder.c | 2 +- contrib/xz/src/liblzma/lz/lz_encoder_hash.h | 30 +- contrib/xz/src/liblzma/lzma/lzma2_encoder.c | 9 +- contrib/xz/src/liblzma/lzma/lzma_decoder.c | 2 +- contrib/xz/src/liblzma/simple/arm.c | 4 +- contrib/xz/src/liblzma/simple/arm64.c | 22 +- contrib/xz/src/liblzma/simple/armthumb.c | 7 +- contrib/xz/src/liblzma/simple/ia64.c | 4 +- contrib/xz/src/liblzma/simple/powerpc.c | 4 +- contrib/xz/src/liblzma/simple/riscv.c | 18 + contrib/xz/src/liblzma/simple/sparc.c | 5 +- contrib/xz/src/liblzma/simple/x86.c | 24 + contrib/xz/src/lzmainfo/lzmainfo.c | 52 +- contrib/xz/src/xz/args.c | 41 +- contrib/xz/src/xz/args.h | 2 +- contrib/xz/src/xz/coder.c | 28 +- contrib/xz/src/xz/file_io.c | 260 +- contrib/xz/src/xz/file_io.h | 10 +- contrib/xz/src/xz/list.c | 39 +- contrib/xz/src/xz/main.c | 10 +- contrib/xz/src/xz/message.c | 506 +- contrib/xz/src/xz/options.c | 15 +- contrib/xz/src/xz/private.h | 1 + contrib/xz/src/xz/sandbox.c | 78 +- contrib/xz/src/xz/suffix.c | 12 +- contrib/xz/src/xz/util.c | 10 +- contrib/xz/src/xz/xz.1 | 94 +- contrib/xz/src/xzdec/xzdec.c | 75 +- lib/liblzma/Makefile | 9 +- lib/liblzma/Symbol.map | 9 + lib/liblzma/Versions.def | 5 +- lib/liblzma/config.h | 18 +- usr.bin/lzmainfo/Makefile | 5 +- usr.bin/xz/Makefile | 4 +- usr.bin/xzdec/Makefile | 3 +- 88 files changed, 7849 insertions(+), 2552 deletions(-) diff --git a/contrib/xz/AUTHORS b/contrib/xz/AUTHORS index 5eff238ae413..f805a204ecb7 100644 --- a/contrib/xz/AUTHORS +++ b/contrib/xz/AUTHORS @@ -24,7 +24,7 @@ Authors of XZ Utils by Michał Górny. Architecture-specific CRC optimizations were contributed by - Ilya Kurdyukov, Hans Jansen, and Chenxi Mao. + Ilya Kurdyukov, Chenxi Mao, and Xi Ruoyao. Other authors: - Jonathan Nieder diff --git a/contrib/xz/COPYING b/contrib/xz/COPYING index aed21531497c..ef3371389d7d 100644 --- a/contrib/xz/COPYING +++ b/contrib/xz/COPYING @@ -40,6 +40,12 @@ XZ Utils Licensing free software licenses. These aren't built or installed as part of XZ Utils. + The following command may be helpful in finding per-file license + information. It works on xz.git and on a clean file tree extracted + from a release tarball. + + sh build-aux/license-check.sh -v + For the files under the BSD Zero Clause License (0BSD), if a copyright notice is needed, the following is sufficient: @@ -59,25 +65,6 @@ XZ Utils Licensing - COPYING.GPLv2: GNU General Public License version 2 - COPYING.GPLv3: GNU General Public License version 3 - A note about old XZ Utils releases: - - XZ Utils releases 5.4.6 and older and 5.5.1alpha have a - significant amount of code put into the public domain and - that obviously remains so. The switch from public domain to - 0BSD for newer releases was made in Febrary 2024 because - public domain has (real or perceived) legal ambiguities in - some jurisdictions. - - There is very little *practical* difference between public - domain and 0BSD. The main difference likely is that one - shouldn't claim that 0BSD-licensed code is in the public - domain; 0BSD-licensed code is copyrighted but available under - an extremely permissive license. Neither 0BSD nor public domain - require retaining or reproducing author, copyright holder, or - license notices when distributing the software. (Compare to, - for example, BSD 2-Clause "Simplified" License which does have - such requirements.) - If you have questions, don't hesitate to ask for more information. The contact information is in the README file. diff --git a/contrib/xz/ChangeLog b/contrib/xz/ChangeLog index 2d36d7bb1043..577dce5e12a2 100644 --- a/contrib/xz/ChangeLog +++ b/contrib/xz/ChangeLog @@ -1,834 +1,4468 @@ -commit 9331ce4009ddc839f5191d234cc41b2d4797376d +commit a522a226545730551f7e7c2685fab27cf567746c Author: Lasse Collin -Date: 2024-10-01 12:21:22 +0300 +Date: 2025-04-03 14:34:43 +0300 - Bump version and soname for 5.6.3 + Bump version and soname for 5.8.1 src/liblzma/Makefile.am | 2 +- src/liblzma/api/lzma/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -commit f52857ffde768058db0e0e13f68a2660ca9f1330 +commit 1c462c2ad86ff85766928638431029cd0b0dc995 Author: Lasse Collin -Date: 2024-10-01 12:17:39 +0300 +Date: 2025-04-03 14:34:43 +0300 - Add NEWS for 5.6.3 + Add NEWS for 5.8.1 - NEWS | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 125 insertions(+) + NEWS | 30 ++++++++++++++++++++++++++++++ + 1 file changed, 30 insertions(+) -commit b8f52990b5d47a50902bf33cd2305ce985457bac +commit 513cabcf7f5ce1c3ed0619e791393fc53d1dbbd0 Author: Lasse Collin -Date: 2024-10-01 12:10:23 +0300 +Date: 2025-04-03 14:34:43 +0300 - Update THANKS + Tests: Call lzma_code() in smaller chunks in fuzz_common.h - (cherry picked from commit 1ebbe915d4e0d877154261b5f8103719a6722975) + This makes it easy to crash fuzz_decode_stream_mt when tested + against the code from 5.8.0. + + Obviously this might make it harder to reach some other code path now. + The previous code has been in use since 2018 when fuzzing was added + in 106d1a663d4b ("Tests: Add a fuzz test program and a config file + for OSS-Fuzz."). - THANKS | 2 ++ - 1 file changed, 2 insertions(+) + tests/ossfuzz/fuzz_common.h | 31 ++++++++++++++++++++++++------- + 1 file changed, 24 insertions(+), 7 deletions(-) -commit 51f6f455873911894f155e6997bc23a9be8f42ba +commit 48440e24a25911ae59e8518b67a1e0f6f1c293bf Author: Lasse Collin -Date: 2024-10-01 12:10:23 +0300 +Date: 2025-04-03 14:34:43 +0300 - Tests/Windows: Add the application manifest to the test programs - - This ensures that the test programs get executed the same way as - the binaries that are installed. + Tests: Add a fuzzing target for the multithreaded .xz decoder - (cherry picked from commit 74702ee00ecfd080d8ab11118cd25dbe6c437ec0) + It doesn't seem possible to trigger the CVE-2025-31115 bug with this + fuzzing target at the moment. It's because the code in fuzz_common.h + passes the whole input buffer to lzma_code() at once. - CMakeLists.txt | 14 ++++++++++---- - tests/Makefile.am | 10 ++++++++++ - tests/tests.cmake | 33 ++++++++++++++++++++++++++++++++- - tests/tests_w32res.rc | 18 ++++++++++++++++++ - 4 files changed, 70 insertions(+), 5 deletions(-) + tests/ossfuzz/fuzz_decode_stream_mt.c | 47 +++++++++++++++++++++++++++++++++++ + 1 file changed, 47 insertions(+) -commit bf518b9ba446327a062ddfe67e7e0a5baed2394f +commit 0c80045ab82c406858d9d5bcea9f48ebc3d0a81d Author: Lasse Collin -Date: 2024-10-01 12:10:23 +0300 +Date: 2025-04-03 14:34:42 +0300 - Windows: Embed an application manifest in the EXE files - - IMPORTANT: This includes a security fix to command line tool - argument handling. - - Some toolchains embed an application manifest by default to declare - UAC-compliance. Some also declare compatibility with Vista/8/8.1/10/11 - to let the app access features newer than those of Vista. - - We want all the above but also two more things: - - - Declare that the app is long path aware to support paths longer - than 259 characters (this may also require a registry change). - - - Force the code page to UTF-8. This allows the command line tools - to access files whose names contain characters that don't exist - in the current legacy code page (except unpaired surrogates). - The UTF-8 code page also fixes security issues in command line - argument handling which can be exploited with malicious filenames. - See the new file w32_application.manifest.comments.txt. + liblzma: mt dec: Fix lack of parallelization in single-shot decoding - Thanks to Orange Tsai and splitline from DEVCORE Research Team - for discovering this issue. - - Thanks to Vijay Sarvepalli for reporting the issue to me. + Single-shot decoding means calling lzma_code() by giving it the whole + input at once and enough output buffer space to store the uncompressed + data, and combining this with LZMA_FINISH and no timeout + (lzma_mt.timeout = 0). This way the file is decoded with a single + lzma_code() call if possible. - Thanks to Kelvin Lee for testing with MSVC and helping with - the required build system fixes. + The bug prevented the decoder from starting more than one worker thread + in single-shot mode. The issue was noticed when reviewing the code; + there are no bug reports. Thus maybe few have tried this mode. - (cherry picked from commit 46ee0061629fb075d61d83839e14dd193337af59) + Fixes: 64b6d496dc81 ("liblzma: Threaded decoder: Always wait for output if LZMA_FINISH is used.") - CMakeLists.txt | 18 +++ - src/Makefile.am | 4 +- - src/common/common_w32res.rc | 5 + - src/common/w32_application.manifest | 28 ++++ - src/common/w32_application.manifest.comments.txt | 178 +++++++++++++++++++++++ - 5 files changed, 232 insertions(+), 1 deletion(-) + src/liblzma/common/stream_decoder_mt.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) -commit 5718ce932e6ad4262d5fffc9e2a7a838f963d7e5 +commit 8188048854e8d11071b8a50d093c74f4c030acc9 Author: Lasse Collin -Date: 2024-09-29 14:46:52 +0300 +Date: 2025-04-03 14:34:42 +0300 - Windows: Set DLL name accurately in StringFileInfo on Cygwin and MSYS2 + liblzma: mt dec: Don't modify thr->in_size in the worker thread - Now the information in the "Details" tab in the file properties - dialog matches the naming convention of Cygwin and MSYS2. This - is only a cosmetic change. + Don't set thr->in_size = 0 when returning the thread to the stack of + available threads. Not only is it useless, but the main thread may + read the value in SEQ_BLOCK_THR_RUN. With valid inputs, it made + no difference if the main thread saw the original value or 0. With + invalid inputs (when worker thread stops early), thr->in_size was + no longer modified after the previous commit with the security fix + ("Don't free the input buffer too early"). - (cherry picked from commit dad153091552b52a41b95ec4981c6951f1cae487) + So while the bug appears harmless now, it's important to fix it because + the variable was being modified without proper locking. It's trivial + to fix because there is no need to change the value. Only main thread + needs to set the value in (in SEQ_BLOCK_THR_INIT) when starting a new + Block before the worker thread is activated. + + Fixes: 4cce3e27f529 ("liblzma: Add threaded .xz decompressor.") + Reviewed-by: Sebastian Andrzej Siewior + Thanks-to: Sam James - src/liblzma/liblzma_w32res.rc | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) + src/liblzma/common/stream_decoder_mt.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) -commit e77c0ca61d12ebac433b7661840cb18d7031700a +commit d5a2ffe41bb77b918a8c96084885d4dbe4bf6480 Author: Lasse Collin -Date: 2024-09-25 15:47:55 +0300 +Date: 2025-04-03 14:34:42 +0300 - common_w32res.rc: White space edits + liblzma: mt dec: Don't free the input buffer too early (CVE-2025-31115) - LANGUAGE and VS_VERSION_INFO begin new statements so put an empty line - between them. + The input buffer must be valid as long as the main thread is writing + to the worker-specific input buffer. Fix it by making the worker + thread not free the buffer on errors and not return the worker thread to + the pool. The input buffer will be freed when threads_end() is called. - (cherry picked from commit 8940ecb96fe9f0f2a9cfb8b66fe9ed31ffbea904) - - src/common/common_w32res.rc | 15 ++++++++------- - 1 file changed, 8 insertions(+), 7 deletions(-) - -commit e0ba0f26d9f3f53cedc92fb13303924c39d00392 -Author: Lasse Collin -Date: 2024-09-28 20:09:50 +0300 - - CMake: Add the resource files to the Cygwin and MSYS2 builds + With invalid input, the bug could at least result in a crash. The + effects include heap use after free and writing to an address based + on the null pointer plus an offset. - Autotools-based build has always done this so this is for consistency. + The bug has been there since the first committed version of the threaded + decoder and thus affects versions from 5.3.3alpha to 5.8.0. - However, the CMake build won't create the DEF file when building - for Cygwin or MSYS2 because in that context it should be useless. - (If Cygwin or MSYS2 is used to host building of normal Windows - binaries then the DEF file is still created.) + As the commit message in 4cce3e27f529 says, I had made significant + changes on top of Sebastian's patch. This bug was indeed introduced + by my changes; it wasn't in Sebastian's version. + + Thanks to Harri K. Koskinen for discovering and reporting this issue. - (cherry picked from commit c3b9dad07d3fd9319f88386b7095019bcea45ce1) + Fixes: 4cce3e27f529 ("liblzma: Add threaded .xz decompressor.") + Reported-by: Harri K. Koskinen + Reviewed-by: Sebastian Andrzej Siewior + Thanks-to: Sam James - CMakeLists.txt | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) + src/liblzma/common/stream_decoder_mt.c | 31 ++++++++++++++++++++++--------- + 1 file changed, 22 insertions(+), 9 deletions(-) -commit 69637d0c323c0d7d9619cff637c7ce97dabc4f02 +commit c0c835964dfaeb2513a3c0bdb642105152fe9f34 Author: Lasse Collin -Date: 2024-09-28 15:19:14 +0300 +Date: 2025-04-03 14:34:42 +0300 - CMake: Fix Windows resource file dependencies + liblzma: mt dec: Simplify by removing the THR_STOP state - If common_w32res.rc is modified, the resource files need to be rebuilt. - In contrast, the liblzma*.map files truly are link dependencies. + The main thread can directly set THR_IDLE in threads_stop() which is + called when errors are detected. threads_stop() won't return the stopped + threads to the pool or free the memory pointed by thr->in anymore, but + it doesn't matter because the existing workers won't be reused after + an error. The resources will be cleaned up when threads_end() is + called (reinitializing the decoder always calls threads_end()). - (cherry picked from commit da4f275bd1c18b897e5c2dd0043546de3accce0a) + Reviewed-by: Sebastian Andrzej Siewior + Thanks-to: Sam James - CMakeLists.txt | 17 +++++++++-------- - 1 file changed, 9 insertions(+), 8 deletions(-) + src/liblzma/common/stream_decoder_mt.c | 75 +++++++++++++--------------------- + 1 file changed, 29 insertions(+), 46 deletions(-) -commit af8533459c60d7bc5b55f2f516251af4572169e4 +commit 831b55b971cf579ee16a854f177c36b20d3c6999 Author: Lasse Collin -Date: 2024-09-29 01:20:03 +0300 +Date: 2025-04-03 14:34:42 +0300 - CMake: Checking for CYGWIN covers MSYS2 too - - On MSYS2, both CYGWIN and MSYS are set. + liblzma: mt dec: Fix a comment - (cherry picked from commit 1c673c0aac7f7dee8dda2c1140351c8417a71e47) + Reviewed-by: Sebastian Andrzej Siewior + Thanks-to: Sam James - CMakeLists.txt | 2 +- + src/liblzma/common/stream_decoder_mt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit eca08e4c204db404911e513f95110dcb0fb919bd +commit b9d168eee4fb6393b4fe207c0aeb5faee316ca1a Author: Lasse Collin -Date: 2024-09-28 09:37:30 +0300 +Date: 2025-04-03 14:34:30 +0300 - Translations: Add the SPDX license identifier to pt_BR.po - - (cherry picked from commit 6aaa0173b839e28429d43a8b62d257ad2f3b4521) + liblzma: Add assertions to lzma_bufcpy() - po/pt_BR.po | 2 ++ - 1 file changed, 2 insertions(+) + src/liblzma/common/common.c | 6 ++++++ + 1 file changed, 6 insertions(+) -commit 85801c96c32456300177fbbad1506b07f5dd0a47 +commit c8e0a4897b4d0f906966f5d4d4f662221d64f3ae Author: Lasse Collin -Date: 2024-09-25 16:41:37 +0300 +Date: 2025-04-02 16:40:22 +0300 - Windows/CMake: Use the correct resource file for lzmadec.exe - - CMakeLists.txt was using xzdec_w32res.rc for both xzdec and lzmadec. - - Fixes: 998d0b29536094a89cf385a3b894e157db1ccefe - (cherry picked from commit dc7b9f24b737e4e55bcbbdde6754883f991c2cfb) + DOS: Update Makefile to fix the build - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + dos/Makefile | 2 ++ + 1 file changed, 2 insertions(+) -commit a341d19c835a8c10fcf561b00b548c53af43381e +commit 307c02ed698a69763ef1c9c0df4ff24727442118 Author: Lasse Collin -Date: 2024-09-25 21:29:59 +0300 +Date: 2025-03-29 12:41:32 +0200 - Translations: Update the Brazilian Portuguese translation + sysdefs.h: Avoid even with C11 compilers + + Oracle Developer Studio 12.6 on Solaris 10 claims C11 support in + __STDC_VERSION__ and supports _Alignas. However, is missing. + We only need alignas, so define it to _Alignas with C11/C17 compilers. + If something included later, it shouldn't cause problems. - (cherry picked from commit b834ae5f80911a3819d6cdb484f61b257174c544) + Thanks to Ihsan Dogan for reporting the issue and testing the fix. + + Fixes: c0e7eaae8d6eef1e313c9d0da20ccf126ec61f38 - po/pt_BR.po | 144 ++++++++++++++++++++++-------------------------------------- - 1 file changed, 53 insertions(+), 91 deletions(-) + src/common/sysdefs.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) -commit e69c0b9b2e00ade984393ef9cabac57342072328 +commit 7ce38b318339d6c01378a77585e08169ca3a604e Author: Lasse Collin -Date: 2024-09-17 01:21:15 +0300 +Date: 2025-03-29 12:32:05 +0200 Update THANKS - - (cherry picked from commit eceb023d4c129fd63ee881a2d8696eaf52ad1532) THANKS | 1 + 1 file changed, 1 insertion(+) -commit aef9a25b3200457c16846b046222fb2c7967afe0 -Author: Tobias Stoeckmann -Date: 2024-09-16 23:19:46 +0200 +commit 688e51bde4c987589717b2be1a1fde9576c604fc +Author: Lasse Collin +Date: 2025-03-29 12:21:51 +0200 - lzmainfo: Avoid integer overflow - - The MB output can overflow with huge numbers. Most likely these are - invalid .lzma files anyway, but let's avoid garbage output. - - lzmadec was adapted from LZMA Utils. The original code with this bug - was written in 2005, over 19 years ago. - - Co-authored-by: Lasse Collin - Closes: https://github.com/tukaani-project/xz/pull/144 - (cherry picked from commit 76cfd0a9bb33ae8e534b1f73f6359dc825589f2f) + Translations: Update the Croatian translation - src/lzmainfo/lzmainfo.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) + po/hr.po | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) -commit 40a7f163f56aca6b3c8b83e9382f5e5cb4f8e93b -Author: Tobias Stoeckmann -Date: 2024-09-16 22:04:40 +0200 +commit 173fb5c68b08a8c1369550267be258132b7760c6 +Author: Lasse Collin +Date: 2025-03-25 18:23:57 +0200 - xzdec: Remove unused short option -M - - "xzdec -M123" exited with exit status 1 without printing - any messages. The "M:" entry should have been removed when - the memory usage limiter support was removed from xzdec. - - Fixes: 792331bdee706aa852a78b171040ebf814c6f3ae - Closes: https://github.com/tukaani-project/xz/pull/143 - [ Lasse: Commit message edits ] - - (cherry picked from commit 78355aebb7fb654302e5e33692ba109909dacaff) + doc/SHA256SUMS: Add 5.8.0 - src/xzdec/xzdec.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + doc/SHA256SUMS | 6 ++++++ + 1 file changed, 6 insertions(+) -commit c98714a57058ac381365c2ff1e1d1cd63a5742c4 +commit db9258e828bc2cd96e3954f1ddcc9d3530589025 Author: Lasse Collin -Date: 2024-09-10 13:54:47 +0300 +Date: 2025-03-25 15:18:32 +0200 - Update THANKS + Bump version and soname for 5.8.0 - (cherry picked from commit e5758db7bd75587a2499e0771907521a4aa86908) + Also remove the LZMA_UNSTABLE macro. - THANKS | 1 + - 1 file changed, 1 insertion(+) + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/bcj.h | 2 -- + src/liblzma/api/lzma/version.h | 6 +++--- + src/liblzma/common/common.h | 2 -- + src/liblzma/liblzma_generic.map | 2 +- + src/liblzma/liblzma_linux.map | 2 +- + 6 files changed, 6 insertions(+), 10 deletions(-) -commit 4ed449517817b3659b35d19f39703e3c460f46c2 -Author: Firas Khalil Khana -Date: 2024-09-10 12:30:32 +0300 +commit bfb752a38f89ed03fc93d54f11c09f43fda64bc2 +Author: Lasse Collin +Date: 2025-03-25 15:18:32 +0200 - Build: Fix a typo in autogen.sh - - Fixes: e9be74f5b129fe8a5388d588e68b1b7f5168a310 - Closes: https://github.com/tukaani-project/xz/pull/141 - (cherry picked from commit 80ffa38f56657257ed4d90d76f6bd2f2bcb8163c) + Add NEWS for 5.8.0 - autogen.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + NEWS | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 62 insertions(+) -commit 3b83577a1547e72cb78a905ad3d308a799ded485 +commit 6ccbb904da851eb0c174c8dbd43e84da31739720 Author: Lasse Collin -Date: 2024-09-02 20:08:40 +0300 +Date: 2025-03-25 15:18:31 +0200 - Translations: Update Chinese (simplified) translation - - Differences to the zh_CN.po file from the Translation Project: - - - Two uses of \v were fixed. + Translations: Run "make -C po update-po" - - Missing "OPTS" translation in --riscv[=OPTS] was copied from - previous lines. + POT-Creation-Date is set to match the timestamp in 5.7.2beta which + in the Translation Project is known as 5.8.0-pre1. The strings + haven't changed since 5.7.1alpha but a few comments have. + + This is a very noisy commit, but this helps keeping the PO files + similar between the Git repository and stable release tarballs. + + po/ca.po | 964 ++++++++++++++++++++++++++++++++++++++++++++--------------- + po/cs.po | 935 ++++++++++++++++++++++++++++++++++++++++++---------------- + po/da.po | 663 ++++++++++++++++++++++++++++++----------- + po/de.po | 7 +- + po/eo.po | 966 +++++++++++++++++++++++++++++++++++++++++++++--------------- + po/es.po | 7 +- + po/fi.po | 2 +- + po/fr.po | 916 +++++++++++++++++++++++++++++++++++++++++--------------- + po/hu.po | 966 +++++++++++++++++++++++++++++++++++++++++++++--------------- + po/ka.po | 7 +- + po/ko.po | 7 +- + po/nl.po | 7 +- + po/pl.po | 7 +- + po/pt_BR.po | 962 ++++++++++++++++++++++++++++++++++++++++++++--------------- + po/sr.po | 2 +- + po/sv.po | 7 +- + po/tr.po | 7 +- + po/uk.po | 7 +- + po/vi.po | 948 +++++++++++++++++++++++++++++++++++++++++++--------------- + po/zh_CN.po | 940 ++++++++++++++++++++++++++++++++++++++++++++-------------- + po/zh_TW.po | 2 +- + 21 files changed, 6209 insertions(+), 2120 deletions(-) + +commit 891a5f057a6bb2dd2e3ce5e3bdd7a1f1ee03b800 +Author: Lasse Collin +Date: 2025-03-25 15:18:31 +0200 + + Translations: Run po4a/update-po - - "make update-po" was run to remove line numbers from comments. + Also remove the trivial obsolete messages like man page dates. - (cherry picked from commit 68c54e45d042add64a4cb44bfc87ca74d29b87e2) + This is a noisy commit, but this helps keeping the PO files similar + between the Git repository and stable release tarballs. - po/zh_CN.po | 102 ++++++++++++++++++++++++------------------------------------ - 1 file changed, 40 insertions(+), 62 deletions(-) + po4a/fr.po | 82 +++++++++++++++++++++++++++++++++++++------------------ + po4a/pt_BR.po | 88 +++++++++++++++++++++++++++++++++++++++++------------------ + po4a/sr.po | 79 ++++++++++++++++++++++++++++++++++------------------- + 3 files changed, 167 insertions(+), 82 deletions(-) -commit 06f4c7edda0387eb6a2d6303804b59dcf4d3db1f +commit 4f52e7387012cb3510b01c937dd9b3a0c6a3ac6c Author: Lasse Collin -Date: 2024-09-02 19:40:50 +0300 +Date: 2025-03-25 15:18:31 +0200 - Translations: Update the Catalan translation - - Differences to the ca.po file from the Translation Project: - - - An overlong line translating --filters-help was wrapped. - - - "make update-po" was used to remove line numbers from the comments - to match the changes in fccebe2b4fd513488fc920e4dac32562ed3c7637 - and 093490b58271e9424ce38a7b1b38bcf61b9c86c6. xz.pot in the TP - is older than these commits. + Translations: Partially fix overtranslation in Serbian man pages - (cherry picked from commit 2230692aa1bcebb586100183831e3daf1714d60a) + Names of environment variables and some other strings must be present + in the original form. The translator couldn't be reached so I'm + changing some of the strings myself. In the "Robot mode" section, + occurrences in the middle of sentences weren't changed to reduce + the chance of grammar breakage, but I kept the translated strings in + parenthesis in the headings. It's not ideal, but now people shouldn't + need to look at the English man page to find the English strings. - po/ca.po | 171 ++++++++++++++++++++++++++------------------------------------- - 1 file changed, 69 insertions(+), 102 deletions(-) + po4a/sr.po | 66 ++++++++++++++++++++++++++++++++++++++++++-------------------- + 1 file changed, 45 insertions(+), 21 deletions(-) -commit 406cb5b669e47c0e45c98f1afb7be998084a93d0 +commit ff5d944749b99eb5ab35e2ebaf01d05a59e7169b Author: Lasse Collin -Date: 2024-08-22 11:01:07 +0300 +Date: 2025-03-25 15:18:31 +0200 - Update THANKS - - (cherry picked from commit 5e375987509fab484b7bef0b90be92f241c58c91) + liblzma: Count the extra bytes in LZMA/LZMA2 decoder memory usage - THANKS | 1 + - 1 file changed, 1 insertion(+) + src/liblzma/lz/lz_decoder.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) -commit 3a4a05d75eb41ddc41899324df0511670ceaaf1e -Author: Yifeng Li -Date: 2024-08-22 02:18:49 +0000 +commit 943b012d09f717f7b44284c4e4976ea41264c731 +Author: Lasse Collin +Date: 2025-03-25 15:18:31 +0200 - liblzma: Fix x86-64 movzw compatibility in range_decoder.h + liblzma: Use SSE2 intrinsics instead of memcpy() in dict_repeat() - Support for instruction "movzw" without suffix in "GNU as" was - added in commit [1] and stabilized in binutils 2.27, released - in August 2016. Earlier systems don't accept this instruction - without a suffix, making range_decoder.h's inline assembly - unable to build on old systems such as Ubuntu 16.04, creating - error messages like: + SSE2 is supported on every x86-64 processor. The SSE2 code is used on + 32-bit x86 if compiler options permit unconditional use of SSE2. - lzma_decoder.c: Assembler messages: - lzma_decoder.c:371: Error: no such instruction: `movzw 2(%r11),%esi' - lzma_decoder.c:373: Error: no such instruction: `movzw 4(%r11),%edi' - lzma_decoder.c:388: Error: no such instruction: `movzw 6(%r11),%edx' - lzma_decoder.c:398: Error: no such instruction: `movzw (%r11,%r14,4),%esi' + dict_repeat() copies short random-sized unaligned buffers. At least + on glibc, FreeBSD, and Windows (MSYS2, UCRT, MSVCRT), memcpy() is + clearly faster than byte-by-byte copying in this use case. Compared + to the memcpy() version, the new SSE2 version reduces decompression + time by 0-5 % depending on the machine and libc. It should never be + slower than the memcpy() version. - Change "movzw" to "movzwl" for compatibility. + However, on musl 1.2.5 on x86-64, the memcpy() version is the slowest. + Compared to the memcpy() version: - [1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=c07315e0c610e0e3317b4c02266f81793df253d2 + - The byte-by-version takes 6-7 % less time to decompress. + - The SSE2 version takes 16-18 % less time to decompress. - Suggested-by: Lasse Collin - Tested-by: Yifeng Li - Signed-off-by: Yifeng Li - Fixes: 3182a330c1512cc1f5c87b5c5a272578e60a5158 - Fixes: https://github.com/tukaani-project/xz/issues/121 - Closes: https://github.com/tukaani-project/xz/pull/136 - (cherry picked from commit 6cd7c8607843c337edfe2c472aa316602a393754) + The numbers are from decompressing a Linux kernel source tarball in + single-threaded mode on older AMD and Intel systems. The tarball + compresses well, and thus dict_repeat() performance matters more + than with some other files. - src/liblzma/rangecoder/range_decoder.h | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) + src/liblzma/lz/lz_decoder.c | 14 ++++++-- + src/liblzma/lz/lz_decoder.h | 87 ++++++++++++++++++++++++++++++++++++++++----- + 2 files changed, 90 insertions(+), 11 deletions(-) -commit 4669f06d1a8d31de4b8b5861b5e8afd82cacd721 +commit bc14e4c94e788d42eeab984298391fc0ca46f969 Author: Lasse Collin -Date: 2024-07-19 20:02:43 +0300 +Date: 2025-03-25 15:18:31 +0200 - Build: Comment that elf_aux_info(3) will be available on OpenBSD >= 7.6 + liblzma: Add "restrict" to a few functions in lz_decoder.h + + This doesn't make any difference in practice because compilers can + already see that writing through the dict->buf pointer cannot modify + the contents of *dict itself: The LZMA decoder makes a local copy of + the lzma_dict structure, and even if it didn't, the pointer to + lzma_dict in the LZMA decoder is already "restrict". - (cherry picked from commit bf901dee5d4c46609645e50311c0cb2dfdcf9738) + It's nice to add "restrict" anyway. uint8_t is typically unsigned char + which can alias anything. Without the above conditions or "restrict", + compilers could need to assume that writing through dict->buf might + modify *dict. This would matter in dict_repeat() because the loops + refer to dict->buf and dict->pos instead of making local copies of + those members for the duration of the loops. If compilers had to + assume that writing through dict->buf can affect *dict, then compilers + would need to emit code that reloads dict->buf and dict->pos after + every write through dict->buf. - CMakeLists.txt | 2 +- - configure.ac | 17 +++++++++++------ - 2 files changed, 12 insertions(+), 7 deletions(-) + src/liblzma/lz/lz_decoder.h | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) -commit 9edddda5636d7b3504a033c31e8ea763e293fd35 +commit e82ee090c567e560f51a056775a17f534d159d65 Author: Lasse Collin -Date: 2024-07-13 22:10:37 +0300 +Date: 2025-03-25 15:18:30 +0200 - liblzma: Tweak a comment + liblzma: Define LZ_DICT_INIT_POS for initial dictionary position - (cherry picked from commit 7c292dd0bf23cefcdf4b1509f3666322e08a7ede) + It's more readable. - src/liblzma/simple/arm64.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + src/liblzma/lz/lz_decoder.c | 4 ++-- + src/liblzma/lz/lz_decoder.h | 9 ++++++--- + 2 files changed, 8 insertions(+), 5 deletions(-) -commit 1a93ab55d1563f5eb9b2c1b8240384046fe4bb97 +commit 8e7cd0091e5239334437decbe1989662d45a2f47 Author: Lasse Collin -Date: 2024-07-11 22:17:56 +0300 +Date: 2025-03-25 15:18:30 +0200 - CMake: Bump maximum policy version to 3.30 + Windows: Update README-Windows.txt about UCRT - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + windows/README-Windows.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) -commit cfe4465742ad2963fb0d9795e258615d7c1cf32d +commit 2c24292d341e505e5579fccac3bce5bc71d839ef Author: Lasse Collin -Date: 2024-07-09 14:27:51 +0300 +Date: 2025-03-25 15:18:15 +0200 Update THANKS - - (cherry picked from commit 028185dd4889e3d6235ff13560160ebca6985021) THANKS | 1 + 1 file changed, 1 insertion(+) -commit 0f47db18d04434203b350bde4909a5e468f197cc +commit 48053c90898fa191a216aefca01626520a7413f4 Author: Lasse Collin -Date: 2024-07-06 14:04:48 +0300 +Date: 2025-03-17 15:33:25 +0200 - xz: Remove the TODO comment about --recursive - - It won't be implemented. find + xargs is more flexible, for example, - it allows compressing small files in parallel. An example for that - has been included in the xz man page since 2010. - - (cherry picked from commit baecfa142644eb5f5c6dd6f8e2f531c362fa3747) + Translations: Update the Italian translation - src/xz/args.c | 1 - - 1 file changed, 1 deletion(-) + po/it.po | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) -commit 07f52c3528e43c4a925a3fc59a933c89f5604d92 +commit 8d6f06a65f50358fad13567f5dd8af41ef1d2b58 Author: Lasse Collin -Date: 2024-07-03 20:45:48 +0300 +Date: 2025-03-17 15:28:56 +0200 - CMake: Link xz against Threads::Threads if using pthreads + Translations: Update the Portuguese translation - The liblzma target was recently changed to link against Threads::Threads - with the PRIVATE keyword. I had forgotten that xz itself depends on - pthreads too due to pthread_sigmask(). Thus, the build broke when - building shared liblzma and pthread_sigmask() wasn't in libc. - - Thanks to Peter Seiderer for the bug report. - - Fixes: ac05f1b0d7cda1e7ae79775a8dfecc54601d7f1c - Fixes: https://github.com/tukaani-project/xz/issues/129#issuecomment-2204522994 - (cherry picked from commit b3e53122f42796aaebd767bab920cf7bedf69966) + The language tag in the Translation Project is pt, not pt_PT, + thus I changed the "Language:" line to pt. - CMakeLists.txt | 13 +++++++++++++ - 1 file changed, 13 insertions(+) + po/pt.po | 1045 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 526 insertions(+), 519 deletions(-) -commit eccb4d258b01651d06a2a31b8b68be9b04b7998c +commit c3439b039f46fe547ad603e16dc3bd63c1ca9b0c Author: Lasse Collin -Date: 2024-07-02 22:49:33 +0300 +Date: 2025-03-14 13:02:21 +0200 - Update THANKS - - (cherry picked from commit 5742ec1fc7f2cf1c82cfe3477bb90594a4658374) + Translations: Update the Italian translation - THANKS | 1 + - 1 file changed, 1 insertion(+) + po/it.po | 1020 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 516 insertions(+), 504 deletions(-) -commit c9bd00327f064778babb014302718a18d65cf7d3 -Author: Sam James -Date: 2024-06-28 14:18:35 +0300 +commit 79b4ab8d79528dd633a84df2d29e63f5d13ccbdf +Author: Lasse Collin +Date: 2025-03-12 20:48:39 +0200 - CI: Speed up Valgrind job by using --trace-children-skip-by-arg=... - - This addresses the issue I mentioned in - 6c095a98fbec70b790253a663173ecdb669108c4 and speeds up the Valgrind - job a bit, because non-xz tools aren't run unnecessarily with - Valgrind by the script tests. + Translations: Update the Italian man page translations - (cherry picked from commit 7e99856f66c07852c4e0de7aa01951e9147d86b0) + Only trivial additions but this keeps the file in sync with the TP. - .github/workflows/ci.yml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + po4a/it.po | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) -commit 495de6ec9d7834c4ef4d5286844ef7b784eb951b +commit 515b6fc8557825e1335012b3b1c8cf71e2c38775 Author: Lasse Collin -Date: 2024-06-25 16:00:22 +0300 +Date: 2025-03-12 19:38:54 +0200 - Build: Prepend, not append, PTHREAD_CFLAGS to LIBS - - It shouldn't make any difference because LIBS should be empty - at that point in configure. But prepending is the correct way - because in general the libraries being added might require other - libraries that come later on the command line. - - (cherry picked from commit 2402e8a1ae92676fa0d4cb1b761d7f62f005c098) + Translations: Update the Italian man page translations - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + po4a/it.po | 129 ++++++++++++++++++++++++++++++++++++------------------------- + 1 file changed, 77 insertions(+), 52 deletions(-) -commit 55bf3f49a812e20a21e42323e39526bb31d9341a +commit 333b7c0b776295f0941269b4e6cdb1a0ba5f6218 Author: Lasse Collin -Date: 2024-06-25 14:24:29 +0300 +Date: 2025-03-10 21:00:31 +0200 - Build: Use AC_LINK_IFELSE to handle implicit function declarations - - It's more robust in case the compiler allows pre-C99 implicit function - declarations. If an x86 intrinsic is missing and gets treated as - implicit function, the linking step will very probably fail. This - isn't the only way to workaround implicit function declarations but - it might be the simplest and cleanest. - - The problem hasn't been observed in the wild. - - There are a couple more AC_COMPILE_IFELSE uses in configure.ac. - Of these, Landlock check calls prctl() and in theory could have - the same problem. In practice it doesn't as the check program - looks for several other things too. However, it was changed to - AC_LINK_IFELSE still to look more correct. - - Similarly, m4/tuklib_cpucores.m4 and m4/tuklib_physmem.m4 were - updated although they haven't given any trouble either. They - have worked all these years because those check programs rely - on specific headers and types: if headers or types are missing, - compilation will fail. Using the linker makes these checks more - similar to the ones in cmake/tuklib_*.cmake which always link. - - (cherry picked from commit 7bb46f2b7b3989c1b589a247a251470f65e91cda) + Translations: Update the Korean man page translations - configure.ac | 8 ++++++-- *** 14820 LINES SKIPPED *** From nobody Thu May 8 17:38:06 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZtfVQ3XZYz5vNFs; Thu, 08 May 2025 17:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZtfVQ1VfKz3HwS; Thu, 08 May 2025 17:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746725886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sAyxAGJGpdFwaesXgaiV6BVqvEr1B6SLe14SrqHkrOI=; b=Xpb+4msKfrLwj/vJY6K8wSMfQuaE6GTiXxQ8fOljFD6mKhMRdfAvYJTZhJ+MAeGIIAzv38 LvhUOZRA/0EGg282ysxq97og4RArt8hDaUdCCyEBjCw4/3Ff9p6lb4xJQ/UU5t/AluAjfy VvLOFB/QgVeUPk+jtcs+T2SYy/sYUcoPUKv4VSga2CekCa7t5ayBfslDyxH7Y0ZXH4PlKW /kYW7ASGFaw45M7ebo8j5xdn88dhK8ZHlzBZqGtT5hzwtlYnteOC/aYpHF2sZoWgykFMCL Hevirjmt6Ow5ZL/g508mHUVRtDrgghv2HpgfNpGtbMs2U8bdDNBF3VVVJzrjUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746725886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sAyxAGJGpdFwaesXgaiV6BVqvEr1B6SLe14SrqHkrOI=; b=rrMfuxxZyJBZBWxhP3c8ZMoiSfIlk0Ic92Nez1amdezCRgHZi+4ElKZRPTVjeNnOpRllH3 /sl8NRvBv666PHcFIhYfmfh+maOhlmv8XS1ImtxwZU4CsXcSEKQZnFBqr1Hpf1JnUT1EVx R9nIwKSunEASbO6bw7LUMfyQRKlxUmAQD1pLbPZ/lJGHbbliLneI9gJiUeCprLeiA1dgsx B2xKxPYPvBbyE6VANThK5esOQTzJ1ELX9BXAA7zBq9EwczfvAaZRyuEnsUmOBz+c+qa//k CRVuLuTWOpDcHB5BqrmVNpxSmg82F5R2YXYnr2whCWZv8/wdXGQ5yl8dQ5QNUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746725886; a=rsa-sha256; cv=none; b=jY0flgAlesSrWbgfuBwyZGcqiZ61hU88xCJb6iUanbnWuTzEh+TcZegJMREyEPuaoHnCYu ChR1HJwO+XCk1DkV23RHAs+JK8vCmuH2kDzWWsSuEcFbKY3mrM5nFFobSTfJBQSGjzXQpu d1prOX9h5+iZn6weth683bBi33Yd4NyV1JwQjyugKlIBcLBXz9kTslnRuGIngJN3NkcSl/ PMXXD9QJRlf16vozEoPY0B71BZoQ7jdrVJ9qCZ/mIKgYREcZlteDvq9ODOkST5Ort4clkH esqYyNmAddnotMDn+1v8jdYXz6A6bo1Cv/Sj/brw9bep/vRS5g4jG50hu2H6XA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZtfVQ0xtgz8lt; Thu, 08 May 2025 17:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 548Hc6Gl042828; Thu, 8 May 2025 17:38:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 548Hc6bc042825; Thu, 8 May 2025 17:38:06 GMT (envelope-from git) Date: Thu, 8 May 2025 17:38:06 GMT Message-Id: <202505081738.548Hc6bc042825@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: f18a49a747f7 - stable/14 - RELNOTES: ps(1): Document change in behavior for '-a'/'-A' List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f18a49a747f7641e93c24d50207d54e7e612f97d Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=f18a49a747f7641e93c24d50207d54e7e612f97d commit f18a49a747f7641e93c24d50207d54e7e612f97d Author: Olivier Certner AuthorDate: 2025-05-06 13:42:33 +0000 Commit: Olivier Certner CommitDate: 2025-05-08 17:34:44 +0000 RELNOTES: ps(1): Document change in behavior for '-a'/'-A' Document the practical consequence of change "ps(1): Make '-a' and '-A' always show all processes" (93a94ce731a8) that specifying '-a'/'-A' leads to printing all processes regardless of the presence of other process selection options (except for '-x'/'-X', which command a filter). While here, mention a possible practical issue with '-J', as reported by dch@. This option was introduced by commit "Add -J to filter by matching jail IDs and names." (13767130c7147ae7182a, r265229), which unfortunately talked about '-J' being a filter while actually implementing it as a regular selection option which adds to the processes to display. Reviewed by: dch MFC after: 1 day Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50193 (cherry picked from commit 428200d2f0689aa801f5cab15d3066e2c77825f5) Commit hash edited on MFC. --- RELNOTES | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/RELNOTES b/RELNOTES index 82c0aacd97ee..838833f8db89 100644 --- a/RELNOTES +++ b/RELNOTES @@ -10,6 +10,23 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. +1ee62f354ab0: + ps(1)'s options '-a' and '-A', when combined with any other one + affecting the selection of processes except for '-X' and '-x', would + have no effect, in contradiction with the rule that one process is + listed as soon as any of the specified options selects it (inclusive + OR), which is both mandated by POSIX and arguably a natural expectation. + This bug has been fixed. + + As a practical consequence, specifying '-a'/'-A' now causes all + processes to be listed regardless of other selection options (except for + '-X' and '-x', which still apply). In particular, to list only + processes from specific jails, one must not use '-a' with '-J'. Option + '-J', contrary to its apparent initial intent, never worked as a filter + in practice (except by accident with '-a' due to the bug), but instead + as any other selection options (e.g., '-U', '-p', '-G', etc.) subject to + the "inclusive OR" rule. + a2132d91739d: ps(1)'s '-U' option has been changed to select processes by their real user IDs instead of their effective one, in accordance with POSIX and From nobody Thu May 8 17:38:04 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZtfVP2xPpz5vNFr; Thu, 08 May 2025 17:38:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZtfVP1pkmz3HtJ; Thu, 08 May 2025 17:38:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746725885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=taPQMzUH4IYELJAxhU4duC6bcJyoMqbOIoMeLT1ybM4=; b=BbzrwoKFlxti+hZp9eU27RsMUvsm4LCUm74YGB0P4//dAGsAg8/pdhQ6oxx2Rpi6Oad+3+ wrR/+oBuxeqfXFpS6vF0liX2aIuTEeYceKwhIt1c63aruDgrDcsugPDxph6UHbsVT4g/j8 U3I1pzXaabF0Mo61RDOvgf45yKDPm4jiHP4iin9TTuRy5aynkbccben+i3jDkvWxQgPD4J r+BEw2sjRT7wH2lcuPHWZkG7vqJXSClUYmXBfPNwsEqrpkyM0n+19x1P/8CaFRS0MbHnW2 o0JKIePhu6zO9SxJu1Hs8/0ENaOobTT5+zyquv/vGKY+s7fA/iMy2OCny6izdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746725885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=taPQMzUH4IYELJAxhU4duC6bcJyoMqbOIoMeLT1ybM4=; b=wzGApcrUjg+ZPMq6Tw5EQRHasAcCUTeYkfYFx22gjcHkLvzNArM9Hq/rHhDsWsQsRI+Urv J8I8ijjO/2GjbKKN77QcQQ2iwqzH9gObgJOZwrYNQnsaVEosDWhId4cD4owy6poEO4HGkw ZQYtPWWUSFRsvVJ7BMeOXthQarSwmwJFCbLduiGGhd7ctMOshJi7/u0lhzVRDi+4qKybh4 fhRH2bOlnWPxiSTASmZ4PIP1LiG3LbKV2d3EFCGhiZ4QaY0+5Qt8uy9HSKK46CqRMef0gI 1GyNmj2YFvFBgW6LPcCUVw1h99oooa3wA2EwCosMv0mTquQiWQzGAKHY7F/Kcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746725885; a=rsa-sha256; cv=none; b=O5og7qWvBM8esWM1B7nufoKgQp1LUdNQ25c+GE63uetXaF8FKB1Sa1h3mxgfP1fPuijtnS HN+Lbyv9yO5eaN8HDYWAWgYBw6AFiMCPI8FCdWkfRDaYps2nRRvxQtvJ5It6TdwtrejV/9 ikepCFV09nQpt8mhXMFKdQl7NXZi4VvBQDn4THeqgir4Zx3M16ZeKhU8+pfso/YlOINW7T JNuwbD+uwiwGpwIZfsoxi2RcBqEozAZCuC7zZcQvZReHyX9P2WkQ/qY0prqKxtro6aVp1I StByWGvj32jii47u2aUR6kAL8E9WTx6RFkdj6XpKly++uzb56AFxc0hhGvZ+8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZtfVP0vxLz8yF; Thu, 08 May 2025 17:38:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 548Hc4RB042792; Thu, 8 May 2025 17:38:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 548Hc4So042789; Thu, 8 May 2025 17:38:04 GMT (envelope-from git) Date: Thu, 8 May 2025 17:38:04 GMT Message-Id: <202505081738.548Hc4So042789@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 455203ec8885 - stable/14 - VFS cache: Fix initial sizing for non-default 'ncsizefactor' List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 455203ec88850dfc776b932666ffe34e6f6e5619 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=455203ec88850dfc776b932666ffe34e6f6e5619 commit 455203ec88850dfc776b932666ffe34e6f6e5619 Author: Olivier Certner AuthorDate: 2025-05-01 10:30:49 +0000 Commit: Olivier Certner CommitDate: 2025-05-08 17:30:58 +0000 VFS cache: Fix initial sizing for non-default 'ncsizefactor' --- sys/kern/vfs_cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index ab28540be8a8..6f92130e12b3 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -2686,7 +2686,7 @@ nchinit(void *dummy __unused) ncsize = desiredvnodes * ncsizefactor; cache_recalc_neg_min(); - nchashtbl = nchinittbl(desiredvnodes * 2, &nchash); + nchashtbl = nchinittbl(ncsize, &nchash); ncbuckethash = cache_roundup_2(mp_ncpus * mp_ncpus) - 1; if (ncbuckethash < 7) /* arbitrarily chosen to avoid having one lock */ ncbuckethash = 7; From nobody Thu May 8 17:38:07 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZtfVR4qjwz5vNT2; Thu, 08 May 2025 17:38:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZtfVR2YBhz3HtP; Thu, 08 May 2025 17:38:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746725887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F4E7u9vVlaciBKSTwHnU5kjN887E1bfOYQyH/O5p/qQ=; b=yrMpkiJv+euGBozJvE89U+5OGlCOPwtBBWJgEZKIB11BLPafNkgx93lvavAlcB+3VsQTBi AAu2a648l/c4Bjy/vqb6JASJlwaYpD8qFK4TuhAhtLECx4ZYWARR7OrDZ43LsRhDdWcqxN ZeSqZ/5U9ngMrkp4H2TyuCy5ELkV9sU2sbXwn4WyPo1DHdf/wofZckjYjR0E0ELU8k2ikX fDq/91UnI8MIZURTOjyw+kXD24u6iKPm9TvOXUMmxC1Y5EokTaJOGVaZYf8AemCBgnrtuw IDGXP72WpJt29xhHjQa+FwQajjHGujzvDT3AF2TdEpbdwiIwtf1hJGQLUFzu3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746725887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F4E7u9vVlaciBKSTwHnU5kjN887E1bfOYQyH/O5p/qQ=; b=nKumfCcr8V6mNmH8cY/9W3HFFRsL8PtrkEP50BSqB2kPT2DxLpe1vkfe5W2mkdp+2KHj/6 RM/VOKJpgrsgkR1ZK82sCh1SHBrIww3TZamGLOUD0lg0/rb7xCQuoEJ62D028uwUxRdgAR xYq8T97BS4HGPg7GplK1F8Rinsrz4Wg3ARVd2//VvSS/eXbP++whLpjlqiMl+Lug/6icXO oiFu1cpj7Im60vJnhIwl0+Lzowb9rLnAUWbfH+YEae9V0TMeJ5NQqQcuYDgt+thLx/phsv D5pBuuNYyM4G5HTN1XIrhUU0nrAkXW/1eqvHdmr8Tb7XTdL5FQUIE2wignQvHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746725887; a=rsa-sha256; cv=none; b=MzPbdF2S1xwBbVG5jb3rzkZJn5Burr+kgmErce0Uilr1YF1hB9A2NDFCyDA6YI6mjNZaG+ RJIobuoSW/a1Na0phdS8RgGFXxla+V0RRucx7ax8T0BlFXcpZG9OCjhfkWxzOUAa06mVwN 3BQXTQ1Jaw8HaICP1ItGn6KYVeuX6ymX+dYTiZI6n7Gb/7oLSEeF/mjT2f83TbrNmoQKc5 t+lxTYvnU8w+ZgouIYIXLA7NIM1QVuCEBWIerLmYEJR5YPjO3eRzCHdy8UpoYjoi4IH0oL bkjTNbB8V0hwfJvudFx7AaGXnW7JF/KCp6gpgvUff4xd2OVL8Lvq75pG99w5uQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZtfVR25myz8Sj; Thu, 08 May 2025 17:38:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 548Hc7HF042866; Thu, 8 May 2025 17:38:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 548Hc7ha042863; Thu, 8 May 2025 17:38:07 GMT (envelope-from git) Date: Thu, 8 May 2025 17:38:07 GMT Message-Id: <202505081738.548Hc7ha042863@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 1586fd84fbda - stable/14 - ps.1: Remove ambiguity in description of option '-J' List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1586fd84fbdab2e2ec205ca717c69946805f2ba0 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=1586fd84fbdab2e2ec205ca717c69946805f2ba0 commit 1586fd84fbdab2e2ec205ca717c69946805f2ba0 Author: Olivier Certner AuthorDate: 2025-05-06 13:47:18 +0000 Commit: Olivier Certner CommitDate: 2025-05-08 17:34:53 +0000 ps.1: Remove ambiguity in description of option '-J' As stated in the previous commit, option '-J' was introduced by commit "Add -J to filter by matching jail IDs and names." (13767130c7147ae7182a, r265229), which unfortunately talked about '-J' being a filter while actually implementing it as a regular selection option which adds to the processes to display. The manual page's formulation hinted more at '-J' being a filter, which it is not, or could be just considered ambiguous, because of the presence of the "only" word. Consequently, remove it and reformulate. Reviewed by: ziaee, dch MFC after: 1 day Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50194 (cherry picked from commit cbda1aea6532697247bcca6e59d45775857c35e2) --- bin/ps/ps.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/ps/ps.1 b/bin/ps/ps.1 index c1c2bcea5813..1267b1013f69 100644 --- a/bin/ps/ps.1 +++ b/bin/ps/ps.1 @@ -35,7 +35,7 @@ .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" -.Dd April 28, 2025 +.Dd May 06, 2025 .Dt PS 1 .Os .Sh NAME @@ -285,7 +285,7 @@ of the jail. Use .Fl J .Sy 0 -to display only host processes. +to request display of host processes. Implies .Fl x by default. From nobody Thu May 8 17:38:08 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZtfVT0YfJz5vNdR; Thu, 08 May 2025 17:38:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZtfVS3DYKz3Hs2; Thu, 08 May 2025 17:38:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746725888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FI11wObJAPmfeyCgl7g1b3xEAlA9astTjgeCyzuuja8=; b=QE+20s9T6k1Dcfa/JvCtEOB8nPA3E28ArcpQQtbQhAUXhnfg2/JDQl6AtQB4h9IcP62vEk tw14OFZMZvAoeNJz2YUbOSZMEpGfRQLXz92XEVxpQtX3D8grwspH7aDnKg3bufpCpoLkUY R1Ncg7ug3LxqXcNfpVufn7VOpz3k5h8wE1YqPdYSSZ3NPVUfOrS+VjSKpoBF8D7VI7M/jq e6OgtKXpB2Me2cJm1AqvN1Pl4guObz7hnopwz3xbHshmLiyHXU18QMtS3LC/eu1FTELgSD dGatMVoJUlxuzl/wjQ/P/vIW5+lZNcmkC8wMrXGbJzZ6jMuQB7uDL2ZC/U41nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746725888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FI11wObJAPmfeyCgl7g1b3xEAlA9astTjgeCyzuuja8=; b=vgZdh9XYKI1WgqC+EEn3EnNruWjHBcXoxktUbZAmp5VihxsahWDsLKaROFu+0dXtsua7Ka AVSFRo2aDvuTjOYhIilwZtu/ErxTbUoGaPYPZ/VJTG9Sigk9yJOq60N2dlqEANZyrjL4rG JqTQBVqW83X4rzg3SKZIgyPE0xQM5m8D9zfx7ig2YwmfY9Gs41tzavN8LOrPZSbLXZhlRr mopDfNGaR2bu6hO2Bdmc20M5o5N+Qca5UzajWCPQ9vi6ZTjQbWOCNzjvElnTdBnUMhOsmL 3/XXFoMatjeA1PZrtzcv/KulILyk0LxulFb54bP9v2Bl4H+2WXALqCV1ypb4gA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746725888; a=rsa-sha256; cv=none; b=quxel8wydZmTRSDBBYBZL9t53GosAdHYkT/J0798Bal63jZoE/BsAL8HTJPBwVE0TDddEk y996mIYP3qVXVc0qJ4xtgG651OGmfrqG4XU98fReb8enOkThaq23WvjsMQcRjRUIpnU7Ad TwMt0BP7CEN4FEx35hGLKF3UjpaqJiGY13CRxq0FBEfNwUVoX6i0XY6irI6vk09r2ZTJ1a mkqpPwnulFn0cyY8ve0FT+EBxgkjO0P1eXvSdwzA8V8iKyWTUDfCwnJyY64GLqwD0uQSfO 6yiq67n9hNxuIRVPgIKOtaupIR46SLnkhayQx5iJLMtDgH/Sm/fruH7Up4hG9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZtfVS2jrBz8nx; Thu, 08 May 2025 17:38:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 548Hc8Cv042899; Thu, 8 May 2025 17:38:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 548Hc8TK042896; Thu, 8 May 2025 17:38:08 GMT (envelope-from git) Date: Thu, 8 May 2025 17:38:08 GMT Message-Id: <202505081738.548Hc8TK042896@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: a69fe6260402 - stable/14 - rc/tests: Fix process flags checks using ps(1) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a69fe62604021f120206e4064ca7463195aeb3a0 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=a69fe62604021f120206e4064ca7463195aeb3a0 commit a69fe62604021f120206e4064ca7463195aeb3a0 Author: Olivier Certner AuthorDate: 2025-05-06 13:52:39 +0000 Commit: Olivier Certner CommitDate: 2025-05-08 17:34:53 +0000 rc/tests: Fix process flags checks using ps(1) These checks use ps(1) with both the '-p' and '-a' flags, which worked so far as ps(1)'s '-a' option was buggy. Since the fix in commit "ps(1): Make '-a' and '-A' always show all processes" (93a94ce731a89b56), such a command-line always selects all processes, making the specified '-p' useless and the test wrong. Remove the useless '-a'. While here, remove the redundant '-x', as '-p' implies '-x' by default. MFC after: 1 day Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50201 (cherry picked from commit 646375408742dd5ed9abb174a621a3f8f65a56ef) --- libexec/rc/tests/rc_subr_test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rc/tests/rc_subr_test.sh b/libexec/rc/tests/rc_subr_test.sh index f004354fe52e..60f77c2c2de3 100644 --- a/libexec/rc/tests/rc_subr_test.sh +++ b/libexec/rc/tests/rc_subr_test.sh @@ -59,9 +59,9 @@ oomprotect_all_body() atf_check -s exit:0 -o inline:"Starting ${__name}.\n" -e empty \ /bin/sh "$__script" "$__name" "$__pidfile" "$__childpidfile" onestart atf_check -s exit:0 -o match:'^..1..... .......1$' -e empty \ - ps -p "$(cat "$__pidfile")" -ax -o flags,flags2 + ps -p "$(cat "$__pidfile")" -o flags,flags2 atf_check -s exit:0 -o match:'^..1..... .......1$' -e empty \ - ps -p "$(cat "$__childpidfile")" -ax -o flags,flags2 + ps -p "$(cat "$__childpidfile")" -o flags,flags2 atf_check -s exit:0 -o ignore -e empty \ /bin/sh "$__script" "$__name" "$__pidfile" "$__childpidfile" onestop } From nobody Thu May 8 17:38:09 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZtfVV0Dncz5vN58; Thu, 08 May 2025 17:38:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZtfVT4BPpz3Hlf; Thu, 08 May 2025 17:38:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746725889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4EX3AYqMeib0nihUKxcjlboSilsPG3q+bmpSDue5ayM=; b=uSXsd+wUZw6gJ1jaLgUwRHJEIYaFHlEpw79HRAfkbFwDVguoY4IMNjvquSgu+YT/QTuklf IPu7y6Hajq0ygiroMyEyxoyIAvrjt/2HfVKO2MJGj/LmyeAJ/cvo6ku32eeuIqjSs/prrA WYg+AzrireZnOIF82XbbAYscteLy8IvgLKLXBuSWO7yft+ak31WF2QxAVBogItOjPUWVqn iix7BM9KwNG+vNlQCBV2dfF+zdSm594hS0Q7fDNuO0TuspZJrYFWtKbHtzCzEWvBu88gBR kKPsICzIb4mXBBepDGLRIKTEsypKtxFZYPzzfF2pjE5LWR0vwrYhTLX/GJivjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746725889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4EX3AYqMeib0nihUKxcjlboSilsPG3q+bmpSDue5ayM=; b=Keaoz5I0JIDQZnoL+cQn2KfDfgBT7aTC8ONXmjS1Hl5wsHGicC4p6CdYmhbKzVdA6v6cKs ABAhJQXqM6zNVxBUMeGRfjtpfKGyEG5McMeerqiLb28YN2mwmyqY7n0e6m+s0TrPpx1hrl 4j0hUMLXmjMG0Ub8TcZYy8OoTYCDPXQ7K0fbpaVfQdjZBgLm2RejJ7SNgvXu3hwH7HkWC5 M0oguSjTfEl6yYjXLbg+Pr3NpTQm34yufkEaqekJAU7TKtrWniir/e2cHy5n8nZh2/uABF 57Ursm3dvRkxxXB/4QljJSJZW7+K2GJMAa/OFoPHHE1UMop/nSsXyVtDjP1kvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746725889; a=rsa-sha256; cv=none; b=G930gg4GXHEdBdNGv1/lfVa7FAOD6YOfezuCkkEaLz/IuTbgbJqSZrprlNQZafBxUq9mGX JKdCdG8LLkb3peHFVMuC5s4jHG2JR0cqrcLm7nTBIbKHT14hqyTWOB3N1jGhPOz3irKpky ZXJ9B427tDoZF4bZCdLJZhH98CYGW3WZvwFk4jBADkjHjVpNoNpJLcdHCrM9UK/Q0uWGhX YjYjpd7vAedyNy5agyPjKko+zgxQGX+MJzTIkkipwfM4PjuxIos2WrGdj4oTB9WaVHNX0M 2/ZY2nqfJWao0bHV0e+4nBeMbtS0yo7pYohfvlMQDTy95E3qjXxWi0D8Qvv4EA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZtfVT3jycz8J2; Thu, 08 May 2025 17:38:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 548Hc976042931; Thu, 8 May 2025 17:38:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 548Hc95D042928; Thu, 8 May 2025 17:38:09 GMT (envelope-from git) Date: Thu, 8 May 2025 17:38:09 GMT Message-Id: <202505081738.548Hc95D042928@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 5af18707c155 - stable/14 - stress2: exlock2.sh: Preserve behavior after ps(1)'s '-U' change List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5af18707c155dca74071aa3bfb61160814f03bc3 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=5af18707c155dca74071aa3bfb61160814f03bc3 commit 5af18707c155dca74071aa3bfb61160814f03bc3 Author: Olivier Certner AuthorDate: 2025-05-06 14:43:33 +0000 Commit: Olivier Certner CommitDate: 2025-05-08 17:34:54 +0000 stress2: exlock2.sh: Preserve behavior after ps(1)'s '-U' change Remove '-Uroot', as now '-U' selects processes based on their real user IDs, and since the program using them was launched as 'root', the equivalent now is just to remove it, as now ps(1) by default selects processes based on its effective UID (root) and their effective UIDs. It seems that matching on effective or real UID does not really matter in this test, but at least this change simplifies the command-line. MFC after: 1 day Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50200 (cherry picked from commit 1265d3b07eaa418e9c60800db93f3482ddbb6ae2) --- tools/test/stress2/misc/exlock2.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/test/stress2/misc/exlock2.sh b/tools/test/stress2/misc/exlock2.sh index 58a49919d86a..292e60e8d9f6 100755 --- a/tools/test/stress2/misc/exlock2.sh +++ b/tools/test/stress2/misc/exlock2.sh @@ -153,7 +153,7 @@ out: } #if defined(DEBUG) if (e != 0) { - system("ps -Uroot | grep -v grep | grep /tmp/exlock2 | "\ + system("ps | grep -v grep | grep /tmp/exlock2 | "\ "awk '{print $1}' | xargs procstat -f"); } #endif From nobody Thu May 8 17:38:10 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZtfVW6Nmtz5vNY6; Thu, 08 May 2025 17:38:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZtfVV5HdWz3HsK; Thu, 08 May 2025 17:38:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746725890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XRIOq3ODrJ2cdFtYLOwtmI7GRCLB5ZEfAlLz5RcZYDE=; b=YmbiiSO9+S8AOm5RTI5Glx0dAiqlbYPNn+ud5HdQgU2vpe7ejvo4uMHaQHWFBISJ6BPUgS BKj7siZePDUE6Qi0FnnhUqeg8IA1J3566FwqllN0udOhBxnfznN3wvHlP4SXdot7jqShWY HvrHKLAOnUOeLF/m2b6hdLU3LvXk5CBv5FgaDEdv6adA1AidDbeFmI3Gv0TAFHnK7q0VUl PsIijujZrH1+i71oiSMCBftKjP18BsdDwqThNww0WhABirkboijP8mDL1wnxZl1Fh6++Vt ypCLsqZHKdEkp7OgT+59AQkgCiBndFM+wc65HvkWitB99Ufd/ZDTnj1Piblzjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746725890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XRIOq3ODrJ2cdFtYLOwtmI7GRCLB5ZEfAlLz5RcZYDE=; b=oT2bIyQ8a+Xv49hugA5qIP93mvOD03t67c9eBwWmsofKw59rG0FNe7bMLqNaKMEe04Fdi+ lWiPl4Jz/4GVMPsLhSeY5ddUofiucg2zY1DIH/cN/1ZHSGLQ4TMRCZaIXzLVEVLbmrguSC cvrw8GVVmFQ31EYNgOtTf95ubDUt4Ob866ZJdHdCJF5Fi8s9vMFSM94q4Z4F2m1DLAkN/A 6zpvIogZ7iQGSvjVNZB3ZH0sk/l4ACX3zozLaH7zhbB6Lq4DfwVwhRQkYcuueHsVpoFDj9 W6C4FWryrvs3uLdEm4/QKO9RscByFEGA9KpZz1ge/Bn32+HIkgz6PKguvTDq4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746725890; a=rsa-sha256; cv=none; b=Qy7Ls3TlxEu7g1KwtZ7nLVpnkRuEG4VrvJdYvsIOx4UtesDiTbztkXbE5ZmA33xWYjdlg7 75KJ2wCbA1ICDT5+CrRewF4wbT2rxtMy90EUDzckrGq//aInbDrdr0TrtuBZzuM5w6eKP0 2qrDDHRcLEVmzgjjlOpiORSaWUdvaNUrp0+P4IJ6DqHJKhvavQseYqzOYfkndI9y8WGtyW TZsLPrz6fzyermsJrja0m3svf5ijLN8YPsoAcn16+xhokc5WOWn9/mgKwJJqvMqlI5m22x vfYWiOGAifCzQ19LKxZgFPseyVPlhy8WL8vI402HSKE026vYo0oqDxoHuSTEWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZtfVV4cl8z8d3; Thu, 08 May 2025 17:38:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 548HcAxf042968; Thu, 8 May 2025 17:38:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 548HcAxh042965; Thu, 8 May 2025 17:38:10 GMT (envelope-from git) Date: Thu, 8 May 2025 17:38:10 GMT Message-Id: <202505081738.548HcAxh042965@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: efce9f8a510b - stable/14 - sysctl(9): Ease exporting struct sizes; Discourage doing that List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: efce9f8a510b60736994e50288b78fc7b32b5d90 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=efce9f8a510b60736994e50288b78fc7b32b5d90 commit efce9f8a510b60736994e50288b78fc7b32b5d90 Author: Olivier Certner AuthorDate: 2025-05-01 16:02:44 +0000 Commit: Olivier Certner CommitDate: 2025-05-08 17:36:17 +0000 sysctl(9): Ease exporting struct sizes; Discourage doing that Introduce two helpers, the more general SYSCTL_SIZEOF() and a struct-specific one SYSCTL_SIZEOF_STRUCT() which prepends 'struct' in the description and in the use of sizeof() but uses the raw structure name as the knob's name. The size of the object/structure is exported under 'debug.sizeof'. Existing knobs under 'debug.sizeof' were all converted to use the helpers. Add a note before the helpers discouraging the introduction of new leaves for ad-hoc reasons. List alternative means for developers to obtain the size of arbitrary kernel structures easily (thanks to markj@ for providing these). No functional change (intended). Reviewed by: kib, markj MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50121 (cherry picked from commit 713abc9880aabe0ff924ff644bceb6ff404ed3cd) --- .../openzfs/module/os/freebsd/zfs/zfs_znode_os.c | 4 ++++ sys/fs/devfs/devfs_devs.c | 7 ++----- sys/geom/geom_kern.c | 15 +++++---------- sys/kern/kern_mib.c | 18 ++++++------------ sys/kern/subr_devstat.c | 3 +-- sys/kern/vfs_cache.c | 3 +-- sys/sys/sysctl.h | 21 +++++++++++++++++++++ 7 files changed, 40 insertions(+), 31 deletions(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode_os.c index fea34273baef..61a59be9f78b 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode_os.c @@ -66,8 +66,12 @@ #include "zfs_comutil.h" /* Used by fstat(1). */ +#ifdef SYSCTL_SIZEOF +SYSCTL_SIZEOF(znode, znode_t); +#else SYSCTL_INT(_debug_sizeof, OID_AUTO, znode, CTLFLAG_RD, SYSCTL_NULL_INT_PTR, sizeof (znode_t), "sizeof(znode_t)"); +#endif /* * Define ZNODE_STATS to turn on statistic gathering. By default, it is only diff --git a/sys/fs/devfs/devfs_devs.c b/sys/fs/devfs/devfs_devs.c index c6dcd4fc7646..124f9f0449af 100644 --- a/sys/fs/devfs/devfs_devs.c +++ b/sys/fs/devfs/devfs_devs.c @@ -121,11 +121,8 @@ SYSCTL_PROC(_kern, OID_AUTO, devname, CTLTYPE_OPAQUE|CTLFLAG_RW|CTLFLAG_ANYBODY|CTLFLAG_MPSAFE, NULL, 0, sysctl_devname, "", "devname(3) handler"); -SYSCTL_INT(_debug_sizeof, OID_AUTO, cdev, CTLFLAG_RD, - SYSCTL_NULL_INT_PTR, sizeof(struct cdev), "sizeof(struct cdev)"); - -SYSCTL_INT(_debug_sizeof, OID_AUTO, cdev_priv, CTLFLAG_RD, - SYSCTL_NULL_INT_PTR, sizeof(struct cdev_priv), "sizeof(struct cdev_priv)"); +SYSCTL_SIZEOF_STRUCT(cdev); +SYSCTL_SIZEOF_STRUCT(cdev_priv); struct cdev * devfs_alloc(int flags) diff --git a/sys/geom/geom_kern.c b/sys/geom/geom_kern.c index 14707403215d..f8f99087ad9c 100644 --- a/sys/geom/geom_kern.c +++ b/sys/geom/geom_kern.c @@ -230,13 +230,8 @@ SYSCTL_INT(_kern_geom, OID_AUTO, collectstats, CTLFLAG_RW, &g_collectstats, 0, "Control statistics collection on GEOM providers and consumers"); -SYSCTL_INT(_debug_sizeof, OID_AUTO, g_class, CTLFLAG_RD, - SYSCTL_NULL_INT_PTR, sizeof(struct g_class), "sizeof(struct g_class)"); -SYSCTL_INT(_debug_sizeof, OID_AUTO, g_geom, CTLFLAG_RD, - SYSCTL_NULL_INT_PTR, sizeof(struct g_geom), "sizeof(struct g_geom)"); -SYSCTL_INT(_debug_sizeof, OID_AUTO, g_provider, CTLFLAG_RD, - SYSCTL_NULL_INT_PTR, sizeof(struct g_provider), "sizeof(struct g_provider)"); -SYSCTL_INT(_debug_sizeof, OID_AUTO, g_consumer, CTLFLAG_RD, - SYSCTL_NULL_INT_PTR, sizeof(struct g_consumer), "sizeof(struct g_consumer)"); -SYSCTL_INT(_debug_sizeof, OID_AUTO, g_bioq, CTLFLAG_RD, - SYSCTL_NULL_INT_PTR, sizeof(struct g_bioq), "sizeof(struct g_bioq)"); +SYSCTL_SIZEOF_STRUCT(g_class); +SYSCTL_SIZEOF_STRUCT(g_geom); +SYSCTL_SIZEOF_STRUCT(g_provider); +SYSCTL_SIZEOF_STRUCT(g_consumer); +SYSCTL_SIZEOF_STRUCT(g_bioq); diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c index d60c72a00f63..f69275fc3d1d 100644 --- a/sys/kern/kern_mib.c +++ b/sys/kern/kern_mib.c @@ -722,11 +722,9 @@ SYSCTL_STRING(_user, USER_LOCALBASE, localbase, CTLFLAG_RWTUN, localbase, sizeof(localbase), "Prefix used to install and locate add-on packages"); #include -SYSCTL_INT(_debug_sizeof, OID_AUTO, vnode, CTLFLAG_RD, - SYSCTL_NULL_INT_PTR, sizeof(struct vnode), "sizeof(struct vnode)"); +SYSCTL_SIZEOF_STRUCT(vnode); -SYSCTL_INT(_debug_sizeof, OID_AUTO, proc, CTLFLAG_RD, - SYSCTL_NULL_INT_PTR, sizeof(struct proc), "sizeof(struct proc)"); +SYSCTL_SIZEOF_STRUCT(proc); static int sysctl_kern_pid_max(SYSCTL_HANDLER_ARGS) @@ -758,19 +756,15 @@ SYSCTL_PROC(_kern, OID_AUTO, pid_max, CTLTYPE_INT | #include #include -SYSCTL_INT(_debug_sizeof, OID_AUTO, bio, CTLFLAG_RD, - SYSCTL_NULL_INT_PTR, sizeof(struct bio), "sizeof(struct bio)"); -SYSCTL_INT(_debug_sizeof, OID_AUTO, buf, CTLFLAG_RD, - SYSCTL_NULL_INT_PTR, sizeof(struct buf), "sizeof(struct buf)"); +SYSCTL_SIZEOF_STRUCT(bio); +SYSCTL_SIZEOF_STRUCT(buf); #include -SYSCTL_INT(_debug_sizeof, OID_AUTO, kinfo_proc, CTLFLAG_RD, - SYSCTL_NULL_INT_PTR, sizeof(struct kinfo_proc), "sizeof(struct kinfo_proc)"); +SYSCTL_SIZEOF_STRUCT(kinfo_proc); /* Used by kernel debuggers. */ const int pcb_size = sizeof(struct pcb); -SYSCTL_INT(_debug_sizeof, OID_AUTO, pcb, CTLFLAG_RD, - SYSCTL_NULL_INT_PTR, sizeof(struct pcb), "sizeof(struct pcb)"); +SYSCTL_SIZEOF_STRUCT(pcb); /* XXX compatibility, remove for 6.0 */ #include diff --git a/sys/kern/subr_devstat.c b/sys/kern/subr_devstat.c index 6c0977d1cc35..3a107ac30390 100644 --- a/sys/kern/subr_devstat.c +++ b/sys/kern/subr_devstat.c @@ -600,5 +600,4 @@ devstat_free(struct devstat *dsp) } } -SYSCTL_INT(_debug_sizeof, OID_AUTO, devstat, CTLFLAG_RD, - SYSCTL_NULL_INT_PTR, sizeof(struct devstat), "sizeof(struct devstat)"); +SYSCTL_SIZEOF_STRUCT(devstat); diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 6f92130e12b3..300173347401 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -511,8 +511,7 @@ SYSCTL_INT(_debug, OID_AUTO, vfscache, CTLFLAG_RW, &doingcache, 0, #endif /* Export size information to userland */ -SYSCTL_INT(_debug_sizeof, OID_AUTO, namecache, CTLFLAG_RD, SYSCTL_NULL_INT_PTR, - sizeof(struct namecache), "sizeof(struct namecache)"); +SYSCTL_SIZEOF_STRUCT(namecache); /* * The new name cache statistics diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index 5fce4b8e1713..f08080d4e4fa 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -38,6 +38,7 @@ #define _SYS_SYSCTL_H_ #ifdef _KERNEL +#include #include #include #endif @@ -934,6 +935,26 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry); CTLFLAG_RD | CTLFLAG_CAPRD | CTLTYPE_INT | CTLFLAG_MPSAFE, \ NULL, 1, sysctl_handle_int, "I", desc, "feature"); +/* + * Adding new leaves to the 'debug.sizeof' MIB tree for ad-hoc reasons is + * discouraged, and in particular for reporting to developers the size of some + * kernel structures, which can be obtained by the following alternative means: + * 1. In GDB, load a full kernel image and use 'print(sizeof(struct XXX))'. + * Alternatively, use 'ptype/o struct XXX' to additionally get the offsets + * and size of all structure's fields. + * 2. If the structure is allocated from UMA, then 'vmstat -z' reports its size + * (the mapping between structure types and zones is usually + * straightforward). + */ +/* Generates a read-only sysctl reporting the size of an object/structure. */ +#define SYSCTL_SIZEOF(name, expr) \ + SYSCTL_INT(_debug_sizeof, OID_AUTO, name, CTLFLAG_RD, \ + SYSCTL_NULL_INT_PTR, sizeof(expr), \ + "sizeof(" __STRING(expr) ")"); +/* Same, specialized for structures. */ +#define SYSCTL_SIZEOF_STRUCT(struct_name) \ + SYSCTL_SIZEOF(struct_name, struct struct_name) + #endif /* _KERNEL */ /* From nobody Thu May 8 17:38:11 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZtfVX60TDz5vN5J; Thu, 08 May 2025 17:38:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZtfVX3BFnz3J51; Thu, 08 May 2025 17:38:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746725892; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zW6zHu8eFjEB458kR3enmVNg/Cm+t09Krypv6nyI+5o=; b=NHodcPEHjdQAkK+0NsoBT+skzpQQt+Ch4YrmuegOF8i37Cxc03KOmIp/VGkseI+4ZKIz8z lXhWpuQvYsMISDM3dieVmbqzfSWKfeSd2skXQnIjGRpmKmMU6NuE4Kf/236rVyAAv+Rnc+ 3E4lA2WfdJJv7a2lMDAFcwjSHg9EbCf42m2Ct5+g0u83c8v8aNMbKN1BtGJzVMNLlvZob3 8p4wxW052El6dBzLRd8RnrOLrOrOBifNVI8pHB0eqTsBdrytNo3aJNA4us6rX/5CmrnmZ7 5PssZqcLQlEYQh/S4fugXoYyUYWHk0/A1uz0xGlB7eilgat+RpR0bhJMzD4dOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746725892; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zW6zHu8eFjEB458kR3enmVNg/Cm+t09Krypv6nyI+5o=; b=e5g4YIEWUjUiwkgmy8ME+HJmD+vBJ61LYSezJawozSbfnHrRBSVpE7FU7YkE/bmwwjHzCC cmYsgZAMeYmPiMZKzOh2bVsObeTzM12byoWcsWcVcRVxz62NYrzYNT/Z307muGPcu9M8pE IQfaUDeFr5DnwhVrITurzGhJSg7GIqHLAY+hGYsxUnTLkqHr+YVABzzjOq8zcpwGoLDdeH UfX00q4ffbsRqyRr71VzhSIWEH1PWJvh9bX74sbWGtpiwAUBLeEQLrzm6r2F766uUBO5qA 3Jp4AhIRyjlzCKW7v7bO+XmmvfTbQL4EmV/KxeoeK4bh+642PiZVnRvuaM/8Iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746725892; a=rsa-sha256; cv=none; b=aj2w0WDop4gs1VUhCaorLMSYF5XoEv+kXXBmjHvNYJxpVkJzKH6vwAVPbLSyH+FFjCSmyR LJZDEgSJOHjcn+K3d7C7EHdFmeFJf7wMDoC3YKRPUun0XyQwiI/78xb6zL+9dM3xUeu8Cc EC6Qe7uVHdO1QJAt2hN9m1+5oRnO4n6ebVR4ReZ9MybIWU22BjpCOCCODyIEWgkOrk/u8f In0F6O/lJz6cuyWg8ZDnrKjFeA5/Ee6EoR+rhIatnzyhgiZdcO4E5p+FHBxOoPS6Au+Eud qVCn+e6AV1KUZ+481+0qDWqijgtV7b7vlc/gar2FJ0lceLPEN4UsoonpYxEXcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZtfVW5Y6yz8Sk; Thu, 08 May 2025 17:38:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 548HcBuM043001; Thu, 8 May 2025 17:38:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 548HcBYh042998; Thu, 8 May 2025 17:38:11 GMT (envelope-from git) Date: Thu, 8 May 2025 17:38:11 GMT Message-Id: <202505081738.548HcBYh042998@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: eca0ce8afb15 - stable/14 - queue(3): Install *_SPLIT_AFTER() links to the main manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: eca0ce8afb15ef9f01703c4d15273eaf66eb63f5 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=eca0ce8afb15ef9f01703c4d15273eaf66eb63f5 commit eca0ce8afb15ef9f01703c4d15273eaf66eb63f5 Author: Olivier Certner AuthorDate: 2025-05-05 10:04:12 +0000 Commit: Olivier Certner CommitDate: 2025-05-08 17:37:03 +0000 queue(3): Install *_SPLIT_AFTER() links to the main manual page Completes commit "queue(3): New *_SPLIT_AFTER(), *_ASSERT_EMPTY(), *_ASSERT_NONEMPTY()" (c02880233949b01f). MFC after: 1 day Sponsored by: The FreeBSD Foundation (cherry picked from commit c071616b06aa0f51ac4314f989c472d0268c2ddb) --- share/man/man3/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile index 75f209ab4e0d..9f0c796e445c 100644 --- a/share/man/man3/Makefile +++ b/share/man/man3/Makefile @@ -217,6 +217,7 @@ MLINKS+= queue.3 LIST_CLASS_ENTRY.3 \ queue.3 LIST_PREV.3 \ queue.3 LIST_REMOVE.3 \ queue.3 LIST_REPLACE.3 \ + queue.3 LIST_SPLIT_AFTER.3 \ queue.3 LIST_SWAP.3 \ queue.3 SLIST_CLASS_ENTRY.3 \ queue.3 SLIST_CLASS_HEAD.3 \ @@ -237,6 +238,7 @@ MLINKS+= queue.3 LIST_CLASS_ENTRY.3 \ queue.3 SLIST_REMOVE_AFTER.3 \ queue.3 SLIST_REMOVE_HEAD.3 \ queue.3 SLIST_REMOVE_PREVPTR.3 \ + queue.3 SLIST_SPLIT_AFTER.3 \ queue.3 SLIST_SWAP.3 \ queue.3 STAILQ_CLASS_ENTRY.3 \ queue.3 STAILQ_CLASS_HEAD.3 \ @@ -259,6 +261,7 @@ MLINKS+= queue.3 LIST_CLASS_ENTRY.3 \ queue.3 STAILQ_REMOVE.3 \ queue.3 STAILQ_REMOVE_AFTER.3 \ queue.3 STAILQ_REMOVE_HEAD.3 \ + queue.3 STAILQ_SPLIT_AFTER.3 \ queue.3 STAILQ_SWAP.3 \ queue.3 TAILQ_CLASS_ENTRY.3 \ queue.3 TAILQ_CLASS_HEAD.3 \ @@ -286,6 +289,7 @@ MLINKS+= queue.3 LIST_CLASS_ENTRY.3 \ queue.3 TAILQ_PREV.3 \ queue.3 TAILQ_REMOVE.3 \ queue.3 TAILQ_REPLACE.3 \ + queue.3 TAILQ_SPLIT_AFTER.3 \ queue.3 TAILQ_SWAP.3 MLINKS+= stats.3 stats_tpl_alloc.3 \ stats.3 stats_tpl_fetch_allocid.3 \ From nobody Thu May 8 18:37:16 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ztgph71RSz5vRZ3; Thu, 08 May 2025 18:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ztgph6Jk0z43yy; Thu, 08 May 2025 18:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746729436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V3a+ecQTiLP8NXhhyN6wGaxL7hgkRF8plLTe0fTs55g=; b=PeT0Cr9Tc1hOsdykNvNmJETu66Y8rP+eyNHfXWFi3TCKoHeVGebms6eTRGAEhq39Upt9/I CRCVrU+Lgwqv1Q5YpAoz2RGRXymoyTNqucCl9z6A7jhk3z41Bla0XbuKa9UKmmJ7t1wus8 5PQyDlvrU2DOJSivRKhLLzUBpbKdIKEqV5RWH5GJ+sbOUDB7Cn95cyNxkpTUs3KLsaan7M Pv3LnMN/GGEcmoPq+HfXrTcOmjPw7CWwRab1yoHWk5SzvbsWg6VAHfwwew74sgN5F07Tyn IWmLUPCwQc84mm6x7am7TvpophSnZJ4DE9SbVc96Yr97SatFCqZxkpuB8eX97g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746729436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V3a+ecQTiLP8NXhhyN6wGaxL7hgkRF8plLTe0fTs55g=; b=Mt9WTSdHv1gUxDUZxdVgcuLLzUHuNWjWerbs8GTwgqiXUwr6LtelWwoQbGPC6S8YIx9GQ6 o2ImEWSbKtfmcjT0XKi0VaQCHBH3ImeKf745r6TuILgmyysSSSDNfVOmvBeU0VbTXn38TH Rfb0/rhh56S0qAVPKk1939cl/6GakNgA0xYo/P+KnBMXRqQEofx0yuAafJZcMDLFtJ0Ah3 Il+Mf2HKrgYyOuU4qv7/+veAV6hO0dH0iYi8MyKMMFN1XMvau/2W8oJk2e8O3LKHxS+3Ob ERjVVsYefsNbAI+niOYnuRa5Gm16alyDpJYjAuyqBuFMKYX5D+3dS+Tk0t662g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746729436; a=rsa-sha256; cv=none; b=kcpPHR/0h5c9cZ6sv53EN30S61hc1G47+KDbxrH7XxX2SXLKaPzIkAeLSMNOLL7OazRPTX tmcZFQpky3qkPlZ5TwurDJGH4YMf9Zt0lq3iMkzCzMlwycALqu0X2RZdXIQsFFQLBKVa6t GS+h0GR1ETAJkSS1VKwHH3YLvf7K/jqW3SqKR71O5aobL57k65vN6Gff1aRTGpt6UvA0G9 TvRK0ulUcvTxJu0sGP3fuu1g7RFU4tVU1QYgs3QxwywVgN+xeVAD8tSbvakJO53Lzzxnc6 ssPd6r0YSddO/KLhJ89mfkmHL4pTdEw4gYdDe8biICGsXPDEybi4kjHDhKBX5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ztgph5dl6zBSq; Thu, 08 May 2025 18:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 548IbGV1056035; Thu, 8 May 2025 18:37:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 548IbGhb056032; Thu, 8 May 2025 18:37:16 GMT (envelope-from git) Date: Thu, 8 May 2025 18:37:16 GMT Message-Id: <202505081837.548IbGhb056032@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: e5baab94b0b0 - stable/14 - Revert "VFS cache: Fix initial sizing for non-default 'ncsizefactor'" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e5baab94b0b096f772d40cf204875992d09a70c4 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=e5baab94b0b096f772d40cf204875992d09a70c4 commit e5baab94b0b096f772d40cf204875992d09a70c4 Author: Olivier Certner AuthorDate: 2025-05-08 18:34:44 +0000 Commit: Olivier Certner CommitDate: 2025-05-08 18:34:44 +0000 Revert "VFS cache: Fix initial sizing for non-default 'ncsizefactor'" Because it unadvertently was committed without the proper tags. Will be recommitted with them. This reverts commit 455203ec8885 (VFS cache: Fix initial sizing for non-default 'ncsizefactor', 2025-05-01). --- sys/kern/vfs_cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 300173347401..92e9d77eb891 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -2685,7 +2685,7 @@ nchinit(void *dummy __unused) ncsize = desiredvnodes * ncsizefactor; cache_recalc_neg_min(); - nchashtbl = nchinittbl(ncsize, &nchash); + nchashtbl = nchinittbl(desiredvnodes * 2, &nchash); ncbuckethash = cache_roundup_2(mp_ncpus * mp_ncpus) - 1; if (ncbuckethash < 7) /* arbitrarily chosen to avoid having one lock */ ncbuckethash = 7; From nobody Thu May 8 18:37:17 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ztgpk1hH9z5vRqj; Thu, 08 May 2025 18:37:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ztgpk0Fgbz43tc; Thu, 08 May 2025 18:37:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746729438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dO9aPQvH7Tnht54li7+JWa4KpO3gLkXYjd3zZaoJAUg=; b=BeF7s34hbrjnVdDwr9g5fHcmvH4NGYD6aCqWBj/3id1QE6Lt1OKRTYrDs8mYG/E4llOjBa lf1OFxbVqVeakwVX8HX/fHFEl1bcwJo25dNTUg3/uIlYT36seE/PEN6iUsdMfOsi26Qyqx zDZDlqKpu9SnhjF8YiuQoxTovAa2LROfX7euZn89pR1xaNElCM5wFxMgY3A2betSCNNNRr i1pNRmSWJf/fzXK1tIuODcIJ5vzCYFFq29IACFang2ERjfZVzFAUjWqQHFomE4E8ukV9Jk zaa19J+K0w7O6OoGRr/BgDhy0OPAAaeZ0T913PXQ+ghg9IZbJAJWzpgVKNdNXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746729438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dO9aPQvH7Tnht54li7+JWa4KpO3gLkXYjd3zZaoJAUg=; b=CzCXYYwUPNIA25pY6KIwRH55ls393gJYtNjac9WHvediBe3TiPAC4vt29IJCUOBuLAj03j PuYv/ocPuRqJp+rOd8ljYhf75rZ/PP7me9yJSMJ9UGnDiEKwQnVow7J8ztwrumr7AMURNf pVj0JLB0iKxoUWI4Ijk9Ray9Oum/+pTUEhvf733kNJ8sIjS8kmbwt0NMVJ0gZSQ6BOhgMV woemWpFOdNjz9glfkD8K58ESMtRw2MtxviMKEP5HB1RyncfbdSmV5RsJj4XY/VrekXFWjq ovEiqFvwKZsdhl+11+D0mbJRbYHZIpG4TOzQdDIlbKeEM3AwfVVGp7JmTsejrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746729438; a=rsa-sha256; cv=none; b=cohUXlA07LPMUK98FRE2KiV5Z0sOAIOA6vVP4uD/LnK/59yA9kDWdllPTUXJd2V8cDKV+y 1uOXMZ8c5YLS6DgpJgM14JNI1Z/0MV3fgYOCfnNMOyHURSmu8DsaLqs5YLyDUUWxjGmXYc EZPIqpnUzD+q3DwvaQEZjngL08oWOrQTyXBAHDy7mc9iWg3GXVmpCGeBWbClCQW3mLPiJ4 fGdNWHZPHEnpZHV5BBGHVpYApewdAxMMiMmb6lbcIMeC5U8DohMxcl3X/1kge9C1WJ14oK seLOO0vU89MHK/dmIDMr9bOxgBr/OpSq8jMk5nACjrvl7gdrDinuRjSjoANYvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ztgpj6r5yzBBT; Thu, 08 May 2025 18:37:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 548IbHB3056067; Thu, 8 May 2025 18:37:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 548IbHJq056064; Thu, 8 May 2025 18:37:17 GMT (envelope-from git) Date: Thu, 8 May 2025 18:37:17 GMT Message-Id: <202505081837.548IbHJq056064@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 95528b6ff1aa - stable/14 - VFS cache: Fix initial sizing for non-default 'ncsizefactor' List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 95528b6ff1aa630f98231fd907b79760f7346cd7 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=95528b6ff1aa630f98231fd907b79760f7346cd7 commit 95528b6ff1aa630f98231fd907b79760f7346cd7 Author: Olivier Certner AuthorDate: 2025-05-01 10:30:49 +0000 Commit: Olivier Certner CommitDate: 2025-05-08 18:36:37 +0000 VFS cache: Fix initial sizing for non-default 'ncsizefactor' Reviewed by: markj MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50120 (cherry picked from commit 811f6a0ae0230fb09b666276cbe93a8be4fe7c73) --- sys/kern/vfs_cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 92e9d77eb891..300173347401 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -2685,7 +2685,7 @@ nchinit(void *dummy __unused) ncsize = desiredvnodes * ncsizefactor; cache_recalc_neg_min(); - nchashtbl = nchinittbl(desiredvnodes * 2, &nchash); + nchashtbl = nchinittbl(ncsize, &nchash); ncbuckethash = cache_roundup_2(mp_ncpus * mp_ncpus) - 1; if (ncbuckethash < 7) /* arbitrarily chosen to avoid having one lock */ ncbuckethash = 7; From nobody Thu May 8 21:23:29 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZtlVT2DJ3z5vdGd; Thu, 08 May 2025 21:23:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZtlVT1Vtpz3RN9; Thu, 08 May 2025 21:23:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746739409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GETWpbGWKsgFk6psam5ifzQgMvcWSdaXgIIfpKvBHuY=; b=aDBE+pwLCsr7YuXsOpof85XWqBH952oiTtm/C1UJdLXJWSVoMFl3Wg/kADOhwXJeZ/jkmM bC/790ZStf945k3pXQLrL479uBkNro4a+jUxxG+Iq+h0tbfrO0iCKDPePf2NgFln5BLpUY 0ozy2O/mWitiHzTnUt7U9V772FdOVTzqPaT7AZx/WWhsycFpnbHemgFA5d6tkB8yDm67kO YQZ2jlcNXOAm0Upt26B9GDVh0gef+RJIQX4Tyhy3IL0QKjIhJIJDAgnXimhQa/u/lUO2O6 FtXydn0OVtKmhvONoH/xuvVaO1xlF8KkQ4eTMqeqOEdHB7pdM9ewnIAYlONO2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746739409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GETWpbGWKsgFk6psam5ifzQgMvcWSdaXgIIfpKvBHuY=; b=bnzWYfC1qJ1X2QizVQFpHVWWSDr1Tj9m7n/WbINHbA79b/4vMK+q8OBjD/WJ6i0wFH63qn KADhKNULp5BSwrlAeXuhuWlgyRIZvHs3eucmH71BtXIHoeMvhgDWlfHFwuZmaOQ5rz2Bh0 W/kYdMCW7Hy7s/bqNYk1/mx2W4PB4WkZ5xY/WSRL/tQHCEX7uN2XAHnQCem8WGR2w7ttCb F0JqlTnkJuXMkbk2kHRqtSJtYPNWU53+13MDBOOrjYhxQroekW0BZv95PuJkEkOttv/QWd 3AIbnCOpqDLW8XdvSwGSrYwCtjbWGQtyyyqvl5Pnaett4shmw9LKzvSWHPmC8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746739409; a=rsa-sha256; cv=none; b=WhjnYkm1apjKb7D+PPwLU6Q4x4ENizBsi6yKLssQpTZV+b7XP6h8IusuDLfuuFsn+3p/px vqDtBbdvDjf+9AeigjahhuNuhXpwXdo2gme1qnuZ8pkjZudvSHtyIwiraKrVpcSBta8z1Q xj8JPOPTEist1QMHVoUpzyFyHomV0Kj5Q4M2a30uMh1hssuEfFV/a7Wilom9Ls8MoCGUY3 9L+WW51Mo/ZAHTU3w5ltzn6kJ7JBBVIYLE5QITv23ZeYCxbmsMW3bjx+TKXqK3/T6LLu5I czyXWlM8wbEcm6dc866d7bb9vO0OKHgxEtTOmWt5vbOYsx7ttgpKssp3Tq8ZOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZtlVT0wK2zXVm; Thu, 08 May 2025 21:23:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 548LNTpI073140; Thu, 8 May 2025 21:23:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 548LNTLF073137; Thu, 8 May 2025 21:23:29 GMT (envelope-from git) Date: Thu, 8 May 2025 21:23:29 GMT Message-Id: <202505082123.548LNTLF073137@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 71946313d4d5 - releng/14.3 - LinuxKPI: 802.11: fix wiphy_info[_once] List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 71946313d4d50e8727afd089a1556f52cba62863 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=71946313d4d50e8727afd089a1556f52cba62863 commit 71946313d4d50e8727afd089a1556f52cba62863 Author: Bjoern A. Zeeb AuthorDate: 2025-05-02 20:14:35 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-08 21:22:35 +0000 LinuxKPI: 802.11: fix wiphy_info[_once] The dev field in wiphy is a pointer already; no need for &. Sponsored by: The FreeBSD Foundation Fixes: ac1d519c01ca8 Approved by: re (cperciva) (cherry picked from commit 845b81cf908002b14ac08ce8c42246720a5b30d9) (cherry picked from commit a21addc7a0137c5938414df322dbf5f929729834) --- sys/compat/linuxkpi/common/include/net/cfg80211.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index 328563b4a125..aae60983f5f6 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -2281,9 +2281,9 @@ wiphy_delayed_work_cancel(struct wiphy *wiphy, struct wiphy_delayed_work *wdwk) #define wiphy_err(_wiphy, _fmt, ...) \ dev_err((_wiphy)->dev, _fmt, __VA_ARGS__) #define wiphy_info(wiphy, fmt, ...) \ - dev_info(&(wiphy)->dev, fmt, ##__VA_ARGS__) + dev_info((wiphy)->dev, fmt, ##__VA_ARGS__) #define wiphy_info_once(wiphy, fmt, ...) \ - dev_info_once(&(wiphy)->dev, fmt, ##__VA_ARGS__) + dev_info_once((wiphy)->dev, fmt, ##__VA_ARGS__) #ifndef LINUXKPI_NET80211 #define ieee80211_channel linuxkpi_ieee80211_channel From nobody Thu May 8 21:23:30 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZtlVV5B9Wz5vdmJ; Thu, 08 May 2025 21:23:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZtlVV281Wz3RNL; Thu, 08 May 2025 21:23:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746739410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XLcztczoEIgiDwdTX7gmmIJ1Y+ykYyKZ12x36hd9Nzk=; b=XdWHC/6gkTHmLT0XJTG2FaNUxUZ1o6aKpl7fppWD/DbgB9CpKpbnY+VxajCSnPgv1SgUhf IW8Irm4MnmG4xiJpilASnWCrldeTx0OIOqiQtLAZR5P3djRlY5leOr00jdyFWV8jhnx/+v ehgRjGfJzi0PhqvWm1R32mVm90yI3fCAGwTmxDUm+ddkr9tbKg3DDGG1ZSZTMtANKs9Qgm iVD4Ie9vSOQuEymJkNrEuSY9TK7eZ1bEp5LAGDXFJem2HtB8SBED0aXJB992A8k88oUsNq WQPkYuK4rZbjk0OuJBwJWGXV82v7qRMqMbogWf8/ISghusi23iPHZ7w3MR3nXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746739410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XLcztczoEIgiDwdTX7gmmIJ1Y+ykYyKZ12x36hd9Nzk=; b=r5JvLSPim6sFyDTy+Y0g6rWQnRAH4YkwceMN/UGGYV1ElgOxbxv/56urLLV/Rg1g/+hMwr 6gjbyKZVnjdsEMSuQ+Ig6JE8ts8uCdQf3+aleFPg3SLg9ADlantMWQAB+5CzJmD80cnlv1 0Rc9dpuPiE1gZHd6jVYdemgGfd2nDragEKdc+uqC503NmiCkFYzLGdxMwSCxZcALD+uPLy Sp9fssRboxNV6A4oG/ld2ZAJyuqvjWmucMMJSsJwYbh3FWvcrQz5ZQx+SPtxTKxGuzqe7h p55QCoJ3iwmsFrbiU2mPPq9Yda5GOiKMRH1eviw5dEP2eh6GNOWEjCaj/+8bXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746739410; a=rsa-sha256; cv=none; b=n4VfM/Fy3b3HUJG1ma13wNGspxy1eg1CK1DIUVwor0jVtKrsUNYsqPsDns7MCbrUUHyZok tTeaZgTCQys8Ab9xijTI0TvwCGmge1FAEAeGm9E+zooZV/Ba6gmhVeY8DDfIF3lmGizjya +0GAcBVBKIPJDQv9unw7y4EBnQx2JZWBbrLre5CS7eQSdzSMKTs2NE47nSUaKQWOq1r9/Z v0qkIXSEKesFHKz4vKVh1J7PPjGHAI6J7wDmXhqmdYA3U9GIpZJz8QC1k9LAvF0gKqB5fI c1QZd0zX4lPkX4cZrJJ1/uA3jMPaJKSbl3ChMC+mloARToauob21Gn4Hwh50fA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZtlVV1hX7zXyD; Thu, 08 May 2025 21:23:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 548LNUC6073183; Thu, 8 May 2025 21:23:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 548LNUHi073179; Thu, 8 May 2025 21:23:30 GMT (envelope-from git) Date: Thu, 8 May 2025 21:23:30 GMT Message-Id: <202505082123.548LNUHi073179@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 873c0ea6482f - releng/14.3 - LinuxKPI: 802.11: header updates for mt76 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 873c0ea6482f38ea572ad3d5c494a261fed536fb Auto-Submitted: auto-generated The branch releng/14.3 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=873c0ea6482f38ea572ad3d5c494a261fed536fb commit 873c0ea6482f38ea572ad3d5c494a261fed536fb Author: Bjoern A. Zeeb AuthorDate: 2025-05-02 20:13:33 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-08 21:22:53 +0000 LinuxKPI: 802.11: header updates for mt76 Add more structs, fields, flags, defines. Sponsored by: The FreeBSD Foundation Approved by: re (cperciva) (cherry picked from commit 675e6b1c68ba71af1853952f7df4d84399340009) (cherry picked from commit 6a0dbc0a1246c9825f0892bb6dd957f5d081057a) --- .../linuxkpi/common/include/linux/ieee80211.h | 6 ++ sys/compat/linuxkpi/common/include/net/cfg80211.h | 96 +++++++++++++++------- sys/compat/linuxkpi/common/include/net/mac80211.h | 36 ++++++-- 3 files changed, 100 insertions(+), 38 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index 8a33ad002e09..396204c3c484 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -295,6 +295,7 @@ enum ieee80211_ac_numbers { #define IEEE80211_HT_MCS_MASK_LEN 10 #define IEEE80211_MLD_MAX_NUM_LINKS 15 +#define IEEE80211_MLD_CAP_OP_MAX_SIMUL_LINKS 0xf #define IEEE80211_MLD_CAP_OP_TID_TO_LINK_MAP_NEG_SUPP 0x0060 #define IEEE80211_MLD_CAP_OP_TID_TO_LINK_MAP_NEG_SUPP_SAME 1 @@ -427,6 +428,7 @@ enum ieee80211_tx_control_flags { IEEE80211_TX_CTRL_PORT_CTRL_PROTO = BIT(0), IEEE80211_TX_CTRL_PS_RESPONSE = BIT(1), IEEE80211_TX_CTRL_RATE_INJECT = BIT(2), + IEEE80211_TX_CTRL_DONT_USE_RATE_MASK = BIT(3), IEEE80211_TX_CTRL_MLO_LINK = 0xF0000000, /* This is IEEE80211_LINK_UNSPECIFIED on the high bits. */ }; @@ -493,6 +495,10 @@ enum ieee80211_category { WLAN_CATEGORY_SA_QUERY = 8, /* net80211::IEEE80211_ACTION_CAT_SA_QUERY */ }; +struct ieee80211_he_6ghz_capa { + uint16_t capa; +}; + /* 80211-2020 9.3.3.2 Format of Management frames */ struct ieee80211_mgmt { __le16 frame_control; diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index aae60983f5f6..1e4f917a2796 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -744,6 +744,8 @@ struct linuxkpi_ieee80211_regdomain { #define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_4 0x20 #define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_MASK 0x40 #define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_MASK 0x80 +#define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_5 0x80 +#define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_5 0x80 #define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_2 0x1 #define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_2 0x2 @@ -931,11 +933,6 @@ struct ieee80211_he_obss_pd { uint8_t partial_bssid_bitmap[8]; }; -struct ieee80211_sta_he_6ghz_capa { - /* TODO FIXME */ - int capa; -}; - struct ieee80211_eht_mcs_nss_supp_20mhz_only { union { struct { @@ -989,7 +986,7 @@ struct ieee80211_sband_iftype_data { /* TODO FIXME */ enum nl80211_iftype types_mask; struct ieee80211_sta_he_cap he_cap; - struct ieee80211_sta_he_6ghz_capa he_6ghz_capa; + struct ieee80211_he_6ghz_capa he_6ghz_capa; struct ieee80211_sta_eht_cap eht_cap; struct { const uint8_t *data; @@ -1182,6 +1179,18 @@ enum cfg80211_regulatory { REGULATORY_COUNTRY_IE_FOLLOW_POWER = BIT(6), }; +struct wiphy_radio_freq_range { + uint32_t start_freq; + uint32_t end_freq; +}; + +struct wiphy_radio { + int n_freq_range; + int n_iface_combinations; + const struct wiphy_radio_freq_range *freq_range; + const struct ieee80211_iface_combination *iface_combinations; +}; + enum wiphy_flags { WIPHY_FLAG_AP_UAPSD = BIT(0), WIPHY_FLAG_HAS_CHANNEL_SWITCH = BIT(1), @@ -1246,6 +1255,9 @@ struct wiphy { uint8_t available_antennas_rx; uint8_t available_antennas_tx; + int n_radio; + const struct wiphy_radio *radio; + int features, hw_version; int interface_modes, max_match_sets, max_remain_on_channel_duration, max_scan_ssids, max_sched_scan_ie_len, max_sched_scan_plan_interval, max_sched_scan_plan_iterations, max_sched_scan_plans, max_sched_scan_reqs, max_sched_scan_ssids; int num_iftype_ext_capab; @@ -1259,6 +1271,7 @@ struct wiphy { unsigned long ext_features[BITS_TO_LONGS(NUM_NL80211_EXT_FEATURES)]; struct dentry *debugfsdir; + const struct wiphy_wowlan_support *wowlan; struct cfg80211_wowlan *wowlan_config; /* Lower layer (driver/mac80211) specific data. */ @@ -1271,8 +1284,9 @@ struct wiphy { struct wireless_dev { /* XXX TODO, like ic? */ - int iftype; - int address; + enum nl80211_iftype iftype; + uint32_t radio_mask; + uint8_t address[ETH_ALEN]; struct net_device *netdev; struct wiphy *wiphy; }; @@ -1542,6 +1556,43 @@ cfg80211_chandef_create(struct cfg80211_chan_def *chandef, }; } +static __inline bool +cfg80211_chandef_valid(const struct cfg80211_chan_def *chandef) +{ + TODO(); + return (false); +} + +static __inline bool +cfg80211_chandef_dfs_usable(struct wiphy *wiphy, const struct cfg80211_chan_def *chandef) +{ + TODO(); + return (false); +} + +static __inline unsigned int +cfg80211_chandef_dfs_cac_time(struct wiphy *wiphy, const struct cfg80211_chan_def *chandef) +{ + TODO(); + return (0); +} + +static __inline bool +cfg80211_chandef_identical(const struct cfg80211_chan_def *chandef_1, + const struct cfg80211_chan_def *chandef_2) +{ + TODO(); + return (false); +} + +static __inline bool +cfg80211_chandef_usable(struct wiphy *wiphy, + const struct cfg80211_chan_def *chandef, uint32_t flags) +{ + TODO(); + return (false); +} + static __inline void cfg80211_bss_iter(struct wiphy *wiphy, struct cfg80211_chan_def *chandef, void (*iterfunc)(struct wiphy *, struct cfg80211_bss *, void *), void *data) @@ -2077,27 +2128,6 @@ cfg80211_find_ext_ie(uint8_t eid, const uint8_t *p, size_t len) return (NULL); } -static __inline bool -cfg80211_chandef_valid(const struct cfg80211_chan_def *chandef) -{ - TODO(); - return (false); -} - -static __inline bool -cfg80211_chandef_dfs_usable(struct wiphy *wiphy, const struct cfg80211_chan_def *chandef) -{ - TODO(); - return (false); -} - -static __inline unsigned int -cfg80211_chandef_dfs_cac_time(struct wiphy *wiphy, const struct cfg80211_chan_def *chandef) -{ - TODO(); - return (0); -} - static inline void _ieee80211_set_sband_iftype_data(struct ieee80211_supported_band *band, struct ieee80211_sband_iftype_data *iftype_data, size_t nitems) @@ -2189,6 +2219,14 @@ cfg80211_get_iftype_ext_capa(struct wiphy *wiphy, enum nl80211_iftype iftype) return (NULL); } +static inline uint16_t +ieee80211_get_he_6ghz_capa(const struct ieee80211_supported_band *sband, + enum nl80211_iftype iftype) +{ + TODO(); + return (0); +} + static inline int nl80211_chan_width_to_mhz(enum nl80211_chan_width width) { diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index c6cdcbc43269..f8eb180d63a1 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -473,6 +473,7 @@ enum ieee80211_hw_flags { IEEE80211_HW_DISALLOW_PUNCTURING_5GHZ, IEEE80211_HW_TX_STATUS_NO_AMPDU_LEN, IEEE80211_HW_HANDLES_QUIET_CSA, + IEEE80211_HW_NO_VIRTUAL_MONITOR, /* Keep last. */ NUM_IEEE80211_HW_FLAGS @@ -708,9 +709,10 @@ struct ieee80211_sta_rates { /* XXX TODO */ /* XXX some _rcu thing */ struct { - int idx; - int flags; - } rate[1]; /* XXX what is the real number? */ + uint8_t idx; + uint8_t count; + uint16_t flags; + } rate[4]; /* XXX what is the real number? */ }; struct ieee80211_sta_txpwr { @@ -734,7 +736,7 @@ struct ieee80211_link_sta { struct ieee80211_sta_ht_cap ht_cap; struct ieee80211_sta_vht_cap vht_cap; struct ieee80211_sta_he_cap he_cap; - struct ieee80211_sta_he_6ghz_capa he_6ghz_capa; + struct ieee80211_he_6ghz_capa he_6ghz_capa; struct ieee80211_sta_eht_cap eht_cap; uint8_t rx_nss; enum ieee80211_sta_rx_bw bandwidth; @@ -1093,7 +1095,7 @@ struct ieee80211_ops { void (*update_vif_offload)(struct ieee80211_hw *, struct ieee80211_vif *); - int (*get_txpower)(struct ieee80211_hw *, struct ieee80211_vif *, int *); + int (*get_txpower)(struct ieee80211_hw *, struct ieee80211_vif *, unsigned int, int *); int (*get_stats)(struct ieee80211_hw *, struct ieee80211_low_level_stats *); int (*set_radar_background)(struct ieee80211_hw *, struct cfg80211_chan_def *); @@ -1870,13 +1872,13 @@ ieee80211_rate_set_vht(struct ieee80211_tx_rate *r, uint8_t mcs, uint8_t nss) } static inline uint8_t -ieee80211_rate_get_vht_nss(struct ieee80211_tx_rate *r) +ieee80211_rate_get_vht_nss(const struct ieee80211_tx_rate *r) { return (((r->idx >> 4) & 0x07) + 1); } static inline uint8_t -ieee80211_rate_get_vht_mcs(struct ieee80211_tx_rate *r) +ieee80211_rate_get_vht_mcs(const struct ieee80211_tx_rate *r) { return (r->idx & 0x0f); } @@ -2180,12 +2182,27 @@ ieee80211_queue_work(struct ieee80211_hw *hw, struct work_struct *w) linuxkpi_ieee80211_queue_work(hw, w); } +static __inline bool +ieee80211_tx_prepare_skb(struct ieee80211_hw *hw, struct ieee80211_vif *vif, + struct sk_buff *skb, enum nl80211_band band, struct ieee80211_sta **sta) +{ + TODO(); + return (false); +} + static __inline void ieee80211_tx_status_skb(struct ieee80211_hw *hw, struct sk_buff *skb) { linuxkpi_ieee80211_tx_status(hw, skb); } +static inline void +ieee80211_tx_status_noskb(struct ieee80211_hw *hw, struct ieee80211_sta *sta, + struct ieee80211_tx_info *info) +{ + TODO(); +} + static __inline void ieee80211_tx_status_irqsafe(struct ieee80211_hw *hw, struct sk_buff *skb) { @@ -2267,7 +2284,8 @@ ieee80211_txq_may_transmit(struct ieee80211_hw *hw, struct ieee80211_txq *txq) } static __inline void -ieee80211_radar_detected(struct ieee80211_hw *hw) +ieee80211_radar_detected(struct ieee80211_hw *hw, + struct ieee80211_chanctx_conf *chanctx_conf) { TODO(); } @@ -2327,7 +2345,7 @@ ieee80211_get_tx_rates(struct ieee80211_vif *vif, struct ieee80211_sta *sta, } static __inline void -ieee80211_color_change_finish(struct ieee80211_vif *vif) +ieee80211_color_change_finish(struct ieee80211_vif *vif, uint8_t link_id) { TODO(); } From nobody Thu May 8 21:23:31 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZtlVW5njMz5vdxZ; Thu, 08 May 2025 21:23:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZtlVW32xvz3Rbv; Thu, 08 May 2025 21:23:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746739411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w9Lw9V5Kr5pDW+fkHRf/gx3WuxVMECGuaaDgnMxR0Ec=; b=MkIIIPBwAP4hh5SaoWGRduyu0Znciv+feQfBfRJ/A8CZhwjYVi7i2eP6DcCq9x9g+sLiWk zz5w0atsD7E2y1cuEZEmfmv+z2y6DlXqg/MPjUTlD9jzH872lx9rsyUuXXDYu3H6wsVzEP SBXpT4vEGTlwRos/vrCLt7Z8qquupqxZWlnypinXpdTfAtCo7vhdAOdzyvItX++lICHID0 IIO4dPOkgYi5H1Hac+d6LFuxV0S1qRTPexLOis3NGUcEZC3HSlQ0/zUwSX3fVVe8xN/Lw5 N1mHKBprJpXV7Y2Q2yuF1MLo+O0oAwGRXrSYIgC8yNjjiCoNw2UCaGtQ3hEpNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746739411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w9Lw9V5Kr5pDW+fkHRf/gx3WuxVMECGuaaDgnMxR0Ec=; b=g6hgyDQ/7nPK8Lz+yPdbYZd86RmJSYILJgn5KUqfRDdGh1nKHATD8TMCUKx7aNkR9w22SZ KS9u58TqO0RHQ0CVbtj2DoLBkAFnHk47CkaAqoDna5dVF7dk6RYkAIf9d2aEx1dJyiKbR4 xVc51ahUpbgz2X/MjvcQKIkNs3Srk0hqFAnKdRxktVoeL5eEwKtYWx5gXlwlAkETb5TWIi +O3mfUESm3Ch+CGEVcraOevtqC2X41Q2v58JhaImD9bIOIcRKRTxH9vy21XR+mT9m+rCLS H8duaJUPuCzJRDBO9/j7LHcpfUiecA4a1w2ONs7ELayGu3r5RY9t7w2AB6CfDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746739411; a=rsa-sha256; cv=none; b=ITQ1tMQBFZ2hLcZpn3zLp8Tjwfa3nkd9A6U+163DHr5QLDY0CQLnh7FGwWEiAnbmbhb+Ea 1LNNnFKadaD9WJqlj1Ez7F7qFiToCe11ZFyzFYJgeLHzgqpniY4L5fZjdaS1rsU1woeAkQ CLFqUQSwnAY51MuPrFYRI3+hLXXi4YB72x/vaIuD3bAR8yQRN7kEsoXbm5JBfggJEvuXwR knV7YyYYCxZbAZyosu6BwsN8IMrDUeBpdUljM+g6lijiKRmSSeOK5QLJUbIJXk01eDodaX RgbyjiWq+uwaL3mOVBL878aI9gh9hne7rSWkk+z1jMbVPeImcvVJQyHZNDGzGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZtlVW2cMrzXXt; Thu, 08 May 2025 21:23:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 548LNVsr073223; Thu, 8 May 2025 21:23:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 548LNVRJ073220; Thu, 8 May 2025 21:23:31 GMT (envelope-from git) Date: Thu, 8 May 2025 21:23:31 GMT Message-Id: <202505082123.548LNVRJ073220@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 8d6b75819946 - releng/14.3 - net80211: fix a race between ieee80211_sta_join and scan entries List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 8d6b75819946c5b01281dc93e3b0df049340f9b6 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8d6b75819946c5b01281dc93e3b0df049340f9b6 commit 8d6b75819946c5b01281dc93e3b0df049340f9b6 Author: Bjoern A. Zeeb AuthorDate: 2025-04-16 19:10:58 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-08 21:22:59 +0000 net80211: fix a race between ieee80211_sta_join and scan entries We were seeing panics during ieee80211_sta_join() which seemed that the ni->ni_chan was not valid anymore, which was true. We also saw errors indicating data put into ni_ies became inalid. The problem was that the ieee80211_scan_entry passed into ieee80211_sta_join() (in the observed case from setmlme_assoc_sta()) became invalid during ieee80211_alloc_node(). As a result for the ni_chan case the the rateset and len in rates[1] became invalid. Similarly for the IEs. Make a (deep)copy of the scan entry in setmlme_assoc_sta() and return the copy as once we leave ieee80211_scan_iterate() we can no longer rely on the scan entry to be valid. Sponsored by: The FreeBSD Foundation Reported by: rm, ziaee, bz Tested by: rm, ziaee, bz PR: 286063 Approved by: re (cperciva) Reviewed by: adrian (,emaste) Differential Revision: https://reviews.freebsd.org/D49865 (cherry picked from commit aff56b4f0b25c44c9c2cae9a3f816c4277057a71) (cherry picked from commit 34cd36918652f07ea8a36a62115349781e457fc6) --- sys/net80211/ieee80211_ioctl.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c index 3b57e7d8cd8e..7447e3a05ed3 100644 --- a/sys/net80211/ieee80211_ioctl.c +++ b/sys/net80211/ieee80211_ioctl.c @@ -1534,7 +1534,8 @@ struct scanlookup { const uint8_t *mac; int esslen; const uint8_t *essid; - const struct ieee80211_scan_entry *se; + bool found; + struct ieee80211_scan_entry se; }; /* @@ -1544,6 +1545,10 @@ static void mlmelookup(void *arg, const struct ieee80211_scan_entry *se) { struct scanlookup *look = arg; + int rv; + + if (look->found) + return; if (!IEEE80211_ADDR_EQ(look->mac, se->se_macaddr)) return; @@ -1553,7 +1558,14 @@ mlmelookup(void *arg, const struct ieee80211_scan_entry *se) if (memcmp(look->essid, se->se_ssid+2, look->esslen)) return; } - look->se = se; + /* + * First copy everything and then ensure we get our own copy of se_ies. */ + look->se = *se; + look->se.se_ies.data = 0; + look->se.se_ies.len = 0; + rv = ieee80211_ies_init(&look->se.se_ies, se->se_ies.data, se->se_ies.len); + if (rv != 0) /* No error */ + look->found = true; } static int @@ -1562,21 +1574,25 @@ setmlme_assoc_sta(struct ieee80211vap *vap, const uint8_t ssid[IEEE80211_NWID_LEN]) { struct scanlookup lookup; + int rv; KASSERT(vap->iv_opmode == IEEE80211_M_STA, ("expected opmode STA not %s", ieee80211_opmode_name[vap->iv_opmode])); /* NB: this is racey if roaming is !manual */ - lookup.se = NULL; lookup.mac = mac; lookup.esslen = ssid_len; lookup.essid = ssid; + memset(&lookup.se, 0, sizeof(lookup.se)); + lookup.found = false; ieee80211_scan_iterate(vap, mlmelookup, &lookup); - if (lookup.se == NULL) + if (!lookup.found) return ENOENT; mlmedebug(vap, mac, IEEE80211_MLME_ASSOC, 0); - if (!ieee80211_sta_join(vap, lookup.se->se_chan, lookup.se)) + rv = ieee80211_sta_join(vap, lookup.se.se_chan, &lookup.se); + ieee80211_ies_cleanup(&lookup.se.se_ies); + if (rv == 0) return EIO; /* XXX unique but could be better */ return 0; } From nobody Fri May 9 00:03:06 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ztq2f5xtDz5vng2; Fri, 09 May 2025 00:03:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ztq2f5RQkz41rV; Fri, 09 May 2025 00:03:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746748986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mHr4bOaiGusbL6cvjyelaJAwZ7s+d/0sb/GFjDQOBlk=; b=H+a7zDLfIpte7wcEGxPKOlXatezuWFAx77im4dUgIgoj6VksKWX+njVHeDa11zMF5ywkrw iYQaz6LuHs67un764gTygd1Iw+5bhFRn94OSlJuS5gPCAKAFowiN7leuuKpDwywEFr/O7u 9EE9dzNwi2Vu7k6gmj0QUhCczU4SygYrV0d84Jbn/oiP7o1RXopHG0/mmp3sNEV0dm0fZ6 2amK7DEYHp6kI3iaG0NSXkqJNg/Q+V75iMCMaDwOovdi95BEXLjp8O86b+L3DVpsYQDNCF 9GSeomvpVLbV09W4FIK4SF3vHgLGhA/tXmKglI9Z0gIanKHde7SCrg/MndYgzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746748986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mHr4bOaiGusbL6cvjyelaJAwZ7s+d/0sb/GFjDQOBlk=; b=mq5NqfH4EATRsiODkarv18qmvF28n3y/6lfDX7NChF+T+chTMkZ6nw5xc7fZ8uOmvJ1WTr cOf4YgYXdNsa+ze1BpZuHKiyzrfHMza0vkV0P15+ec3pgwvJk13Lve61zx4Rk6MkAbTy1P 6m4eWgnLbZDMha0e5/w6xgjKcjA2/KDN0xJ1Tr5k2iBR7etrfenRvBUd6EVC+msceDT99+ j+xpHYK8Q0SwedVvkq7zJkCdBjH9G8NSQ2BBrigfHtDOlFxUTYoddXH8FVwdyCjkBohe8v 78XwS0CdhILK0BsUs+ndEvKRnQfeJSfOPWnYV0subuaqNG9iYjOu5dih4lIkDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746748986; a=rsa-sha256; cv=none; b=ClDN+KTZsdIejYFja50y/zihtXqFCY3xCzbdnve0H7xMCQQzv7IdmMNc9wiZcx+MxtnZ0W tCF5b0UEnKWKbTBJKvpLuqMSA54g2T23V6K9K+jqImzdA9T+FtUkqIj2P3GxcPlhfmfg6V a0kQUsNZ595jUdADg3UZoLm/nWewpjxWUPEabNG3+ZudRUc5vkNFQDsyGzOozYDvvxYvPe WXC0wuDkDD7ic8k1YJmsq+nOEoVkaSQsgcupehYfQ7UDnXKGEQeVCZrXwfyFZcxQIQKkBx UTiA6HK9jtj+Vsw3zdidcI1foJ5uUH+HDpejsrFzwdqtPSSrv9H3OJLL2a1K8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ztq2f4x9GzdLr; Fri, 09 May 2025 00:03:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 549036tM073642; Fri, 9 May 2025 00:03:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 549036OK073639; Fri, 9 May 2025 00:03:06 GMT (envelope-from git) Date: Fri, 9 May 2025 00:03:06 GMT Message-Id: <202505090003.549036OK073639@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 0e8065166204 - releng/14.3 - 14.3: Update to BETA2 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 0e8065166204c99c5a33700cc317964390831eef Auto-Submitted: auto-generated The branch releng/14.3 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0e8065166204c99c5a33700cc317964390831eef commit 0e8065166204c99c5a33700cc317964390831eef Author: Colin Percival AuthorDate: 2025-05-09 00:00:00 +0000 Commit: Colin Percival CommitDate: 2025-05-09 00:00:00 +0000 14.3: Update to BETA2 Approved by: re (implicit) Sponsored by: Amazon --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index f93ddac7d10c..4f6e7e82a1b2 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.3" -BRANCH="BETA1" +BRANCH="BETA2" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri May 9 16:59:54 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZvFbv2fPVz5vv4n; Fri, 09 May 2025 16:59:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZvFbv2B39z3wrH; Fri, 09 May 2025 16:59:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746809995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5vzaT7M6qOe3qvHHvatdbFgw9rFtpZbI8t2X43mqkVA=; b=EcNn/cMelM8kybcNEZHnDZXMfqj6urKeR+K75Wl+xE+Zfbdo3Ai/eMxiAt24BJSrp9lSRZ /Dbt8aAf8eUlr8d+rcOAWoeN454vvF4oBbDxacKHa3FiTTvqdWvmmfBKCdY6DPPoKFr5jN aUcDAZUUHVkB2RBEo9Sm5FNybbiRFZTiQCKt4U9LcSZsqhj3Lu7Eh3dPoyIr8YU6rhRGc4 MPC5LDq88RxEOGFKOgawUR/2Zw1nR5WlVNOiQepg4X4XwqGQ6vruiWIwPf+XfgOD2lfqpS nAxBYHqAT141Uy8tzYo6bKpYQispBirL1JG4Wv3WWbF+h2PqtXneEEOn8p1H+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746809995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5vzaT7M6qOe3qvHHvatdbFgw9rFtpZbI8t2X43mqkVA=; b=tiYfgVClNq/xfijEWsOT/ImhsuFOBC9JcXAhtzqEZMAeGGsGi6HT/BRv94eb/Gt3+woYn4 AXhLkOijnqAf3Ahncd6DYdGX5oLYgv9TGJHoX7epgEqTE46Z56eB4a2ntJ7EVdlumHP2sG vAJwioShUkf1D44nu754y05iGe7ohWpErAF9i2q6Ku0K5xWEoLPkAt04i8q83SXxGavP4/ LzJPeOxugEztsOgzftQmrJXE8IuGWUFNMpoVJD33pJqqMxEdHQMMWwFkBAS1mYkG/6HgH/ VHwhSRbZivF931FI6Cb3l+pcucIe0GYSy3ejD2r5gWuag8zyZeFcBwPsXen/lA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746809995; a=rsa-sha256; cv=none; b=nsY05I+il+KtHQWH2GpGhY9K6SH6vLFgY1k0miQL6FVl0nxe714KZ3kuJMqQusHUQzzooZ siGqAKnMc4KK0902VPXxqDKsCUgBKreu6kNkNgcnx5DrJVBkv1HXcxlY8PF0nEli72VkNc H71r394RQ0vuMcdFilfXhyxLrP7WuvxSlNHHeCTW+pwVc20p3tnEiLxNajMkyHFx0q5h5g RS7NkzRgKHzkOgl9hGv0Vh+H5iWU198HD4l1P7ngjQDT+NOdGLvRfi68+DbQcZLJI/D+iu mr2UjuHpKNVJapKVxSixNnYw7nEdazUl5404xVsEM0Xe1CzvINSVzT12jZL0UA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZvFbv1HsGz16tm; Fri, 09 May 2025 16:59:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 549Gxssu065147; Fri, 9 May 2025 16:59:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 549Gxspm065144; Fri, 9 May 2025 16:59:54 GMT (envelope-from git) Date: Fri, 9 May 2025 16:59:54 GMT Message-Id: <202505091659.549Gxspm065144@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: a9b30c92ab1c - stable/14 - bsddialog: Correct type for bsddialog_total_progview List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a9b30c92ab1c0dbed31eed94b8b975eb574d2a3f Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a9b30c92ab1c0dbed31eed94b8b975eb574d2a3f commit a9b30c92ab1c0dbed31eed94b8b975eb574d2a3f Author: Ed Maste AuthorDate: 2025-05-09 00:35:10 +0000 Commit: Ed Maste CommitDate: 2025-05-09 16:58:11 +0000 bsddialog: Correct type for bsddialog_total_progview It was an int, but printed with %lli format. Although it would be reasonable to use a 32-bit int here (i.e., changing the printf format instead) this matches what was done in bsddialog upstream (and now in main). PR: 286655 Reviewed by: asiciliano Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50261 --- contrib/bsddialog/lib/barbox.c | 4 ++-- contrib/bsddialog/lib/bsddialog_progressview.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/bsddialog/lib/barbox.c b/contrib/bsddialog/lib/barbox.c index 71759839a709..d9b4070b3e0c 100644 --- a/contrib/bsddialog/lib/barbox.c +++ b/contrib/bsddialog/lib/barbox.c @@ -47,7 +47,7 @@ bool bsddialog_interruptprogview; bool bsddialog_abortprogview; -int bsddialog_total_progview; +long long int bsddialog_total_progview; static void draw_bar(WINDOW *win, int y, int x, int barlen, int perc, bool withlabel, @@ -747,4 +747,4 @@ bsddialog_pause(struct bsddialog_conf *conf, const char *text, int rows, end_dialog(conf, shadow, widget, textpad); return (retval); -} \ No newline at end of file +} diff --git a/contrib/bsddialog/lib/bsddialog_progressview.h b/contrib/bsddialog/lib/bsddialog_progressview.h index 0cd9368a1040..af10d813f5f9 100644 --- a/contrib/bsddialog/lib/bsddialog_progressview.h +++ b/contrib/bsddialog/lib/bsddialog_progressview.h @@ -36,7 +36,7 @@ extern bool bsddialog_interruptprogview; extern bool bsddialog_abortprogview; -extern int bsddialog_total_progview; +extern long long int bsddialog_total_progview; struct bsddialog_fileminibar { const char *path; @@ -57,4 +57,4 @@ bsddialog_progressview (struct bsddialog_conf *conf, const char *text, int rows, int cols, struct bsddialog_progviewconf *pvconf, unsigned int nminibar, struct bsddialog_fileminibar *minibar); -#endif \ No newline at end of file +#endif From nobody Fri May 9 20:32:44 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZvLKT1Dbzz5w6qh; Fri, 09 May 2025 20:32:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZvLKT0ZSQz3q6N; Fri, 09 May 2025 20:32:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746822765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k0lQor08ceZDjzYol5VicGwHSvpwFMiRlSH47/HnsK8=; b=Zm/SIH0tfvRtbcC6Rq9Z+HEgwkEFejO4uKL+PRAhm0XkFORw6ZmN2UCU263+mL2MFglDfX FRxcn2vlJUqV+8QNwPu/Ctu0wbF4NRyrr4Zg/CewFbHSgrLQeTrbLuSiLVdk8XIfX1du9h f9A7tFs3Ldt4Y5XMPa9dui7XsTRi0sAaLEGWBhVfWZcMaxhrtGoZVInIPnZDX/BelQlBFf vy32GUq1yc3ESRYd4p8mFjBk/q6PYaA411bAGtHypyEa+xMrQWcAN2LK0Likr1npkguCqK +2ZLXhSz4l12L6EIialOv9WdSkP1ihUm6NO/M9ypw6n7vzGrRcrUI7hzN51qWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746822765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k0lQor08ceZDjzYol5VicGwHSvpwFMiRlSH47/HnsK8=; b=nTNTXhlB9o6nxUasjR9b6nG/srN0/VoYPS3dL3VEQhRyAs7eZ+RAEomUzneTdjsuGzYR98 wWaZD4+hbXEkVLUpYdQxTcb2Q4QzSLjw7CmpGvH4SoCBO5odlA/kHgClrpYSjLXTNt+oRN R9i9SvlgbUF33FcwNg8pyH7JF/pnbtmfofa3bVjJP8GvXImlFBjmAtPjA2tudGP1fOToCY 7HKnlilY3f1/iWNBqcvBfnS1s/cP3zmai7+g9l7sxAxBmZzO1WzJ9GM0hknhWdukZHqUfH IyNxWRBDAUIZM7rGKMc4BmtosOdUE/S9eWg8Bg0cDvwV3/4DPHQMjGsEz7qxAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746822765; a=rsa-sha256; cv=none; b=rWD5ObR83uok1WyKpmwtQjUsUS7SZGWEWpfAvHAhjSxgjdQLI3OZo37x+e3z5NMumPVfDQ Zn2WK2Ws2D306Xj27W0RztXFcnoQAMrRYpXqLVmB45+pk6kAVK7bWWWM5d6hvVoo64CeCO ThAvKQ5mW+gPEBUksePjtRqumkkoGbs4luUlZr2SfjsN+wL0ia/qyWHEhhCy+tshq6Nsjz yMQSXZWjlHs6Z/RppVdEUrTQAuFgyxDCn34nOZJP6zJ+Dtu9SWD2+gic8NiGU+tacDddFG G0KTUINcSyAf7gP9uCbvb5+HEeSq+z2jWqE4t1Q8wIvRuZMG6kaG79/o+4V9/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZvLKS756Gz1HJ; Fri, 09 May 2025 20:32:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 549KWiAi073969; Fri, 9 May 2025 20:32:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 549KWiw2073966; Fri, 9 May 2025 20:32:44 GMT (envelope-from git) Date: Fri, 9 May 2025 20:32:44 GMT Message-Id: <202505092032.549KWiw2073966@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: a743b3f1a4c5 - stable/14 - Convert libllvm, libclang and liblldb into private shared libraries List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a743b3f1a4c538c50236b5322d4c82db08a3d9f2 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a743b3f1a4c538c50236b5322d4c82db08a3d9f2 commit a743b3f1a4c538c50236b5322d4c82db08a3d9f2 Author: Dimitry Andric AuthorDate: 2025-04-25 17:56:39 +0000 Commit: Dimitry Andric CommitDate: 2025-05-09 17:16:18 +0000 Convert libllvm, libclang and liblldb into private shared libraries This allows clang, lld, lldb, and other llvm tools to be linked against these shared libraries, which makes them smaller and avoids duplication. Since these are not quite the same as the shared libraries shipped by the upstream llvm build system, and we do not want to expose the ABI to external programs such as ports, make them private libraries. Note that during the cross-tools stage they are still built as static libraries, so the cross compiler and linker are static binaries, as they have always been. This also requires a depend-cleanup.sh kludge which will be added in a follow-up commit, to ensure binaries are rebuilt against the shared libraries in case of incremental builds. MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D49967 (cherry picked from commit 2e47f35be5dc61945afdbd1a70e8fd505c032c94) --- lib/clang/libclang/Makefile | 83 ++++++++++++----- lib/clang/liblldb/Makefile | 23 ++++- lib/clang/libllvm/Makefile | 152 +++++++++++++++++-------------- tools/build/mk/OptionalObsoleteFiles.inc | 10 ++ usr.bin/clang/Makefile.inc | 2 + usr.bin/clang/clang.prog.mk | 12 ++- usr.bin/clang/lld/Makefile | 12 ++- usr.bin/clang/lldb-server/Makefile | 7 +- usr.bin/clang/lldb/Makefile | 7 +- usr.bin/clang/llvm.prog.mk | 8 +- 10 files changed, 211 insertions(+), 105 deletions(-) diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile index 14c3778d514a..5e20b37c1183 100644 --- a/lib/clang/libclang/Makefile +++ b/lib/clang/libclang/Makefile @@ -2,7 +2,22 @@ .include .include "../clang.pre.mk" +.if defined(TOOLS_PREFIX) +# Build static library during cross-tools stage LIB= clang +INTERNALLIB= +.else +PACKAGE= clang +SHLIB_CXX= clang +SHLIB_MAJOR= 19 +PRIVATELIB= +.if ${MACHINE} == "powerpc" +# Work around "relocation R_PPC_GOT16 out of range" errors +PICFLAG= -fPIC +.endif +.endif + +SHARED_CXXFLAGS+= -UPIC # To avoid compile errors CFLAGS+= -I${.OBJDIR} CFLAGS+= -I${OBJTOP}/lib/clang/libllvm @@ -71,7 +86,7 @@ SRCS_MIN+= AST/CommentParser.cpp SRCS_MIN+= AST/CommentSema.cpp SRCS_MIN+= AST/ComparisonCategories.cpp SRCS_MIN+= AST/ComputeDependence.cpp -SRCS_FUL+= AST/DataCollection.cpp +SRCS_MIN+= AST/DataCollection.cpp SRCS_MIN+= AST/Decl.cpp SRCS_MIN+= AST/DeclBase.cpp SRCS_MIN+= AST/DeclCXX.cpp @@ -159,7 +174,9 @@ SRCS_MIN+= AST/VTableBuilder.cpp SRCS_MIN+= ASTMatchers/ASTMatchFinder.cpp SRCS_MIN+= ASTMatchers/ASTMatchersInternal.cpp SRCS_MIN+= ASTMatchers/Dynamic/Diagnostics.cpp +SRCS_MIN+= ASTMatchers/Dynamic/Marshallers.cpp SRCS_MIN+= ASTMatchers/Dynamic/Registry.cpp +SRCS_MIN+= ASTMatchers/Dynamic/VariantValue.cpp SRCS_MIN+= Analysis/AnalysisDeclContext.cpp SRCS_MIN+= Analysis/BodyFarm.cpp SRCS_MIN+= Analysis/CFG.cpp @@ -425,27 +442,27 @@ SRCS_MIN+= ExtractAPI/DeclarationFragments.cpp SRCS_MIN+= ExtractAPI/ExtractAPIConsumer.cpp SRCS_MIN+= ExtractAPI/Serialization/SymbolGraphSerializer.cpp SRCS_MIN+= ExtractAPI/TypedefUnderlyingTypeResolver.cpp -SRCS_EXT+= Format/AffectedRangeManager.cpp -SRCS_EXT+= Format/BreakableToken.cpp -SRCS_EXT+= Format/ContinuationIndenter.cpp -SRCS_EXT+= Format/DefinitionBlockSeparator.cpp -SRCS_EXT+= Format/Format.cpp -SRCS_EXT+= Format/FormatToken.cpp -SRCS_EXT+= Format/FormatTokenLexer.cpp -SRCS_EXT+= Format/IntegerLiteralSeparatorFixer.cpp -SRCS_EXT+= Format/MacroCallReconstructor.cpp -SRCS_EXT+= Format/MacroExpander.cpp +SRCS_MIN+= Format/AffectedRangeManager.cpp +SRCS_MIN+= Format/BreakableToken.cpp +SRCS_MIN+= Format/ContinuationIndenter.cpp +SRCS_MIN+= Format/DefinitionBlockSeparator.cpp +SRCS_MIN+= Format/Format.cpp +SRCS_MIN+= Format/FormatToken.cpp +SRCS_MIN+= Format/FormatTokenLexer.cpp +SRCS_MIN+= Format/IntegerLiteralSeparatorFixer.cpp +SRCS_MIN+= Format/MacroCallReconstructor.cpp +SRCS_MIN+= Format/MacroExpander.cpp SRCS_EXT+= Format/MatchFilePath.cpp -SRCS_EXT+= Format/NamespaceEndCommentsFixer.cpp -SRCS_EXT+= Format/ObjCPropertyAttributeOrderFixer.cpp -SRCS_EXT+= Format/QualifierAlignmentFixer.cpp -SRCS_EXT+= Format/SortJavaScriptImports.cpp -SRCS_EXT+= Format/TokenAnalyzer.cpp -SRCS_EXT+= Format/TokenAnnotator.cpp -SRCS_EXT+= Format/UnwrappedLineFormatter.cpp -SRCS_EXT+= Format/UnwrappedLineParser.cpp -SRCS_EXT+= Format/UsingDeclarationsSorter.cpp -SRCS_EXT+= Format/WhitespaceManager.cpp +SRCS_MIN+= Format/NamespaceEndCommentsFixer.cpp +SRCS_MIN+= Format/ObjCPropertyAttributeOrderFixer.cpp +SRCS_MIN+= Format/QualifierAlignmentFixer.cpp +SRCS_MIN+= Format/SortJavaScriptImports.cpp +SRCS_MIN+= Format/TokenAnalyzer.cpp +SRCS_MIN+= Format/TokenAnnotator.cpp +SRCS_MIN+= Format/UnwrappedLineFormatter.cpp +SRCS_MIN+= Format/UnwrappedLineParser.cpp +SRCS_MIN+= Format/UsingDeclarationsSorter.cpp +SRCS_MIN+= Format/WhitespaceManager.cpp SRCS_MIN+= Frontend/ASTConsumers.cpp SRCS_MIN+= Frontend/ASTMerge.cpp SRCS_MIN+= Frontend/ASTUnit.cpp @@ -825,9 +842,12 @@ SRCS_MIN+= Tooling/ArgumentsAdjusters.cpp SRCS_MIN+= Tooling/CommonOptionsParser.cpp SRCS_MIN+= Tooling/CompilationDatabase.cpp SRCS_MIN+= Tooling/Core/Replacement.cpp +SRCS_MIN+= Tooling/ExpandResponseFilesCompilationDatabase.cpp SRCS_MIN+= Tooling/FileMatchTrie.cpp -SRCS_EXT+= Tooling/Inclusions/HeaderIncludes.cpp -SRCS_EXT+= Tooling/Inclusions/IncludeStyle.cpp +SRCS_MIN+= Tooling/GuessTargetAndModeCompilationDatabase.cpp +SRCS_MIN+= Tooling/Inclusions/HeaderIncludes.cpp +SRCS_MIN+= Tooling/Inclusions/IncludeStyle.cpp +SRCS_MIN+= Tooling/InterpolatingCompilationDatabase.cpp SRCS_MIN+= Tooling/JSONCompilationDatabase.cpp SRCS_MIN+= Tooling/Refactoring.cpp SRCS_MIN+= Tooling/RefactoringCallbacks.cpp @@ -845,6 +865,21 @@ SRCS_ALL+= ${SRCS_LDB} .endif SRCS+= ${SRCS_ALL:O} +LIBDEPS+= llvm + +.if defined(TOOLS_PREFIX) +LIBPRIV= +LIBEXT= a +.else +LIBPRIV= private +LIBEXT= so +.endif + +.for lib in ${LIBDEPS} +DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} +LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} +.endfor + clang/AST/AbstractBasicReader.inc: \ ${CLANG_SRCS}/include/clang/AST/PropertiesBase.td ${CLANG_TBLGEN} -gen-clang-basic-reader \ @@ -1300,6 +1335,4 @@ CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} .include "../clang.build.mk" -INTERNALLIB= - .include diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile index 48966d7cccf5..408ebc440686 100644 --- a/lib/clang/liblldb/Makefile +++ b/lib/clang/liblldb/Makefile @@ -2,7 +2,13 @@ .include .include "../lldb.pre.mk" -LIB= lldb +PACKAGE= lldb +SHLIB_CXX= lldb +SHLIB_MAJOR= 19 +PRIVATELIB= + +SHARED_CXXFLAGS+= -UPIC # To avoid compile errors + SRCDIR= lldb/source CFLAGS+= -I${LLDB_SRCS}/include @@ -745,6 +751,19 @@ SRCS+= Utility/VMRange.cpp SRCS+= Utility/XcodeSDK.cpp SRCS+= Version/Version.cpp +LIBDEPS+= clang +LIBDEPS+= llvm + +LIBPRIV= private +LIBEXT= so + +.for lib in ${LIBDEPS} +DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} +LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} +.endfor + +LIBADD+= kvm + LLDB_TBLGEN?= lldb-tblgen CommandOptions.inc: ${LLDB_SRCS}/source/Commands/Options.td @@ -780,8 +799,6 @@ CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} .include "../clang.build.mk" -INTERNALLIB= - # Building lldb's bindings requires swig, but we do not want to include it in # the FreeBSD base system (as a build tool) because it has non-trivial # dependencies. As a workaround we commit the generated file. Requires the diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index 14122e117021..cb16d39961ae 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -2,8 +2,22 @@ .include .include "../llvm.pre.mk" +.if defined(TOOLS_PREFIX) +# Build static library during cross-tools stage LIB= llvm INTERNALLIB= +.else +PACKAGE= clang +SHLIB_CXX= llvm +SHLIB_MAJOR= 19 +PRIVATELIB= +.if ${MACHINE} == "powerpc" +# Work around "relocation R_PPC_GOT16 out of range" errors +PICFLAG= -fPIC +.endif +.endif + +SHARED_CXXFLAGS+= -UPIC # To avoid compile errors CFLAGS+= -I${.OBJDIR} CFLAGS+= -I${SRCTOP}/sys/contrib/zstd/lib @@ -509,24 +523,24 @@ SRCS_EXT+= DWP/DWP.cpp SRCS_EXT+= DWP/DWPError.cpp SRCS_MIW+= DebugInfo/BTF/BTFContext.cpp SRCS_MIW+= DebugInfo/BTF/BTFParser.cpp -SRCS_EXT+= DebugInfo/CodeView/AppendingTypeTableBuilder.cpp +SRCS_MIN+= DebugInfo/CodeView/AppendingTypeTableBuilder.cpp SRCS_MIN+= DebugInfo/CodeView/CVSymbolVisitor.cpp SRCS_MIN+= DebugInfo/CodeView/CVTypeVisitor.cpp SRCS_MIN+= DebugInfo/CodeView/CodeViewError.cpp SRCS_MIN+= DebugInfo/CodeView/CodeViewRecordIO.cpp SRCS_MIN+= DebugInfo/CodeView/ContinuationRecordBuilder.cpp SRCS_MIN+= DebugInfo/CodeView/DebugChecksumsSubsection.cpp -SRCS_EXT+= DebugInfo/CodeView/DebugCrossExSubsection.cpp -SRCS_EXT+= DebugInfo/CodeView/DebugCrossImpSubsection.cpp +SRCS_MIN+= DebugInfo/CodeView/DebugCrossExSubsection.cpp +SRCS_MIN+= DebugInfo/CodeView/DebugCrossImpSubsection.cpp SRCS_MIN+= DebugInfo/CodeView/DebugFrameDataSubsection.cpp SRCS_MIN+= DebugInfo/CodeView/DebugInlineeLinesSubsection.cpp SRCS_MIN+= DebugInfo/CodeView/DebugLinesSubsection.cpp SRCS_MIN+= DebugInfo/CodeView/DebugStringTableSubsection.cpp -SRCS_MIW+= DebugInfo/CodeView/DebugSubsection.cpp -SRCS_EXT+= DebugInfo/CodeView/DebugSubsectionRecord.cpp -SRCS_EXT+= DebugInfo/CodeView/DebugSubsectionVisitor.cpp -SRCS_EXT+= DebugInfo/CodeView/DebugSymbolRVASubsection.cpp -SRCS_EXT+= DebugInfo/CodeView/DebugSymbolsSubsection.cpp +SRCS_MIN+= DebugInfo/CodeView/DebugSubsection.cpp +SRCS_MIN+= DebugInfo/CodeView/DebugSubsectionRecord.cpp +SRCS_MIN+= DebugInfo/CodeView/DebugSubsectionVisitor.cpp +SRCS_MIN+= DebugInfo/CodeView/DebugSymbolRVASubsection.cpp +SRCS_MIN+= DebugInfo/CodeView/DebugSymbolsSubsection.cpp SRCS_MIN+= DebugInfo/CodeView/EnumTables.cpp SRCS_MIN+= DebugInfo/CodeView/Formatters.cpp SRCS_MIN+= DebugInfo/CodeView/GlobalTypeTableBuilder.cpp @@ -540,7 +554,7 @@ SRCS_EXT+= DebugInfo/CodeView/StringsAndChecksums.cpp SRCS_MIN+= DebugInfo/CodeView/SymbolDumper.cpp SRCS_MIN+= DebugInfo/CodeView/SymbolRecordHelpers.cpp SRCS_MIN+= DebugInfo/CodeView/SymbolRecordMapping.cpp -SRCS_EXT+= DebugInfo/CodeView/SymbolSerializer.cpp +SRCS_MIN+= DebugInfo/CodeView/SymbolSerializer.cpp SRCS_MIN+= DebugInfo/CodeView/TypeDumpVisitor.cpp SRCS_MIN+= DebugInfo/CodeView/TypeHashing.cpp SRCS_MIN+= DebugInfo/CodeView/TypeIndex.cpp @@ -549,37 +563,37 @@ SRCS_EXT+= DebugInfo/CodeView/TypeRecordHelpers.cpp SRCS_MIN+= DebugInfo/CodeView/TypeRecordMapping.cpp SRCS_MIN+= DebugInfo/CodeView/TypeStreamMerger.cpp SRCS_MIN+= DebugInfo/CodeView/TypeTableCollection.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFAcceleratorTable.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFAddressRange.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFCompileUnit.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFContext.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFDataExtractor.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFDebugAbbrev.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFDebugAddr.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFDebugArangeSet.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFDebugAranges.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFDebugFrame.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFDebugInfoEntry.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFDebugLine.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFDebugLoc.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFDebugMacro.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFDebugPubTable.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFDebugRangeList.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFDebugRnglists.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFDie.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFAcceleratorTable.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFAddressRange.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFCompileUnit.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFContext.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFDataExtractor.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFDebugAbbrev.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFDebugAddr.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFDebugArangeSet.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFDebugAranges.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFDebugFrame.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFDebugInfoEntry.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFDebugLine.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFDebugLoc.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFDebugMacro.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFDebugPubTable.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFDebugRangeList.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFDebugRnglists.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFDie.cpp SRCS_MIN+= DebugInfo/DWARF/DWARFExpression.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFFormValue.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFGdbIndex.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFListTable.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFTypePrinter.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFTypeUnit.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFUnit.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFUnitIndex.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFVerifier.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFFormValue.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFGdbIndex.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFListTable.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFTypePrinter.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFTypeUnit.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFUnit.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFUnitIndex.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFVerifier.cpp SRCS_MIN+= DebugInfo/MSF/MSFBuilder.cpp SRCS_MIN+= DebugInfo/MSF/MSFCommon.cpp -SRCS_EXT+= DebugInfo/MSF/MSFError.cpp +SRCS_MIN+= DebugInfo/MSF/MSFError.cpp SRCS_MIN+= DebugInfo/MSF/MappedBlockStream.cpp SRCS_EXT+= DebugInfo/PDB/GenericError.cpp SRCS_EXT+= DebugInfo/PDB/IPDBSourceFile.cpp @@ -867,7 +881,7 @@ SRCS_MIN+= LTO/LTO.cpp SRCS_MIN+= LTO/LTOBackend.cpp SRCS_EXL+= LTO/LTOCodeGenerator.cpp SRCS_EXL+= LTO/LTOModule.cpp -SRCS_EXL+= LTO/SummaryBasedOptimizations.cpp +SRCS_MIN+= LTO/SummaryBasedOptimizations.cpp SRCS_EXL+= LTO/ThinLTOCodeGenerator.cpp SRCS_MIN+= LTO/UpdateCompilerUsed.cpp SRCS_MIN+= Linker/IRMover.cpp @@ -892,7 +906,7 @@ SRCS_MIN+= MC/MCContext.cpp SRCS_MIN+= MC/MCDXContainerStreamer.cpp SRCS_MIN+= MC/MCDXContainerWriter.cpp SRCS_XDL+= MC/MCDisassembler/Disassembler.cpp -SRCS_XDW+= MC/MCDisassembler/MCDisassembler.cpp +SRCS_MIN+= MC/MCDisassembler/MCDisassembler.cpp SRCS_XDW+= MC/MCDisassembler/MCExternalSymbolizer.cpp SRCS_MIN+= MC/MCDisassembler/MCRelocationInfo.cpp SRCS_XDW+= MC/MCDisassembler/MCSymbolizer.cpp @@ -1006,9 +1020,9 @@ SRCS_MIW+= ObjCopy/wasm/WasmWriter.cpp SRCS_MIN+= Object/Archive.cpp SRCS_MIN+= Object/ArchiveWriter.cpp SRCS_MIN+= Object/Binary.cpp -SRCS_MIW+= Object/BuildID.cpp +SRCS_MIN+= Object/BuildID.cpp SRCS_MIN+= Object/COFFImportFile.cpp -SRCS_MIW+= Object/COFFModuleDefinition.cpp +SRCS_MIN+= Object/COFFModuleDefinition.cpp SRCS_MIN+= Object/COFFObjectFile.cpp SRCS_MIN+= Object/Decompressor.cpp SRCS_MIN+= Object/ELF.cpp @@ -1018,31 +1032,34 @@ SRCS_MIW+= Object/FaultMapParser.cpp SRCS_MIN+= Object/IRObjectFile.cpp SRCS_MIN+= Object/IRSymtab.cpp SRCS_MIN+= Object/MachOObjectFile.cpp -SRCS_MIW+= Object/MachOUniversal.cpp +SRCS_MIN+= Object/MachOUniversal.cpp SRCS_MIW+= Object/MachOUniversalWriter.cpp -SRCS_MIW+= Object/Minidump.cpp +SRCS_MIN+= Object/Minidump.cpp SRCS_MIN+= Object/ModuleSymbolTable.cpp SRCS_EXT+= Object/Object.cpp SRCS_MIN+= Object/ObjectFile.cpp -SRCS_MIW+= Object/OffloadBinary.cpp +SRCS_MIN+= Object/OffloadBinary.cpp SRCS_MIN+= Object/RecordStreamer.cpp -SRCS_MIW+= Object/RelocationResolver.cpp +SRCS_MIN+= Object/RelocationResolver.cpp SRCS_MIW+= Object/SymbolSize.cpp SRCS_MIN+= Object/SymbolicFile.cpp -SRCS_MIW+= Object/TapiFile.cpp -SRCS_MIW+= Object/TapiUniversal.cpp +SRCS_MIN+= Object/TapiFile.cpp +SRCS_MIN+= Object/TapiUniversal.cpp SRCS_MIN+= Object/WasmObjectFile.cpp SRCS_MIW+= Object/WindowsMachineFlag.cpp SRCS_MIN+= Object/WindowsResource.cpp SRCS_MIN+= Object/XCOFFObjectFile.cpp SRCS_MIN+= ObjectYAML/COFFYAML.cpp -SRCS_EXT+= ObjectYAML/CodeViewYAMLDebugSections.cpp -SRCS_EXT+= ObjectYAML/CodeViewYAMLSymbols.cpp -SRCS_EXT+= ObjectYAML/CodeViewYAMLTypes.cpp +SRCS_MIN+= ObjectYAML/CodeViewYAMLDebugSections.cpp +SRCS_MIN+= ObjectYAML/CodeViewYAMLSymbols.cpp +SRCS_MIN+= ObjectYAML/CodeViewYAMLTypeHashing.cpp +SRCS_MIN+= ObjectYAML/CodeViewYAMLTypes.cpp +SRCS_MIN+= ObjectYAML/DWARFEmitter.cpp SRCS_MIN+= ObjectYAML/DWARFYAML.cpp +SRCS_MIN+= ObjectYAML/ELFEmitter.cpp SRCS_MIN+= ObjectYAML/ELFYAML.cpp SRCS_MIN+= ObjectYAML/MachOYAML.cpp -SRCS_EXT+= ObjectYAML/YAML.cpp +SRCS_MIN+= ObjectYAML/YAML.cpp SRCS_MIN+= Option/Arg.cpp SRCS_MIN+= Option/ArgList.cpp SRCS_MIN+= Option/OptTable.cpp @@ -1135,7 +1152,7 @@ SRCS_MIN+= Support/ErrorHandling.cpp SRCS_MIN+= Support/ExponentialBackoff.cpp SRCS_MIN+= Support/ExtensibleRTTI.cpp SRCS_MIN+= Support/FileCollector.cpp -SRCS_MIW+= Support/FileOutputBuffer.cpp +SRCS_MIN+= Support/FileOutputBuffer.cpp SRCS_MIN+= Support/FileUtilities.cpp SRCS_MIN+= Support/FloatingPointMode.cpp SRCS_MIN+= Support/FoldingSet.cpp @@ -1161,7 +1178,7 @@ SRCS_MIW+= Support/MSP430Attributes.cpp SRCS_MIN+= Support/ManagedStatic.cpp SRCS_MIN+= Support/MathExtras.cpp SRCS_MIN+= Support/MemAlloc.cpp -SRCS_MIW+= Support/Memory.cpp +SRCS_MIN+= Support/Memory.cpp SRCS_MIN+= Support/MemoryBuffer.cpp SRCS_MIN+= Support/MemoryBufferRef.cpp SRCS_MIN+= Support/NativeFormatting.cpp @@ -1200,7 +1217,7 @@ SRCS_MIN+= Support/SuffixTree.cpp SRCS_MIN+= Support/SuffixTreeNode.cpp SRCS_EXT+= Support/SystemUtils.cpp SRCS_LLD+= Support/TarWriter.cpp -SRCS_MIW+= Support/ThreadPool.cpp +SRCS_MIN+= Support/ThreadPool.cpp SRCS_MIN+= Support/Threading.cpp SRCS_MIN+= Support/TimeProfiler.cpp SRCS_MIN+= Support/Timer.cpp @@ -1695,21 +1712,22 @@ SRCS_MIN+= TargetParser/SubtargetFeature.cpp SRCS_MIN+= TargetParser/TargetParser.cpp SRCS_MIN+= TargetParser/Triple.cpp SRCS_MIN+= TargetParser/X86TargetParser.cpp -SRCS_MIW+= TextAPI/Architecture.cpp -SRCS_MIW+= TextAPI/ArchitectureSet.cpp +SRCS_MIN+= TextAPI/Architecture.cpp +SRCS_MIN+= TextAPI/ArchitectureSet.cpp SRCS_MIW+= TextAPI/BinaryReader/DylibReader.cpp -SRCS_MIW+= TextAPI/InterfaceFile.cpp -SRCS_MIW+= TextAPI/PackedVersion.cpp -SRCS_MIW+= TextAPI/Platform.cpp +SRCS_MIN+= TextAPI/InterfaceFile.cpp +SRCS_MIN+= TextAPI/PackedVersion.cpp +SRCS_MIN+= TextAPI/Platform.cpp SRCS_MIW+= TextAPI/RecordVisitor.cpp -SRCS_MIW+= TextAPI/Symbol.cpp -SRCS_MIW+= TextAPI/SymbolSet.cpp -SRCS_MIW+= TextAPI/Target.cpp -SRCS_MIW+= TextAPI/TextAPIError.cpp -SRCS_MIW+= TextAPI/TextStub.cpp -SRCS_MIW+= TextAPI/TextStubCommon.cpp -SRCS_MIW+= TextAPI/TextStubV5.cpp -SRCS_MIW+= TextAPI/Utils.cpp +SRCS_MIW+= TextAPI/RecordsSlice.cpp +SRCS_MIN+= TextAPI/Symbol.cpp +SRCS_MIN+= TextAPI/SymbolSet.cpp +SRCS_MIN+= TextAPI/Target.cpp +SRCS_MIN+= TextAPI/TextAPIError.cpp +SRCS_MIN+= TextAPI/TextStub.cpp +SRCS_MIN+= TextAPI/TextStubCommon.cpp +SRCS_MIN+= TextAPI/TextStubV5.cpp +SRCS_MIN+= TextAPI/Utils.cpp SRCS_MIN+= ToolDrivers/llvm-dlltool/DlltoolDriver.cpp SRCS_MIW+= ToolDrivers/llvm-lib/LibDriver.cpp SRCS_MIN+= Transforms/AggressiveInstCombine/AggressiveInstCombine.cpp diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index b985adbd1e0b..3b8c0c1dff55 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -880,6 +880,15 @@ OLD_FILES+=usr/share/man/man4/ccd.4.gz OLD_FILES+=usr/share/man/man8/ccdconfig.8.gz .endif +.if ${MK_CLANG} == no && ${MK_CLANG_FORMAT} == no && ${MK_LLDB} == no +OLD_LIBS+=usr/lib/libprivateclang.so.19 +.endif + +.if ${MK_CLANG_EXTRAS} == no && ${MK_CLANG} == no && ${MK_LLDB} == no && \ + ${MK_LLD} == no && ${MK_LLVM_BINUTILS} == no && ${MK_LLVM_COV} == no +OLD_LIBS+=usr/lib/libprivatellvm.so.19 +.endif + .if ${MK_CLANG} == no && ${MK_LLVM_BINUTILS} == no OLD_FILES+=usr/bin/llvm-addr2line OLD_FILES+=usr/bin/llvm-ar @@ -3704,6 +3713,7 @@ OLD_FILES+=usr/bin/ld.lld .if ${MK_LLDB} == no OLD_FILES+=usr/bin/lldb OLD_FILES+=usr/bin/lldb-server +OLD_LIBS+=usr/lib/libprivatelldb.so.19 OLD_FILES+=usr/share/man/man1/lldb-server.1.gz OLD_FILES+=usr/share/man/man1/lldb.1.gz .endif diff --git a/usr.bin/clang/Makefile.inc b/usr.bin/clang/Makefile.inc index 99e993b57cb2..68e749ef131d 100644 --- a/usr.bin/clang/Makefile.inc +++ b/usr.bin/clang/Makefile.inc @@ -1,7 +1,9 @@ .include +.if defined(TOOLS_PREFIX) MK_PIE:= no # Explicit libXXX.a references +.endif .if ${MK_LLVM_FULL_DEBUGINFO} == "no" .if ${COMPILER_TYPE} == "clang" diff --git a/usr.bin/clang/clang.prog.mk b/usr.bin/clang/clang.prog.mk index cf48f02359e9..36c601bcbe36 100644 --- a/usr.bin/clang/clang.prog.mk +++ b/usr.bin/clang/clang.prog.mk @@ -18,9 +18,17 @@ LIBADD+= z LIBADD+= zstd .endif +.if defined(TOOLS_PREFIX) +LIBPRIV= +LIBEXT= a +.else +LIBPRIV= private +LIBEXT= so +.endif + .for lib in ${LIBDEPS} -DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a -LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a +DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} +LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} .endfor PACKAGE= clang diff --git a/usr.bin/clang/lld/Makefile b/usr.bin/clang/lld/Makefile index aabccc8805ca..6403835b10b6 100644 --- a/usr.bin/clang/lld/Makefile +++ b/usr.bin/clang/lld/Makefile @@ -82,9 +82,17 @@ SRCS+= tools/lld/lld.cpp LIBDEPS+= llvm +.if defined(TOOLS_PREFIX) +LIBPRIV= +LIBEXT= a +.else +LIBPRIV= private +LIBEXT= so +.endif + .for lib in ${LIBDEPS} -DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a -LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a +DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} +LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} .endfor INCFILE= Options.inc diff --git a/usr.bin/clang/lldb-server/Makefile b/usr.bin/clang/lldb-server/Makefile index 3a16c470fe2b..e51923545956 100644 --- a/usr.bin/clang/lldb-server/Makefile +++ b/usr.bin/clang/lldb-server/Makefile @@ -23,9 +23,12 @@ LIBDEPS+= lldb LIBDEPS+= clang LIBDEPS+= llvm +LIBPRIV= private +LIBEXT= so + .for lib in ${LIBDEPS} -DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a -LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a +DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} +LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} .endfor INCFILE= LLGSOptions.inc diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile index f9c09c8d697b..b7668c03e6e5 100644 --- a/usr.bin/clang/lldb/Makefile +++ b/usr.bin/clang/lldb/Makefile @@ -16,9 +16,12 @@ LIBDEPS+= lldb LIBDEPS+= clang LIBDEPS+= llvm +LIBPRIV= private +LIBEXT= so + .for lib in ${LIBDEPS} -DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a -LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a +DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} +LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} .endfor INCFILE= Options.inc diff --git a/usr.bin/clang/llvm.prog.mk b/usr.bin/clang/llvm.prog.mk index 27a3312726df..f702082e31bd 100644 --- a/usr.bin/clang/llvm.prog.mk +++ b/usr.bin/clang/llvm.prog.mk @@ -10,15 +10,19 @@ CFLAGS+= -I${OBJTOP}/lib/clang/libllvm (${PROG_CXX} == "clang-tblgen" || ${PROG_CXX} == "lldb-tblgen" || \ ${PROG_CXX} == "llvm-min-tblgen" || ${PROG_CXX} == "llvm-tblgen") LIBDEPS+= llvmminimal +LIBPRIV= +LIBEXT= a .else LIBDEPS+= llvm +LIBPRIV= private +LIBEXT= so LIBADD+= z LIBADD+= zstd .endif .for lib in ${LIBDEPS} -DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a -LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a +DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} +LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} .endfor PACKAGE= clang From nobody Fri May 9 20:32:45 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZvLKV3hStz5w6m8; Fri, 09 May 2025 20:32:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZvLKV0htcz3q4H; Fri, 09 May 2025 20:32:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746822766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AgfSUWhxHmV8wCT3wLPpMUUygq6tkdZ4xA1HIx+MA/s=; b=Ui5tsKpF9bJZjGE1BZ8F4Wz42D7RgEcIcjBrAClma4zaz5vqZPC737s4JkCxKs+/A+ZtiZ exDJaqud9G2oz8zDBJBBcEY9et9DGZ/CbwASIDgaMWGEiaBIYHTVcSOHQtFG1NyVIrdNei z1kmEHrfIGv1A2chsrY0VwfK1H1Af9p+uJC82uxboaikXG94eDIK6a2RGdswmWZhFZKHl5 cUABHTxRAPkPKYJAOo7VNBUQEHERAqGH/nVovM2jm4+QSSa0xflZln6gQlz3DNXNqDLQ6O qsEEEQ2HNlLEdakSGFF93kPpVjKpgab2b5A1X1vMCttkMmHm/thEBAP0zfrf7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746822766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AgfSUWhxHmV8wCT3wLPpMUUygq6tkdZ4xA1HIx+MA/s=; b=vCux7GRbZTqMOGsFynRTe5Vkxttwh2pjffewBsUsAYcyHjQxa+9F3PGup4W6T+2WoLPhg/ tccb1dpunrEueU4lF6Yducb132dvGtHtGstxalczKD+pxoC4JQN+LzjKIe0PBKhDHu/cUx Rdi8rqFHufImJRgY3nUCg8Mnt5HRHH/7GG/Wgjr8GhX1xiG1woqWJD6VB5QTyHOuiDF9Bp GxLChmWu0+h6Abm2TQxADoP08VDYXv09caVnlgKI0xtjn/yuJPkkzTS6RePKMWc9ZIX+Mk d/3DbOKujpYF4lnpS3d2YhAg5exgYjmun5dqQV7n3ReFLYX5p9Sxb2Qj87c1Bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746822766; a=rsa-sha256; cv=none; b=Gni5+ou2uJCow+sh/VwWIdoJvKgIiLIybgtwqSe3ltx81S6d8h55f3giQ05wbdrhMsAalT ENypI/+o9AWI9R6LjH2iAzfAfRekyVEdgoOkdUSSCFt/yl7UyKHT6El+EFamODGYeDUxVH SFICjaLCD4yjRLqmWdsy7gmsapNgm1w/HciiUCqBVZhDp+sWBJD0N77YxjVcHgdEtb49MO 6iMkxtsx2lAIEolliLHtR1IuzxqvKxW1CwPGrDxSB7A4ezL/JZhKvBoKpduW+xEnxTO4Kv uhZSknHzH4BvD3x9b0noipnzulez+BF7aE524XqP2+tndnj336m4RVo39D7Exg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZvLKV0Hmdz19s; Fri, 09 May 2025 20:32:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 549KWjam074006; Fri, 9 May 2025 20:32:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 549KWjm3074003; Fri, 9 May 2025 20:32:45 GMT (envelope-from git) Date: Fri, 9 May 2025 20:32:45 GMT Message-Id: <202505092032.549KWjm3074003@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: e925d6c2e739 - stable/14 - depend-cleanup: ensure clang and llvm binaries are rebuilt List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e925d6c2e73934e631e5942522d80ef6b89cb8d2 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=e925d6c2e73934e631e5942522d80ef6b89cb8d2 commit e925d6c2e73934e631e5942522d80ef6b89cb8d2 Author: Dimitry Andric AuthorDate: 2025-04-25 17:58:03 +0000 Commit: Dimitry Andric CommitDate: 2025-05-09 17:19:56 +0000 depend-cleanup: ensure clang and llvm binaries are rebuilt In 2e47f35be5dc, libllvm, libclang and liblldb became shared libraries, so make sure the binaries that depend on these libraries get rebuilt. MFC after: 2 weeks (cherry picked from commit d4dab32448ce7aff01273ecf9965125f0cb8067a) --- tools/build/depend-cleanup.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index c560a079f43c..00627d551bbe 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -182,3 +182,17 @@ fi clean_dep cddl/lib/libzpool abd_os c "linux/zfs/abd_os\.c" clean_dep cddl/lib/libzpool arc_os c "linux/zfs/arc_os\.c" clean_dep cddl/lib/libzpool zfs_debug c "linux/zfs/zfs_debug\.c" + +# 20250425 2e47f35be5dc libllvm, libclang and liblldb became shared libraries +if [ -f "$OBJTOP"/lib/clang/libllvm/libllvm.a ]; then + echo "Removing old static libllvm library" + run rm -f "$OBJTOP"/lib/clang/libllvm/libllvm.a +fi +if [ -f "$OBJTOP"/lib/clang/libclang/libclang.a ]; then + echo "Removing old static libclang library" + run rm -f "$OBJTOP"/lib/clang/libclang/libclang.a +fi +if [ -f "$OBJTOP"/lib/clang/liblldb/liblldb.a ]; then + echo "Removing old static liblldb library" + run rm -f "$OBJTOP"/lib/clang/liblldb/liblldb.a +fi From nobody Fri May 9 20:32:56 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZvLKk0nNkz5w6XC; Fri, 09 May 2025 20:32:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZvLKj1N4Mz3q9Y; Fri, 09 May 2025 20:32:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746822777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MwPoAGX/5zQb3zSmqzDefuZZtvrQVBatx+uVN633tak=; b=X73fx9OK6g1tuvyT9/tiiZvYzCWhjN8cMT7zh6fwRe4sQaDo2b9ju86hcSRbYHEZQte607 MHdEjMVUB4zgevTB5964ZVvJIE26Vk/rf0OOKmyY9IqL2aCCL2SFPoMkyRXbWVZVC/gVJd N8RxerVFMd7jxj5GjouSAzumBNYyyjdrcV+90yHjInqmq9KBWmA1y0NFzMcU3NGMBAm+aZ eaYefVnF8CMf8Kw4y8TiscNPaPETAwiLv8bDNQX66LDqxKz5Zva7sjavC07CuEbZx+KdsV qJoC0AcRv65EgdviyIYn15yZX2ts2y/rORgafrWWSjmKizitYJTFxudZpMiiqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746822777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MwPoAGX/5zQb3zSmqzDefuZZtvrQVBatx+uVN633tak=; b=qz8Z8VbptBpmdhQZBfmptZH4uwz48ZgXBskSa7TZjKmKyWjh9E1qS5CG1TAijKinXX5Y8E +AH+P4Zw6KUZwnObqGo61THGGE+HZp7eJtlXTasjKGm0Q192o70XTYKi01BeBrva7y9fWf V9AfE5Cykg7pIlwplOOdYTprGC3bbzCTm0zch3FCLiNN6ROM3WDdy869dqAqw4jMuvzJ5W R9IgZNd8sYNQrpTg9NQeV84Gt1qeo0LmxQlnpTNfR9M1l0nFDZF26BVl9QuyWY8LKsCcoA phNVynI7OSjGNyf3BdSR555SkZgeuuLCgkPqJfBGUplPZPsgLDsCBHRxV/a/Gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746822777; a=rsa-sha256; cv=none; b=LKhHmIAzCxf2HBqyCw4XaWfBaekQshSj/Nt6N6VKxHMZ62bEahWppO3a5R6HWPOHapVxwL IpxJGemNqWmd3CMGuzTleDZORVb7ty7FLtvoqU4NcUPNuVYTym9b5zOd0Xbw6h2mjWe+AE mfxqGrsTCNk/F5csAXYmvRLvpw03KiifE2JsNsRgkhgaUx5LqYjmjGWJfQbJykh02rtTxO owHTOq5zX+0svgvCaf5Tw8YE3uTXRIHJqozAhXq6D0BkRvs5aGUU1WMz/ZKptvMneamfrp sMrCzh3TEoK2Qr19J1kQNbpm6mS3erTHfBi1jIokwGBzzx1rGjuMY9baq9RGYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZvLKj0Rhdz1HK; Fri, 09 May 2025 20:32:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 549KWuM5074199; Fri, 9 May 2025 20:32:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 549KWuuO074194; Fri, 9 May 2025 20:32:56 GMT (envelope-from git) Date: Fri, 9 May 2025 20:32:56 GMT Message-Id: <202505092032.549KWuuO074194@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: ae60fcd40fc6 - stable/13 - Convert libllvm, libclang and liblldb into private shared libraries List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ae60fcd40fc6e46d239104464f61a6ae30d14e5b Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=ae60fcd40fc6e46d239104464f61a6ae30d14e5b commit ae60fcd40fc6e46d239104464f61a6ae30d14e5b Author: Dimitry Andric AuthorDate: 2025-04-25 17:56:39 +0000 Commit: Dimitry Andric CommitDate: 2025-05-09 17:16:15 +0000 Convert libllvm, libclang and liblldb into private shared libraries This allows clang, lld, lldb, and other llvm tools to be linked against these shared libraries, which makes them smaller and avoids duplication. Since these are not quite the same as the shared libraries shipped by the upstream llvm build system, and we do not want to expose the ABI to external programs such as ports, make them private libraries. Note that during the cross-tools stage they are still built as static libraries, so the cross compiler and linker are static binaries, as they have always been. This also requires a depend-cleanup.sh kludge which will be added in a follow-up commit, to ensure binaries are rebuilt against the shared libraries in case of incremental builds. MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D49967 (cherry picked from commit 2e47f35be5dc61945afdbd1a70e8fd505c032c94) --- lib/clang/libclang/Makefile | 83 ++++++++++++----- lib/clang/liblldb/Makefile | 23 ++++- lib/clang/libllvm/Makefile | 152 +++++++++++++++++-------------- tools/build/mk/OptionalObsoleteFiles.inc | 10 ++ usr.bin/clang/Makefile.inc | 2 + usr.bin/clang/clang.prog.mk | 12 ++- usr.bin/clang/lld/Makefile | 12 ++- usr.bin/clang/lldb-server/Makefile | 7 +- usr.bin/clang/lldb/Makefile | 7 +- usr.bin/clang/llvm.prog.mk | 8 +- 10 files changed, 211 insertions(+), 105 deletions(-) diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile index 14c3778d514a..5e20b37c1183 100644 --- a/lib/clang/libclang/Makefile +++ b/lib/clang/libclang/Makefile @@ -2,7 +2,22 @@ .include .include "../clang.pre.mk" +.if defined(TOOLS_PREFIX) +# Build static library during cross-tools stage LIB= clang +INTERNALLIB= +.else +PACKAGE= clang +SHLIB_CXX= clang +SHLIB_MAJOR= 19 +PRIVATELIB= +.if ${MACHINE} == "powerpc" +# Work around "relocation R_PPC_GOT16 out of range" errors +PICFLAG= -fPIC +.endif +.endif + +SHARED_CXXFLAGS+= -UPIC # To avoid compile errors CFLAGS+= -I${.OBJDIR} CFLAGS+= -I${OBJTOP}/lib/clang/libllvm @@ -71,7 +86,7 @@ SRCS_MIN+= AST/CommentParser.cpp SRCS_MIN+= AST/CommentSema.cpp SRCS_MIN+= AST/ComparisonCategories.cpp SRCS_MIN+= AST/ComputeDependence.cpp -SRCS_FUL+= AST/DataCollection.cpp +SRCS_MIN+= AST/DataCollection.cpp SRCS_MIN+= AST/Decl.cpp SRCS_MIN+= AST/DeclBase.cpp SRCS_MIN+= AST/DeclCXX.cpp @@ -159,7 +174,9 @@ SRCS_MIN+= AST/VTableBuilder.cpp SRCS_MIN+= ASTMatchers/ASTMatchFinder.cpp SRCS_MIN+= ASTMatchers/ASTMatchersInternal.cpp SRCS_MIN+= ASTMatchers/Dynamic/Diagnostics.cpp +SRCS_MIN+= ASTMatchers/Dynamic/Marshallers.cpp SRCS_MIN+= ASTMatchers/Dynamic/Registry.cpp +SRCS_MIN+= ASTMatchers/Dynamic/VariantValue.cpp SRCS_MIN+= Analysis/AnalysisDeclContext.cpp SRCS_MIN+= Analysis/BodyFarm.cpp SRCS_MIN+= Analysis/CFG.cpp @@ -425,27 +442,27 @@ SRCS_MIN+= ExtractAPI/DeclarationFragments.cpp SRCS_MIN+= ExtractAPI/ExtractAPIConsumer.cpp SRCS_MIN+= ExtractAPI/Serialization/SymbolGraphSerializer.cpp SRCS_MIN+= ExtractAPI/TypedefUnderlyingTypeResolver.cpp -SRCS_EXT+= Format/AffectedRangeManager.cpp -SRCS_EXT+= Format/BreakableToken.cpp -SRCS_EXT+= Format/ContinuationIndenter.cpp -SRCS_EXT+= Format/DefinitionBlockSeparator.cpp -SRCS_EXT+= Format/Format.cpp -SRCS_EXT+= Format/FormatToken.cpp -SRCS_EXT+= Format/FormatTokenLexer.cpp -SRCS_EXT+= Format/IntegerLiteralSeparatorFixer.cpp -SRCS_EXT+= Format/MacroCallReconstructor.cpp -SRCS_EXT+= Format/MacroExpander.cpp +SRCS_MIN+= Format/AffectedRangeManager.cpp +SRCS_MIN+= Format/BreakableToken.cpp +SRCS_MIN+= Format/ContinuationIndenter.cpp +SRCS_MIN+= Format/DefinitionBlockSeparator.cpp +SRCS_MIN+= Format/Format.cpp +SRCS_MIN+= Format/FormatToken.cpp +SRCS_MIN+= Format/FormatTokenLexer.cpp +SRCS_MIN+= Format/IntegerLiteralSeparatorFixer.cpp +SRCS_MIN+= Format/MacroCallReconstructor.cpp +SRCS_MIN+= Format/MacroExpander.cpp SRCS_EXT+= Format/MatchFilePath.cpp -SRCS_EXT+= Format/NamespaceEndCommentsFixer.cpp -SRCS_EXT+= Format/ObjCPropertyAttributeOrderFixer.cpp -SRCS_EXT+= Format/QualifierAlignmentFixer.cpp -SRCS_EXT+= Format/SortJavaScriptImports.cpp -SRCS_EXT+= Format/TokenAnalyzer.cpp -SRCS_EXT+= Format/TokenAnnotator.cpp -SRCS_EXT+= Format/UnwrappedLineFormatter.cpp -SRCS_EXT+= Format/UnwrappedLineParser.cpp -SRCS_EXT+= Format/UsingDeclarationsSorter.cpp -SRCS_EXT+= Format/WhitespaceManager.cpp +SRCS_MIN+= Format/NamespaceEndCommentsFixer.cpp +SRCS_MIN+= Format/ObjCPropertyAttributeOrderFixer.cpp +SRCS_MIN+= Format/QualifierAlignmentFixer.cpp +SRCS_MIN+= Format/SortJavaScriptImports.cpp +SRCS_MIN+= Format/TokenAnalyzer.cpp +SRCS_MIN+= Format/TokenAnnotator.cpp +SRCS_MIN+= Format/UnwrappedLineFormatter.cpp +SRCS_MIN+= Format/UnwrappedLineParser.cpp +SRCS_MIN+= Format/UsingDeclarationsSorter.cpp +SRCS_MIN+= Format/WhitespaceManager.cpp SRCS_MIN+= Frontend/ASTConsumers.cpp SRCS_MIN+= Frontend/ASTMerge.cpp SRCS_MIN+= Frontend/ASTUnit.cpp @@ -825,9 +842,12 @@ SRCS_MIN+= Tooling/ArgumentsAdjusters.cpp SRCS_MIN+= Tooling/CommonOptionsParser.cpp SRCS_MIN+= Tooling/CompilationDatabase.cpp SRCS_MIN+= Tooling/Core/Replacement.cpp +SRCS_MIN+= Tooling/ExpandResponseFilesCompilationDatabase.cpp SRCS_MIN+= Tooling/FileMatchTrie.cpp -SRCS_EXT+= Tooling/Inclusions/HeaderIncludes.cpp -SRCS_EXT+= Tooling/Inclusions/IncludeStyle.cpp +SRCS_MIN+= Tooling/GuessTargetAndModeCompilationDatabase.cpp +SRCS_MIN+= Tooling/Inclusions/HeaderIncludes.cpp +SRCS_MIN+= Tooling/Inclusions/IncludeStyle.cpp +SRCS_MIN+= Tooling/InterpolatingCompilationDatabase.cpp SRCS_MIN+= Tooling/JSONCompilationDatabase.cpp SRCS_MIN+= Tooling/Refactoring.cpp SRCS_MIN+= Tooling/RefactoringCallbacks.cpp @@ -845,6 +865,21 @@ SRCS_ALL+= ${SRCS_LDB} .endif SRCS+= ${SRCS_ALL:O} +LIBDEPS+= llvm + +.if defined(TOOLS_PREFIX) +LIBPRIV= +LIBEXT= a +.else +LIBPRIV= private +LIBEXT= so +.endif + +.for lib in ${LIBDEPS} +DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} +LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} +.endfor + clang/AST/AbstractBasicReader.inc: \ ${CLANG_SRCS}/include/clang/AST/PropertiesBase.td ${CLANG_TBLGEN} -gen-clang-basic-reader \ @@ -1300,6 +1335,4 @@ CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} .include "../clang.build.mk" -INTERNALLIB= - .include diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile index 48966d7cccf5..408ebc440686 100644 --- a/lib/clang/liblldb/Makefile +++ b/lib/clang/liblldb/Makefile @@ -2,7 +2,13 @@ .include .include "../lldb.pre.mk" -LIB= lldb +PACKAGE= lldb +SHLIB_CXX= lldb +SHLIB_MAJOR= 19 +PRIVATELIB= + +SHARED_CXXFLAGS+= -UPIC # To avoid compile errors + SRCDIR= lldb/source CFLAGS+= -I${LLDB_SRCS}/include @@ -745,6 +751,19 @@ SRCS+= Utility/VMRange.cpp SRCS+= Utility/XcodeSDK.cpp SRCS+= Version/Version.cpp +LIBDEPS+= clang +LIBDEPS+= llvm + +LIBPRIV= private +LIBEXT= so + +.for lib in ${LIBDEPS} +DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} +LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} +.endfor + +LIBADD+= kvm + LLDB_TBLGEN?= lldb-tblgen CommandOptions.inc: ${LLDB_SRCS}/source/Commands/Options.td @@ -780,8 +799,6 @@ CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} .include "../clang.build.mk" -INTERNALLIB= - # Building lldb's bindings requires swig, but we do not want to include it in # the FreeBSD base system (as a build tool) because it has non-trivial # dependencies. As a workaround we commit the generated file. Requires the diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index 14122e117021..cb16d39961ae 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -2,8 +2,22 @@ .include .include "../llvm.pre.mk" +.if defined(TOOLS_PREFIX) +# Build static library during cross-tools stage LIB= llvm INTERNALLIB= +.else +PACKAGE= clang +SHLIB_CXX= llvm +SHLIB_MAJOR= 19 +PRIVATELIB= +.if ${MACHINE} == "powerpc" +# Work around "relocation R_PPC_GOT16 out of range" errors +PICFLAG= -fPIC +.endif +.endif + +SHARED_CXXFLAGS+= -UPIC # To avoid compile errors CFLAGS+= -I${.OBJDIR} CFLAGS+= -I${SRCTOP}/sys/contrib/zstd/lib @@ -509,24 +523,24 @@ SRCS_EXT+= DWP/DWP.cpp SRCS_EXT+= DWP/DWPError.cpp SRCS_MIW+= DebugInfo/BTF/BTFContext.cpp SRCS_MIW+= DebugInfo/BTF/BTFParser.cpp -SRCS_EXT+= DebugInfo/CodeView/AppendingTypeTableBuilder.cpp +SRCS_MIN+= DebugInfo/CodeView/AppendingTypeTableBuilder.cpp SRCS_MIN+= DebugInfo/CodeView/CVSymbolVisitor.cpp SRCS_MIN+= DebugInfo/CodeView/CVTypeVisitor.cpp SRCS_MIN+= DebugInfo/CodeView/CodeViewError.cpp SRCS_MIN+= DebugInfo/CodeView/CodeViewRecordIO.cpp SRCS_MIN+= DebugInfo/CodeView/ContinuationRecordBuilder.cpp SRCS_MIN+= DebugInfo/CodeView/DebugChecksumsSubsection.cpp -SRCS_EXT+= DebugInfo/CodeView/DebugCrossExSubsection.cpp -SRCS_EXT+= DebugInfo/CodeView/DebugCrossImpSubsection.cpp +SRCS_MIN+= DebugInfo/CodeView/DebugCrossExSubsection.cpp +SRCS_MIN+= DebugInfo/CodeView/DebugCrossImpSubsection.cpp SRCS_MIN+= DebugInfo/CodeView/DebugFrameDataSubsection.cpp SRCS_MIN+= DebugInfo/CodeView/DebugInlineeLinesSubsection.cpp SRCS_MIN+= DebugInfo/CodeView/DebugLinesSubsection.cpp SRCS_MIN+= DebugInfo/CodeView/DebugStringTableSubsection.cpp -SRCS_MIW+= DebugInfo/CodeView/DebugSubsection.cpp -SRCS_EXT+= DebugInfo/CodeView/DebugSubsectionRecord.cpp -SRCS_EXT+= DebugInfo/CodeView/DebugSubsectionVisitor.cpp -SRCS_EXT+= DebugInfo/CodeView/DebugSymbolRVASubsection.cpp -SRCS_EXT+= DebugInfo/CodeView/DebugSymbolsSubsection.cpp +SRCS_MIN+= DebugInfo/CodeView/DebugSubsection.cpp +SRCS_MIN+= DebugInfo/CodeView/DebugSubsectionRecord.cpp +SRCS_MIN+= DebugInfo/CodeView/DebugSubsectionVisitor.cpp +SRCS_MIN+= DebugInfo/CodeView/DebugSymbolRVASubsection.cpp +SRCS_MIN+= DebugInfo/CodeView/DebugSymbolsSubsection.cpp SRCS_MIN+= DebugInfo/CodeView/EnumTables.cpp SRCS_MIN+= DebugInfo/CodeView/Formatters.cpp SRCS_MIN+= DebugInfo/CodeView/GlobalTypeTableBuilder.cpp @@ -540,7 +554,7 @@ SRCS_EXT+= DebugInfo/CodeView/StringsAndChecksums.cpp SRCS_MIN+= DebugInfo/CodeView/SymbolDumper.cpp SRCS_MIN+= DebugInfo/CodeView/SymbolRecordHelpers.cpp SRCS_MIN+= DebugInfo/CodeView/SymbolRecordMapping.cpp -SRCS_EXT+= DebugInfo/CodeView/SymbolSerializer.cpp +SRCS_MIN+= DebugInfo/CodeView/SymbolSerializer.cpp SRCS_MIN+= DebugInfo/CodeView/TypeDumpVisitor.cpp SRCS_MIN+= DebugInfo/CodeView/TypeHashing.cpp SRCS_MIN+= DebugInfo/CodeView/TypeIndex.cpp @@ -549,37 +563,37 @@ SRCS_EXT+= DebugInfo/CodeView/TypeRecordHelpers.cpp SRCS_MIN+= DebugInfo/CodeView/TypeRecordMapping.cpp SRCS_MIN+= DebugInfo/CodeView/TypeStreamMerger.cpp SRCS_MIN+= DebugInfo/CodeView/TypeTableCollection.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFAcceleratorTable.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFAddressRange.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFCompileUnit.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFContext.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFDataExtractor.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFDebugAbbrev.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFDebugAddr.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFDebugArangeSet.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFDebugAranges.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFDebugFrame.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFDebugInfoEntry.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFDebugLine.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFDebugLoc.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFDebugMacro.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFDebugPubTable.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFDebugRangeList.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFDebugRnglists.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFDie.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFAcceleratorTable.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFAddressRange.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFCompileUnit.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFContext.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFDataExtractor.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFDebugAbbrev.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFDebugAddr.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFDebugArangeSet.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFDebugAranges.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFDebugFrame.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFDebugInfoEntry.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFDebugLine.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFDebugLoc.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFDebugMacro.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFDebugPubTable.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFDebugRangeList.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFDebugRnglists.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFDie.cpp SRCS_MIN+= DebugInfo/DWARF/DWARFExpression.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFFormValue.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFGdbIndex.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFListTable.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFTypePrinter.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFTypeUnit.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFUnit.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFUnitIndex.cpp -SRCS_MIW+= DebugInfo/DWARF/DWARFVerifier.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFFormValue.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFGdbIndex.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFListTable.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFTypePrinter.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFTypeUnit.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFUnit.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFUnitIndex.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFVerifier.cpp SRCS_MIN+= DebugInfo/MSF/MSFBuilder.cpp SRCS_MIN+= DebugInfo/MSF/MSFCommon.cpp -SRCS_EXT+= DebugInfo/MSF/MSFError.cpp +SRCS_MIN+= DebugInfo/MSF/MSFError.cpp SRCS_MIN+= DebugInfo/MSF/MappedBlockStream.cpp SRCS_EXT+= DebugInfo/PDB/GenericError.cpp SRCS_EXT+= DebugInfo/PDB/IPDBSourceFile.cpp @@ -867,7 +881,7 @@ SRCS_MIN+= LTO/LTO.cpp SRCS_MIN+= LTO/LTOBackend.cpp SRCS_EXL+= LTO/LTOCodeGenerator.cpp SRCS_EXL+= LTO/LTOModule.cpp -SRCS_EXL+= LTO/SummaryBasedOptimizations.cpp +SRCS_MIN+= LTO/SummaryBasedOptimizations.cpp SRCS_EXL+= LTO/ThinLTOCodeGenerator.cpp SRCS_MIN+= LTO/UpdateCompilerUsed.cpp SRCS_MIN+= Linker/IRMover.cpp @@ -892,7 +906,7 @@ SRCS_MIN+= MC/MCContext.cpp SRCS_MIN+= MC/MCDXContainerStreamer.cpp SRCS_MIN+= MC/MCDXContainerWriter.cpp SRCS_XDL+= MC/MCDisassembler/Disassembler.cpp -SRCS_XDW+= MC/MCDisassembler/MCDisassembler.cpp +SRCS_MIN+= MC/MCDisassembler/MCDisassembler.cpp SRCS_XDW+= MC/MCDisassembler/MCExternalSymbolizer.cpp SRCS_MIN+= MC/MCDisassembler/MCRelocationInfo.cpp SRCS_XDW+= MC/MCDisassembler/MCSymbolizer.cpp @@ -1006,9 +1020,9 @@ SRCS_MIW+= ObjCopy/wasm/WasmWriter.cpp SRCS_MIN+= Object/Archive.cpp SRCS_MIN+= Object/ArchiveWriter.cpp SRCS_MIN+= Object/Binary.cpp -SRCS_MIW+= Object/BuildID.cpp +SRCS_MIN+= Object/BuildID.cpp SRCS_MIN+= Object/COFFImportFile.cpp -SRCS_MIW+= Object/COFFModuleDefinition.cpp +SRCS_MIN+= Object/COFFModuleDefinition.cpp SRCS_MIN+= Object/COFFObjectFile.cpp SRCS_MIN+= Object/Decompressor.cpp SRCS_MIN+= Object/ELF.cpp @@ -1018,31 +1032,34 @@ SRCS_MIW+= Object/FaultMapParser.cpp SRCS_MIN+= Object/IRObjectFile.cpp SRCS_MIN+= Object/IRSymtab.cpp SRCS_MIN+= Object/MachOObjectFile.cpp -SRCS_MIW+= Object/MachOUniversal.cpp +SRCS_MIN+= Object/MachOUniversal.cpp SRCS_MIW+= Object/MachOUniversalWriter.cpp -SRCS_MIW+= Object/Minidump.cpp +SRCS_MIN+= Object/Minidump.cpp SRCS_MIN+= Object/ModuleSymbolTable.cpp SRCS_EXT+= Object/Object.cpp SRCS_MIN+= Object/ObjectFile.cpp -SRCS_MIW+= Object/OffloadBinary.cpp +SRCS_MIN+= Object/OffloadBinary.cpp SRCS_MIN+= Object/RecordStreamer.cpp -SRCS_MIW+= Object/RelocationResolver.cpp +SRCS_MIN+= Object/RelocationResolver.cpp SRCS_MIW+= Object/SymbolSize.cpp SRCS_MIN+= Object/SymbolicFile.cpp -SRCS_MIW+= Object/TapiFile.cpp -SRCS_MIW+= Object/TapiUniversal.cpp +SRCS_MIN+= Object/TapiFile.cpp +SRCS_MIN+= Object/TapiUniversal.cpp SRCS_MIN+= Object/WasmObjectFile.cpp SRCS_MIW+= Object/WindowsMachineFlag.cpp SRCS_MIN+= Object/WindowsResource.cpp SRCS_MIN+= Object/XCOFFObjectFile.cpp SRCS_MIN+= ObjectYAML/COFFYAML.cpp -SRCS_EXT+= ObjectYAML/CodeViewYAMLDebugSections.cpp -SRCS_EXT+= ObjectYAML/CodeViewYAMLSymbols.cpp -SRCS_EXT+= ObjectYAML/CodeViewYAMLTypes.cpp +SRCS_MIN+= ObjectYAML/CodeViewYAMLDebugSections.cpp +SRCS_MIN+= ObjectYAML/CodeViewYAMLSymbols.cpp +SRCS_MIN+= ObjectYAML/CodeViewYAMLTypeHashing.cpp +SRCS_MIN+= ObjectYAML/CodeViewYAMLTypes.cpp +SRCS_MIN+= ObjectYAML/DWARFEmitter.cpp SRCS_MIN+= ObjectYAML/DWARFYAML.cpp +SRCS_MIN+= ObjectYAML/ELFEmitter.cpp SRCS_MIN+= ObjectYAML/ELFYAML.cpp SRCS_MIN+= ObjectYAML/MachOYAML.cpp -SRCS_EXT+= ObjectYAML/YAML.cpp +SRCS_MIN+= ObjectYAML/YAML.cpp SRCS_MIN+= Option/Arg.cpp SRCS_MIN+= Option/ArgList.cpp SRCS_MIN+= Option/OptTable.cpp @@ -1135,7 +1152,7 @@ SRCS_MIN+= Support/ErrorHandling.cpp SRCS_MIN+= Support/ExponentialBackoff.cpp SRCS_MIN+= Support/ExtensibleRTTI.cpp SRCS_MIN+= Support/FileCollector.cpp -SRCS_MIW+= Support/FileOutputBuffer.cpp +SRCS_MIN+= Support/FileOutputBuffer.cpp SRCS_MIN+= Support/FileUtilities.cpp SRCS_MIN+= Support/FloatingPointMode.cpp SRCS_MIN+= Support/FoldingSet.cpp @@ -1161,7 +1178,7 @@ SRCS_MIW+= Support/MSP430Attributes.cpp SRCS_MIN+= Support/ManagedStatic.cpp SRCS_MIN+= Support/MathExtras.cpp SRCS_MIN+= Support/MemAlloc.cpp -SRCS_MIW+= Support/Memory.cpp +SRCS_MIN+= Support/Memory.cpp SRCS_MIN+= Support/MemoryBuffer.cpp SRCS_MIN+= Support/MemoryBufferRef.cpp SRCS_MIN+= Support/NativeFormatting.cpp @@ -1200,7 +1217,7 @@ SRCS_MIN+= Support/SuffixTree.cpp SRCS_MIN+= Support/SuffixTreeNode.cpp SRCS_EXT+= Support/SystemUtils.cpp SRCS_LLD+= Support/TarWriter.cpp -SRCS_MIW+= Support/ThreadPool.cpp +SRCS_MIN+= Support/ThreadPool.cpp SRCS_MIN+= Support/Threading.cpp SRCS_MIN+= Support/TimeProfiler.cpp SRCS_MIN+= Support/Timer.cpp @@ -1695,21 +1712,22 @@ SRCS_MIN+= TargetParser/SubtargetFeature.cpp SRCS_MIN+= TargetParser/TargetParser.cpp SRCS_MIN+= TargetParser/Triple.cpp SRCS_MIN+= TargetParser/X86TargetParser.cpp -SRCS_MIW+= TextAPI/Architecture.cpp -SRCS_MIW+= TextAPI/ArchitectureSet.cpp +SRCS_MIN+= TextAPI/Architecture.cpp +SRCS_MIN+= TextAPI/ArchitectureSet.cpp SRCS_MIW+= TextAPI/BinaryReader/DylibReader.cpp -SRCS_MIW+= TextAPI/InterfaceFile.cpp -SRCS_MIW+= TextAPI/PackedVersion.cpp -SRCS_MIW+= TextAPI/Platform.cpp +SRCS_MIN+= TextAPI/InterfaceFile.cpp +SRCS_MIN+= TextAPI/PackedVersion.cpp +SRCS_MIN+= TextAPI/Platform.cpp SRCS_MIW+= TextAPI/RecordVisitor.cpp -SRCS_MIW+= TextAPI/Symbol.cpp -SRCS_MIW+= TextAPI/SymbolSet.cpp -SRCS_MIW+= TextAPI/Target.cpp -SRCS_MIW+= TextAPI/TextAPIError.cpp -SRCS_MIW+= TextAPI/TextStub.cpp -SRCS_MIW+= TextAPI/TextStubCommon.cpp -SRCS_MIW+= TextAPI/TextStubV5.cpp -SRCS_MIW+= TextAPI/Utils.cpp +SRCS_MIW+= TextAPI/RecordsSlice.cpp +SRCS_MIN+= TextAPI/Symbol.cpp +SRCS_MIN+= TextAPI/SymbolSet.cpp +SRCS_MIN+= TextAPI/Target.cpp +SRCS_MIN+= TextAPI/TextAPIError.cpp +SRCS_MIN+= TextAPI/TextStub.cpp +SRCS_MIN+= TextAPI/TextStubCommon.cpp +SRCS_MIN+= TextAPI/TextStubV5.cpp +SRCS_MIN+= TextAPI/Utils.cpp SRCS_MIN+= ToolDrivers/llvm-dlltool/DlltoolDriver.cpp SRCS_MIW+= ToolDrivers/llvm-lib/LibDriver.cpp SRCS_MIN+= Transforms/AggressiveInstCombine/AggressiveInstCombine.cpp diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index a9436af31b77..5675d92197df 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1161,6 +1161,15 @@ OLD_FILES+=usr/share/man/man8/zfsloader.8.gz OLD_FILES+=usr/share/man/man8/zpool.8.gz .endif +.if ${MK_CLANG} == no && ${MK_CLANG_FORMAT} == no && ${MK_LLDB} == no +OLD_LIBS+=usr/lib/libprivateclang.so.19 +.endif + +.if ${MK_CLANG_EXTRAS} == no && ${MK_CLANG} == no && ${MK_LLDB} == no && \ + ${MK_LLD} == no && ${MK_LLVM_BINUTILS} == no && ${MK_LLVM_COV} == no +OLD_LIBS+=usr/lib/libprivatellvm.so.19 +.endif + .if ${MK_CLANG} == no && ${MK_LLVM_BINUTILS} == no OLD_FILES+=usr/bin/llvm-addr2line OLD_FILES+=usr/bin/llvm-ar @@ -4329,6 +4338,7 @@ OLD_FILES+=usr/bin/ld.lld .if ${MK_LLDB} == no OLD_FILES+=usr/bin/lldb OLD_FILES+=usr/bin/lldb-server +OLD_LIBS+=usr/lib/libprivatelldb.so.19 OLD_FILES+=usr/share/man/man1/lldb-server.1.gz OLD_FILES+=usr/share/man/man1/lldb.1.gz .endif diff --git a/usr.bin/clang/Makefile.inc b/usr.bin/clang/Makefile.inc index 8f6b098de2d4..d5c9658b1d90 100644 --- a/usr.bin/clang/Makefile.inc +++ b/usr.bin/clang/Makefile.inc @@ -1,7 +1,9 @@ .include +.if defined(TOOLS_PREFIX) MK_PIE:= no # Explicit libXXX.a references +.endif .if ${MK_LLVM_FULL_DEBUGINFO} == "no" .if ${COMPILER_TYPE} == "clang" diff --git a/usr.bin/clang/clang.prog.mk b/usr.bin/clang/clang.prog.mk index cf48f02359e9..36c601bcbe36 100644 --- a/usr.bin/clang/clang.prog.mk +++ b/usr.bin/clang/clang.prog.mk @@ -18,9 +18,17 @@ LIBADD+= z LIBADD+= zstd .endif +.if defined(TOOLS_PREFIX) +LIBPRIV= +LIBEXT= a +.else +LIBPRIV= private +LIBEXT= so +.endif + .for lib in ${LIBDEPS} -DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a -LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a +DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} +LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} .endfor PACKAGE= clang diff --git a/usr.bin/clang/lld/Makefile b/usr.bin/clang/lld/Makefile index 08d9cf6f550c..f87677c2b384 100644 --- a/usr.bin/clang/lld/Makefile +++ b/usr.bin/clang/lld/Makefile @@ -86,9 +86,17 @@ SRCS+= tools/lld/lld.cpp LIBDEPS+= llvm +.if defined(TOOLS_PREFIX) +LIBPRIV= +LIBEXT= a +.else +LIBPRIV= private +LIBEXT= so +.endif + .for lib in ${LIBDEPS} -DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a -LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a +DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} +LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} .endfor INCFILE= Options.inc diff --git a/usr.bin/clang/lldb-server/Makefile b/usr.bin/clang/lldb-server/Makefile index a02c5c606566..1a5c96b65806 100644 --- a/usr.bin/clang/lldb-server/Makefile +++ b/usr.bin/clang/lldb-server/Makefile @@ -23,9 +23,12 @@ LIBDEPS+= lldb LIBDEPS+= clang LIBDEPS+= llvm +LIBPRIV= private +LIBEXT= so + .for lib in ${LIBDEPS} -DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a -LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a +DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} +LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} .endfor INCFILE= LLGSOptions.inc diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile index efbd150efe4f..0e9a9ebef7e8 100644 --- a/usr.bin/clang/lldb/Makefile +++ b/usr.bin/clang/lldb/Makefile @@ -16,9 +16,12 @@ LIBDEPS+= lldb LIBDEPS+= clang LIBDEPS+= llvm +LIBPRIV= private +LIBEXT= so + .for lib in ${LIBDEPS} -DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a -LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a +DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} +LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} .endfor INCFILE= Options.inc diff --git a/usr.bin/clang/llvm.prog.mk b/usr.bin/clang/llvm.prog.mk index 2660ee22d82a..8c898b4087fb 100644 --- a/usr.bin/clang/llvm.prog.mk +++ b/usr.bin/clang/llvm.prog.mk @@ -10,15 +10,19 @@ CFLAGS+= -I${OBJTOP}/lib/clang/libllvm (${PROG_CXX} == "clang-tblgen" || ${PROG_CXX} == "lldb-tblgen" || \ ${PROG_CXX} == "llvm-min-tblgen" || ${PROG_CXX} == "llvm-tblgen") LIBDEPS+= llvmminimal +LIBPRIV= +LIBEXT= a .else LIBDEPS+= llvm +LIBPRIV= private +LIBEXT= so LIBADD+= z LIBADD+= zstd .endif .for lib in ${LIBDEPS} -DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a -LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a +DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} +LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT} .endfor PACKAGE= clang From nobody Fri May 9 20:32:58 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZvLKk6x3jz5w6gT; Fri, 09 May 2025 20:32:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZvLKk4b5xz3qDf; Fri, 09 May 2025 20:32:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746822778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yb4VbK8HFJ/hxPSITxt+tMVqNIcTPqnIwvWkGc5shJw=; b=CDuVi4hG6Dnuj2klk+j4SRgqXNGWuP1dZDQHNEoe6x7tOrViY8GAVTm3FX6bU0mkNwPvGU fMe7SzbQ0+xrx1kD+0ho+ojnfbUtknO9TXD8zWyRVPh7U0QT9mq6oAI/7sEZ9cvlS8d1SH 5LprOxDw6J9buZ59kU99vOb1leuQ4hNC0Rb0Vo6Y2qj8VUAhx/C9mVrDe0gEMrSkpAdqWy JS2UGheezX3u6jRAqhF+VflxuGyySBI38EMe9Vji5hx4CZbAeCLqHZ/chNcMKYdhCYxS/R 7PaGhX1NrlRtM7fxnxyuUg5OjEwV6os5d3nAaNTv0zr50qCaQZAY/JOuHtW4zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746822778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yb4VbK8HFJ/hxPSITxt+tMVqNIcTPqnIwvWkGc5shJw=; b=SIibz1Yssfc1R9Ddq7TSOLsU5uXYK87H8gEHH9sIKvVmanXAuPA5lgqgtgQXwiSomPmDh0 KHHufSfNYBtFFOsW9vyzRRdHC5PnWiWhBugCj92XiPXejEVyAqVh5zBSDlqxrpVCajrXxC HzSjlmE4zolFxNY3/O/BAbt49dhkDGT8zR6eVEdSC9oVem4VbKF7QtyLpFGGJfhNQZkTvZ bGHCdNCximH3YtuoSEp9763fs2k6OWt1xCsQfULD04J53Zz15+OnSBTVTg2Jxru1pekYKp 5ZAdZ/EzrhiGppw8hJugFdb+sUjmxqRcGpe2tMq6ORpPBgnBirMK9CjGArOWUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746822778; a=rsa-sha256; cv=none; b=xQiDbku9w46+84EC/dCW2E050fiSvQ2eiVqesIzcEewvsTKG+FK0B2U2oYZiTez0HF+IBk t/rDTGo3nJciLbUJLT/332qpGzrw5lzZsLgo563rpXcR0JbyJzDDKaF8uyzShGouTm1oX0 m1lpnwVTvoTkkBW7sqiJWePH4n186RuW5PzFIESjxNpAMP6VjMgEB0/q6fm+H6i043SUsj BTyjWz2kVGZeZBFgnQs+ypsuhN5glEGBI+lx1OtrxtVzy7sE9EFttGiCadJ6tHntWtzf8g zIlsECKIFyq6yuSbiDlL5Iw46p+V52841GDSzBhONsUENRdIiqsP5plLBNnH0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZvLKk1X8nzvS; Fri, 09 May 2025 20:32:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 549KWwex074237; Fri, 9 May 2025 20:32:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 549KWwnN074231; Fri, 9 May 2025 20:32:58 GMT (envelope-from git) Date: Fri, 9 May 2025 20:32:58 GMT Message-Id: <202505092032.549KWwnN074231@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: b2bd1781fe56 - stable/13 - depend-cleanup: ensure clang and llvm binaries are rebuilt List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b2bd1781fe5645fbbdc6641a1275b6d0696f6663 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=b2bd1781fe5645fbbdc6641a1275b6d0696f6663 commit b2bd1781fe5645fbbdc6641a1275b6d0696f6663 Author: Dimitry Andric AuthorDate: 2025-04-25 17:58:03 +0000 Commit: Dimitry Andric CommitDate: 2025-05-09 19:53:20 +0000 depend-cleanup: ensure clang and llvm binaries are rebuilt In 2e47f35be5dc, libllvm, libclang and liblldb became shared libraries, so make sure the binaries that depend on these libraries get rebuilt. MFC after: 2 weeks (cherry picked from commit d4dab32448ce7aff01273ecf9965125f0cb8067a) --- tools/build/depend-cleanup.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index c12c8e203324..24bbd07f03c4 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -171,3 +171,17 @@ if [ -e "$f" ]; then run rm -f "$p"/*.inc fi fi + +# 20250425 2e47f35be5dc libllvm, libclang and liblldb became shared libraries +if [ -f "$OBJTOP"/lib/clang/libllvm/libllvm.a ]; then + echo "Removing old static libllvm library" + run rm -f "$OBJTOP"/lib/clang/libllvm/libllvm.a +fi +if [ -f "$OBJTOP"/lib/clang/libclang/libclang.a ]; then + echo "Removing old static libclang library" + run rm -f "$OBJTOP"/lib/clang/libclang/libclang.a +fi +if [ -f "$OBJTOP"/lib/clang/liblldb/liblldb.a ]; then + echo "Removing old static liblldb library" + run rm -f "$OBJTOP"/lib/clang/liblldb/liblldb.a +fi From nobody Sat May 10 19:33:04 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zvwy85jvmz5vkZq; Sat, 10 May 2025 19:33:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zvwy851JHz3T7l; Sat, 10 May 2025 19:33:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s3eRKf5lLYE8g2urw0PLFiezyW6fgbzP2kAHWM+hFUc=; b=YtQX65BaVwTxlNNXKpgdVcsi084XtJEHejJcgt9qmFZiUKXiYm97SXhX1YUjLl5qafF/gw zmtyjSZhqDpVgohp7W0mzCVE0m0rDYzbeZu0s3lIwZ01PNSgswBS7OkXKAixQcwYTT79yW KyxumKq7mecVssMPhUxD6UOTWNvvkl+JptmQ3f7DXF+NSFuuIbV3L23dl1wmTdDHxEOqjY pZJO4sMXDPYxnv1jnGi2BnBaazcpAFSNCeWuYLRsMq3yR7niFyCrd2KczihWWCqCwMgwmV HqOohtdfb8QVhSJ9R5Z1OWAIjkzBjXvNq1uCoiIn/Yob7K6DnN8+1oDSmwEjMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s3eRKf5lLYE8g2urw0PLFiezyW6fgbzP2kAHWM+hFUc=; b=DTvydH3xWl2C81FAkbMQDVZWsCpR1lO+wybsTsElMKycEsSkb1J5NTQjNdeKTDLtCH571Y ElnFGdzga2glGHn5Hkm3MJjPrR081YQ+DeyspoQ3x1cNQy9C3T8TOBjOrrfqodLmXzTS0e oZJLxUOsrgtqdwOnNjEaHudYh7MZTNKwlYVlOpPa/XzCC5oIwMfDsnnZcuKPC2VG6zpbPq BsRRJ3R0ctLtLso9EdHXjDMnKnzOZSb14koDqMEtnGS7EpaIfull9IHyI4OdJ+Twm2iZMr mtaFNUVXnr1eRJCQILyxZHq294E9VvnMsFSSs9HXIjQuKUvfhcyZLJmZTGHGlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746905584; a=rsa-sha256; cv=none; b=w/KMM68bNVn/7YJtbVUVZR50lm2psjxyaE+73w3LAajIA7AUlWo9fhmDtndm33g6fL97MY hcT5FvLu6wFIvEwUYcja3oZ0G1HpUNuCjxUym1v+AE58MKS4SNTGXRIg8uqdclXb3DNBI0 7+H+C4t4ZsjmFiSgNC6XC02EPy9rCN40bNBedhrg5VMg/FRMX4hxGHq+VRMZ1MJYgaZRR+ yWG8tpR/ysJj7deZYedVMTt925J6Ds8zZjpCms83NHrxyLGX+L+mnVmZvn1epq0M9y1vcF Qs+Ho0fG5iMF8l7booWyV/a0k28jLbSlBVh+Hq+UxNjfuyl9zs9ap9jmoNjaAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zvwy84cdWzytp; Sat, 10 May 2025 19:33:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54AJX4Qx054811; Sat, 10 May 2025 19:33:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54AJX49x054808; Sat, 10 May 2025 19:33:04 GMT (envelope-from git) Date: Sat, 10 May 2025 19:33:04 GMT Message-Id: <202505101933.54AJX49x054808@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6286f5df3e4a - stable/14 - sys/queue.h: add STAILQ_REVERSE List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6286f5df3e4a667e51561d0d9ddb754930d50ef0 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6286f5df3e4a667e51561d0d9ddb754930d50ef0 commit 6286f5df3e4a667e51561d0d9ddb754930d50ef0 Author: Konstantin Belousov AuthorDate: 2025-05-03 08:13:14 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-10 18:15:21 +0000 sys/queue.h: add STAILQ_REVERSE (cherry picked from commit e8286eb295165ea1852abe4ae355f85ad1ec3356) --- sys/sys/queue.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sys/sys/queue.h b/sys/sys/queue.h index 5dabb1a241c2..cfad9822e74a 100644 --- a/sys/sys/queue.h +++ b/sys/sys/queue.h @@ -566,6 +566,21 @@ struct { \ (head2)->stqh_last = &STAILQ_FIRST(head2); \ } while (0) +#define STAILQ_REVERSE(head, type, field) do { \ + if (STAILQ_EMPTY(head)) \ + break; \ + QUEUE_TYPEOF(type) *_Var, *_Varp, *_Varn; \ + for (_Var = STAILQ_FIRST(head), _Varp = NULL; \ + _Var != NULL;) { \ + _Varn = STAILQ_NEXT(_Var, field); \ + STAILQ_NEXT(_Var, field) = _Varp; \ + _Varp = _Var; \ + _Var = _Varn; \ + } \ + (head)->stqh_last = &STAILQ_NEXT(STAILQ_FIRST(head), field); \ + (head)->stqh_first = _Varp; \ +} while (0) + #define STAILQ_END(head) NULL From nobody Sat May 10 19:33:05 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZvwyB1PWFz5vkhK; Sat, 10 May 2025 19:33:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zvwy96Hclz3T5P; Sat, 10 May 2025 19:33:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GkFxGONOrUk5R83t700Ilv2uiZkk8MdCrZSGlzRTAlk=; b=FFh1nMZ0Rw4c1oi50u7d0LglhOnNFkPk2iqDYBnRusOQUANze7jqJmHQe/cf8ioBUZLTph tyFbXfQ1kSsU8/2SHqLJk19X20LIf2OvYMtc89DeN24hPAwo8u6qHqS4NJoWiIBC+kq+gs c2zFVUdEbchPH7E25+EDqXe5mNgKUf5aOOiPqWl+r7pUwgZUsMwy9WNm6/1c7KoJltOA+z ojS20HvmFNmBiNdKRjn5BvmoAEG1du4HD/1IuZcVJfknWJArJwP7hCOLR1+FMn4t/Fwy+s FSKaMQPnqrDY0uxhSGHgq6PxcID1fCNk7R6gpVHTk1p/yx6vben0woPLRlfihw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GkFxGONOrUk5R83t700Ilv2uiZkk8MdCrZSGlzRTAlk=; b=rfoMtEBybvPOg8g9OLkhCwl6WJf7mzVFrN5sWFGoqtnKEIRY8ClfcoYbYQUPdn7vlQlaEm H/j6ExIRiT/WjIDkcEGsGknmZYRvhLYXwl3tj/WMsb8kzkEvQ4YG6rXvna1TTGTXlQtlEH AyxQ1Qkz748Ws7uuszxJxGI8cZmj9g276UnzdeZ6SMbWhtjkGW/fx9fTXdkQQgDtgpLusg BQu4f6eadiNLZNP5i3uv7c3Vl9yqr3FFL+UGHkrT7o0Zyxt/tdGjEZUqi8fioapow2PH8S qES4NqkCFR8oqRNkw+6CNalIEs7EUtdVLeOgZ2zmvRBLkVBRwAkGnLA7IIREkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746905585; a=rsa-sha256; cv=none; b=k7w8d4MfBfikkU0E6rwNmjQ0Gvw8Ca/pSQvFMavSABkySwj11WBT39uXnz2IJEYwE8gGzi NMDn4VWJtQ7UKycSZjR/HGOjlA/Lbl1AVLWUfSA2E/Be6+Fhlsw9fthoVuv9LvL9JIv49B +8ihhJS/pC+EPzF2+WDF77xDIy6uDhOe7vNs10O5x3xu++F6SwwPAGeO6PASe7U5YQ4dS/ ipusPoYYO5SCcR2Utrapo7cj1C9JCsv141yx/WCidBxPvx5/MY2a+jKbFJnKfLA1LO1y0T WOu85uSUlH1jYe+43sh4ShDcDaCa4zResYsLNyJfbRQpfdCZqKsmKYOALclJzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zvwy95YBdz10Gf; Sat, 10 May 2025 19:33:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54AJX5SB054845; Sat, 10 May 2025 19:33:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54AJX5cV054842; Sat, 10 May 2025 19:33:05 GMT (envelope-from git) Date: Sat, 10 May 2025 19:33:05 GMT Message-Id: <202505101933.54AJX5cV054842@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: aa7487ee9537 - stable/14 - queue.3: document STAILQ_REVERSE List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: aa7487ee9537698f25792065fce47acda47081e2 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=aa7487ee9537698f25792065fce47acda47081e2 commit aa7487ee9537698f25792065fce47acda47081e2 Author: Konstantin Belousov AuthorDate: 2025-05-04 16:04:09 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-10 18:15:21 +0000 queue.3: document STAILQ_REVERSE (cherry picked from commit a5a186baf2c89ebfd795d74d9223d57acd8c0383) --- share/man/man3/Makefile | 1 + share/man/man3/queue.3 | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile index 9f0c796e445c..5f336b6b7d2a 100644 --- a/share/man/man3/Makefile +++ b/share/man/man3/Makefile @@ -261,6 +261,7 @@ MLINKS+= queue.3 LIST_CLASS_ENTRY.3 \ queue.3 STAILQ_REMOVE.3 \ queue.3 STAILQ_REMOVE_AFTER.3 \ queue.3 STAILQ_REMOVE_HEAD.3 \ + queue.3 STAILQ_REVERSE.3 \ queue.3 STAILQ_SPLIT_AFTER.3 \ queue.3 STAILQ_SWAP.3 \ queue.3 TAILQ_CLASS_ENTRY.3 \ diff --git a/share/man/man3/queue.3 b/share/man/man3/queue.3 index a43357d9dd13..aef4944e3847 100644 --- a/share/man/man3/queue.3 +++ b/share/man/man3/queue.3 @@ -75,6 +75,7 @@ .Nm STAILQ_REMOVE , .Nm STAILQ_REMOVE_AFTER , .Nm STAILQ_REMOVE_HEAD , +.Nm STAILQ_REVERSE , .Nm STAILQ_SPLIT_AFTER , .Nm STAILQ_SWAP , .Nm LIST_CLASS_ENTRY , @@ -179,6 +180,7 @@ lists and tail queues .Fn STAILQ_REMOVE "STAILQ_HEAD *head" "TYPE *elm" "TYPE" "STAILQ_ENTRY NAME" .Fn STAILQ_REMOVE_AFTER "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" .Fn STAILQ_REMOVE_HEAD "STAILQ_HEAD *head" "STAILQ_ENTRY NAME" +.Fn STAILQ_REVERSE "STAILQ_HEAD *head" "TYPE" "STAILQ_ENTRY NAME" .Fn STAILQ_SPLIT_AFTER "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_HEAD *rest" "STAILQ_ENTRY NAME" .Fn STAILQ_SWAP "STAILQ_HEAD *head1" "STAILQ_HEAD *head2" "TYPE" .\" @@ -793,6 +795,10 @@ A doubly-linked tail queue should be used if this macro is needed in high-usage code paths or to operate on long tail queues. .Pp The macro +.Nm STAILQ_REVERSE +reverses the queue in place. +.Pp +The macro .Nm STAILQ_SPLIT_AFTER splits the tail queue referenced by .Fa head , From nobody Sat May 10 19:33:06 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZvwyC4px7z5vkf0; Sat, 10 May 2025 19:33:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZvwyC0FM7z3Sy0; Sat, 10 May 2025 19:33:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jk4HFzuyXsEhfhC9/1tBoK9aaQ5yrcoXoDY9yNuZM6g=; b=bf2Ek9dQSls3t484CHKr9OUkz9FZYEibAaLzSKL6XiamrFqFHU5/a7804QhS1Nzzc9dPiR I+h3/A2TYaP8aS2ucUV7tAUzz5rnhMa9/KEeBssHkB2kC8TUXu4pDD8Ynlo3SYy8DADPow 3kPSLTwibcKK32rp8aJ7A/dshbLdxaSlF68H2IM+GMvBWT3RRMgSPXEL0zf2pHaGQEtt9I dPNqDg07E272CwdPhf+eVP6srFj8+8nN1RxyTRV+DFBnnAhXpCIGiaBl6uLsT6SwogAmGa EzLOd6Crhga1ownCj3u4ce26rv06EWtU/7z7KPMls5wOPdhszx6I/j/+T8dTNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jk4HFzuyXsEhfhC9/1tBoK9aaQ5yrcoXoDY9yNuZM6g=; b=c+wyZ95zWUnG/hkComGwMYegzUxbE1eS1XKEWeoVDckQwbtbSs7aU7WRkzAkdYac198PVF pEKDi4sy0pdtziwT2Ao7e8jCtW+mWGIfTzn9BD4/LEXHerPXEyZFe7avGFRC5Fou8TelAs n3tUuHsmohYi4Kp5BnThhtXz/2G8aTnYEejy6WM/bQ6sSaZcETY7+JJvfp4u+Dd5RJanjD XYidIy21jUV6gAjEnNcbCHBsTApzLR0t0VdvaS3n5YmMa0dqzsty0snDTFJFY1K3wttJwe FiVci/AytMRktRzvtfplSsAtXjYJTa3ZJg5FsBu3aYD0KYsST1epUZohPVHE8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746905587; a=rsa-sha256; cv=none; b=xzRVhhCCBausiozjdE9MX1U25LiJyp0X2gby5Zh2E874sBg8wIyVznonVZdi3iBv5vljSH 0ygA3ibnm32UjHZeLO341UdnKSvqV/xKMlfhsy7fGODHcm/hY/q6vE3pXjJmnIhifUylXw 2rXwnyzBHK+QKQgyFclqcBgV5uhZ3MSUDiLw3jRdKK8hdC4OodT7uEhagqJe5EVyGxIjNc n3evODXzTp/4PbJj83wro6vFGi7zbKxkC0LwDkxg0g5XIAFI43SO6Yk+Bl+crj+jtVRzis U4FXs0WtDmLDHTt28He4sTcR/MSmSpWriLQcip7Y4YRvUdqQN1FEywMZ8hntRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZvwyB6nDKzyfh; Sat, 10 May 2025 19:33:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54AJX6pc054887; Sat, 10 May 2025 19:33:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54AJX6E3054884; Sat, 10 May 2025 19:33:06 GMT (envelope-from git) Date: Sat, 10 May 2025 19:33:06 GMT Message-Id: <202505101933.54AJX6E3054884@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 34aae0732122 - stable/14 - sys/queue.h: use reserved identifiers with the file scope for locals List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 34aae073212270d36a4688e770930580b483480f Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=34aae073212270d36a4688e770930580b483480f commit 34aae073212270d36a4688e770930580b483480f Author: Konstantin Belousov AuthorDate: 2025-05-06 18:09:06 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-10 18:15:21 +0000 sys/queue.h: use reserved identifiers with the file scope for locals (cherry picked from commit c15cdaf505849509900b018a44d91eee3647fb13) --- sys/sys/queue.h | 94 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/sys/sys/queue.h b/sys/sys/queue.h index cfad9822e74a..3777721491b7 100644 --- a/sys/sys/queue.h +++ b/sys/sys/queue.h @@ -275,14 +275,14 @@ struct { \ "slist %p is empty", (head)) #define SLIST_CONCAT(head1, head2, type, field) do { \ - QUEUE_TYPEOF(type) *curelm = SLIST_FIRST(head1); \ - if (curelm == NULL) { \ + QUEUE_TYPEOF(type) *_Curelm = SLIST_FIRST(head1); \ + if (_Curelm == NULL) { \ if ((SLIST_FIRST(head1) = SLIST_FIRST(head2)) != NULL) \ SLIST_INIT(head2); \ } else if (SLIST_FIRST(head2) != NULL) { \ - while (SLIST_NEXT(curelm, field) != NULL) \ - curelm = SLIST_NEXT(curelm, field); \ - SLIST_NEXT(curelm, field) = SLIST_FIRST(head2); \ + while (SLIST_NEXT(_Curelm, field) != NULL) \ + _Curelm = SLIST_NEXT(_Curelm, field); \ + SLIST_NEXT(_Curelm, field) = SLIST_FIRST(head2); \ SLIST_INIT(head2); \ } \ } while (0) @@ -340,24 +340,24 @@ struct { \ SLIST_REMOVE_HEAD((head), field); \ } \ else { \ - QUEUE_TYPEOF(type) *curelm = SLIST_FIRST(head); \ - while (SLIST_NEXT(curelm, field) != (elm)) \ - curelm = SLIST_NEXT(curelm, field); \ - SLIST_REMOVE_AFTER(curelm, field); \ + QUEUE_TYPEOF(type) *_Curelm = SLIST_FIRST(head); \ + while (SLIST_NEXT(_Curelm, field) != (elm)) \ + _Curelm = SLIST_NEXT(_Curelm, field); \ + SLIST_REMOVE_AFTER(_Curelm, field); \ } \ } while (0) #define SLIST_REMOVE_AFTER(elm, field) do { \ - QMD_SAVELINK(oldnext, SLIST_NEXT(elm, field)->field.sle_next); \ + QMD_SAVELINK(_Oldnext, SLIST_NEXT(elm, field)->field.sle_next); \ SLIST_NEXT(elm, field) = \ SLIST_NEXT(SLIST_NEXT(elm, field), field); \ - TRASHIT(*oldnext); \ + TRASHIT(*_Oldnext); \ } while (0) #define SLIST_REMOVE_HEAD(head, field) do { \ - QMD_SAVELINK(oldnext, SLIST_FIRST(head)->field.sle_next); \ + QMD_SAVELINK(_Oldnext, SLIST_FIRST(head)->field.sle_next); \ SLIST_FIRST((head)) = SLIST_NEXT(SLIST_FIRST((head)), field); \ - TRASHIT(*oldnext); \ + TRASHIT(*_Oldnext); \ } while (0) #define SLIST_REMOVE_PREVPTR(prevp, elm, field) do { \ @@ -373,9 +373,9 @@ struct { \ } while (0) #define SLIST_SWAP(head1, head2, type) do { \ - QUEUE_TYPEOF(type) *swap_first = SLIST_FIRST(head1); \ + QUEUE_TYPEOF(type) *_Swap_first = SLIST_FIRST(head1); \ SLIST_FIRST(head1) = SLIST_FIRST(head2); \ - SLIST_FIRST(head2) = swap_first; \ + SLIST_FIRST(head2) = _Swap_first; \ } while (0) #define SLIST_END(head) NULL @@ -514,17 +514,17 @@ struct { \ #define STAILQ_NEXT(elm, field) ((elm)->field.stqe_next) #define STAILQ_REMOVE(head, elm, type, field) do { \ - QMD_SAVELINK(oldnext, (elm)->field.stqe_next); \ + QMD_SAVELINK(_Oldnext, (elm)->field.stqe_next); \ if (STAILQ_FIRST((head)) == (elm)) { \ STAILQ_REMOVE_HEAD((head), field); \ } \ else { \ - QUEUE_TYPEOF(type) *curelm = STAILQ_FIRST(head); \ - while (STAILQ_NEXT(curelm, field) != (elm)) \ - curelm = STAILQ_NEXT(curelm, field); \ - STAILQ_REMOVE_AFTER(head, curelm, field); \ + QUEUE_TYPEOF(type) *_Curelm = STAILQ_FIRST(head); \ + while (STAILQ_NEXT(_Curelm, field) != (elm)) \ + _Curelm = STAILQ_NEXT(_Curelm, field); \ + STAILQ_REMOVE_AFTER(head, _Curelm, field); \ } \ - TRASHIT(*oldnext); \ + TRASHIT(*_Oldnext); \ } while (0) #define STAILQ_REMOVE_AFTER(head, elm, field) do { \ @@ -554,12 +554,12 @@ struct { \ } while (0) #define STAILQ_SWAP(head1, head2, type) do { \ - QUEUE_TYPEOF(type) *swap_first = STAILQ_FIRST(head1); \ - QUEUE_TYPEOF(type) **swap_last = (head1)->stqh_last; \ + QUEUE_TYPEOF(type) *_Swap_first = STAILQ_FIRST(head1); \ + QUEUE_TYPEOF(type) **_Swap_last = (head1)->stqh_last; \ STAILQ_FIRST(head1) = STAILQ_FIRST(head2); \ (head1)->stqh_last = (head2)->stqh_last; \ - STAILQ_FIRST(head2) = swap_first; \ - (head2)->stqh_last = swap_last; \ + STAILQ_FIRST(head2) = _Swap_first; \ + (head2)->stqh_last = _Swap_last; \ if (STAILQ_FIRST(head1) == NULL) \ (head1)->stqh_last = &STAILQ_FIRST(head1); \ if (STAILQ_FIRST(head2) == NULL) \ @@ -660,18 +660,18 @@ struct { \ "list %p is empty", (head)) #define LIST_CONCAT(head1, head2, type, field) do { \ - QUEUE_TYPEOF(type) *curelm = LIST_FIRST(head1); \ - if (curelm == NULL) { \ + QUEUE_TYPEOF(type) *_Curelm = LIST_FIRST(head1); \ + if (_Curelm == NULL) { \ if ((LIST_FIRST(head1) = LIST_FIRST(head2)) != NULL) { \ LIST_FIRST(head2)->field.le_prev = \ &LIST_FIRST((head1)); \ LIST_INIT(head2); \ } \ } else if (LIST_FIRST(head2) != NULL) { \ - while (LIST_NEXT(curelm, field) != NULL) \ - curelm = LIST_NEXT(curelm, field); \ - LIST_NEXT(curelm, field) = LIST_FIRST(head2); \ - LIST_FIRST(head2)->field.le_prev = &LIST_NEXT(curelm, field);\ + while (LIST_NEXT(_Curelm, field) != NULL) \ + _Curelm = LIST_NEXT(_Curelm, field); \ + LIST_NEXT(_Curelm, field) = LIST_FIRST(head2); \ + LIST_FIRST(head2)->field.le_prev = &LIST_NEXT(_Curelm, field);\ LIST_INIT(head2); \ } \ } while (0) @@ -743,21 +743,21 @@ struct { \ LIST_REMOVE(LIST_FIRST(head), field) #define LIST_REMOVE(elm, field) do { \ - QMD_SAVELINK(oldnext, (elm)->field.le_next); \ - QMD_SAVELINK(oldprev, (elm)->field.le_prev); \ + QMD_SAVELINK(_Oldnext, (elm)->field.le_next); \ + QMD_SAVELINK(_Oldprev, (elm)->field.le_prev); \ QMD_LIST_CHECK_NEXT(elm, field); \ QMD_LIST_CHECK_PREV(elm, field); \ if (LIST_NEXT((elm), field) != NULL) \ LIST_NEXT((elm), field)->field.le_prev = \ (elm)->field.le_prev; \ *(elm)->field.le_prev = LIST_NEXT((elm), field); \ - TRASHIT(*oldnext); \ - TRASHIT(*oldprev); \ + TRASHIT(*_Oldnext); \ + TRASHIT(*_Oldprev); \ } while (0) #define LIST_REPLACE(elm, elm2, field) do { \ - QMD_SAVELINK(oldnext, (elm)->field.le_next); \ - QMD_SAVELINK(oldprev, (elm)->field.le_prev); \ + QMD_SAVELINK(_Oldnext, (elm)->field.le_next); \ + QMD_SAVELINK(_Oldprev, (elm)->field.le_prev); \ QMD_LIST_CHECK_NEXT(elm, field); \ QMD_LIST_CHECK_PREV(elm, field); \ LIST_NEXT((elm2), field) = LIST_NEXT((elm), field); \ @@ -766,8 +766,8 @@ struct { \ &(elm2)->field.le_next; \ (elm2)->field.le_prev = (elm)->field.le_prev; \ *(elm2)->field.le_prev = (elm2); \ - TRASHIT(*oldnext); \ - TRASHIT(*oldprev); \ + TRASHIT(*_Oldnext); \ + TRASHIT(*_Oldprev); \ } while (0) #define LIST_SPLIT_AFTER(head, elm, rest, field) do { \ @@ -1024,8 +1024,8 @@ struct { \ TAILQ_REMOVE(head, TAILQ_FIRST(head), field) #define TAILQ_REMOVE(head, elm, field) do { \ - QMD_SAVELINK(oldnext, (elm)->field.tqe_next); \ - QMD_SAVELINK(oldprev, (elm)->field.tqe_prev); \ + QMD_SAVELINK(_Oldnext, (elm)->field.tqe_next); \ + QMD_SAVELINK(_Oldprev, (elm)->field.tqe_prev); \ QMD_TAILQ_CHECK_NEXT(elm, field); \ QMD_TAILQ_CHECK_PREV(elm, field); \ if ((TAILQ_NEXT((elm), field)) != NULL) \ @@ -1036,14 +1036,14 @@ struct { \ QMD_TRACE_HEAD(head); \ } \ *(elm)->field.tqe_prev = TAILQ_NEXT((elm), field); \ - TRASHIT(*oldnext); \ - TRASHIT(*oldprev); \ + TRASHIT(*_Oldnext); \ + TRASHIT(*_Oldprev); \ QMD_TRACE_ELEM(&(elm)->field); \ } while (0) #define TAILQ_REPLACE(head, elm, elm2, field) do { \ - QMD_SAVELINK(oldnext, (elm)->field.tqe_next); \ - QMD_SAVELINK(oldprev, (elm)->field.tqe_prev); \ + QMD_SAVELINK(_Oldnext, (elm)->field.tqe_next); \ + QMD_SAVELINK(_Oldprev, (elm)->field.tqe_prev); \ QMD_TAILQ_CHECK_NEXT(elm, field); \ QMD_TAILQ_CHECK_PREV(elm, field); \ TAILQ_NEXT((elm2), field) = TAILQ_NEXT((elm), field); \ @@ -1054,8 +1054,8 @@ struct { \ (head)->tqh_last = &(elm2)->field.tqe_next; \ (elm2)->field.tqe_prev = (elm)->field.tqe_prev; \ *(elm2)->field.tqe_prev = (elm2); \ - TRASHIT(*oldnext); \ - TRASHIT(*oldprev); \ + TRASHIT(*_Oldnext); \ + TRASHIT(*_Oldprev); \ QMD_TRACE_ELEM(&(elm)->field); \ } while (0) From nobody Sat May 10 19:33:07 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZvwyD42svz5vkLq; Sat, 10 May 2025 19:33:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZvwyD173Pz3T5g; Sat, 10 May 2025 19:33:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k66RbioinW9sTqDNr0zA6FNwaaIN2rSN9eB61XG/IGw=; b=NsEBL9DB8/rrhy8waT3xnkFloWYBRgxgKzmX1OWiAgDd16cZjpKZr+NAJJv0ivJQCoEb+k yiX3TgBMFBFyVO2J5KbbfhKfCXGPWZ7vXZ1Omfrsg8P+TdxpHtQtTFsnUUvFSAWjP5uVTM gyigxNh7TeqZVYZ8sEBvw5wWEhTaOX9T6OvJ2iIsLYhK6GlZ6fMQqlXuPqVQKTgV4EtHNl 5aIy1hawhWyuLTmq3cR4pO/VQQ3Xk68PU1W6uLItvx2/MdSWqlrvDI+M2bHh7wRoxH0OOy im1aXdRKI3GzvOn6odj8AF3x3+UbsJJOzyQg0uCgqN3mYJPqoxE8yjGZyXbGPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k66RbioinW9sTqDNr0zA6FNwaaIN2rSN9eB61XG/IGw=; b=j6Ro3JYzVk3ifWafe/e8vtdDRH8UWS+6v+yzXcy6dVtDWVrd4Lu5IWIHDu2Dxs1uGBvskF 6VHpgCZqXzXIyeKDYWQQrrbeRI7SW5tTF6i3XWRwzYT4FfYWWEU3wA5CnvXGac/8c3Vf7e cEkdTtWfKYqDTY2nU2pqm/56fa6x95iiyNeCdnnMpY4hz6TdAJlea77tX9V2bdwOZvTzi/ MtK00iXRyyD5hLlof1BeuQMWmvbWk2QYOVjDSdupxWJtDUw31Y3NIstkzLv6B+uCuic1CG Y25fWINVU8MCYUb5x23C8p7MQa7Ur6iXAaZtFRxhUi0B+rRyCvrC3askWOHyDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746905588; a=rsa-sha256; cv=none; b=JA7wlsA9nZdJ/o/GwMdl8hwr3DL3q7ZnFXzJFIxS7k62Br0Nkmn8903mfX4yX6DH6COeIk 3aX4gU4cmkg8Ggyu/qER6ISS4L0UXGY4zp9dG+1YmLictP5AZj5f9LfhcnLIVPvdMDbrgC K+YH9UkHpGu24bY0ctuIdmTOgMEVFejbGEMS9dqQ4b90NM8LIMrZQMwFlfpY3lij4DW0Ac 0SI3m/D+rU0VIB1SX98GwXm8xVl7vp5j+WkK7z79xqZhJvfQBuKtcPHEjBFAOw0Gtbw7ph eqTi4jH3LnHPePAZ/L1ri7tSpCRZYOKpmi03MS39WGfwCwnRMXmaaEQ4sIaTGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZvwyD0bkxzyfj; Sat, 10 May 2025 19:33:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54AJX7TR054921; Sat, 10 May 2025 19:33:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54AJX7wn054918; Sat, 10 May 2025 19:33:07 GMT (envelope-from git) Date: Sat, 10 May 2025 19:33:07 GMT Message-Id: <202505101933.54AJX7wn054918@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c8f21c33fd46 - stable/14 - rtld: add lockstate_wlocked() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c8f21c33fd46aac5cfbfddeee90c178b2b0279f7 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c8f21c33fd46aac5cfbfddeee90c178b2b0279f7 commit c8f21c33fd46aac5cfbfddeee90c178b2b0279f7 Author: Konstantin Belousov AuthorDate: 2025-05-01 15:43:30 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-10 18:15:21 +0000 rtld: add lockstate_wlocked() (cherry picked from commit bcbc19335a702a05ed89369c1662a91b686324ce) --- libexec/rtld-elf/rtld_lock.c | 6 ++++++ libexec/rtld-elf/rtld_lock.h | 1 + 2 files changed, 7 insertions(+) diff --git a/libexec/rtld-elf/rtld_lock.c b/libexec/rtld-elf/rtld_lock.c index 323bb7494c32..d16549871217 100644 --- a/libexec/rtld-elf/rtld_lock.c +++ b/libexec/rtld-elf/rtld_lock.c @@ -326,6 +326,12 @@ lock_restart_for_upgrade(RtldLockState *lockstate) } } +bool +lockstate_wlocked(const RtldLockState *lockstate) +{ + return (lockstate->lockstate == RTLD_LOCK_WLOCKED); +} + void dlerror_dflt_init(void) { diff --git a/libexec/rtld-elf/rtld_lock.h b/libexec/rtld-elf/rtld_lock.h index f41c23d7f69a..c9b11176b7de 100644 --- a/libexec/rtld-elf/rtld_lock.h +++ b/libexec/rtld-elf/rtld_lock.h @@ -93,6 +93,7 @@ void wlock_acquire(rtld_lock_t, RtldLockState *); void lock_release(rtld_lock_t, RtldLockState *); void lock_upgrade(rtld_lock_t, RtldLockState *); void lock_restart_for_upgrade(RtldLockState *); +bool lockstate_wlocked(const RtldLockState *); void dlerror_dflt_init(void); From nobody Sat May 10 19:33:09 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZvwyF4qtXz5vkVJ; Sat, 10 May 2025 19:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZvwyF1yySz3Sw4; Sat, 10 May 2025 19:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=htqvM8XXBc9hNpU6oPMXCYoxJk/MiBlgOA7BfJV6pw4=; b=DamqLpSMykGqK13XkkvLxyZ3u85DUFc3KThWg7Suxh1HunSqETZeDHMDimU365R5lRfC6y jb/Fces3kef/GPO4nmewQbSKzX1p3HpkcC5h9p2zy2AIph0eeD20UifYvzQis62fXNzE5i m9gXEFDKUgmME1OZJJ7m34YCUAtRoZkTyBOXTDb8bobC7IBPZdpkFHR0db5I10blZpgObg 4/gXwPLtwcJyz5UPFcwmU6CkbrZcHnng/ZVI+xVFT41q7uNHyRpBxcp/eovx6EeKAMwfnv Iob4NEZFCvAq15wtnPDERdK/KO/uloFr+BswAnjp3ndgUDzFNtvJCcyc4u8GKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=htqvM8XXBc9hNpU6oPMXCYoxJk/MiBlgOA7BfJV6pw4=; b=LVyEQPXwmCRaImYhTWv/SHmRVF9B8kaToHCTh1dGU1vo99XcsLsmsz7rqBls93nYpqTDxC UBit6rafi4QHrNDRND1ux11gz8O3LPn+aOejEgddYEvH0OHxu/GpVWaeGI2mZNnxL51Vjt ObvmJQO9krnGQEnnHiBKqRVfd8jgAmnKaXA1WZu99Ts69O9a134IgsWkEjN1/GvzCdJ1hJ BtAYM8dNRvqmrVpA4FglGjSOl8FVzlQMvtS8s2UA872b95q6tLylaSwk7+utSqNBwcRLp0 yEYoHKpoWGrR6BAXKG4nJeBq/4NftC1mzAomOD04W98FoW+BpHICeE19Rn1jkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746905589; a=rsa-sha256; cv=none; b=nMPpU0R/96Ia9Q6WQyM5atkR+mfdGynVH6ZkfDtL7pMZ6Xcmfv2ssvQA2stCyYecwSojSK gMsVLOu87863KeOe2YJVDGQcMXERSs8KA+PJzyCaVR6CYf8jnJ7jXMUG9vqLsufmT4BJnq Ick8Npbit/0zxMKrj9Vu3WnWbLR36xW1q8cb5xt7N/CiCaOda9lKft3ubU/fyhKB2dTRU8 yjHEW6bOSbskrMA76JMl3D+4ejGx0cX0TEggX1z8480eXD9xsFxi19Df2IKYcDOTeQerGh hDmIktNmaTxdIbmzjFHZaWC6+a6tu2QgzTilImEbXmzplJ0b6EKfGh/cpHuh+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZvwyF1L0Gzyfk; Sat, 10 May 2025 19:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54AJX9Wi054961; Sat, 10 May 2025 19:33:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54AJX9DQ054958; Sat, 10 May 2025 19:33:09 GMT (envelope-from git) Date: Sat, 10 May 2025 19:33:09 GMT Message-Id: <202505101933.54AJX9DQ054958@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 5f195cb44bee - stable/14 - rtld: do not call into ifunc resolvers with the bind lock write-locked List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5f195cb44beee2ee952252245937a9bb7a395e38 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5f195cb44beee2ee952252245937a9bb7a395e38 commit 5f195cb44beee2ee952252245937a9bb7a395e38 Author: Konstantin Belousov AuthorDate: 2025-05-01 15:44:12 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-10 18:57:45 +0000 rtld: do not call into ifunc resolvers with the bind lock write-locked PR: 286502 (cherry picked from commit c66c0a8479e62f3e3e085252839cddace4d4bbf5) --- libexec/rtld-elf/rtld.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 6375867d1db1..ba8e2aea6e7c 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -1018,6 +1018,7 @@ _rtld_bind(Obj_Entry *obj, Elf_Size reloff) Elf_Addr target; RtldLockState lockstate; +relock: rlock_acquire(rtld_bind_lock, &lockstate); if (sigsetjmp(lockstate.env, 0) != 0) lock_upgrade(rtld_bind_lock, &lockstate); @@ -1031,10 +1032,15 @@ _rtld_bind(Obj_Entry *obj, Elf_Size reloff) NULL, &lockstate); if (def == NULL) rtld_die(); - if (ELF_ST_TYPE(def->st_info) == STT_GNU_IFUNC) + if (ELF_ST_TYPE(def->st_info) == STT_GNU_IFUNC) { + if (lockstate_wlocked(&lockstate)) { + lock_release(rtld_bind_lock, &lockstate); + goto relock; + } target = (Elf_Addr)rtld_resolve_ifunc(defobj, def); - else + } else { target = (Elf_Addr)(defobj->relocbase + def->st_value); + } dbg("\"%s\" in \"%s\" ==> %p in \"%s\"", defobj->strtab + def->st_name, From nobody Sat May 10 19:33:10 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZvwyH1TQHz5vkLx; Sat, 10 May 2025 19:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZvwyG2Z6yz3Syt; Sat, 10 May 2025 19:33:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QoRRdnYYeJNdWwZNs/NXTyXPfZ2FNyDbIV43NjVbyiI=; b=Czb+BMaHsjeyptUHvP3L/fAeoPRtRyRYEKnRv5yChpkI5TsoqRziAxxdkcvIQmfFMBwXtU UVkCOetzceMh/4YuaskwU/xlAQU2s+HIa4M+LbxiXW6lNzDfab1IhMacoTan0Vlj44k/Un HwYwmFXAMbsYJobqcDn/Qdw6hPm69lxJShWTucPxyEIuopLA0cEsN0brKgOFH75zvm8k4J PNWYDQbPP0k0DbWgh4mH/TOKbm4WoMLwP8bxHQ9fmLoH5e16bYyoE1fhTQbByJruXx1HJs HBJg1vjnt8JS8fuiMAQFWz9tAll5CNACbkiCUwrHpbXTFDU3SpkgJq/vbZpBBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QoRRdnYYeJNdWwZNs/NXTyXPfZ2FNyDbIV43NjVbyiI=; b=RKAM2kKAYkPnALTYmcEos7NoGZB5ekT4pauUt3VcL6WZEuDH5vobFaTNRHu8fh+JgmrlcI i2oRoV7OdtJcVFZcjZVpTthVHVfNW/sMTgDkWxcAtJruXN+xLc9sEHWldUEIxjNjIrB4eI hoqxwIxoKEmmHTBwBnZ9VwVjcBC18e+hV/glDlzNgxKMe2yq6d4T9Z+6RkxI7tmokHaikU Kc5cxWY429mlxqANRTWW23y/OkSLJ3m0WC+IfSQ6ldn0bV9uJC5DImXskuYIWxgVq3R3zz U0uxsSNfiBzrwil/8d0JvHF/KED16Lw5BE+pEOCCwvHtwdNtQY5+uJoWNYI5MQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746905590; a=rsa-sha256; cv=none; b=dAcAkzFA43T7Gk1pU4VrCmUUiWJ+SuniwueKZB4wB0iuuVxx0To3VYtfYjE+vOr555bbEq z2zRAn3UpgJ28Rt9lBcXGdvCqYtU54wF88owTtodszjfGeSPLFaFSVaZfsBv07Kh29lzcP vmZalcFCRRHHyMnJYvGV/TfHjq2YNIszBk/SbMbzLOnECKlnztxSqumjmHIvM5cyleGwJx cn6JdblMdydNUZUxFR9wtAUSLcbSIxKt2nHLXtbcs8el2FReINxyPTDcHuiT5FQEsXg7h6 6bfB6mdHPslRdFXfCOV/YcUBv5H1GUelIiDoFXh60UwWqnyceF+3YePp5DjgsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZvwyG1vk4z1069; Sat, 10 May 2025 19:33:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54AJXAZN055001; Sat, 10 May 2025 19:33:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54AJXAip054998; Sat, 10 May 2025 19:33:10 GMT (envelope-from git) Date: Sat, 10 May 2025 19:33:10 GMT Message-Id: <202505101933.54AJXAip054998@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 7865d159c5e1 - stable/14 - thr_rtld: accept read lock requests while owning the lock for write List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7865d159c5e1b825286777ec236b502ec1261dc0 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7865d159c5e1b825286777ec236b502ec1261dc0 commit 7865d159c5e1b825286777ec236b502ec1261dc0 Author: Konstantin Belousov AuthorDate: 2025-05-02 15:09:46 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-10 18:57:45 +0000 thr_rtld: accept read lock requests while owning the lock for write PR: 286505 (cherry picked from commit 812c4bf3f17024f192980bbb8a781676cb9cf6b6) --- lib/libthr/thread/thr_rtld.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/lib/libthr/thread/thr_rtld.c b/lib/libthr/thread/thr_rtld.c index 55197a9c5461..5195b208f287 100644 --- a/lib/libthr/thread/thr_rtld.c +++ b/lib/libthr/thread/thr_rtld.c @@ -51,8 +51,11 @@ static int _thr_rtld_set_flag(int); static void _thr_rtld_wlock_acquire(void *); struct rtld_lock { - struct urwlock lock; - char _pad[CACHE_LINE_SIZE - sizeof(struct urwlock)]; + struct urwlock lock; + struct pthread *wowner; + u_int rlocks; + char _pad[CACHE_LINE_SIZE - sizeof(struct urwlock) - + sizeof(struct pthread *) - sizeof(u_int)]; }; static struct rtld_lock lock_place[MAX_RTLD_LOCKS] __aligned(CACHE_LINE_SIZE); @@ -117,9 +120,13 @@ _thr_rtld_rlock_acquire(void *lock) SAVE_ERRNO(); l = (struct rtld_lock *)lock; - THR_CRITICAL_ENTER(curthread); - while (_thr_rwlock_rdlock(&l->lock, 0, NULL) != 0) - ; + if (l->wowner == curthread) { + l->rlocks++; + } else { + THR_CRITICAL_ENTER(curthread); + while (_thr_rwlock_rdlock(&l->lock, 0, NULL) != 0) + ; + } curthread->rdlock_count++; RESTORE_ERRNO(); } @@ -138,6 +145,7 @@ _thr_rtld_wlock_acquire(void *lock) THR_CRITICAL_ENTER(curthread); while (_thr_rwlock_wrlock(&l->lock, NULL) != 0) ; + l->wowner = curthread; RESTORE_ERRNO(); } @@ -165,6 +173,14 @@ _thr_rtld_lock_release(void *lock) l->lock.rw_blocked_readers = 0; l->lock.rw_blocked_writers = 0; } + if ((state & URWLOCK_WRITE_OWNER) != 0) { + if (l->rlocks > 0) { + l->rlocks--; + return; + } else { + l->wowner = NULL; + } + } if (_thr_rwlock_unlock(&l->lock) == 0) { if ((state & URWLOCK_WRITE_OWNER) == 0) curthread->rdlock_count--; From nobody Sat May 10 19:33:11 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZvwyH6RL7z5vkVK; Sat, 10 May 2025 19:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZvwyH3NcKz3T3r; Sat, 10 May 2025 19:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eVug8VjUghuG4OSzZo9ueCfVyw4L7kYnTI72HaTJYjc=; b=R6eRrSme+/BqOSG6T2W0ZFq9b+XmZt2pH0lgzACedxEpeSDBM2llq4YuB7lZimzz1iAj4R w9lMJmoxfsJG6mQOjUveiHVaq0FduhX99tfKPwU3D/MUxNfJhxEdKzijGm6+N0plJ0t6Ue bUHUENxKh5iNr61gMiJWV+TFoitVm1MQUW/C90GPefbPbkkX/HrgBG/gnZ6boHI0iY0Z/o Ga+BQwfndR6xgYqtOEtiXVCxZG+juORNmIV4cjm/RZGB+A/IfdAFWE6O193JlHgL0NEf3N 7mgMOMxJvbtSypRXqgkT4/YGpN52xI+pD8EuX1qeA6ETIwUIrYXFhDKFQxwH3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eVug8VjUghuG4OSzZo9ueCfVyw4L7kYnTI72HaTJYjc=; b=lJhlq1lEeLmH9c4plApzOUJptdUcFuUlH2gOnPp4aT+/gkstpk5UAE+FePvGW6DyMdtIVu X3gwfL8LMhN7BkdziYnotcQZGmVmlkwjq7v4+zyxV1xMMKaxpVj+ixOk8kXNAa/JYW4hdS PjlZI5y5ehbt1yFFaok78hPQNv5jSlhaYyjbGRlARAyZuGXrBs5H2lVG/gkT2bTPahDZAj Rr6P3HB2N4rHT1+JENrmVvFrWd4N7JxkJlZxQAkmkYvcieXu++23kAN1qcgeD/5ExJe4Yn ctmRlv/RHzcVLH4C9ZpphLJqAEJyD627AkVYEyVVnj6E/ZcvtTo2p2sLUgWhSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746905591; a=rsa-sha256; cv=none; b=BVd5CT4YtKnWRGrq/9QOYbEgsvy/wYNKnp/1w8QVzFuD0vtAL7HVqay/NBRYzpp4NUI6Zd wtkqKPeIB3Gad6g1o0Z3Uec7hKosmJ3wXfYQNG3DklSm9gepwZwQgYxx0BUV6g+wYwDRyq N+paVU9Oo94Y8Zxy2GjNA4edRB6A4kypUK3OUuCu7ND0+8+LWYuGC5ILPGMKtzqGmzcPwr GqrVzyTghN0m1zqtGKILO8oY1FBUE8nWmiWXVF9Hb8kMSiqFI7Yv9iq6js3679q8gborDZ n2Ff6fDNitkztUzhgziAdZiwIzP7KANPZYo5QR6HTJcOJZNVsoKRqpAQ4Zmryw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZvwyH2yctz10K5; Sat, 10 May 2025 19:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54AJXBTZ055033; Sat, 10 May 2025 19:33:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54AJXBUv055030; Sat, 10 May 2025 19:33:11 GMT (envelope-from git) Date: Sat, 10 May 2025 19:33:11 GMT Message-Id: <202505101933.54AJXBUv055030@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: eccd076e8e71 - stable/14 - sys/elf_common.h: add the DF_1_INITFIRST flag definition List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: eccd076e8e7131f4e19b260d8281b778a07dfbfb Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=eccd076e8e7131f4e19b260d8281b778a07dfbfb commit eccd076e8e7131f4e19b260d8281b778a07dfbfb Author: Konstantin Belousov AuthorDate: 2025-05-03 10:49:45 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-10 18:57:46 +0000 sys/elf_common.h: add the DF_1_INITFIRST flag definition (cherry picked from commit 31a24831802389f52f3ebb7fdf670ee0e4dd608e) --- sys/sys/elf_common.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h index 2f132e43efac..0b5a91019c70 100644 --- a/sys/sys/elf_common.h +++ b/sys/sys/elf_common.h @@ -770,6 +770,7 @@ typedef struct { #define DF_1_GLOBAL 0x00000002 /* Set the RTLD_GLOBAL for object */ #define DF_1_NODELETE 0x00000008 /* Set the RTLD_NODELETE for object */ #define DF_1_LOADFLTR 0x00000010 /* Immediate loading of filtees */ +#define DF_1_INITFIRST 0x00000020 /* Initialize DSO first at runtime */ #define DF_1_NOOPEN 0x00000040 /* Do not allow loading on dlopen() */ #define DF_1_ORIGIN 0x00000080 /* Process $ORIGIN */ #define DF_1_INTERPOSE 0x00000400 /* Interpose all objects but main */ From nobody Sat May 10 19:33:12 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZvwyJ4wnGz5vkf7; Sat, 10 May 2025 19:33:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZvwyJ49Zsz3TFs; Sat, 10 May 2025 19:33:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SYEN39I+BrJj+6w7UQMm+Le97JmAItPUO2iY9eQ2Gg0=; b=uLGnXiafMqMaUJN/dz0I5wXtWbcCPM+l9IwGeoZDLMc2wnt+vWtNW5iiptS3iima8htsaw Q7EkRRAtuGPWdFoeOM4Nuh7fDB2X8EV/ZtwDwl5lctxrb9f47BNzGX86ioM5/oiFGA8MHt JdkEkPQPhoXEX7mNssN95C4fFP/8b+PAeKYRZSqeh7I1YpSL2r30Cd9/EiaLIpTB4Lh5iB l2HSwobxSJPeZZO6Kvk2MkWCdWvu5pLq2ycWXD6m9FLfrjH+c5aeXuqJitSIQ45HLC8NqV xGkrJu62ZB1Kog8rpYl/oMluiUh2tLTEVjLr0iG1aebnpMWuBETgPl8DJmV0Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SYEN39I+BrJj+6w7UQMm+Le97JmAItPUO2iY9eQ2Gg0=; b=seaNOv8trISNpD/vUcazi/FMY+cgjL/+ANKD82LvgQ5yzOdgpGuvzuSpeXCNKiYuiZ8u2f 9i6oKMY7/poVoNL1xQeBd+4rjQTv5iE/ga6iwgPuYtYpGJKD1qm7MIgsRJYEVTfQp4T84N Q7jizWYj4eIWKMimeRRKPlshxZa92L2XVNeV9SZ78RO8u+LrOknRB/CG2z+cbEioD0qqGV xfJF5Jsr2XwyT0HAB1poUUJxbbRNl7VPnGS1qCs0rqxOadjW92kJGR9wh0O12h83CZKk73 U8E0h0OeWGGHYt3DI2A8OJzAMb/CrbRDGWU5xfcdiYQ8pvgk7MekxTeC9LtXDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746905592; a=rsa-sha256; cv=none; b=aEuURR6c6snFYETIfzybcj8hKwYjrzuB2A4vdXqaztG8rRRvMP+THvOzpg/nwK2e1EK5zj Eb0p1J7mE90mcFmWCtolITbxDn+mPBJx+6ATsxjZiz4TqAzl6d8rw2k839faFlCNUKAW3p MPY5Em5ws4y6zL0rPSx5olHmAa1BsTpSNDdiKy6lWjCT3yecy3hQeqfwa4pw4lqnKIRu9H jwgq0+a+vGtD7dkwJ7batunmDBsXSoSkdYGBFYAFmk/2n6eAz7mixbB3TEl69Z1Gx5wHgq F8TTBhmwmruQe21k1bYCQESqc9GfMW2a5m2kXbYZHjTetVl86HsmjwIJobyQaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZvwyJ3cLdzytq; Sat, 10 May 2025 19:33:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54AJXCfo055065; Sat, 10 May 2025 19:33:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54AJXCmQ055062; Sat, 10 May 2025 19:33:12 GMT (envelope-from git) Date: Sat, 10 May 2025 19:33:12 GMT Message-Id: <202505101933.54AJXCmQ055062@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: f31acb9d5cb2 - stable/14 - rtld: add support for -z initfirst List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f31acb9d5cb25678cb497cb28bc466442b99239f Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f31acb9d5cb25678cb497cb28bc466442b99239f commit f31acb9d5cb25678cb497cb28bc466442b99239f Author: Konstantin Belousov AuthorDate: 2025-05-03 08:14:25 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-10 18:57:46 +0000 rtld: add support for -z initfirst (cherry picked from commit 78aaab9f1cf359f3b7325e4369653f6b50593393) --- libexec/rtld-elf/rtld.c | 138 +++++++++++++++++++++++++++++++++++------------- libexec/rtld-elf/rtld.h | 1 + 2 files changed, 103 insertions(+), 36 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index ba8e2aea6e7c..8a3129093e8c 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -114,8 +114,11 @@ static void init_dag(Obj_Entry *); static void init_marker(Obj_Entry *); static void init_pagesizes(Elf_Auxinfo **aux_info); static void init_rtld(caddr_t, Elf_Auxinfo **); -static void initlist_add_neededs(Needed_Entry *, Objlist *); -static void initlist_add_objects(Obj_Entry *, Obj_Entry *, Objlist *); +static void initlist_add_neededs(Needed_Entry *, Objlist *, Objlist *); +static void initlist_add_objects(Obj_Entry *, Obj_Entry *, Objlist *, + Objlist *); +static void initlist_for_loaded_obj(Obj_Entry *obj, Obj_Entry *tail, + Objlist *list); static int initlist_objects_ifunc(Objlist *, bool, int, RtldLockState *); static void linkmap_add(Obj_Entry *); static void linkmap_delete(Obj_Entry *); @@ -932,8 +935,8 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp) /* Make a list of init functions to call. */ objlist_init(&initlist); - initlist_add_objects(globallist_curr(TAILQ_FIRST(&obj_list)), - preload_tail, &initlist); + initlist_for_loaded_obj(globallist_curr(TAILQ_FIRST(&obj_list)), + preload_tail, &initlist); r_debug_state(NULL, &obj_main->linkmap); /* say hello to gdb! */ @@ -1510,6 +1513,8 @@ digest_dynamic1(Obj_Entry *obj, int early, const Elf_Dyn **dyn_rpath, obj->bind_now = true; if (dynp->d_un.d_val & DF_STATIC_TLS) obj->static_tls = true; + if (dynp->d_un.d_val & DF_1_INITFIRST) + obj->z_initfirst = true; break; #ifdef __powerpc__ @@ -2518,15 +2523,15 @@ psa_filled: * when this function is called. */ static void -initlist_add_neededs(Needed_Entry *needed, Objlist *list) +initlist_add_neededs(Needed_Entry *needed, Objlist *list, Objlist *iflist) { /* Recursively process the successor needed objects. */ if (needed->next != NULL) - initlist_add_neededs(needed->next, list); + initlist_add_neededs(needed->next, list, iflist); /* Process the current needed object. */ if (needed->obj != NULL) - initlist_add_objects(needed->obj, needed->obj, list); + initlist_add_objects(needed->obj, needed->obj, list, iflist); } /* @@ -2539,36 +2544,97 @@ initlist_add_neededs(Needed_Entry *needed, Objlist *list) * held when this function is called. */ static void -initlist_add_objects(Obj_Entry *obj, Obj_Entry *tail, Objlist *list) +initlist_for_loaded_obj(Obj_Entry *obj, Obj_Entry *tail, Objlist *list) { - Obj_Entry *nobj; + Objlist iflist; /* initfirst objs and their needed */ + Objlist_Entry *tmp; - if (obj->init_scanned || obj->init_done) - return; - obj->init_scanned = true; - - /* Recursively process the successor objects. */ - nobj = globallist_next(obj); - if (nobj != NULL && obj != tail) - initlist_add_objects(nobj, tail, list); - - /* Recursively process the needed objects. */ - if (obj->needed != NULL) - initlist_add_neededs(obj->needed, list); - if (obj->needed_filtees != NULL) - initlist_add_neededs(obj->needed_filtees, list); - if (obj->needed_aux_filtees != NULL) - initlist_add_neededs(obj->needed_aux_filtees, list); - - /* Add the object to the init list. */ - objlist_push_tail(list, obj); - - /* Add the object to the global fini list in the reverse order. */ - if ((obj->fini != (Elf_Addr)NULL || obj->fini_array != (Elf_Addr)NULL) - && !obj->on_fini_list) { - objlist_push_head(&list_fini, obj); - obj->on_fini_list = true; - } + objlist_init(&iflist); + initlist_add_objects(obj, tail, list, &iflist); + + STAILQ_FOREACH(tmp, &iflist, link) { + Obj_Entry *tobj = tmp->obj; + + if ((tobj->fini != (Elf_Addr)NULL || + tobj->fini_array != (Elf_Addr)NULL) && + !tobj->on_fini_list) { + objlist_push_tail(&list_fini, tobj); + tobj->on_fini_list = true; + } + } + + /* + * This might result in the same object appearing more + * than once on the init list. objlist_call_init() + * uses obj->init_scanned to avoid dup calls. + */ + STAILQ_REVERSE(&iflist, Struct_Objlist_Entry, link); + STAILQ_FOREACH(tmp, &iflist, link) + objlist_push_head(list, tmp->obj); + + objlist_clear(&iflist); +} + +static void +initlist_add_objects(Obj_Entry *obj, Obj_Entry *tail, Objlist *list, + Objlist *iflist) +{ + Obj_Entry *nobj; + + if (obj->init_done) + return; + + if (obj->z_initfirst || list == NULL) { + /* + * Ignore obj->init_scanned. The object might indeed + * already be on the init list, but due to being + * needed by an initfirst object, we must put it at + * the head of the init list. obj->init_done protects + * against double-initialization. + */ + if (obj->needed != NULL) + initlist_add_neededs(obj->needed, NULL, iflist); + if (obj->needed_filtees != NULL) + initlist_add_neededs(obj->needed_filtees, NULL, + iflist); + if (obj->needed_aux_filtees != NULL) + initlist_add_neededs(obj->needed_aux_filtees, + NULL, iflist); + objlist_push_tail(iflist, obj); + } else { + if (obj->init_scanned) + return; + obj->init_scanned = true; + + /* Recursively process the successor objects. */ + nobj = globallist_next(obj); + if (nobj != NULL && obj != tail) + initlist_add_objects(nobj, tail, list, iflist); + + /* Recursively process the needed objects. */ + if (obj->needed != NULL) + initlist_add_neededs(obj->needed, list, iflist); + if (obj->needed_filtees != NULL) + initlist_add_neededs(obj->needed_filtees, list, + iflist); + if (obj->needed_aux_filtees != NULL) + initlist_add_neededs(obj->needed_aux_filtees, list, + iflist); + + /* Add the object to the init list. */ + objlist_push_tail(list, obj); + + /* + * Add the object to the global fini list in the + * reverse order. + */ + if ((obj->fini != (Elf_Addr)NULL || + obj->fini_array != (Elf_Addr)NULL) && + !obj->on_fini_list) { + objlist_push_head(&list_fini, obj); + obj->on_fini_list = true; + } + } } static void @@ -3824,7 +3890,7 @@ dlopen_object(const char *name, int fd, Obj_Entry *refobj, int lo_flags, */ } else { /* Make list of init functions to call. */ - initlist_add_objects(obj, obj, &initlist); + initlist_for_loaded_obj(obj, obj, &initlist); } /* * Process all no_delete or global objects here, given diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h index 97187b24ce84..8d0b8bfed2ab 100644 --- a/libexec/rtld-elf/rtld.h +++ b/libexec/rtld-elf/rtld.h @@ -256,6 +256,7 @@ typedef struct Struct_Obj_Entry { bool z_nodeflib : 1; /* Don't search default library path */ bool z_global : 1; /* Make the object global */ bool z_pie : 1; /* Object proclaimed itself PIE executable */ + bool z_initfirst : 1; /* Proceed initializers before other objects */ bool static_tls : 1; /* Needs static TLS allocation */ bool static_tls_copied : 1; /* Needs static TLS copying */ bool ref_nodel : 1; /* Refcount increased to prevent dlclose */ From nobody Sat May 10 19:33:13 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZvwyK6YWFz5vkfC; Sat, 10 May 2025 19:33:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZvwyK5FKkz3T28; Sat, 10 May 2025 19:33:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ahMf6keYsZkFsQTl/AhHdGu0YfBDqyNZQex5XBvI1KU=; b=C96BMSlUZpruTRtVA/sBvI5zd1eYO4h8bL+pEpxuvUIdlR5A3ZDUjzRkxNOCYjL+udUpbV NZMGUVjRTtpU8rV1I2xTMG182y/BBEmgkNxzzy5FjtIHd9C7RTW1TbMM8fBLRzLNbqKLbR TFvqgQMB+IxUWtQo6nMFcU4TS+Hpr095SbQw3I8C7bGKmBTavcbn5daiPB/s9VVcjFUENy LAcCji2UJVDdh+4sPryTSI6kgK+8qezewgEUqOQkmaXMmF/uhi3p530qYwsOvXXvyD0xMl hq5OPXIG6CnHsc1O7gO4SbwMwCi8qRS/bb2LNTDmiqp+ArlGRtSzQu91765oGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ahMf6keYsZkFsQTl/AhHdGu0YfBDqyNZQex5XBvI1KU=; b=RRnjb+lHCNELccebZarUaQFzhKj34uV5l2rq5nzuVyEOE2PJavx5AsEDpmopK19KULTZl/ NvQACCrZl/AEkVL63NOUSyHKIPC4QjbeBV+yGajai98gOndJX5uJaFIU6sWqsfBHw938lN dg8SNp+0u7cCj5evozkz8jXeYzlWBrNp6BqxEGpziARGCn5ZR0IZifxjUQdvFQV/jRLoXn tiynnQWxcN+ZJlp78wbDLpPunr24OTUYEUH+L2p8aXDgFT90+oDsOzqOqJr1ylm9l7hjzi HJ2W57OCl/7NIXfnKPyMvayeOOrl8NU1hDHTP1CF4nTKhI5DaxlJ0HNl2j2r5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746905593; a=rsa-sha256; cv=none; b=A1WbSxY9sLeeMbUDFeHepK6wktIGRrlo6roD5derl/Jy+AdOK2TzCrAXvaNG6W66+ljmNi AluOx/q8Ufh97YCcJ6ADKXhWD4+AQR+IqK/n6NibaItRI5ukRKSfZXJT1ZhtgSMDjfBmgR /ISHet3Fy3Jsjibwa65AVMli6BT8qhhC+4aMZsnyuUA/Bvfej/0X7PXBcFquBFHt2U3+y4 +n8PKgjZvcxJe0WdAH1g7F8o+iLULfNjIotwqmiK6rIrZl2tERG1B0t61oYlV4KVQXwKzJ qEjYEP9jVOKp+Fl+Zuuq/sOYRuom9jYADhu2n/m794gUpH9z+UpexuswccmhZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZvwyK4Zk0zyfl; Sat, 10 May 2025 19:33:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54AJXD8X055097; Sat, 10 May 2025 19:33:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54AJXD14055094; Sat, 10 May 2025 19:33:13 GMT (envelope-from git) Date: Sat, 10 May 2025 19:33:13 GMT Message-Id: <202505101933.54AJXD14055094@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: eb8cf785e441 - stable/14 - libthr.so: mark as -z initfirst List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: eb8cf785e4416fd74fe082218328453d1913a812 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=eb8cf785e4416fd74fe082218328453d1913a812 commit eb8cf785e4416fd74fe082218328453d1913a812 Author: Konstantin Belousov AuthorDate: 2025-05-03 08:15:36 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-10 18:57:46 +0000 libthr.so: mark as -z initfirst PR: 286537 (cherry picked from commit 7c6a5272f1ded20e91b63fe3d1a016243641a37d) --- lib/libthr/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile index 2f20934bb351..612ebf3c28ec 100644 --- a/lib/libthr/Makefile +++ b/lib/libthr/Makefile @@ -39,6 +39,7 @@ CFLAGS+=-D_PTHREAD_FORCED_UNWIND .endif LDFLAGS+=-Wl,-znodelete +LDFLAGS+=-Wl,-zinitfirst VERSION_DEF=${SRCTOP}/lib/libc/Versions.def SYMBOL_MAPS=${.CURDIR}/pthread.map From nobody Sat May 10 19:33:14 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZvwyM1Snjz5vkkl; Sat, 10 May 2025 19:33:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZvwyL62Gmz3TGh; Sat, 10 May 2025 19:33:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eWTYKLW5dnKiJR/ey4fhk4Y4zU7RzrBCDcWFSIKgzr8=; b=Zs8RwzIkQFPlLkcRhhgox2B+68yHbQ+P8xCypHulJwOkXaQOT6h/PcttDI5WQtj53CjyIZ wKGS3mnZxHWK4DafYlUaa9w6ve5Syo5Oof31h+kk69OIgjnUVyLdXP3PXFRbDDrDXVywe0 RY/D9QDmZWvMi2eFAd02l4rivYNl4OXy/TRuX4UQJJd7ncyZOZP9Typ213dmQ6b8towoys gPdIuxdydaHpDSIvJ/4My3C3CQkVg8afmmxNRq2rn9+Bj8hNuJUST5qGwqfZfN/DNNI5gz B5P7QAljGlKP5L+i1ASB0g2ti381zSiVCTgEOrVAQpKsU6RQ4wKMc+Rs/ZABgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eWTYKLW5dnKiJR/ey4fhk4Y4zU7RzrBCDcWFSIKgzr8=; b=YgFD74gT7LKCPIHeV1+HZu1X5jO99uDuT7pWBmk38sHKHMCWQFtW7BBoh0vFe2Sm+TO2f9 ZBkPQOA94B9ScNCDJ6+5DUY3wXWFg0TA5a+E8Dr+jQvv/rhE+Q0+tZfmwfuDIMtWUYx2AK kepGHX3MtFnU2yLzS+r3HK9gInP1TtitDsrZLCcXn4PaNv4e7Nz+kxwoK0xoFg0a4VjF6U d03ghPpTTUTVhdw65MpLR9vfLnL7E4hXnP/46IpQehWH5lhNcldIioC0cFY+jjnGL6NRlL /1q1UUmd3rdEtfd7qxO1H/QQXpx41JQ6qbga5XSSpKMdGAnoROZV93TwLzQv7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746905594; a=rsa-sha256; cv=none; b=cltz1ldliQgLu38IoBrUY2qcwjMeefuDxAK3HJWaPKTMUzH6VRqnHhRbjK7tnCmZNyEjrr FZaSSFJuZusQ3psPejWvZlWdloAj+bU3TloiJo7lkFsBMFk/IGs+LhKLqsf0+/G88rl4N3 KAQgao89+8JtKzG4RP9WYrCXh5yw+bDXzPtTO49tqF9E812eHYRIWpal526lkrUgerTMWo B6NPQmVTAKHR+/T3wFeppw1OHnJbXhMHo/IZkIpxiIvlxtP3DrvJfVtNyay7Q1rpShTHJs oxB3M7uxBiQmCEpzVuFilH7r1bIboCa+YbQflAWYoJu3f+kwkqQ+R/jOO+X8wQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZvwyL5Dfgzyfm; Sat, 10 May 2025 19:33:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54AJXEA4055131; Sat, 10 May 2025 19:33:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54AJXEEv055128; Sat, 10 May 2025 19:33:14 GMT (envelope-from git) Date: Sat, 10 May 2025 19:33:14 GMT Message-Id: <202505101933.54AJXEEv055128@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6d6fdcbdd87f - stable/14 - rtld: remove stray tabs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6d6fdcbdd87f9f8916b273a1974bbe520289a6a3 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6d6fdcbdd87f9f8916b273a1974bbe520289a6a3 commit 6d6fdcbdd87f9f8916b273a1974bbe520289a6a3 Author: Konstantin Belousov AuthorDate: 2025-05-08 23:56:02 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-10 18:57:46 +0000 rtld: remove stray tabs (cherry picked from commit 33759fc7e823be533d4ab0611950f8264de06ecc) --- libexec/rtld-elf/rtld.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 8a3129093e8c..7120cc176b04 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -2610,7 +2610,7 @@ initlist_add_objects(Obj_Entry *obj, Obj_Entry *tail, Objlist *list, nobj = globallist_next(obj); if (nobj != NULL && obj != tail) initlist_add_objects(nobj, tail, list, iflist); - + /* Recursively process the needed objects. */ if (obj->needed != NULL) initlist_add_neededs(obj->needed, list, iflist); @@ -2620,7 +2620,7 @@ initlist_add_objects(Obj_Entry *obj, Obj_Entry *tail, Objlist *list, if (obj->needed_aux_filtees != NULL) initlist_add_neededs(obj->needed_aux_filtees, list, iflist); - + /* Add the object to the init list. */ objlist_push_tail(list, obj); From nobody Sat May 10 19:33:15 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZvwyN2Dvjz5vkSR; Sat, 10 May 2025 19:33:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZvwyM6rx7z3T2M; Sat, 10 May 2025 19:33:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tmInjCHxV+VqtdrSkF43TNwkuZk4rQyPYx92VjCoAe0=; b=caaOD/6hhA/HEOD04vXVcolfEY0WvdZSmhEUpmTS4nWoVbbtpCzgbG0NJbbAQH6ukU9MFz fjWR/AAVobWKcq0Pqa0bSs1P5N0daOUWd/gi040QujomgJwnTc9EFrVkTAe8Xj26Hpz//d Rza6MzTnHlW4dOO1Iqiu2ykuNoEpE/STvD+B7/GeaW6vH7FSjC5OlNM2PF5ahy+pkfg0ZQ cVm2JFbeLkXoYx+fwLwVa7wXbIBXFki7WCqWn81uoBTSTfbDH1r5CYkuj7MfEI8JP17Ffc s3+Ew0bq1m8znun91W/3nmNgjTvklMD5dZsIE5RzvEay0+MFuVVro7PX/Ku2jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tmInjCHxV+VqtdrSkF43TNwkuZk4rQyPYx92VjCoAe0=; b=oKUgCSPg0M9wOs4+UdWu4Fyx4tzeOjl5XEVTbf+Vnm3Zs8fbrmo1VgCt/kOTG/a7Ot7kum h2xcTiYTendh7UfQnB8Ijo9hHkvou+oeKv33i0skQtwqG07LpthN3Af09cXFdw7s/RUeop 1nlnwFgkk4iB/483WV1aa8Z1/qCgq0qew1xfxJXeWhmohPICXP01oofQ6SI0VfUajWQoGr kTaSrSf+OQUZX1O/ZuYWqBiEfWsKMe0H1Y5HPnDYkSBsCEqQZfenftR+PwZfZdU86CGjv2 jdaknMMEnLtUSPb/B0NZLKCw6rh5I6jItwRDXR4zOI4CcDtsGybZECuvXjrkEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746905596; a=rsa-sha256; cv=none; b=ZdE4bcHRuhWjJCQzMeMhDp7MOJq18fCuX9S23mBK+IEWCrWNTANOR2JIfecrK3jIJtKNXN gxsIu1hKJYo7DK4Ka2Bz4OBISKlJzu457GLO6ev4IGQCuv1VL8w0WGz1BvOZ+Z29emJdGf pd9goY0lD5+Dal1k+/aVfndDK3Y2TI0Do9UcVMNqa7JkpUXJs3uBkJXuoqqrH9E7vvHjXi GAei0KB598iohxCW1tbXFFu2NulvTi7PWt8ozwB3F4T0c8Kl20tmf/m7TlQqj8J3yqE9f4 FhFAI7wa/t9jGfAF79+G7QEn1bIRwjwZ38fiizLlRYU3d291tMJvELoC6yGA1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZvwyM69Mgzytr; Sat, 10 May 2025 19:33:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54AJXFJu055167; Sat, 10 May 2025 19:33:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54AJXF7e055164; Sat, 10 May 2025 19:33:15 GMT (envelope-from git) Date: Sat, 10 May 2025 19:33:15 GMT Message-Id: <202505101933.54AJXF7e055164@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 29b28e380c14 - stable/14 - include/paths.h: add _PATH_NOSHUTDOWN List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 29b28e380c14d4a21ce9457e445f5d98dce5cf74 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=29b28e380c14d4a21ce9457e445f5d98dce5cf74 commit 29b28e380c14d4a21ce9457e445f5d98dce5cf74 Author: Konstantin Belousov AuthorDate: 2025-05-04 13:38:53 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-10 18:57:46 +0000 include/paths.h: add _PATH_NOSHUTDOWN (cherry picked from commit 5ab906195b35609c60e05080f7b82cf64437306e) --- include/paths.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/paths.h b/include/paths.h index 0f930ed5c03d..8fada5489646 100644 --- a/include/paths.h +++ b/include/paths.h @@ -84,6 +84,7 @@ #define _PATH_MOUNT "/sbin/mount" #define _PATH_NEWFS "/sbin/newfs" #define _PATH_NOLOGIN "/var/run/nologin" +#define _PATH_NOSHUTDOWN "/var/run/noshutdown" #define _PATH_RCP "/bin/rcp" #define _PATH_REBOOT "/sbin/reboot" #define _PATH_RLOGIN "/usr/bin/rlogin" From nobody Sat May 10 19:33:16 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZvwyP49mNz5vknD; Sat, 10 May 2025 19:33:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZvwyP0fcDz3TLk; Sat, 10 May 2025 19:33:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9uxg2XzD/lHCzm0Ecj/wRGy+nxdNSn9ce09edfIwOiw=; b=BP2eSeS5keft7EgIlEYpiUoP86tEnimUgi4s9YfK84Doau5aQdnaLRtMVr6G2Zve1501D2 B1DqXGqkf5qVpBmc0E6VVA4oBoGsT+MzFqwdPyZ66ZwWeNO4Uz5Vnv15Pqr23mI6zhmJUl +EoJnPJFTv2v1FUq8dWljTYY9fmjJCuwXD0VpJStWc69Vv+hdE2Uyd5a6UVMHrGBXBnwXQ Xghuto8jtlfTaKM3rJbTFrQitibMPgQQEuEb5DjKQ9goAs0w6TpSOkv7cKF4ESc8LZ2peW kOSaMvkxzATYAvxt0+d2aBs8SwIsv6Ax9T35KzapzMOm6iDzYLLRk3Ciq1uVxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9uxg2XzD/lHCzm0Ecj/wRGy+nxdNSn9ce09edfIwOiw=; b=yiHmnKdprny7IyAjp1wrrpwxMPEJkTQxwpoL2ra7w3Wzpt1Ir4P5X3FmWWi1ZM5eyJ/a0k mQAFDIZjdOwdkD7FRwlOUYKLS17Dg3qx8VtVTTzL4zzbvAd7ZvmLKhUiKqeX3RWWuV+Byn 5Hu0Yl7dG1wKhyu4APqwUn5K1RXFbFSe+bvxi5cazAnDmPPt1b2Ffdf9L9d/e/YPhN3I8Y ekge0Hc8XeADsZ8uaaSCRdekXGE90UlqJk1bk8n1y/1sAQUz3E/F5tEWzKrUB5E5RMl3al tYRgRrG35UVEJMMX/0Ot/U/N7YTLk3F7oVA53p+/sXQ3gIQ0XgBu9CNrczmfqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746905597; a=rsa-sha256; cv=none; b=d0ywf4YMoLRElap1KStZwCpxOVIihGwZq5gCpALKRTMWXpP9e0xoorRg9elHF5hpe81ZWn W20y+uCzizH0ZKVQXGjPvSTaxJEO6o88AnjM0Fpq7MyXqFmJMl8azfXvn6y3n7Wcw7XqKp NnWuyBzmsvpli7IUNK8uJDgzfsBj9Five1++y7/IzRETNc4zk6jiTIEn4GMFUWF6kdw5LQ KALyDlkKfets0d6u3t5sSxURDw1GMyZCiiZ0tMPAHPFd0VE49HXke8rtEQU4UhZN18wZ8b PKJEbOu0tI+NZjR/6DLXQsgylzIvqfo3EmUf3Ojyi7ZuSNrReYL7FBXphp3FLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZvwyP02B1z1031; Sat, 10 May 2025 19:33:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54AJXGhg055199; Sat, 10 May 2025 19:33:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54AJXGcM055196; Sat, 10 May 2025 19:33:16 GMT (envelope-from git) Date: Sat, 10 May 2025 19:33:16 GMT Message-Id: <202505101933.54AJXGcM055196@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 16f17042683b - stable/14 - shutdown(8): refuse to run if /var/run/noshutdown is present List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 16f17042683bca6ae46d668bcc30e416f88cc42a Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=16f17042683bca6ae46d668bcc30e416f88cc42a commit 16f17042683bca6ae46d668bcc30e416f88cc42a Author: Konstantin Belousov AuthorDate: 2025-05-04 13:39:32 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-10 18:57:46 +0000 shutdown(8): refuse to run if /var/run/noshutdown is present (cherry picked from commit 7fb88c20eccc3fd2118fda2ba58d7afe2b87f7e3) --- sbin/shutdown/shutdown.8 | 23 +++++++++++++++++++++-- sbin/shutdown/shutdown.c | 18 +++++++++++++++--- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/sbin/shutdown/shutdown.8 b/sbin/shutdown/shutdown.8 index 7f60f22cc0e3..1b8b61df977e 100644 --- a/sbin/shutdown/shutdown.8 +++ b/sbin/shutdown/shutdown.8 @@ -38,7 +38,7 @@ .Nm .Op Fl .Oo -.Fl c | Fl h | Fl p | +.Fl c | Fl f | Fl h | Fl p | .Fl r | Fl k .Oc .Oo @@ -72,6 +72,12 @@ At the present time, only systems with BMC supported by the driver that implement this functionality support this flag. The amount of time the system is off is dependent on the device that implements this feature. +.It Fl f +The +.Nm +command ignores the presence of the +.Pa /var/run/noshutdown +file. .It Fl h The system is halted at the specified .Ar time . @@ -201,6 +207,12 @@ file that .Nm created will be removed automatically. .Pp +If the +.Pa /var/run/noshutdown +file is present, +.Nm +exits without executing any action on the system. +.Pp When run without options, the .Nm utility will place the system into single user mode at the @@ -214,11 +226,18 @@ is equivalent to running: shutdown -p now .Ed .Sh FILES -.Bl -tag -width /var/run/nologin -compact +.Bl -tag -width /var/run/noshutdown -compact .It Pa /var/run/nologin tells .Xr login 1 not to let anyone log in +.It Pa /var/run/noshutdown +prevents +.Nm +from initiating an action on the system. +Can be overridden with the +.Fl f +option. .El .Sh EXAMPLES Reboot the system in 30 minutes and display a warning message on the terminals diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c index 3864e44025eb..624f17cb366e 100644 --- a/sbin/shutdown/shutdown.c +++ b/sbin/shutdown/shutdown.c @@ -44,6 +44,7 @@ static char sccsid[] = "@(#)shutdown.c 8.4 (Berkeley) 4/28/95"; #include #include #include +#include #include #include @@ -90,7 +91,8 @@ static struct interval { #undef S static time_t offset, shuttime; -static int docycle, dohalt, dopower, doreboot, killflg, mbuflen, oflag; +static int docycle, dohalt, dopower, doreboot, ign_noshutdown, + killflg, mbuflen, oflag; static char mbuf[BUFSIZ]; static const char *nosync, *whom; @@ -111,6 +113,7 @@ main(int argc, char **argv) { char *p, *endp; struct passwd *pw; + struct stat st; int arglen, ch, len, readstdin; #ifndef DEBUG @@ -142,7 +145,7 @@ main(int argc, char **argv) goto poweroff; } - while ((ch = getopt(argc, argv, "-chknopr")) != -1) + while ((ch = getopt(argc, argv, "-cfhknopr")) != -1) switch (ch) { case '-': readstdin = 1; @@ -150,6 +153,9 @@ main(int argc, char **argv) case 'c': docycle = 1; break; + case 'f': + ign_noshutdown = 1; + break; case 'h': dohalt = 1; break; @@ -220,6 +226,12 @@ poweroff: } mbuflen = strlen(mbuf); + if (!ign_noshutdown && stat(_PATH_NOSHUTDOWN, &st) == 0) { + (void)printf("Shutdown cannot be done, " _PATH_NOSHUTDOWN + " is present\n"); + exit(2); + } + if (offset) { BOOTTRACE("Shutdown at %s", ctime(&shuttime)); (void)printf("Shutdown at %.24s.\n", ctime(&shuttime)); @@ -596,7 +608,7 @@ usage(const char *cp) if (cp != NULL) warnx("%s", cp); (void)fprintf(stderr, - "usage: shutdown [-] [-c | -h | -p | -r | -k] [-o [-n]] time [warning-message ...]\n" + "usage: shutdown [-] [-c | -f | -h | -p | -r | -k] [-o [-n]] time [warning-message ...]\n" " poweroff\n"); exit(1); } From nobody Sat May 10 19:33:17 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZvwyQ4Ddxz5vkkx; Sat, 10 May 2025 19:33:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZvwyQ19THz3TNb; Sat, 10 May 2025 19:33:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xXk3TcDV1RcsqWfUJXfkIAIhQIjpkMvpVddfRXQKIWs=; b=HtIKAwygEI8ySkUMOT8NqrQFfHd8ysSuUDOuB+PjOzikL5a3OPt7+e2z/Yu3rO3Rdq52W/ DqH/E2eRI3FYe2KS++9HE+BRI31N0wxhBqvs0a7482ygsRYaF49E4xMM3pMRldB7OZKRAM u2CE9PAogmcSR1V52JOi0yQlwnk41Ykdw+xJmNiL/ovxs0L/LnbPalYng4661TgPD80J0K ukcnNdKY3bRnjyr32Pt+jhlTGRUQxPEwkjTLw25OZ5bci2mM7+fWftS+yU2X2V2a+FoudW hA+kunybU975xnsFf2G3oo6zIexzFLUn3orYENWblU4yEIQK80c88qll5pbvLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xXk3TcDV1RcsqWfUJXfkIAIhQIjpkMvpVddfRXQKIWs=; b=LRjYWg6pJSQf9RvqBuxM23oLkx5JGg72eoEwV7fJ8f5K1GsZxAuBgGt7BvTnQZb0WnJJ9S Zhg3jexdLi30o7unee1k7+CopiAKdWJ52rgPGQNN8YKsNHjkwmpsiNk+LmZtuCun8klTOF gZDmmAznIA8h5VMOYmMnsxACAMtct5vhEw3sQIAqwX3jjba0xxLKmofSw/VCo78KEnrQI4 mVSvoEH/ZWuqNeM8q7Y96X6GYTbAY3+bdTyhCzfkQBkWtRxHWYMfMcOFQaR1rzBrGg/xBJ QRbrxTz4yg13V4Vs52kfs1zFcoFSSBahZ44de6K4dLhztOdpmN+GOed/brsDQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746905598; a=rsa-sha256; cv=none; b=nQriTM2hmSq5ZbY/lvu05PVY7bq6GR52vZFJnjLNA5oQxRmUiwAjyOzEUu9Ny9CHZw2ELN W4F0AU2+LaE0TpPu593t1Wtf04KVh6TjKV1a3ayfHq6lBD3BvY2nX7BDj5nBfm6DPLsiNa U+Fb2E+HhTZTsiiZWoldbdnXqasHTaduLgxhB+WBGEmvOz+KFhn67DkjqYEDV0xtSPS32g xxHZDnClLZJh8ynKOcPual8B2YfHKhWpbwEla8G5f7/OMn7jFIm0trXlW2yE4nU1pMyxoR A36Ch7tUrtVTMkIP//e2W2RXiN7vb/TnXNncegW42+2lgQFc26AmdymGy+foug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZvwyQ0lHSzyqv; Sat, 10 May 2025 19:33:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54AJXIA5055232; Sat, 10 May 2025 19:33:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54AJXHRd055228; Sat, 10 May 2025 19:33:17 GMT (envelope-from git) Date: Sat, 10 May 2025 19:33:17 GMT Message-Id: <202505101933.54AJXHRd055228@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 8cb3670fb90e - stable/14 - rc.d: Add precious_machine rc.conf knob to create /var/run/noshutdown List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8cb3670fb90ebe14ea609cd576f5dc235814f8b1 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8cb3670fb90ebe14ea609cd576f5dc235814f8b1 commit 8cb3670fb90ebe14ea609cd576f5dc235814f8b1 Author: Konstantin Belousov AuthorDate: 2025-05-04 13:51:26 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-10 18:57:46 +0000 rc.d: Add precious_machine rc.conf knob to create /var/run/noshutdown (cherry picked from commit 384d976725a5c29734a9227fcdb6ef0807485c91) --- libexec/rc/rc.conf | 2 ++ libexec/rc/rc.d/Makefile | 1 + libexec/rc/rc.d/noshutdown | 31 +++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index 3f8b0ae7b42f..b3c54c3cb0f0 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -29,6 +29,8 @@ rc_info="NO" # Enables display of informational messages at boot. rc_startmsgs="YES" # Show "Starting foo:" messages at boot rcshutdown_timeout="90" # Seconds to wait before terminating rc.shutdown +precious_machine="NO" # Set to YES to get some guards against mis-directed + # shutdown(8) commands early_late_divider="FILESYSTEMS" # Script that separates early/late # stages of the boot process. Make sure you know # the ramifications if you change this. diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index 320408d5d62c..e218ecf516d1 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -67,6 +67,7 @@ CONFS= DAEMON \ nfsd \ nfsuserd \ nisdomain \ + noshutdown \ ${_nscd} \ ntpdate \ ${_opensm} \ diff --git a/libexec/rc/rc.d/noshutdown b/libexec/rc/rc.d/noshutdown new file mode 100755 index 000000000000..54924310a6c7 --- /dev/null +++ b/libexec/rc/rc.d/noshutdown @@ -0,0 +1,31 @@ +#!/bin/sh +# +# + +# PROVIDE: noshutdown +# REQUIRE: var +# BEFORE: LOGIN + +. /etc/rc.subr + +name="noshutdown" +desc="Disable shutdown(8) for precious machines" +rcvar="precious_machine" +start_cmd="noshutdown_start" +stop_cmd="noshutdown_stop" + +: ${noshutdown_file:="/var/run/noshutdown"} + +noshutdown_start() +{ + touch $noshutdown_file +} + +noshutdown_stop() +{ + rm -f $noshutdown_file +} + +load_rc_config $name + +run_rc_command "$1" From nobody Sat May 10 19:33:19 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZvwyR5tlwz5vkM9; Sat, 10 May 2025 19:33:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZvwyR1qj0z3TRS; Sat, 10 May 2025 19:33:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dF4IXgujwCE3Q01Ymd8aaB/2qadoqkrPqZoMN0sKNJE=; b=QXk5Us0HBQ3ghhIRjgXiCihNn1AolLUqUnGbsRsjJhs8k4Y0LCfen9nW6E6zZXwtIy0dYf aw0tEMv46p0sOL3A16cRWGsYE2ARpIbnysB8fXpGD/2x3WDgAxHO8YZ4n7brqP7UVJ+LyL w2GRKpjNHdFYoAdHUlx7RhknN3ZdF0T7OGu5Yc8Cqu2IBodGy0OvzbhkxIZ2bELJ4j5DPX f075VM0WJaQuA96bq8A5F+5p93IBTAb3DQ9u44c478cJ4XkW6vtJxbbYdkhXaYItwmgAL4 SU9BggCPnfqVcldHPqXEh5X/v74r3R0GKYcNCM+q7+Art9En19j1gj97hmpENw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dF4IXgujwCE3Q01Ymd8aaB/2qadoqkrPqZoMN0sKNJE=; b=E4kEwQ17SZkSUSKqqEJ0YiJM0UADntnan4iwXbObg/BbicPMVn9lWjGd9RuBUInN1/wi1+ QHsMT9n0VX9TwxtjM+f/jD57jKSihw4RysCVtJJ/FXB2uiFlVTCWXW+64nrqvM4YVFOsVK Jo1ctyurJEDSAE1bBYw0WhDPbpAMDwloufu7KIJVdbO43eGs/df/tXGZgWwMdCvTjPvsc3 G6Eih2H66snPI1+B0FBFAee2oN4Mc99BZzgJyK+Gfzx50owA31QmlLd68ayh4lmsdBLq2/ uGEizSyR9j8jJTAC/Z+z4waBSFjJTqzB3f2DGZSIsbJtGuRCe/fX/5o9baYR5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746905599; a=rsa-sha256; cv=none; b=aL252/Z6HF3R4OwqhxkIE2zK/8R6Oybl4TcqrNsGPRpjN9eM6UVIH78ZCc0mkfLkozzkoh ByrBnckLK/Ev2hNuKEkhW2t2jj0pzQyM3CDbH/R3FFnFbN8zi9sMpPK1uKfCakryky64tU QfDKUHETIm1I7GrO9Id2muQeQoKvXAMnQBgsAzIf0hJZ1nckq0L5fe+z4P945hDFXWjDUi OSrdUP+cdzP6vgGdOIo5UT06WHA2IcHjJT6vQiz77LbG4mH9UsQWTIo5jyeQL4YdlBmeJV 08bvKR/KsBf9YYyGpdy84FHJ3wK6ttpF1KvCaM74lx49R0KooHWMxv+ccJVQKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZvwyR1FfCzyfn; Sat, 10 May 2025 19:33:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54AJXJJF055268; Sat, 10 May 2025 19:33:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54AJXJWl055265; Sat, 10 May 2025 19:33:19 GMT (envelope-from git) Date: Sat, 10 May 2025 19:33:19 GMT Message-Id: <202505101933.54AJXJWl055265@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 97312e0b46de - stable/14 - rc.conf.5: document precious_machine List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 97312e0b46dedf1d31617a357b17fc416d5d268b Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=97312e0b46dedf1d31617a357b17fc416d5d268b commit 97312e0b46dedf1d31617a357b17fc416d5d268b Author: Konstantin Belousov AuthorDate: 2025-05-06 17:39:14 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-10 18:57:46 +0000 rc.conf.5: document precious_machine (cherry picked from commit a130a604a4fb0e9a6d767c7c3f0422396d61b2b1) --- share/man/man5/rc.conf.5 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index c3c009c3961e..51e9ff7d9f86 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -4934,6 +4934,16 @@ daemon. .Dq Li YES , these are the flags to pass to the .Xr sendmail 8 +.It Va precious_machine +If set to +.Dq Li YES , +some destructive actions require removal of the action-specific safe-belts +before being allowed. +For instance, the file +.Pa /var/run/noshutdown +is created to prevent +.Xr shutdown 8 +targeted at the wrong machine. .El .Sh FILES .Bl -tag -width "/etc/defaults/rc.conf" -compact From nobody Sun May 11 04:49:46 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zw9JV2zpsz5wKY4; Sun, 11 May 2025 04:49:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zw9JV2H8gz3x5J; Sun, 11 May 2025 04:49:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746938986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1b1dFYZuL0PVQefHxFjyez8RgoXm9Usz+cJHsvv1Dy8=; b=Q6N7stM3yYRilj0KlZX1kJfE2hOvPe92RoP2saiZKnycPWhUQ9bIp7LP7uayRzjUscKQkx E6oTr6jgE6EazwmEiJae+987N3DCmg0Qpc4zTsgVpL4V8ti3BkPUvLvD4gvqqL6Qg9Bq1D 1D46unKhXofmQQAkl8WAA0eBQkb3Z0ZzUf/Cahy5MgdtDeJit/vd3AG39lZXk8U3gCO822 ErrNClCJYYNsMEGRNId3m745FAo/It8LSmv/RaEQGQGa8Q5zXak7YnZEOEouKTNSETa7Mn hmY+RNYCD7ag2+mgqTzXrjDpohRaV8PBM0tInejaFYDUu7nWK+i2vxF/jh44Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746938986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1b1dFYZuL0PVQefHxFjyez8RgoXm9Usz+cJHsvv1Dy8=; b=cO2ZpSjOlm+VDiI8x+c5q0LTSzK/UrfxoRg2dMc3RvdNHgLdREbOO0K/BxmROYogCnuKN6 lkJbFyACSxDvG+iY9vhD8i0yhkDiy0myutTe5kDlwrFPXOgMSkkTn4NY/iC2NrDz1dANdU h7hUkWqTwCzqp9g/TRuf6l3R94DGLPfm4upynhLHQxPXuqioKAswTyG8c71gRm/pO6NuRm RBYjLLR4QBllDYLOTfJyBIOOTCSPMsiQw1F5Gam024x6kZjWL0QgHSJj89ias9uDECF42t iATY71jmkcknJcNWrxc/b2+h2VL7baDGSg+jb7WaIojPEUTMIwZRwUN2V7TXOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746938986; a=rsa-sha256; cv=none; b=JH1q7wMM2IfLaf6kx2dDFf8E/Tl56PTCv1KUqA7Si8r/oJ2NhPAwrB+yihP58b9b4IrEsN zrYjWNAeNHBVz1j4EIjsDbHTJQEYACVo80V0jYN+MBFP2PPx0dd2MJOJke9CiIfNYEtDDD 6Z1bIjmwbTc0kSaIjWMKsItl4b+81SL7KLpxN8X9bUbDJblYJzt8cicPMA5rXMCsD0dk4Q 9WmVxwzfMEusjOS0SixfeLo2jWzRkRNy7uYRkJslGRkNwQngAKiOTkuLfulYcdHjX9fUqp /R/+2DAIOtCA7CZ5IDfkerwcbFLr7Bjyul0gZRTbx9WZz/jU8xB4Yz+Z8eWEXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zw9JV1tvGz2Gl; Sun, 11 May 2025 04:49:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54B4nkTW083041; Sun, 11 May 2025 04:49:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54B4nkvN083038; Sun, 11 May 2025 04:49:46 GMT (envelope-from git) Date: Sun, 11 May 2025 04:49:46 GMT Message-Id: <202505110449.54B4nkvN083038@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: e39b3eb12d67 - stable/14 - heimdal: Add missing symbols to map List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e39b3eb12d67ad4a14c9d679190b72437972be94 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=e39b3eb12d67ad4a14c9d679190b72437972be94 commit e39b3eb12d67ad4a14c9d679190b72437972be94 Author: Cy Schubert AuthorDate: 2025-03-26 13:43:54 +0000 Commit: Cy Schubert CommitDate: 2025-05-11 04:48:48 +0000 heimdal: Add missing symbols to map Patch supplied by mi@ through a private email. Bump __FreeBSD_version for ports that might need this. PR: 280025 (cherry picked from commit d5c804138845a1c8d81fbbce48de676806de32e6) --- crypto/heimdal/lib/krb5/version-script.map | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/crypto/heimdal/lib/krb5/version-script.map b/crypto/heimdal/lib/krb5/version-script.map index 818e6e071cbd..7e4e8623cbd5 100644 --- a/crypto/heimdal/lib/krb5/version-script.map +++ b/crypto/heimdal/lib/krb5/version-script.map @@ -764,6 +764,28 @@ HEIMDAL_KRB5_2.0 { # kinit helper krb5_get_init_creds_opt_set_pkinit_user_certs; krb5_pk_enterprise_cert; + krb5_auth_con_getrecvsubkey; + krb5_auth_con_getsendsubkey; + krb5_auth_con_setrecvsubkey; + krb5_auth_con_setsendsubkey; + krb5_c_random_make_octets; + krb5_cc_copy_creds; + krb5_cc_get_flags; + krb5_creds_get_ticket_flags; + krb5_get_validated_creds; + krb5_init_creds_free; + krb5_init_creds_get_creds; + krb5_init_creds_get_error; + krb5_init_creds_get; + krb5_init_creds_init; + krb5_init_creds_set_keyblock; + krb5_init_creds_set_keytab; + krb5_init_creds_set_password; + krb5_init_creds_set_service; + krb5_init_creds_step; + krb5_rd_req_out_get_server; + krb5_sockaddr_is_loopback; + krb5_ticket_get_flags; # testing _krb5_aes_cts_encrypt; From nobody Sun May 11 04:49:47 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zw9JX4P1Kz5wKvG; Sun, 11 May 2025 04:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zw9JX1JJqz3xGt; Sun, 11 May 2025 04:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746938988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FInXriXl0r3gruj9DPjXL4b+ZXHfZr+nv0WgO4p6G7Q=; b=EgoaqLvnS5ylhuie4KhPOFZLDyv8W6K2W7t1NJ/w3g6Bs4sI0VORYblJOtG/Z74CMoZSjD HzBZ7w0WUzoex0VdSqBhGG2QpHgXRr5qV5H+e252w+HLOsDQpPMuh3GHeVn3K7VXuCgi/Y caGAH/J08waFfwmFc5CJCDaom3rJQpL/pF3wHrvIOB7asJYMAc3glI6PZmMZ4tStxqkn2m pmWltynok45hsdTbzhS1ZX+T3tvJV+5KzT/RH4gAnRuR/BZU8SID2DOMzvhAPErGv+U0Ua D30SMSMUBnYWRsPDB/h7Urgu1dnDc8hSfiOZE6RhU+KrRao0eVfYm04zt/Jw7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746938988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FInXriXl0r3gruj9DPjXL4b+ZXHfZr+nv0WgO4p6G7Q=; b=wfS6uH8c9Vj0J60dv82hJvf5Q1IlJDxTVCLz/MKxrKYUbwvQ7HHqRnlRTNMgbdGYwasCgz Gzif4gVH3To5pMLLWcFgIFzOULGsJcprHcdKyEtLyApNciM6UVpAwlerOmA27/Xc9DFspa KTmk+DnYF2ashdPf5r1MaWP1Yg+YWZVz3i0OocT4Flc6alayZRDYPi8hKznqghg+tsOzWr LMowvSgggM9uOxN/WdpFKXibxzGOtppUM4BtCkqKSOH6VhD0HleC602rQgqRaTOzjgKvaD +VjpXc+UU/pRWcQ3WdMXcKt+Ihm1vDB70RQZ8iq+2Y0UeyZQSjkDSO+j3Ash7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746938988; a=rsa-sha256; cv=none; b=PaMZw/GjLMtJ2D3UhNC7Io91mlFO79kif7q6T2M160ibqVzBMZnvzSZM2NqUveLUBjdquO rjTZYriLJGZVXwTx4zXXH8zwVk2zNrc37QuqPh2Ays6HpsxPCzkTJmhjlrBVw3swQyyJr3 kHss93alaUwgo9DcBoAfV7E+efztbO5W+adLqbHZmKpKmhG5nlVkPeyhLTlHiGc3Qem1SY y6gNLOSO6/dg79bbF2blhAV97eEYscCJS3AlOydW1BKByzB6S78kuTWG1iwseHsy71GSxr N/Uk1J1X6gqUcHZlTL5xhGEYoBPLtnQSsNsiKFOD0DvvI82j7iaYr1DoIppcHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zw9JX0rsXz2Cq; Sun, 11 May 2025 04:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54B4nmts083074; Sun, 11 May 2025 04:49:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54B4nlYf083071; Sun, 11 May 2025 04:49:47 GMT (envelope-from git) Date: Sun, 11 May 2025 04:49:47 GMT Message-Id: <202505110449.54B4nlYf083071@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 692553df59d9 - stable/14 - unbound: Vendor import 1.23.0 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 692553df59d92558e5b65dc6e3f8b35c88817fa1 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=692553df59d92558e5b65dc6e3f8b35c88817fa1 commit 692553df59d92558e5b65dc6e3f8b35c88817fa1 Author: Cy Schubert AuthorDate: 2025-04-25 14:48:44 +0000 Commit: Cy Schubert CommitDate: 2025-05-11 04:48:48 +0000 unbound: Vendor import 1.23.0 Release notes at https://nlnetlabs.nl/news/2025/Apr/24/unbound-1.23.0-released/ Merge commit '44bab727dfe28451b777dc9e47db4f748b709182' (cherry picked from commit be771a7b7f4580a30d99e41a5bb1b93a385a119d) --- contrib/unbound/Makefile.in | 23 +- contrib/unbound/ax_build_date_epoch.m4 | 70 + contrib/unbound/cachedb/cachedb.c | 5 +- contrib/unbound/cachedb/redis.c | 280 +- contrib/unbound/compat/malloc.c | 4 - contrib/unbound/config.h.in | 6 + contrib/unbound/configure | 122 +- contrib/unbound/configure.ac | 32 +- contrib/unbound/contrib/android/install_expat.sh | 11 +- contrib/unbound/contrib/ios/install_expat.sh | 18 +- contrib/unbound/daemon/acl_list.c | 30 +- contrib/unbound/daemon/acl_list.h | 13 +- contrib/unbound/daemon/cachedump.c | 4 +- contrib/unbound/daemon/daemon.c | 42 +- contrib/unbound/daemon/daemon.h | 35 +- contrib/unbound/daemon/remote.c | 4162 ++++++++++- contrib/unbound/daemon/remote.h | 167 + contrib/unbound/daemon/stats.c | 32 +- contrib/unbound/daemon/unbound.c | 92 +- contrib/unbound/daemon/worker.c | 118 +- contrib/unbound/daemon/worker.h | 8 +- contrib/unbound/dns64/dns64.c | 6 +- contrib/unbound/dnstap/dnstap.c | 28 +- contrib/unbound/dnstap/dnstap.h | 7 + contrib/unbound/dnstap/unbound-dnstap-socket.c | 17 +- contrib/unbound/doc/Changelog | 265 + contrib/unbound/doc/README | 2 +- contrib/unbound/doc/example.conf.in | 54 +- contrib/unbound/doc/libunbound.3.in | 4 +- contrib/unbound/doc/unbound-anchor.8.in | 2 +- contrib/unbound/doc/unbound-checkconf.8.in | 2 +- contrib/unbound/doc/unbound-control.8.in | 169 +- contrib/unbound/doc/unbound-host.1.in | 2 +- contrib/unbound/doc/unbound.8.in | 4 +- contrib/unbound/doc/unbound.conf.5.in | 204 +- contrib/unbound/ipsecmod/ipsecmod.c | 3 +- contrib/unbound/iterator/iter_delegpt.c | 2 +- contrib/unbound/iterator/iter_fwd.c | 52 +- contrib/unbound/iterator/iter_fwd.h | 9 + contrib/unbound/iterator/iter_hints.c | 13 +- contrib/unbound/iterator/iter_hints.h | 9 + contrib/unbound/iterator/iter_utils.c | 153 +- contrib/unbound/iterator/iter_utils.h | 49 +- contrib/unbound/iterator/iterator.c | 81 +- contrib/unbound/iterator/iterator.h | 26 +- contrib/unbound/libunbound/libworker.c | 16 +- contrib/unbound/libunbound/unbound.h | 6 + contrib/unbound/pythonmod/interface.i | 1857 +++++ contrib/unbound/pythonmod/pythonmod_utils.c | 201 + contrib/unbound/respip/respip.c | 74 +- contrib/unbound/respip/respip.h | 33 +- contrib/unbound/services/authzone.c | 278 +- contrib/unbound/services/authzone.h | 40 +- contrib/unbound/services/cache/dns.c | 45 +- contrib/unbound/services/cache/dns.h | 5 +- contrib/unbound/services/cache/infra.c | 170 +- contrib/unbound/services/cache/infra.h | 31 + contrib/unbound/services/listen_dnsport.c | 173 +- contrib/unbound/services/listen_dnsport.h | 25 +- contrib/unbound/services/localzone.c | 50 +- contrib/unbound/services/localzone.h | 14 + contrib/unbound/services/mesh.c | 303 +- contrib/unbound/services/mesh.h | 24 + contrib/unbound/services/outside_network.c | 33 +- contrib/unbound/services/outside_network.h | 6 +- contrib/unbound/services/rpz.c | 43 +- contrib/unbound/services/rpz.h | 7 + contrib/unbound/services/view.c | 41 +- contrib/unbound/services/view.h | 26 +- contrib/unbound/sldns/keyraw.c | 2 + contrib/unbound/sldns/rrdef.c | 10 +- contrib/unbound/sldns/rrdef.h | 6 + contrib/unbound/sldns/str2wire.c | 54 +- contrib/unbound/sldns/str2wire.h | 9 + contrib/unbound/sldns/wire2str.c | 50 +- contrib/unbound/sldns/wire2str.h | 13 + contrib/unbound/smallapp/unbound-checkconf.c | 12 +- .../unbound/smallapp/unbound-control-setup.sh.in | 3 +- contrib/unbound/smallapp/unbound-control.c | 24 +- contrib/unbound/smallapp/worker_cb.c | 14 + contrib/unbound/testcode/checklocks.c | 916 +++ contrib/unbound/testcode/do-tests.sh | 76 + contrib/unbound/testcode/doqclient.c | 2715 +++++++ contrib/unbound/testcode/fake_event.c | 2022 +++++ contrib/unbound/testcode/testbound.c | 668 ++ contrib/unbound/testcode/unitdname.c | 1037 +++ contrib/unbound/testcode/unitinfra.c | 209 + contrib/unbound/testcode/unitldns.c | 284 + contrib/unbound/testcode/unitmain.c | 1377 ++++ contrib/unbound/testcode/unitmain.h | 92 + contrib/unbound/testcode/unitneg.c | 545 ++ contrib/unbound/testcode/unitverify.c | 573 ++ contrib/unbound/testcode/unitzonemd.c | 541 ++ .../09-unbound-control.conf | 31 + .../09-unbound-control.test | 493 ++ .../09-unbound-control.testns | 44 + .../testdata/acl_interface.tdir/acl_interface.conf | 198 + .../acl_interface.tdir/acl_interface.test.scenario | 268 + .../unbound/testdata/auth_tls.tdir/auth_tls.pre | 48 + .../auth_tls_failcert.tdir/auth_tls_failcert.pre | 48 + contrib/unbound/testdata/cachedb_expired.crpl | 325 + .../testdata/cachedb_expired_reply_ttl.crpl | 260 + .../unbound/testdata/cachedb_servfail_cname.crpl | 181 + contrib/unbound/testdata/cachedb_val_expired.crpl | 328 + contrib/unbound/testdata/common.sh | 394 + contrib/unbound/testdata/dns_error_reporting.rpl | 200 + contrib/unbound/testdata/dnstap.tdir/dnstap.conf | 43 + .../testdata/fast_reload_fwd.tdir/auth1.zone | 2 + .../testdata/fast_reload_fwd.tdir/auth2.zone | 2 + .../fast_reload_fwd.tdir/fast_reload_fwd.conf | 107 + .../fast_reload_fwd.tdir/fast_reload_fwd.conf2 | 108 + .../fast_reload_fwd.tdir/fast_reload_fwd.dsc | 16 + .../fast_reload_fwd.tdir/fast_reload_fwd.ns1 | 339 + .../fast_reload_fwd.tdir/fast_reload_fwd.ns2 | 285 + .../fast_reload_fwd.tdir/fast_reload_fwd.post | 27 + .../fast_reload_fwd.tdir/fast_reload_fwd.pre | 56 + .../fast_reload_fwd.tdir/fast_reload_fwd.test | 320 + .../auth.nlnetlabs.nl.zone | 3 + .../fast_reload_most_options.conf | 143 + .../fast_reload_most_options.dsc | 16 + .../fast_reload_most_options.post | 11 + .../fast_reload_most_options.pre | 33 + .../fast_reload_most_options.test | 42 + .../rpz.nlnetlabs.nl.zone | 5 + .../fast_reload_thread.conf | 20 + .../fast_reload_thread.tdir/fast_reload_thread.dsc | 16 + .../fast_reload_thread.post | 11 + .../fast_reload_thread.tdir/fast_reload_thread.pre | 34 + .../fast_reload_thread.test | 38 + contrib/unbound/testdata/fwd_0ttlservfail.rpl | 87 + contrib/unbound/testdata/iter_failreply.rpl | 131 + contrib/unbound/testdata/iter_fwdstubauth.rpl | 155 + contrib/unbound/testdata/iter_scrub_rr_length.rpl | 297 + .../testdata/log_servfail.tdir/log_servfail.conf | 27 + .../testdata/log_servfail.tdir/log_servfail.dsc | 16 + .../testdata/log_servfail.tdir/log_servfail.post | 10 + .../testdata/log_servfail.tdir/log_servfail.pre | 21 + .../testdata/log_servfail.tdir/log_servfail.test | 47 + .../unbound/testdata/redis_replica.tdir/after.zone | 2 + .../testdata/redis_replica.tdir/before.zone | 2 + .../unbound/testdata/redis_replica.tdir/redis.conf | 583 ++ .../testdata/redis_replica.tdir/redis_replica.conf | 31 + .../testdata/redis_replica.tdir/redis_replica.dsc | 16 + .../testdata/redis_replica.tdir/redis_replica.post | 18 + .../testdata/redis_replica.tdir/redis_replica.pre | 46 + .../testdata/redis_replica.tdir/redis_replica.test | 78 + .../redis_replica.tdir/unbound_control.key | 39 + .../redis_replica.tdir/unbound_control.pem | 22 + .../testdata/redis_replica.tdir/unbound_server.key | 39 + .../testdata/redis_replica.tdir/unbound_server.pem | 22 + contrib/unbound/testdata/rpz_nsdname.rpl | 471 ++ contrib/unbound/testdata/rpz_val_block.rpl | 642 ++ contrib/unbound/testdata/serve_expired.rpl | 126 + .../unbound/testdata/serve_expired_0ttl_nodata.rpl | 154 + .../testdata/serve_expired_0ttl_nxdomain.rpl | 154 + .../testdata/serve_expired_0ttl_servfail.rpl | 129 + .../testdata/serve_expired_cached_servfail.rpl | 130 + .../serve_expired_cached_servfail_refresh.rpl | 145 + .../serve_expired_client_timeout_servfail.rpl | 219 + .../serve_expired_client_timeout_val_bogus.rpl | 328 + .../unbound/testdata/serve_expired_reply_ttl.rpl | 106 + contrib/unbound/testdata/serve_expired_ttl.rpl | 101 + .../unbound/testdata/serve_expired_ttl_reset.rpl | 101 + .../unbound/testdata/serve_expired_val_bogus.rpl | 389 + contrib/unbound/testdata/serve_expired_zerottl.rpl | 157 + contrib/unbound/testdata/serve_original_ttl.rpl | 139 + .../testdata/stat_values.tdir/stat_values.conf | 44 + .../testdata/stat_values.tdir/stat_values.pre | 50 + .../testdata/stat_values.tdir/stat_values.test | 680 ++ .../testdata/stat_values.tdir/stat_values.testns | 82 + .../stat_values.tdir/stat_values_cachedb.conf | 30 + .../stat_values_discard_wait_limit.conf | 36 + .../unbound/testdata/subnet_cached_servfail.crpl | 168 + .../subnet_global_prefetch_always_forward.crpl | 168 + .../testdata/subnet_global_prefetch_expired.crpl | 242 + contrib/unbound/testdata/test_ldnsrr.4 | 80 + contrib/unbound/testdata/test_ldnsrr.5 | 178 + contrib/unbound/testdata/test_ldnsrr.c3 | 1068 +++ contrib/unbound/testdata/test_ldnsrr.c4 | 84 + contrib/unbound/testdata/test_ldnsrr.c5 | 220 + contrib/unbound/testdata/val_failure_dnskey.rpl | 347 + contrib/unbound/testdata/val_scrub_rr_length.rpl | 163 + contrib/unbound/util/config_file.c | 169 +- contrib/unbound/util/config_file.h | 74 +- contrib/unbound/util/configlexer.c | 7712 ++++++++++---------- contrib/unbound/util/configlexer.lex | 25 +- contrib/unbound/util/configparser.c | 4659 ++++++------ contrib/unbound/util/configparser.h | 352 +- contrib/unbound/util/configparser.y | 143 +- contrib/unbound/util/data/dname.c | 16 +- contrib/unbound/util/data/dname.h | 5 +- contrib/unbound/util/data/msgreply.c | 18 +- contrib/unbound/util/data/msgreply.h | 4 +- contrib/unbound/util/edns.c | 23 + contrib/unbound/util/edns.h | 16 + contrib/unbound/util/fptr_wlist.c | 3 + contrib/unbound/util/iana_ports.inc | 5 +- contrib/unbound/util/log.c | 2 +- contrib/unbound/util/module.c | 8 +- contrib/unbound/util/module.h | 5 + contrib/unbound/util/net_help.c | 163 +- contrib/unbound/util/net_help.h | 29 +- contrib/unbound/util/netevent.c | 243 +- contrib/unbound/util/netevent.h | 21 +- contrib/unbound/util/shm_side/shm_main.c | 2 +- contrib/unbound/util/storage/dnstree.c | 2 +- contrib/unbound/util/storage/lruhash.c | 30 + contrib/unbound/util/storage/lruhash.h | 10 + contrib/unbound/util/storage/slabhash.c | 9 + contrib/unbound/util/storage/slabhash.h | 7 + contrib/unbound/util/tcp_conn_limit.c | 11 + contrib/unbound/util/tcp_conn_limit.h | 9 + contrib/unbound/util/tube.c | 5 +- contrib/unbound/util/ub_event.c | 61 +- contrib/unbound/validator/autotrust.c | 33 +- contrib/unbound/validator/val_anchor.c | 78 +- contrib/unbound/validator/val_anchor.h | 10 +- contrib/unbound/validator/val_neg.c | 9 + contrib/unbound/validator/val_neg.h | 7 + contrib/unbound/validator/validator.c | 99 +- contrib/unbound/validator/validator.h | 23 + contrib/unbound/winrc/win_svc.c | 660 ++ 222 files changed, 41990 insertions(+), 7275 deletions(-) diff --git a/contrib/unbound/Makefile.in b/contrib/unbound/Makefile.in index c262250ca2c5..463cdac286e1 100644 --- a/contrib/unbound/Makefile.in +++ b/contrib/unbound/Makefile.in @@ -179,11 +179,11 @@ testcode/unitlruhash.c testcode/unitmain.c testcode/unitmsgparse.c \ testcode/unitneg.c testcode/unitregional.c testcode/unitslabhash.c \ testcode/unitverify.c testcode/readhex.c testcode/testpkts.c testcode/unitldns.c \ testcode/unitecs.c testcode/unitauth.c testcode/unitzonemd.c \ -testcode/unittcpreuse.c testcode/unitdoq.c +testcode/unittcpreuse.c testcode/unitdoq.c testcode/unitinfra.c UNITTEST_OBJ=unitanchor.lo unitdname.lo unitlruhash.lo unitmain.lo \ unitmsgparse.lo unitneg.lo unitregional.lo unitslabhash.lo unitverify.lo \ readhex.lo testpkts.lo unitldns.lo unitecs.lo unitauth.lo unitzonemd.lo \ -unittcpreuse.lo unitdoq.lo +unittcpreuse.lo unitdoq.lo unitinfra.lo UNITTEST_OBJ_LINK=$(UNITTEST_OBJ) worker_cb.lo $(COMMON_OBJ) $(SLDNS_OBJ) \ $(COMPAT_OBJ) DAEMON_SRC=daemon/acl_list.c daemon/cachedump.c daemon/daemon.c \ @@ -509,10 +509,15 @@ util/configlexer.c: $(srcdir)/util/configlexer.lex util/configparser.h fi @if test ! -f $@; then echo "No $@ : need flex and bison to compile from source repository"; exit 1; fi -util/configparser.c util/configparser.h: $(srcdir)/util/configparser.y +# Builds both util/configparser.c and util/configparser.h. +# To avoid double-building we split one target out. +util/configparser.c: $(srcdir)/util/configparser.y @-if test ! -d util; then $(INSTALL) -d util; fi $(YACC) -d -o util/configparser.c $(srcdir)/util/configparser.y +util/configparser.h: util/configparser.c + touch $@ + clean: rm -f *.o *.d *.lo *~ tags rm -f unbound$(EXEEXT) unbound-checkconf$(EXEEXT) unbound-host$(EXEEXT) unbound-control$(EXEEXT) unbound-anchor$(EXEEXT) unbound-control-setup libunbound.la unbound.h @@ -876,7 +881,7 @@ view.lo view.o: $(srcdir)/services/view.c config.h $(srcdir)/services/view.h $(s $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h \ $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/data/msgreply.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h + $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h $(srcdir)/respip/respip.h rpz.lo rpz.o: $(srcdir)/services/rpz.c config.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \ $(srcdir)/util/rbtree.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/storage/dnstree.h \ $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/data/msgreply.h \ @@ -972,7 +977,7 @@ fptr_wlist.lo fptr_wlist.o: $(srcdir)/util/fptr_wlist.c config.h $(srcdir)/util/ $(srcdir)/validator/val_nsec3.h $(srcdir)/validator/val_sigcrypt.h $(srcdir)/validator/val_kentry.h \ $(srcdir)/validator/val_neg.h $(srcdir)/validator/autotrust.h $(srcdir)/libunbound/libworker.h \ $(srcdir)/libunbound/context.h $(srcdir)/util/alloc.h $(srcdir)/libunbound/unbound-event.h \ - $(srcdir)/libunbound/worker.h + $(srcdir)/libunbound/worker.h $(srcdir)/daemon/remote.h locks.lo locks.o: $(srcdir)/util/locks.c config.h $(srcdir)/util/locks.h $(srcdir)/util/log.h log.lo log.o: $(srcdir)/util/log.c config.h $(srcdir)/util/log.h $(srcdir)/util/locks.h $(srcdir)/sldns/sbuffer.h mini_event.lo mini_event.o: $(srcdir)/util/mini_event.c config.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h \ @@ -1059,7 +1064,7 @@ tube.lo tube.o: $(srcdir)/util/tube.c config.h $(srcdir)/util/tube.h $(srcdir)/u $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/util/ub_event.h ub_event.lo ub_event.o: $(srcdir)/util/ub_event.c config.h $(srcdir)/util/ub_event.h $(srcdir)/util/log.h \ $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/util/tube.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h + $(srcdir)/util/tube.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h $(srcdir)/daemon/remote.h ub_event_pluggable.lo ub_event_pluggable.o: $(srcdir)/util/ub_event_pluggable.c config.h $(srcdir)/util/ub_event.h \ $(srcdir)/libunbound/unbound-event.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ $(srcdir)/util/log.h $(srcdir)/util/fptr_wlist.h \ @@ -1256,6 +1261,7 @@ unitzonemd.lo unitzonemd.o: $(srcdir)/testcode/unitzonemd.c config.h $(srcdir)/u $(srcdir)/validator/val_anchor.h unittcpreuse.lo unittcpreuse.o: $(srcdir)/testcode/unittcpreuse.c config.h $(srcdir)/services/outside_network.h \ $(srcdir)/util/random.h +unitinfra.lo unitinfra.o: $(srcdir)/testcode/unitinfra.c config.h $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h $(srcdir)/iterator/iterator.h acl_list.lo acl_list.o: $(srcdir)/daemon/acl_list.c config.h $(srcdir)/daemon/acl_list.h \ $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/services/view.h $(srcdir)/util/locks.h \ $(srcdir)/util/log.h $(srcdir)/util/regional.h $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h \ @@ -1307,7 +1313,10 @@ remote.lo remote.o: $(srcdir)/daemon/remote.c config.h $(srcdir)/daemon/remote.h $(srcdir)/validator/val_anchor.h $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h \ $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h $(srcdir)/iterator/iter_delegpt.h \ $(srcdir)/services/outside_network.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/parseutil.h \ - $(srcdir)/sldns/wire2str.h $(srcdir)/util/edns.h + $(srcdir)/sldns/wire2str.h $(srcdir)/util/edns.h \ + $(srcdir)/util/locks.h $(srcdir)/util/ub_event.h \ + $(srcdir)/util/tcp_conn_limit.h $(srcdir)/util/edns.h $(srcdir)/validator/val_neg.h \ + $(srcdir)/iterator/iter_utils.h $(srcdir)/iterator/iter_donotq.h $(srcdir)/iterator/iter_priv.h stats.lo stats.o: $(srcdir)/daemon/stats.c config.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ $(srcdir)/libunbound/unbound.h $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ diff --git a/contrib/unbound/ax_build_date_epoch.m4 b/contrib/unbound/ax_build_date_epoch.m4 new file mode 100644 index 000000000000..dbecb067a8cb --- /dev/null +++ b/contrib/unbound/ax_build_date_epoch.m4 @@ -0,0 +1,70 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_build_date_epoch.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BUILD_DATE_EPOCH(VARIABLE[, FORMAT[, ACTION-IF-FAIL]]) +# +# DESCRIPTION +# +# Sets VARIABLE to a string representing the current time. It is +# formatted according to FORMAT if specified, otherwise it is formatted as +# the number of seconds (excluding leap seconds) since the UNIX epoch (01 +# Jan 1970 00:00:00 UTC). +# +# If the SOURCE_DATE_EPOCH environment variable is set, it uses the value +# of that variable instead of the current time. See +# https://reproducible-builds.org/specs/source-date-epoch). If +# SOURCE_DATE_EPOCH is set but cannot be properly interpreted as a UNIX +# timestamp, then execute ACTION-IF-FAIL if specified, otherwise error. +# +# VARIABLE is AC_SUBST-ed. +# +# LICENSE +# +# Copyright (c) 2016 Eric Bavier +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 2 + +AC_DEFUN([AX_BUILD_DATE_EPOCH], +[dnl +AC_MSG_CHECKING([for build time]) +ax_date_fmt="m4_default($2,%s)" +AS_IF([test x"$SOURCE_DATE_EPOCH" = x], + [$1=`date "+$ax_date_fmt"`], + [ax_build_date=`date -u -d "@$SOURCE_DATE_EPOCH" "+$ax_date_fmt" 2>/dev/null \ + || date -u -r "$SOURCE_DATE_EPOCH" "+$ax_date_fmt" 2>/dev/null` + AS_IF([test x"$ax_build_date" = x], + [m4_ifval([$3], + [$3], + [AC_MSG_ERROR([malformed SOURCE_DATE_EPOCH])])], + [$1=$ax_build_date])]) +AC_MSG_RESULT([$$1]) +])dnl AX_BUILD_DATE_EPOCH diff --git a/contrib/unbound/cachedb/cachedb.c b/contrib/unbound/cachedb/cachedb.c index 0329f8458bd7..bdb1754e42d2 100644 --- a/contrib/unbound/cachedb/cachedb.c +++ b/contrib/unbound/cachedb/cachedb.c @@ -47,6 +47,7 @@ #include "util/regional.h" #include "util/net_help.h" #include "util/config_file.h" +#include "util/data/dname.h" #include "util/data/msgreply.h" #include "util/data/msgencode.h" #include "services/cache/dns.h" @@ -341,6 +342,7 @@ calc_hash(struct query_info* qinfo, struct module_env* env, char* buf, /* copy the hash info into the clear buffer */ if(clen + qinfo->qname_len < sizeof(clear)) { memmove(clear+clen, qinfo->qname, qinfo->qname_len); + query_dname_tolower(clear+clen); clen += qinfo->qname_len; } if(clen + 4 < sizeof(clear)) { @@ -755,7 +757,8 @@ cachedb_intcache_store(struct module_qstate* qstate, int msg_expired) } (void)dns_cache_store(qstate->env, &qstate->qinfo, qstate->return_msg->rep, 0, qstate->prefetch_leeway, 0, - qstate->region, store_flags, qstate->qstarttime); + qstate->region, store_flags, qstate->qstarttime, + qstate->is_valrec); if(serve_expired && msg_expired) { if(qstate->env->cfg->serve_expired_client_timeout) { /* No expired response from the query state, the diff --git a/contrib/unbound/cachedb/redis.c b/contrib/unbound/cachedb/redis.c index 68c033535a69..3dfa95859eb8 100644 --- a/contrib/unbound/cachedb/redis.c +++ b/contrib/unbound/cachedb/redis.c @@ -52,19 +52,38 @@ #include "hiredis/hiredis.h" struct redis_moddata { - redisContext** ctxs; /* thread-specific redis contexts */ - int numctxs; /* number of ctx entries */ - const char* server_host; /* server's IP address or host name */ - int server_port; /* server's TCP port */ - const char* server_path; /* server's unix path, or "", NULL if unused */ - const char* server_password; /* server's AUTH password, or "", NULL if unused */ - struct timeval command_timeout; /* timeout for commands */ - struct timeval connect_timeout; /* timeout for connect */ - int logical_db; /* the redis logical database to use */ + /* thread-specific redis contexts */ + redisContext** ctxs; + redisContext** replica_ctxs; + /* number of ctx entries */ + int numctxs; + /* server's IP address or host name */ + const char* server_host; + const char* replica_server_host; + /* server's TCP port */ + int server_port; + int replica_server_port; + /* server's unix path, or "", NULL if unused */ + const char* server_path; + const char* replica_server_path; + /* server's AUTH password, or "", NULL if unused */ + const char* server_password; + const char* replica_server_password; + /* timeout for commands */ + struct timeval command_timeout; + struct timeval replica_command_timeout; + /* timeout for connection setup */ + struct timeval connect_timeout; + struct timeval replica_connect_timeout; + /* the redis logical database to use */ + int logical_db; + int replica_logical_db; + /* if the SET with EX command is supported */ + int set_with_ex_available; }; static redisReply* redis_command(struct module_env*, struct cachedb_env*, - const char*, const uint8_t*, size_t); + const char*, const uint8_t*, size_t, int); static void moddata_clean(struct redis_moddata** moddata) { @@ -78,21 +97,30 @@ moddata_clean(struct redis_moddata** moddata) { } free((*moddata)->ctxs); } + if((*moddata)->replica_ctxs) { + int i; + for(i = 0; i < (*moddata)->numctxs; i++) { + if((*moddata)->replica_ctxs[i]) + redisFree((*moddata)->replica_ctxs[i]); + } + free((*moddata)->replica_ctxs); + } free(*moddata); *moddata = NULL; } static redisContext* -redis_connect(const struct redis_moddata* moddata) +redis_connect(const char* host, int port, const char* path, + const char* password, int logical_db, + const struct timeval connect_timeout, + const struct timeval command_timeout) { redisContext* ctx; - if(moddata->server_path && moddata->server_path[0]!=0) { - ctx = redisConnectUnixWithTimeout(moddata->server_path, - moddata->connect_timeout); + if(path && path[0]!=0) { + ctx = redisConnectUnixWithTimeout(path, connect_timeout); } else { - ctx = redisConnectWithTimeout(moddata->server_host, - moddata->server_port, moddata->connect_timeout); + ctx = redisConnectWithTimeout(host, port, connect_timeout); } if(!ctx || ctx->err) { const char *errstr = "out of memory"; @@ -101,13 +129,13 @@ redis_connect(const struct redis_moddata* moddata) log_err("failed to connect to redis server: %s", errstr); goto fail; } - if(redisSetTimeout(ctx, moddata->command_timeout) != REDIS_OK) { - log_err("failed to set redis timeout"); + if(redisSetTimeout(ctx, command_timeout) != REDIS_OK) { + log_err("failed to set redis timeout, %s", ctx->errstr); goto fail; } - if(moddata->server_password && moddata->server_password[0]!=0) { + if(password && password[0]!=0) { redisReply* rep; - rep = redisCommand(ctx, "AUTH %s", moddata->server_password); + rep = redisCommand(ctx, "AUTH %s", password); if(!rep || rep->type == REDIS_REPLY_ERROR) { log_err("failed to authenticate with password"); freeReplyObject(rep); @@ -115,18 +143,25 @@ redis_connect(const struct redis_moddata* moddata) } freeReplyObject(rep); } - if(moddata->logical_db > 0) { + if(logical_db > 0) { redisReply* rep; - rep = redisCommand(ctx, "SELECT %d", moddata->logical_db); + rep = redisCommand(ctx, "SELECT %d", logical_db); if(!rep || rep->type == REDIS_REPLY_ERROR) { log_err("failed to set logical database (%d)", - moddata->logical_db); + logical_db); freeReplyObject(rep); goto fail; } freeReplyObject(rep); } - verbose(VERB_OPS, "Connection to Redis established"); + if(verbosity >= VERB_OPS) { + char port_str[6+1]; + port_str[0] = ' '; + (void)snprintf(port_str+1, sizeof(port_str)-1, "%d", port); + verbose(VERB_OPS, "Connection to Redis established (%s%s)", + path&&path[0]!=0?path:host, + path&&path[0]!=0?"":port_str); + } return ctx; fail: @@ -135,6 +170,14 @@ fail: return NULL; } +static void +set_timeout(struct timeval* timeout, int value, int explicit_value) +{ + int v = explicit_value != 0 ? explicit_value : value; + timeout->tv_sec = v / 1000; + timeout->tv_usec = (v % 1000) * 1000; +} + static int redis_init(struct module_env* env, struct cachedb_env* cachedb_env) { @@ -149,57 +192,98 @@ redis_init(struct module_env* env, struct cachedb_env* cachedb_env) goto fail; } moddata->numctxs = env->cfg->num_threads; - moddata->ctxs = calloc(env->cfg->num_threads, sizeof(redisContext*)); - if(!moddata->ctxs) { - log_err("out of memory"); - goto fail; - } - /* note: server_host is a shallow reference to configured string. - * we don't have to free it in this module. */ + /* note: server_host and similar string configuration options are + * shallow references to configured strings; we don't have to free them + * in this module. */ moddata->server_host = env->cfg->redis_server_host; + moddata->replica_server_host = env->cfg->redis_replica_server_host; + moddata->server_port = env->cfg->redis_server_port; + moddata->replica_server_port = env->cfg->redis_replica_server_port; + moddata->server_path = env->cfg->redis_server_path; + moddata->replica_server_path = env->cfg->redis_replica_server_path; + moddata->server_password = env->cfg->redis_server_password; - moddata->command_timeout.tv_sec = env->cfg->redis_timeout / 1000; - moddata->command_timeout.tv_usec = - (env->cfg->redis_timeout % 1000) * 1000; - moddata->connect_timeout.tv_sec = env->cfg->redis_timeout / 1000; - moddata->connect_timeout.tv_usec = - (env->cfg->redis_timeout % 1000) * 1000; - if(env->cfg->redis_command_timeout != 0) { - moddata->command_timeout.tv_sec = - env->cfg->redis_command_timeout / 1000; - moddata->command_timeout.tv_usec = - (env->cfg->redis_command_timeout % 1000) * 1000; + moddata->replica_server_password = env->cfg->redis_replica_server_password; + + set_timeout(&moddata->command_timeout, + env->cfg->redis_timeout, + env->cfg->redis_command_timeout); + set_timeout(&moddata->replica_command_timeout, + env->cfg->redis_replica_timeout, + env->cfg->redis_replica_command_timeout); + set_timeout(&moddata->connect_timeout, + env->cfg->redis_timeout, + env->cfg->redis_connect_timeout); + set_timeout(&moddata->replica_connect_timeout, + env->cfg->redis_replica_timeout, + env->cfg->redis_replica_connect_timeout); + + moddata->logical_db = env->cfg->redis_logical_db; + moddata->replica_logical_db = env->cfg->redis_replica_logical_db; + + moddata->ctxs = calloc(env->cfg->num_threads, sizeof(redisContext*)); + if(!moddata->ctxs) { + log_err("out of memory"); + goto fail; } - if(env->cfg->redis_connect_timeout != 0) { - moddata->connect_timeout.tv_sec = - env->cfg->redis_connect_timeout / 1000; - moddata->connect_timeout.tv_usec = - (env->cfg->redis_connect_timeout % 1000) * 1000; + if((moddata->replica_server_host && moddata->replica_server_host[0]!=0) + || (moddata->replica_server_path && moddata->replica_server_path[0]!=0)) { + /* There is a replica configured, allocate ctxs */ + moddata->replica_ctxs = calloc(env->cfg->num_threads, sizeof(redisContext*)); + if(!moddata->replica_ctxs) { + log_err("out of memory"); + goto fail; + } } - moddata->logical_db = env->cfg->redis_logical_db; for(i = 0; i < moddata->numctxs; i++) { - redisContext* ctx = redis_connect(moddata); + redisContext* ctx = redis_connect( + moddata->server_host, + moddata->server_port, + moddata->server_path, + moddata->server_password, + moddata->logical_db, + moddata->connect_timeout, + moddata->command_timeout); if(!ctx) { - log_err("redis_init: failed to init redis"); - goto fail; + log_err("redis_init: failed to init redis " + "(for thread %d)", i); + /* And continue, the context can be established + * later, just like after a disconnect. */ } moddata->ctxs[i] = ctx; } + if(moddata->replica_ctxs) { + for(i = 0; i < moddata->numctxs; i++) { + redisContext* ctx = redis_connect( + moddata->replica_server_host, + moddata->replica_server_port, + moddata->replica_server_path, + moddata->replica_server_password, + moddata->replica_logical_db, + moddata->replica_connect_timeout, + moddata->replica_command_timeout); + if(!ctx) { + log_err("redis_init: failed to init redis " + "replica (for thread %d)", i); + /* And continue, the context can be established + * later, just like after a disconnect. */ + } + moddata->replica_ctxs[i] = ctx; + } + } cachedb_env->backend_data = moddata; - if(env->cfg->redis_expire_records) { + if(env->cfg->redis_expire_records && + moddata->ctxs[env->alloc->thread_num] != NULL) { redisReply* rep = NULL; int redis_reply_type = 0; - /** check if setex command is supported */ + /** check if set with ex command is supported */ rep = redis_command(env, cachedb_env, - "SETEX __UNBOUND_REDIS_CHECK__ 1 none", NULL, 0); + "SET __UNBOUND_REDIS_CHECK__ none EX 1", NULL, 0, 1); if(!rep) { /** init failed, no response from redis server*/ - log_err("redis_init: failed to init redis, the " - "redis-expire-records option requires the SETEX command " - "(redis >= 2.0.0)"); - goto fail; + goto set_with_ex_fail; } redis_reply_type = rep->type; freeReplyObject(rep); @@ -207,15 +291,18 @@ redis_init(struct module_env* env, struct cachedb_env* cachedb_env) case REDIS_REPLY_STATUS: break; default: - /** init failed, setex command not supported */ - log_err("redis_init: failed to init redis, the " - "redis-expire-records option requires the SETEX command " - "(redis >= 2.0.0)"); - goto fail; + /** init failed, set_with_ex command not supported */ + goto set_with_ex_fail; } + moddata->set_with_ex_available = 1; } return 1; +set_with_ex_fail: + log_err("redis_init: failure during redis_init, the " + "redis-expire-records option requires the SET with EX command " + "(redis >= 2.6.2)"); + return 1; fail: moddata_clean(&moddata); return 0; @@ -246,9 +333,9 @@ redis_deinit(struct module_env* env, struct cachedb_env* cachedb_env) */ static redisReply* redis_command(struct module_env* env, struct cachedb_env* cachedb_env, - const char* command, const uint8_t* data, size_t data_len) + const char* command, const uint8_t* data, size_t data_len, int write) { - redisContext* ctx; + redisContext* ctx, **ctx_selector; redisReply* rep; struct redis_moddata* d = (struct redis_moddata*) cachedb_env->backend_data; @@ -259,17 +346,38 @@ redis_command(struct module_env* env, struct cachedb_env* cachedb_env, * assumption throughout the unbound architecture, so we simply assert * it. */ log_assert(env->alloc->thread_num < d->numctxs); - ctx = d->ctxs[env->alloc->thread_num]; + + ctx_selector = !write && d->replica_ctxs + ?d->replica_ctxs + :d->ctxs; + ctx = ctx_selector[env->alloc->thread_num]; /* If we've not established a connection to the server or we've closed * it on a failure, try to re-establish a new one. Failures will be * logged in redis_connect(). */ if(!ctx) { - ctx = redis_connect(d); - d->ctxs[env->alloc->thread_num] = ctx; + if(!write && d->replica_ctxs) { + ctx = redis_connect( + d->replica_server_host, + d->replica_server_port, + d->replica_server_path, + d->replica_server_password, + d->replica_logical_db, + d->replica_connect_timeout, + d->replica_command_timeout); + } else { + ctx = redis_connect( + d->server_host, + d->server_port, + d->server_path, + d->server_password, + d->logical_db, + d->connect_timeout, + d->command_timeout); + } + ctx_selector[env->alloc->thread_num] = ctx; } - if(!ctx) - return NULL; + if(!ctx) return NULL; /* Send the command and get a reply, synchronously. */ rep = (redisReply*)redisCommand(ctx, command, data, data_len); @@ -279,7 +387,7 @@ redis_command(struct module_env* env, struct cachedb_env* cachedb_env, log_err("redis_command: failed to receive a reply, " "closing connection: %s", ctx->errstr); redisFree(ctx); - d->ctxs[env->alloc->thread_num] = NULL; + ctx_selector[env->alloc->thread_num] = NULL; return NULL; } @@ -309,7 +417,7 @@ redis_lookup(struct module_env* env, struct cachedb_env* cachedb_env, return 0; } - rep = redis_command(env, cachedb_env, cmdbuf, NULL, 0); + rep = redis_command(env, cachedb_env, cmdbuf, NULL, 0, 0); if(!rep) return 0; switch(rep->type) { @@ -346,11 +454,16 @@ redis_store(struct module_env* env, struct cachedb_env* cachedb_env, { redisReply* rep; int n; - int set_ttl = (env->cfg->redis_expire_records && + struct redis_moddata* moddata = (struct redis_moddata*) + cachedb_env->backend_data; + int set_ttl = (moddata->set_with_ex_available && + env->cfg->redis_expire_records && (!env->cfg->serve_expired || env->cfg->serve_expired_ttl > 0)); /* Supported commands: * - "SET " + key + " %b" - * - "SETEX " + key + " " + ttl + " %b" + * - "SET " + key + " %b EX " + ttl + * older redis 2.0.0 was "SETEX " + key + " " + ttl + " %b" + * - "EXPIRE " + key + " 0" */ char cmdbuf[6+(CACHEDB_HASHSIZE/8)*2+11+3+1]; @@ -358,14 +471,22 @@ redis_store(struct module_env* env, struct cachedb_env* cachedb_env, verbose(VERB_ALGO, "redis_store %s (%d bytes)", key, (int)data_len); /* build command to set to a binary safe string */ n = snprintf(cmdbuf, sizeof(cmdbuf), "SET %s %%b", key); + } else if(ttl == 0) { + /* use the EXPIRE command, SET with EX 0 is an invalid time. */ + /* Replies with REDIS_REPLY_INTEGER of 1. */ + verbose(VERB_ALGO, "redis_store expire %s (%d bytes)", + key, (int)data_len); + n = snprintf(cmdbuf, sizeof(cmdbuf), "EXPIRE %s 0", key); + data = NULL; + data_len = 0; } else { /* add expired ttl time to redis ttl to avoid premature eviction of key */ ttl += env->cfg->serve_expired_ttl; verbose(VERB_ALGO, "redis_store %s (%d bytes) with ttl %u", - key, (int)data_len, (uint32_t)ttl); + key, (int)data_len, (unsigned)(uint32_t)ttl); /* build command to set to a binary safe string */ - n = snprintf(cmdbuf, sizeof(cmdbuf), "SETEX %s %u %%b", key, - (uint32_t)ttl); + n = snprintf(cmdbuf, sizeof(cmdbuf), "SET %s %%b EX %u", key, + (unsigned)(uint32_t)ttl); } @@ -374,11 +495,12 @@ redis_store(struct module_env* env, struct cachedb_env* cachedb_env, return; } - rep = redis_command(env, cachedb_env, cmdbuf, data, data_len); + rep = redis_command(env, cachedb_env, cmdbuf, data, data_len, 1); if(rep) { verbose(VERB_ALGO, "redis_store set completed"); if(rep->type != REDIS_REPLY_STATUS && - rep->type != REDIS_REPLY_ERROR) { + rep->type != REDIS_REPLY_ERROR && + rep->type != REDIS_REPLY_INTEGER) { log_err("redis_store: unexpected type of reply (%d)", rep->type); } diff --git a/contrib/unbound/compat/malloc.c b/contrib/unbound/compat/malloc.c index d8097b13e024..74beae01c98c 100644 --- a/contrib/unbound/compat/malloc.c +++ b/contrib/unbound/compat/malloc.c @@ -5,12 +5,8 @@ #undef malloc #include -#ifndef USE_WINSOCK -void *malloc (); -#else /* provide a prototype */ void *malloc (size_t n); -#endif /* Allocate an N-byte block of memory from the heap. If N is zero, allocate a 1-byte block. */ diff --git a/contrib/unbound/config.h.in b/contrib/unbound/config.h.in index dc03e82dddba..f2dc8c8b92b3 100644 --- a/contrib/unbound/config.h.in +++ b/contrib/unbound/config.h.in @@ -378,6 +378,9 @@ /* Define if we have LibreSSL */ #undef HAVE_LIBRESSL +/* If we have atomic_store */ +#undef HAVE_LINK_ATOMIC_STORE + /* Define to 1 if you have the header file. */ #undef HAVE_LINUX_NET_TSTAMP_H @@ -663,6 +666,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDARG_H +/* Define to 1 if you have the header file. */ +#undef HAVE_STDATOMIC_H + /* Define to 1 if you have the header file. */ #undef HAVE_STDBOOL_H diff --git a/contrib/unbound/configure b/contrib/unbound/configure index 918a0632013d..0b78d97b16e9 100755 --- a/contrib/unbound/configure +++ b/contrib/unbound/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for unbound 1.22.0. +# Generated by GNU Autoconf 2.71 for unbound 1.23.0. # # Report bugs to . # @@ -622,8 +622,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unbound' PACKAGE_TARNAME='unbound' -PACKAGE_VERSION='1.22.0' -PACKAGE_STRING='unbound 1.22.0' +PACKAGE_VERSION='1.23.0' +PACKAGE_STRING='unbound 1.23.0' PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues' PACKAGE_URL='' @@ -712,6 +712,7 @@ SSLLIB HAVE_SSL PC_CRYPTO_DEPENDENCY CONFIG_DATE +SOURCE_DATE_EPOCH GCC_DOCKER_LINTFLAGS NETBSD_LINTFLAGS PYUNBOUND_UNINSTALL @@ -959,6 +960,7 @@ SYSTEMD_LIBS SYSTEMD_DAEMON_CFLAGS SYSTEMD_DAEMON_LIBS PYTHON_VERSION +SOURCE_DATE_EPOCH PROTOBUFC_CFLAGS PROTOBUFC_LIBS' @@ -1509,7 +1511,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures unbound 1.22.0 to adapt to many kinds of systems. +\`configure' configures unbound 1.23.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1575,7 +1577,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unbound 1.22.0:";; + short | recursive ) echo "Configuration of unbound 1.23.0:";; esac cat <<\_ACEOF @@ -1752,6 +1754,10 @@ Some influential environment variables: The installed Python version to use, for example '2.3'. This string will be appended to the Python interpreter canonical name. + SOURCE_DATE_EPOCH + If it is set, it uses the value of that variable instead of the + current time as the build timestamp. The format is a unix + timestamp. This enables reproducible build output. PROTOBUFC_CFLAGS C compiler flags for PROTOBUFC, overriding pkg-config PROTOBUFC_LIBS @@ -1824,7 +1830,7 @@ fi test -n "$ac_init_help" && exit $ac_status *** 58195 LINES SKIPPED *** From nobody Sun May 11 04:49:49 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zw9JY5YWjz5wKvK; Sun, 11 May 2025 04:49:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zw9JY2BGnz3xP0; Sun, 11 May 2025 04:49:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746938989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T6f+q52t9pG+vcFoO1HqaMskTQ2Xxj9RHQqVBt1YyWc=; b=VPCTIrHgWI3yb5DBUabpEbNcbE0Vif1lX9AqYaEF6itSpgjjIyt9OoYAemaqu1EgLf0gQQ Rva3V38X1rg5zKtvypr+fiZseDzvWclrNMyKfEVnlKDtaRckGnb9gqRkXjZuERiIrf3gq/ 6zpN0EO+FB76ttMiNQw6No8NIc6OeY34YUWr2JbVi3VxefWhFQNY0yOtqDOO/m+qp/zGtm 0/HcaQoXFqMcqf3CAIRTrdu7JeoaHXA1LrZgrP1uf8rGVrfrOmhC3zw+32/K//dSE54T9s u/IH8uI5GlPTJDnY70W2KoWXJmkRn0QcQyGW7tKrqV06Qg1O8m+3TPAVpIC8Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746938989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T6f+q52t9pG+vcFoO1HqaMskTQ2Xxj9RHQqVBt1YyWc=; b=JO/zZDtY1TfQPxY4sRZKR27BjxwW00lgtpR9Nl3Emek55nZW8cWC/dKXxwKewprMpv0wEW Zv3BEtWpAx33lBpKC1OL5cQBlo551WFkCgjtPMhw+4OHOiYLdWHg0fSduAchnEYlXPEhh4 ooJUGXmBG9dbglFqdnxCgt5OQb3CCOgLBynkGLKtr64i2lx2NuIhXyFcOZSAWS89gVbAln sYnuEDsP9NuTF6wWvQgWR71Hwa3Bi8x3TdACXmMU5IVB900H9bSLIiy9JZG9ZCJmNvQl3I GkF/dcWgl6gMhZVz5Gp/pivc/7AxpM+3AUBMw4tNprc+izmIZx+ePEBAHUEN3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746938989; a=rsa-sha256; cv=none; b=uo7E5wK81k26wSLaeTUCdrYWiRrP+DzaH5Mbsx5nqd/y6JEJf6WAV6KfTck1s1EjogO67C Tn7UucpR3jTAkOWdTogWnibMo8jjr1kUZ9Rl2Wv4Q9KZH28ReEvGgiSkykI66kkjVPQugX 7X2S3w9y8SP9jH6tJ17IuU2KalJUB9yPfOzxX8Xxgg++vlt4x1c/50rtBXf1Ssnvz6Ft2Z 7EumvqE9neibjM2pSf8J/bS6H9z28/qyCSTAbWN4tDixtguyS0zkGCii24WrT1RUdmQSoN P97CM2/yT3yvK5qgL2OSM9wkrveKN9NPNn2e6rUAXgsZQ1oIHF7yb1PgKmbLkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zw9JY1QgZz23t; Sun, 11 May 2025 04:49:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54B4nnCC083107; Sun, 11 May 2025 04:49:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54B4nnBR083104; Sun, 11 May 2025 04:49:49 GMT (envelope-from git) Date: Sun, 11 May 2025 04:49:49 GMT Message-Id: <202505110449.54B4nnBR083104@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 0e80536cfe46 - stable/14 - unbound: Update version strings List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0e80536cfe46dbe6d1d430141c0cf3c69c5b84b0 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=0e80536cfe46dbe6d1d430141c0cf3c69c5b84b0 commit 0e80536cfe46dbe6d1d430141c0cf3c69c5b84b0 Author: Cy Schubert AuthorDate: 2025-04-27 03:39:21 +0000 Commit: Cy Schubert CommitDate: 2025-05-11 04:48:48 +0000 unbound: Update version strings Fixes: be771a7b7f45 (cherry picked from commit 3bef9b313be73788cd3b77d9b514d292169c442e) --- lib/libunbound/config.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libunbound/config.h b/lib/libunbound/config.h index 17a6707c7102..a986bfc869a3 100644 --- a/lib/libunbound/config.h +++ b/lib/libunbound/config.h @@ -796,7 +796,7 @@ #define PACKAGE_NAME "unbound" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "unbound 1.22.0" +#define PACKAGE_STRING "unbound 1.23.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "unbound" @@ -805,7 +805,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.22.0" +#define PACKAGE_VERSION "1.23.0" /* default pidfile location */ #define PIDFILE "/var/unbound/unbound.pid" @@ -828,7 +828,7 @@ #define ROOT_CERT_FILE "/var/unbound/icannbundle.pem" /* version number for resource files */ -#define RSRC_PACKAGE_VERSION 1,22,0,0 +#define RSRC_PACKAGE_VERSION 1,23,0,0 /* Directory to chdir to */ #define RUN_DIR "/var/unbound" From nobody Sun May 11 04:49:50 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zw9JZ4PfMz5wKqm; Sun, 11 May 2025 04:49:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zw9JZ2fKHz3x5X; Sun, 11 May 2025 04:49:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746938990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cAV6xNws9n9r85lmFuhcoKJYr7awM0Cw85yIYJ8tr/s=; b=kLClU2JTT2j0HxFHL/wCm5ikXuMMuFSnVxfqpdUYVM7SsI8VbIkOtkd6/X89LrjsVZdGCV UOhU+hS/cj1HTM8And8I0u49xDjV6+MXMR66z7s0AVmaWTbLQAg8FL4F+9GfDkpDNbPhyl b2ATaNeltzBkzAXSNP+05e54WxC6HxH1rJ4gvFnIhePa4Ly5VYmlHrmkK1J3SygMgx+ePJ pZr8ljcooyH9SvUnkRYKxhY92s1QpX5TbIpTbUGGIxQuESs5D9FoVA87x3A//aZG5Tpa9F ScmIwU0wIaMqrnZ40PS1XXN6xejogCAsC/2tuULqSrHoKzb+VMS0o5eWp/c2jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746938990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cAV6xNws9n9r85lmFuhcoKJYr7awM0Cw85yIYJ8tr/s=; b=QTegvegY1PGhwJqQWlgMD5sy4aNbnVnqn7xHB8KsLW3IjboidiPiHoodNHgNPHgdSFvCnz RF00e+BfVX1L1OjcBVihT4Ho6s4Mo46GXWFMM3Zzo9Wig7FbVzJ1XMfI6ODEHGnIqikcSz aeVixlKMn667DSORVjuViPVtKDewsCnYg+DnzL011hYxx3ZW4nI7Xt7zaa3XGWWp6t7N7F np+qgiOUTdLc8VpRn+q2Mpuodj5hhADwqt88O2nawVV3HBWUNIWpc6eP4RHL2+kSPbK5ZX d9vuntlFdpc/2dJz0/W2GOwlO0/W29zS9muD2EmBDwQuSLK+DDcWfrGCMc40cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746938990; a=rsa-sha256; cv=none; b=Ce1vYwrwz3Oa9t20WcSLqUHh+0iycpBIRBYxsYJ6mV+nqJO71BVSe5SIO6b5rYxL1qfxql KmZwO97JT+37Vlooiu3YHYeN56TylJB0Ka8+JXP/ChlgFvSZetCr0D+HVnTJ6a1BA8uMsK IHnvop51lFKGzly++mBNzDctlXEpn5cXrgJZE/5nq92tYxvV8AyCf+kQy68c2AXu9HWCd8 pSFsPoDUc3A9kVdEvID6+pgRm4dxHjfMfjmDGbXvVUkxayUF8+Sxq3rQOo8BPWbNtIthku B68NtbAxjQ6nlcxp+6vQKD6W50p4q77feCP3Ur0dCbBxmWHIFLb4Qt+a2Aysqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zw9JZ2Dqrz23v; Sun, 11 May 2025 04:49:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54B4noDl083151; Sun, 11 May 2025 04:49:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54B4no2b083146; Sun, 11 May 2025 04:49:50 GMT (envelope-from git) Date: Sun, 11 May 2025 04:49:50 GMT Message-Id: <202505110449.54B4no2b083146@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: db9d0fad461a - stable/14 - wpa_supplicant: Handle systems without INET (legacy IP) support List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: db9d0fad461a6d3a0beb79981c31026bc4ce0a48 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=db9d0fad461a6d3a0beb79981c31026bc4ce0a48 commit db9d0fad461a6d3a0beb79981c31026bc4ce0a48 Author: Marek Zarychta AuthorDate: 2025-04-28 00:02:04 +0000 Commit: Cy Schubert CommitDate: 2025-05-11 04:48:49 +0000 wpa_supplicant: Handle systems without INET (legacy IP) support Currently, wpa_supplicant fails when legacy IP support is disabled in FreeBSD (i.e., the world built with WITHOUT_INET and nooptions INET in the kernel config). The proposed patch allows running wpa_supplicant and connecting to wireless networks without INET support when INET6 is available. Reviewed by: cy, adrian, philip, roy_marples.name Differential Revision: https://reviews.freebsd.org/D49959 (cherry picked from commit 8c7149c73f8f2301369f271c98470b72973b0c01) --- contrib/wpa/src/drivers/driver_bsd.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/contrib/wpa/src/drivers/driver_bsd.c b/contrib/wpa/src/drivers/driver_bsd.c index 75a1a061e0a7..384c0a19cfe3 100644 --- a/contrib/wpa/src/drivers/driver_bsd.c +++ b/contrib/wpa/src/drivers/driver_bsd.c @@ -1770,9 +1770,19 @@ bsd_global_init(void *ctx) global->sock = socket(PF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0); if (global->sock < 0) { + if (errno == EAFNOSUPPORT) { + wpa_printf(MSG_INFO, "INET not supported, trying INET6..."); + global->sock = socket(PF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, 0); + if (global->sock < 0) { + wpa_printf(MSG_ERROR, "socket[PF_INET6,SOCK_DGRAM]: %s", + strerror(errno)); + goto fail1; + } + } else { wpa_printf(MSG_ERROR, "socket[PF_INET,SOCK_DGRAM]: %s", strerror(errno)); goto fail1; + } } global->route = socket(PF_ROUTE, From nobody Sun May 11 04:49:51 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zw9Jc1SWhz5wKxk; Sun, 11 May 2025 04:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zw9Jb3fxfz3x5j; Sun, 11 May 2025 04:49:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746938991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xcbp84ez0WBdxKKBbfhjCISAgfN453eOWw6vXGby6Xo=; b=p3Kt/VyJ3f8INvTNbAK3jN1/WVOSyACQp1BEjTQv2cogT6qR6O5Hw6QjBaqp6lR3qyKEug oF6r7BQe9O/mfH9OENekqmG/pOLETkWlPkj4Yxdlho0pMpOBJyW5ksBDEwVk4885UlYroH gC41M/aTStXr8hLIFik512Wip2I01pGgjlK0WoKmEPRqMMsUH/TppUJKB3Cnzkd15RSDbc jCOp74e/KV7g5ojL9dI7gKfcSamvPnNOziak3d3IuudGE/pM2E6Xo+z/XNxFm1M1V/HypH 2wDgwQenEDbKMoQOktU95AcY7qUhTArDYyppUPozZe5GCmGxLyqxAXIKsztCXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746938991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xcbp84ez0WBdxKKBbfhjCISAgfN453eOWw6vXGby6Xo=; b=GNA2iUaplpxrjDDRmALxRb+lFA2aAJ5BDxuHBkyx0BASMPuRWgtOoTsfgTRk2Oj3aGEbW1 B3lUCC81YY4gkgxELE9oYF5YfL2+NFUcGlSC5kd27UXAGv0W9J0ITlbzOiYC1mMItuAwFn jPTpJYiJZyMdyNXFLyZJAU74fi+jPxFl5WpEBXEfS1M8VcJw+sMpqFcURdyJfXTb2gB+Cm B+51eRFg6g+ALFUjbl5MY9BmhKWX4cY1vHap7oaPMZuIq0q2fEUCtcWqlJF19lp/sGq7E8 Gc/zg+4XcV30Whc6vkTk1F5R+WObG466FxvqnOgURVLGawfIzQtzpXtwO74+8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746938991; a=rsa-sha256; cv=none; b=vd8sEGQt1LCO3TgzUxOsdsvPt1ipY+FNtSFQs5ZsL0b4eiF96aqjKghHom4HWhkn6D6oMU 6ZrXeidS2DT/+tDJxuwB/gCgYAXI1+vYuCxesBeClkvIt0naifoHpXOs02hlN/hubuI8FI xTir42l23pN6vwMhBWWWSkEkGV4vVPdOJpx7RdgPtbEwzEw+u0c1Q1mVv/NXnoZZtPoIKt z3TrHH5CO3f2r1BXaDDbhfwGr15JARqetlmsZzuoj490qRo4qI2cwCA8kpTCk/5JEdqPJh 8Nnqt9/TEjU98F0IEXvl1jcHRAsSYiLQdDIFLVKQb+K8kSkEmoIxSpcIbSBGNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zw9Jb38vhz2Kd; Sun, 11 May 2025 04:49:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54B4np8B083187; Sun, 11 May 2025 04:49:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54B4npBI083184; Sun, 11 May 2025 04:49:51 GMT (envelope-from git) Date: Sun, 11 May 2025 04:49:51 GMT Message-Id: <202505110449.54B4npBI083184@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 70068b3030f9 - stable/14 - wpa_supplicant: Use PF_LOCAL instead of PF_INET* List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 70068b3030f95b3f83dd04515d58db2c7b2ad587 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=70068b3030f95b3f83dd04515d58db2c7b2ad587 commit 70068b3030f95b3f83dd04515d58db2c7b2ad587 Author: Cy Schubert AuthorDate: 2025-04-28 01:16:37 +0000 Commit: Cy Schubert CommitDate: 2025-05-11 04:48:49 +0000 wpa_supplicant: Use PF_LOCAL instead of PF_INET* Using a local socket circumvents the issue of needing any Internet protocol (PF_INET or PF_INET6) support. We only use interface ("i" group) ioctls on this socket so we can get away with using PF_LOCAL instead of requring any Internet protocol (PF_INET or PF_INET6) support on the system. This simplifies the patch from 8c7149c73f8f. PR: 286259 Noted by: kevans Fixes: 8c7149c73f8f Reviewed by: kevans, philip, zarychtam_plan-b.pwste.edu.pl (mzar) Differential revision: https://reviews.freebsd.org/D50050 (cherry picked from commit 6aeec6a741975143f53feabceb1726d5033aafd6) --- contrib/wpa/src/drivers/driver_bsd.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/contrib/wpa/src/drivers/driver_bsd.c b/contrib/wpa/src/drivers/driver_bsd.c index 384c0a19cfe3..26d2f3e8a231 100644 --- a/contrib/wpa/src/drivers/driver_bsd.c +++ b/contrib/wpa/src/drivers/driver_bsd.c @@ -1768,21 +1768,11 @@ bsd_global_init(void *ctx) global->ctx = ctx; dl_list_init(&global->ifaces); - global->sock = socket(PF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0); + global->sock = socket(PF_LOCAL, SOCK_DGRAM | SOCK_CLOEXEC, 0); if (global->sock < 0) { - if (errno == EAFNOSUPPORT) { - wpa_printf(MSG_INFO, "INET not supported, trying INET6..."); - global->sock = socket(PF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, 0); - if (global->sock < 0) { - wpa_printf(MSG_ERROR, "socket[PF_INET6,SOCK_DGRAM]: %s", - strerror(errno)); - goto fail1; - } - } else { - wpa_printf(MSG_ERROR, "socket[PF_INET,SOCK_DGRAM]: %s", + wpa_printf(MSG_ERROR, "socket[PF_LOCAL,SOCK_DGRAM]: %s", strerror(errno)); goto fail1; - } } global->route = socket(PF_ROUTE, From nobody Sun May 11 04:50:11 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zw9Jz5vvrz5wKYN; Sun, 11 May 2025 04:50:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zw9Jz3kTpz3xwH; Sun, 11 May 2025 04:50:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746939011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XDE1wpKrupxIjgbuWGMzDVZS9E+6IkT160QXaMJeKMY=; b=kgwbzV4TLmBHJQ0wZZB/FHOzA6GUGoRCvFLJdazxlihcd/ahP5G7zi6OIIARcLGwUNzSHx t7UDFWNs93ne4FGRn42ht/2nr+kVvwfq8FFJULs7x7jJhP+GRJSVmnaNMiCkMC9Psnsb8j /OPY/pBx976EZ3h/Fkztx18yaq8r8guJitzsM7Q4xsRxMh+5CXZ+TFNgYXAswt2fVPc5c8 FbBtTSSlkqeQ4uSR3QGe54VJ6H8dZg4LIM4sF7q77GiyvRFC4qe2ISXnZ9cL9DImsCcKYj avwzcMSHLryUCW38r2PNRGXoReTJMOoaYolMSUeWWjOjXBWd2d33OwlnZFd/KQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746939011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XDE1wpKrupxIjgbuWGMzDVZS9E+6IkT160QXaMJeKMY=; b=LeQcRWydk9FQgz7byQNNWg/+R29wIgs+iFyegw+v6yjj76cF2i8WYAMafa7V6p0HlAwau/ vOVEq8smfCf15xGE9Vvu+EYFjO/NTilFvY0zBFIqhT6VKW1vFV341idh3LXP7uTfTRPEB6 FVx2t6Pip3RIMYZca+gB5Mry63qdiEFdMv2G3MGD0CH6DI2pFpBViedhkDz+6HUWbQxXVp P3g4Yzd6suUOW3gvbmSkoUZjnSmzxaueBXyOIV7FNSQIg2RCiroplg0Ul0+k32xwtWnmPq GsK/7W5zvSs/k+YfKJ8/KKN7t8Uak3V/igCMFjb/YL8OFpsWXVXy70uJIl6QCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746939011; a=rsa-sha256; cv=none; b=MfL5aJQTROu4od25DmqSFrzNFJcoG9GAjXMp9uWc6R5pdWQdL0uZNDISQYWhFDGSRp4SOM IiJGAHkDcKJwkU6JgfExYKlc85T30NqmJ/n0wT0bxJlhYRYhN6ZreA4XrqylVB3AYVU81X hE4Sxwvw2ySol23XTs3IVbFvE4eYISDvTVIKNN36nnJ0abV6p1kLu6/oX07dxx4xlfC7Og dVTeu2aZo9Ui7DMZmpkgOUdz2/VDxgacyMqodw8ZJ1BrLsNjKxrvJKJD7joowlunoGvfl8 /QJexmFObPQ0f1TPZ4hecthX1hWqnRStE2l3Ql8Tpz3J2gv02RvvkXokRO2ZDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zw9Jz3B6Lz2Ct; Sun, 11 May 2025 04:50:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54B4oB94088406; Sun, 11 May 2025 04:50:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54B4oBJF088398; Sun, 11 May 2025 04:50:11 GMT (envelope-from git) Date: Sun, 11 May 2025 04:50:11 GMT Message-Id: <202505110450.54B4oBJF088398@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 7e755cde72e3 - stable/13 - heimdal: Add missing symbols to map List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7e755cde72e3351a2ec998606a5b612cb7dbe5d1 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=7e755cde72e3351a2ec998606a5b612cb7dbe5d1 commit 7e755cde72e3351a2ec998606a5b612cb7dbe5d1 Author: Cy Schubert AuthorDate: 2025-03-26 13:43:54 +0000 Commit: Cy Schubert CommitDate: 2025-05-11 04:49:59 +0000 heimdal: Add missing symbols to map Patch supplied by mi@ through a private email. Bump __FreeBSD_version for ports that might need this. PR: 280025 (cherry picked from commit d5c804138845a1c8d81fbbce48de676806de32e6) --- crypto/heimdal/lib/krb5/version-script.map | 22 ++++++++++++++++++++++ sys/sys/param.h | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/crypto/heimdal/lib/krb5/version-script.map b/crypto/heimdal/lib/krb5/version-script.map index 818e6e071cbd..7e4e8623cbd5 100644 --- a/crypto/heimdal/lib/krb5/version-script.map +++ b/crypto/heimdal/lib/krb5/version-script.map @@ -764,6 +764,28 @@ HEIMDAL_KRB5_2.0 { # kinit helper krb5_get_init_creds_opt_set_pkinit_user_certs; krb5_pk_enterprise_cert; + krb5_auth_con_getrecvsubkey; + krb5_auth_con_getsendsubkey; + krb5_auth_con_setrecvsubkey; + krb5_auth_con_setsendsubkey; + krb5_c_random_make_octets; + krb5_cc_copy_creds; + krb5_cc_get_flags; + krb5_creds_get_ticket_flags; + krb5_get_validated_creds; + krb5_init_creds_free; + krb5_init_creds_get_creds; + krb5_init_creds_get_error; + krb5_init_creds_get; + krb5_init_creds_init; + krb5_init_creds_set_keyblock; + krb5_init_creds_set_keytab; + krb5_init_creds_set_password; + krb5_init_creds_set_service; + krb5_init_creds_step; + krb5_rd_req_out_get_server; + krb5_sockaddr_is_loopback; + krb5_ticket_get_flags; # testing _krb5_aes_cts_encrypt; diff --git a/sys/sys/param.h b/sys/sys/param.h index 817c0c2dc715..119af606d1d5 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -59,7 +59,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1305500 /* Master, propagated to newvers */ +#define __FreeBSD_version 1305501 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Sun May 11 04:50:12 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zw9K13bnlz5wKqw; Sun, 11 May 2025 04:50:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zw9K12lmpz3xyg; Sun, 11 May 2025 04:50:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746939013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4d5BnsM9Y9pGoL9Vo+a0dkjnspavUVPQ3CjK13LUU/4=; b=WKZvIT2OXdBt/aeLvNaCpO5daZz0PPQt2YCXTFu/bMbED/mjxFbTmtL2FOoOddr+R23EgY xZlemNvI7aGXkgP2qKKkpjgA2V57WFmsbnZEs2IuAsWPOZL5as1FpOqdmT221bHn+EgFQf Qi7USbfZUVipwlwMHknBuS/VxebM/+OScV37dO5/5nKTJ+iHyjfW82Jj0cTALW+gvt6e7h BXSx+SLNpJMZQPHuo+Ziddvv5TWAQ9FUUDQqZBPS353wVB6lxqNpffWg7p0xKObkE2+ZFJ GjHKnGaN0sdsgrWoqeBez/4xMtKMjLOWiiKl04ytkGz8CMx952Nkfn5PKQPwfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746939013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4d5BnsM9Y9pGoL9Vo+a0dkjnspavUVPQ3CjK13LUU/4=; b=kTmn2hbHrQSPjq5kRr6cQW9R8vCV5sqVBKZNizoWvBQB2940EF6dUYbhtH1q5YC0KFeSrZ 8VRQBkEVsDqkVPVia1Xx0SPxBwDile/I9x3uJa7+g1SiYNLT/etMPouJz4ObNcz9IQ9poH 6oFKkRB6Hm88PXgkJLzitJpDl+R3cW52MiWBNBRpCmaVDpw0pGb5ZjSmUF750BVHiH/k3O QapVonwfQ9npseAypYb6mzuMPS6ResKA3YZL2/2y67+C+Prxdrt3Wu7augTf8Fkue48gHD ONTYDH3GCPWmdDloC+kMfCNbSFR8tyxpGuNV1n/qWNDwBI4YAVEh4+1Cknuxuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746939013; a=rsa-sha256; cv=none; b=cbyUjyFZ5jvHtEDzCPiP+WlrsAk0Cw6HRutBYzJbywWztFypn282C91CpOC7OT3Utk2a3E lAhXf/JLYlNNkTXltbCK1FQxYx+DURp9vSqHHa7xCWHeg2ClG+/tdKwldsZ97lfYWxHFFi rTEtVnre58GnZfuFR4zVUcE4X3KXffCgjma7sYBSaxnWuf927zFJQRmCRH05wXvxa/cw1v 08oUstfbIeaC8eHVOT5B5d0c6gmwDllLsQA9gqzXvMuUSDS/xUhki3wB84qX71i+fyS2NA o/LaRrG3JdxF3A0VYQOPLUaQtEbY+fnzFoACpHB4bFxyXGSPVgJO3dkKbwLeWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zw9K127Q1z2Gn; Sun, 11 May 2025 04:50:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54B4oDwm089488; Sun, 11 May 2025 04:50:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54B4oCJB089052; Sun, 11 May 2025 04:50:12 GMT (envelope-from git) Date: Sun, 11 May 2025 04:50:12 GMT Message-Id: <202505110450.54B4oCJB089052@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 8f00a3eabdcf - stable/13 - unbound: Vendor import 1.23.0 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8f00a3eabdcf3fe4e7ca353aae2aa16afe840d8f Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=8f00a3eabdcf3fe4e7ca353aae2aa16afe840d8f commit 8f00a3eabdcf3fe4e7ca353aae2aa16afe840d8f Author: Cy Schubert AuthorDate: 2025-04-25 14:48:44 +0000 Commit: Cy Schubert CommitDate: 2025-05-11 04:49:59 +0000 unbound: Vendor import 1.23.0 Release notes at https://nlnetlabs.nl/news/2025/Apr/24/unbound-1.23.0-released/ Merge commit '44bab727dfe28451b777dc9e47db4f748b709182' (cherry picked from commit be771a7b7f4580a30d99e41a5bb1b93a385a119d) --- contrib/unbound/Makefile.in | 23 +- contrib/unbound/ax_build_date_epoch.m4 | 70 + contrib/unbound/cachedb/cachedb.c | 5 +- contrib/unbound/cachedb/redis.c | 280 +- contrib/unbound/compat/malloc.c | 4 - contrib/unbound/config.h.in | 6 + contrib/unbound/configure | 122 +- contrib/unbound/configure.ac | 32 +- contrib/unbound/contrib/android/install_expat.sh | 11 +- contrib/unbound/contrib/ios/install_expat.sh | 18 +- contrib/unbound/daemon/acl_list.c | 30 +- contrib/unbound/daemon/acl_list.h | 13 +- contrib/unbound/daemon/cachedump.c | 4 +- contrib/unbound/daemon/daemon.c | 42 +- contrib/unbound/daemon/daemon.h | 35 +- contrib/unbound/daemon/remote.c | 4162 ++++++++++- contrib/unbound/daemon/remote.h | 167 + contrib/unbound/daemon/stats.c | 32 +- contrib/unbound/daemon/unbound.c | 92 +- contrib/unbound/daemon/worker.c | 118 +- contrib/unbound/daemon/worker.h | 8 +- contrib/unbound/dns64/dns64.c | 6 +- contrib/unbound/dnstap/dnstap.c | 28 +- contrib/unbound/dnstap/dnstap.h | 7 + contrib/unbound/dnstap/unbound-dnstap-socket.c | 17 +- contrib/unbound/doc/Changelog | 265 + contrib/unbound/doc/README | 2 +- contrib/unbound/doc/example.conf.in | 54 +- contrib/unbound/doc/libunbound.3.in | 4 +- contrib/unbound/doc/unbound-anchor.8.in | 2 +- contrib/unbound/doc/unbound-checkconf.8.in | 2 +- contrib/unbound/doc/unbound-control.8.in | 169 +- contrib/unbound/doc/unbound-host.1.in | 2 +- contrib/unbound/doc/unbound.8.in | 4 +- contrib/unbound/doc/unbound.conf.5.in | 204 +- contrib/unbound/ipsecmod/ipsecmod.c | 3 +- contrib/unbound/iterator/iter_delegpt.c | 2 +- contrib/unbound/iterator/iter_fwd.c | 52 +- contrib/unbound/iterator/iter_fwd.h | 9 + contrib/unbound/iterator/iter_hints.c | 13 +- contrib/unbound/iterator/iter_hints.h | 9 + contrib/unbound/iterator/iter_utils.c | 153 +- contrib/unbound/iterator/iter_utils.h | 49 +- contrib/unbound/iterator/iterator.c | 81 +- contrib/unbound/iterator/iterator.h | 26 +- contrib/unbound/libunbound/libworker.c | 16 +- contrib/unbound/libunbound/unbound.h | 6 + contrib/unbound/pythonmod/interface.i | 1857 +++++ contrib/unbound/pythonmod/pythonmod_utils.c | 201 + contrib/unbound/respip/respip.c | 74 +- contrib/unbound/respip/respip.h | 33 +- contrib/unbound/services/authzone.c | 278 +- contrib/unbound/services/authzone.h | 40 +- contrib/unbound/services/cache/dns.c | 45 +- contrib/unbound/services/cache/dns.h | 5 +- contrib/unbound/services/cache/infra.c | 170 +- contrib/unbound/services/cache/infra.h | 31 + contrib/unbound/services/listen_dnsport.c | 173 +- contrib/unbound/services/listen_dnsport.h | 25 +- contrib/unbound/services/localzone.c | 50 +- contrib/unbound/services/localzone.h | 14 + contrib/unbound/services/mesh.c | 303 +- contrib/unbound/services/mesh.h | 24 + contrib/unbound/services/outside_network.c | 33 +- contrib/unbound/services/outside_network.h | 6 +- contrib/unbound/services/rpz.c | 43 +- contrib/unbound/services/rpz.h | 7 + contrib/unbound/services/view.c | 41 +- contrib/unbound/services/view.h | 26 +- contrib/unbound/sldns/keyraw.c | 2 + contrib/unbound/sldns/rrdef.c | 10 +- contrib/unbound/sldns/rrdef.h | 6 + contrib/unbound/sldns/str2wire.c | 54 +- contrib/unbound/sldns/str2wire.h | 9 + contrib/unbound/sldns/wire2str.c | 50 +- contrib/unbound/sldns/wire2str.h | 13 + contrib/unbound/smallapp/unbound-checkconf.c | 12 +- .../unbound/smallapp/unbound-control-setup.sh.in | 3 +- contrib/unbound/smallapp/unbound-control.c | 24 +- contrib/unbound/smallapp/worker_cb.c | 14 + contrib/unbound/testcode/checklocks.c | 916 +++ contrib/unbound/testcode/do-tests.sh | 76 + contrib/unbound/testcode/doqclient.c | 2715 +++++++ contrib/unbound/testcode/fake_event.c | 2022 +++++ contrib/unbound/testcode/testbound.c | 668 ++ contrib/unbound/testcode/unitdname.c | 1037 +++ contrib/unbound/testcode/unitinfra.c | 209 + contrib/unbound/testcode/unitldns.c | 284 + contrib/unbound/testcode/unitmain.c | 1377 ++++ contrib/unbound/testcode/unitmain.h | 92 + contrib/unbound/testcode/unitneg.c | 545 ++ contrib/unbound/testcode/unitverify.c | 573 ++ contrib/unbound/testcode/unitzonemd.c | 541 ++ .../09-unbound-control.conf | 31 + .../09-unbound-control.test | 493 ++ .../09-unbound-control.testns | 44 + .../testdata/acl_interface.tdir/acl_interface.conf | 198 + .../acl_interface.tdir/acl_interface.test.scenario | 268 + .../unbound/testdata/auth_tls.tdir/auth_tls.pre | 48 + .../auth_tls_failcert.tdir/auth_tls_failcert.pre | 48 + contrib/unbound/testdata/cachedb_expired.crpl | 325 + .../testdata/cachedb_expired_reply_ttl.crpl | 260 + .../unbound/testdata/cachedb_servfail_cname.crpl | 181 + contrib/unbound/testdata/cachedb_val_expired.crpl | 328 + contrib/unbound/testdata/common.sh | 394 + contrib/unbound/testdata/dns_error_reporting.rpl | 200 + contrib/unbound/testdata/dnstap.tdir/dnstap.conf | 43 + .../testdata/fast_reload_fwd.tdir/auth1.zone | 2 + .../testdata/fast_reload_fwd.tdir/auth2.zone | 2 + .../fast_reload_fwd.tdir/fast_reload_fwd.conf | 107 + .../fast_reload_fwd.tdir/fast_reload_fwd.conf2 | 108 + .../fast_reload_fwd.tdir/fast_reload_fwd.dsc | 16 + .../fast_reload_fwd.tdir/fast_reload_fwd.ns1 | 339 + .../fast_reload_fwd.tdir/fast_reload_fwd.ns2 | 285 + .../fast_reload_fwd.tdir/fast_reload_fwd.post | 27 + .../fast_reload_fwd.tdir/fast_reload_fwd.pre | 56 + .../fast_reload_fwd.tdir/fast_reload_fwd.test | 320 + .../auth.nlnetlabs.nl.zone | 3 + .../fast_reload_most_options.conf | 143 + .../fast_reload_most_options.dsc | 16 + .../fast_reload_most_options.post | 11 + .../fast_reload_most_options.pre | 33 + .../fast_reload_most_options.test | 42 + .../rpz.nlnetlabs.nl.zone | 5 + .../fast_reload_thread.conf | 20 + .../fast_reload_thread.tdir/fast_reload_thread.dsc | 16 + .../fast_reload_thread.post | 11 + .../fast_reload_thread.tdir/fast_reload_thread.pre | 34 + .../fast_reload_thread.test | 38 + contrib/unbound/testdata/fwd_0ttlservfail.rpl | 87 + contrib/unbound/testdata/iter_failreply.rpl | 131 + contrib/unbound/testdata/iter_fwdstubauth.rpl | 155 + contrib/unbound/testdata/iter_scrub_rr_length.rpl | 297 + .../testdata/log_servfail.tdir/log_servfail.conf | 27 + .../testdata/log_servfail.tdir/log_servfail.dsc | 16 + .../testdata/log_servfail.tdir/log_servfail.post | 10 + .../testdata/log_servfail.tdir/log_servfail.pre | 21 + .../testdata/log_servfail.tdir/log_servfail.test | 47 + .../unbound/testdata/redis_replica.tdir/after.zone | 2 + .../testdata/redis_replica.tdir/before.zone | 2 + .../unbound/testdata/redis_replica.tdir/redis.conf | 583 ++ .../testdata/redis_replica.tdir/redis_replica.conf | 31 + .../testdata/redis_replica.tdir/redis_replica.dsc | 16 + .../testdata/redis_replica.tdir/redis_replica.post | 18 + .../testdata/redis_replica.tdir/redis_replica.pre | 46 + .../testdata/redis_replica.tdir/redis_replica.test | 78 + .../redis_replica.tdir/unbound_control.key | 39 + .../redis_replica.tdir/unbound_control.pem | 22 + .../testdata/redis_replica.tdir/unbound_server.key | 39 + .../testdata/redis_replica.tdir/unbound_server.pem | 22 + contrib/unbound/testdata/rpz_nsdname.rpl | 471 ++ contrib/unbound/testdata/rpz_val_block.rpl | 642 ++ contrib/unbound/testdata/serve_expired.rpl | 126 + .../unbound/testdata/serve_expired_0ttl_nodata.rpl | 154 + .../testdata/serve_expired_0ttl_nxdomain.rpl | 154 + .../testdata/serve_expired_0ttl_servfail.rpl | 129 + .../testdata/serve_expired_cached_servfail.rpl | 130 + .../serve_expired_cached_servfail_refresh.rpl | 145 + .../serve_expired_client_timeout_servfail.rpl | 219 + .../serve_expired_client_timeout_val_bogus.rpl | 328 + .../unbound/testdata/serve_expired_reply_ttl.rpl | 106 + contrib/unbound/testdata/serve_expired_ttl.rpl | 101 + .../unbound/testdata/serve_expired_ttl_reset.rpl | 101 + .../unbound/testdata/serve_expired_val_bogus.rpl | 389 + contrib/unbound/testdata/serve_expired_zerottl.rpl | 157 + contrib/unbound/testdata/serve_original_ttl.rpl | 139 + .../testdata/stat_values.tdir/stat_values.conf | 44 + .../testdata/stat_values.tdir/stat_values.pre | 50 + .../testdata/stat_values.tdir/stat_values.test | 680 ++ .../testdata/stat_values.tdir/stat_values.testns | 82 + .../stat_values.tdir/stat_values_cachedb.conf | 30 + .../stat_values_discard_wait_limit.conf | 36 + .../unbound/testdata/subnet_cached_servfail.crpl | 168 + .../subnet_global_prefetch_always_forward.crpl | 168 + .../testdata/subnet_global_prefetch_expired.crpl | 242 + contrib/unbound/testdata/test_ldnsrr.4 | 80 + contrib/unbound/testdata/test_ldnsrr.5 | 178 + contrib/unbound/testdata/test_ldnsrr.c3 | 1068 +++ contrib/unbound/testdata/test_ldnsrr.c4 | 84 + contrib/unbound/testdata/test_ldnsrr.c5 | 220 + contrib/unbound/testdata/val_failure_dnskey.rpl | 347 + contrib/unbound/testdata/val_scrub_rr_length.rpl | 163 + contrib/unbound/util/config_file.c | 169 +- contrib/unbound/util/config_file.h | 74 +- contrib/unbound/util/configlexer.c | 7712 ++++++++++---------- contrib/unbound/util/configlexer.lex | 25 +- contrib/unbound/util/configparser.c | 4659 ++++++------ contrib/unbound/util/configparser.h | 352 +- contrib/unbound/util/configparser.y | 143 +- contrib/unbound/util/data/dname.c | 16 +- contrib/unbound/util/data/dname.h | 5 +- contrib/unbound/util/data/msgreply.c | 18 +- contrib/unbound/util/data/msgreply.h | 4 +- contrib/unbound/util/edns.c | 23 + contrib/unbound/util/edns.h | 16 + contrib/unbound/util/fptr_wlist.c | 3 + contrib/unbound/util/iana_ports.inc | 5 +- contrib/unbound/util/log.c | 2 +- contrib/unbound/util/module.c | 8 +- contrib/unbound/util/module.h | 5 + contrib/unbound/util/net_help.c | 163 +- contrib/unbound/util/net_help.h | 29 +- contrib/unbound/util/netevent.c | 243 +- contrib/unbound/util/netevent.h | 21 +- contrib/unbound/util/shm_side/shm_main.c | 2 +- contrib/unbound/util/storage/dnstree.c | 2 +- contrib/unbound/util/storage/lruhash.c | 30 + contrib/unbound/util/storage/lruhash.h | 10 + contrib/unbound/util/storage/slabhash.c | 9 + contrib/unbound/util/storage/slabhash.h | 7 + contrib/unbound/util/tcp_conn_limit.c | 11 + contrib/unbound/util/tcp_conn_limit.h | 9 + contrib/unbound/util/tube.c | 5 +- contrib/unbound/util/ub_event.c | 61 +- contrib/unbound/validator/autotrust.c | 33 +- contrib/unbound/validator/val_anchor.c | 78 +- contrib/unbound/validator/val_anchor.h | 10 +- contrib/unbound/validator/val_neg.c | 9 + contrib/unbound/validator/val_neg.h | 7 + contrib/unbound/validator/validator.c | 99 +- contrib/unbound/validator/validator.h | 23 + contrib/unbound/winrc/win_svc.c | 660 ++ 222 files changed, 41990 insertions(+), 7275 deletions(-) diff --git a/contrib/unbound/Makefile.in b/contrib/unbound/Makefile.in index c262250ca2c5..463cdac286e1 100644 --- a/contrib/unbound/Makefile.in +++ b/contrib/unbound/Makefile.in @@ -179,11 +179,11 @@ testcode/unitlruhash.c testcode/unitmain.c testcode/unitmsgparse.c \ testcode/unitneg.c testcode/unitregional.c testcode/unitslabhash.c \ testcode/unitverify.c testcode/readhex.c testcode/testpkts.c testcode/unitldns.c \ testcode/unitecs.c testcode/unitauth.c testcode/unitzonemd.c \ -testcode/unittcpreuse.c testcode/unitdoq.c +testcode/unittcpreuse.c testcode/unitdoq.c testcode/unitinfra.c UNITTEST_OBJ=unitanchor.lo unitdname.lo unitlruhash.lo unitmain.lo \ unitmsgparse.lo unitneg.lo unitregional.lo unitslabhash.lo unitverify.lo \ readhex.lo testpkts.lo unitldns.lo unitecs.lo unitauth.lo unitzonemd.lo \ -unittcpreuse.lo unitdoq.lo +unittcpreuse.lo unitdoq.lo unitinfra.lo UNITTEST_OBJ_LINK=$(UNITTEST_OBJ) worker_cb.lo $(COMMON_OBJ) $(SLDNS_OBJ) \ $(COMPAT_OBJ) DAEMON_SRC=daemon/acl_list.c daemon/cachedump.c daemon/daemon.c \ @@ -509,10 +509,15 @@ util/configlexer.c: $(srcdir)/util/configlexer.lex util/configparser.h fi @if test ! -f $@; then echo "No $@ : need flex and bison to compile from source repository"; exit 1; fi -util/configparser.c util/configparser.h: $(srcdir)/util/configparser.y +# Builds both util/configparser.c and util/configparser.h. +# To avoid double-building we split one target out. +util/configparser.c: $(srcdir)/util/configparser.y @-if test ! -d util; then $(INSTALL) -d util; fi $(YACC) -d -o util/configparser.c $(srcdir)/util/configparser.y +util/configparser.h: util/configparser.c + touch $@ + clean: rm -f *.o *.d *.lo *~ tags rm -f unbound$(EXEEXT) unbound-checkconf$(EXEEXT) unbound-host$(EXEEXT) unbound-control$(EXEEXT) unbound-anchor$(EXEEXT) unbound-control-setup libunbound.la unbound.h @@ -876,7 +881,7 @@ view.lo view.o: $(srcdir)/services/view.c config.h $(srcdir)/services/view.h $(s $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h \ $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/data/msgreply.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h + $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h $(srcdir)/respip/respip.h rpz.lo rpz.o: $(srcdir)/services/rpz.c config.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \ $(srcdir)/util/rbtree.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/storage/dnstree.h \ $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/data/msgreply.h \ @@ -972,7 +977,7 @@ fptr_wlist.lo fptr_wlist.o: $(srcdir)/util/fptr_wlist.c config.h $(srcdir)/util/ $(srcdir)/validator/val_nsec3.h $(srcdir)/validator/val_sigcrypt.h $(srcdir)/validator/val_kentry.h \ $(srcdir)/validator/val_neg.h $(srcdir)/validator/autotrust.h $(srcdir)/libunbound/libworker.h \ $(srcdir)/libunbound/context.h $(srcdir)/util/alloc.h $(srcdir)/libunbound/unbound-event.h \ - $(srcdir)/libunbound/worker.h + $(srcdir)/libunbound/worker.h $(srcdir)/daemon/remote.h locks.lo locks.o: $(srcdir)/util/locks.c config.h $(srcdir)/util/locks.h $(srcdir)/util/log.h log.lo log.o: $(srcdir)/util/log.c config.h $(srcdir)/util/log.h $(srcdir)/util/locks.h $(srcdir)/sldns/sbuffer.h mini_event.lo mini_event.o: $(srcdir)/util/mini_event.c config.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h \ @@ -1059,7 +1064,7 @@ tube.lo tube.o: $(srcdir)/util/tube.c config.h $(srcdir)/util/tube.h $(srcdir)/u $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/util/ub_event.h ub_event.lo ub_event.o: $(srcdir)/util/ub_event.c config.h $(srcdir)/util/ub_event.h $(srcdir)/util/log.h \ $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/util/tube.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h + $(srcdir)/util/tube.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h $(srcdir)/daemon/remote.h ub_event_pluggable.lo ub_event_pluggable.o: $(srcdir)/util/ub_event_pluggable.c config.h $(srcdir)/util/ub_event.h \ $(srcdir)/libunbound/unbound-event.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ $(srcdir)/util/log.h $(srcdir)/util/fptr_wlist.h \ @@ -1256,6 +1261,7 @@ unitzonemd.lo unitzonemd.o: $(srcdir)/testcode/unitzonemd.c config.h $(srcdir)/u $(srcdir)/validator/val_anchor.h unittcpreuse.lo unittcpreuse.o: $(srcdir)/testcode/unittcpreuse.c config.h $(srcdir)/services/outside_network.h \ $(srcdir)/util/random.h +unitinfra.lo unitinfra.o: $(srcdir)/testcode/unitinfra.c config.h $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h $(srcdir)/iterator/iterator.h acl_list.lo acl_list.o: $(srcdir)/daemon/acl_list.c config.h $(srcdir)/daemon/acl_list.h \ $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/services/view.h $(srcdir)/util/locks.h \ $(srcdir)/util/log.h $(srcdir)/util/regional.h $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h \ @@ -1307,7 +1313,10 @@ remote.lo remote.o: $(srcdir)/daemon/remote.c config.h $(srcdir)/daemon/remote.h $(srcdir)/validator/val_anchor.h $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h \ $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h $(srcdir)/iterator/iter_delegpt.h \ $(srcdir)/services/outside_network.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/parseutil.h \ - $(srcdir)/sldns/wire2str.h $(srcdir)/util/edns.h + $(srcdir)/sldns/wire2str.h $(srcdir)/util/edns.h \ + $(srcdir)/util/locks.h $(srcdir)/util/ub_event.h \ + $(srcdir)/util/tcp_conn_limit.h $(srcdir)/util/edns.h $(srcdir)/validator/val_neg.h \ + $(srcdir)/iterator/iter_utils.h $(srcdir)/iterator/iter_donotq.h $(srcdir)/iterator/iter_priv.h stats.lo stats.o: $(srcdir)/daemon/stats.c config.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ $(srcdir)/libunbound/unbound.h $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ diff --git a/contrib/unbound/ax_build_date_epoch.m4 b/contrib/unbound/ax_build_date_epoch.m4 new file mode 100644 index 000000000000..dbecb067a8cb --- /dev/null +++ b/contrib/unbound/ax_build_date_epoch.m4 @@ -0,0 +1,70 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_build_date_epoch.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BUILD_DATE_EPOCH(VARIABLE[, FORMAT[, ACTION-IF-FAIL]]) +# +# DESCRIPTION +# +# Sets VARIABLE to a string representing the current time. It is +# formatted according to FORMAT if specified, otherwise it is formatted as +# the number of seconds (excluding leap seconds) since the UNIX epoch (01 +# Jan 1970 00:00:00 UTC). +# +# If the SOURCE_DATE_EPOCH environment variable is set, it uses the value +# of that variable instead of the current time. See +# https://reproducible-builds.org/specs/source-date-epoch). If +# SOURCE_DATE_EPOCH is set but cannot be properly interpreted as a UNIX +# timestamp, then execute ACTION-IF-FAIL if specified, otherwise error. +# +# VARIABLE is AC_SUBST-ed. +# +# LICENSE +# +# Copyright (c) 2016 Eric Bavier +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 2 + +AC_DEFUN([AX_BUILD_DATE_EPOCH], +[dnl +AC_MSG_CHECKING([for build time]) +ax_date_fmt="m4_default($2,%s)" +AS_IF([test x"$SOURCE_DATE_EPOCH" = x], + [$1=`date "+$ax_date_fmt"`], + [ax_build_date=`date -u -d "@$SOURCE_DATE_EPOCH" "+$ax_date_fmt" 2>/dev/null \ + || date -u -r "$SOURCE_DATE_EPOCH" "+$ax_date_fmt" 2>/dev/null` + AS_IF([test x"$ax_build_date" = x], + [m4_ifval([$3], + [$3], + [AC_MSG_ERROR([malformed SOURCE_DATE_EPOCH])])], + [$1=$ax_build_date])]) +AC_MSG_RESULT([$$1]) +])dnl AX_BUILD_DATE_EPOCH diff --git a/contrib/unbound/cachedb/cachedb.c b/contrib/unbound/cachedb/cachedb.c index 0329f8458bd7..bdb1754e42d2 100644 --- a/contrib/unbound/cachedb/cachedb.c +++ b/contrib/unbound/cachedb/cachedb.c @@ -47,6 +47,7 @@ #include "util/regional.h" #include "util/net_help.h" #include "util/config_file.h" +#include "util/data/dname.h" #include "util/data/msgreply.h" #include "util/data/msgencode.h" #include "services/cache/dns.h" @@ -341,6 +342,7 @@ calc_hash(struct query_info* qinfo, struct module_env* env, char* buf, /* copy the hash info into the clear buffer */ if(clen + qinfo->qname_len < sizeof(clear)) { memmove(clear+clen, qinfo->qname, qinfo->qname_len); + query_dname_tolower(clear+clen); clen += qinfo->qname_len; } if(clen + 4 < sizeof(clear)) { @@ -755,7 +757,8 @@ cachedb_intcache_store(struct module_qstate* qstate, int msg_expired) } (void)dns_cache_store(qstate->env, &qstate->qinfo, qstate->return_msg->rep, 0, qstate->prefetch_leeway, 0, - qstate->region, store_flags, qstate->qstarttime); + qstate->region, store_flags, qstate->qstarttime, + qstate->is_valrec); if(serve_expired && msg_expired) { if(qstate->env->cfg->serve_expired_client_timeout) { /* No expired response from the query state, the diff --git a/contrib/unbound/cachedb/redis.c b/contrib/unbound/cachedb/redis.c index 68c033535a69..3dfa95859eb8 100644 --- a/contrib/unbound/cachedb/redis.c +++ b/contrib/unbound/cachedb/redis.c @@ -52,19 +52,38 @@ #include "hiredis/hiredis.h" struct redis_moddata { - redisContext** ctxs; /* thread-specific redis contexts */ - int numctxs; /* number of ctx entries */ - const char* server_host; /* server's IP address or host name */ - int server_port; /* server's TCP port */ - const char* server_path; /* server's unix path, or "", NULL if unused */ - const char* server_password; /* server's AUTH password, or "", NULL if unused */ - struct timeval command_timeout; /* timeout for commands */ - struct timeval connect_timeout; /* timeout for connect */ - int logical_db; /* the redis logical database to use */ + /* thread-specific redis contexts */ + redisContext** ctxs; + redisContext** replica_ctxs; + /* number of ctx entries */ + int numctxs; + /* server's IP address or host name */ + const char* server_host; + const char* replica_server_host; + /* server's TCP port */ + int server_port; + int replica_server_port; + /* server's unix path, or "", NULL if unused */ + const char* server_path; + const char* replica_server_path; + /* server's AUTH password, or "", NULL if unused */ + const char* server_password; + const char* replica_server_password; + /* timeout for commands */ + struct timeval command_timeout; + struct timeval replica_command_timeout; + /* timeout for connection setup */ + struct timeval connect_timeout; + struct timeval replica_connect_timeout; + /* the redis logical database to use */ + int logical_db; + int replica_logical_db; + /* if the SET with EX command is supported */ + int set_with_ex_available; }; static redisReply* redis_command(struct module_env*, struct cachedb_env*, - const char*, const uint8_t*, size_t); + const char*, const uint8_t*, size_t, int); static void moddata_clean(struct redis_moddata** moddata) { @@ -78,21 +97,30 @@ moddata_clean(struct redis_moddata** moddata) { } free((*moddata)->ctxs); } + if((*moddata)->replica_ctxs) { + int i; + for(i = 0; i < (*moddata)->numctxs; i++) { + if((*moddata)->replica_ctxs[i]) + redisFree((*moddata)->replica_ctxs[i]); + } + free((*moddata)->replica_ctxs); + } free(*moddata); *moddata = NULL; } static redisContext* -redis_connect(const struct redis_moddata* moddata) +redis_connect(const char* host, int port, const char* path, + const char* password, int logical_db, + const struct timeval connect_timeout, + const struct timeval command_timeout) { redisContext* ctx; - if(moddata->server_path && moddata->server_path[0]!=0) { - ctx = redisConnectUnixWithTimeout(moddata->server_path, - moddata->connect_timeout); + if(path && path[0]!=0) { + ctx = redisConnectUnixWithTimeout(path, connect_timeout); } else { - ctx = redisConnectWithTimeout(moddata->server_host, - moddata->server_port, moddata->connect_timeout); + ctx = redisConnectWithTimeout(host, port, connect_timeout); } if(!ctx || ctx->err) { const char *errstr = "out of memory"; @@ -101,13 +129,13 @@ redis_connect(const struct redis_moddata* moddata) log_err("failed to connect to redis server: %s", errstr); goto fail; } - if(redisSetTimeout(ctx, moddata->command_timeout) != REDIS_OK) { - log_err("failed to set redis timeout"); + if(redisSetTimeout(ctx, command_timeout) != REDIS_OK) { + log_err("failed to set redis timeout, %s", ctx->errstr); goto fail; } - if(moddata->server_password && moddata->server_password[0]!=0) { + if(password && password[0]!=0) { redisReply* rep; - rep = redisCommand(ctx, "AUTH %s", moddata->server_password); + rep = redisCommand(ctx, "AUTH %s", password); if(!rep || rep->type == REDIS_REPLY_ERROR) { log_err("failed to authenticate with password"); freeReplyObject(rep); @@ -115,18 +143,25 @@ redis_connect(const struct redis_moddata* moddata) } freeReplyObject(rep); } - if(moddata->logical_db > 0) { + if(logical_db > 0) { redisReply* rep; - rep = redisCommand(ctx, "SELECT %d", moddata->logical_db); + rep = redisCommand(ctx, "SELECT %d", logical_db); if(!rep || rep->type == REDIS_REPLY_ERROR) { log_err("failed to set logical database (%d)", - moddata->logical_db); + logical_db); freeReplyObject(rep); goto fail; } freeReplyObject(rep); } - verbose(VERB_OPS, "Connection to Redis established"); + if(verbosity >= VERB_OPS) { + char port_str[6+1]; + port_str[0] = ' '; + (void)snprintf(port_str+1, sizeof(port_str)-1, "%d", port); + verbose(VERB_OPS, "Connection to Redis established (%s%s)", + path&&path[0]!=0?path:host, + path&&path[0]!=0?"":port_str); + } return ctx; fail: @@ -135,6 +170,14 @@ fail: return NULL; } +static void +set_timeout(struct timeval* timeout, int value, int explicit_value) +{ + int v = explicit_value != 0 ? explicit_value : value; + timeout->tv_sec = v / 1000; + timeout->tv_usec = (v % 1000) * 1000; +} + static int redis_init(struct module_env* env, struct cachedb_env* cachedb_env) { @@ -149,57 +192,98 @@ redis_init(struct module_env* env, struct cachedb_env* cachedb_env) goto fail; } moddata->numctxs = env->cfg->num_threads; - moddata->ctxs = calloc(env->cfg->num_threads, sizeof(redisContext*)); - if(!moddata->ctxs) { - log_err("out of memory"); - goto fail; - } - /* note: server_host is a shallow reference to configured string. - * we don't have to free it in this module. */ + /* note: server_host and similar string configuration options are + * shallow references to configured strings; we don't have to free them + * in this module. */ moddata->server_host = env->cfg->redis_server_host; + moddata->replica_server_host = env->cfg->redis_replica_server_host; + moddata->server_port = env->cfg->redis_server_port; + moddata->replica_server_port = env->cfg->redis_replica_server_port; + moddata->server_path = env->cfg->redis_server_path; + moddata->replica_server_path = env->cfg->redis_replica_server_path; + moddata->server_password = env->cfg->redis_server_password; - moddata->command_timeout.tv_sec = env->cfg->redis_timeout / 1000; - moddata->command_timeout.tv_usec = - (env->cfg->redis_timeout % 1000) * 1000; - moddata->connect_timeout.tv_sec = env->cfg->redis_timeout / 1000; - moddata->connect_timeout.tv_usec = - (env->cfg->redis_timeout % 1000) * 1000; - if(env->cfg->redis_command_timeout != 0) { - moddata->command_timeout.tv_sec = - env->cfg->redis_command_timeout / 1000; - moddata->command_timeout.tv_usec = - (env->cfg->redis_command_timeout % 1000) * 1000; + moddata->replica_server_password = env->cfg->redis_replica_server_password; + + set_timeout(&moddata->command_timeout, + env->cfg->redis_timeout, + env->cfg->redis_command_timeout); + set_timeout(&moddata->replica_command_timeout, + env->cfg->redis_replica_timeout, + env->cfg->redis_replica_command_timeout); + set_timeout(&moddata->connect_timeout, + env->cfg->redis_timeout, + env->cfg->redis_connect_timeout); + set_timeout(&moddata->replica_connect_timeout, + env->cfg->redis_replica_timeout, + env->cfg->redis_replica_connect_timeout); + + moddata->logical_db = env->cfg->redis_logical_db; + moddata->replica_logical_db = env->cfg->redis_replica_logical_db; + + moddata->ctxs = calloc(env->cfg->num_threads, sizeof(redisContext*)); + if(!moddata->ctxs) { + log_err("out of memory"); + goto fail; } - if(env->cfg->redis_connect_timeout != 0) { - moddata->connect_timeout.tv_sec = - env->cfg->redis_connect_timeout / 1000; - moddata->connect_timeout.tv_usec = - (env->cfg->redis_connect_timeout % 1000) * 1000; + if((moddata->replica_server_host && moddata->replica_server_host[0]!=0) + || (moddata->replica_server_path && moddata->replica_server_path[0]!=0)) { + /* There is a replica configured, allocate ctxs */ + moddata->replica_ctxs = calloc(env->cfg->num_threads, sizeof(redisContext*)); + if(!moddata->replica_ctxs) { + log_err("out of memory"); + goto fail; + } } - moddata->logical_db = env->cfg->redis_logical_db; for(i = 0; i < moddata->numctxs; i++) { - redisContext* ctx = redis_connect(moddata); + redisContext* ctx = redis_connect( + moddata->server_host, + moddata->server_port, + moddata->server_path, + moddata->server_password, + moddata->logical_db, + moddata->connect_timeout, + moddata->command_timeout); if(!ctx) { - log_err("redis_init: failed to init redis"); - goto fail; + log_err("redis_init: failed to init redis " + "(for thread %d)", i); + /* And continue, the context can be established + * later, just like after a disconnect. */ } moddata->ctxs[i] = ctx; } + if(moddata->replica_ctxs) { + for(i = 0; i < moddata->numctxs; i++) { + redisContext* ctx = redis_connect( + moddata->replica_server_host, + moddata->replica_server_port, + moddata->replica_server_path, + moddata->replica_server_password, + moddata->replica_logical_db, + moddata->replica_connect_timeout, + moddata->replica_command_timeout); + if(!ctx) { + log_err("redis_init: failed to init redis " + "replica (for thread %d)", i); + /* And continue, the context can be established + * later, just like after a disconnect. */ + } + moddata->replica_ctxs[i] = ctx; + } + } cachedb_env->backend_data = moddata; - if(env->cfg->redis_expire_records) { + if(env->cfg->redis_expire_records && + moddata->ctxs[env->alloc->thread_num] != NULL) { redisReply* rep = NULL; int redis_reply_type = 0; - /** check if setex command is supported */ + /** check if set with ex command is supported */ rep = redis_command(env, cachedb_env, - "SETEX __UNBOUND_REDIS_CHECK__ 1 none", NULL, 0); + "SET __UNBOUND_REDIS_CHECK__ none EX 1", NULL, 0, 1); if(!rep) { /** init failed, no response from redis server*/ - log_err("redis_init: failed to init redis, the " - "redis-expire-records option requires the SETEX command " - "(redis >= 2.0.0)"); - goto fail; + goto set_with_ex_fail; } redis_reply_type = rep->type; freeReplyObject(rep); @@ -207,15 +291,18 @@ redis_init(struct module_env* env, struct cachedb_env* cachedb_env) case REDIS_REPLY_STATUS: break; default: - /** init failed, setex command not supported */ - log_err("redis_init: failed to init redis, the " - "redis-expire-records option requires the SETEX command " - "(redis >= 2.0.0)"); - goto fail; + /** init failed, set_with_ex command not supported */ + goto set_with_ex_fail; } + moddata->set_with_ex_available = 1; } return 1; +set_with_ex_fail: + log_err("redis_init: failure during redis_init, the " + "redis-expire-records option requires the SET with EX command " + "(redis >= 2.6.2)"); + return 1; fail: moddata_clean(&moddata); return 0; @@ -246,9 +333,9 @@ redis_deinit(struct module_env* env, struct cachedb_env* cachedb_env) */ static redisReply* redis_command(struct module_env* env, struct cachedb_env* cachedb_env, - const char* command, const uint8_t* data, size_t data_len) + const char* command, const uint8_t* data, size_t data_len, int write) { - redisContext* ctx; + redisContext* ctx, **ctx_selector; redisReply* rep; struct redis_moddata* d = (struct redis_moddata*) cachedb_env->backend_data; @@ -259,17 +346,38 @@ redis_command(struct module_env* env, struct cachedb_env* cachedb_env, * assumption throughout the unbound architecture, so we simply assert * it. */ log_assert(env->alloc->thread_num < d->numctxs); - ctx = d->ctxs[env->alloc->thread_num]; + + ctx_selector = !write && d->replica_ctxs + ?d->replica_ctxs + :d->ctxs; + ctx = ctx_selector[env->alloc->thread_num]; /* If we've not established a connection to the server or we've closed * it on a failure, try to re-establish a new one. Failures will be * logged in redis_connect(). */ if(!ctx) { - ctx = redis_connect(d); - d->ctxs[env->alloc->thread_num] = ctx; + if(!write && d->replica_ctxs) { + ctx = redis_connect( + d->replica_server_host, + d->replica_server_port, + d->replica_server_path, + d->replica_server_password, + d->replica_logical_db, + d->replica_connect_timeout, + d->replica_command_timeout); + } else { + ctx = redis_connect( + d->server_host, + d->server_port, + d->server_path, + d->server_password, + d->logical_db, + d->connect_timeout, + d->command_timeout); + } + ctx_selector[env->alloc->thread_num] = ctx; } - if(!ctx) - return NULL; + if(!ctx) return NULL; /* Send the command and get a reply, synchronously. */ rep = (redisReply*)redisCommand(ctx, command, data, data_len); @@ -279,7 +387,7 @@ redis_command(struct module_env* env, struct cachedb_env* cachedb_env, log_err("redis_command: failed to receive a reply, " "closing connection: %s", ctx->errstr); redisFree(ctx); - d->ctxs[env->alloc->thread_num] = NULL; + ctx_selector[env->alloc->thread_num] = NULL; return NULL; } @@ -309,7 +417,7 @@ redis_lookup(struct module_env* env, struct cachedb_env* cachedb_env, return 0; } - rep = redis_command(env, cachedb_env, cmdbuf, NULL, 0); + rep = redis_command(env, cachedb_env, cmdbuf, NULL, 0, 0); if(!rep) return 0; switch(rep->type) { @@ -346,11 +454,16 @@ redis_store(struct module_env* env, struct cachedb_env* cachedb_env, { redisReply* rep; int n; - int set_ttl = (env->cfg->redis_expire_records && + struct redis_moddata* moddata = (struct redis_moddata*) + cachedb_env->backend_data; + int set_ttl = (moddata->set_with_ex_available && + env->cfg->redis_expire_records && (!env->cfg->serve_expired || env->cfg->serve_expired_ttl > 0)); /* Supported commands: * - "SET " + key + " %b" - * - "SETEX " + key + " " + ttl + " %b" + * - "SET " + key + " %b EX " + ttl + * older redis 2.0.0 was "SETEX " + key + " " + ttl + " %b" + * - "EXPIRE " + key + " 0" */ char cmdbuf[6+(CACHEDB_HASHSIZE/8)*2+11+3+1]; @@ -358,14 +471,22 @@ redis_store(struct module_env* env, struct cachedb_env* cachedb_env, verbose(VERB_ALGO, "redis_store %s (%d bytes)", key, (int)data_len); /* build command to set to a binary safe string */ n = snprintf(cmdbuf, sizeof(cmdbuf), "SET %s %%b", key); + } else if(ttl == 0) { + /* use the EXPIRE command, SET with EX 0 is an invalid time. */ + /* Replies with REDIS_REPLY_INTEGER of 1. */ + verbose(VERB_ALGO, "redis_store expire %s (%d bytes)", + key, (int)data_len); + n = snprintf(cmdbuf, sizeof(cmdbuf), "EXPIRE %s 0", key); + data = NULL; + data_len = 0; } else { /* add expired ttl time to redis ttl to avoid premature eviction of key */ ttl += env->cfg->serve_expired_ttl; verbose(VERB_ALGO, "redis_store %s (%d bytes) with ttl %u", - key, (int)data_len, (uint32_t)ttl); + key, (int)data_len, (unsigned)(uint32_t)ttl); /* build command to set to a binary safe string */ - n = snprintf(cmdbuf, sizeof(cmdbuf), "SETEX %s %u %%b", key, - (uint32_t)ttl); + n = snprintf(cmdbuf, sizeof(cmdbuf), "SET %s %%b EX %u", key, + (unsigned)(uint32_t)ttl); } @@ -374,11 +495,12 @@ redis_store(struct module_env* env, struct cachedb_env* cachedb_env, return; } - rep = redis_command(env, cachedb_env, cmdbuf, data, data_len); + rep = redis_command(env, cachedb_env, cmdbuf, data, data_len, 1); if(rep) { verbose(VERB_ALGO, "redis_store set completed"); if(rep->type != REDIS_REPLY_STATUS && - rep->type != REDIS_REPLY_ERROR) { + rep->type != REDIS_REPLY_ERROR && + rep->type != REDIS_REPLY_INTEGER) { log_err("redis_store: unexpected type of reply (%d)", rep->type); } diff --git a/contrib/unbound/compat/malloc.c b/contrib/unbound/compat/malloc.c index d8097b13e024..74beae01c98c 100644 --- a/contrib/unbound/compat/malloc.c +++ b/contrib/unbound/compat/malloc.c @@ -5,12 +5,8 @@ #undef malloc #include -#ifndef USE_WINSOCK -void *malloc (); -#else /* provide a prototype */ void *malloc (size_t n); -#endif /* Allocate an N-byte block of memory from the heap. If N is zero, allocate a 1-byte block. */ diff --git a/contrib/unbound/config.h.in b/contrib/unbound/config.h.in index dc03e82dddba..f2dc8c8b92b3 100644 --- a/contrib/unbound/config.h.in +++ b/contrib/unbound/config.h.in @@ -378,6 +378,9 @@ /* Define if we have LibreSSL */ #undef HAVE_LIBRESSL +/* If we have atomic_store */ +#undef HAVE_LINK_ATOMIC_STORE + /* Define to 1 if you have the header file. */ #undef HAVE_LINUX_NET_TSTAMP_H @@ -663,6 +666,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDARG_H +/* Define to 1 if you have the header file. */ +#undef HAVE_STDATOMIC_H + /* Define to 1 if you have the header file. */ #undef HAVE_STDBOOL_H diff --git a/contrib/unbound/configure b/contrib/unbound/configure index 918a0632013d..0b78d97b16e9 100755 --- a/contrib/unbound/configure +++ b/contrib/unbound/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for unbound 1.22.0. +# Generated by GNU Autoconf 2.71 for unbound 1.23.0. # # Report bugs to . # @@ -622,8 +622,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unbound' PACKAGE_TARNAME='unbound' -PACKAGE_VERSION='1.22.0' -PACKAGE_STRING='unbound 1.22.0' +PACKAGE_VERSION='1.23.0' +PACKAGE_STRING='unbound 1.23.0' PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues' PACKAGE_URL='' @@ -712,6 +712,7 @@ SSLLIB HAVE_SSL PC_CRYPTO_DEPENDENCY CONFIG_DATE +SOURCE_DATE_EPOCH GCC_DOCKER_LINTFLAGS NETBSD_LINTFLAGS PYUNBOUND_UNINSTALL @@ -959,6 +960,7 @@ SYSTEMD_LIBS SYSTEMD_DAEMON_CFLAGS SYSTEMD_DAEMON_LIBS PYTHON_VERSION +SOURCE_DATE_EPOCH PROTOBUFC_CFLAGS PROTOBUFC_LIBS' @@ -1509,7 +1511,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures unbound 1.22.0 to adapt to many kinds of systems. +\`configure' configures unbound 1.23.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1575,7 +1577,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unbound 1.22.0:";; + short | recursive ) echo "Configuration of unbound 1.23.0:";; esac cat <<\_ACEOF @@ -1752,6 +1754,10 @@ Some influential environment variables: The installed Python version to use, for example '2.3'. This string will be appended to the Python interpreter canonical name. + SOURCE_DATE_EPOCH + If it is set, it uses the value of that variable instead of the + current time as the build timestamp. The format is a unix + timestamp. This enables reproducible build output. PROTOBUFC_CFLAGS C compiler flags for PROTOBUFC, overriding pkg-config PROTOBUFC_LIBS @@ -1824,7 +1830,7 @@ fi test -n "$ac_init_help" && exit $ac_status *** 58195 LINES SKIPPED *** From nobody Sun May 11 04:50:14 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zw9K26KC5z5wL1H; Sun, 11 May 2025 04:50:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zw9K23Hyqz3xyt; Sun, 11 May 2025 04:50:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746939014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7393jEq1hPtGueSO5J+0wjlySQ7nAaOnE7dqWRqup28=; b=Kjh/JAJSr1XVncsEUSjqFlwd1igUzASoNCwN8X5yp/qNsKlJNNzq3SUSuRasAd7Xjt8hct 0yrZNF3uG88oKjWuDqxHgYXUgQMbdPDsDB3dYdzQOE0Bb8DiFIZrVroW9v5kHqPYCMe74K gJgKBHaoRFJzEYGwi518RaGWRGPrlqIo+BFlb29q1ApmecJBSxlQa1xz+PJxrOdFCF6kif onGk4HthzcSFabJ0ZM95O8bb++nucCTjQFM1rNOwCjd3VIi6AHpjtORYCHaIXjA5IJf39C xWPsaB6HrxB9qd/IRuBlL2HhFyX+atj8rvRtFKOxcA9B410ZXXUS+J/NqOiCiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746939014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7393jEq1hPtGueSO5J+0wjlySQ7nAaOnE7dqWRqup28=; b=bUzTJ9z3mF60fKW1aPj+V31BZ/7gXFWAI0tba3bwXtHeXFfYNEVTFd3P17PmhMhsD2nf1f V82jRQKnFz6KCvsH5OmVlnsAeNTfHz87p6Eu1TtfSypYxU4XDwqRF8b3ylx52uvILRK13E 4rWPcucNAySGtLLyZcC+TO+n75gb14vkB33brtgxAXUq/vXYyrh2zE1najh1R8U19kvunu EG3HAufKNjhEwcl6ToqTMC31qfAKdIL2Pz8l3XFR91b2N5mJoCwzBKuEZ22PeyOU+RpnPy VJyKUJPUk0EZp4+SH8OW9ri+nNsTY4wxO7qGuv978bSTkNq7z5QelnYGfaQVrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746939014; a=rsa-sha256; cv=none; b=WF5A2ovdw/uVKqmDL6sLRys4tEB4TOUFwF5xlyQwRtOy1T2QgJ+v7GzXYea5vaO7J7c/Am FKeWL3ChQzy5F25xix7TZ4IbCdsuEDllj2zZgQ7kdtiNZvCFpNL7yJdj/xsviwws+D0uIy xfPdfmAdhLWVTbaJAt03oKHHZztTmFovtwPz+jDvM7kJu2g2xZHrZPsxbPj/rM8xGhWiM8 eG4BpTcADY/1Qzd/Nz55lAaV6+UINLrTdi4DblJv/p3mUdJ9ITiWGly06MB71QMh8Vxjfx u0shJztwCpcrRuPIH/e+kPHMb5xv1X4jQyqEqYQUio6uoMVvjvnW28uDHi4ejw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zw9K22YbKz2Gp; Sun, 11 May 2025 04:50:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54B4oE1w090146; Sun, 11 May 2025 04:50:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54B4oEkS090135; Sun, 11 May 2025 04:50:14 GMT (envelope-from git) Date: Sun, 11 May 2025 04:50:14 GMT Message-Id: <202505110450.54B4oEkS090135@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 560608f78a53 - stable/13 - unbound: Update version strings List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 560608f78a538f87559b2bffde27fd75b4abd93e Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=560608f78a538f87559b2bffde27fd75b4abd93e commit 560608f78a538f87559b2bffde27fd75b4abd93e Author: Cy Schubert AuthorDate: 2025-04-27 03:39:21 +0000 Commit: Cy Schubert CommitDate: 2025-05-11 04:49:59 +0000 unbound: Update version strings Fixes: be771a7b7f45 MFC after: 2 weeks (cherry picked from commit 3bef9b313be73788cd3b77d9b514d292169c442e) --- lib/libunbound/config.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libunbound/config.h b/lib/libunbound/config.h index ca2916a6b5b0..c89724b6b8fc 100644 --- a/lib/libunbound/config.h +++ b/lib/libunbound/config.h @@ -796,7 +796,7 @@ #define PACKAGE_NAME "unbound" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "unbound 1.22.0" +#define PACKAGE_STRING "unbound 1.23.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "unbound" @@ -805,7 +805,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.22.0" +#define PACKAGE_VERSION "1.23.0" /* default pidfile location */ #define PIDFILE "/var/unbound/unbound.pid" @@ -828,7 +828,7 @@ #define ROOT_CERT_FILE "/var/unbound/icannbundle.pem" /* version number for resource files */ -#define RSRC_PACKAGE_VERSION 1,22,0,0 +#define RSRC_PACKAGE_VERSION 1,23,0,0 /* Directory to chdir to */ #define RUN_DIR "/var/unbound" From nobody Sun May 11 04:50:15 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zw9K35vsSz5wKr0; Sun, 11 May 2025 04:50:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zw9K33kWyz3yf8; Sun, 11 May 2025 04:50:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746939015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k9v+hagU9cOsB8gHyoJpHHU7dEY5fbssD8kxkhP6N0M=; b=odajXhliRIyAiUJLcGe+LDcfgQVidkmzT9c4ioRmw3cLV+q/YUDa5UFUoDUok9EeOlFzY3 hPjftaNZoRM69NsuQc8A+aJk5xH3DwT2qch5og2dosVC6NF7Q7fAimZJbZpaWFL521VBHB 5KGoGFTBNq9Y2ffr7UGwf4c21KH6bi3BxCvxRzfUNw6Ne+xzCYea1qs0tMQ4MmG4BEcoKj 0Z4GbucjDlxHEmy8J4pDKhmMuNn7RG9QAbqRFT0O0DtGcsZPl4fSQ0M85l2wwwZQ73ujVz nl20l2dVJ/6wRCG1WflasOaUpdc/+ThZY6qPnOn+lPk5so79NUWLn0ZLC6JcMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746939015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k9v+hagU9cOsB8gHyoJpHHU7dEY5fbssD8kxkhP6N0M=; b=qWHwV8eg5gJiwQ9/ThKPzTQ5HpiR14FuCBVadFvt/EQLebRZUQhWSZr4qlM8JkEtaA0hgo U9AiSzRIcvtznWRCmyVyD3dq1++0fZhgP7jfMPSCOQ/FWoCPEGUxfUDxq9pavijS8FSM6r gF+YI/w6JsJ1c0AI/PZRoGSL/xgUUtTXCFeDKEmgaf49ugcjLLs1uEafNoPH71k0NJS6po LaEyt85rSS83oNnOT1JaGEoSM6IiyV1WQa1RxtQ875lUILXOfp9CXjeh5NBhVLE/cPOaFI ZyZGHYQgclEet/CFH4xctLPAAtGEQhCEjnBVjZDldAe2211B/HfW5JEFyw5wJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746939015; a=rsa-sha256; cv=none; b=iAazuG/cLMHRi3yyP4aMWGeQQo+svcVipF4/GsffeB7xvGNQc0cLN1izAHUyH1FEblZWGs GJJq3U5hPWDn7PmqCHomDfFvikqQryY4qC0Hod2bGDyV3ENBbzLQhRUWW2m+kiIiW+3BM7 6lSHFONcz/o1eUYUu/nubglQsTN7Y1k3kDZpifB2QviDMuRRXQ8iZnINev1HAp1uJh/dDX Xd9iHNS1m6iMcfh6lqR6rlD9CLKV2U3Az+jq3qV9rKPfgZnV2NTF/qAEBW30pPBOgsO1Oh 8nIC85Gp3YZgJbBCrXr+GM/lA8eq6Jqtq/G46hRLPOwtmRG4/Ngdvt89xyd6Jg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zw9K33JBhz1q0; Sun, 11 May 2025 04:50:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54B4oF6c090822; Sun, 11 May 2025 04:50:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54B4oFuC090817; Sun, 11 May 2025 04:50:15 GMT (envelope-from git) Date: Sun, 11 May 2025 04:50:15 GMT Message-Id: <202505110450.54B4oFuC090817@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: b3e677d58b7a - stable/13 - wpa_supplicant: Handle systems without INET (legacy IP) support List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b3e677d58b7a3247d213456e05389586da82195e Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=b3e677d58b7a3247d213456e05389586da82195e commit b3e677d58b7a3247d213456e05389586da82195e Author: Marek Zarychta AuthorDate: 2025-04-28 00:02:04 +0000 Commit: Cy Schubert CommitDate: 2025-05-11 04:49:59 +0000 wpa_supplicant: Handle systems without INET (legacy IP) support Currently, wpa_supplicant fails when legacy IP support is disabled in FreeBSD (i.e., the world built with WITHOUT_INET and nooptions INET in the kernel config). The proposed patch allows running wpa_supplicant and connecting to wireless networks without INET support when INET6 is available. Reviewed by: cy, adrian, philip, roy_marples.name Differential Revision: https://reviews.freebsd.org/D49959 (cherry picked from commit 8c7149c73f8f2301369f271c98470b72973b0c01) --- contrib/wpa/src/drivers/driver_bsd.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/contrib/wpa/src/drivers/driver_bsd.c b/contrib/wpa/src/drivers/driver_bsd.c index 5f734b737184..e5ff319637c0 100644 --- a/contrib/wpa/src/drivers/driver_bsd.c +++ b/contrib/wpa/src/drivers/driver_bsd.c @@ -1769,9 +1769,19 @@ bsd_global_init(void *ctx) global->sock = socket(PF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0); if (global->sock < 0) { + if (errno == EAFNOSUPPORT) { + wpa_printf(MSG_INFO, "INET not supported, trying INET6..."); + global->sock = socket(PF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, 0); + if (global->sock < 0) { + wpa_printf(MSG_ERROR, "socket[PF_INET6,SOCK_DGRAM]: %s", + strerror(errno)); + goto fail1; + } + } else { wpa_printf(MSG_ERROR, "socket[PF_INET,SOCK_DGRAM]: %s", strerror(errno)); goto fail1; + } } global->route = socket(PF_ROUTE, From nobody Sun May 11 04:50:16 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zw9K511wtz5wKmt; Sun, 11 May 2025 04:50:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zw9K44PD1z3yj0; Sun, 11 May 2025 04:50:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746939016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EZv1/nTLsq0VULH/NBUyBMAmISbHLMKI3wd3x7rJlos=; b=HnTGIrLd/uhj4yVFe65gnmHkxn73alzJuHG1cASwOPTHlbyDO2achefmKc5Tzws+e9gIV5 dQQui5TQyuUoJvmETgAVGrClp3X7K1FCS9sciWBir0wqtkkYLn3vf5e1MM3yIbFwbT123g kmFSsVLvrVK675Jc5k/8nwYxzZ5+R6667ncfFUYfguGv2QwNq+ZW3oHKvpwP3Rf3uFLItF efY7E5XMA940KbB4QWqAzd9Jb0COs6NugHEBRNcsey0jNbr2a0+dWiLUWvlY8+DuL0HIGT emfbYqFwRQl6FwnEghED4Wr0y7CWVjOD36AnFQnwlXMYUDXguzc8pvHbnrDu+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746939016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EZv1/nTLsq0VULH/NBUyBMAmISbHLMKI3wd3x7rJlos=; b=M1Y0VY+AKapsgtcrcXBWcqt++jysmlux0hor421ON5EFHu7C2rTay+Rr1u4hbeDMQjSVGe +6mp3tifawxqlNRvBaN8VphN12cGje6rNzHzXO0MsQLD4sHLQaxcJ+dIK+IN/cbtRHGCEe 2VESm5fpqojV2+kaVsVuMy/lFvbWfrnFwxNX9NRah45wVed8JIL8r22uFEDc1jBNhhMNI7 GnXFro5ZKW9+T3+6tZELgz/NGWed7Z6Sd5hDXC+tdH0IRINAyIyTZwl/xP8peuwo6S+evb No00ELqCfv9Vn2nPqwEmXaheiTRJT21ZWomt2VAypHJAPAVOyXREG2tpgRbyFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746939016; a=rsa-sha256; cv=none; b=hGYvKtmQ89jVZczbFvSj+PVeSwvt9x3rUItWptpNs0l3Wu7PzMvSVTQh8s9x9R8Druy/Bj iJoYzWcWex4tKF10iofrtONpKBjVId6HB52CFiSbWnxImNmKywG5BguLagLTUXXVyX/Z2d BLEOlxkdSNo/FFBTJ4+B4l/kTkwjofHCDNcV4wckIqlhttHBnptZkObvOnvlkF4eLQFgkK PVqKaAAXNUS7rZrXS26DsHfBJ2Lp8sbMjzl18dW2SDItq6HKiqOQ0EfDCAzBtxByuyII0C y1bul8hqAYPUgUQNVYrxH8g8b0ighW2fHiyJ+tNI5MEfagyGJh4jyNiyUUa+Pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zw9K43lYGz2Kf; Sun, 11 May 2025 04:50:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54B4oGQV091484; Sun, 11 May 2025 04:50:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54B4oGfK091475; Sun, 11 May 2025 04:50:16 GMT (envelope-from git) Date: Sun, 11 May 2025 04:50:16 GMT Message-Id: <202505110450.54B4oGfK091475@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 738c0bb0ad0b - stable/13 - wpa_supplicant: Use PF_LOCAL instead of PF_INET* List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 738c0bb0ad0b2a732841526f74af045703ec5236 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=738c0bb0ad0b2a732841526f74af045703ec5236 commit 738c0bb0ad0b2a732841526f74af045703ec5236 Author: Cy Schubert AuthorDate: 2025-04-28 01:16:37 +0000 Commit: Cy Schubert CommitDate: 2025-05-11 04:50:00 +0000 wpa_supplicant: Use PF_LOCAL instead of PF_INET* Using a local socket circumvents the issue of needing any Internet protocol (PF_INET or PF_INET6) support. We only use interface ("i" group) ioctls on this socket so we can get away with using PF_LOCAL instead of requring any Internet protocol (PF_INET or PF_INET6) support on the system. This simplifies the patch from 8c7149c73f8f. PR: 286259 Noted by: kevans Fixes: 8c7149c73f8f Reviewed by: kevans, philip, zarychtam_plan-b.pwste.edu.pl (mzar) Differential revision: https://reviews.freebsd.org/D50050 (cherry picked from commit 6aeec6a741975143f53feabceb1726d5033aafd6) --- contrib/wpa/src/drivers/driver_bsd.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/contrib/wpa/src/drivers/driver_bsd.c b/contrib/wpa/src/drivers/driver_bsd.c index e5ff319637c0..ab8f40cfd065 100644 --- a/contrib/wpa/src/drivers/driver_bsd.c +++ b/contrib/wpa/src/drivers/driver_bsd.c @@ -1767,21 +1767,11 @@ bsd_global_init(void *ctx) global->ctx = ctx; dl_list_init(&global->ifaces); - global->sock = socket(PF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0); + global->sock = socket(PF_LOCAL, SOCK_DGRAM | SOCK_CLOEXEC, 0); if (global->sock < 0) { - if (errno == EAFNOSUPPORT) { - wpa_printf(MSG_INFO, "INET not supported, trying INET6..."); - global->sock = socket(PF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, 0); - if (global->sock < 0) { - wpa_printf(MSG_ERROR, "socket[PF_INET6,SOCK_DGRAM]: %s", - strerror(errno)); - goto fail1; - } - } else { - wpa_printf(MSG_ERROR, "socket[PF_INET,SOCK_DGRAM]: %s", + wpa_printf(MSG_ERROR, "socket[PF_LOCAL,SOCK_DGRAM]: %s", strerror(errno)); goto fail1; - } } global->route = socket(PF_ROUTE, From nobody Sun May 11 15:09:53 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZwR42014yz5w1GW; Sun, 11 May 2025 15:09:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZwR416bXHz3jVt; Sun, 11 May 2025 15:09:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746976193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x8hz6uBXZAYCoE0vhA1jFiDeJzupld+lMpBiSjpffK4=; b=REyhR7vWg/nkqEwWL6kgxjYMvf74144pMd/1E5FtvW6okV6S13jiAZaMxpIf07Ocbpl8jN lF4oAMjRiSjeaRBFsKFmI1H+xopEwQxgcQUNj94iMdeOeCdAbAg1kJjcQVgWJaAn3qlz7V y01NMlBO9Z9bDqGMe+H94xcO3ACF3IeA3/u0XBNOYQqrgJY4jHKf1l0hf/irkJvjMW1G6k F+slU61F6LHNB0kOK/gWd2OBFeXi+1vA4v6Srna38dm+Lp7YiP8M72vaGgDE0qeJiRAAzW bVqynHKigUNPs3PsJC+ftafeTvmCb/AJhCbzAb88gBeBGu13lt9FHzb2f8keGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746976193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x8hz6uBXZAYCoE0vhA1jFiDeJzupld+lMpBiSjpffK4=; b=s8Bm5BHi8nS/lyGlmlK/VCxE19wjd9NvOJJkOoxQEcQs33MYay5/uRevV8yiDemjRA8nmF gRYE9x8XT0FK3F1isNB0zDC/DmLX6o3Dqh0eNVaOCdxOKyC7xFWQwu5O6RQRkUZO72FApK HYAjQ4/GFrAeSBP8Oc6SmEzHS+8iZbMr6sMWxBdlHknbKfBy8y4aNTBtc6Tky3dG2bNOV+ fe6um4PYeCDFUbirNrfjaOF8TRVMvhWZbO2RnPRFEMSEcUDBelY3fdFGWDFoTCRUtJVV/s 1QO3bA11/Eba6yHn5TnIwhJzSr2w90w6wbhJe4Nu/XixhEeVBZ0sqZP+VYeiIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746976193; a=rsa-sha256; cv=none; b=Az+mnaSNKplsXYS34JOnIcxagXlLL9r6y3Ufy1g8rRZrFo6QLKminwfS5+OtVnrfys+GYd BjtzKKj6EHsXQE8pmpGKktYn/ZkSCXHKg+KcyRy39aeXfUQZ8hA2HbolkxWKPDeZE2HUtg SBZZkG1JM+8WMydwNQpoXzUvIrDL1OCoG2ck2lQ60B7ROT+EDAsTarm8Vk0xCym4YwFIt3 65xK9XXVp8nkAQczDfflFNS3v3MlD/ODaC//Uva5YVVebSNDxjCUftQEH+LXv/L67Lk2ZA H3LnC5kHjR1gf9rkMdsZW6ZqgfKyafvaPLDfjsW8JYzzQn6+/p1GfPWjbdvOTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZwR415sr4zcbr; Sun, 11 May 2025 15:09:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54BF9rfW041265; Sun, 11 May 2025 15:09:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54BF9r24041262; Sun, 11 May 2025 15:09:53 GMT (envelope-from git) Date: Sun, 11 May 2025 15:09:53 GMT Message-Id: <202505111509.54BF9r24041262@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: d967c87d073d - stable/14 - flua: Add minimal man page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d967c87d073d1307dfd51ab9335ead472a05e6bd Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d967c87d073d1307dfd51ab9335ead472a05e6bd commit d967c87d073d1307dfd51ab9335ead472a05e6bd Author: Ed Maste AuthorDate: 2025-04-15 15:23:39 +0000 Commit: Ed Maste CommitDate: 2025-05-11 15:09:37 +0000 flua: Add minimal man page Flua is a minimal Lua interpreter integrated into the FreeBSD base system. It is intended for internal use and is not designed for general-purpose scripting or use by third-party applications, and was originally intentionally undocumented. There have been questions about its purpose, and questions about the available functionality from internal users, so provide a minimal man page including these details. Reviewed by: kevans, Isaac Freund Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49835 (cherry picked from commit 550289771d5cb73befb6a1645fb9cdf0b9fb65a7) --- libexec/flua/Makefile | 1 - libexec/flua/flua.1 | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 1 deletion(-) diff --git a/libexec/flua/Makefile b/libexec/flua/Makefile index 6d05d9d72a52..f79b00d0bbf9 100644 --- a/libexec/flua/Makefile +++ b/libexec/flua/Makefile @@ -6,7 +6,6 @@ LUASRC?= ${SRCTOP}/contrib/lua/src PROG= flua WARNS?= 2 -MAN= # No manpage; this is internal. CWARNFLAGS.gcc+= -Wno-format-nonliteral diff --git a/libexec/flua/flua.1 b/libexec/flua/flua.1 new file mode 100644 index 000000000000..796ab813f89f --- /dev/null +++ b/libexec/flua/flua.1 @@ -0,0 +1,98 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2025 The FreeBSD Foundation +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.Dd April 21, 2025 +.Dt FLUA 1 +.Os +.Sh NAME +.Nm flua +.Nd Lua interpreter for the FreeBSD base system +.Sh SYNOPSIS +.Nm flua +.Op Fl EWiv +.Op Fl e Ar string +.Op Fl l Ar module +.Op Fl l Ar g=module +.Op Ar script Op Ar args +.Op Fl - +.Op Fl +.Sh DESCRIPTION +.Nm +is a minimal Lua interpreter integrated into the FreeBSD base system. +It is derived from Lua 5.4 with modifications to suit the needs of +.Fx +build infrastructure and system tooling. +.Nm +is intended for internal use within the base system and is +.Em not +designed for general-purpose scripting or use by third-party applications. +.Pp +Unlike full Lua installations provided by the Ports Collection, +.Nm +has a reduced feature set and is limited to meeting the requirements of +base system environments such as the bootloader. +.Sh USAGE +.Nm +is typically invoked internally by FreeBSD base system tools and build scripts. +While it accepts Lua source files and arguments in a standard fashion, its +limited environment and module support make it unsuitable for general scripting +use. +.Sh INCLUDED MODULES +.Nm +includes a subset of functionality from a small number of standard Lua modules +as well as bespoke modules necessary for the base system: +.Bl -bullet +.It +lfs (LuaFileSystem) – file attribute and directory manipulation +.It +lposix - basic POSIX system calls +.It +.Xr freebsd.kenv 3lua +.It +.Xr freebsd.sys.linker 3lua +.It +.Xr hash 3lua +.It +.Xr jail 3lua +.El +.Sh NOTES +.Nm +should not be used as a replacement for +.Xr lua 1 +from the Ports Collection (e.g., +.Pa lang/lua54 ) +as it may be modified or updated to a newer Lua version in the future without +retaining backwards compatibility. +.Sh SEE ALSO +.Xr freebsd.kenv 3lua , +.Xr freebsd.sys.linker 3lua , +.Xr hash 3lua , +.Xr jail 3lua +.Sh HISTORY +.Nm +first appeared in +.Fx 14.0 . From nobody Sun May 11 15:10:38 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZwR4t33fdz5w1Qm; Sun, 11 May 2025 15:10:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZwR4t2Htdz3k1y; Sun, 11 May 2025 15:10:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746976238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dcYks3otAxhscIckaDY5FWwXfQNDx4E40CJI4D5INTU=; b=F90EWPHHSjMY/UFWf/nh6pissL0Ji00vSh/Kcr7LHdfKIESMwAmpY49k2vWyx0WIgOWA5E gV4QF8+Gplm3NGr8x0gvcG9FAWPbVX+6bPsv7KlSdl9PIMdJg2oG1il2GBnkavbS92gy6q m9Ew0ow8zQXhJgq9sWWnlb0uQfIq3UgGEWVTUYTkHGVy6nJDP2Oz86LHR03WwFj2fUIlbJ //00WkNMYzURjG5UOpnQJySvbz6yf2MkFdC5mDSZL/56qfCih2PPMCuDg1INTsxhXummdp opJBBw9+8RGZ9ylFutX3xdSnWE24mpHV3aZuAXiGabIHWa7pYWgaggme4Ios7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746976238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dcYks3otAxhscIckaDY5FWwXfQNDx4E40CJI4D5INTU=; b=v35WyONYvrtTaFXjq/s7YeQsNXEUzOph/EAYj6uWWP2S7eqtTWxXkSLaTZGFXi16vZ7SBm Ww5EEQ5/9z0jqa+oElT0fv1ih2lAE+HOXZFKugXJ9knnFPutxj07SNhYec04MrJIGQkt8z ex7DALJToShYHNTErdzprbuTJJhi3gaQUNRzcIAhvknxlphUnmvqKhgYMR2bDHbeYQ8OPD Lb/7M6bSdCquqvGXauOs3D8rWLt+LqCiDtEnwenhqsBt2X69SC1JRpNoA7UWeopvEepHeT gc/wFwN6JtwwSvI3VTy6lyBk0iWUOLvPUnXVi99/zUGmbuvVs9FTZLm2arzapw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746976238; a=rsa-sha256; cv=none; b=bocxV+DrfpZCZTwchk8NUXEwUWJ67wRKcNFoebKmYT1ehjomVljE797SX1OanMd9MxDIFA 6ThdpdOtKEHLhdvDUPAfB+3qaAynDH5RIZ2qZgr/Y9g4nDngsYbj3gaMhJ6WZP56fdAHsl e0/FAo88pcpya1jjMsUMYTc3/z+ecV3IzuRpK5Fv9aWg7ipCpzBBJ8H1OvcGRp9pOhrkmP pGAeUN+SqSrc1Ue45V+RPAAs5unraWmXKOE77ZP9PmfyOCgz5l99IcFQABZy2HOc9S+rpQ STxWBiB68elyBpDiS0LEkvAnMYahI8nxtJ9i7BWyLHSvAaB99s5FKAPg+H+hhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZwR4t1hy7zcbw; Sun, 11 May 2025 15:10:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54BFAcDQ051348; Sun, 11 May 2025 15:10:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54BFAcqC051345; Sun, 11 May 2025 15:10:38 GMT (envelope-from git) Date: Sun, 11 May 2025 15:10:38 GMT Message-Id: <202505111510.54BFAcqC051345@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: c02b45a75b73 - stable/14 - flua.1: Add xref to style.lua(9) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c02b45a75b73b2b4c31f7827920722659cb7b636 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c02b45a75b73b2b4c31f7827920722659cb7b636 commit c02b45a75b73b2b4c31f7827920722659cb7b636 Author: Ed Maste AuthorDate: 2025-04-28 20:27:04 +0000 Commit: Ed Maste CommitDate: 2025-05-11 15:10:26 +0000 flua.1: Add xref to style.lua(9) Sponsored by: The FreeBSD Foundation (cherry picked from commit cbe50f7c20cf0ca484d29cf345864a18c29850e7) --- libexec/flua/flua.1 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libexec/flua/flua.1 b/libexec/flua/flua.1 index 796ab813f89f..a315e4106065 100644 --- a/libexec/flua/flua.1 +++ b/libexec/flua/flua.1 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 21, 2025 +.Dd April 28, 2025 .Dt FLUA 1 .Os .Sh NAME @@ -91,7 +91,8 @@ retaining backwards compatibility. .Xr freebsd.kenv 3lua , .Xr freebsd.sys.linker 3lua , .Xr hash 3lua , -.Xr jail 3lua +.Xr jail 3lua , +.Xr style.lua 9 .Sh HISTORY .Nm first appeared in From nobody Sun May 11 15:25:00 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZwRPS6RYHz5w2Gv; Sun, 11 May 2025 15:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZwRPS5q7tz3vnb; Sun, 11 May 2025 15:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746977100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O2/R3GKO7TL/YGaS2A/Pv5Yy8hEIXoHNi9KZbEWPlCg=; b=VPHsIxgpnBIZW1x58oBroVvCaaRNjtUnmJem2pbpn5dMAa6nbSRc5l7zF6g506zaIqnPVE 1MysK0ZK5ZoJaoA3M60GnZ8T/KHkCe6ahMsw26tuI42FGNKy0V6lvgLZFK6VgZf8eyFMzi TKtKFWkoEzrojogBVi25a9d8BeHpdM44fNd7m1VrmUusrBPtTFhv7B7U6kIib1VK7iJmv9 AX42Kx9k5uqDJLVU6h5Ps5ly86sSy0eNli4sBwb2GnOuJy1eVzFLRSLjjaIOXZ6nAlUfG0 u2pl407TySWjRR+pCvCAB3DIUsAvLARWi30I/aSz+gEbn+8Io1815wUxeCtxPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746977100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O2/R3GKO7TL/YGaS2A/Pv5Yy8hEIXoHNi9KZbEWPlCg=; b=FaXTnPZ+sUof502bhl6vuL0H/jrXDzFpuJRnoEa44814mTtu3uFnO752uR2Blhs9T0hpWS MG5ZNJEa68/SmK4l5rMYKYO48YgWkjxUWaQ3qAT+SS9Ek74WRNkkkaYojkmHwpTcIWLlDj VEwvsmBYoHwobfV0tRLc9PAdye7fUHbuIEfzQNY7KrkqyIL5uU6dtjwz+IkyxohmBPhfFu ZzFtQBxeJN2qiHLIYARUcNa6eCx/diuI2+Z7XsUhNpqAXZ6734DyV7zdznrG/8dqZKoZ0h eYt2DwA6zAeXtfJAuRqj3SMuNzFzT+h3hK5etxClfyRMQfuv21+b7f6Ren3i2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746977100; a=rsa-sha256; cv=none; b=I/kfWq2F9ZkE4C9bx5AhwlTCQYKMMNS1TMy+4lsD8nP8er2fhz6Yqg3MUqlaa4sIOGYRds oc//BLT+la85pg4/nHNzAvGiTvClY0KVZaDL0i+OJAReuWQ68GqiPzKMkhI2IKtU0ET0e1 2WsKARh95QkK8iOry7RyHBq64g2lPje2HLpTCmZfka0+E4zseylvRAEZ1xXEPhyA22c9yZ L8hInzlk9YhAO9A4fwEDPzCWWYgoNrrgQSDrEI93VFFWm/2/QM/pdGgDuu0rrtty53Bpep Wtw08Ki26bAjHWhLEl5TvZtzDaQPb2muAJuy/D6UDCx5QnvLx4Z2hSt0ngXoYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZwRPS5QQYzcJc; Sun, 11 May 2025 15:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54BFP0Hn076924; Sun, 11 May 2025 15:25:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54BFP0oK076921; Sun, 11 May 2025 15:25:00 GMT (envelope-from git) Date: Sun, 11 May 2025 15:25:00 GMT Message-Id: <202505111525.54BFP0oK076921@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 6fea96105618 - stable/14 - service: Use explicit path for /usr/bin/env List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6fea961056180a95a72c463cdaf081492edb9395 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6fea961056180a95a72c463cdaf081492edb9395 commit 6fea961056180a95a72c463cdaf081492edb9395 Author: Ed Maste AuthorDate: 2025-05-06 15:28:13 +0000 Commit: Ed Maste CommitDate: 2025-05-11 15:24:48 +0000 service: Use explicit path for /usr/bin/env A reddit thread[1] reported an error from env(1) invoked by service(8), wwhen GNU coreutils utilities were installed without `g` prefixes. [1] https://www.reddit.com/r/freebsd/comments/1kfzh78/service_command_changed_between_freebsd11_and/ Reviewed by: kevans Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50195 (cherry picked from commit 81449fb2c044a85ecd9c5a15c6b470cdbcacacfc) --- usr.sbin/service/service.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/service/service.sh b/usr.sbin/service/service.sh index 65aa18181101..245430107277 100755 --- a/usr.sbin/service/service.sh +++ b/usr.sbin/service/service.sh @@ -174,7 +174,7 @@ cd / for dir in /etc/rc.d $local_startup; do if [ -x "$dir/$script" ]; then [ -n "$VERBOSE" ] && echo "$script is located in $dir" - exec env -i -L -/daemon HOME=/ PATH=/sbin:/bin:/usr/sbin:/usr/bin ${VARS} "$dir/$script" "$@" + exec /usr/bin/env -i -L -/daemon HOME=/ PATH=/sbin:/bin:/usr/sbin:/usr/bin ${VARS} "$dir/$script" "$@" fi done From nobody Sun May 11 22:21:17 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zwcdn6gRFz5wV4V; Sun, 11 May 2025 22:21:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zwcdn61Mvz3pcw; Sun, 11 May 2025 22:21:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747002077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uzbtxNFQqR62encFIhNv1Mwb2f1/g2Ywif1xMmOb+Ws=; b=GPawX9WiDB8Pp6qV4iJHo/opPsoCGokZjb0RaH710cnF4ueOorc4/lyHX6IAZ+5W+8S8hg sXpVDGg+lBoqvYK77/Zjgu+CrlTu46vclb27fOtlYk8V8Rxqq181X4+/OTf5CI/YujCq7x 6vWiquY0Of7C4ikhlKCj7N8HmMX2PQsReKCeP39HFoTGrmCsSWLFmQP2W0dZrTSxsSJ4vF dRUhL6eSru5krKVzICPGZcIKcKSeFMNTouxz0jR6gyn1rLmeV/BnXJwmnWSJw8Wiyb+vTf DUR1gZbtdJm+BfnnJjEuzJeSVGLXtyYsGOE5PPvCzxm4+///t4glCjMB0D/tAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747002077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uzbtxNFQqR62encFIhNv1Mwb2f1/g2Ywif1xMmOb+Ws=; b=SAJRsH+P7S3hqbuzcUjhtOZWtc+7qCIx+6E97JlmBo0dLFoe+ZM0HuNjz1NHMacPkdHQCq F15P0un12hAQYfa1YXDwcfeJYpZFQnIZz4gyt5kR4ErlDPAzDEj9BTmnAgCI5uNSjcal5w 7T8FIGJTydhcIxmVY3l9PBuKs6vnplEqQKBQJAyTJkXBxFO+HafaDsc1wA8UOex1cpPrp0 9fhcSAYueORWCLIL/d2UsrNbCjUEyZLbKze04IEXnp/xTlk+nAG8c6mflWvueBqg2adHR8 WTnOxp5CpDJrCvaDzskcDeZLpQ9hoc6U0prNsEMsCyxUKHsjr3hFOqzkf5qPKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747002077; a=rsa-sha256; cv=none; b=Xs2crYC25GrtRGt5Wdvc37/2H/ezWDOX7ksKapgKb6de394zccM5crMvjKP6SI/+YFY/KK svkfS3DBJw+YLaGLp3H2vIHz2KNkWCLKdjeKDnmdb3IjyiQb1ZiVEWxI3cBG2RdBmK1u3n /5JmzYozTOECnJzvsKvs+ngXn9e/sPwDCdqCkQiZsK3IbZTpKswGv8nZy3/61EFdvbPMmO ZQo1RAlL+1NPwQhcrMNM2i7eA5iHY5j1vT9gjvKylvebw7hNCPsb5XqYqVCGssZklYTHbK q5QXA/BgwUxWRpfPNs9uWhdB82f6Ehy1SC1+0sMa/C4yfo3zgXFAmRPaPe+ElA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zwcdn5WjjzqSV; Sun, 11 May 2025 22:21:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54BMLHx5062523; Sun, 11 May 2025 22:21:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54BMLHhF062520; Sun, 11 May 2025 22:21:17 GMT (envelope-from git) Date: Sun, 11 May 2025 22:21:17 GMT Message-Id: <202505112221.54BMLHhF062520@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 1c2e947d272e - stable/14 - pkg-stage.sh: kde5 -> kde List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1c2e947d272ea42dbf7416d867101fe5164ffc6d Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1c2e947d272ea42dbf7416d867101fe5164ffc6d commit 1c2e947d272ea42dbf7416d867101fe5164ffc6d Author: Colin Percival AuthorDate: 2025-02-19 19:21:04 +0000 Commit: Colin Percival CommitDate: 2025-05-11 22:20:19 +0000 pkg-stage.sh: kde5 -> kde The "kde5" package no longer exists; KDE goes to 6. Note: Depending on the size of 13.5-BETA3 DVD images, KDE might end up being removed from this list in the near future. With hat: re@ MFC after: 30 seconds Sponsored by: Amazon (cherry picked from commit 0d7b98c06c5ec9638020844ee460af075cfc6e54) --- release/scripts/pkg-stage.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 082cf746b6b9..58b6d25fcccf 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -30,7 +30,7 @@ sysutils/tmux www/firefox www/links x11/gnome -x11/kde5 +x11/kde x11/sddm x11/xorg x11-wm/sway" From nobody Sun May 11 22:21:18 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zwcdq5Pj7z5wVDm; Sun, 11 May 2025 22:21:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zwcdq2dt8z3pgP; Sun, 11 May 2025 22:21:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747002079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TbSTnSLxityFK1WDcXu3UOQp0sBTubs9HCOX6JNOjN4=; b=fq6/P8zxw/N+g9PhGLPkDnPi9QBlxOTAyRW1oIui2P/QZrf6TvrTS9E3p/dJUjbhvc+lP0 fHcK2yVsMJCl2ws28/UvJoJiIiVpNFdrE3E+95RiOr1TTmZ5DTmNR4dKGlFqne+8ybZrRl +tBJMEPqqWoqeHqREzZFKdt667ItCuz8HiQJtOr+CxLSe4YI/4w7LjOTVLSBL57PZF+4JO EvFfDYS1WzvNtFL8S4Zeyois769f5djEt/13Yz4s44F6S5Pr61r6Sn9HPCoa4PgaD5SNxg BxaGwU/cCtVMx0rL7bb/lI5f+dqr6wp9f9TbkNIKE1w6B4RXQryChlvfMLR0Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747002079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TbSTnSLxityFK1WDcXu3UOQp0sBTubs9HCOX6JNOjN4=; b=TF83K+lpvtI8VvEWiHJOazTEanb53/9bx61+kJo8uPNWwlOj72Uiob9ytPWUt2LgTGftUX nUBIqoAuMgvVYpqyaOQC8N7rXa82WDS2PDmf5T3W17uI2nVHhyowWoqhQ7GWMdRjF1RJkz WHE5VXQlTOR06tnwQ1VxHPjqOT/LcyirOW+cyE7+dd/w6ecxl74F/ySvCGHDxVoRTPRDSD sZ/Ia112bf4+Xvo7+9zTx68XE+256oBVSa4ZtDnpgKm1NcAZnNgYlTNefOzncf3CNbMPnz 7kCU/Rj0b0SE/3hCNo+UQatgTdnl6fMxXqZnQNBxwX2gfOz8d1GxdejsJuj4bQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747002079; a=rsa-sha256; cv=none; b=Zoe4Qf6oBIkpUAb3Eyw92smBlO7KrcF66Uk/e3OorcMxgd42XLsYFnXIcRx/RenorhhgXJ zJyzEVcVJlTegwYK1YmmY3OISYCF4UNi1AoDQtQbijYC+9QQ45BRZkAjPjEstARaApTxfj 4ABLRE8S3GqzRE1/NEuC2fhfKzKySrwZjN70xOwCR3viwpSYI/r31HCuJx3PkXotW374Rt dMKobEpYnec/RRBWoBwdYI15KV8IWwbvVLcW27Jx9xa1AR5ehqA0ntdQpRAVjctx6AVB5T /Ft5VP8Xq1E+8KFWBlm2xhK+Z6eDmwEReCSN/ViMSC1HovtYK3q/exp2tFng0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zwcdp6SW5zqqs; Sun, 11 May 2025 22:21:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54BMLIZ4062555; Sun, 11 May 2025 22:21:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54BMLIMk062552; Sun, 11 May 2025 22:21:18 GMT (envelope-from git) Date: Sun, 11 May 2025 22:21:18 GMT Message-Id: <202505112221.54BMLIMk062552@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 1ecfdc009172 - stable/14 - release: Don't put drm-kmod package onto DVD List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1ecfdc009172491a133d596332a9aaf6851a49c1 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1ecfdc009172491a133d596332a9aaf6851a49c1 commit 1ecfdc009172491a133d596332a9aaf6851a49c1 Author: Colin Percival AuthorDate: 2025-05-11 22:10:48 +0000 Commit: Colin Percival CommitDate: 2025-05-11 22:21:02 +0000 release: Don't put drm-kmod package onto DVD The X.Y-RELEASE DVDs use a quarterly package set which was built on X.(Y-1)-RELEASE, and those kernel modules are never going to be useful. MFC after: 30 seconds Sponsored by: Amazon (cherry picked from commit 94e44a074e5212cc3459e360a9de55500f7c41d0) --- release/scripts/pkg-stage.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 58b6d25fcccf..77e9dbd1e789 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -13,9 +13,6 @@ export PKGCMD="/usr/sbin/pkg -d --rootdir ${ROOTDIR}" export PORTSDIR="${PORTSDIR:-/usr/ports}" _DVD_PACKAGES="devel/git@lite -graphics/drm-kmod -graphics/drm-510-kmod -graphics/drm-515-kmod misc/freebsd-doc-all net/mpd5 net/rsync From nobody Sun May 11 22:23:37 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZwchV1ZBqz5wVBk; Sun, 11 May 2025 22:23:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZwchV04cjz3slh; Sun, 11 May 2025 22:23:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747002218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sdr/8LpBCQms+1RZEZQH6J2DIO0WnNaG+8jVbJYfUBg=; b=PyrdF4l4xwyFiTup3/sH65z+pU4V0KPrlkLZR1Y6NXlYGhoJfQGOLubhaZ8/wjVTgmSNnx 0QMvBcFIf/jNIPAqQclumHnOd7cZvwb0HgCVWQnw38EEiYcaBuk4LkEXrovvH6Lp5L0W58 cHPSANuiePp6dRk3At7C9wm7c7dlcuYS6jvuBZobOWtVkorTU8EeyRD0gQnw2Ncp4qNboK e2Ui81SmVD0g6TgiJB5PsbYOVDRIEzHnZfEI1ZXHHl9VYNuHEWlViHHHUb0rzuEQnca0h+ paLmrG14t/hayZFhrVirC0y251xK7v5AUnFrWCncqJp4D5m1j4U6EpvsuBGVRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747002218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sdr/8LpBCQms+1RZEZQH6J2DIO0WnNaG+8jVbJYfUBg=; b=ox/KxtYjtGPKAmhwH9e24UVQVzJgQNdLR4Y5NQegUfyD5yIsL3uXx8NbWS62RoFtCmjldH 0vix6EkplkR8qmeVhB/mS32LZyNB53fs4GTc2DxEK9AHEFHNGNF3HAwelZnONBsMjevMXt WJ6hupmBHrFG2KHKDrlABMSrLXCmCEFnIhGaxTIoLJGPvbaBeQjky8Jz1vDROGFfIvNuw3 Va+15picN2sIm4DPSZ3+NM5iq+rkJDAIfVQxViS4Acy5+FHF++rHA5S5ElfAS+OJjdd4VG SBom0fQFysVc5aMZc3cCK97wKS2sdDW+ZXFkcnIarTskWxzw81mcjKIY7Q/ZqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747002218; a=rsa-sha256; cv=none; b=DXuvgCfJK5T+6Z/iLqvaLSUP7zavOjBV17PfPWRGbY9BNxHtDuZwwqJEO5d8+p0ODPY576 5e5ve+2lnvMKErigmaInVdnkimIfoKCWdmHPyzP9jP3Tk4xOlHOka5S/43pBrYT5BuzXyE rnVArtm4E5RzcAA+6Cgl6odIykxVICNAjhYwnkAtFu8cd1AanKF32odCi+nJIW7R/4vrZ0 UE/usReUFPceUaArqMJjCVZzKU0NFJ6PoAzgOXqfUDGGogl5jBJcd7+m4TF8ulXLcjx3/x SGOO0gAu9XqTAthOpIz4J8EC4XIXw6NIPUfM80gFwwgjz+JzeRuoUo9/jDMApA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZwchT6N4mzqrS; Sun, 11 May 2025 22:23:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54BMNbnK064724; Sun, 11 May 2025 22:23:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54BMNbEK064721; Sun, 11 May 2025 22:23:37 GMT (envelope-from git) Date: Sun, 11 May 2025 22:23:37 GMT Message-Id: <202505112223.54BMNbEK064721@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: a1874e9adfc1 - releng/14.3 - pkg-stage.sh: kde5 -> kde List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: a1874e9adfc119eed5777fa20863aeb82c5687fb Auto-Submitted: auto-generated The branch releng/14.3 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a1874e9adfc119eed5777fa20863aeb82c5687fb commit a1874e9adfc119eed5777fa20863aeb82c5687fb Author: Colin Percival AuthorDate: 2025-02-19 19:21:04 +0000 Commit: Colin Percival CommitDate: 2025-05-11 22:23:14 +0000 pkg-stage.sh: kde5 -> kde The "kde5" package no longer exists; KDE goes to 6. Note: Depending on the size of 13.5-BETA3 DVD images, KDE might end up being removed from this list in the near future. Approved by: re (cperciva) With hat: re@ MFC after: 30 seconds Sponsored by: Amazon (cherry picked from commit 0d7b98c06c5ec9638020844ee460af075cfc6e54) (cherry picked from commit 1c2e947d272ea42dbf7416d867101fe5164ffc6d) --- release/scripts/pkg-stage.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 082cf746b6b9..58b6d25fcccf 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -30,7 +30,7 @@ sysutils/tmux www/firefox www/links x11/gnome -x11/kde5 +x11/kde x11/sddm x11/xorg x11-wm/sway" From nobody Sun May 11 22:23:38 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZwchX1VqBz5wV9Q; Sun, 11 May 2025 22:23:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZwchW03Krz3spH; Sun, 11 May 2025 22:23:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747002219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z9KLTkRehT0WDY3UkITRk21h+07E1WHimTxqLsKeSLY=; b=I6BRD4dIl1NZMm9miVaKbytlPUdEEzYWfqPkf4UCx3hOayqrk2vm8RP+sS10msRpy518SU RpZnPBxQHncG66nlG2a3XBmVxH+7CfNTxqRaTX956QziF12caxtkdYYC2KTIMzv3whUAIa Ec99kpuyr5MBYbVETp5YTofanTPLuwCz97WovBbggoTlzbKVFEKUvfQyBE+749XJHskLoH TVqlvoatjoLaZEv3iw4Tapug93HmoIPGaG4Lvk2F68T3wtGtNfpXv4V6daQ0H8IppRINjQ 5nuKkTV+XCBPSaO/4FOSsEhttMtPyCtHppRC0KWn9Y7PplYAbfvS2DLu2fNDTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747002219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z9KLTkRehT0WDY3UkITRk21h+07E1WHimTxqLsKeSLY=; b=Lr6xJoR8ULB1VQJzQTjJq0SV/CMMS0gKSSWq7epNT2kd7id/qXYre01ZSc/gve0U0WysEa Cm0fsyaQYKkpF+ZeL1lw5e8hF9FA6SSPkIW6QGPbJPD601oS2DVvsEJBoOc3y+qWZS+MZ5 mrt4UIsW46lTCN4k0kUt8S/Nq7JDciWSuL+NbhMXYywa5+xxCw4I/mUrU22EKNKKGwsE0w 6JocL0yqUhlCEzEf4rgLGQ8AAZ/fqVJxUo1yAJil5KpIGjBbnO+Cn1g/5TzVXk1aEhMuF/ +EvH7saCFfXmkoREBwg4mfIQsRLr5sNv5gmo/x6dLQOR2YvRsSSPmCI5Ph8sUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747002219; a=rsa-sha256; cv=none; b=eBX7kWcvTUY67xOBvfDuszRCwVwORB1yyqAVP2KVvNQEbGu+dmHt5LOsd3ZbT3OaFx7IUI pEKQx74djtnHIPt2wMr0MSTNQYj+LBKLmo/EC2fkrcRFgSF+kVsZVGlC/aFmZ64IDqIopn FYjNhS2vZJpxO8MjxNlmbcFZUNptgnv71iSaAtt2vLlRLWmVUrg0Bmsr0nXwclzoE5WDIf 38aCR5uG5sEDCNeyqlxkCKVYqtHxmjVknh1BHjdRkSQdh9XL94gp/OtYMdlnHRFuSWIv22 XXygHbr7Jpgeg0gQEGj0FhZItGXX8v1EAptpmnaoFmZnWBxL8pg8HkNOxpOkQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZwchV6YD5zqrT; Sun, 11 May 2025 22:23:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54BMNc3I064758; Sun, 11 May 2025 22:23:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54BMNcTj064755; Sun, 11 May 2025 22:23:38 GMT (envelope-from git) Date: Sun, 11 May 2025 22:23:38 GMT Message-Id: <202505112223.54BMNcTj064755@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 0e771ca261cc - releng/14.3 - release: Don't put drm-kmod package onto DVD List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 0e771ca261cccad5bee61bbcbb49c7901166722e Auto-Submitted: auto-generated The branch releng/14.3 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0e771ca261cccad5bee61bbcbb49c7901166722e commit 0e771ca261cccad5bee61bbcbb49c7901166722e Author: Colin Percival AuthorDate: 2025-05-11 22:10:48 +0000 Commit: Colin Percival CommitDate: 2025-05-11 22:23:21 +0000 release: Don't put drm-kmod package onto DVD The X.Y-RELEASE DVDs use a quarterly package set which was built on X.(Y-1)-RELEASE, and those kernel modules are never going to be useful. Approved by: re (cperciva) MFC after: 30 seconds Sponsored by: Amazon (cherry picked from commit 94e44a074e5212cc3459e360a9de55500f7c41d0) (cherry picked from commit 1ecfdc009172491a133d596332a9aaf6851a49c1) --- release/scripts/pkg-stage.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 58b6d25fcccf..77e9dbd1e789 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -13,9 +13,6 @@ export PKGCMD="/usr/sbin/pkg -d --rootdir ${ROOTDIR}" export PORTSDIR="${PORTSDIR:-/usr/ports}" _DVD_PACKAGES="devel/git@lite -graphics/drm-kmod -graphics/drm-510-kmod -graphics/drm-515-kmod misc/freebsd-doc-all net/mpd5 net/rsync