diff --git a/.gitignore b/.gitignore index 7cbbd3c..a93bbcb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ # Local builds -/camoufox-* +/omegafox-* /firefox-* /mozilla-unified dist/ diff --git a/Makefile b/Makefile index ba1fab6..9d1ccc0 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ include upstream.sh export -cf_source_dir := camoufox-$(version)-$(release) +cf_source_dir := omegafox-$(version)-$(release) ff_source_tarball := firefox-$(version).source.tar.xz debs := python3 python3-dev python3-pip p7zip-full golang-go msitools wget aria2 @@ -31,7 +31,7 @@ help: @echo " package-macos - Package Camoufox for macOS" @echo " package-windows - Package Camoufox for Windows" @echo " run - Run Camoufox" - @echo " edit-cfg - Edit camoufox.cfg" + @echo " edit-cfg - Edit omegafox.cfg" @echo " ff-dbg - Setup vanilla Firefox with minimal patches" @echo " patch - Apply a patch" @echo " unpatch - Remove a patch" @@ -88,7 +88,7 @@ ff-dbg: setup # Only apply patches to help debug vanilla Firefox make patch ./patches/chromeutil.patch make patch ./patches/browser-init.patch - echo "LOCAL_INCLUDES += ['/camoucfg']" >> $(cf_source_dir)/dom/base/moz.build + echo "LOCAL_INCLUDES += ['/omegacfg']" >> $(cf_source_dir)/dom/base/moz.build touch $(cf_source_dir)/_READY make checkpoint make build @@ -147,7 +147,7 @@ build-launcher: check-arch package-linux: python3 scripts/package.py linux \ --includes \ - settings/camoucfg.jvv \ + settings/omegacfg.jvv \ settings/properties.json \ bundle/fontconfigs \ --version $(version) \ @@ -158,7 +158,7 @@ package-linux: package-macos: python3 scripts/package.py macos \ --includes \ - settings/camoucfg.jvv \ + settings/omegacfg.jvv \ settings/properties.json \ --version $(version) \ --release $(release) \ @@ -168,7 +168,7 @@ package-macos: package-windows: python3 scripts/package.py windows \ --includes \ - settings/camoucfg.jvv \ + settings/omegacfg.jvv \ settings/properties.json \ ~/.mozbuild/vs/VC/Redist/MSVC/14.38.33135/$(vcredist_arch)/Microsoft.VC143.CRT/*.dll \ --version $(version) \ @@ -191,16 +191,16 @@ run-pw: run: cd $(cf_source_dir) \ - && rm -rf ~/.camoufox obj-x86_64-pc-linux-gnu/tmp/profile-default \ + && rm -rf ~/.omegafox obj-x86_64-pc-linux-gnu/tmp/profile-default \ && CAMOU_CONFIG=$${CAMOU_CONFIG:-'{}'} \ && CAMOU_CONFIG="$${CAMOU_CONFIG%?}, \"debug\": true}" ./mach run $(args) edit-cfg: - @if [ ! -f $(cf_source_dir)/obj-x86_64-pc-linux-gnu/dist/bin/camoufox.cfg ]; then \ - echo "Error: camoufox.cfg not found. Apply config.patch first."; \ + @if [ ! -f $(cf_source_dir)/obj-x86_64-pc-linux-gnu/dist/bin/omegafox.cfg ]; then \ + echo "Error: omegafox.cfg not found. Apply config.patch first."; \ exit 1; \ fi - $(EDITOR) $(cf_source_dir)/obj-x86_64-pc-linux-gnu/dist/bin/camoufox.cfg + $(EDITOR) $(cf_source_dir)/obj-x86_64-pc-linux-gnu/dist/bin/omegafox.cfg check-arg: @if [ -z "$(_ARGS)" ]; then \ @@ -231,12 +231,12 @@ workspace: make patch $(_ARGS) unbusy: - rm -rf $(cf_source_dir)/obj-x86_64-pc-linux-gnu/dist/bin/camoufox-bin \ - $(cf_source_dir)/obj-x86_64-pc-linux-gnu/dist/bin/camoufox \ + rm -rf $(cf_source_dir)/obj-x86_64-pc-linux-gnu/dist/bin/omegafox-bin \ + $(cf_source_dir)/obj-x86_64-pc-linux-gnu/dist/bin/omegafox \ $(cf_source_dir)/obj-x86_64-pc-linux-gnu/dist/bin/launch path: - @realpath $(cf_source_dir)/obj-x86_64-pc-linux-gnu/dist/bin/camoufox-bin + @realpath $(cf_source_dir)/obj-x86_64-pc-linux-gnu/dist/bin/omegafox-bin upload: # =============================== @@ -244,8 +244,8 @@ upload: # =============================== @test -f .passwd || { echo "Error: .passwd file not found"; exit 1; } - @mkdir -p ../camoufox-web/internal - @rm -rf ../camoufox-web/pipeline/rev-$(closedsrc_rev).7z - 7z a "-p$$(cat ./.passwd)" -mhe=on ../camoufox-web/pipeline/rev-$(closedsrc_rev).7z "./patches/private/*.patch" + @mkdir -p ../omegafox-web/internal + @rm -rf ../omegafox-web/pipeline/rev-$(closedsrc_rev).7z + 7z a "-p$$(cat ./.passwd)" -mhe=on ../omegafox-web/pipeline/rev-$(closedsrc_rev).7z "./patches/private/*.patch" vcredist_arch := $(shell echo $(arch) | sed 's/x86_64/x64/' | sed 's/i686/x86/') diff --git a/additions/camoucfg/MaskConfig.hpp b/additions/omegafox/MaskConfig.hpp similarity index 100% rename from additions/camoucfg/MaskConfig.hpp rename to additions/omegafox/MaskConfig.hpp diff --git a/additions/camoucfg/json.hpp b/additions/omegafox/json.hpp similarity index 100% rename from additions/camoucfg/json.hpp rename to additions/omegafox/json.hpp diff --git a/additions/camoucfg/moz.build b/additions/omegafox/moz.build similarity index 96% rename from additions/camoucfg/moz.build rename to additions/omegafox/moz.build index f0dce5b..7d02d41 100644 --- a/additions/camoucfg/moz.build +++ b/additions/omegafox/moz.build @@ -12,7 +12,7 @@ EXPORTS += [ ] LOCAL_INCLUDES += [ - "/camoucfg", + "/omegacfg", ] FINAL_LIBRARY = "xul" \ No newline at end of file diff --git a/multibuild.py b/multibuild.py index e424fae..2e2d357 100644 --- a/multibuild.py +++ b/multibuild.py @@ -1,5 +1,5 @@ """ -Easy build CLI for Camoufox +Easy build CLI for Omegafox options: -h, --help show this help message and exit @@ -13,7 +13,7 @@ options: Example: $ python3 multibuild.py --target linux windows macos --arch x86_64 arm64 -Since Camoufox is NOT meant to be used as a daily driver, no installers are provided. +Since Omegafox is NOT meant to be used as a daily driver, no installers are provided. """ import argparse @@ -49,12 +49,12 @@ class BSYS: run('make bootstrap') def build(self): - """Build the Camoufox source code""" + """Build the Omegafox source code""" os.environ['BUILD_TARGET'] = f'{self.target},{self.arch}' run('make build') def package(self): - """Package the Camoufox source code""" + """Package the Omegafox source code""" run(f'make package-{self.target} arch={self.arch}') def update_target(self): @@ -65,12 +65,12 @@ class BSYS: @property def assets(self) -> List[str]: """Get the list of assets""" - package_pattern = f'camoufox-*-{self.target[:3]}.{self.arch}.zip' + package_pattern = f'omegafox-*-{self.target[:3]}.{self.arch}.zip' return glob.glob(package_pattern) @staticmethod def clean(): - """Clean the Camoufox directory""" + """Clean the Omegafox directory""" run('make clean') @@ -91,7 +91,7 @@ def run_build(target, arch): def main(): - parser = argparse.ArgumentParser(description="Easy build CLI for Camoufox") + parser = argparse.ArgumentParser(description="Easy build CLI for Omegafox") parser.add_argument( "--target", choices=AVAILABLE_TARGETS, diff --git a/patches/audio-context-spoofing.patch b/patches/audio-context-spoofing.patch index 7857c6d..fbda544 100644 --- a/patches/audio-context-spoofing.patch +++ b/patches/audio-context-spoofing.patch @@ -28,7 +28,7 @@ index 21063575d7..9e7c9f3e84 100644 FINAL_LIBRARY = "xul" +# DOM Mask -+LOCAL_INCLUDES += ["/camoucfg"] ++LOCAL_INCLUDES += ["/omegacfg"] \ No newline at end of file diff --git a/dom/media/webaudio/AudioContext.cpp b/dom/media/webaudio/AudioContext.cpp index 66184b683b..daf30882ea 100644 @@ -70,5 +70,5 @@ index 3ee8c0aa76..c0f1df8cf6 100644 LOCAL_INCLUDES += [".."] + +# DOM Mask -+LOCAL_INCLUDES += ["/camoucfg"] ++LOCAL_INCLUDES += ["/omegacfg"] \ No newline at end of file diff --git a/patches/chromeutil.patch b/patches/chromeutil.patch index 4540607..7a82e38 100644 --- a/patches/chromeutil.patch +++ b/patches/chromeutil.patch @@ -162,7 +162,7 @@ index 6a99703db1..82415eba19 100644 boolean isDarkBackground(Element element); + /** -+ * Camoufox debug commands ++ * Omegafox debug commands + */ + undefined camouDebug(DOMString varName); + @@ -176,27 +176,27 @@ index 6a99703db1..82415eba19 100644 readonly attribute unsigned long aliveUtilityProcesses; + /** -+ * Get an int value from Camoufox MaskConfig. ++ * Get an int value from Omegafox MaskConfig. + */ + long camouGetInt(DOMString varName); + + /** -+ * Get a double value from Camoufox MaskConfig. ++ * Get a double value from Omegafox MaskConfig. + */ + double camouGetDouble(DOMString varName, double defaultValue); + + /** -+ * Get a bool value from Camoufox MaskConfig. ++ * Get a bool value from Omegafox MaskConfig. + */ + boolean camouGetBool(DOMString varName, boolean defaultValue); + + /** -+ * Get a string value from Camoufox MaskConfig. ++ * Get a string value from Omegafox MaskConfig. + */ + DOMString camouGetString(DOMString varName); + + /** -+ * Get a list of strings from Camoufox MaskConfig. ++ * Get a list of strings from Omegafox MaskConfig. + */ + sequence camouGetStringList(DOMString varName); + diff --git a/patches/config.patch b/patches/config.patch index 6b64c17..16c3233 100644 --- a/patches/config.patch +++ b/patches/config.patch @@ -6,7 +6,7 @@ index bb0f71dd60..3ad3d84b82 100644 #endif #endif -+; Camoufox specific files ++; Omegafox specific files +@RESPATH@/defaults/pref/local-settings.js +@RESPATH@/distribution/policies.json +@RESPATH@/omegafox.cfg diff --git a/patches/fingerprint-injection.patch b/patches/fingerprint-injection.patch index 9569e9c..8b3922f 100644 --- a/patches/fingerprint-injection.patch +++ b/patches/fingerprint-injection.patch @@ -8,7 +8,7 @@ index 434167c996..e18a16aee0 100644 ) + +# DOM Mask -+LOCAL_INCLUDES += ["/camoucfg"] ++LOCAL_INCLUDES += ["/omegacfg"] \ No newline at end of file diff --git a/dom/base/Element.cpp b/dom/base/Element.cpp index 807cb4ec25..3df0e0f70f 100644 @@ -235,7 +235,7 @@ index 114402c4a1..55daeabe7a 100644 ) + +# DOM Mask -+LOCAL_INCLUDES += ["/camoucfg"] ++LOCAL_INCLUDES += ["/omegacfg"] \ No newline at end of file diff --git a/dom/base/nsGlobalWindowInner.cpp b/dom/base/nsGlobalWindowInner.cpp index 3678ebc59c..03a72fe242 100644 @@ -461,7 +461,7 @@ index 3a90c93c01..91d673039b 100644 MOCHITEST_MANIFESTS += ["test/mochitest.toml"] + +# DOM Mask -+LOCAL_INCLUDES += ["/camoucfg"] ++LOCAL_INCLUDES += ["/omegacfg"] \ No newline at end of file diff --git a/dom/workers/WorkerNavigator.cpp b/dom/workers/WorkerNavigator.cpp index b05e409a84..8e0f7ea657 100644 @@ -531,5 +531,5 @@ index c7818826d1..2e2e6526e7 100644 BROWSER_CHROME_MANIFESTS += ["test/browser.toml"] + +# DOM Mask -+LOCAL_INCLUDES += ["/camoucfg"] ++LOCAL_INCLUDES += ["/omegacfg"] \ No newline at end of file diff --git a/patches/font-hijacker.patch b/patches/font-hijacker.patch index 08fd76c..54e39fe 100644 --- a/patches/font-hijacker.patch +++ b/patches/font-hijacker.patch @@ -37,7 +37,7 @@ index 3d99906827..a9d1191688 100644 include("/tools/fuzzing/libfuzzer-config.mozbuild") + +# DOM Mask -+LOCAL_INCLUDES += ["/camoucfg"] ++LOCAL_INCLUDES += ["/omegacfg"] \ No newline at end of file diff --git a/layout/style/FontFace.cpp b/layout/style/FontFace.cpp index f1a90334ea..47d3a881ac 100644 @@ -155,5 +155,5 @@ index a14ab6a7ac..6e6a727abf 100644 ] + +# DOM Mask -+LOCAL_INCLUDES += ["/camoucfg"] ++LOCAL_INCLUDES += ["/omegacfg"] \ No newline at end of file diff --git a/patches/geolocation-spoofing.patch b/patches/geolocation-spoofing.patch index 9606c64..b388d9d 100644 --- a/patches/geolocation-spoofing.patch +++ b/patches/geolocation-spoofing.patch @@ -79,7 +79,7 @@ index 2d6b6b5fab..0c7ed74c6d 100644 CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] + +# DOM Mask -+LOCAL_INCLUDES += ["/camoucfg"] ++LOCAL_INCLUDES += ["/omegacfg"] \ No newline at end of file diff --git a/dom/system/NetworkGeolocationProvider.sys.mjs b/dom/system/NetworkGeolocationProvider.sys.mjs index 7edc62b4a6..19b77aa6b6 100644 diff --git a/patches/librewolf/dbus_name.patch b/patches/librewolf/dbus_name.patch index 490f709..875d991 100644 --- a/patches/librewolf/dbus_name.patch +++ b/patches/librewolf/dbus_name.patch @@ -7,7 +7,7 @@ index aad9d7054af8..a926d8b6abdc 100644 aDestinationName = - nsPrintfCString("org.mozilla.%s.%s", aProgram, profileName.get()); -+ nsPrintfCString("com.camoufox.%s.%s", aProgram, profileName.get()); ++ nsPrintfCString("com.omegafox.%s.%s", aProgram, profileName.get()); if (aDestinationName.Length() > DBUS_MAXIMUM_NAME_LENGTH) aDestinationName.Truncate(DBUS_MAXIMUM_NAME_LENGTH); @@ -16,7 +16,7 @@ index aad9d7054af8..a926d8b6abdc 100644 // We don't have a valid busName yet - try to create a default one. aDestinationName = - nsPrintfCString("org.mozilla.%s.%s", aProgram, "default"); -+ nsPrintfCString("com.camoufox.%s.%s", aProgram, "default"); ++ nsPrintfCString("com.omegafox.%s.%s", aProgram, "default"); if (!sDBusValidateBusName(aDestinationName.get(), nullptr)) { // We failed completelly to get a valid bus name - just quit // to prevent crash at dbus_bus_request_name(). @@ -34,7 +34,7 @@ index aad9d7054af8..a926d8b6abdc 100644 nsAutoCString remoteInterfaceName; - remoteInterfaceName = nsPrintfCString("org.mozilla.%s", appName.get()); -+ remoteInterfaceName = nsPrintfCString("com.camoufox.%s", appName.get()); ++ remoteInterfaceName = nsPrintfCString("com.omegafox.%s", appName.get()); LOG(" DBus destination: %s\n", destinationName.get()); LOG(" DBus path: %s\n", pathName.get()); @@ -47,7 +47,7 @@ index 4afb8381d0bc..bd927334b817 100644 "\"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\">\n" "\n" - " \n" -+ " \n" ++ " \n" " \n" " \n" " \n" @@ -56,7 +56,7 @@ index 4afb8381d0bc..bd927334b817 100644 const gchar* aMethodName, Span aParam) { - nsPrintfCString ourInterfaceName("org.mozilla.%s", mAppName.get()); -+ nsPrintfCString ourInterfaceName("com.camoufox.%s", mAppName.get()); ++ nsPrintfCString ourInterfaceName("com.omegafox.%s", mAppName.get()); if ((strcmp("OpenURL", aMethodName) != 0) || (strcmp(ourInterfaceName.get(), aInterfaceName) != 0)) { @@ -65,7 +65,7 @@ index 4afb8381d0bc..bd927334b817 100644 void nsDBusRemoteServer::OnBusAcquired(GDBusConnection* aConnection) { - mPathName = nsPrintfCString("/org/mozilla/%s/Remote", mAppName.get()); -+ mPathName = nsPrintfCString("/com/camoufox/%s/Remote", mAppName.get()); ++ mPathName = nsPrintfCString("/com/omegafox/%s/Remote", mAppName.get()); static auto sDBusValidatePathName = (bool (*)(const char*, DBusError*))dlsym( RTLD_DEFAULT, "dbus_validate_path"); if (!sDBusValidatePathName || @@ -75,7 +75,7 @@ index 4afb8381d0bc..bd927334b817 100644 - nsPrintfCString busName("org.mozilla.%s.%s", mAppName.get(), - profileName.get()); -+ nsPrintfCString busName("com.camoufox.%s.%s", mAppName.get(), profileName.get()); ++ nsPrintfCString busName("com.omegafox.%s.%s", mAppName.get(), profileName.get()); if (busName.Length() > DBUS_MAXIMUM_NAME_LENGTH) { busName.Truncate(DBUS_MAXIMUM_NAME_LENGTH); } @@ -84,7 +84,7 @@ index 4afb8381d0bc..bd927334b817 100644 // We don't have a valid busName yet - try to create a default one. if (!sDBusValidateBusName(busName.get(), nullptr)) { - busName = nsPrintfCString("org.mozilla.%s.%s", mAppName.get(), "default"); -+ busName = nsPrintfCString("com.camoufox.%s.%s", mAppName.get(), "default"); ++ busName = nsPrintfCString("com.omegafox.%s.%s", mAppName.get(), "default"); if (!sDBusValidateBusName(busName.get(), nullptr)) { // We failed completelly to get a valid bus name - just quit // to prevent crash at dbus_bus_request_name(). diff --git a/patches/librewolf/devtools-bypass.patch b/patches/librewolf/devtools-bypass.patch index 15c968e..7d64b58 100644 --- a/patches/librewolf/devtools-bypass.patch +++ b/patches/librewolf/devtools-bypass.patch @@ -7,7 +7,7 @@ index d91f463..3c1ba5a 100644 // Note that the client avoids trying to call attach if already attached. // But just in case, avoid any possible duplicate call to attach. - if (this.alreadyAttached) { -+ let forceDetach = Services.prefs.getBoolPref("camoufox.debugger.force_detach", false); ++ let forceDetach = Services.prefs.getBoolPref("omegafox.debugger.force_detach", false); + if (this.alreadyAttached || forceDetach) { return; } @@ -21,7 +21,7 @@ index 3e5d0bc..8260e2b 100644 */ onConsoleAPILogEvent(message) { - if (!this.handler) { -+ let disableConsole = Services.prefs.getBoolPref("camoufox.console.logging_disabled", false); ++ let disableConsole = Services.prefs.getBoolPref("omegafox.console.logging_disabled", false); + if (!this.handler || disableConsole) { return; } diff --git a/patches/librewolf/mozilla_dirs.patch b/patches/librewolf/mozilla_dirs.patch index 139e915..9bc9336 100644 --- a/patches/librewolf/mozilla_dirs.patch +++ b/patches/librewolf/mozilla_dirs.patch @@ -5,19 +5,19 @@ getter_AddRefs(localDir)); if (NS_SUCCEEDED(rv)) { - rv = localDir->AppendNative("Mozilla"_ns); -+ rv = localDir->AppendNative("Camoufox"_ns); ++ rv = localDir->AppendNative("Omegafox"_ns); } # else constexpr auto dirname = # ifdef HAVE_USR_LIB64_DIR - "/usr/lib64/mozilla"_ns -+ "/usr/lib64/camoufox"_ns ++ "/usr/lib64/omegafox"_ns # elif defined(__OpenBSD__) || defined(__FreeBSD__) - "/usr/local/lib/mozilla"_ns -+ "/usr/local/lib/camoufox"_ns ++ "/usr/local/lib/omegafox"_ns # else - "/usr/lib/mozilla"_ns -+ "/usr/lib/camoufox"_ns ++ "/usr/lib/omegafox"_ns # endif ; rv = NS_NewNativeLocalFile(dirname, false, getter_AddRefs(localDir)); @@ -26,10 +26,10 @@ NS_ENSURE_SUCCESS(rv, rv); # if defined(XP_MACOSX) - rv = file->AppendNative("Mozilla"_ns); -+ rv = file->AppendNative("Camoufox"_ns); ++ rv = file->AppendNative("Omegafox"_ns); # else // defined(XP_MACOSX) - rv = file->AppendNative(".mozilla"_ns); -+ rv = file->AppendNative(".camoufox"_ns); ++ rv = file->AppendNative(".omegafox"_ns); # endif // defined(XP_MACOSX) } #endif // defined(XP_UNIX) || defined(XP_MACOSX) @@ -38,10 +38,10 @@ # ifdef ENABLE_SYSTEM_EXTENSION_DIRS # if defined(__OpenBSD__) || defined(__FreeBSD__) - static const char* const sysLExtDir = "/usr/local/share/mozilla/extensions"; -+ static const char* const sysLExtDir = "/usr/local/share/camoufox/extensions"; ++ static const char* const sysLExtDir = "/usr/local/share/omegafox/extensions"; # else - static const char* const sysLExtDir = "/usr/share/mozilla/extensions"; -+ static const char* const sysLExtDir = "/usr/share/camoufox/extensions"; ++ static const char* const sysLExtDir = "/usr/share/omegafox/extensions"; # endif rv = NS_NewNativeLocalFile(nsDependentCString(sysLExtDir), false, getter_AddRefs(file)); @@ -50,7 +50,7 @@ return NS_ERROR_FAILURE; } - } else if (NS_FAILED(localDir->AppendNative("Mozilla"_ns))) { -+ } else if (NS_FAILED(localDir->AppendNative("Camoufox"_ns))) { ++ } else if (NS_FAILED(localDir->AppendNative("Omegafox"_ns))) { return NS_ERROR_FAILURE; } @@ -59,7 +59,7 @@ #if defined(XP_MACOSX) || defined(XP_WIN) - static const char* const sXR = "Mozilla"; -+ static const char* const sXR = "Camoufox"; ++ static const char* const sXR = "Omegafox"; rv = aFile->AppendNative(nsDependentCString(sXR)); NS_ENSURE_SUCCESS(rv, rv); @@ -68,7 +68,7 @@ #elif defined(XP_UNIX) - static const char* const sXR = ".mozilla"; -+ static const char* const sXR = ".camoufox"; ++ static const char* const sXR = ".omegafox"; rv = aFile->AppendNative(nsDependentCString(sXR)); NS_ENSURE_SUCCESS(rv, rv); diff --git a/patches/locale-spoofing.patch b/patches/locale-spoofing.patch index e6f620c..6479454 100644 --- a/patches/locale-spoofing.patch +++ b/patches/locale-spoofing.patch @@ -76,7 +76,7 @@ index 9a043518cf..a8d3733212 100644 +} + +const char* Locale::GetDefaultLocale() { -+ // In Camoufox, GetDefaultLocale is defined outside the header ++ // In Omegafox, GetDefaultLocale is defined outside the header + // to access MaskConfig. + if (auto value = GetCamouLocale()) + return value; diff --git a/patches/network-patches.patch b/patches/network-patches.patch index e2b03f5..2b85ef3 100644 --- a/patches/network-patches.patch +++ b/patches/network-patches.patch @@ -8,7 +8,7 @@ index b090a56d88..9fe4a5e1e8 100644 include("/tools/fuzzing/libfuzzer-config.mozbuild") + +# DOM Mask -+LOCAL_INCLUDES += ["/camoucfg"] ++LOCAL_INCLUDES += ["/omegacfg"] \ No newline at end of file diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp index d0aebdf965..01472ec205 100644 diff --git a/patches/screen-hijacker.patch b/patches/screen-hijacker.patch index 773a97a..16fe70a 100644 --- a/patches/screen-hijacker.patch +++ b/patches/screen-hijacker.patch @@ -25,7 +25,7 @@ index a2b3e60fe5..faa0c113bc 100644 CXXFLAGS += CONFIG["MOZ_PANGO_CFLAGS"] + +# DOM Mask -+LOCAL_INCLUDES += ["/camoucfg"] ++LOCAL_INCLUDES += ["/omegacfg"] \ No newline at end of file diff --git a/gfx/src/nsDeviceContext.cpp b/gfx/src/nsDeviceContext.cpp index 7a4fa8d48f..408b754d92 100644 diff --git a/patches/timezone-spoofing.patch b/patches/timezone-spoofing.patch index 0b9d641..2495811 100644 --- a/patches/timezone-spoofing.patch +++ b/patches/timezone-spoofing.patch @@ -8,7 +8,7 @@ index b0af60b999..28c221136e 100644 Library("intlcomponents") + +# DOM Mask -+LOCAL_INCLUDES += ["/camoucfg"] ++LOCAL_INCLUDES += ["/omegacfg"] \ No newline at end of file diff --git a/intl/components/src/TimeZone.cpp b/intl/components/src/TimeZone.cpp index 5b09dfdcc5..98a78b33cc 100644 diff --git a/patches/voice-spoofing.patch b/patches/voice-spoofing.patch index 755c069..5cace20 100644 --- a/patches/voice-spoofing.patch +++ b/patches/voice-spoofing.patch @@ -8,7 +8,7 @@ index 2cf19982b2..dcdcdb5cbf 100644 ] + +# DOM Mask -+LOCAL_INCLUDES += ['/camoucfg'] ++LOCAL_INCLUDES += ['/omegacfg'] \ No newline at end of file diff --git a/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp b/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp index e5a1353d6b..4a4a5b080b 100644 diff --git a/patches/webgl-spoofing.patch b/patches/webgl-spoofing.patch index 0000d86..6bae179 100644 --- a/patches/webgl-spoofing.patch +++ b/patches/webgl-spoofing.patch @@ -390,5 +390,5 @@ index 3a533d36d1..41d74d9b3f 100644 include("/tools/fuzzing/libfuzzer-config.mozbuild") + +# DOM Mask -+LOCAL_INCLUDES += ["/camoucfg"] ++LOCAL_INCLUDES += ["/omegacfg"] \ No newline at end of file diff --git a/patches/webrtc-ip-spoofing.patch b/patches/webrtc-ip-spoofing.patch index 3fd2ed2..a9fae7c 100644 --- a/patches/webrtc-ip-spoofing.patch +++ b/patches/webrtc-ip-spoofing.patch @@ -312,5 +312,5 @@ index 925190505a..878853f0f0 100644 FINAL_LIBRARY = "xul" + +# DOM Mask -+LOCAL_INCLUDES += ["/camoucfg"] ++LOCAL_INCLUDES += ["/omegacfg"] \ No newline at end of file diff --git a/patches/windows-theming-bug-modified.patch b/patches/windows-theming-bug-modified.patch index 5c00348..c7a5cb1 100644 --- a/patches/windows-theming-bug-modified.patch +++ b/patches/windows-theming-bug-modified.patch @@ -25,12 +25,12 @@ index 54d6b43fe126..116410bb89d9 100644 endif PROGRAMS_DEST = $(DIST)/bin -diff --git a/browser/app/firefox.exe.manifest b/browser/app/camoufox.manifest +diff --git a/browser/app/firefox.exe.manifest b/browser/app/omegafox.manifest similarity index 96% rename from browser/app/firefox.exe.manifest -rename to browser/app/camoufox.exe.manifest +rename to browser/app/omegafox.exe.manifest --- a/browser/app/firefox.exe.manifest -+++ b/browser/app/camoufox.exe.manifest ++++ b/browser/app/omegafox.exe.manifest @@ -3,10 +3,10 @@ Camoufox.app - nightly_dir = os.path.join(temp_dir, 'Camoufox') + # Move Omegafox/Omegafox.app -> Omegafox.app + nightly_dir = os.path.join(temp_dir, 'Omegafox') shutil.move( - os.path.join(nightly_dir, 'Camoufox.app'), os.path.join(temp_dir, 'Camoufox.app') + os.path.join(nightly_dir, 'Omegafox.app'), os.path.join(temp_dir, 'Omegafox.app') ) # Remove old app dir and all content in it shutil.rmtree(nightly_dir) else: - # Move contents out of camoufox folder if it exists - old_camoufox_dir = os.path.join(temp_dir, 'camoufox') - camoufox_dir = os.path.join(temp_dir, 'camoufox-folder') - if os.path.exists(old_camoufox_dir): - # Rename camoufox_dir - os.rename(old_camoufox_dir, camoufox_dir) - for item in os.listdir(camoufox_dir): - shutil.move(os.path.join(camoufox_dir, item), temp_dir) - os.rmdir(camoufox_dir) + # Move contents out of omegafox folder if it exists + old_omegafox_dir = os.path.join(temp_dir, 'omegafox') + omegafox_dir = os.path.join(temp_dir, 'omegafox-folder') + if os.path.exists(old_omegafox_dir): + # Rename omegafox_dir + os.rename(old_omegafox_dir, omegafox_dir) + for item in os.listdir(omegafox_dir): + shutil.move(os.path.join(omegafox_dir, item), temp_dir) + os.rmdir(omegafox_dir) # Create target_dir if target == 'macos': - target_dir = os.path.join(temp_dir, 'Camoufox.app', 'Contents', 'Resources') + target_dir = os.path.join(temp_dir, 'Omegafox.app', 'Contents', 'Resources') else: target_dir = temp_dir @@ -98,14 +98,14 @@ def add_includes_to_package(package_file, includes, fonts, new_file, target): def get_args(): """Get CLI parameters""" parser = argparse.ArgumentParser( - description='Package Camoufox for different operating systems.' + description='Package Omegafox for different operating systems.' ) parser.add_argument('os', choices=['linux', 'macos', 'windows'], help='Target operating system') parser.add_argument( '--includes', nargs='+', help='List of files or directories to include in the package' ) - parser.add_argument('--version', required=True, help='Camoufox version') - parser.add_argument('--release', required=True, help='Camoufox release number') + parser.add_argument('--version', required=True, help='Omegafox version') + parser.add_argument('--release', required=True, help='Omegafox release number') parser.add_argument( '--arch', choices=['x86_64', 'i686', 'arm64'], help='Architecture for Windows build' ) @@ -129,7 +129,7 @@ def main(): run('./mach package') # Find package files search_path = os.path.abspath( - f'obj-{moz_target}/dist/camoufox-{args.version}-{args.release}.*.{file_ext}' + f'obj-{moz_target}/dist/omegafox-{args.version}-{args.release}.*.{file_ext}' ) # Copy package files @@ -146,7 +146,7 @@ def main(): sys.exit(1) # Find the package file - package_pattern = f'camoufox-{args.version}-{args.release}.en-US.*.{file_ext}' + package_pattern = f'omegafox-{args.version}-{args.release}.en-US.*.{file_ext}' package_files = glob.glob(package_pattern) if not package_files: print(f"Error: No package file found matching pattern: {package_pattern}") @@ -154,7 +154,7 @@ def main(): package_file = package_files[0] # Add includes to the package - new_name = f'camoufox-{args.version}-{args.release}-{args.os[:3]}.{args.arch}.zip' + new_name = f'omegafox-{args.version}-{args.release}-{args.os[:3]}.{args.arch}.zip' add_includes_to_package( package_file=package_file, includes=args.includes, diff --git a/scripts/patch.py b/scripts/patch.py index 4fcdd07..72cd09b 100644 --- a/scripts/patch.py +++ b/scripts/patch.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ -The script that patches the Firefox source into the Camoufox source. +The script that patches the Firefox source into the Omegafox source. Based on LibreWolf's patch script: https://gitlab.com/librewolf-community/browser/source/-/blob/main/scripts/librewolf-patches.py @@ -34,12 +34,12 @@ Main patcher functions @dataclass class Patcher: - """Patch and prepare the Camoufox source""" + """Patch and prepare the Omegafox source""" moz_target: str target: str - def camoufox_patches(self): + def omegafox_patches(self): """ Apply all patches """ @@ -122,7 +122,7 @@ Preparation def extract_args(): """Get version and release from args""" if len(args) != 2: - sys.stderr.write('error: please specify version and release of camoufox source') + sys.stderr.write('error: please specify version and release of omegafox source') sys.exit(1) return args[0], args[1] @@ -156,12 +156,12 @@ if __name__ == "__main__": _update_rustup(TARGET) # Check if the folder exists - if not os.path.exists(f'camoufox-{VERSION}-{RELEASE}/configure.py'): + if not os.path.exists(f'omegafox-{VERSION}-{RELEASE}/configure.py'): sys.stderr.write('error: folder doesn\'t look like a Firefox folder.') sys.exit(1) # Apply the patches patcher = Patcher(MOZ_TARGET, TARGET) - patcher.camoufox_patches() + patcher.omegafox_patches() sys.exit(0) # ensure 0 exit code diff --git a/settings/camoufox.cfg b/settings/omegafox.cfg similarity index 100% rename from settings/camoufox.cfg rename to settings/omegafox.cfg diff --git a/settings/camoucfg.jvv b/settings/omegafox.jvv similarity index 100% rename from settings/camoucfg.jvv rename to settings/omegafox.jvv