From nobody Fri Apr 3 13:51:43 2026 X-Original-To: dev-commits-src-all@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 4fnKrv4wwSz6YX4Q for ; Fri, 03 Apr 2026 13:51:43 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fnKrv1qR4z3Sqk for ; Fri, 03 Apr 2026 13:51:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775224303; 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=+y3vXJEPNPBABAe32IPSeTdkhCUqrsM4/3baRRrgnsw=; b=ZxfIimM/Y4i+Qn99MzzJNJoHLjc635Q4s0c4UOWANi5504tKZYwBjUu7K3Nk7M/pXbYUHG 8Sh2RCrWPQu1Q616LZAd/bFV+adoqkX24ykRp8VI/EHcM42hvC63/rNLwyN+8NemI2M2IR Zs2TwROVFO26Hg/cuhauP63yfGWwX950VZckJgaCeNkeu6E2k6GKfy0NagM0MGjhwSrvUA zx6ckHVSh9zY92i4ylh+S9MXScQwQMnGC3Tvsos6OwDn64BgKOAgzU85fAMGAPq54LAJLh /Q5AbURiiu96hIQtbzbPY2eAzECE3DfGTYBhabmjKFDSe57zlMFzZ1kDY1bcHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775224303; a=rsa-sha256; cv=none; b=j/87J63r1IpUsAJ2MNSxrbOY5waRqQOvXyJA1i+vGNp38eIE+MvKd+bNFaLq713RmLMt1d V43KVhuh89aiDxZuUABYlDc/JothJEb8Ell8nemgKF+0u37cRYM1db+rqSbPG86n/dWgk9 GhwddlSBR+WgQgHp2inGCflQLJbSk1QxKEXDeOu+99/CgvQt+2Ocdat2K3LGULoiyxZIMr 5c5u6EJjhWqbAwL2Gt8yDaQiQI27TKzeH31wk69cAj6GLNJGiRFQS/jws67jysk1jNBeGw ZTfWAYkm/ZkZ8c8dsc/spdjFTkcNDt/ivIiBng51hd81tL9gYi5/FrtloSsazw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775224303; 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=+y3vXJEPNPBABAe32IPSeTdkhCUqrsM4/3baRRrgnsw=; b=cQDZfdUo/pZxhs7dgimqw7Jx67TZ5IMQYNhGIS40FVMhiqnMneCej0DRLXUuN1FvT98h/6 e2WQSVf2KhcAnoF6EpQKeuZplAVt+wboyr7OSIAvf6r9rFrs6IGmv5q6lMdP4BBIDdJUi8 QZ45up+tbw2/hMf6ORHoH24xmMpRBgJUPNbEswA53/TOXISCxAjQ5x5heELvyrGekI0EOO 5aJybQTrH8ZP+lfC/4lKAScAfkhmIzzVLNpK/06yiK4DVioEEE4eMG77+Y24TivbvujniA 69EVN1AWyGJJJHhGmeO4okuKpySS5ZLj9yFcaetNsfzbIb9G/g3lBsrmEt5sOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fnKrv0zpXzrXZ for ; Fri, 03 Apr 2026 13:51:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3800c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 03 Apr 2026 13:51:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: ab9257599a55 - main - Remove WITHOUT_BZIP2, WITHOUT_BZIP2_SUPPORT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: ab9257599a551cf4be8738ec52205998f4e7dd81 Auto-Submitted: auto-generated Date: Fri, 03 Apr 2026 13:51:43 +0000 Message-Id: <69cfc5ef.3800c.eae8c0f@gitrepo.freebsd.org> The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=ab9257599a551cf4be8738ec52205998f4e7dd81 commit ab9257599a551cf4be8738ec52205998f4e7dd81 Author: Lexi Winter AuthorDate: 2026-04-03 13:50:09 +0000 Commit: Lexi Winter CommitDate: 2026-04-03 13:50:09 +0000 Remove WITHOUT_BZIP2, WITHOUT_BZIP2_SUPPORT WITHOUT_BZIP2_SUPPORT only affects a single binary, gzip(1); it doesn't remove bzip2 support from other bits (e.g., libarchive) and there are no similar options for gzip, xz or zstd. WITHOUT_BZIP2 has not done anything at all since it was first added in 2007. MFC after: never Discussed on: arch@ Reviewed by: imp, des, adrian, delphij, emaste Differential Revision: https://reviews.freebsd.org/D56148 Sponsored by: https://www.patreon.com/bsdivy --- share/man/man5/src.conf.5 | 17 +---------------- share/mk/src.opts.mk | 2 -- tools/build/options/WITHOUT_BZIP2 | 4 ---- tools/build/options/WITHOUT_BZIP2_SUPPORT | 1 - usr.bin/gzip/Makefile | 8 +------- 5 files changed, 2 insertions(+), 30 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 9862d5aa8154..a94c5d6177b4 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 April 2, 2026 +.Dd April 3, 2026 .Dt SRC.CONF 5 .Os .Sh NAME @@ -315,21 +315,6 @@ and related programs. Do not build or install .Xr bsnmpd 1 and related libraries and data files. -.It Va WITHOUT_BZIP2 -Do not build contributed bzip2 software as a part of the base system. -.Bf -symbolic -The option has no effect yet. -.Ef -When set, these options are also in effect: -.Pp -.Bl -inset -compact -.It Va WITHOUT_BZIP2_SUPPORT -(unless -.Va WITH_BZIP2_SUPPORT -is set explicitly) -.El -.It Va WITHOUT_BZIP2_SUPPORT -Build some programs without optional bzip2 support. .It Va WITHOUT_CALENDAR Do not build .Xr calendar 1 . diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 5e59f476a743..5c3e3bb31a7f 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -73,7 +73,6 @@ __DEFAULT_YES_OPTIONS = \ BOOTPD \ BSDINSTALL \ BSNMP \ - BZIP2 \ CALENDAR \ CAROOT \ CCD \ @@ -246,7 +245,6 @@ __LIBC_MALLOC_DEFAULT= jemalloc .for var in \ BLACKLIST \ BLOCKLIST \ - BZIP2 \ INET \ INET6 \ KERBEROS \ diff --git a/tools/build/options/WITHOUT_BZIP2 b/tools/build/options/WITHOUT_BZIP2 deleted file mode 100644 index 0ec4f7638a44..000000000000 --- a/tools/build/options/WITHOUT_BZIP2 +++ /dev/null @@ -1,4 +0,0 @@ -Do not build contributed bzip2 software as a part of the base system. -.Bf -symbolic -The option has no effect yet. -.Ef diff --git a/tools/build/options/WITHOUT_BZIP2_SUPPORT b/tools/build/options/WITHOUT_BZIP2_SUPPORT deleted file mode 100644 index 0cc8c81fadff..000000000000 --- a/tools/build/options/WITHOUT_BZIP2_SUPPORT +++ /dev/null @@ -1 +0,0 @@ -Build some programs without optional bzip2 support. diff --git a/usr.bin/gzip/Makefile b/usr.bin/gzip/Makefile index 33fbdb85d78c..fae01959596c 100644 --- a/usr.bin/gzip/Makefile +++ b/usr.bin/gzip/Makefile @@ -5,13 +5,7 @@ PROG= gzip MAN= gzip.1 gzexe.1 zdiff.1 zforce.1 zmore.1 znew.1 -LIBADD= z lzma zstd - -.if ${MK_BZIP2_SUPPORT} != "no" -LIBADD+= bz2 -.else -CFLAGS+= -DNO_BZIP2_SUPPORT -.endif +LIBADD= bz2 lzma z zstd CFLAGS+= -I${SRCTOP}/sys/contrib/zstd/lib