diff --git a/.gitignore b/.gitignore index 438a7ec..3ffff17 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,5 @@ /nscl-ef1ecbea27e39e255d988a8fb0233ab53c46e57c.tar.gz /noscript-11.4.28.tar.gz /nscl-4c94bf24f117277f5c00878005d91d0d7aaa18e4.tar.gz +/noscript-11.4.29.tar.gz +/nscl-08593a23b46e2616ffadf2836291ef233e62ac89.tar.gz diff --git a/mozilla-noscript-fedora.patch b/mozilla-noscript-fedora.patch index 6cc4511..74c00c3 100644 --- a/mozilla-noscript-fedora.patch +++ b/mozilla-noscript-fedora.patch @@ -1,21 +1,7 @@ -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" - --# install html5_events.pl dependencies if needed --cpan Regexp::List List::MoreUtils --if ./html5_events/html5_events.pl; then -- # update full event list as an array in src/lib/DocumentFreezer.js -- EVENTS=$(grep '^on[a-z]\+$' html5_events/html5_events_archive.txt | sed "s/^on//;s/.*/'&'/;H;1h;"'$!d;x;s/\n/, /g'); -- perl -pi -e 's/(\bconst eventTypes\s*=\s*)\[.*?\]/$1\['"$EVENTS"'\]/' src/lib/DocumentFreezer.js --fi - - rm -rf "$BUILD" "$XPI" - cp -pR "$SRC" "$BUILD" -@@ -86,8 +79,8 @@ cp -pR "$SRC" "$BUILD" +diff -up noscript-11.4.29/build.sh.f noscript-11.4.29/build.sh +--- noscript-11.4.29/build.sh.f 2023-12-08 00:02:44.000000000 +0100 ++++ noscript-11.4.29/build.sh 2024-02-29 13:33:30.692581632 +0100 +@@ -78,8 +78,8 @@ cp -pR "$SRC" "$BUILD" cp -p LICENSE "$BUILD"/ @@ -26,7 +12,7 @@ diff -up noscript-11.4.28/build.sh.f noscript-11.4.28/build.sh CHROMIUM_BUILD_CMD="$BUILD_CMD" CHROMIUM_BUILD_OPTS="$BUILD_OPTS" -@@ -131,10 +124,42 @@ else +@@ -123,10 +123,41 @@ else WEBEXT_OUT="$XPI_DIR" fi @@ -37,7 +23,6 @@ diff -up noscript-11.4.28/build.sh.f noscript-11.4.28/build.sh +content/experiments.js +nscl/boot.js +nscl/common/Entities.js -+nscl/content/DocumentFreezer.js +nscl/content/ftp.js +nscl/content/patchWorkers.js +nscl/content.js @@ -71,7 +56,7 @@ diff -up noscript-11.4.28/build.sh.f noscript-11.4.28/build.sh } build -@@ -156,6 +181,7 @@ elif ! [ -f "$XPI.xpi" ]; then +@@ -148,6 +179,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 804ec5d..2bd2e09 100644 --- a/mozilla-noscript.spec +++ b/mozilla-noscript.spec @@ -9,11 +9,11 @@ # needed for this package %global extension_id \{73a6fe31-595d-460b-a920-fcc0f8843232\} -%global nscl_commit 4c94bf24f117277f5c00878005d91d0d7aaa18e4 +%global nscl_commit 08593a23b46e2616ffadf2836291ef233e62ac89 Name: mozilla-noscript -Version: 11.4.28 -Release: 3%{?dist} +Version: 11.4.29 +Release: 1%{?dist} Summary: JavaScript white list extension for Mozilla Firefox License: GPL-3.0-or-later AND MIT AND MPL-2.0 AND CC-BY-SA-3.0 @@ -76,6 +76,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{name}.m %{_datadir}/metainfo/%{name}.metainfo.xml %changelog +* Thu Feb 29 2024 Dominik Mierzejewski - 11.4.29-1 +- update to 11.4.29 (#2253570) + * Thu Jan 25 2024 Fedora Release Engineering - 11.4.28-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 30e2bc9..fa4dc25 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (noscript-11.4.28.tar.gz) = 844a6bff0e08457a3387b6a4e163484eba9288bf02674f9eecd05f4d0cebc0233e2d0d8ed05543fa2bda41b92a3ab46b235033c93758e2e3b81a4411f735acdf -SHA512 (nscl-4c94bf24f117277f5c00878005d91d0d7aaa18e4.tar.gz) = bf4ff314ea1c2f55aed89a7b57a1eb283a19ba496a84c488a29a50c8047b012beeb23545cb8a31f47dfeac1b53f35778e82eb8c281fceb904dd2c69c01b5be9a +SHA512 (noscript-11.4.29.tar.gz) = e44fea24f638a66269c5f1085b463df5a235f577841312e7f68cfcada1e6b950106e64c2c6a78ec0a33d16c814b900369eb0f1f92a7bde3481327c2257bcf85d +SHA512 (nscl-08593a23b46e2616ffadf2836291ef233e62ac89.tar.gz) = e254dfc46cbf90890e1260a25ea9bbcee9d9122539252050f8bdf61db57eda79312f4a3528416dfcebc0865a5e15a8480db11881552745b3251ffad80a3da6cc