On 2026/10/19 08:36, Leah Rowe wrote: > I know ports tree is closed until after the 8.0 release. Just > sending this patch anyway. I see that my 157 update patch did get > merged anyway and the firefox 158 patch was merged on 13 october.
https://marc.info/?l=openbsd-ports&m=179140008318699&w=2 Lock is so we get things stabilized to build the release; we generally unlock once fast arch are done with package builds and builds on slower archs have started. So we are now working on 8.0-current in the head branch, and 8.0-stable in cvs OPENBSD_8_0. > i didn't check librewolf updates as much this month, precisely > because openbsd is in release mode, otherwise i would have been more > punctual with the update. no worries if this can't go in tree for > 8.0 release as i can always backport it into -stable at a later > date. landry, do you want to handle these? > From 1e5e3d7c8c56928ee4fcb8f988723d172424cb52 Mon Sep 17 00:00:00 2001 > From: Leah Rowe <[email protected]> > Date: Sun, 18 Oct 2026 21:01:03 +0100 > Subject: [PATCH 1/1] www/librewolf: update to 158.0-1 > > GenerativeAI control no longer relevant upstream, > as AIControls replaced it, which we also set already. > > I've tightened up the policy considerably; translations > and pdf alt text already blocked before in AIControls, and > now locked. I do not want my work contributing politively to > the scourge that is generative artificial intelligence. I'm not using librewolf, but fwiw, if I did, I'd find it annoying to lose the local-only translations stuff (I'd much prefer that stuff to run locally than send it to google or whoever). > Besides this, I've rebased patching and synced with the > OpenBSD FireFox 158 port. Everything works. > > Signed-off-by: Leah Rowe <[email protected]> > --- > www/librewolf/Makefile | 7 +- > www/librewolf/distinfo | 8 +-- > .../patches/patch-config_makefiles_rust_mk | 14 ++-- > .../patches/patch-js_src_gc_Memory_cpp | 2 +- > .../patches/patch-js_src_wasm_WasmStacks_cpp | 2 +- > www/librewolf/patches/patch-lw_policies_json | 65 ++++++++----------- > www/librewolf/patches/patch-mozconfig | 8 +-- > .../patch-third_party_llama_cpp_moz_build | 2 +- > 8 files changed, 48 insertions(+), 60 deletions(-) > > diff --git a/www/librewolf/Makefile b/www/librewolf/Makefile > index e59e4944b88..fe44267c609 100644 > --- a/www/librewolf/Makefile > +++ b/www/librewolf/Makefile > @@ -13,9 +13,8 @@ ONLY_FOR_ARCHS = amd64 aarch64 riscv64 > > # If upstream adds revision number -x, it will become plx in OpenBSD, e.g. > # librewolf-149.0.2-2 (upstream) becomes librewolf-149.0.2pl2 (patch level 2) > -MOZILLA_DIST_VERSION = 157.0-1 > +MOZILLA_DIST_VERSION = 158.0-1 > MOZILLA_VERSION = ${MOZILLA_DIST_VERSION:C/-([0-9]+)$/pl\1/} > -REVISION = 0 > > MOZILLA_PROJECT = librewolf > MOZILLA_CODENAME = browser > @@ -23,13 +22,13 @@ MAINTAINER = Leah Rowe <[email protected]> > > # LibreWolf doesn't provide PGO data, but we use the data > # provided by FireFox releases, re-using the OpenBSD distfile > -MOZILLA_PROFDATA_TASKID = BnF3vh8WT4OW53JJ0ow3mQ > +MOZILLA_PROFDATA_TASKID = Yy7PLAWLTQ6Ru0Iqs0_iRQ > FFVERSION = ${MOZILLA_DIST_VERSION:C/-([0-9]+)$//} > FFDIST = firefox-${FFVERSION}.source > DISTFILES.profdata = ${FFDIST}-profdata.tar.xz{profdata.tar.xz} > > HOMEPAGE = https://librewolf.net/ > -SO_VERSION = 6.0 > +SO_VERSION = 7.0 > # Bump minor ver if shlibs deleted in components dir to avoid pkg_add -r > issues > MOZILLA_LIBS = mozavcodec mozavutil mozgtk mozinference mozwayland xul > \ > clearkey gkcodecs lgpllibs mozsqlite3 > diff --git a/www/librewolf/distinfo b/www/librewolf/distinfo > index 0fcbdf9217b..f3995170a8b 100644 > --- a/www/librewolf/distinfo > +++ b/www/librewolf/distinfo > @@ -1,4 +1,4 @@ > -SHA256 (mozilla/firefox-157.0.source-profdata.tar.xz) = > lwkzOiqkOrreLbO+tEnGwySn0Mb2+W4bNQBL39D/7/c= > -SHA256 (mozilla/librewolf-157.0-1.source.tar.gz) = > vqPMfFfz+4ko1YOgYDsPQBMLAvZi4DJ0Y0WlHg9V/7M= > -SIZE (mozilla/firefox-157.0.source-profdata.tar.xz) = 18900828 > -SIZE (mozilla/librewolf-157.0-1.source.tar.gz) = 1178691023 > +SHA256 (mozilla/firefox-158.0.source-profdata.tar.xz) = > Jd8si/gEYPCqHefjsMFmOyjt438g5pGAGiYqMhl0vuQ= > +SHA256 (mozilla/librewolf-158.0-1.source.tar.gz) = > 6iQk+0wCkWwMUxIQ8d2LRg6FB08tjKBSnUlVPTbdE8A= > +SIZE (mozilla/firefox-158.0.source-profdata.tar.xz) = 19008760 > +SIZE (mozilla/librewolf-158.0-1.source.tar.gz) = 1181473241 > diff --git a/www/librewolf/patches/patch-config_makefiles_rust_mk > b/www/librewolf/patches/patch-config_makefiles_rust_mk > index 177aa8e43ee..ec6c03fbb5f 100644 > --- a/www/librewolf/patches/patch-config_makefiles_rust_mk > +++ b/www/librewolf/patches/patch-config_makefiles_rust_mk > @@ -5,13 +5,13 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1640982 > Index: config/makefiles/rust.mk > --- config/makefiles/rust.mk.orig > +++ config/makefiles/rust.mk > -@@ -91,7 +91,8 @@ ifeq (,$(RUST_SANCOV_FLAGS)) > - # Never enable when coverage is enabled to work around > https://github.com/rust-lang/rust/issues/90045. > - ifndef MOZ_CODE_COVERAGE > - ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE))) > --cargo_rustc_flags += -Clto$(if $(filter full,$(MOZ_LTO_RUST_CROSS)),=fat) > +@@ -56,7 +56,8 @@ cargo_build_flags += $(MOZ_CARGO_BUILD_STD_ARGS) > + cargo_rustc_flags = $(CARGO_RUSTCFLAGS) > + # Enable link-time optimization for release builds. > + ifdef RUST_LIBRARY_LTO > +-cargo_rustc_flags += -Clto > +cargo_rustc_flags += -Clto=thin > +export CARGO_PROFILE_RELEASE_LTO=thin > endif > - # We need -Cembed-bitcode=yes for all crates when using -Clto. > - RUSTFLAGS += -Cembed-bitcode=yes > + > + ifdef CARGO_INCREMENTAL > diff --git a/www/librewolf/patches/patch-js_src_gc_Memory_cpp > b/www/librewolf/patches/patch-js_src_gc_Memory_cpp > index ed8ff73cccc..811d3308ad1 100644 > --- a/www/librewolf/patches/patch-js_src_gc_Memory_cpp > +++ b/www/librewolf/patches/patch-js_src_gc_Memory_cpp > @@ -3,7 +3,7 @@ https://hg.mozilla.org/mozilla-central/rev/b3a14f8efa23 > Index: js/src/gc/Memory.cpp > --- js/src/gc/Memory.cpp.orig > +++ js/src/gc/Memory.cpp > -@@ -532,6 +532,30 @@ void MapStack(size_t stackSize) { > +@@ -534,6 +534,30 @@ void MapStack(size_t stackSize) { > #endif > } > > diff --git a/www/librewolf/patches/patch-js_src_wasm_WasmStacks_cpp > b/www/librewolf/patches/patch-js_src_wasm_WasmStacks_cpp > index 81bbe151b4f..badaabac523 100644 > --- a/www/librewolf/patches/patch-js_src_wasm_WasmStacks_cpp > +++ b/www/librewolf/patches/patch-js_src_wasm_WasmStacks_cpp > @@ -3,7 +3,7 @@ https://hg.mozilla.org/mozilla-central/rev/b3a14f8efa23 > Index: js/src/wasm/WasmStacks.cpp > --- js/src/wasm/WasmStacks.cpp.orig > +++ js/src/wasm/WasmStacks.cpp > -@@ -874,7 +874,7 @@ ContStackArena::~ContStackArena() { > +@@ -877,7 +877,7 @@ ContStackArena::~ContStackArena() { > /* static */ > UniqueContStackArena ContStackArena::create(ContStackAllocator* owner) { > size_t arenaSize = owner->arenaSize(); > diff --git a/www/librewolf/patches/patch-lw_policies_json > b/www/librewolf/patches/patch-lw_policies_json > index ba045f030c7..51f402bd2d8 100644 > --- a/www/librewolf/patches/patch-lw_policies_json > +++ b/www/librewolf/patches/patch-lw_policies_json > @@ -3,63 +3,52 @@ perhaps send these to librewolf upstream as well > Index: lw/policies.json > --- lw/policies.json.orig > +++ lw/policies.json > -@@ -1,26 +1,47 @@ > - { > +@@ -2,26 +2,37 @@ > "__COMMENT__ More Information": > "https://github.com/mozilla/policy-templates/blob/master/README.md";, > "policies": { > -- "AIControls": { > -+ > -+ "GenerativeAI": { > -+ "Enabled": false, > -+ "Chatbot": false, > -+ "LinkPreviews": false, > -+ "TabGroups": false, > -+ "Locked": true > -+ }, > -+ "AIControls": { > + "AIControls": { > + "Default": { > -+ "Value": "blocked", > -+ "Locked": true > ++ "Value": "blocked", > ++ "Locked": true > + }, > "Translations": { > - "Value": "available" > -+ "Value": "blocked", > -+ "Locked": false > ++ "Value": "blocked", > ++ "Locked": true > }, > "PDFAltText": { > - "Value": "blocked" > -+ "Value": "blocked", > -+ "Locked": false > ++ "Value": "blocked", > ++ "Locked": true > }, > "SmartTabGroups": { > - "Value": "blocked" > -+ "Value": "blocked", > -+ "Locked": true > ++ "Value": "blocked", > ++ "Locked": true > }, > "LinkPreviewKeyPoints": { > - "Value": "blocked" > -+ "Value": "blocked", > -+ "Locked": true > ++ "Value": "blocked", > ++ "Locked": true > }, > "SidebarChatbot": { > - "Value": "blocked" > -+ "Value": "blocked", > -+ "Locked": true > ++ "Value": "blocked", > ++ "Locked": true > }, > "SmartWindow": { > - "Value": "blocked" > -+ "Value": "blocked", > -+ "Locked": true > ++ "Value": "blocked", > ++ "Locked":, true > + }, > + "SpeechRecognition": { > +- "Value": "blocked" > ++ "Value": "blocked", > ++ "Locked": true > } > -- }, > -+ > -+ }, > -+ > -+ > + }, > "AppUpdateURL": "https://localhost";, > - "DisableAppUpdate": true, > - "DisableDefaultBrowserAgent": true, > -@@ -73,6 +94,7 @@ > +@@ -87,6 +98,7 @@ > "EnablePrompting": true > }, > "NoDefaultBookmarks": true, > @@ -67,15 +56,15 @@ Index: lw/policies.json > "OverridePostUpdatePage": "", > "SkipTermsOfUse": true, > "SupportMenu": { > -@@ -84,6 +106,11 @@ > +@@ -98,6 +110,11 @@ > "SkipOnboarding": true, > "MoreFromMozilla": false, > "FirefoxLabs": false > + }, > + "SearchEngines": { > -+ "Remove": [ > -+ "Perplexity" > -+ ] > ++ "Remove": [ > ++ "Perplexity" > ++ ] > } > } > } > diff --git a/www/librewolf/patches/patch-mozconfig > b/www/librewolf/patches/patch-mozconfig > index 327fa7440ef..6a5c64120f3 100644 > --- a/www/librewolf/patches/patch-mozconfig > +++ b/www/librewolf/patches/patch-mozconfig > @@ -28,9 +28,9 @@ Index: mozconfig > +# ac_add_options --disable-tests > ac_add_options --disable-updater > ac_add_options --disable-cargo-incremental > - ac_add_options --enable-hardening > -@@ -13,8 +20,9 @@ ac_add_options --enable-release > - ac_add_options --enable-rust-simd > + ac_add_options --enable-update-channel=release > +@@ -15,8 +22,9 @@ ac_add_options --enable-rust-simd > + ac_add_options --enable-proxy-bypass-protection > # allow replacing malloc manually, will not affect regular systems > # not compatible with ac_add_options --disable-jemalloc, which only works > when preloading custom malloc > -ac_add_options --enable-replace-malloc > @@ -41,7 +41,7 @@ Index: mozconfig > > ac_add_options --with-app-name=librewolf > ac_add_options --with-branding=browser/branding/librewolf > -@@ -33,7 +41,19 @@ mk_add_options MOZ_TELEMETRY_REPORTING=0 > +@@ -36,7 +44,19 @@ mk_add_options MOZ_TELEMETRY_REPORTING=0 > > export CFLAGS="-ftrivial-auto-var-init=zero -fwrapv -Wno-backend-plugin > $CFLAGS" > export CXXFLAGS="-ftrivial-auto-var-init=zero -fwrapv -Wno-backend-plugin > $CXXFLAGS" > diff --git a/www/librewolf/patches/patch-third_party_llama_cpp_moz_build > b/www/librewolf/patches/patch-third_party_llama_cpp_moz_build > index 931d744474f..cb56ac879cd 100644 > --- a/www/librewolf/patches/patch-third_party_llama_cpp_moz_build > +++ b/www/librewolf/patches/patch-third_party_llama_cpp_moz_build > @@ -17,7 +17,7 @@ Example error at compile time: > Index: third_party/llama.cpp/moz.build > --- third_party/llama.cpp/moz.build.orig > +++ third_party/llama.cpp/moz.build > -@@ -135,6 +135,18 @@ if CONFIG["OS_TARGET"] == "Linux": > +@@ -174,6 +174,18 @@ if CONFIG["OS_TARGET"] == "Linux": > OS_LIBS += [ > "dl", > ] > -- > 2.55.0 >
