Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (5f458fa5af8caecfcf25e831df1de6cfd0c2a980)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (5f458fa5af8caecfcf25e831df1de6cfd0c2a980)
  • Date: Fri, 5 May 2023 05:48:32 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

crypto/libfido2/DEPENDS |
1
crypto/libfido2/HISTORY |
3
http/firefox-esr/DETAILS |
6
http/firefox-esr/HISTORY |
4
http/firefox-esr/patches/0048-bmo-1769631-python-3.11-compatibility.patch |
208 ----------
libs/libcbor/DEPENDS |
1
libs/libcbor/HISTORY |
3
7 files changed, 15 insertions(+), 211 deletions(-)

New commits:
commit 5f458fa5af8caecfcf25e831df1de6cfd0c2a980
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

libcbor, libfido2: fix DEPENDS

commit b3e03792480405901d6b57e7e832bd56086ac421
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

firefox-esr: update to 102.9, ++SECURITY_PATCH

diff --git a/crypto/libfido2/DEPENDS b/crypto/libfido2/DEPENDS
old mode 100644
new mode 100755
index ca4184e..ae17773
--- a/crypto/libfido2/DEPENDS
+++ b/crypto/libfido2/DEPENDS
@@ -1,3 +1,4 @@
+. "$GRIMOIRE"/CMAKE_DEPENDS &&
depends openssl &&
depends libcbor &&
depends zlib &&
diff --git a/crypto/libfido2/HISTORY b/crypto/libfido2/HISTORY
index 3c07f7b..298d0e8 100644
--- a/crypto/libfido2/HISTORY
+++ b/crypto/libfido2/HISTORY
@@ -1,2 +1,5 @@
+2023-05-05 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: cmake, and exec bit to activate it
+
2023-05-04 Thomas Orgis <sobukus AT sourcemage.org>
* CONFIGURE, DEPENDS, DETAILS: spell created
diff --git a/http/firefox-esr/DETAILS b/http/firefox-esr/DETAILS
index 2b63e7f..353c643 100755
--- a/http/firefox-esr/DETAILS
+++ b/http/firefox-esr/DETAILS
@@ -1,10 +1,10 @@
SPELL=firefox-esr
SPELLX=firefox
- VERSION=102.6.0esr
- SECURITY_PATCH=167
+ VERSION=102.9.0esr
+ SECURITY_PATCH=168
SOURCE="${SPELLX}-${VERSION}.source.tar.xz"

SOURCE_URL[0]="http://releases.mozilla.org/pub/${SPELLX}/releases/${VERSION}/source/${SOURCE}";
-
SOURCE_HASH="sha512:c0f0160bea612d0ae74c29dd44beb7fd9a1c292694b8cd5c4faf2e54feb5c27684eee821b67dd40df714d69866a4e3a8b19e22182d9bc3023050d2d96b02d308"
+
SOURCE_HASH="sha512:3923212ce4b7d1f589129025961ff1b380b8aaf1dd074674f3bd63cf14e9a44ff051bda556b7796c25634e153de00ce62243ece15a520f63dd0791a19b2a6685"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION%esr}"
WEB_SITE=https://www.mozilla.org/en-US/firefox/fx/
GATHER_DOCS=off
diff --git a/http/firefox-esr/HISTORY b/http/firefox-esr/HISTORY
index 03c9b4f..fe7f74c 100644
--- a/http/firefox-esr/HISTORY
+++ b/http/firefox-esr/HISTORY
@@ -1,3 +1,7 @@
+2023-05-04 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: 102.9 with SECURITY_PATCH++
+ * patches/0048-bmo-1769631-python-3.11-compatibility.patch: gone
+
2023-01-03 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: 102.6 with SECURITY_PATCH++
* patches/0031-bmo-1773259-cbindgen-root_clip_chain-fix.patch:
diff --git
a/http/firefox-esr/patches/0048-bmo-1769631-python-3.11-compatibility.patch
b/http/firefox-esr/patches/0048-bmo-1769631-python-3.11-compatibility.patch
deleted file mode 100644
index 8dcd0e2..0000000
---
a/http/firefox-esr/patches/0048-bmo-1769631-python-3.11-compatibility.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-
-# HG changeset patch
-# User ahochheiden <ahochheiden AT mozilla.com>
-# Date 1654151264 0
-# Node ID f54162b2c1f2fe52c6137ab2c3469a1944f58b27
-# Parent 6e7776492240c27732840d65a33dcc440fa1aba0
-Bug 1769631 - Remove 'U' from 'mode' parameters for various 'open' calls to
ensure Python3.11 compatibility r=firefox-build-system-reviewers,glandium
-
-The 'U' flag represents "universal newline". It has been deprecated
-since Python3.3. Since then "universal newline" is the default when a
-file is opened in text mode (not bytes). In Python3.11 using the 'U'
-flag throws errors. There should be no harm in removing 'U' from 'open'
-everywhere it is used, and doing allows the use of Python3.11.
-
-For more reading see:
https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
-
-Differential Revision: https://phabricator.services.mozilla.com/D147721
-
-diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
---- a/dom/base/usecounters.py
-+++ b/dom/base/usecounters.py
-@@ -3,17 +3,17 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
- import collections
- import re
-
-
- def read_conf(conf_filename):
- # Can't read/write from a single StringIO, so make a new one for
reading.
-- stream = open(conf_filename, "rU")
-+ stream = open(conf_filename, "r")
-
- def parse_counters(stream):
- for line_num, line in enumerate(stream):
- line = line.rstrip("\n")
- if not line or line.startswith("//"):
- # empty line or comment
- continue
- m = re.match(r"method ([A-Za-z0-9]+)\.([A-Za-z0-9]+)$", line)
-diff --git a/python/mozbuild/mozbuild/action/process_define_files.py
b/python/mozbuild/mozbuild/action/process_define_files.py
---- a/python/mozbuild/mozbuild/action/process_define_files.py
-+++ b/python/mozbuild/mozbuild/action/process_define_files.py
-@@ -31,17 +31,17 @@ def process_define_file(output, input):
-
- config = PartialConfigEnvironment(topobjdir)
-
- if mozpath.basedir(
- path, [mozpath.join(topsrcdir, "js/src")]
- ) and not config.substs.get("JS_STANDALONE"):
- config = PartialConfigEnvironment(mozpath.join(topobjdir, "js",
"src"))
-
-- with open(path, "rU") as input:
-+ with open(path, "r") as input:
- r = re.compile(
-
"^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U
- )
- for l in input:
- m = r.match(l)
- if m:
- cmd = m.group("cmd")
- name = m.group("name")
-diff --git a/python/mozbuild/mozbuild/backend/base.py
b/python/mozbuild/mozbuild/backend/base.py
---- a/python/mozbuild/mozbuild/backend/base.py
-+++ b/python/mozbuild/mozbuild/backend/base.py
-@@ -267,17 +267,17 @@ class BuildBackend(LoggingMixin):
- If an exception is raised, |mach build| will fail with a
- non-zero exit code.
- """
- self._write_purgecaches(config)
-
- return status
-
- @contextmanager
-- def _write_file(self, path=None, fh=None, readmode="rU"):
-+ def _write_file(self, path=None, fh=None, readmode="r"):
- """Context manager to write a file.
-
- This is a glorified wrapper around FileAvoidWrite with integration
to
- update the summary data on this instance.
-
- Example usage:
-
- with self._write_file('foo.txt') as fh:
-diff --git a/python/mozbuild/mozbuild/preprocessor.py
b/python/mozbuild/mozbuild/preprocessor.py
---- a/python/mozbuild/mozbuild/preprocessor.py
-+++ b/python/mozbuild/mozbuild/preprocessor.py
-@@ -526,17 +526,17 @@ class Preprocessor:
- if not options.output:
- raise Preprocessor.Error(
- self, "--depend doesn't work with stdout", None
- )
- depfile = get_output_file(options.depend)
-
- if args:
- for f in args:
-- with io.open(f, "rU", encoding="utf-8") as input:
-+ with io.open(f, "r", encoding="utf-8") as input:
- self.processFile(input=input, output=out)
- if depfile:
- mk = Makefile()
-
mk.create_rule([six.ensure_text(options.output)]).add_dependencies(
- self.includes
- )
- mk.dump(depfile)
- depfile.close()
-@@ -855,17 +855,17 @@ class Preprocessor:
- self.checkLineNumbers = False
- if isName:
- try:
- args = _to_text(args)
- if filters:
- args = self.applyFilters(args)
- if not os.path.isabs(args):
- args = os.path.join(self.curdir, args)
-- args = io.open(args, "rU", encoding="utf-8")
-+ args = io.open(args, "r", encoding="utf-8")
- except Preprocessor.Error:
- raise
- except Exception:
- raise Preprocessor.Error(self, "FILE_NOT_FOUND",
_to_text(args))
- self.checkLineNumbers = bool(
- re.search("\.(js|jsm|java|webidl)(?:\.in)?$", args.name)
- )
- oldFile = self.context["FILE"]
-@@ -909,17 +909,17 @@ class Preprocessor:
-
- def do_error(self, args):
- raise Preprocessor.Error(self, "Error: ", _to_text(args))
-
-
- def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout,
marker="#"):
- pp = Preprocessor(defines=defines, marker=marker)
- for f in includes:
-- with io.open(f, "rU", encoding="utf-8") as input:
-+ with io.open(f, "r", encoding="utf-8") as input:
- pp.processFile(input=input, output=output)
- return pp.includes
-
-
- # Keep this module independently executable.
- if __name__ == "__main__":
- pp = Preprocessor()
- pp.handleCommandLine(None, True)
-diff --git a/python/mozbuild/mozbuild/util.py
b/python/mozbuild/mozbuild/util.py
---- a/python/mozbuild/mozbuild/util.py
-+++ b/python/mozbuild/mozbuild/util.py
-@@ -231,17 +231,17 @@ class FileAvoidWrite(BytesIO):
- enabled by default because it a) doesn't make sense for binary files b)
- could add unwanted overhead to calls.
-
- Additionally, there is dry run mode where the file is not actually
written
- out, but reports whether the file was existing and would have been
updated
- still occur, as well as diff capture if requested.
- """
-
-- def __init__(self, filename, capture_diff=False, dry_run=False,
readmode="rU"):
-+ def __init__(self, filename, capture_diff=False, dry_run=False,
readmode="r"):
- BytesIO.__init__(self)
- self.name = filename
- assert type(capture_diff) == bool
- assert type(dry_run) == bool
- assert "r" in readmode
- self._capture_diff = capture_diff
- self._write_to_file = not dry_run
- self.diff = None
-diff --git a/python/mozbuild/mozpack/files.py
b/python/mozbuild/mozpack/files.py
---- a/python/mozbuild/mozpack/files.py
-+++ b/python/mozbuild/mozpack/files.py
-@@ -549,17 +549,17 @@ class PreprocessedFile(BaseFile):
- self.defines = defines
- self.extra_depends = list(extra_depends or [])
- self.silence_missing_directive_warnings =
silence_missing_directive_warnings
-
- def inputs(self):
- pp = Preprocessor(defines=self.defines, marker=self.marker)
-
pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
-
-- with _open(self.path, "rU") as input:
-+ with _open(self.path, "r") as input:
- with _open(os.devnull, "w") as output:
- pp.processFile(input=input, output=output)
-
- # This always yields at least self.path.
- return pp.includes
-
- def copy(self, dest, skip_if_older=True):
- """
-@@ -606,17 +606,17 @@ class PreprocessedFile(BaseFile):
- return False
-
- deps_out = None
- if self.depfile:
- deps_out = FileAvoidWrite(self.depfile)
- pp = Preprocessor(defines=self.defines, marker=self.marker)
-
pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
-
-- with _open(self.path, "rU") as input:
-+ with _open(self.path, "r") as input:
- pp.processFile(input=input, output=dest, depfile=deps_out)
-
- dest.close()
- if self.depfile:
- deps_out.close()
-
- return True
-
-
diff --git a/libs/libcbor/DEPENDS b/libs/libcbor/DEPENDS
new file mode 100755
index 0000000..bd2c258
--- /dev/null
+++ b/libs/libcbor/DEPENDS
@@ -0,0 +1 @@
+. "$GRIMOIRE"/CMAKE_DEPENDS
diff --git a/libs/libcbor/HISTORY b/libs/libcbor/HISTORY
index e7e9d83..751437b 100644
--- a/libs/libcbor/HISTORY
+++ b/libs/libcbor/HISTORY
@@ -1,2 +1,5 @@
+2023-05-05 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: added for cmake
+
2023-05-04 Thomas Orgis <sobukus AT sourcemage.org>
* CONFIGURE, DETAILS: spell created



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (5f458fa5af8caecfcf25e831df1de6cfd0c2a980), Thomas Orgis, 05/05/2023

Archive powered by MHonArc 2.6.24.

Top of Page