diff --git a/.gitignore b/.gitignore index 7969e9c..438a7ec 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,5 @@ /nscl-7de366324a204aec9ca3b5a09aa7872683577543.tar.gz /noscript-11.4.27.tar.gz /nscl-ef1ecbea27e39e255d988a8fb0233ab53c46e57c.tar.gz +/noscript-11.4.28.tar.gz +/nscl-4c94bf24f117277f5c00878005d91d0d7aaa18e4.tar.gz diff --git a/mozilla-noscript-fedora.patch b/mozilla-noscript-fedora.patch index cdbbb6a..6cc4511 100644 --- a/mozilla-noscript-fedora.patch +++ b/mozilla-noscript-fedora.patch @@ -1,6 +1,6 @@ -diff -up noscript-11.4.11/build.sh.f noscript-11.4.11/build.sh ---- noscript-11.4.11/build.sh.f 2022-09-14 15:45:17.000000000 +0200 -+++ noscript-11.4.11/build.sh 2022-10-04 14:04:04.620302316 +0200 +diff -up noscript-11.4.28/build.sh.f noscript-11.4.28/build.sh +--- noscript-11.4.28/build.sh.f 2023-10-08 22:29:24.000000000 +0200 ++++ noscript-11.4.28/build.sh 2023-11-21 11:34:58.294714452 +0100 @@ -70,13 +70,6 @@ LIB="$SRC/lib" NSCL="$SRC/nscl" @@ -26,7 +26,7 @@ diff -up noscript-11.4.11/build.sh.f noscript-11.4.11/build.sh CHROMIUM_BUILD_CMD="$BUILD_CMD" CHROMIUM_BUILD_OPTS="$BUILD_OPTS" -@@ -131,10 +124,43 @@ else +@@ -131,10 +124,42 @@ else WEBEXT_OUT="$XPI_DIR" fi @@ -42,7 +42,6 @@ diff -up noscript-11.4.11/build.sh.f noscript-11.4.11/build.sh +nscl/content/patchWorkers.js +nscl/content.js +nscl/COPYING -+nscl/lib/sha256.js.license +nscl/lib/browser-polyfill.js.license +nscl/lib/punycode.js.license +nscl/LICENSE.md @@ -72,7 +71,7 @@ diff -up noscript-11.4.11/build.sh.f noscript-11.4.11/build.sh } build -@@ -156,6 +182,7 @@ elif ! [ -f "$XPI.xpi" ]; then +@@ -156,6 +181,7 @@ elif ! [ -f "$XPI.xpi" ]; then exit 3 fi ln -fs "$XPI.xpi" "$BASE/latest.xpi" diff --git a/mozilla-noscript.spec b/mozilla-noscript.spec index e93e2d4..a667053 100644 --- a/mozilla-noscript.spec +++ b/mozilla-noscript.spec @@ -9,10 +9,10 @@ # needed for this package %global extension_id \{73a6fe31-595d-460b-a920-fcc0f8843232\} -%global nscl_commit ef1ecbea27e39e255d988a8fb0233ab53c46e57c +%global nscl_commit 4c94bf24f117277f5c00878005d91d0d7aaa18e4 Name: mozilla-noscript -Version: 11.4.27 +Version: 11.4.28 Release: 1%{?dist} Summary: JavaScript white list extension for Mozilla Firefox @@ -37,8 +37,6 @@ Provides: bundled(js-flextabs) = 0.2.0 Provides: bundled(js-he) = 1.2.0 # https://mths.be/punycode MIT Provides: bundled(js-punycode) = 1.4.1 -# https://github.com/emn178/js-sha256 MIT -Provides: bundled(js-sha256) = 0.9.0 # https://github.com/hackademix/nscl GPLv3+ Provides: bundled(js-nscl) = 0.0.1 # https://github.com/mozilla/webextension-polyfill MPL @@ -72,12 +70,16 @@ install -Dpm644 %{SOURCE1} %{buildroot}%{_datadir}/metainfo/%{name}.metainfo.xml appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{name}.metainfo.xml %files -%license LICENSE nscl.COPYING nscl.LICENSE.md src/nscl/lib/{browser-polyfill,punycode,sha256}.js.license +%license LICENSE nscl.COPYING nscl.LICENSE.md src/nscl/lib/{browser-polyfill,punycode}.js.license %{_firefox_extdir}/%{extension_id}.xpi # GNOME Software Center metadata %{_datadir}/metainfo/%{name}.metainfo.xml %changelog +* Tue Nov 21 2023 Dominik Mierzejewski - 11.4.28-1 +- update to 11.4.28 (#2242773) +- bundled sha256 implementation is gone + * Thu Sep 28 2023 Dominik Mierzejewski - 11.4.27-1 - update to 11.4.27 (#2238212) diff --git a/sources b/sources index 0c3c834..30e2bc9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (noscript-11.4.27.tar.gz) = 9e06fef6998cba94a8cbe553acdac0491aa30f07e465afdd0bc4649ced569f9ce1c531eab11ec948eb41aec5baafb6797881cff90dc6d802e90ce5774d633899 -SHA512 (nscl-ef1ecbea27e39e255d988a8fb0233ab53c46e57c.tar.gz) = 77df8b62c3a108715c6f484ae7b5bfe89c08aae01dd4b0e191fd9208169a74310a00e7d2bccd4b728fbaffb168a5653e1ce66776acbf006102e8df8fb5571753 +SHA512 (noscript-11.4.28.tar.gz) = 844a6bff0e08457a3387b6a4e163484eba9288bf02674f9eecd05f4d0cebc0233e2d0d8ed05543fa2bda41b92a3ab46b235033c93758e2e3b81a4411f735acdf +SHA512 (nscl-4c94bf24f117277f5c00878005d91d0d7aaa18e4.tar.gz) = bf4ff314ea1c2f55aed89a7b57a1eb283a19ba496a84c488a29a50c8047b012beeb23545cb8a31f47dfeac1b53f35778e82eb8c281fceb904dd2c69c01b5be9a