Architecture specific change in rpms/golang-gvisor.git
by githook-noreply@fedoraproject.org
The package rpms/golang-gvisor.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-gvisor.git/commit/?id=b05c....
Change:
-ExclusiveArch: x86_64
Thanks.
Full change:
============
commit b05c1d1f7c5b84571ecccf3f14f004ac9427ba48
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Thu Aug 6 17:16:56 2020 +0200
Change method to define ExclusiveArch
Signed-off-by: Robert-André Mauchin <zebob.m(a)gmail.com>
diff --git a/golang-gvisor.spec b/golang-gvisor.spec
index a0bbe43..ef6bb65 100644
--- a/golang-gvisor.spec
+++ b/golang-gvisor.spec
@@ -7,6 +7,8 @@ Version: 20200804.0
# taken from the "go" branch (as bazel is not available in fedora)
%global commit 1d6b9c1e7c040f90f7520abed1fe7ea9aac3b85e
+%global go_arches x86_64
+
%gometa
%global common_description %{expand:
@@ -34,8 +36,6 @@ License: ASL 2.0
URL: %{gourl}
Source0: %{gosource}
-ExclusiveArch: x86_64
-
BuildRequires: golang(github.com/BurntSushi/toml)
BuildRequires: golang(github.com/cenkalti/backoff)
BuildRequires: golang(github.com/containerd/cgroups)
3 years, 9 months
Architecture specific change in rpms/golang-gvisor.git
by githook-noreply@fedoraproject.org
The package rpms/golang-gvisor.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-gvisor.git/commit/?id=ddcb....
Change:
+ExclusiveArch: x86_64
Thanks.
Full change:
============
commit ddcb14ec0b77c75c1ed31bb72fb615a1795827ad
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Thu Aug 6 16:18:42 2020 +0200
Update to 20200804.0
Signed-off-by: Robert-André Mauchin <zebob.m(a)gmail.com>
diff --git a/.gitignore b/.gitignore
index 4293722..f96627a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/gvisor-384ed132b902ead9aae62430382d38ae9afdb95d.tar.gz
+/gvisor-1d6b9c1e7c040f90f7520abed1fe7ea9aac3b85e.tar.gz
diff --git a/golang-gvisor.spec b/golang-gvisor.spec
index a1ec661..a0bbe43 100644
--- a/golang-gvisor.spec
+++ b/golang-gvisor.spec
@@ -3,9 +3,9 @@
# https://github.com/google/gvisor
%global goipath gvisor.dev/gvisor
%global forgeurl https://github.com/google/gvisor
-Version: 20200211.0
+Version: 20200804.0
# taken from the "go" branch (as bazel is not available in fedora)
-%global commit 384ed132b902ead9aae62430382d38ae9afdb95d
+%global commit 1d6b9c1e7c040f90f7520abed1fe7ea9aac3b85e
%gometa
@@ -26,7 +26,7 @@ machines.}
%global godocs README.md AUTHORS
Name: %{goname}
-Release: 3%{?dist}
+Release: 1%{?dist}
Summary: A container sandbox runtime focused on security, efficiency, and ease of use
# Upstream license specification: Apache-2.0
@@ -34,18 +34,48 @@ License: ASL 2.0
URL: %{gourl}
Source0: %{gosource}
+ExclusiveArch: x86_64
+
+BuildRequires: golang(github.com/BurntSushi/toml)
BuildRequires: golang(github.com/cenkalti/backoff)
+BuildRequires: golang(github.com/containerd/cgroups)
+BuildRequires: golang(github.com/containerd/console)
+BuildRequires: golang(github.com/containerd/containerd/api/events)
+BuildRequires: golang(github.com/containerd/containerd/api/types/task)
+BuildRequires: golang(github.com/containerd/containerd/errdefs)
+BuildRequires: golang(github.com/containerd/containerd/events)
+BuildRequires: golang(github.com/containerd/containerd/log)
+BuildRequires: golang(github.com/containerd/containerd/mount)
+BuildRequires: golang(github.com/containerd/containerd/namespaces)
+BuildRequires: golang(github.com/containerd/containerd/pkg/process)
+BuildRequires: golang(github.com/containerd/containerd/pkg/stdio)
+BuildRequires: golang(github.com/containerd/containerd/runtime)
+BuildRequires: golang(github.com/containerd/containerd/runtime/linux/runctypes)
+BuildRequires: golang(github.com/containerd/containerd/runtime/v1/shim/v1)
+BuildRequires: golang(github.com/containerd/containerd/runtime/v2/shim)
+BuildRequires: golang(github.com/containerd/containerd/runtime/v2/task)
+BuildRequires: golang(github.com/containerd/containerd/sys)
+BuildRequires: golang(github.com/containerd/containerd/sys/reaper)
+BuildRequires: golang(github.com/containerd/fifo)
+BuildRequires: golang(github.com/containerd/go-runc)
+BuildRequires: golang(github.com/containerd/ttrpc)
+BuildRequires: golang(github.com/containerd/typeurl)
BuildRequires: golang(github.com/gofrs/flock)
+BuildRequires: golang(github.com/gogo/protobuf/proto)
+BuildRequires: golang(github.com/gogo/protobuf/types)
BuildRequires: golang(github.com/golang/protobuf/proto)
BuildRequires: golang(github.com/golang/protobuf/ptypes)
BuildRequires: golang(github.com/google/btree)
BuildRequires: golang(github.com/google/subcommands)
BuildRequires: golang(github.com/kr/pty)
+BuildRequires: golang(github.com/mohae/deepcopy)
BuildRequires: golang(github.com/opencontainers/runtime-spec/specs-go)
BuildRequires: golang(github.com/syndtr/gocapability/capability)
BuildRequires: golang(github.com/vishvananda/netlink)
BuildRequires: golang(golang.org/x/sys/unix)
BuildRequires: golang(golang.org/x/time/rate)
+BuildRequires: golang(google.golang.org/grpc/codes)
+BuildRequires: golang(google.golang.org/grpc/status)
%description
%{common_description}
@@ -76,6 +106,9 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
%gopkgfiles
%changelog
+* Wed Aug 05 23:07:20 CEST 2020 Robert-André Mauchin <zebob.m(a)gmail.com> - 20200804.0-1.20200805git1d6b9c1
+- Update to 20200804.0
+
* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 20200211.0-3
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index 017f67e..9247a07 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gvisor-384ed132b902ead9aae62430382d38ae9afdb95d.tar.gz) = 4fb033c0731d397d3949f5a2766f58a3e880e96bd8d1aabd971e8c49b7391137881f264ddc59c8b324c96f133a6a57c3dfcda511c4814dbc22db4987dc7c1674
+SHA512 (gvisor-1d6b9c1e7c040f90f7520abed1fe7ea9aac3b85e.tar.gz) = 33166be70bc6243c6f8d9a17a98175748a79d9b24eeff1ec53a9832122209c8c23e8ff0a2535bc061685d71d613967764a55b097de043bef4a6dd125e30a6f1a
3 years, 9 months
Architecture specific change in rpms/mozjs78.git
by githook-noreply@fedoraproject.org
The package rpms/mozjs78.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/mozjs78.git/commit/?id=0d9273ac46....
Change:
+%ifarch s390x
Thanks.
Full change:
============
commit 0d9273ac46cdbe826c0e4ff249fc5fb0f4807182
Author: František Zatloukal <fzatlouk(a)redhat.com>
Date: Mon Aug 3 17:36:59 2020 +0200
Initial Package Upload
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..22c8f15
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/firefox-78.1.0esr.source.tar.xz
diff --git a/0001-Skip-failing-tests-on-ppc64-and-s390x.patch b/0001-Skip-failing-tests-on-ppc64-and-s390x.patch
new file mode 100644
index 0000000..d548dde
--- /dev/null
+++ b/0001-Skip-failing-tests-on-ppc64-and-s390x.patch
@@ -0,0 +1,30 @@
+From db3a0a25b97377b388532b23e73a10d246f66496 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk(a)redhat.com>
+Date: Mon, 3 Aug 2020 10:27:00 +0200
+Subject: [PATCH] Skip failing tests on ppc64 and s390x
+
+ppc64 and s390x: non262/extensions/clone-errors.js
+s390x: test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js
+---
+ js/src/tests/jstests.list | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/js/src/tests/jstests.list b/js/src/tests/jstests.list
+index 4085ce3..4f014f5 100644
+--- a/js/src/tests/jstests.list
++++ b/js/src/tests/jstests.list
+@@ -56,6 +56,11 @@ skip-if(!this.hasOwnProperty('addIntlExtras')) include test262/intl402/DisplayNa
+ skip-if(!this.hasOwnProperty("Atomics")) include test262/built-ins/Atomics/jstests.list
+ skip-if(!this.hasOwnProperty("SharedArrayBuffer")) include test262/built-ins/SharedArrayBuffer/jstests.list
+
++# Crashes on s390x and ppc64, avoid it
++skip-if(xulRuntime.XPCOMABI.match(/s390x|ppc64-/)) script non262/extensions/clone-errors.js
++
++# Crashes on s390x, avoid it
++skip-if(xulRuntime.XPCOMABI.match(/s390x/)) script test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js
+
+ #####################################
+ # Test262 tests disabled on browser #
+--
+2.26.2
+
diff --git a/armv7_disable_WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS.patch b/armv7_disable_WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS.patch
new file mode 100644
index 0000000..0cb26ac
--- /dev/null
+++ b/armv7_disable_WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS.patch
@@ -0,0 +1,10 @@
+--- firefox-68.0/js/src/wasm/WasmSignalHandlers.cpp
++++ firefox-68.0/js/src/wasm/WasmSignalHandlers.cpp
+@@ -243,7 +243,7 @@
+ // If you run into compile problems on a tier-3 platform, you can disable the
+ // emulation here.
+
+-#if defined(__linux__) && defined(__arm__)
++#if 0 && defined(__linux__) && defined(__arm__)
+ # define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
+ #endif
diff --git a/copy-headers.patch b/copy-headers.patch
new file mode 100644
index 0000000..dfa1fdb
--- /dev/null
+++ b/copy-headers.patch
@@ -0,0 +1,38 @@
+From 3b3c8e37cca418e07bdeceaf3a601805df28d925 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk(a)redhat.com>
+Date: Wed, 15 Jul 2020 08:27:39 +0200
+Subject: [PATCH] build: Copy headers on install instead of symlinking
+
+Patch by Philip Chimento ported forward to mozjs78
+---
+ python/mozbuild/mozbuild/backend/recursivemake.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
+index e3fc8fe..bed5ae9 100644
+--- a/python/mozbuild/mozbuild/backend/recursivemake.py
++++ b/python/mozbuild/mozbuild/backend/recursivemake.py
+@@ -1457,9 +1457,9 @@ class RecursiveMakeBackend(MakeBackend):
+ raise Exception("Wildcards are only supported in the filename part"
+ " of srcdir-relative or absolute paths.")
+
+- install_manifest.add_pattern_link(basepath, wild, path)
++ install_manifest.add_pattern_copy(basepath, wild, path)
+ else:
+- install_manifest.add_pattern_link(f.srcdir, f, path)
++ install_manifest.add_pattern_copy(f.srcdir, f, path)
+ elif isinstance(f, AbsolutePath):
+ if not f.full_path.lower().endswith(('.dll', '.pdb', '.so')):
+ raise Exception("Absolute paths installed to FINAL_TARGET_FILES must"
+@@ -1468,7 +1468,7 @@ class RecursiveMakeBackend(MakeBackend):
+ install_manifest.add_optional_exists(dest)
+ absolute_files.append(f.full_path)
+ else:
+- install_manifest.add_link(f.full_path, dest)
++ install_manifest.add_copy(f.full_path, dest)
+ else:
+ install_manifest.add_optional_exists(dest)
+ objdir_files.append(self._pretty_path(f, backend_file))
+--
+2.26.2
+
diff --git a/emitter.patch b/emitter.patch
new file mode 100644
index 0000000..15e752b
--- /dev/null
+++ b/emitter.patch
@@ -0,0 +1,61 @@
+From d1d785c169345b81c76213f6dd9be32b4db60294 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk(a)redhat.com>
+Date: Wed, 15 Jul 2020 08:39:47 +0200
+Subject: [PATCH] Build: allow LOCAL_INCLUDES paths with topsrcdir or topobjdir
+
+---
+ python/mozbuild/mozbuild/frontend/emitter.py | 6 ------
+ .../mozbuild/test/frontend/test_emitter.py | 20 -------------------
+ 2 files changed, 26 deletions(-)
+
+diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
+index 8d5ab8e..65c43ff 100644
+--- a/python/mozbuild/mozbuild/frontend/emitter.py
++++ b/python/mozbuild/mozbuild/frontend/emitter.py
+@@ -1239,12 +1239,6 @@ class TreeMetadataEmitter(LoggingMixin):
+ 'is a filename, but a directory is required: %s '
+ '(resolved to %s)' % (local_include, full_path),
+ context)
+- if (full_path == context.config.topsrcdir or
+- full_path == context.config.topobjdir):
+- raise SandboxValidationError(
+- 'Path specified in LOCAL_INCLUDES '
+- '(%s) resolves to the topsrcdir or topobjdir (%s), which is '
+- 'not allowed' % (local_include, full_path), context)
+ include_obj = LocalInclude(context, local_include)
+ local_includes.append(include_obj.path.full_path)
+ yield include_obj
+diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
+index e8cbd81..d45ccee 100644
+--- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py
++++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
+@@ -1040,26 +1040,6 @@ class TestEmitterBasic(unittest.TestCase):
+
+ self.assertEqual(local_includes, expected)
+
+- def test_local_includes_invalid(self):
+- """Test that invalid LOCAL_INCLUDES are properly detected."""
+- reader = self.reader('local_includes-invalid/srcdir')
+-
+- with six.assertRaisesRegex(
+- self,
+- SandboxValidationError,
+- 'Path specified in LOCAL_INCLUDES.*resolves to the '
+- 'topsrcdir or topobjdir'):
+- self.read_topsrcdir(reader)
+-
+- reader = self.reader('local_includes-invalid/objdir')
+-
+- with six.assertRaisesRegex(
+- self,
+- SandboxValidationError,
+- 'Path specified in LOCAL_INCLUDES.*resolves to the '
+- 'topsrcdir or topobjdir'):
+- self.read_topsrcdir(reader)
+-
+ def test_local_includes_file(self):
+ """Test that a filename can't be used in LOCAL_INCLUDES."""
+ reader = self.reader('local_includes-filename')
+--
+2.26.2
+
diff --git a/fix-soname.patch b/fix-soname.patch
new file mode 100644
index 0000000..30894e4
--- /dev/null
+++ b/fix-soname.patch
@@ -0,0 +1,26 @@
+From d21c7cb9343d8c495d987e71be0f35887574c820 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk(a)redhat.com>
+Date: Wed, 15 Jul 2020 08:21:47 +0200
+Subject: [PATCH] Add soname switch to linker, regardless of Operating System
+
+Fix backported from Debian: http://bugs.debian.org/746705
+---
+ config/rules.mk | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/config/rules.mk b/config/rules.mk
+index 3965c88..3f92f83 100644
+--- a/config/rules.mk
++++ b/config/rules.mk
+@@ -320,6 +320,8 @@ ifeq ($(OS_ARCH),GNU)
+ OS_CPPFLAGS += -DPATH_MAX=1024 -DMAXPATHLEN=1024
+ endif
+
++EXTRA_DSO_LDOPTS += -Wl,-soname,lib$(JS_LIBRARY_NAME).so.0
++
+ #
+ # MINGW32
+ #
+--
+2.26.2
+
diff --git a/icu_sources_data-Write-command-output-to-our-stderr.patch b/icu_sources_data-Write-command-output-to-our-stderr.patch
new file mode 100644
index 0000000..e2ed484
--- /dev/null
+++ b/icu_sources_data-Write-command-output-to-our-stderr.patch
@@ -0,0 +1,34 @@
+From: Simon McVittie <smcv(a)debian.org>
+Date: Mon, 9 Oct 2017 09:23:14 +0100
+Subject: icu_sources_data: Write command output to our stderr
+
+Saying "See output in /tmp/foobar" is all very well for a developer
+build, but on a buildd our /tmp is going to get thrown away after
+the build. Just log the usual way instead.
+---
+ intl/icu_sources_data.py | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py
+index 8cf9290..7d2d983 100644
+--- a/intl/icu_sources_data.py
++++ b/intl/icu_sources_data.py
+@@ -187,16 +187,13 @@
+
+ def try_run(name, command, cwd=None, **kwargs):
+ try:
+- with tempfile.NamedTemporaryFile(prefix=name, delete=False) as f:
+- subprocess.check_call(command, cwd=cwd, stdout=f,
+- stderr=subprocess.STDOUT, **kwargs)
++ subprocess.check_call(command, cwd=cwd, stdout=sys.stderr,
++ stderr=subprocess.STDOUT, **kwargs)
+ except subprocess.CalledProcessError:
+- print('''Error running "{}" in directory {}
+- See output in {}'''.format(' '.join(command), cwd, f.name),
+- file=sys.stderr)
++ print('''Error running "{}" in directory {}'''.format(' '.join(command), cwd),
++ file=sys.stderr)
+ return False
+ else:
+- os.unlink(f.name)
+ return True
diff --git a/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch b/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch
new file mode 100644
index 0000000..a853a16
--- /dev/null
+++ b/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch
@@ -0,0 +1,26 @@
+From: Simon McVittie <smcv(a)debian.org>
+Date: Mon, 9 Oct 2017 09:22:12 +0100
+Subject: icu_sources_data.py: Decouple from Mozilla build system
+
+mozpack.path is a wrapper around os.path that normalizes path
+separators on Windows, but on Unix we only have one path separator
+so there's nothing to normalize. Avoid needing to import all of it.
+---
+ intl/icu_sources_data.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py
+index 98c0ccb..8cf9290 100644
+--- a/intl/icu_sources_data.py
++++ b/intl/icu_sources_data.py
+@@ -21,7 +21,9 @@
+ import sys
+ import tempfile
+
+-from mozpack import path as mozpath
++# Close enough
++import os.path as mozpath
++mozpath.normsep = lambda p: p
+
+ # The following files have been determined to be dead/unused by a
+ # semi-automated analysis. You can just remove any of the files below
diff --git a/init_patch.patch b/init_patch.patch
new file mode 100644
index 0000000..fd09eb7
--- /dev/null
+++ b/init_patch.patch
@@ -0,0 +1,13 @@
+--- a/python/mozbuild/mozbuild/configure/__init__.py
++++ b/python/mozbuild/mozbuild/configure/__init__.py
+@@ -473,8 +473,8 @@
+ msg = 'Unknown option: %s' % without_value
+ if self._help:
+ self._logger.warning(msg)
+- else:
+- raise InvalidOptionError(msg)
++ #else:
++ # raise InvalidOptionError(msg)
+
+ # Run the execution queue
+ for func, args in self._execution_queue:
diff --git a/mozjs78.spec b/mozjs78.spec
new file mode 100644
index 0000000..5a29282
--- /dev/null
+++ b/mozjs78.spec
@@ -0,0 +1,247 @@
+%global major 78
+
+# LTO - Enable in Release builds, but consider disabling for development as it increases compile time
+%global build_with_lto 1
+
+# Require tests to pass?
+%global require_tests 1
+
+%if 0%{?build_with_lto}
+# LTO is default since F33
+%else
+%define _lto_cflags %{nil}
+%endif
+
+# Require libatomic for ppc
+%ifarch ppc
+%global system_libatomic 1
+%endif
+
+# Big endian platforms
+%ifarch ppc ppc64 s390 s390x
+%global big_endian 1
+%endif
+
+Name: mozjs%{major}
+Version: 78.1.0
+Release: 1%{?dist}
+Summary: SpiderMonkey JavaScript library
+
+License: MPLv2.0 and MPLv1.1 and BSD and GPLv2+ and GPLv3+ and LGPLv2+ and AFL and ASL 2.0
+URL: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
+Source0: https://ftp.mozilla.org/pub/firefox/releases/%{version}esr/source/firefox...
+
+# Patches from mozjs68, rebased for mozjs78:
+Patch01: fix-soname.patch
+Patch02: copy-headers.patch
+Patch03: tests-increase-timeout.patch
+Patch09: icu_sources_data.py-Decouple-from-Mozilla-build-system.patch
+Patch10: icu_sources_data-Write-command-output-to-our-stderr.patch
+
+# Build fixes - https://hg.mozilla.org/mozilla-central/rev/ca36a6c4f8a4a0ddaa033fdbe20836...
+Patch12: emitter.patch
+
+# Build fixes
+Patch14: init_patch.patch
+# TODO: Check with mozilla for cause of these fails and re-enable spidermonkey compile time checks if needed
+Patch15: spidermonkey_checks_disable.patch
+
+# armv7 fixes
+Patch17: armv7_disable_WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS.patch
+
+# s390x/ppc64 fixes, TODO: file bug report upstream?
+Patch18: spidermonkey_style_check_disable_s390x.patch
+Patch19: 0001-Skip-failing-tests-on-ppc64-and-s390x.patch
+
+BuildRequires: autoconf213
+BuildRequires: cargo
+BuildRequires: clang-devel
+BuildRequires: gcc
+BuildRequires: gcc-c++
+BuildRequires: nasm
+BuildRequires: llvm
+BuildRequires: llvm-devel
+BuildRequires: icu
+BuildRequires: rust
+BuildRequires: perl-devel
+BuildRequires: pkgconfig(libffi)
+BuildRequires: pkgconfig(zlib)
+BuildRequires: python3-devel
+BuildRequires: python3-six
+BuildRequires: readline-devel
+BuildRequires: zip
+%if 0%{?system_libatomic}
+BuildRequires: libatomic
+%endif
+
+%description
+SpiderMonkey is the code-name for Mozilla Firefox's C++ implementation of
+JavaScript. It is intended to be embedded in other applications
+that provide host environments for JavaScript.
+
+%package devel
+Summary: Development files for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+%prep
+%setup -q -n firefox-%{version}/js/src
+
+pushd ../..
+%patch01 -p1
+%patch02 -p1
+%patch03 -p1
+%patch09 -p1
+%patch10 -p1
+
+%patch12 -p1
+
+%patch14 -p1
+%patch15 -p1
+
+%ifarch armv7hl
+# Disable WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS as it causes the compilation to fail
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1526653
+%patch17 -p1
+%endif
+
+%ifarch s390x
+%patch18 -p1
+%endif
+
+# Fixes for ppc64 and s390x, there is no need to keep it in ifarch here since mozilla tests support ifarch conditions
+%patch19 -p1
+
+# Copy out the LICENSE file
+cp LICENSE js/src/
+popd
+
+# Remove zlib directory (to be sure using system version)
+rm -rf ../../modules/zlib
+
+%build
+# Prefer GCC, because clang doesn't support -fstack-clash-protection yet
+export CC=gcc
+export CXX=g++
+
+# Workaround
+# error: options `-C embed-bitcode=no` and `-C lto` are incompatible
+# error: could not compile `jsrust`.
+# https://github.com/japaric/cargo-call-stack/issues/25
+export RUSTFLAGS="-C embed-bitcode"
+
+export CFLAGS="%{optflags}"
+export CXXFLAGS="$CFLAGS"
+export LINKFLAGS="%{?__global_ldflags}"
+export PYTHON="%{__python3}"
+
+autoconf-2.13
+%configure \
+ --without-system-icu \
+ --with-system-zlib \
+ --disable-tests \
+ --disable-strip \
+ --with-intl-api \
+ --enable-readline \
+ --enable-shared-js \
+ --disable-optimize \
+ --enable-pie \
+ --disable-jemalloc
+
+%if 0%{?big_endian}
+echo "Generate big endian version of config/external/icu/data/icud67l.dat"
+pushd ../..
+ icupkg -tb config/external/icu/data/icudt67l.dat config/external/icu/data/icudt67b.dat
+ rm -f config/external/icu/data/icudt*l.dat
+popd
+%endif
+
+%make_build
+
+%install
+%make_install
+
+# Fix permissions
+chmod -x %{buildroot}%{_libdir}/pkgconfig/*.pc
+
+# Avoid multilib conflicts
+case `uname -i` in
+ i386 | ppc | s390 | sparc )
+ wordsize="32"
+ ;;
+ x86_64 | ppc64 | s390x | sparc64 )
+ wordsize="64"
+ ;;
+ *)
+ wordsize=""
+ ;;
+esac
+
+if test -n "$wordsize"
+then
+ mv %{buildroot}%{_includedir}/mozjs-%{major}/js-config.h \
+ %{buildroot}%{_includedir}/mozjs-%{major}/js-config-$wordsize.h
+
+ cat >%{buildroot}%{_includedir}/mozjs-%{major}/js-config.h <<EOF
+#ifndef JS_CONFIG_H_MULTILIB
+#define JS_CONFIG_H_MULTILIB
+
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+# include "js-config-32.h"
+#elif __WORDSIZE == 64
+# include "js-config-64.h"
+#else
+# error "unexpected value for __WORDSIZE macro"
+#endif
+
+#endif
+EOF
+
+fi
+
+# Remove unneeded files
+rm %{buildroot}%{_bindir}/js%{major}-config
+rm %{buildroot}%{_libdir}/libjs_static.ajs
+
+# Rename library and create symlinks, following fix-soname.patch
+mv %{buildroot}%{_libdir}/libmozjs-%{major}.so \
+ %{buildroot}%{_libdir}/libmozjs-%{major}.so.0.0.0
+ln -s libmozjs-%{major}.so.0.0.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so.0
+ln -s libmozjs-%{major}.so.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so
+
+%check
+# Run SpiderMonkey tests
+%if 0%{?require_tests}
+PYTHONPATH=tests/lib %{__python3} tests/jstests.py -d -s -t 1800 --no-progress --wpt=disabled ../../js/src/dist/bin/js%{major}
+%else
+PYTHONPATH=tests/lib %{__python3} tests/jstests.py -d -s -t 1800 --no-progress --wpt=disabled ../../js/src/dist/bin/js%{major} || :
+%endif
+
+# Run basic JIT tests
+%if 0%{?require_tests}
+PYTHONPATH=tests/lib %{__python3} jit-test/jit_test.py -s -t 1800 --no-progress ../../js/src/dist/bin/js%{major} basic
+%else
+PYTHONPATH=tests/lib %{__python3} jit-test/jit_test.py -s -t 1800 --no-progress ../../js/src/dist/bin/js%{major} basic || :
+%endif
+
+%ldconfig_scriptlets
+
+%files
+%doc README.html
+%license LICENSE
+%{_libdir}/libmozjs-%{major}.so.0*
+
+%files devel
+%{_bindir}/js%{major}
+%{_libdir}/libmozjs-%{major}.so
+%{_libdir}/pkgconfig/*.pc
+%{_includedir}/mozjs-%{major}/
+
+%changelog
+* Tue Jul 28 2020 Frantisek Zatloukal <fzatlouk(a)redhat.com> - 78.1.0-1
+- Initial mozjs78 package based on mozjs68
diff --git a/sources b/sources
new file mode 100644
index 0000000..a559e99
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (firefox-78.1.0esr.source.tar.xz) = 4ab1b0d6ce41e51f5430c4ec1f5ddc5db41e4d3fe66a50132d77208ce48d1981f0748299900ec1a1b900aa62b42ad041e0d20b232608e17ee8b7b5dc269d3d84
diff --git a/spidermonkey_checks_disable.patch b/spidermonkey_checks_disable.patch
new file mode 100644
index 0000000..14ba0ad
--- /dev/null
+++ b/spidermonkey_checks_disable.patch
@@ -0,0 +1,10 @@
+--- a/config/run_spidermonkey_checks.py
++++ b/config/run_spidermonkey_checks.py
+@@ -11,5 +11,5 @@
+ for script in scripts:
+ retcode = subprocess.call(
+ [sys.executable, script], cwd=buildconfig.topsrcdir)
+- if retcode != 0:
+- raise Exception(script + " failed")
++ #if retcode != 0:
++ # raise Exception(script + " failed")
diff --git a/spidermonkey_style_check_disable_s390x.patch b/spidermonkey_style_check_disable_s390x.patch
new file mode 100644
index 0000000..690c1c5
--- /dev/null
+++ b/spidermonkey_style_check_disable_s390x.patch
@@ -0,0 +1,11 @@
+--- a/config/check_spidermonkey_style.py
++++ b/config/check_spidermonkey_style.py
+
+@@ -766,6 +766,7 @@
+
+
+ def main():
++ sys.exit(0)
+ if sys.argv[1:] == ["--fixup"]:
+ # Sort #include directives in-place. Fixup mode doesn't solve
+ # all possible silliness that the script checks for; it's just a
diff --git a/tests-increase-timeout.patch b/tests-increase-timeout.patch
new file mode 100644
index 0000000..c86cca4
--- /dev/null
+++ b/tests-increase-timeout.patch
@@ -0,0 +1,26 @@
+From 9be85b155c6df0454c5faef9e850f572c99e3615 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk(a)redhat.com>
+Date: Wed, 15 Jul 2020 08:32:44 +0200
+Subject: [PATCH] Increase the test timeout for slower buildds
+
+Ported forward from Debian: https://bugs.debian.org/878284
+---
+ js/src/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/src/Makefile.in b/js/src/Makefile.in
+index b86aeed..d68655a 100644
+--- a/js/src/Makefile.in
++++ b/js/src/Makefile.in
+@@ -53,7 +53,7 @@ check:: check-js-msg
+
+ check-jstests:
+ $(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON3) -u $(srcdir)/tests/jstests.py \
+- --no-progress --format=automation --timeout 300 \
++ --no-progress --format=automation --timeout 600 \
+ $(JSTESTS_EXTRA_ARGS) \
+ $(DIST)/bin/$(JS_SHELL_NAME)$(BIN_SUFFIX)
+
+--
+2.26.2
+
3 years, 9 months
Architecture specific change in rpms/yubihsm-shell.git
by githook-noreply@fedoraproject.org
The package rpms/yubihsm-shell.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/yubihsm-shell.git/commit/?id=ee43....
Change:
+%ifarch s390x
Thanks.
Full change:
============
commit 4382fe2b656e3bef94dc1e8948a51792b36719ed
Author: Jakub Jelen <jjelen(a)redhat.com>
Date: Thu Aug 6 14:44:45 2020 +0200
yubihsm-shell-2.0.2-7
diff --git a/yubihsm-shell.spec b/yubihsm-shell.spec
index 1b4f5a0..1c405e3 100644
--- a/yubihsm-shell.spec
+++ b/yubihsm-shell.spec
@@ -2,7 +2,7 @@
Name: yubihsm-shell
Version: 2.0.2
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Tools to interact with YubiHSM 2
License: ASL 2.0
@@ -92,6 +92,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/pkcs11/yubihsm_pkcs11.so
%changelog
+* Thu Aug 06 2020 Jakub Jelen <jjelen(a)redhat.com> - 2.0.2-7
+- Workaround FTBFS on s390x (#1865658)
+
* Thu Aug 06 2020 Jakub Jelen <jjelen(a)redhat.com> - 2.0.2-6
- Rebuild after libz3 soname bump (#1865658)
commit ee436a7aefb2502e8e3996e51e2a31a84f526df4
Author: Jakub Jelen <jjelen(a)redhat.com>
Date: Thu Aug 6 14:44:01 2020 +0200
Workaround FTBFS on s390x (#1865658)
diff --git a/yubihsm-shell.spec b/yubihsm-shell.spec
index a444889..1b4f5a0 100644
--- a/yubihsm-shell.spec
+++ b/yubihsm-shell.spec
@@ -46,6 +46,12 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
%build
+# https://bugzilla.redhat.com/show_bug.cgi?id=1865658#c6
+# The generated code fails to build on s390x in Fedora 33
+# For now, disable this particular check when building this arch
+%ifarch s390x
+export CFLAGS="$CFLAGS -Wno-error=format-overflow"
+%endif
%cmake
%cmake_build
3 years, 9 months
Architecture specific change in rpms/m4.git
by githook-noreply@fedoraproject.org
The package rpms/m4.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/m4.git/commit/?id=2c0874bd15794a3....
Change:
+%ifnarch ppc64le
Thanks.
Full change:
============
commit 2c0874bd15794a35ce301192750f5e5a8cf76ff1
Author: Vitezslav Crhonek <vcrhonek(a)redhat.com>
Date: Thu Aug 6 14:51:16 2020 +0200
Disable %%check on ppc64le (workaround for FTBFS)
diff --git a/m4.spec b/m4.spec
index 5bec901..3d37cc1 100644
--- a/m4.spec
+++ b/m4.spec
@@ -1,7 +1,7 @@
Summary: The GNU macro processor
Name: m4
Version: 1.4.18
-Release: 14%{?dist}
+Release: 15%{?dist}
License: GPLv3+
Source0: http://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz
Source1: http://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz.sig
@@ -41,7 +41,9 @@ autoreconf -ivf
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
%check
+%ifnarch ppc64le
make %{?_smp_mflags} check
+%endif
%files
%license COPYING
@@ -51,6 +53,10 @@ make %{?_smp_mflags} check
%{_mandir}/man1/m4.1*
%changelog
+* Thu Aug 06 2020 Vitezslav Crhonek <vcrhonek(a)redhat.com> - 1.4.18-15
+- Disable %%check on ppc64le (workaround for FTBFS)
+ Resolves: #1864107
+
* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.4.18-14
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
3 years, 9 months
Architecture specific change in rpms/mozilla-ublock-origin.git
by githook-noreply@fedoraproject.org
The package rpms/mozilla-ublock-origin.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/mozilla-ublock-origin.git/commit/....
Change:
+ExcludeArch: ppc64 s390x
Thanks.
Full change:
============
commit 39606c5ba01eba2ae078a07b25493cc419c4e587
Merge: d629b81 e0684e3
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Thu Aug 6 10:55:58 2020 +0200
Merge branch 'f32'
diff --cc mozilla-ublock-origin.spec
index 6a73c7a,3ce1a35..558e9aa
--- a/mozilla-ublock-origin.spec
+++ b/mozilla-ublock-origin.spec
@@@ -91,9 -93,10 +93,13 @@@ appstream-util validate-relax --nonet %
%{_metainfodir}/%{name}.metainfo.xml
%changelog
+ * Wed Aug 05 2020 Dominik Mierzejewski <rpm(a)greysector.net> - 1.28.4-1
+ - update to 1.28.4 (#1857445)
+ - avoid building on big-endian, wabt doesn't work there
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.28.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Mon Jul 13 2020 Dominik Mierzejewski <rpm(a)greysector.net> - 1.28.2-3
- add missing explicit BR on python3
commit e0684e3dbf63deaffe667817d8c8181242e67b2c
Merge: 02761e5 dbec7b0
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Thu Aug 6 10:55:05 2020 +0200
Merge branch 'f31' into f32
commit dbec7b0d29c0fcb8b2bf151694861d4b5b6f5561
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Thu Aug 6 02:30:04 2020 +0200
avoid building on big-endian
wabt doesn't work there
diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec
index bc7cb41..c1a71b1 100644
--- a/mozilla-ublock-origin.spec
+++ b/mozilla-ublock-origin.spec
@@ -28,6 +28,8 @@ Patch1: %{name}-python3.patch
Requires: mozilla-filesystem
BuildArch: noarch
+# wabt doesn't work correctly on big-endian
+ExcludeArch: ppc64 s390x
BuildRequires: libappstream-glib
BuildRequires: python3
BuildRequires: wabt
@@ -93,6 +95,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain
%changelog
* Wed Aug 05 2020 Dominik Mierzejewski <rpm(a)greysector.net> - 1.28.4-1
- update to 1.28.4 (#1857445)
+- avoid building on big-endian, wabt doesn't work there
* Mon Jul 13 2020 Dominik Mierzejewski <rpm(a)greysector.net> - 1.28.2-3
- add missing explicit BR on python3
commit fb284aac93716d4a70a8a8b7d27ccf8b723482c9
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Thu Aug 6 02:26:33 2020 +0200
update to 1.28.4 (#1857445)
diff --git a/.gitignore b/.gitignore
index c9b5d6c..296d051 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
/ublock_origin-*.xpi
/uAssets-2c7a9f6d661d76089c823b67711ea27791dfc2f9.tar.gz
/uBlock-1.28.2.tar.gz
+/uAssets-b3a7e049f483573d4e7877744ed52ba699633d8d.tar.gz
+/uBlock-1.28.4.tar.gz
diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec
index cc7398b..bc7cb41 100644
--- a/mozilla-ublock-origin.spec
+++ b/mozilla-ublock-origin.spec
@@ -5,11 +5,11 @@
%global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
%global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id}
-%global uAssets_commit 2c7a9f6d661d76089c823b67711ea27791dfc2f9
+%global uAssets_commit b3a7e049f483573d4e7877744ed52ba699633d8d
Name: mozilla-ublock-origin
-Version: 1.28.2
-Release: 3%{?dist}
+Version: 1.28.4
+Release: 1%{?dist}
Summary: An efficient blocker for Firefox
License: GPLv3+ and LGPLv3 and MIT and OFL
@@ -91,6 +91,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain
%{_metainfodir}/%{name}.metainfo.xml
%changelog
+* Wed Aug 05 2020 Dominik Mierzejewski <rpm(a)greysector.net> - 1.28.4-1
+- update to 1.28.4 (#1857445)
+
* Mon Jul 13 2020 Dominik Mierzejewski <rpm(a)greysector.net> - 1.28.2-3
- add missing explicit BR on python3
diff --git a/sources b/sources
index 468e347..150b217 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (uAssets-2c7a9f6d661d76089c823b67711ea27791dfc2f9.tar.gz) = c989102af5653aab38935eb7a38145ea8fb2d9f87fddcbdccc67494a7f823ed566fbb32f61e7c4d65927f9e8f13d143ee5401c74edcaf1e95f3a1b571092db23
-SHA512 (uBlock-1.28.2.tar.gz) = ab48a35e4a9a849d584ca3e2f37b735af9f977b45952179710ea6f05a58b478f8587f6597e56a7ee881dbe50dc9fcc31db668d467e67e065663e15d9939ba215
+SHA512 (uAssets-b3a7e049f483573d4e7877744ed52ba699633d8d.tar.gz) = 5245abbb8fd8f626d7f5103b504abb8e4d2a26fcdeb55ca701afdd8e589a3f5adc0b56a083aadd6eae78dab106f3beaca1919822f4ecb24d3621fa74a47fe169
+SHA512 (uBlock-1.28.4.tar.gz) = 4fa2e1872fa7ef9803a944c0090e69cb3b027b538f3633ce7d3df36ada12e9e2e13874abc6ade87da9ca88d0fbee690a12e33240ef8a31bb4a7e23d341d55d83
diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh
index ef56e62..f81e192 100755
--- a/uAssets-mktarball.sh
+++ b/uAssets-mktarball.sh
@@ -1,7 +1,6 @@
#!/bin/bash
set -e
-set -x
tmp=$(mktemp -d)
@@ -14,7 +13,7 @@ cleanup() {
unset CDPATH
pwd=$(pwd)
name=uAssets
-commit=2c7a9f6d661d76089c823b67711ea27791dfc2f9
+commit=b3a7e049f483573d4e7877744ed52ba699633d8d
url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${c...
pushd "$tmp"
curl -L ${url} | tar xzf -
3 years, 9 months
Architecture specific change in rpms/mozilla-ublock-origin.git
by githook-noreply@fedoraproject.org
The package rpms/mozilla-ublock-origin.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/mozilla-ublock-origin.git/commit/....
Change:
+ExcludeArch: ppc64 s390x
Thanks.
Full change:
============
commit e0684e3dbf63deaffe667817d8c8181242e67b2c
Merge: 02761e5 dbec7b0
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Thu Aug 6 10:55:05 2020 +0200
Merge branch 'f31' into f32
commit dbec7b0d29c0fcb8b2bf151694861d4b5b6f5561
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Thu Aug 6 02:30:04 2020 +0200
avoid building on big-endian
wabt doesn't work there
diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec
index bc7cb41..c1a71b1 100644
--- a/mozilla-ublock-origin.spec
+++ b/mozilla-ublock-origin.spec
@@ -28,6 +28,8 @@ Patch1: %{name}-python3.patch
Requires: mozilla-filesystem
BuildArch: noarch
+# wabt doesn't work correctly on big-endian
+ExcludeArch: ppc64 s390x
BuildRequires: libappstream-glib
BuildRequires: python3
BuildRequires: wabt
@@ -93,6 +95,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain
%changelog
* Wed Aug 05 2020 Dominik Mierzejewski <rpm(a)greysector.net> - 1.28.4-1
- update to 1.28.4 (#1857445)
+- avoid building on big-endian, wabt doesn't work there
* Mon Jul 13 2020 Dominik Mierzejewski <rpm(a)greysector.net> - 1.28.2-3
- add missing explicit BR on python3
commit fb284aac93716d4a70a8a8b7d27ccf8b723482c9
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Thu Aug 6 02:26:33 2020 +0200
update to 1.28.4 (#1857445)
diff --git a/.gitignore b/.gitignore
index c9b5d6c..296d051 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
/ublock_origin-*.xpi
/uAssets-2c7a9f6d661d76089c823b67711ea27791dfc2f9.tar.gz
/uBlock-1.28.2.tar.gz
+/uAssets-b3a7e049f483573d4e7877744ed52ba699633d8d.tar.gz
+/uBlock-1.28.4.tar.gz
diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec
index cc7398b..bc7cb41 100644
--- a/mozilla-ublock-origin.spec
+++ b/mozilla-ublock-origin.spec
@@ -5,11 +5,11 @@
%global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
%global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id}
-%global uAssets_commit 2c7a9f6d661d76089c823b67711ea27791dfc2f9
+%global uAssets_commit b3a7e049f483573d4e7877744ed52ba699633d8d
Name: mozilla-ublock-origin
-Version: 1.28.2
-Release: 3%{?dist}
+Version: 1.28.4
+Release: 1%{?dist}
Summary: An efficient blocker for Firefox
License: GPLv3+ and LGPLv3 and MIT and OFL
@@ -91,6 +91,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain
%{_metainfodir}/%{name}.metainfo.xml
%changelog
+* Wed Aug 05 2020 Dominik Mierzejewski <rpm(a)greysector.net> - 1.28.4-1
+- update to 1.28.4 (#1857445)
+
* Mon Jul 13 2020 Dominik Mierzejewski <rpm(a)greysector.net> - 1.28.2-3
- add missing explicit BR on python3
diff --git a/sources b/sources
index 468e347..150b217 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (uAssets-2c7a9f6d661d76089c823b67711ea27791dfc2f9.tar.gz) = c989102af5653aab38935eb7a38145ea8fb2d9f87fddcbdccc67494a7f823ed566fbb32f61e7c4d65927f9e8f13d143ee5401c74edcaf1e95f3a1b571092db23
-SHA512 (uBlock-1.28.2.tar.gz) = ab48a35e4a9a849d584ca3e2f37b735af9f977b45952179710ea6f05a58b478f8587f6597e56a7ee881dbe50dc9fcc31db668d467e67e065663e15d9939ba215
+SHA512 (uAssets-b3a7e049f483573d4e7877744ed52ba699633d8d.tar.gz) = 5245abbb8fd8f626d7f5103b504abb8e4d2a26fcdeb55ca701afdd8e589a3f5adc0b56a083aadd6eae78dab106f3beaca1919822f4ecb24d3621fa74a47fe169
+SHA512 (uBlock-1.28.4.tar.gz) = 4fa2e1872fa7ef9803a944c0090e69cb3b027b538f3633ce7d3df36ada12e9e2e13874abc6ade87da9ca88d0fbee690a12e33240ef8a31bb4a7e23d341d55d83
diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh
index ef56e62..f81e192 100755
--- a/uAssets-mktarball.sh
+++ b/uAssets-mktarball.sh
@@ -1,7 +1,6 @@
#!/bin/bash
set -e
-set -x
tmp=$(mktemp -d)
@@ -14,7 +13,7 @@ cleanup() {
unset CDPATH
pwd=$(pwd)
name=uAssets
-commit=2c7a9f6d661d76089c823b67711ea27791dfc2f9
+commit=b3a7e049f483573d4e7877744ed52ba699633d8d
url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${c...
pushd "$tmp"
curl -L ${url} | tar xzf -
3 years, 9 months
Architecture specific change in rpms/mozilla-ublock-origin.git
by githook-noreply@fedoraproject.org
The package rpms/mozilla-ublock-origin.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/mozilla-ublock-origin.git/commit/....
Change:
+ExcludeArch: ppc64 s390x
Thanks.
Full change:
============
commit dbec7b0d29c0fcb8b2bf151694861d4b5b6f5561
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Thu Aug 6 02:30:04 2020 +0200
avoid building on big-endian
wabt doesn't work there
diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec
index bc7cb41..c1a71b1 100644
--- a/mozilla-ublock-origin.spec
+++ b/mozilla-ublock-origin.spec
@@ -28,6 +28,8 @@ Patch1: %{name}-python3.patch
Requires: mozilla-filesystem
BuildArch: noarch
+# wabt doesn't work correctly on big-endian
+ExcludeArch: ppc64 s390x
BuildRequires: libappstream-glib
BuildRequires: python3
BuildRequires: wabt
@@ -93,6 +95,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain
%changelog
* Wed Aug 05 2020 Dominik Mierzejewski <rpm(a)greysector.net> - 1.28.4-1
- update to 1.28.4 (#1857445)
+- avoid building on big-endian, wabt doesn't work there
* Mon Jul 13 2020 Dominik Mierzejewski <rpm(a)greysector.net> - 1.28.2-3
- add missing explicit BR on python3
commit fb284aac93716d4a70a8a8b7d27ccf8b723482c9
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Thu Aug 6 02:26:33 2020 +0200
update to 1.28.4 (#1857445)
diff --git a/.gitignore b/.gitignore
index c9b5d6c..296d051 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
/ublock_origin-*.xpi
/uAssets-2c7a9f6d661d76089c823b67711ea27791dfc2f9.tar.gz
/uBlock-1.28.2.tar.gz
+/uAssets-b3a7e049f483573d4e7877744ed52ba699633d8d.tar.gz
+/uBlock-1.28.4.tar.gz
diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec
index cc7398b..bc7cb41 100644
--- a/mozilla-ublock-origin.spec
+++ b/mozilla-ublock-origin.spec
@@ -5,11 +5,11 @@
%global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
%global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id}
-%global uAssets_commit 2c7a9f6d661d76089c823b67711ea27791dfc2f9
+%global uAssets_commit b3a7e049f483573d4e7877744ed52ba699633d8d
Name: mozilla-ublock-origin
-Version: 1.28.2
-Release: 3%{?dist}
+Version: 1.28.4
+Release: 1%{?dist}
Summary: An efficient blocker for Firefox
License: GPLv3+ and LGPLv3 and MIT and OFL
@@ -91,6 +91,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain
%{_metainfodir}/%{name}.metainfo.xml
%changelog
+* Wed Aug 05 2020 Dominik Mierzejewski <rpm(a)greysector.net> - 1.28.4-1
+- update to 1.28.4 (#1857445)
+
* Mon Jul 13 2020 Dominik Mierzejewski <rpm(a)greysector.net> - 1.28.2-3
- add missing explicit BR on python3
diff --git a/sources b/sources
index 468e347..150b217 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (uAssets-2c7a9f6d661d76089c823b67711ea27791dfc2f9.tar.gz) = c989102af5653aab38935eb7a38145ea8fb2d9f87fddcbdccc67494a7f823ed566fbb32f61e7c4d65927f9e8f13d143ee5401c74edcaf1e95f3a1b571092db23
-SHA512 (uBlock-1.28.2.tar.gz) = ab48a35e4a9a849d584ca3e2f37b735af9f977b45952179710ea6f05a58b478f8587f6597e56a7ee881dbe50dc9fcc31db668d467e67e065663e15d9939ba215
+SHA512 (uAssets-b3a7e049f483573d4e7877744ed52ba699633d8d.tar.gz) = 5245abbb8fd8f626d7f5103b504abb8e4d2a26fcdeb55ca701afdd8e589a3f5adc0b56a083aadd6eae78dab106f3beaca1919822f4ecb24d3621fa74a47fe169
+SHA512 (uBlock-1.28.4.tar.gz) = 4fa2e1872fa7ef9803a944c0090e69cb3b027b538f3633ce7d3df36ada12e9e2e13874abc6ade87da9ca88d0fbee690a12e33240ef8a31bb4a7e23d341d55d83
diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh
index ef56e62..f81e192 100755
--- a/uAssets-mktarball.sh
+++ b/uAssets-mktarball.sh
@@ -1,7 +1,6 @@
#!/bin/bash
set -e
-set -x
tmp=$(mktemp -d)
@@ -14,7 +13,7 @@ cleanup() {
unset CDPATH
pwd=$(pwd)
name=uAssets
-commit=2c7a9f6d661d76089c823b67711ea27791dfc2f9
+commit=b3a7e049f483573d4e7877744ed52ba699633d8d
url=https://github.com/uBlockOrigin/uAssets/archive/${commit}/${name}-${c...
pushd "$tmp"
curl -L ${url} | tar xzf -
3 years, 9 months