openSUSE Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
July 2022
- 1 participants
- 1863 discussions
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-cligj for openSUSE:Factory checked in at 2022-04-28 23:07:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-cligj (Old)
and /work/SRC/openSUSE:Factory/.python-cligj.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-cligj"
Thu Apr 28 23:07:52 2022 rev:2 rq:973538 version:0.7.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-cligj/python-cligj.changes 2019-03-10 09:36:21.436162133 +0100
+++ /work/SRC/openSUSE:Factory/.python-cligj.new.1538/python-cligj.changes 2022-04-28 23:07:56.736686031 +0200
@@ -1,0 +2,17 @@
+Mon Apr 25 13:47:41 UTC 2022 - Stefan Br��ns <stefan.bruens(a)rwth-aachen.de>
+
+- Update to 0.7.2:
+ * Permit use with click versions 8 and higher.
+- Update to 0.7.1:
+ * Future deprecation warning added in 0.7.0 has been changed.
+ Cligj version 1.0.0 will support Python versions >= 3.6.
+- Update to 0.7.0:
+ * Warn about deprecation of support for Python versions < 3.7
+ in 1.0.0 (#33).
+ * Warn about future change in --sequence default when the option
+ is used (#31).
+- Update to 0.6.0:
+ * Always use `encoding='utf-8'` when opening input GeoJSON (#27).
+ * Improve docstrings (#22).
+
+-------------------------------------------------------------------
Old:
----
cligj-0.5.0.tar.gz
New:
----
cligj-0.7.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-cligj.spec ++++++
--- /var/tmp/diff_new_pack.nCHSqc/_old 2022-04-28 23:07:57.216686554 +0200
+++ /var/tmp/diff_new_pack.nCHSqc/_new 2022-04-28 23:07:57.220686558 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-cligj
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -13,15 +13,16 @@
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-cligj
-Version: 0.5.0
+Version: 0.7.2
Release: 0
License: BSD-3-Clause
Summary: Click params for commmand line interfaces to GeoJSON
-Url: https://github.com/mapbox/cligj
+URL: https://github.com/mapbox/cligj
Group: Development/Languages/Python
# pypi source lack license and tests
Source: https://github.com/mapbox/cligj/archive/%{version}.tar.gz#/cligj-%{version}…
@@ -35,7 +36,6 @@
Requires: python-click
BuildArch: noarch
-
%python_subpackages
%description
++++++ cligj-0.5.0.tar.gz -> cligj-0.7.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cligj-0.5.0/.travis.yml new/cligj-0.7.2/.travis.yml
--- old/cligj-0.5.0/.travis.yml 2018-09-26 17:58:55.000000000 +0200
+++ new/cligj-0.7.2/.travis.yml 2021-05-28 23:21:08.000000000 +0200
@@ -1,10 +1,9 @@
sudo: false
language: python
python:
- - "2.7"
- - "3.3"
- - "3.4"
- - "3.5"
+ - "3.6"
+ - "3.7"
+ - "3.8"
install:
- "pip install coveralls"
- "pip install -e .[test]"
@@ -17,4 +16,4 @@
tags: true
provider: pypi
distributions: "sdist bdist_wheel"
- user: mapboxci
+ user: __token__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cligj-0.5.0/CHANGES.txt new/cligj-0.7.2/CHANGES.txt
--- old/cligj-0.5.0/CHANGES.txt 2018-09-26 17:58:55.000000000 +0200
+++ new/cligj-0.7.2/CHANGES.txt 2021-05-28 23:21:08.000000000 +0200
@@ -1,6 +1,36 @@
Changes
=======
+0.7.1 (2010-11-20)
+------------------
+
+- Future deprecation warning added in 0.7.0 has been changed. Cligj version
+ 1.0.0 will support Python versions >= 3.6.
+
+0.7.0 (2010-10-21)
+------------------
+
+- Warn about deprecation of support for Python versions < 3.7 in 1.0.0 (#33).
+- Warn about future change in --sequence default when the option is used (#31).
+
+0.6.0 (2020-10-19)
+------------------
+
+No changes since 0.6b1.
+
+0.6b1 (2020-10-14)
+------------------
+
+Future changes:
+
+- Feature sequences, not collections, will be the default form of output in
+ version 1.0 (#20).
+
+Bug fixes:
+
+- Always use `encoding='utf-8'` when opening input GeoJSON (#27).
+- Improve docstrings (#22).
+
0.5.0 (2018-09-26)
------------------
@@ -20,7 +50,7 @@
0.3.0 (2015-08-12)
------------------
-- Deprecation of the cligj.plugins module (#6). Please switch to the
+- Deprecation of the cligj.plugins module (#6). Please switch to the
click-plugins module: https://github.com/click-contrib/click-plugins. The
cligj.plugins module will be removed from cligj at version 1.0.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cligj-0.5.0/MANIFEST.in new/cligj-0.7.2/MANIFEST.in
--- old/cligj-0.5.0/MANIFEST.in 1970-01-01 01:00:00.000000000 +0100
+++ new/cligj-0.7.2/MANIFEST.in 2021-05-28 23:21:08.000000000 +0200
@@ -0,0 +1,4 @@
+include CHANGES.txt
+include LICENSE
+
+graft tests
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cligj-0.5.0/README.rst new/cligj-0.7.2/README.rst
--- old/cligj-0.5.0/README.rst 2018-09-26 17:58:55.000000000 +0200
+++ new/cligj-0.7.2/README.rst 2021-05-28 23:21:08.000000000 +0200
@@ -1,8 +1,8 @@
cligj
======
-.. image:: https://travis-ci.org/mapbox/cligj.svg
- :target: https://travis-ci.org/mapbox/cligj
+.. image:: https://travis-ci.com/mapbox/cligj.svg
+ :target: https://travis-ci.com/mapbox/cligj
.. image:: https://coveralls.io/repos/mapbox/cligj/badge.png?branch=master
:target: https://coveralls.io/r/mapbox/cligj?branch=master
@@ -10,7 +10,7 @@
Common arguments and options for GeoJSON processing commands, using Click.
`cligj` is for Python developers who create command line interfaces for geospatial data.
-`cligj` allows you to quickly build consistent, well-tested and interoperable CLIs for handling GeoJSON.
+`cligj` allows you to quickly build consistent, well-tested and interoperable CLIs for handling GeoJSON.
Arguments
@@ -76,11 +76,15 @@
reads and writes GeoJSON expects a text containing a single feature collection,
that's the default, and a LF-delimited sequence of texts containing one GeoJSON
feature each is a feature that is turned on using the ``--sequence`` option.
-To write sequences of feature texts that conform to the `JSON Text Sequences
-proposed standard
-<http://tools.ietf.org/html/draft-ietf-json-text-sequence-13>`__ (and might
-contain pretty-printed JSON) with the ASCII Record Separator (0x1e) as
-a delimiter, use the ``--rs`` option
+To write sequences of feature texts that conform to the `GeoJSON Text Sequences
+standard <https://tools.ietf.org/html/rfc8142>`__ (and might contain
+pretty-printed JSON) with the ASCII Record Separator (0x1e) as a delimiter, use
+the ``--rs`` option
+
+.. warning:: Future change warning
+ GeoJSON sequences (`--sequence`), not collections (`--no-sequence`), will be
+ the default in version 1.0.0.
+
.. code-block:: python
@@ -125,7 +129,6 @@
False).
--help Show this message and exit.
-
And can be used like this
.. code-block:: console
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cligj-0.5.0/cligj/__init__.py new/cligj-0.7.2/cligj/__init__.py
--- old/cligj-0.5.0/cligj/__init__.py 2018-09-26 17:58:55.000000000 +0200
+++ new/cligj-0.7.2/cligj/__init__.py 2021-05-28 23:21:08.000000000 +0200
@@ -1,12 +1,21 @@
-# cligj
+"""cligj
-# Shared arguments and options.
+A package of arguments, options, and parsers for the Python GeoJSON
+ecosystem.
+"""
+
+import sys
+from warnings import warn
import click
from .features import normalize_feature_inputs
-# Arguments.
+__version__ = "0.7.2"
+
+if sys.version_info < (3, 6):
+ warn("cligj 1.0.0 will require Python >= 3.6", FutureWarning)
+
# Multiple input files.
files_in_arg = click.argument(
@@ -97,8 +106,14 @@
'--sequence/--no-sequence',
default=False,
help="Write a LF-delimited sequence of texts containing individual "
- "objects or write a single JSON text containing a feature "
- "collection object (the default).")
+ "objects or write a single JSON text containing a feature "
+ "collection object (the default).",
+ callback=lambda ctx, param, value: warn(
+ "Sequences of Features, not FeatureCollections, will be the default in version 1.0.0",
+ FutureWarning,
+ )
+ or value,
+)
use_rs_opt = click.option(
'--rs/--no-rs',
@@ -109,8 +124,8 @@
"(default is False).")
-# GeoJSON output mode option.
def geojson_type_collection_opt(default=False):
+ """GeoJSON FeatureCollection output mode"""
return click.option(
'--collection',
'geojson_type',
@@ -120,6 +135,7 @@
def geojson_type_feature_opt(default=False):
+ """GeoJSON Feature or Feature sequence output mode"""
return click.option(
'--feature',
'geojson_type',
@@ -129,6 +145,7 @@
def geojson_type_bbox_opt(default=False):
+ """GeoJSON bbox output mode"""
return click.option(
'--bbox',
'geojson_type',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cligj-0.5.0/cligj/features.py new/cligj-0.7.2/cligj/features.py
--- old/cligj-0.5.0/cligj/features.py 2018-09-26 17:58:55.000000000 +0200
+++ new/cligj-0.7.2/cligj/features.py 2021-05-28 23:21:08.000000000 +0200
@@ -1,3 +1,5 @@
+"""Feature parsing and normalization"""
+
from itertools import chain
import json
import re
@@ -23,10 +25,16 @@
"[lng, lat]", or "lng, lat", or "lng lat".
If no value is provided, features will be read from stdin.
+
+ Yields
+ ------
+ Mapping
+ A GeoJSON Feature represented by a Python mapping
+
"""
for feature_like in value or ('-',):
try:
- with click.open_file(feature_like) as src:
+ with click.open_file(feature_like, encoding="utf-8") as src:
for feature in iter_features(iter(src)):
yield feature
except IOError:
@@ -55,6 +63,12 @@
A function that will be applied to each extracted feature. It
takes a feature object and may return a replacement feature or
None -- in which case iter_features does not yield.
+
+ Yields
+ ------
+ Mapping
+ A GeoJSON Feature represented by a Python mapping
+
"""
func = func or (lambda x: x)
first_line = next(geojsonfile)
@@ -136,9 +150,20 @@
def to_feature(obj):
- """Takes a feature or a geometry
- returns feature verbatim or
- wraps geom in a feature with empty properties
+ """Converts an object to a GeoJSON Feature
+
+ Returns feature verbatim or wraps geom in a feature with empty
+ properties.
+
+ Raises
+ ------
+ ValueError
+
+ Returns
+ -------
+ Mapping
+ A GeoJSON Feature represented by a Python mapping
+
"""
if obj['type'] == 'Feature':
return obj
@@ -177,13 +202,13 @@
an iterable of objects with a geo interface and
normalizes it to the former."""
for obj in feature_objs:
- if hasattr(obj, "__geo_interface__") and \
- 'type' in obj.__geo_interface__.keys() and \
- obj.__geo_interface__['type'] == 'Feature':
+ if (
+ hasattr(obj, "__geo_interface__")
+ and "type" in obj.__geo_interface__.keys()
+ and obj.__geo_interface__["type"] == "Feature"
+ ):
yield obj.__geo_interface__
- elif isinstance(obj, dict) and 'type' in obj and \
- obj['type'] == 'Feature':
+ elif isinstance(obj, dict) and "type" in obj and obj["type"] == "Feature":
yield obj
else:
- raise ValueError("Did not recognize object {0}"
- "as GeoJSON Feature".format(obj))
+ raise ValueError("Did not recognize object as GeoJSON Feature")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cligj-0.5.0/setup.cfg new/cligj-0.7.2/setup.cfg
--- old/cligj-0.5.0/setup.cfg 1970-01-01 01:00:00.000000000 +0100
+++ new/cligj-0.7.2/setup.cfg 2021-05-28 23:21:08.000000000 +0200
@@ -0,0 +1,2 @@
+[metadata]
+license_file = LICENSE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cligj-0.5.0/setup.py new/cligj-0.7.2/setup.py
--- old/cligj-0.5.0/setup.py 2018-09-26 17:58:55.000000000 +0200
+++ new/cligj-0.7.2/setup.py 2021-05-28 23:21:08.000000000 +0200
@@ -1,28 +1,32 @@
from codecs import open as codecs_open
+
from setuptools import setup, find_packages
+with open("cligj/__init__.py") as f:
+ for line in f:
+ if "__version__" in line:
+ version = line.split("=")[1].strip().strip('"').strip("'")
+ continue
-# Get the long description from the relevant file
with codecs_open('README.rst', encoding='utf-8') as f:
long_description = f.read()
-setup(name='cligj',
- version='0.5.0',
- description=u"Click params for commmand line interfaces to GeoJSON",
- long_description=long_description,
- classifiers=[],
- keywords='',
- author=u"Sean Gillies",
- author_email='sean(a)mapbox.com',
- url='https://github.com/mapbox/cligj',
- license='BSD',
- packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
- include_package_data=True,
- zip_safe=False,
- install_requires=[
- 'click >= 4.0, < 8'
- ],
- extras_require={
- 'test': ['pytest-cov'],
- })
+setup(
+ name="cligj",
+ version=version,
+ description=u"Click params for commmand line interfaces to GeoJSON",
+ long_description=long_description,
+ classifiers=[],
+ keywords="",
+ author=u"Sean Gillies",
+ author_email="sean(a)mapbox.com",
+ url="https://github.com/mapbox/cligj",
+ license="BSD",
+ packages=find_packages(exclude=["ez_setup", "examples", "tests"]),
+ include_package_data=True,
+ zip_safe=False,
+ python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, <4",
+ install_requires=["click >= 4.0"],
+ extras_require={"test": ["pytest-cov"],},
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cligj-0.5.0/tests/test_cli.py new/cligj-0.7.2/tests/test_cli.py
--- old/cligj-0.5.0/tests/test_cli.py 2018-09-26 17:58:55.000000000 +0200
+++ new/cligj-0.7.2/tests/test_cli.py 2021-05-28 23:21:08.000000000 +0200
@@ -1,7 +1,9 @@
import os
import os.path
+import sys
import click
+import pytest
import cligj
@@ -155,62 +157,67 @@
assert result.output.splitlines() == ['geographic']
-def test_sequence(runner):
+(a)pytest.mark.filterwarnings("ignore")
+(a)pytest.mark.parametrize(
+ ("opt", "val"),
+ [
+ ("--sequence", True),
+ ("--no-sequence", False),
+ (None, cligj.__version__.startswith("1.0")),
+ ],
+)
+def test_sequence(runner, opt, val):
+ """True becomes the default in 1.0"""
@click.command()
@cligj.sequence_opt
def cmd(sequence):
- click.echo("%s" % sequence)
+ click.echo(str(sequence))
- result = runner.invoke(cmd)
+ result = runner.invoke(cmd, [opt] if opt is not None else [])
assert not result.exception
- assert result.output.splitlines() == ['False']
+ assert result.output.splitlines() == [str(val)]
- result = runner.invoke(cmd, ['--sequence'])
- assert not result.exception
- assert result.output.splitlines() == ['True']
- result = runner.invoke(cmd, ['--no-sequence'])
- assert not result.exception
- assert result.output.splitlines() == ['False']
+(a)pytest.mark.skipif(sys.version_info < (3,), reason="Requires Python 3")
+(a)pytest.mark.xfail(cligj.__version__.startswith("1.0"), reason="No warning in 1.0")
+def test_sequence_warns(runner):
+ """Warn about --sequence until 1.0"""
+ @click.command()
+ @cligj.sequence_opt
+ def cmd(sequence):
+ click.echo(str(sequence))
+
+ with pytest.warns(FutureWarning):
+ result = runner.invoke(cmd, ["--sequence"])
-def test_sequence_rs(runner):
+(a)pytest.mark.filterwarnings("ignore")
+(a)pytest.mark.parametrize(("opt", "val"), [("--rs", True), (None, False)])
+def test_sequence_rs(runner, opt, val):
@click.command()
@cligj.sequence_opt
@cligj.use_rs_opt
def cmd(sequence, use_rs):
- click.echo("%s" % sequence)
- click.echo("%s" % use_rs)
+ click.echo(str(sequence))
+ click.echo(str(use_rs))
- result = runner.invoke(cmd, ['--sequence', '--rs'])
+ result = runner.invoke(cmd, ["--sequence"] + ([opt] if opt is not None else []))
assert not result.exception
- assert result.output.splitlines() == ['True', 'True']
-
- result = runner.invoke(cmd, ['--sequence'])
- assert not result.exception
- assert result.output.splitlines() == ['True', 'False']
+ assert result.output.splitlines() == ["True", str(val)]
-def test_geojson_type(runner):
+(a)pytest.mark.parametrize(
+ ("opt", "val"),
+ [("--collection", "collection"), ("--feature", "feature"), ("--bbox", "bbox")],
+)
+def test_geojson_type(runner, opt, val):
@click.command()
@cligj.geojson_type_collection_opt(True)
@cligj.geojson_type_feature_opt(False)
@cligj.geojson_type_bbox_opt(False)
def cmd(geojson_type):
- click.echo("%s" % geojson_type)
-
- result = runner.invoke(cmd)
- assert not result.exception
- assert result.output.splitlines() == ['collection']
-
- result = runner.invoke(cmd, ['--collection'])
- assert not result.exception
- assert result.output.splitlines() == ['collection']
-
- result = runner.invoke(cmd, ['--feature'])
- assert not result.exception
- assert result.output.splitlines() == ['feature']
+ click.echo(str(geojson_type))
- result = runner.invoke(cmd, ['--bbox'])
+ result = runner.invoke(cmd, [opt])
assert not result.exception
- assert result.output.splitlines() == ['bbox']
+ assert result.output.splitlines() == [val]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cligj-0.5.0/tests/twopoints.geojson new/cligj-0.7.2/tests/twopoints.geojson
--- old/cligj-0.5.0/tests/twopoints.geojson 2018-09-26 17:58:55.000000000 +0200
+++ new/cligj-0.7.2/tests/twopoints.geojson 2021-05-28 23:21:08.000000000 +0200
@@ -1 +1 @@
-{"features": [{"bbox": [-122.9292140099711, 45.37948199034149, -122.44106199104115, 45.858097009742835], "center": [-122.7282, 45.5801], "context": [{"id": "postcode.2503633822", "text": "97203"}, {"id": "region.3470299826", "text": "Oregon"}, {"id": "country.4150104525", "short_code": "us", "text": "United States"}], "geometry": {"coordinates": [-122.7282, 45.5801], "type": "Point"}, "id": "place.42767", "place_name": "Portland, Oregon, United States", "properties": {}, "relevance": 0.999, "text": "Portland", "type": "Feature"}, {"bbox": [-121.9779540096568, 43.74737999114854, -120.74788099000016, 44.32812500969035], "center": [-121.3153, 44.0582], "context": [{"id": "postcode.3332732485", "text": "97701"}, {"id": "region.3470299826", "text": "Oregon"}, {"id": "country.4150104525", "short_code": "us", "text": "United States"}], "geometry": {"coordinates": [-121.3153, 44.0582], "type": "Point"}, "id": "place.3965", "place_name": "Bend, Oregon, United States", "properties": {}, "rele
vance": 0.999, "text": "Bend", "type": "Feature"}], "type": "FeatureCollection"}
+{"features": [{"bbox": [-122.9292140099711, 45.37948199034149, -122.44106199104115, 45.858097009742835], "center": [-122.7282, 45.5801], "context": [{"id": "postcode.2503633822", "text": "97203"}, {"id": "region.3470299826", "text": "Oregon"}, {"id": "country.4150104525", "short_code": "us", "text": "United States"}], "geometry": {"coordinates": [-122.7282, 45.5801], "type": "Point"}, "id": "place.42767", "place_name": "Portland, Oregon, United States", "properties": {}, "relevance": 0.999, "text": "Portland", "type": "Feature"}, {"bbox": [-121.9779540096568, 43.74737999114854, -120.74788099000016, 44.32812500969035], "center": [-121.3153, 44.0582], "context": [{"id": "postcode.3332732485", "text": "97701"}, {"id": "region.3470299826", "text": "Oregon"}, {"id": "country.4150104525", "short_code": "us", "text": "United States"}], "geometry": {"coordinates": [-121.3153, 44.0582], "type": "Point"}, "id": "place.3965", "place_name": "Bend, ����regon, United States", "properties": {}, "r
elevance": 0.999, "text": "Bend", "type": "Feature"}], "type": "FeatureCollection"}
2
1
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package 000release-packages for openSUSE:Factory checked in at 2022-07-31 23:42:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/000release-packages (Old)
and /work/SRC/openSUSE:Factory/.000release-packages.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "000release-packages"
Sun Jul 31 23:42:52 2022 rev:1739 rq: version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ MicroOS-release.spec ++++++
--- /var/tmp/diff_new_pack.uGbQRy/_old 2022-07-31 23:42:54.591047959 +0200
+++ /var/tmp/diff_new_pack.uGbQRy/_new 2022-07-31 23:42:54.599047981 +0200
@@ -17,7 +17,7 @@
Name: MicroOS-release
-Version: 20220729
+Version: 20220731
Release: 0
Summary: openSUSE MicroOS
License: GPL-2.0-or-later
@@ -176,9 +176,9 @@
%include %{SOURCE100}
Provides: %name-%version
Provides: product() = MicroOS
-Provides: product(MicroOS) = 20220729-0
+Provides: product(MicroOS) = 20220731-0
Provides: product-label() = openSUSE%20MicroOS
-Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20220729
+Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20220731
Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm
Provides: product-endoflife()
Requires: product_flavor(MicroOS)
@@ -194,7 +194,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(dvd)
-Provides: product_flavor(MicroOS) = 20220729-0
+Provides: product_flavor(MicroOS) = 20220731-0
Summary: openSUSE MicroOS%{?betaversion: %{betaversion}}
%description dvd
@@ -210,7 +210,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance)
-Provides: product_flavor(MicroOS) = 20220729-0
+Provides: product_flavor(MicroOS) = 20220731-0
Summary: openSUSE MicroOS%{?betaversion: %{betaversion}}
%description appliance
@@ -267,11 +267,11 @@
<product schemeversion="0">
<vendor>openSUSE</vendor>
<name>MicroOS</name>
- <version>20220729</version>
+ <version>20220731</version>
<release>0</release>
<endoflife></endoflife>
<arch>%{_target_cpu}</arch>
- <cpeid>cpe:/o:opensuse:microos:20220729</cpeid>
+ <cpeid>cpe:/o:opensuse:microos:20220731</cpeid>
<productline>MicroOS</productline>
<register>
<pool>
++++++ openSUSE-Addon-NonOss-release.spec ++++++
--- /var/tmp/diff_new_pack.uGbQRy/_old 2022-07-31 23:42:54.619048040 +0200
+++ /var/tmp/diff_new_pack.uGbQRy/_new 2022-07-31 23:42:54.627048063 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package openSUSE-Addon-NonOss-release (Version 20220729)
+# spec file for package openSUSE-Addon-NonOss-release (Version 20220731)
#
# Copyright (c) 2022 openSUSE.
#
@@ -16,16 +16,16 @@
Name: openSUSE-Addon-NonOss-release
%define product openSUSE-Addon-NonOss
Summary: openSUSE NonOSS Addon%{?betaversion: %{betaversion}}
-Version: 20220729
+Version: 20220731
Release: 0
License: BSD-3-Clause
Group: System/Fhs
Provides: %name-%version
Provides: product() = openSUSE-Addon-NonOss
-Provides: product(openSUSE-Addon-NonOss) = 20220729-0
+Provides: product(openSUSE-Addon-NonOss) = 20220731-0
Provides: product-label() = non%20oss%20addon
-Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20220729
+Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20220731
AutoReqProv: on
@@ -48,10 +48,10 @@
<product schemeversion="0">
<vendor>openSUSE</vendor>
<name>openSUSE-Addon-NonOss</name>
- <version>20220729</version>
+ <version>20220731</version>
<release>0</release>
<arch>%{_target_cpu}</arch>
- <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20220729</cpeid>
+ <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20220731</cpeid>
<register>
<pool>
</pool>
++++++ openSUSE-release.spec ++++++
--- /var/tmp/diff_new_pack.uGbQRy/_old 2022-07-31 23:42:54.647048121 +0200
+++ /var/tmp/diff_new_pack.uGbQRy/_new 2022-07-31 23:42:54.655048144 +0200
@@ -20,7 +20,7 @@
#define betaversion %{nil}
%define codename Tumbleweed
Name: openSUSE-release
-Version: 20220729
+Version: 20220731
Release: 0
# 0 is the product release, not the build release of this package
Summary: openSUSE Tumbleweed
@@ -178,7 +178,7 @@
%include %{SOURCE100}
Provides: %name-%version
Provides: product() = openSUSE
-Provides: product(openSUSE) = 20220729-0
+Provides: product(openSUSE) = 20220731-0
%ifarch x86_64
Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64
%endif
@@ -192,7 +192,7 @@
Provides: product-register-target() = openSUSE%2DTumbleweed%2Daarch64
%endif
Provides: product-label() = openSUSE
-Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20220729
+Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20220731
Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm
Provides: product-url(repository) = http%3A%2F%2Fdownload.opensuse.org%2Ftumbleweed%2Frepo%2Foss%2F
Requires: product_flavor(openSUSE)
@@ -206,7 +206,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(ftp)
-Provides: product_flavor(openSUSE) = 20220729-0
+Provides: product_flavor(openSUSE) = 20220731-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description ftp
@@ -221,7 +221,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(mini)
-Provides: product_flavor(openSUSE) = 20220729-0
+Provides: product_flavor(openSUSE) = 20220731-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description mini
@@ -236,7 +236,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(dvd)
-Provides: product_flavor(openSUSE) = 20220729-0
+Provides: product_flavor(openSUSE) = 20220731-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description dvd
@@ -251,7 +251,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-kde)
-Provides: product_flavor(openSUSE) = 20220729-0
+Provides: product_flavor(openSUSE) = 20220731-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description livecd-kde
@@ -266,7 +266,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-x11)
-Provides: product_flavor(openSUSE) = 20220729-0
+Provides: product_flavor(openSUSE) = 20220731-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description livecd-x11
@@ -281,7 +281,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-gnome)
-Provides: product_flavor(openSUSE) = 20220729-0
+Provides: product_flavor(openSUSE) = 20220731-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description livecd-gnome
@@ -296,7 +296,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-xfce)
-Provides: product_flavor(openSUSE) = 20220729-0
+Provides: product_flavor(openSUSE) = 20220731-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description livecd-xfce
@@ -311,7 +311,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(usb-kde)
-Provides: product_flavor(openSUSE) = 20220729-0
+Provides: product_flavor(openSUSE) = 20220731-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description usb-kde
@@ -326,7 +326,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(usb-gnome)
-Provides: product_flavor(openSUSE) = 20220729-0
+Provides: product_flavor(openSUSE) = 20220731-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description usb-gnome
@@ -341,7 +341,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(usb-x11)
-Provides: product_flavor(openSUSE) = 20220729-0
+Provides: product_flavor(openSUSE) = 20220731-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description usb-x11
@@ -356,7 +356,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance)
-Provides: product_flavor(openSUSE) = 20220729-0
+Provides: product_flavor(openSUSE) = 20220731-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance
@@ -371,7 +371,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-docker)
-Provides: product_flavor(openSUSE) = 20220729-0
+Provides: product_flavor(openSUSE) = 20220731-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-docker
@@ -386,7 +386,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-kvm)
-Provides: product_flavor(openSUSE) = 20220729-0
+Provides: product_flavor(openSUSE) = 20220731-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-kvm
@@ -401,7 +401,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-vmware)
-Provides: product_flavor(openSUSE) = 20220729-0
+Provides: product_flavor(openSUSE) = 20220731-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-vmware
@@ -416,7 +416,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-openstack)
-Provides: product_flavor(openSUSE) = 20220729-0
+Provides: product_flavor(openSUSE) = 20220731-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-openstack
@@ -431,7 +431,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-hyperv)
-Provides: product_flavor(openSUSE) = 20220729-0
+Provides: product_flavor(openSUSE) = 20220731-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-hyperv
@@ -446,7 +446,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-vagrant)
-Provides: product_flavor(openSUSE) = 20220729-0
+Provides: product_flavor(openSUSE) = 20220731-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-vagrant
@@ -461,7 +461,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-wsl)
-Provides: product_flavor(openSUSE) = 20220729-0
+Provides: product_flavor(openSUSE) = 20220731-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-wsl
@@ -476,7 +476,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-custom)
-Provides: product_flavor(openSUSE) = 20220729-0
+Provides: product_flavor(openSUSE) = 20220731-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-custom
@@ -557,10 +557,10 @@
<product schemeversion="0">
<vendor>openSUSE</vendor>
<name>openSUSE</name>
- <version>20220729</version>
+ <version>20220731</version>
<release>0</release>
<arch>%{_target_cpu}</arch>
- <cpeid>cpe:/o:opensuse:opensuse:20220729</cpeid>
+ <cpeid>cpe:/o:opensuse:opensuse:20220731</cpeid>
<productline>openSUSE</productline>
<register>
<pool>
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mercurial for openSUSE:Factory checked in at 2022-07-31 23:00:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mercurial (Old)
and /work/SRC/openSUSE:Factory/.mercurial.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mercurial"
Sun Jul 31 23:00:55 2022 rev:174 rq:991726 version:6.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/mercurial/mercurial.changes 2022-07-21 11:32:50.986919998 +0200
+++ /work/SRC/openSUSE:Factory/.mercurial.new.1533/mercurial.changes 2022-07-31 23:01:11.287734305 +0200
@@ -1,0 +2,21 @@
+Fri Jul 29 13:36:34 UTC 2022 - Lukas M��ller <expeehaa(a)outlook.com>
+
+- Update to Mercurial 6.2.1.
+ * git: make sure to fsdecode bookmark names everywhere (issue6723)
+ * git: add a missing reset_copy keyword argument to dirstate.set_tracked()
+ * git: copy findmissingrevs() from revlog.py to gitlog.py (issue6472)
+ * sslutil: use proper attribute to select python 3.7+
+ * sslutil: another use proper attribute to select python 3.7+
+ * mergestate: action name was str
+ * packaging: update keyring on Windows to avoid spurious stacktraces
+ * packaging: bump dulwich to 0.20.45
+ * debug-discovery: fix a typo in the doc
+ * debug-discovery: properly apply remote filtering in "old" mode
+ * debug-discovery: also gather details on tree-discovery queries type
+ * debug-discovery: gather the right number of roundtrips for tree discovery
+ * debug-discovery: do not abort on unrelated repositories
+ * debug-discovery: deal with case where common is empty
+ * tree-discovery: fix the request debug output and progress location
+ * debug-discovery: apply spelling fixes from Rapha��l
+
+-------------------------------------------------------------------
Old:
----
mercurial-6.2.tar.gz
New:
----
mercurial-6.2.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mercurial.spec ++++++
--- /var/tmp/diff_new_pack.GTOo9n/_old 2022-07-31 23:01:11.851735944 +0200
+++ /var/tmp/diff_new_pack.GTOo9n/_new 2022-07-31 23:01:11.855735956 +0200
@@ -20,7 +20,7 @@
%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%endif
Name: mercurial
-Version: 6.2
+Version: 6.2.1
Release: 0
Summary: Scalable Distributed SCM
License: GPL-2.0-or-later
++++++ mercurial-6.2.tar.gz -> mercurial-6.2.1.tar.gz ++++++
/work/SRC/openSUSE:Factory/mercurial/mercurial-6.2.tar.gz /work/SRC/openSUSE:Factory/.mercurial.new.1533/mercurial-6.2.1.tar.gz differ: char 5, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libnettle for openSUSE:Factory checked in at 2022-07-31 23:00:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libnettle (Old)
and /work/SRC/openSUSE:Factory/.libnettle.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libnettle"
Sun Jul 31 23:00:54 2022 rev:43 rq:991715 version:3.8.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/libnettle/libnettle.changes 2022-07-13 14:32:03.137262419 +0200
+++ /work/SRC/openSUSE:Factory/.libnettle.new.1533/libnettle.changes 2022-07-31 23:01:10.287731400 +0200
@@ -1,0 +2,11 @@
+Thu Jul 28 20:25:53 UTC 2022 - Dirk M��ller <dmueller(a)suse.com>
+
+- update to 3.8.1:
+ * Avoid non-posix m4 argument references in the chacha
+ implementation for arm64, powerpc64 and s390x. Reported by
+ Christian Weisgerber, fix contributed by Mamone Tarsha.
+ * Use explicit .machine pseudo-ops where needed in s390x
+ assembly files. Bug report by Andreas K. Huettel, fix
+ contributed by Mamone Tarsha.
+
+-------------------------------------------------------------------
Old:
----
nettle-3.8.tar.gz
nettle-3.8.tar.gz.sig
New:
----
nettle-3.8.1.tar.gz
nettle-3.8.1.tar.gz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libnettle.spec ++++++
--- /var/tmp/diff_new_pack.CMTOmM/_old 2022-07-31 23:01:10.731732690 +0200
+++ /var/tmp/diff_new_pack.CMTOmM/_new 2022-07-31 23:01:10.735732702 +0200
@@ -19,7 +19,7 @@
%define soname 8
%define hogweed_soname 6
Name: libnettle
-Version: 3.8
+Version: 3.8.1
Release: 0
Summary: Cryptographic Library
License: GPL-2.0-or-later AND LGPL-2.1-or-later
++++++ nettle-3.8.tar.gz -> nettle-3.8.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nettle-3.8/ChangeLog new/nettle-3.8.1/ChangeLog
--- old/nettle-3.8/ChangeLog 2022-06-02 19:57:16.000000000 +0200
+++ new/nettle-3.8.1/ChangeLog 2022-07-27 21:23:20.000000000 +0200
@@ -1,3 +1,21 @@
+2022-07-26 Niels M��ller <nisse(a)lysator.liu.se>
+
+ * Released nettle-3.8.1.
+
+ * configure.ac: Bump package version, to 3.8.1.
+ (LIBNETTLE_MINOR): Bump minor number, to 8.6.
+ (LIBHOGWEED_MINOR): Bump minor number, to 6.6.
+
+2022-06-12 Niels M��ller <nisse(a)lysator.liu.se>
+
+ From Christian Weisgerber:
+ * fat-arm64.c (get_arm64_features): Enable runtime feature
+ detection for openbsd.
+
+2022-06-02 Niels M��ller <nisse(a)lysator.liu.se>
+
+ * Released nettle-3.8.
+
2022-05-23 Niels M��ller <nisse(a)lysator.liu.se>
* Makefile.in (OPT_SOURCES): Add missing file fat-arm64.c.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nettle-3.8/NEWS new/nettle-3.8.1/NEWS
--- old/nettle-3.8/NEWS 2022-06-02 19:57:16.000000000 +0200
+++ new/nettle-3.8.1/NEWS 2022-07-27 21:23:20.000000000 +0200
@@ -1,3 +1,28 @@
+NEWS for the Nettle 3.8.1 release
+
+ This is a bugfix release, fixing a few portability issues
+ reported for Nettle-3.8.
+
+ Bug fixes:
+
+ * Avoid non-posix m4 argument references in the chacha
+ implementation for arm64, powerpc64 and s390x. Reported by
+ Christian Weisgerber, fix contributed by Mamone Tarsha.
+
+ * Use explicit .machine pseudo-ops where needed in s390x
+ assembly files. Bug report by Andreas K. Huettel, fix
+ contributed by Mamone Tarsha.
+
+ Optimizations:
+
+ * Implemented runtime detection of cpu features for OpenBSD on
+ arm64. Contributed by Christian Weisgerber.
+
+ The new version is intended to be fully source and binary
+ compatible with Nettle-3.6. The shared library names are
+ libnettle.so.8.6 and libhogweed.so.6.6, with sonames
+ libnettle.so.8 and libhogweed.so.6.
+
NEWS for the Nettle 3.8 release
This release includes a couple of new features, and many
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nettle-3.8/README new/nettle-3.8.1/README
--- old/nettle-3.8/README 2022-06-02 19:57:16.000000000 +0200
+++ new/nettle-3.8.1/README 2022-07-27 21:23:20.000000000 +0200
@@ -42,7 +42,7 @@
Read the manual. Mail me if you have any questions or suggestions.
You may want to subscribe to the nettle-bugs mailing list. See
-<URL: http://lists.lysator.liu.se/mailman/listinfo/nettle-bugs>.
+<URL: https://lists.lysator.liu.se/mailman3/postorius/lists/nettle-bugs.lists.lys…>.
See CONTRIBUTING.md for information on contibuting patches.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nettle-3.8/arm64/chacha-4core.asm new/nettle-3.8.1/arm64/chacha-4core.asm
--- old/nettle-3.8/arm64/chacha-4core.asm 2022-06-02 19:57:16.000000000 +0200
+++ new/nettle-3.8.1/arm64/chacha-4core.asm 2022-07-27 21:23:21.000000000 +0200
@@ -53,67 +53,74 @@
define(`ROT24', `v8')
+C A workaround for expanding multiple digits of argument references to QR macro which is incompatible with POSIX
+C See https://www.gnu.org/software/m4/manual/html_node/Arguments.html
+define(`P1',
+`ifelse($1, 0, v16, $1, 1, v17, $1, 2, v18, $1, 3, v19, $1, 4, v20, $1, 5, v21, $1, 6, v22, $1, 7, v23, $1, 8, v24, $1, 9, v25, $1, 10, v26, $1, 11, v27, $1, 12, v28, $1, 13, v29, $1, 14, v30, $1, 15, v31)')
+define(`P2',
+`ifelse($1, 0, v16, $1, 1, v21, $1, 2, v26, $1, 3, v31, $1, 4, v20, $1, 5, v25, $1, 6, v30, $1, 7, v19, $1, 8, v24, $1, 9, v29, $1, 10, v18, $1, 11, v23, $1, 12, v28, $1, 13, v17, $1, 14, v22, $1, 15, v27)')
+
C Main loop for round
define(`QR',`
- add $1.4s, $1.4s, $2.4s
- add $5.4s, $5.4s, $6.4s
- add $9.4s, $9.4s, $10.4s
- add $13.4s, $13.4s, $14.4s
- eor $4.16b, $4.16b, $1.16b
- eor $8.16b, $8.16b, $5.16b
- eor $12.16b, $12.16b, $9.16b
- eor $16.16b, $16.16b, $13.16b
- rev32 $4.8h, $4.8h
- rev32 $8.8h, $8.8h
- rev32 $12.8h, $12.8h
- rev32 $16.8h, $16.8h
-
- add $3.4s, $3.4s, $4.4s
- add $7.4s, $7.4s, $8.4s
- add $11.4s, $11.4s, $12.4s
- add $15.4s, $15.4s, $16.4s
- eor TMP0.16b, $2.16b, $3.16b
- eor TMP1.16b, $6.16b, $7.16b
- eor TMP2.16b, $10.16b, $11.16b
- eor TMP3.16b, $14.16b, $15.16b
- ushr $2.4s, TMP0.4s, #20
- ushr $6.4s, TMP1.4s, #20
- ushr $10.4s, TMP2.4s, #20
- ushr $14.4s, TMP3.4s, #20
- sli $2.4s, TMP0.4s, #12
- sli $6.4s, TMP1.4s, #12
- sli $10.4s, TMP2.4s, #12
- sli $14.4s, TMP3.4s, #12
-
- add $1.4s, $1.4s, $2.4s
- add $5.4s, $5.4s, $6.4s
- add $9.4s, $9.4s, $10.4s
- add $13.4s, $13.4s, $14.4s
- eor $4.16b, $4.16b, $1.16b
- eor $8.16b, $8.16b, $5.16b
- eor $12.16b, $12.16b, $9.16b
- eor $16.16b, $16.16b, $13.16b
- tbl $4.16b, {$4.16b}, ROT24.16b
- tbl $8.16b, {$8.16b}, ROT24.16b
- tbl $12.16b, {$12.16b}, ROT24.16b
- tbl $16.16b, {$16.16b}, ROT24.16b
-
- add $3.4s, $3.4s, $4.4s
- add $7.4s, $7.4s, $8.4s
- add $11.4s, $11.4s, $12.4s
- add $15.4s, $15.4s, $16.4s
- eor TMP0.16b, $2.16b, $3.16b
- eor TMP1.16b, $6.16b, $7.16b
- eor TMP2.16b, $10.16b, $11.16b
- eor TMP3.16b, $14.16b, $15.16b
- ushr $2.4s, TMP0.4s, #25
- ushr $6.4s, TMP1.4s, #25
- ushr $10.4s, TMP2.4s, #25
- ushr $14.4s, TMP3.4s, #25
- sli $2.4s, TMP0.4s, #7
- sli $6.4s, TMP1.4s, #7
- sli $10.4s, TMP2.4s, #7
- sli $14.4s, TMP3.4s, #7
+ add $1(0).4s, $1(0).4s, $1(1).4s
+ add $1(4).4s, $1(4).4s, $1(5).4s
+ add $1(8).4s, $1(8).4s, $1(9).4s
+ add $1(12).4s, $1(12).4s, $1(13).4s
+ eor $1(3).16b, $1(3).16b, $1(0).16b
+ eor $1(7).16b, $1(7).16b, $1(4).16b
+ eor $1(11).16b, $1(11).16b, $1(8).16b
+ eor $1(15).16b, $1(15).16b, $1(12).16b
+ rev32 $1(3).8h, $1(3).8h
+ rev32 $1(7).8h, $1(7).8h
+ rev32 $1(11).8h, $1(11).8h
+ rev32 $1(15).8h, $1(15).8h
+
+ add $1(2).4s, $1(2).4s, $1(3).4s
+ add $1(6).4s, $1(6).4s, $1(7).4s
+ add $1(10).4s, $1(10).4s, $1(11).4s
+ add $1(14).4s, $1(14).4s, $1(15).4s
+ eor TMP0.16b, $1(1).16b, $1(2).16b
+ eor TMP1.16b, $1(5).16b, $1(6).16b
+ eor TMP2.16b, $1(9).16b, $1(10).16b
+ eor TMP3.16b, $1(13).16b, $1(14).16b
+ ushr $1(1).4s, TMP0.4s, #20
+ ushr $1(5).4s, TMP1.4s, #20
+ ushr $1(9).4s, TMP2.4s, #20
+ ushr $1(13).4s, TMP3.4s, #20
+ sli $1(1).4s, TMP0.4s, #12
+ sli $1(5).4s, TMP1.4s, #12
+ sli $1(9).4s, TMP2.4s, #12
+ sli $1(13).4s, TMP3.4s, #12
+
+ add $1(0).4s, $1(0).4s, $1(1).4s
+ add $1(4).4s, $1(4).4s, $1(5).4s
+ add $1(8).4s, $1(8).4s, $1(9).4s
+ add $1(12).4s, $1(12).4s, $1(13).4s
+ eor $1(3).16b, $1(3).16b, $1(0).16b
+ eor $1(7).16b, $1(7).16b, $1(4).16b
+ eor $1(11).16b, $1(11).16b, $1(8).16b
+ eor $1(15).16b, $1(15).16b, $1(12).16b
+ tbl $1(3).16b, {$1(3).16b}, ROT24.16b
+ tbl $1(7).16b, {$1(7).16b}, ROT24.16b
+ tbl $1(11).16b, {$1(11).16b}, ROT24.16b
+ tbl $1(15).16b, {$1(15).16b}, ROT24.16b
+
+ add $1(2).4s, $1(2).4s, $1(3).4s
+ add $1(6).4s, $1(6).4s, $1(7).4s
+ add $1(10).4s, $1(10).4s, $1(11).4s
+ add $1(14).4s, $1(14).4s, $1(15).4s
+ eor TMP0.16b, $1(1).16b, $1(2).16b
+ eor TMP1.16b, $1(5).16b, $1(6).16b
+ eor TMP2.16b, $1(9).16b, $1(10).16b
+ eor TMP3.16b, $1(13).16b, $1(14).16b
+ ushr $1(1).4s, TMP0.4s, #25
+ ushr $1(5).4s, TMP1.4s, #25
+ ushr $1(9).4s, TMP2.4s, #25
+ ushr $1(13).4s, TMP3.4s, #25
+ sli $1(1).4s, TMP0.4s, #7
+ sli $1(5).4s, TMP1.4s, #7
+ sli $1(9).4s, TMP2.4s, #7
+ sli $1(13).4s, TMP3.4s, #7
')
define(`TRANSPOSE',`
@@ -174,8 +181,8 @@
mov T3.16b, v31.16b
.Loop:
- QR(v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31)
- QR(v16, v21, v26, v31, v20, v25, v30, v19, v24, v29, v18, v23, v28, v17, v22, v27)
+ QR(`P1')
+ QR(`P2')
subs ROUNDS, ROUNDS, #2
b.ne .Loop
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nettle-3.8/configure new/nettle-3.8.1/configure
--- old/nettle-3.8/configure 2022-06-02 19:57:16.000000000 +0200
+++ new/nettle-3.8.1/configure 2022-07-27 21:23:20.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for nettle 3.8.
+# Generated by GNU Autoconf 2.69 for nettle 3.8.1.
#
# Report bugs to <nettle-bugs(a)lists.lysator.liu.se>.
#
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='nettle'
PACKAGE_TARNAME='nettle'
-PACKAGE_VERSION='3.8'
-PACKAGE_STRING='nettle 3.8'
+PACKAGE_VERSION='3.8.1'
+PACKAGE_STRING='nettle 3.8.1'
PACKAGE_BUGREPORT='nettle-bugs(a)lists.lysator.liu.se'
PACKAGE_URL=''
@@ -1348,7 +1348,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures nettle 3.8 to adapt to many kinds of systems.
+\`configure' configures nettle 3.8.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1414,7 +1414,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of nettle 3.8:";;
+ short | recursive ) echo "Configuration of nettle 3.8.1:";;
esac
cat <<\_ACEOF
@@ -1542,7 +1542,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-nettle configure 3.8
+nettle configure 3.8.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2186,7 +2186,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by nettle $as_me 3.8, which was
+It was created by nettle $as_me 3.8.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2571,10 +2571,10 @@
LIBNETTLE_MAJOR=8
-LIBNETTLE_MINOR=5
+LIBNETTLE_MINOR=6
LIBHOGWEED_MAJOR=6
-LIBHOGWEED_MINOR=5
+LIBHOGWEED_MINOR=6
MAJOR_VERSION=`echo $PACKAGE_VERSION | sed 's/^\([^.]*\)\..*/\1/'`
MINOR_VERSION=`echo $PACKAGE_VERSION | sed 's/^[^.]*\.\([0-9]*\).*/\1/'`
@@ -8323,7 +8323,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by nettle $as_me 3.8, which was
+This file was extended by nettle $as_me 3.8.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8389,7 +8389,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-nettle config.status 3.8
+nettle config.status 3.8.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nettle-3.8/configure.ac new/nettle-3.8.1/configure.ac
--- old/nettle-3.8/configure.ac 2022-06-02 19:57:16.000000000 +0200
+++ new/nettle-3.8.1/configure.ac 2022-07-27 21:23:20.000000000 +0200
@@ -2,7 +2,7 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([nettle], [3.8], [nettle-bugs(a)lists.lysator.liu.se]
+AC_INIT([nettle], [3.8.1], [nettle-bugs(a)lists.lysator.liu.se]
AC_PREREQ(2.61)
AC_CONFIG_SRCDIR([arcfour.c])
# Needed to stop autoconf from looking for files in parent directories.
@@ -11,10 +11,10 @@
AC_CONFIG_HEADER([config.h])
LIBNETTLE_MAJOR=8
-LIBNETTLE_MINOR=5
+LIBNETTLE_MINOR=6
LIBHOGWEED_MAJOR=6
-LIBHOGWEED_MINOR=5
+LIBHOGWEED_MINOR=6
dnl Note double square brackets, for extra m4 quoting.
MAJOR_VERSION=`echo $PACKAGE_VERSION | sed 's/^\([[^.]]*\)\..*/\1/'`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nettle-3.8/fat-arm64.c new/nettle-3.8.1/fat-arm64.c
--- old/nettle-3.8/fat-arm64.c 2022-06-02 19:57:15.000000000 +0200
+++ new/nettle-3.8.1/fat-arm64.c 2022-07-27 21:23:20.000000000 +0200
@@ -46,6 +46,10 @@
# include <asm/hwcap.h>
# include <sys/auxv.h>
# endif
+#elif defined(__OpenBSD__)
+# include <sys/sysctl.h>
+# include <machine/cpu.h>
+# include <machine/armreg.h>
#endif
#include "nettle-types.h"
@@ -122,6 +126,21 @@
= ((hwcap & (HWCAP_ASIMD | HWCAP_SHA1)) == (HWCAP_ASIMD | HWCAP_SHA1));
features->have_sha2
= ((hwcap & (HWCAP_ASIMD | HWCAP_SHA2)) == (HWCAP_ASIMD | HWCAP_SHA2));
+#elif defined(__OpenBSD__)
+ const int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 };
+ uint64_t isar0;
+ size_t len = sizeof(isar0);
+
+ if (sysctl(isar0_mib, 2, &isar0, &len, NULL, 0) < 0)
+ return;
+ features->have_aes
+ = (ID_AA64ISAR0_AES(isar0) >= ID_AA64ISAR0_AES_BASE);
+ features->have_pmull
+ = (ID_AA64ISAR0_AES(isar0) >= ID_AA64ISAR0_AES_PMULL);
+ features->have_sha1
+ = (ID_AA64ISAR0_SHA1(isar0) >= ID_AA64ISAR0_SHA1_BASE);
+ features->have_sha2
+ = (ID_AA64ISAR0_SHA2(isar0) >= ID_AA64ISAR0_SHA2_BASE);
#endif
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nettle-3.8/powerpc64/p7/chacha-4core.asm new/nettle-3.8.1/powerpc64/p7/chacha-4core.asm
--- old/nettle-3.8/powerpc64/p7/chacha-4core.asm 2022-06-02 19:57:16.000000000 +0200
+++ new/nettle-3.8.1/powerpc64/p7/chacha-4core.asm 2022-07-27 21:23:21.000000000 +0200
@@ -53,59 +53,66 @@
define(`T2', `v22')
define(`T3', `v23')
+C A workaround for expanding multiple digits of argument references to QR macro which is incompatible with POSIX
+C See https://www.gnu.org/software/m4/manual/html_node/Arguments.html
+define(`P1',
+`ifelse($1, 0, v0, $1, 1, v4, $1, 2, v8, $1, 3, v12, $1, 4, v1, $1, 5, v5, $1, 6, v9, $1, 7, v13, $1, 8, v2, $1, 9, v6, $1, 10, v10, $1, 11, v14, $1, 12, v3, $1, 13, v7, $1, 14, v11, $1, 15, v15)')
+define(`P2',
+`ifelse($1, 0, v0, $1, 1, v5, $1, 2, v10, $1, 3, v15, $1, 4, v1, $1, 5, v6, $1, 6, v11, $1, 7, v12, $1, 8, v2, $1, 9, v7, $1, 10, v8, $1, 11, v13, $1, 12, v3, $1, 13, v4, $1, 14, v9, $1, 15, v14)')
+
C Main loop for round
define(`QR',`
- vadduwm $1, $1, $2
- vadduwm $5, $5, $6
- vadduwm $9, $9, $10
- vadduwm $13, $13, $14
- vxor $4, $4, $1
- vxor $8, $8, $5
- vxor $12, $12, $9
- vxor $16, $16, $13
- vrlw $4, $4, ROT16
- vrlw $8, $8, ROT16
- vrlw $12, $12, ROT16
- vrlw $16, $16, ROT16
-
- vadduwm $3, $3, $4
- vadduwm $7, $7, $8
- vadduwm $11, $11, $12
- vadduwm $15, $15, $16
- vxor $2, $2, $3
- vxor $6, $6, $7
- vxor $10, $10, $11
- vxor $14, $14, $15
- vrlw $2, $2, ROT12
- vrlw $6, $6, ROT12
- vrlw $10, $10, ROT12
- vrlw $14, $14, ROT12
-
- vadduwm $1, $1, $2
- vadduwm $5, $5, $6
- vadduwm $9, $9, $10
- vadduwm $13, $13, $14
- vxor $4, $4, $1
- vxor $8, $8, $5
- vxor $12, $12, $9
- vxor $16, $16, $13
- vrlw $4, $4, ROT8
- vrlw $8, $8, ROT8
- vrlw $12, $12, ROT8
- vrlw $16, $16, ROT8
-
- vadduwm $3, $3, $4
- vadduwm $7, $7, $8
- vadduwm $11, $11, $12
- vadduwm $15, $15, $16
- vxor $2, $2, $3
- vxor $6, $6, $7
- vxor $10, $10, $11
- vxor $14, $14, $15
- vrlw $2, $2, ROT7
- vrlw $6, $6, ROT7
- vrlw $10, $10, ROT7
- vrlw $14, $14, ROT7
+ vadduwm $1(0), $1(0), $1(1)
+ vadduwm $1(4), $1(4), $1(5)
+ vadduwm $1(8), $1(8), $1(9)
+ vadduwm $1(12), $1(12), $1(13)
+ vxor $1(3), $1(3), $1(0)
+ vxor $1(7), $1(7), $1(4)
+ vxor $1(11), $1(11), $1(8)
+ vxor $1(15), $1(15), $1(12)
+ vrlw $1(3), $1(3), ROT16
+ vrlw $1(7), $1(7), ROT16
+ vrlw $1(11), $1(11), ROT16
+ vrlw $1(15), $1(15), ROT16
+
+ vadduwm $1(2), $1(2), $1(3)
+ vadduwm $1(6), $1(6), $1(7)
+ vadduwm $1(10), $1(10), $1(11)
+ vadduwm $1(14), $1(14), $1(15)
+ vxor $1(1), $1(1), $1(2)
+ vxor $1(5), $1(5), $1(6)
+ vxor $1(9), $1(9), $1(10)
+ vxor $1(13), $1(13), $1(14)
+ vrlw $1(1), $1(1), ROT12
+ vrlw $1(5), $1(5), ROT12
+ vrlw $1(9), $1(9), ROT12
+ vrlw $1(13), $1(13), ROT12
+
+ vadduwm $1(0), $1(0), $1(1)
+ vadduwm $1(4), $1(4), $1(5)
+ vadduwm $1(8), $1(8), $1(9)
+ vadduwm $1(12), $1(12), $1(13)
+ vxor $1(3), $1(3), $1(0)
+ vxor $1(7), $1(7), $1(4)
+ vxor $1(11), $1(11), $1(8)
+ vxor $1(15), $1(15), $1(12)
+ vrlw $1(3), $1(3), ROT8
+ vrlw $1(7), $1(7), ROT8
+ vrlw $1(11), $1(11), ROT8
+ vrlw $1(15), $1(15), ROT8
+
+ vadduwm $1(2), $1(2), $1(3)
+ vadduwm $1(6), $1(6), $1(7)
+ vadduwm $1(10), $1(10), $1(11)
+ vadduwm $1(14), $1(14), $1(15)
+ vxor $1(1), $1(1), $1(2)
+ vxor $1(5), $1(5), $1(6)
+ vxor $1(9), $1(9), $1(10)
+ vxor $1(13), $1(13), $1(14)
+ vrlw $1(1), $1(1), ROT7
+ vrlw $1(5), $1(5), ROT7
+ vrlw $1(9), $1(9), ROT7
+ vrlw $1(13), $1(13), ROT7
')
define(`TRANSPOSE',`
@@ -185,8 +192,8 @@
srdi ROUNDS, ROUNDS, 1
mtctr ROUNDS
.Loop:
- QR(v0, v4, v8, v12, v1, v5, v9, v13, v2, v6, v10, v14, v3, v7, v11, v15)
- QR(v0, v5, v10, v15, v1, v6, v11, v12, v2, v7, v8, v13, v3, v4, v9, v14)
+ QR(`P1')
+ QR(`P2')
bdnz .Loop
C Add in saved original words, including counters, before
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nettle-3.8/s390x/memxor.asm new/nettle-3.8.1/s390x/memxor.asm
--- old/nettle-3.8/s390x/memxor.asm 2022-06-02 19:57:16.000000000 +0200
+++ new/nettle-3.8.1/s390x/memxor.asm 2022-07-27 21:23:21.000000000 +0200
@@ -30,6 +30,7 @@
')
.file "memxor.asm"
+.machine "z10"
.text
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nettle-3.8/s390x/vf/chacha-4core.asm new/nettle-3.8.1/s390x/vf/chacha-4core.asm
--- old/nettle-3.8/s390x/vf/chacha-4core.asm 2022-06-02 19:57:16.000000000 +0200
+++ new/nettle-3.8.1/s390x/vf/chacha-4core.asm 2022-07-27 21:23:21.000000000 +0200
@@ -48,59 +48,66 @@
define(`T2', `%v27')
define(`T3', `%v28')
+C A workaround for expanding multiple digits of argument references to QR macro which is incompatible with POSIX
+C See https://www.gnu.org/software/m4/manual/html_node/Arguments.html
+define(`P1',
+`ifelse($1, 0, %v0, $1, 1, %v1, $1, 2, %v2, $1, 3, %v3, $1, 4, %v4, $1, 5, %v5, $1, 6, %v6, $1, 7, %v7, $1, 8, %v8, $1, 9, %v9, $1, 10, %v10, $1, 11, %v11, $1, 12, %v12, $1, 13, %v13, $1, 14, %v14, $1, 15, %v15)')
+define(`P2',
+`ifelse($1, 0, %v0, $1, 1, %v5, $1, 2, %v10, $1, 3, %v15, $1, 4, %v4, $1, 5, %v9, $1, 6, %v14, $1, 7, %v3, $1, 8, %v8, $1, 9, %v13, $1, 10, %v2, $1, 11, %v7, $1, 12, %v12, $1, 13, %v1, $1, 14, %v6, $1, 15, %v11)')
+
C Main loop for round
define(`QR',`
- vaf $1, $1, $2
- vaf $5, $5, $6
- vaf $9, $9, $10
- vaf $13, $13, $14
- vx $4, $4, $1
- vx $8, $8, $5
- vx $12, $12, $9
- vx $16, $16, $13
- verllf $4, $4, 16
- verllf $8, $8, 16
- verllf $12, $12, 16
- verllf $16, $16, 16
-
- vaf $3, $3, $4
- vaf $7, $7, $8
- vaf $11, $11, $12
- vaf $15, $15, $16
- vx $2, $2, $3
- vx $6, $6, $7
- vx $10, $10, $11
- vx $14, $14, $15
- verllf $2, $2, 12
- verllf $6, $6, 12
- verllf $10, $10, 12
- verllf $14, $14, 12
-
- vaf $1, $1, $2
- vaf $5, $5, $6
- vaf $9, $9, $10
- vaf $13, $13, $14
- vx $4, $4, $1
- vx $8, $8, $5
- vx $12, $12, $9
- vx $16, $16, $13
- verllf $4, $4, 8
- verllf $8, $8, 8
- verllf $12, $12, 8
- verllf $16, $16, 8
-
- vaf $3, $3, $4
- vaf $7, $7, $8
- vaf $11, $11, $12
- vaf $15, $15, $16
- vx $2, $2, $3
- vx $6, $6, $7
- vx $10, $10, $11
- vx $14, $14, $15
- verllf $2, $2, 7
- verllf $6, $6, 7
- verllf $10, $10, 7
- verllf $14, $14, 7
+ vaf $1(0), $1(0), $1(1)
+ vaf $1(4), $1(4), $1(5)
+ vaf $1(8), $1(8), $1(9)
+ vaf $1(12), $1(12), $1(13)
+ vx $1(3), $1(3), $1(0)
+ vx $1(7), $1(7), $1(4)
+ vx $1(11), $1(11), $1(8)
+ vx $1(15), $1(15), $1(12)
+ verllf $1(3), $1(3), 16
+ verllf $1(7), $1(7), 16
+ verllf $1(11), $1(11), 16
+ verllf $1(15), $1(15), 16
+
+ vaf $1(2), $1(2), $1(3)
+ vaf $1(6), $1(6), $1(7)
+ vaf $1(10), $1(10), $1(11)
+ vaf $1(14), $1(14), $1(15)
+ vx $1(1), $1(1), $1(2)
+ vx $1(5), $1(5), $1(6)
+ vx $1(9), $1(9), $1(10)
+ vx $1(13), $1(13), $1(14)
+ verllf $1(1), $1(1), 12
+ verllf $1(5), $1(5), 12
+ verllf $1(9), $1(9), 12
+ verllf $1(13), $1(13), 12
+
+ vaf $1(0), $1(0), $1(1)
+ vaf $1(4), $1(4), $1(5)
+ vaf $1(8), $1(8), $1(9)
+ vaf $1(12), $1(12), $1(13)
+ vx $1(3), $1(3), $1(0)
+ vx $1(7), $1(7), $1(4)
+ vx $1(11), $1(11), $1(8)
+ vx $1(15), $1(15), $1(12)
+ verllf $1(3), $1(3), 8
+ verllf $1(7), $1(7), 8
+ verllf $1(11), $1(11), 8
+ verllf $1(15), $1(15), 8
+
+ vaf $1(2), $1(2), $1(3)
+ vaf $1(6), $1(6), $1(7)
+ vaf $1(10), $1(10), $1(11)
+ vaf $1(14), $1(14), $1(15)
+ vx $1(1), $1(1), $1(2)
+ vx $1(5), $1(5), $1(6)
+ vx $1(9), $1(9), $1(10)
+ vx $1(13), $1(13), $1(14)
+ verllf $1(1), $1(1), 7
+ verllf $1(5), $1(5), 7
+ verllf $1(9), $1(9), 7
+ verllf $1(13), $1(13), 7
')
define(`TRANSPOSE',`
@@ -176,8 +183,8 @@
srlg ROUNDS, ROUNDS, 1
.Loop:
- QR(%v0, %v1, %v2, %v3, %v4, %v5, %v6, %v7, %v8, %v9, %v10, %v11, %v12, %v13, %v14, %v15)
- QR(%v0, %v5, %v10, %v15, %v4, %v9, %v14, %v3, %v8, %v13, %v2, %v7, %v12, %v1, %v6, %v11)
+ QR(`P1')
+ QR(`P2')
brctg ROUNDS, .Loop
C Add in saved original words, including counters, before
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package yast2-trans for openSUSE:Factory checked in at 2022-07-31 23:00:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-trans (Old)
and /work/SRC/openSUSE:Factory/.yast2-trans.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-trans"
Sun Jul 31 23:00:53 2022 rev:263 rq:991714 version:84.87.20220729.608d4643aa
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-trans/yast2-trans.changes 2022-07-12 11:11:57.319660431 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-trans.new.1533/yast2-trans.changes 2022-07-31 23:01:09.287728495 +0200
@@ -1,0 +2,21 @@
+Fri Jul 29 12:36:40 UTC 2022 - git(a)opensuse.org
+
+- Update to version 84.87.20220729.608d4643aa:
+ * Translated using Weblate (Dutch)
+ * Translated using Weblate (Catalan)
+ * Translated using Weblate (Japanese)
+ * New POT for text domain 'base'.
+ * New POT for text domain 'auth-client'.
+ * Translated using Weblate (Czech)
+ * Translated using Weblate (Czech)
+ * New POT for text domain 'base'.
+ * Translated using Weblate (Slovak)
+ * Translated using Weblate (Dutch)
+ * Translated using Weblate (Catalan)
+ * Translated using Weblate (Japanese)
+ * New POT for text domain 'journal'.
+ * New POT for text domain 'pam'.
+ * New POT for text domain 'control'.
+ * New POT for text domain 'autoinst'.
+
+-------------------------------------------------------------------
Old:
----
yast2-trans-84.87.20220709.5ead98f887.tar.xz
New:
----
yast2-trans-84.87.20220729.608d4643aa.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-trans.spec ++++++
--- /var/tmp/diff_new_pack.PKedd1/_old 2022-07-31 23:01:10.019730621 +0200
+++ /var/tmp/diff_new_pack.PKedd1/_new 2022-07-31 23:01:10.023730632 +0200
@@ -17,7 +17,7 @@
Name: yast2-trans
-Version: 84.87.20220709.5ead98f887
+Version: 84.87.20220729.608d4643aa
Release: 0
Summary: YaST2 - Translation Container Package
License: GPL-2.0-or-later
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.PKedd1/_old 2022-07-31 23:01:10.091730831 +0200
+++ /var/tmp/diff_new_pack.PKedd1/_new 2022-07-31 23:01:10.095730842 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/yast/yast-translations.git</param>
- <param name="changesrevision">5ead98f887fa72a491256a3cd86e375a7593ff09</param></service></servicedata>
+ <param name="changesrevision">608d4643aab9b2dbde7c3c0cd2934584a5dfabc5</param></service></servicedata>
(No newline at EOF)
++++++ yast2-trans-84.87.20220709.5ead98f887.tar.xz -> yast2-trans-84.87.20220729.608d4643aa.tar.xz ++++++
/work/SRC/openSUSE:Factory/yast2-trans/yast2-trans-84.87.20220709.5ead98f887.tar.xz /work/SRC/openSUSE:Factory/.yast2-trans.new.1533/yast2-trans-84.87.20220729.608d4643aa.tar.xz differ: char 27, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libstorage-ng for openSUSE:Factory checked in at 2022-07-31 23:00:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libstorage-ng (Old)
and /work/SRC/openSUSE:Factory/.libstorage-ng.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage-ng"
Sun Jul 31 23:00:51 2022 rev:178 rq:991670 version:4.5.33
Changes:
--------
--- /work/SRC/openSUSE:Factory/libstorage-ng/libstorage-ng.changes 2022-07-26 19:42:52.678142894 +0200
+++ /work/SRC/openSUSE:Factory/.libstorage-ng.new.1533/libstorage-ng.changes 2022-07-31 23:01:07.043721975 +0200
@@ -1,0 +2,16 @@
+Fri Jul 29 07:16:59 UTC 2022 - aschnell(a)suse.com
+
+- merge gh#openSUSE/libstorage-ng#892
+- continue flushing pending holders if a device cannot be found
+ (see bsc#1201880)
+- coding style
+- removed unneeded mockups
+- 4.5.33
+
+--------------------------------------------------------------------
+Thu Jul 28 16:19:14 UTC 2022 - opensuse-packaging(a)opensuse.org
+
+- Translated using Weblate (Czech) (bsc#1149754)
+- 4.5.32
+
+--------------------------------------------------------------------
Old:
----
libstorage-ng-4.5.31.tar.xz
New:
----
libstorage-ng-4.5.33.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libstorage-ng.spec ++++++
--- /var/tmp/diff_new_pack.9oqopt/_old 2022-07-31 23:01:07.683723834 +0200
+++ /var/tmp/diff_new_pack.9oqopt/_new 2022-07-31 23:01:07.691723857 +0200
@@ -18,7 +18,7 @@
%define libname %{name}1
Name: libstorage-ng
-Version: 4.5.31
+Version: 4.5.33
Release: 0
Summary: Library for storage management
License: GPL-2.0-only
++++++ libstorage-ng-4.5.31.tar.xz -> libstorage-ng-4.5.33.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.31/VERSION new/libstorage-ng-4.5.33/VERSION
--- old/libstorage-ng-4.5.31/VERSION 2022-07-25 14:16:19.000000000 +0200
+++ new/libstorage-ng-4.5.33/VERSION 2022-07-29 09:16:59.000000000 +0200
@@ -1 +1 @@
-4.5.31
+4.5.33
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.31/po/cs.po new/libstorage-ng-4.5.33/po/cs.po
--- old/libstorage-ng-4.5.31/po/cs.po 2022-07-25 14:16:19.000000000 +0200
+++ new/libstorage-ng-4.5.33/po/cs.po 2022-07-29 09:16:59.000000000 +0200
@@ -13,10 +13,10 @@
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-06-03 14:35+0200\n"
-"PO-Revision-Date: 2022-04-06 23:12+0000\n"
-"Last-Translator: Jan Pape�� <honyczek(a)centrum.cz>\n"
-"Language-Team: Czech <https://l10n.opensuse.org/projects/libstorage/ng-"
-"master/cs/>\n"
+"PO-Revision-Date: 2022-07-28 19:12+0000\n"
+"Last-Translator: Ale�� Kastner <alkas(a)volny.cz>\n"
+"Language-Team: Czech <https://l10n.opensuse.org/projects/libstorage/"
+"ng-master/cs/>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -115,14 +115,14 @@
"%3$s"
#. TRANSLATORS: progress message
-#, fuzzy, c-format
+#, c-format
msgid "Activating BitLocker %s"
-msgstr "Aktivuji LUKS %s"
+msgstr "Aktivuje se Bitlocker %s"
#. TRANSLATORS: error message
-#, fuzzy, c-format
+#, c-format
msgid "Activating BitLocker %s failed"
-msgstr "Aktivace LUKS %s selhala"
+msgstr "Aktivace Bitlocker %s selhala"
#. TRANSLATORS: progress message
#, c-format
@@ -2241,7 +2241,7 @@
#. TRANSLATORS: name of partition type
msgid "Linux Server Data"
-msgstr ""
+msgstr "Data serveru Linux"
#. TRANSLATORS: name of partition type
msgid "Linux Swap"
@@ -2392,7 +2392,7 @@
#. TRANSLATORS: name of object
msgid "NILFS2"
-msgstr ""
+msgstr "NILFS2"
#. TRANSLATORS: name of object
msgid "NTFS"
@@ -2426,14 +2426,12 @@
msgid "Plain Encryption"
msgstr "Prost�� ��ifrov��n��"
-#, fuzzy
msgid "Probing BitLocker"
-msgstr "BitLocker"
+msgstr "Kontrola BitLocker"
#. TRANSLATORS: error message
-#, fuzzy
msgid "Probing BitLocker failed"
-msgstr "Testov��n�� disk�� selhalo"
+msgstr "Kontrola BitLocker selhala"
#. TRANSLATORS: error message
#, c-format
@@ -3228,7 +3226,7 @@
#. TRANSLATORS: name of partition type
msgid "Unknown"
-msgstr ""
+msgstr "Nezn��m��"
#. TRANSLATORS: displayed before action,
#. %1$s is replaced by one or more device names (e.g /dev/sda1 (1.00 GiB)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.31/storage/Devices/BitlockerV2Impl.cc new/libstorage-ng-4.5.33/storage/Devices/BitlockerV2Impl.cc
--- old/libstorage-ng-4.5.31/storage/Devices/BitlockerV2Impl.cc 2022-07-25 14:16:19.000000000 +0200
+++ new/libstorage-ng-4.5.33/storage/Devices/BitlockerV2Impl.cc 2022-07-29 09:16:59.000000000 +0200
@@ -100,7 +100,7 @@
if (!uuid.empty())
ret = "UUID=" + uuid;
else
- y2war("no uuid defined, using fallback");
+ y2war("no bitlocker uuid defined, using fallback");
break;
case MountByType::LABEL:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.31/storage/Devices/EncryptionImpl.cc new/libstorage-ng-4.5.33/storage/Devices/EncryptionImpl.cc
--- old/libstorage-ng-4.5.31/storage/Devices/EncryptionImpl.cc 2022-07-25 14:16:19.000000000 +0200
+++ new/libstorage-ng-4.5.33/storage/Devices/EncryptionImpl.cc 2022-07-29 09:16:59.000000000 +0200
@@ -165,11 +165,11 @@
switch (mount_by_type)
{
case MountByType::UUID:
- y2war("no uuid possible, using fallback");
+ y2war("no encryption uuid possible, using fallback");
break;
case MountByType::LABEL:
- y2war("no label possible, using fallback");
+ y2war("no encryption label possible, using fallback");
break;
case MountByType::ID:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.31/storage/Devices/LuksImpl.cc new/libstorage-ng-4.5.33/storage/Devices/LuksImpl.cc
--- old/libstorage-ng-4.5.31/storage/Devices/LuksImpl.cc 2022-07-25 14:16:19.000000000 +0200
+++ new/libstorage-ng-4.5.33/storage/Devices/LuksImpl.cc 2022-07-29 09:16:59.000000000 +0200
@@ -130,14 +130,14 @@
if (!uuid.empty())
ret = "UUID=" + uuid;
else
- y2war("no uuid defined, using fallback");
+ y2war("no luks uuid defined, using fallback");
break;
case MountByType::LABEL:
if (!label.empty())
ret = "LABEL=" + label;
else
- y2war("no label defined, using fallback");
+ y2war("no luks label defined, using fallback");
break;
case MountByType::ID:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.31/storage/Devices/Partition.h new/libstorage-ng-4.5.33/storage/Devices/Partition.h
--- old/libstorage-ng-4.5.31/storage/Devices/Partition.h 2022-07-25 14:16:19.000000000 +0200
+++ new/libstorage-ng-4.5.33/storage/Devices/Partition.h 2022-07-29 09:16:59.000000000 +0200
@@ -341,7 +341,7 @@
* Get the partition label. Can be empty. Only available for partitions on GPT.
*
* In the UEFI spec this is called name instead of label. But many tools,
- * e.g. udev and blkid, use label.
+ * e.g. udev and blkid, use label. Also in fstab PARTLABEL= is used.
*/
const std::string& get_label() const;
@@ -353,7 +353,7 @@
void set_label(const std::string& label);
/**
- * Get the partition UUID. Only available for partitions on GPT.
+ * Get the partition UUID. Only available for partitions on GPT. Experimental.
*/
const std::string& get_uuid() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.31/storage/Devices/PartitionImpl.cc new/libstorage-ng-4.5.33/storage/Devices/PartitionImpl.cc
--- old/libstorage-ng-4.5.31/storage/Devices/PartitionImpl.cc 2022-07-25 14:16:19.000000000 +0200
+++ new/libstorage-ng-4.5.33/storage/Devices/PartitionImpl.cc 2022-07-29 09:16:59.000000000 +0200
@@ -135,8 +135,8 @@
// would be required (even in fstab) when a logical partition
// gets renumbered. For UUIDs a rather odd behaviour.
- if (!cmd_udevadm_info.get_by_part_uuid_links().empty() && is_gpt(partition_table))
- uuid = cmd_udevadm_info.get_by_part_uuid_links().front();
+ if (!cmd_udevadm_info.get_by_partuuid_links().empty() && is_gpt(partition_table))
+ uuid = cmd_udevadm_info.get_by_partuuid_links().front();
probe_topology(prober);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.31/storage/Filesystems/BlkFilesystemImpl.cc new/libstorage-ng-4.5.33/storage/Filesystems/BlkFilesystemImpl.cc
--- old/libstorage-ng-4.5.31/storage/Filesystems/BlkFilesystemImpl.cc 2022-07-25 14:16:19.000000000 +0200
+++ new/libstorage-ng-4.5.33/storage/Filesystems/BlkFilesystemImpl.cc 2022-07-29 09:16:59.000000000 +0200
@@ -669,18 +669,18 @@
{
case MountByType::UUID:
if (!is_permanent())
- y2war("no uuid possible for non-permanent filesystem, using fallback mount-by");
+ y2war("no filesystem uuid possible for non-permanent filesystem, using fallback mount-by");
else if (uuid.empty())
- y2war("no uuid defined, using fallback mount-by");
+ y2war("no filesystem uuid defined, using fallback mount-by");
else
ret = "UUID=" + uuid;
break;
case MountByType::LABEL:
if (!is_permanent())
- y2war("no label possible for non-permanent filesystem, using fallback mount-by");
+ y2war("no filesystem label possible for non-permanent filesystem, using fallback mount-by");
else if (label.empty())
- y2war("no label defined, using fallback mount-by");
+ y2war("no filesystem label defined, using fallback mount-by");
else
ret = "LABEL=" + label;
break;
@@ -752,7 +752,7 @@
vector<ExtendedFstabEntry> ret;
for (const BlkDevice* blk_device : get_blk_devices())
- {
+ {
for (const FstabEntry* fstab_entry : proc_mounts.get_by_name(blk_device->get_name(), system_info))
{
// See find_etc_fstab_entries_unfiltered().
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.31/storage/Prober.cc new/libstorage-ng-4.5.33/storage/Prober.cc
--- old/libstorage-ng-4.5.31/storage/Prober.cc 2022-07-25 14:16:19.000000000 +0200
+++ new/libstorage-ng-4.5.33/storage/Prober.cc 2022-07-29 09:16:59.000000000 +0200
@@ -29,6 +29,7 @@
#include "storage/Utils/StorageDefines.h"
#include "storage/Utils/CallbacksImpl.h"
#include "storage/Utils/SystemCmd.h"
+#include "storage/Utils/Format.h"
#include "storage/StorageImpl.h"
#include "storage/DevicegraphImpl.h"
#include "storage/Devices/DiskImpl.h"
@@ -538,6 +539,8 @@
void
Prober::flush_pending_holders()
{
+ y2mil("flushing " << pending_holders.size() << " pending holders");
+
for (const pending_holder_t& pending_holder : pending_holders)
{
try
@@ -552,7 +555,10 @@
y2err("failed to find " << pending_holder.name << " for "
<< pending_holder.b->get_displayname());
- ST_RETHROW(exception);
+ // TRANSLATORS: error message
+ Text message = sformat(_("Failed to find device %s"), pending_holder.name);
+
+ error_callback(probe_callbacks, message, exception);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.31/storage/SystemInfo/CmdUdevadm.cc new/libstorage-ng-4.5.33/storage/SystemInfo/CmdUdevadm.cc
--- old/libstorage-ng-4.5.31/storage/SystemInfo/CmdUdevadm.cc 2022-07-25 14:16:19.000000000 +0200
+++ new/libstorage-ng-4.5.33/storage/SystemInfo/CmdUdevadm.cc 2022-07-29 09:16:59.000000000 +0200
@@ -72,8 +72,8 @@
const Link links[] = {
{ "S: disk/by-path/", by_path_links },
{ "S: disk/by-id/", by_id_links },
- { "S: disk/by-partlabel/", by_part_label_links },
- { "S: disk/by-partuuid/", by_part_uuid_links }
+ { "S: disk/by-partlabel/", by_partlabel_links },
+ { "S: disk/by-partuuid/", by_partuuid_links }
};
for (const string& line : stdout)
@@ -127,11 +127,11 @@
if (!cmd_udevadm_info.by_id_links.empty())
s << " by-id-links:" << cmd_udevadm_info.by_id_links;
- if (!cmd_udevadm_info.by_part_label_links.empty())
- s << " by-part-label-links:" << cmd_udevadm_info.by_part_label_links;
+ if (!cmd_udevadm_info.by_partlabel_links.empty())
+ s << " by-partlabel-links:" << cmd_udevadm_info.by_partlabel_links;
- if (!cmd_udevadm_info.by_part_uuid_links.empty())
- s << " by-part-uuid-links:" << cmd_udevadm_info.by_part_uuid_links;
+ if (!cmd_udevadm_info.by_partuuid_links.empty())
+ s << " by-partuuid-links:" << cmd_udevadm_info.by_partuuid_links;
s << '\n';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.31/storage/SystemInfo/CmdUdevadm.h new/libstorage-ng-4.5.33/storage/SystemInfo/CmdUdevadm.h
--- old/libstorage-ng-4.5.31/storage/SystemInfo/CmdUdevadm.h 2022-07-25 14:16:19.000000000 +0200
+++ new/libstorage-ng-4.5.33/storage/SystemInfo/CmdUdevadm.h 2022-07-29 09:16:59.000000000 +0200
@@ -59,8 +59,7 @@
const vector<string>& get_by_path_links() const { return by_path_links; }
const vector<string>& get_by_id_links() const { return by_id_links; }
- const vector<string>& get_by_part_label_links() const { return by_part_label_links; }
- const vector<string>& get_by_part_uuid_links() const { return by_part_uuid_links; }
+ const vector<string>& get_by_partuuid_links() const { return by_partuuid_links; }
friend std::ostream& operator<<(std::ostream& s, const CmdUdevadmInfo& cmd_udevadm_info);
@@ -79,8 +78,8 @@
vector<string> by_path_links;
vector<string> by_id_links;
- vector<string> by_part_label_links;
- vector<string> by_part_uuid_links;
+ vector<string> by_partlabel_links;
+ vector<string> by_partuuid_links;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.31/testsuite/probe/integrity-mockup.xml new/libstorage-ng-4.5.33/testsuite/probe/integrity-mockup.xml
--- old/libstorage-ng-4.5.31/testsuite/probe/integrity-mockup.xml 2022-07-25 14:16:19.000000000 +0200
+++ new/libstorage-ng-4.5.33/testsuite/probe/integrity-mockup.xml 2022-07-29 09:16:59.000000000 +0200
@@ -21,18 +21,6 @@
<stdout>dm-3</stdout>
</Command>
<Command>
- <name>/bin/mount --read-only '/dev/mapper/crypto' '/tmp/libstorage-UESimc/tmp-mount-9AqL85' -o subvol=/</name>
- </Command>
- <Command>
- <name>/bin/mount --read-only '/dev/mapper/crypto' '/tmp/libstorage-UESimc/tmp-mount-gPRoAq' -o subvol=/</name>
- </Command>
- <Command>
- <name>/bin/umount '/tmp/libstorage-UESimc/tmp-mount-9AqL85'</name>
- </Command>
- <Command>
- <name>/bin/umount '/tmp/libstorage-UESimc/tmp-mount-gPRoAq'</name>
- </Command>
- <Command>
<name>/sbin/blkid -c '/dev/null'</name>
<stdout>/dev/loop1: UUID="9da09aa7-eb1d-48ca-b39d-4211bf9b8419" BLOCK_SIZE="4096" TYPE="ext4"</stdout>
<stdout>/dev/mapper/live-base: UUID="9da09aa7-eb1d-48ca-b39d-4211bf9b8419" BLOCK_SIZE="4096" TYPE="ext4"</stdout>
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package bindfs for openSUSE:Factory checked in at 2022-07-31 23:00:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bindfs (Old)
and /work/SRC/openSUSE:Factory/.bindfs.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bindfs"
Sun Jul 31 23:00:52 2022 rev:23 rq:991699 version:1.17.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/bindfs/bindfs.changes 2021-03-10 08:48:09.898326006 +0100
+++ /work/SRC/openSUSE:Factory/.bindfs.new.1533/bindfs.changes 2022-07-31 23:01:08.235725438 +0200
@@ -1,0 +2,6 @@
+Fri Jul 29 10:26:36 UTC 2022 - Jan Engelhardt <jengelh(a)inai.de>
+
+- Update to release 1.17.0
+ * Added --map-{passwd,group}-rev
+
+-------------------------------------------------------------------
Old:
----
bindfs-1.15.1.tar.gz
New:
----
bindfs-1.17.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bindfs.spec ++++++
--- /var/tmp/diff_new_pack.4jBzLM/_old 2022-07-31 23:01:08.683726740 +0200
+++ /var/tmp/diff_new_pack.4jBzLM/_new 2022-07-31 23:01:08.687726751 +0200
@@ -1,7 +1,7 @@
#
# spec file for package bindfs
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: bindfs
-Version: 1.15.1
+Version: 1.17.0
Release: 0
Summary: Filesystem for mapping directories with alternate permissions
License: GPL-2.0-or-later
++++++ bindfs-1.15.1.tar.gz -> bindfs-1.17.0.tar.gz ++++++
++++ 17528 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bindfs-1.15.1/ChangeLog new/bindfs-1.17.0/ChangeLog
--- old/bindfs-1.15.1/ChangeLog 2021-02-15 04:35:51.000000000 +0100
+++ new/bindfs-1.17.0/ChangeLog 2022-07-12 20:31:10.000000000 +0200
@@ -1,3 +1,26 @@
+2022-07-12 Martin P��rtel <martin dot partel at gmail dot com>
+
+ * Reverted change in 1.16.0 that made direct_io the default.
+ It turned out to be more problematic than not having it.
+ (issue #117, thanks @DUOLabs333 and @Misterio77)
+ * Released 1.17.0
+
+2022-06-24 Martin P��rtel <martin dot partel at gmail dot com>
+
+ * Added --map-{passwd,group}-rev
+ (PR #113 by @sshilovsky, thanks!)
+ * Fixed build on FreeBSD
+ * Released 1.16.1
+
+2022-06-18 Martin P��rtel <martin dot partel at gmail dot com>
+
+ * Released 1.16.0
+
+2022-04-03 Martin P��rtel <martin dot partel at gmail dot com>
+
+ * Added --no-direct-io and enabled FUSE's direct_io by default
+ (issue #110, thanks @DUOLabs333)
+
2021-02-15 Martin P��rtel <martin dot partel at gmail dot com>
* Fixed build on old compilers by adhering more strictly to C99.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bindfs-1.15.1/README.md new/bindfs-1.17.0/README.md
--- old/bindfs-1.15.1/README.md 2021-02-15 04:35:51.000000000 +0100
+++ new/bindfs-1.17.0/README.md 2022-07-12 20:31:10.000000000 +0200
@@ -29,6 +29,7 @@
Then compile and install as usual:
+ ./autogen.sh # Only needed if you cloned the repo.
./configure
make
make install
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bindfs-1.15.1/compile new/bindfs-1.17.0/compile
--- old/bindfs-1.15.1/compile 2021-02-15 04:35:55.000000000 +0100
+++ new/bindfs-1.17.0/compile 2022-07-12 20:31:13.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey(a)cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@
MINGW*)
file_conv=mingw
;;
- CYGWIN*)
+ CYGWIN* | MSYS*)
file_conv=cygwin
;;
*)
@@ -67,7 +67,7 @@
mingw/*)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
- cygwin/*)
+ cygwin/* | msys/*)
file=`cygpath -m "$file" || echo "$file"`
;;
wine/*)
@@ -255,7 +255,8 @@
echo "compile $scriptversion"
exit $?
;;
- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+ icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
@@ -339,9 +340,9 @@
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bindfs-1.15.1/config.h.in new/bindfs-1.17.0/config.h.in
--- old/bindfs-1.15.1/config.h.in 2021-02-15 04:35:54.000000000 +0100
+++ new/bindfs-1.17.0/config.h.in 2022-07-12 20:31:12.000000000 +0200
@@ -39,9 +39,6 @@
/* Define to 1 if you have the `lutimes' function. */
#undef HAVE_LUTIMES
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
/* Define to 1 if you have the `removexattr' function. */
#undef HAVE_REMOVEXATTR
@@ -54,6 +51,9 @@
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
+/* Define to 1 if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
+
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
@@ -102,7 +102,9 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-/* Define to 1 if you have the ANSI C header files. */
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+ required in a freestanding environment). This macro is provided for
+ backward compatibility; new code need not use it. */
#undef STDC_HEADERS
/* Version number of package */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bindfs-1.15.1/configure.ac new/bindfs-1.17.0/configure.ac
--- old/bindfs-1.15.1/configure.ac 2021-02-15 04:35:51.000000000 +0100
+++ new/bindfs-1.17.0/configure.ac 2022-07-12 20:31:10.000000000 +0200
@@ -1,4 +1,4 @@
-AC_INIT([bindfs],[1.15.1],[martin.partel(a)gmail.com])
+AC_INIT([bindfs],[1.17.0],[martin.partel(a)gmail.com])
AM_INIT_AUTOMAKE([foreign serial-tests])
AC_CONFIG_HEADERS([config.h])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bindfs-1.15.1/missing new/bindfs-1.17.0/missing
--- old/bindfs-1.15.1/missing 2021-02-15 04:35:55.000000000 +0100
+++ new/bindfs-1.17.0/missing 2022-07-12 20:31:13.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -101,9 +101,9 @@
exit $st
fi
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
program_details ()
{
@@ -207,9 +207,9 @@
exit $st
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bindfs-1.15.1/releasescript/makerelease.sh new/bindfs-1.17.0/releasescript/makerelease.sh
--- old/bindfs-1.15.1/releasescript/makerelease.sh 2021-02-15 04:35:51.000000000 +0100
+++ new/bindfs-1.17.0/releasescript/makerelease.sh 2022-07-12 20:31:10.000000000 +0200
@@ -6,7 +6,7 @@
fi
VERSION="$1"
-REPO_URL="git://github.com/mpartel/bindfs.git"
+REPO_URL="git@github.com:mpartel/bindfs"
umask 0022
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bindfs-1.15.1/src/bindfs.1 new/bindfs-1.17.0/src/bindfs.1
--- old/bindfs-1.15.1/src/bindfs.1 2021-02-15 04:35:51.000000000 +0100
+++ new/bindfs-1.17.0/src/bindfs.1 2022-07-12 20:31:10.000000000 +0200
@@ -11,9 +11,7 @@
.SH DESCRIPTION
A FUSE filesystem for mirroring the contents of a directory to another
-directory. Additionally, one can change the permissions
-of files in the mirrored directory.
-
+directory, with changes to permissions and other features.
.SH FILE OWNERSHIP
.TP
@@ -66,21 +64,44 @@
the corresponding behavior of this option.
Requires mounting as root.
+
.TP
.B \-\-map-passwd=\fI<passwdfile>\fP, \-o map-passwd=\fI<passwdfile>\fP
.PD 0
.TP
.B \-\-map-group=\fI<groupfile>\fP, \-o map-group=\fI<groupfile>\fP
-Like \fB--map=...\fP, but reads the UID/GID mapping from passwd and group
-files (like \fI/etc/passwd\fP and \fI/etc/group\fP). Helpful to restore
-system backups where UIDs/GIDs differ.
+Like \fB--map=...\fP, but reads the UID (GID) mapping from passwd (group) file
+(like \fI/etc/passwd\fP and \fI/etc/group\fP). Maps UID (GID) provided in the
+\fI<passwdfile>\fP (\fI<groupfile>\fP) to its corresponding user (group) name.
+Helpful to restore system backups where UIDs and GIDs differ.
Example usage:
\& bindfs --map-passwd=/mnt/orig/etc/passwd \\
.br
-\& \--map-passwd=/mnt/orig/etc/group \\
-.br
+\& \--map-group=/mnt/orig/etc/group \\
+.br
+\& /mnt/orig /mnt/mapped
+
+Requires mounting as root.
+
+.TP
+.B \-\-map-passwd-rev=\fI<passwdfile>\fP, \-o map-passwd-rev=\fI<passwdfile>\fP
+.PD 0
+.TP
+.B \-\-map-group-rev=\fI<groupfile>\fP, \-o map-group-rev=\fI<groupfile>\fP
+Reversed variant of \fB--map-passwd\fP and \fB--map-group\fP. Like
+\fB--map=...\fP, but reads the UID (GID) mapping from passwd (group) files
+(like \fI/etc/passwd\fP and \fI/etc/group\fP). Maps user (group) name provided
+in the \fI<passwdfile>\fP (\fI<groupfile>\fP) to its corresponding UID (GID).
+Helpful to create compatible chroot environments where UIDs and GIDs differ.
+
+Example usage:
+
+\& bindfs --map-passwd-rev=/mnt/mapped/etc/passwd \\
+.br
+\& \--map-group-rev=/mnt/mapped/etc/group \\
+.br
\& /mnt/orig /mnt/mapped
Requires mounting as root.
@@ -389,6 +410,19 @@
a security risk for some use cases. See \fB\%BUGS\fP below.
.TP
+.B \-\-direct\-io, \-o direct\-io
+
+Forwards each read/write operation 1:1 to the underlying FS,
+disabling batching and caching by the kernel. Some applications may
+require this, however it may be incompatible with other applications,
+as currently it has issues with \fBmmap\fP(2) calls, at least.
+
+.TP
+.B \-\-no\-direct\-io, \-o no\-direct\-io
+
+This option is provided in case the default changes in the future.
+
+.TP
.B \-\-forward\-odirect=\fIalignment\fP, \-o forward\-odirect=\fIalignment\fP
Enable experimental \fBO_DIRECT\fP forwarding, with all read/write requests rounded
to the given alignment (in bytes). By default, the \fBO_DIRECT\fP flag is
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bindfs-1.15.1/src/bindfs.c new/bindfs-1.17.0/src/bindfs.c
--- old/bindfs-1.15.1/src/bindfs.c 2021-02-15 04:35:51.000000000 +0100
+++ new/bindfs-1.17.0/src/bindfs.c 2022-07-12 20:31:10.000000000 +0200
@@ -203,6 +203,8 @@
#ifdef __linux__
int forward_odirect;
size_t odirect_alignment;
+
+ bool direct_io;
#endif
uid_t uid_offset;
@@ -221,13 +223,6 @@
/* Checks whether the uid is to be the mirrored owner of all files. */
static int is_mirrored_user(uid_t uid);
-#ifdef HAVE_FUSE_3
-#ifndef __NR_renameat2
-/* Returns the path to a temporary file inside the same directory as src_path */
-char *tmpnam_inpath(char *src_path);
-#endif
-#endif
-
/* Processes the virtual path to a real path. Always free() the result. */
static char *process_path(const char *path, bool resolve_symlinks);
@@ -377,66 +372,6 @@
return 0;
}
-#ifdef HAVE_FUSE_3
-#ifndef __NR_renameat2
-char *tmpnam_inpath(char *src_path)
-{
-
- char *res, tmp[L_tmpnam], *path, *fname, *tfname, *src_path_cpy, *src_path_cpy_1, *tmp_cpy;
- int i = 0;
-
- src_path_cpy = (char *) calloc((strlen(src_path)), sizeof(char));
- strcpy(src_path_cpy, src_path);
-
- src_path_cpy_1 = (char *) calloc((strlen(src_path)), sizeof(char));
- strcpy(src_path_cpy_1, src_path);
-
- path = dirname(src_path_cpy);
- fname = basename(src_path_cpy_1);
-
- tmpnam(tmp);
- tmp_cpy = (char *) calloc((strlen(tmp)), sizeof(char));
- strcpy(tmp_cpy, tmp);
-
- tfname = basename(tmp_cpy);
-
- res = (char *) calloc( (strlen(path) + 2 + strlen(tfname) + 1 + strlen(fname) + 1), sizeof(char));
-
- strcat(res, path);
- strcat(res, "/.");
- strcat(res, tfname);
- strcat(res, "~");
- strcat(res, fname);
-
- while (access( res, F_OK ) == 0 && i < 10) {
-
- tmpnam(tmp);
- tmp_cpy = (char *) calloc((strlen(tmp)), sizeof(char));
- strcpy(tmp_cpy, tmp);
-
- tfname = basename(tmp_cpy);
-
- res = (char *) calloc( (strlen(path) + 2 + strlen(tfname) + 1 + strlen(fname) + 1), sizeof(char));
-
- strcat(res, path);
- strcat(res, "/.");
- strcat(res, tfname);
- strcat(res, "~");
- strcat(res, fname);
-
- i++;
- }
-
- if (access( res, F_OK ) == 0) {
- return NULL;
- }
-
- return res;
-
-}
-#endif
-#endif
-
static char *process_path(const char *path, bool resolve_symlinks)
{
if (path == NULL) { /* possible? */
@@ -756,6 +691,9 @@
cfg->entry_timeout = 0;
cfg->attr_timeout = 0;
cfg->negative_timeout = 0;
+#ifdef __linux__
+ cfg->direct_io = settings.direct_io;
+#endif
#endif
assert(settings.permchain != NULL);
@@ -1349,6 +1287,9 @@
if (!settings.forward_odirect) {
flags &= ~O_DIRECT;
}
+#ifndef HAVE_FUSE_3 // With FUSE 3, we set this in bindfs_init
+ fi->direct_io = settings.direct_io;
+#endif
#endif
fd = open(real_path, flags);
@@ -1754,8 +1695,10 @@
" -M --mirror-only=... Like --mirror but disallow access for\n"
" all other users.\n"
" --map=user1/user2:... Let user2 see files of user1 as his own.\n"
- " --map-passwd=<passwdfile> Load uid mapping from <passwdfile>.\n"
- " --map-group=<groupfile> Load gid mapping from <groupfile>.\n"
+ " --map-passwd=... Load uid mapping from passwd-like file.\n"
+ " --map-group=... Load gid mapping from group-like file.\n"
+ " --map-passwd-rev=... Load reversed uid mapping from passwd-like file.\n"
+ " --map-group-rev=... Load reversed gid mapping from group-like file.\n"
" --uid-offset=... Set file uid = uid + offset.\n"
" --gid-offset=... Set file gid = gid + offset.\n"
"\n"
@@ -1813,7 +1756,7 @@
" --block-devices-as-files Show block devices as regular files.\n"
" --multithreaded Enable multithreaded mode. See man page\n"
" for security issue with current implementation.\n"
- " --forward-odirect=... Forward O_DIRECT (it's cleared by default).\n"
+ " --forward-odirect=... Forward O_DIRECT (it's cleared by default).\n"
"\n"
"FUSE options:\n"
" -o opt[,opt,...] Mount options.\n"
@@ -1857,7 +1800,9 @@
OPTKEY_ENABLE_IOCTL,
OPTKEY_HIDE_HARD_LINKS,
OPTKEY_RESOLVE_SYMLINKS,
- OPTKEY_BLOCK_DEVICES_AS_FILES
+ OPTKEY_BLOCK_DEVICES_AS_FILES,
+ OPTKEY_DIRECT_IO,
+ OPTKEY_NO_DIRECT_IO
};
static int process_option(void *data, const char *arg, int key,
@@ -1965,7 +1910,14 @@
case OPTKEY_BLOCK_DEVICES_AS_FILES:
settings.block_devices_as_files = 1;
return 0;
-
+#ifdef __linux__
+ case OPTKEY_DIRECT_IO:
+ settings.direct_io = true;
+ return 0;
+ case OPTKEY_NO_DIRECT_IO:
+ settings.direct_io = false;
+ return 0;
+#endif
case OPTKEY_NONOPTION:
if (!settings.mntsrc) {
if (strncmp(arg, "/proc/", strlen("/proc/")) == 0) {
@@ -2380,6 +2332,8 @@
char *map;
char *map_passwd;
char *map_group;
+ char *map_passwd_rev;
+ char *map_group_rev;
char *read_rate;
char *write_rate;
char *create_for_user;
@@ -2424,6 +2378,8 @@
OPT_OFFSET2("--map=%s", "map=%s", map, -1),
OPT_OFFSET2("--map-passwd=%s", "map-passwd=%s", map_passwd, -1),
OPT_OFFSET2("--map-group=%s", "map-group=%s", map_group, -1),
+ OPT_OFFSET2("--map-passwd-rev=%s", "map-passwd-rev=%s", map_passwd_rev, -1),
+ OPT_OFFSET2("--map-group-rev=%s", "map-group-rev=%s", map_group_rev, -1),
OPT_OFFSET3("-n", "--no-allow-other", "no-allow-other", no_allow_other, -1),
OPT_OFFSET2("--read-rate=%s", "read-rate=%s", read_rate, -1),
@@ -2455,6 +2411,10 @@
OPT2("--delete-deny", "delete-deny", OPTKEY_DELETE_DENY),
OPT2("--rename-deny", "rename-deny", OPTKEY_RENAME_DENY),
+#ifdef __linux__
+ OPT2("--direct-io", "direct-io", OPTKEY_DIRECT_IO),
+ OPT2("--no-direct-io", "no-direct-io", OPTKEY_NO_DIRECT_IO),
+#endif
OPT2("--hide-hard-links", "hide-hard-links", OPTKEY_HIDE_HARD_LINKS),
OPT2("--resolve-symlinks", "resolve-symlinks", OPTKEY_RESOLVE_SYMLINKS),
@@ -2522,6 +2482,7 @@
#ifdef __linux__
settings.forward_odirect = 0;
settings.odirect_alignment = 0;
+ settings.direct_io = false;
#endif
atexit(&atexit_func);
@@ -2600,6 +2561,17 @@
}
}
+ if (od.map_passwd_rev) {
+ if (getuid() != 0) {
+ fprintf(stderr, "Error: You need to be root to use --map-passwd-rev !\n");
+ return 1;
+ }
+ if (!parse_map_file(settings.usermap_reverse, settings.usermap, od.map_passwd_rev, 0)) {
+ /* parse_map_file printed an error */
+ return 1;
+ }
+ }
+
/* Parse group */
if (od.map_group) {
if (getuid() != 0) {
@@ -2612,6 +2584,16 @@
}
}
+ if (od.map_group_rev) {
+ if (getuid() != 0) {
+ fprintf(stderr, "Error: You need to be root to use --map-group-rev !\n");
+ return 1;
+ }
+ if (!parse_map_file(settings.usermap_reverse, settings.usermap, od.map_group_rev, 1)) {
+ /* parse_map_file printed an error */
+ return 1;
+ }
+ }
/* Parse usermap (may overwrite values from --map-passwd and --map-group) */
if (od.map) {
if (getuid() != 0) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bindfs-1.15.1/test-all.sh new/bindfs-1.17.0/test-all.sh
--- old/bindfs-1.15.1/test-all.sh 2021-02-15 04:35:51.000000000 +0100
+++ new/bindfs-1.17.0/test-all.sh 2022-07-12 20:31:10.000000000 +0200
@@ -10,4 +10,4 @@
sudo ./test_bindfs.rb --valgrind
else
echo "Valgrind not installed. Not running tests with Valgrind."
-end
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bindfs-1.15.1/tests/common.rb new/bindfs-1.17.0/tests/common.rb
--- old/bindfs-1.15.1/tests/common.rb 2021-02-15 04:35:51.000000000 +0100
+++ new/bindfs-1.17.0/tests/common.rb 2022-07-12 20:31:10.000000000 +0200
@@ -108,15 +108,15 @@
mntdir = options[:mntdir_name]
begin
- Dir.mkdir TESTDIR_NAME
+ FileUtils.mkdir_p TESTDIR_NAME
rescue Exception => ex
fail!("ERROR creating testdir at #{TESTDIR_NAME}", ex)
end
begin
Dir.chdir TESTDIR_NAME
- Dir.mkdir srcdir
- Dir.mkdir mntdir
+ FileUtils.mkdir_p srcdir
+ FileUtils.mkdir_p mntdir
rescue Exception => ex
fail!("ERROR preparing testdir at #{TESTDIR_NAME}", ex)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bindfs-1.15.1/tests/odirect_write.c new/bindfs-1.17.0/tests/odirect_write.c
--- old/bindfs-1.15.1/tests/odirect_write.c 2021-02-15 04:35:51.000000000 +0100
+++ new/bindfs-1.17.0/tests/odirect_write.c 2022-07-12 20:31:10.000000000 +0200
@@ -57,7 +57,7 @@
}
if (res != buf_size) {
// Too lazy to write a loop here unless it turns out to be necessary.
- fprintf(stderr, "Failed to write exactly %ld bytes", amt_read);
+ fprintf(stderr, "Failed to write exactly %lu bytes", (unsigned long)amt_read);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bindfs-1.15.1/tests/test_bindfs.rb new/bindfs-1.17.0/tests/test_bindfs.rb
--- old/bindfs-1.15.1/tests/test_bindfs.rb 2021-02-15 04:35:51.000000000 +0100
+++ new/bindfs-1.17.0/tests/test_bindfs.rb 2022-07-12 20:31:10.000000000 +0200
@@ -415,6 +415,7 @@
passwd_file.flush
group_file.write("#{nobody_group}:x:789")
group_file.flush
+
root_testenv("--map-passwd=#{Shellwords.escape(passwd_file.path)} --map-group=#{Shellwords.escape(group_file.path)}") do
touch('src/file1')
chown(123, 789, 'src/file1')
@@ -426,6 +427,19 @@
assert { File.stat('src/file2').uid == 123 }
assert { File.stat('src/file2').gid == 789 }
end
+
+ # Pull Request 113
+ root_testenv("--map-passwd-rev=#{Shellwords.escape(passwd_file.path)} --map-group-rev=#{Shellwords.escape(group_file.path)}") do
+ touch('src/file1')
+ chown(nobody_uid, nobody_gid, 'src/file1')
+ assert { File.stat('mnt/file1').uid == 123 }
+ assert { File.stat('mnt/file1').gid == 789 }
+
+ touch('src/file2')
+ chown(123, 789, 'mnt/file2')
+ assert { File.stat('src/file2').uid == nobody_uid }
+ assert { File.stat('src/file2').gid == nobody_gid }
+ end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bindfs-1.15.1/vagrant/centos8/Vagrantfile new/bindfs-1.17.0/vagrant/centos8/Vagrantfile
--- old/bindfs-1.15.1/vagrant/centos8/Vagrantfile 2021-02-15 04:35:51.000000000 +0100
+++ new/bindfs-1.17.0/vagrant/centos8/Vagrantfile 2022-07-12 20:31:10.000000000 +0200
@@ -16,6 +16,11 @@
end
config.vm.provision "shell", inline: <<-SHELL
+ # CentOS 8 is EOL
+ # https://www.cyberithub.com/solved-failed-to-download-metadata-for-repo-apps…
+ sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
+ sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
+
yum install -y fuse fuse-devel gcc make pkg-config ruby valgrind
echo user_allow_other > /etc/fuse.conf
SHELL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bindfs-1.15.1/vagrant/debian11/Vagrantfile new/bindfs-1.17.0/vagrant/debian11/Vagrantfile
--- old/bindfs-1.15.1/vagrant/debian11/Vagrantfile 1970-01-01 01:00:00.000000000 +0100
+++ new/bindfs-1.17.0/vagrant/debian11/Vagrantfile 2022-07-12 20:31:10.000000000 +0200
@@ -0,0 +1,25 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure("2") do |config|
+ config.vm.box = "roboxes/debian11"
+
+ config.vm.synced_folder ".", "/vagrant", disabled: true
+ config.vm.synced_folder "../../", "/bindfs",
+ type: "rsync",
+ rsync__auto: false,
+ rsync__exclude: ["vagrant"],
+ rsync__args: ["-av", "--delete-after"]
+
+ config.vm.provider "virtualbox" do |v|
+ v.name = "bindfs-debian11"
+ end
+
+ config.vm.provision "shell", reboot: true, inline: <<-SHELL
+ export DEBIAN_FRONTEND='noninteractive'
+ apt-get update
+ apt-get install -y fuse3 libfuse3-dev build-essential pkg-config ruby valgrind
+ apt-get clean
+ echo user_allow_other > /etc/fuse.conf
+ SHELL
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bindfs-1.15.1/vagrant/trusty64/Vagrantfile new/bindfs-1.17.0/vagrant/trusty64/Vagrantfile
--- old/bindfs-1.15.1/vagrant/trusty64/Vagrantfile 2021-02-15 04:35:51.000000000 +0100
+++ new/bindfs-1.17.0/vagrant/trusty64/Vagrantfile 1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
- config.vm.box = "ubuntu/trusty64"
-
- config.vm.synced_folder ".", "/vagrant", disabled: true
- config.vm.synced_folder "../../", "/bindfs",
- type: "rsync",
- rsync__auto: false,
- rsync__exclude: ["vagrant"],
- rsync__args: ["-av", "--delete-after"]
-
- config.vm.provider "virtualbox" do |v|
- v.name = "bindfs-trusty64"
- end
-
- config.vm.provision "shell", inline: <<-SHELL
- apt-get update
- apt-get install -y fuse libfuse-dev build-essential pkg-config ruby1.9 valgrind
- apt-get clean
- adduser vagrant fuse
- echo user_allow_other > /etc/fuse.conf
- SHELL
-end
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package plymouth for openSUSE:Factory checked in at 2022-07-31 23:00:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plymouth (Old)
and /work/SRC/openSUSE:Factory/.plymouth.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plymouth"
Sun Jul 31 23:00:50 2022 rev:109 rq:991664 version:0.9.5~git20220719.9e72df3
Changes:
--------
--- /work/SRC/openSUSE:Factory/plymouth/plymouth.changes 2022-07-22 19:20:18.744566432 +0200
+++ /work/SRC/openSUSE:Factory/.plymouth.new.1533/plymouth.changes 2022-07-31 23:01:05.907718674 +0200
@@ -23 +23 @@
-- Add plymouth-crash-avoid-on-keyboard-remove-input-handler.patch
+- Add plymouth-crash-avoid-on-keyboard-remove-input-handler.patch:
@@ -30 +30 @@
-- Add code to plymouth-watermark-config.patch in order to install
+- Update plymouth-watermark-config.patch: in order to install
@@ -394 +394 @@
-- Do not own /usr/share/locale (owned by filesystem):
+- Update plymouth.spec: Do not own /usr/share/locale (owned by filesystem):
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plymouth.spec ++++++
--- /var/tmp/diff_new_pack.DCqgOD/_old 2022-07-31 23:01:06.663720870 +0200
+++ /var/tmp/diff_new_pack.DCqgOD/_new 2022-07-31 23:01:06.667720882 +0200
@@ -36,31 +36,31 @@
Patch1: plymouth-some-greenish-openSUSE-colors.patch
# PATCH-FIX-UPSTREAM plymouth-manpages.patch bnc#871419 idoenmez(a)suse.de -- Fix man page installation
Patch2: plymouth-manpages.patch
-# PATCH-FIX-OPENSUSE plymouth-disable-fedora-logo.patch qzhao(a)opensuse.org -- Disable the fedora logo reference which is not in openSUSE.
+# PATCH-FIX-OPENSUSE plymouth-disable-fedora-logo.patch qzhao(a)suse.com -- Disable the fedora logo reference which is not in openSUSE.
Patch3: plymouth-disable-fedora-logo.patch
-# PATCH-FIX-OPENSUSE plymouth-only_use_fb_for_cirrus_bochs.patch bnc#888590 boo#1172028 bsc#1181913 fvogt(a)suse.com -- force fb for cirrus and bochs, force drm otherwise. replace removal of framebuffer driver and plymouth-ignore-cirrusdrm.patch with single patch.
+# PATCH-FIX-OPENSUSE plymouth-only_use_fb_for_cirrus_bochs.patch bnc#888590 boo#1172028 bsc#1181913 fvogt(a)suse.com -- Force fb for cirrus and bochs, force drm otherwise. replace removal of framebuffer driver and plymouth-ignore-cirrusdrm.patch with single patch.
Patch4: plymouth-only_use_fb_for_cirrus_bochs.patch
-# PATCH-FIX-OPENSUSE plymouth-crash-avoid-on-keyboard-remove-input-handler.patch bsc#1193736 qzhao(a)suse.com -- Confirm keyboard handler list not NULL before release memory to avoid crash.
-Patch5: plymouth-crash-avoid-on-keyboard-remove-input-handler.patch
+# PATCH-FIX-OPENSUSE plymouth-keep-KillMode-none.patch bsc#1177082 bsc#1184087 boo#1182145 qzhao(a)suse.com -- Keep the plymouth-start.service KillMode=none.
+Patch5: plymouth-keep-KillMode-none.patch
# PATCH-FIX-OPENSUSE plymouth-install-label-library-and-font-file-to-initrd.patch boo#1183425 boo#1184309 qzhao(a)suse.com -- Pack label plugin and font into initram to ensure notice info could successfully show when partition encrypted.
Patch6: plymouth-install-label-library-and-font-file-to-initrd.patch
-# PATCH-FIX-OPENSUSE plymouth-screen-twice-scale-on-160DPI-higher.patch boo#1183425 boo#1184309 qzhao(a)suse.com -- When DPI > 160, screen will scale output twice.
-Patch7: plymouth-screen-twice-scale-on-160DPI-higher.patch
# PATCH-FIX-OPENSUSE plymouth-quiet-dracut-build-info.patch bsc#1189613 qzhao(a)suse.com -- Hide unuseful output when re-generate initrd.
-Patch8: plymouth-quiet-dracut-build-info.patch
+Patch7: plymouth-quiet-dracut-build-info.patch
# PATCH-FIX-OPENSUSE plymouth-watermark-config.patch bsc#1189613 qzhao(a)suse.com -- Add two-step water mark config support.
-Patch9: plymouth-watermark-config.patch
+Patch8: plymouth-watermark-config.patch
# PATCH-FIX-OPENSUSE plymouth-log-on-default.patch bsc#1193736 qzhao(a)suse.com -- Enable plymouth log by default, help to resolve random appear problems.
-Patch10: plymouth-log-on-default.patch
-# PATCH-FIX-OPENSUSE plymouth-keep-KillMode-none.patch bsc#1177082 bsc#1184087 boo#1182145 qzhao(a)suse.com -- Keep the plymouth-start.service KillMode=none.
-Patch11: plymouth-keep-KillMode-none.patch
-# PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch boo#959986 fvogt(a)suse.com -- add ability to output text in initrd needed for encryption.
+Patch9: plymouth-log-on-default.patch
+# PATCH-FIX-OPENSUSE plymouth-screen-twice-scale-on-160DPI-higher.patch boo#1183425 boo#1184309 qzhao(a)suse.com -- When DPI > 160, screen will scale output twice.
+Patch10: plymouth-screen-twice-scale-on-160DPI-higher.patch
+# PATCH-FIX-OPENSUSE plymouth-crash-avoid-on-keyboard-remove-input-handler.patch bsc#1193736 qzhao(a)suse.com -- Confirm keyboard handler list not NULL before release memory to avoid crash.
+Patch11: plymouth-crash-avoid-on-keyboard-remove-input-handler.patch
+# PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch boo#959986 fvogt(a)suse.com -- Add ability to output text in initrd needed for encryption.
Patch1001: 0001-Add-label-ft-plugin.patch
-# PATCH-FIX-UPSTREAM 0002-Install-label-ft-plugin-into-initrd-if-available.patch boo#959986 fvogt(a)suse.com -- add ability to output text in initrd needed for encryption.
+# PATCH-FIX-UPSTREAM 0002-Install-label-ft-plugin-into-initrd-if-available.patch boo#959986 fvogt(a)suse.com -- Add ability to output text in initrd needed for encryption.
Patch1002: 0002-Install-label-ft-plugin-into-initrd-if-available.patch
-# PATCH-FIX-UPSTREAM 0003-fix_null_deref.patch boo#959986 fvogt(a)suse.com -- add ability to output text in initrd needed for encryption.
+# PATCH-FIX-UPSTREAM 0003-fix_null_deref.patch boo#959986 fvogt(a)suse.com -- Add ability to output text in initrd needed for encryption.
Patch1003: 0003-fix_null_deref.patch
-# PATCH-FIX-UPSTREAM 0004-label-ft-fix-alignment.patch boo#959986 fvogt(a)suse.com -- fix alignment for label-ft
+# PATCH-FIX-UPSTREAM 0004-label-ft-fix-alignment.patch boo#959986 fvogt(a)suse.com -- Fix alignment for label-ft
Patch1004: 0004-label-ft-fix-alignment.patch
BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets
@@ -398,6 +398,7 @@
%install
%make_install
+# *.la are files generated during compilation, useless for final user.
find %{buildroot} -type f -name "*.la" -delete
# Glow isn't quite ready for primetime
@@ -405,15 +406,14 @@
# We will nolonger ship plymouthd.conf, Plymouthd will read /usr/share/plymouth/plymouthd.defaults if /etc/plymouth/plymouthd.conf doesn't exist(jsc#SLE-11637).
rm -f %{buildroot}%{_sysconfdir}/plymouth/plymouthd.conf
-rm -f %{buildroot}%{_datadir}/plymouth/plymouthd.conf
-# Move logrotate files from user specific directory /etc/logrotate.d
-# to vendor specific directory /usr/etc/logrotate.d.
+# Move logrotate files from user specific directory /etc/logrotate.d to vendor specific directory /usr/etc/logrotate.d.
%if 0%{?suse_version} > 1500
mkdir -p %{buildroot}%{_distconfdir}/logrotate.d
mv %{buildroot}%{_sysconfdir}/logrotate.d/bootlog %{buildroot}%{_distconfdir}/logrotate.d/bootlog
%endif
+# Split lang to seperate package.
%find_lang %{name}
%post
++++++ plymouth-crash-avoid-on-keyboard-remove-input-handler.patch ++++++
--- /var/tmp/diff_new_pack.DCqgOD/_old 2022-07-31 23:01:06.731721068 +0200
+++ /var/tmp/diff_new_pack.DCqgOD/_new 2022-07-31 23:01:06.735721079 +0200
@@ -1,6 +1,6 @@
-diff -Nura plymouth-0.9.5~git20220412.e960111/src/libply-splash-core/ply-keyboard.c plymouth-0.9.5~git20220412.e960111_new/src/libply-splash-core/ply-keyboard.c
---- plymouth-0.9.5~git20220412.e960111/src/libply-splash-core/ply-keyboard.c 2022-04-15 16:39:24.000000000 +0800
-+++ plymouth-0.9.5~git20220412.e960111_new/src/libply-splash-core/ply-keyboard.c 2022-05-15 23:31:14.329149370 +0800
+diff -Nura plymouth-0.9.5~git20220719.9e72df3/src/libply-splash-core/ply-keyboard.c plymouth-0.9.5~git20220719.9e72df3_new/src/libply-splash-core/ply-keyboard.c
+--- plymouth-0.9.5~git20220719.9e72df3/src/libply-splash-core/ply-keyboard.c 2022-04-15 16:39:24.000000000 +0800
++++ plymouth-0.9.5~git20220719.9e72df3_new/src/libply-splash-core/ply-keyboard.c 2022-07-29 14:19:35.951346564 +0800
@@ -522,6 +522,8 @@
assert (keyboard != NULL);
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package shim for openSUSE:Factory checked in at 2022-07-31 23:00:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/shim (Old)
and /work/SRC/openSUSE:Factory/.shim.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shim"
Sun Jul 31 23:00:49 2022 rev:102 rq:991619 version:15.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/shim/shim.changes 2022-07-18 18:32:53.977668924 +0200
+++ /work/SRC/openSUSE:Factory/.shim.new.1533/shim.changes 2022-07-31 23:01:04.847715594 +0200
@@ -1,0 +2,15 @@
+Fri Jul 29 02:36:36 UTC 2022 - Joey Lee <jlee(a)suse.com>
+
+- Change the URL in SBAT section to mail:security@suse.de. (bsc#1193282)
+
+-------------------------------------------------------------------
+Mon Jul 25 12:44:24 UTC 2022 - Joey Lee <jlee(a)suse.com>
+
+- Revoked the change in shim.spec for "use common SBAT values (boo#1193282)"
+ - we need to build openSUSE Tumbleweed's shim on Leap 15.4 because Factory
+ is unstable for building out a stable shim binary for signing. (bsc#1198458)
+ - But the rpm-config-suse package in Leap 15.4 is direct copied from SLE 15.4
+ because closing-the-leap-gap. So sbat_distro_* variables are SLE version,
+ not for openSUSE. (bsc#1198458)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ shim.spec ++++++
--- /var/tmp/diff_new_pack.GxjqO3/_old 2022-07-31 23:01:05.563717675 +0200
+++ /var/tmp/diff_new_pack.GxjqO3/_new 2022-07-31 23:01:05.567717686 +0200
@@ -35,13 +35,6 @@
%endif
%endif
-%if %{defined sbat_distro}
-# SBAT metadata
-%define sbat_generation 1
-%else
-%{error please define sbat_distro, sbat_distro_summary and sbat_distro_url}
-%endif
-
Name: shim
Version: 15.6
Release: 0
@@ -134,10 +127,17 @@
%patch100 -p1
%build
-%if 0%{?sbat_generation}
# generate the vendor SBAT metadata
-echo "shim.%{sbat_distro},%{sbat_generation},%{sbat_distro_summary},%{name},%{version},%{sbat_distro_url}" > data/sbat.vendor.csv
+%if 0%{?is_opensuse} == 1 || 0%{?sle_version} == 0
+distro_id="opensuse"
+distro_name="The openSUSE project"
+%else
+distro_id="sle"
+distro_name="SUSE Linux Enterprise"
%endif
+distro_sbat=1
+sbat="shim.${distro_id},${distro_sbat},${distro_name},%{name},%{version},mail:security@suse.de"
+echo "${sbat}" > data/sbat.vendor.csv
# first, build MokManager and fallback as they don't depend on a
# specific certificate
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package haproxy for openSUSE:Factory checked in at 2022-07-31 23:00:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/haproxy (Old)
and /work/SRC/openSUSE:Factory/.haproxy.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "haproxy"
Sun Jul 31 23:00:48 2022 rev:119 rq:991607 version:2.6.2+git0.16a3646fd
Changes:
--------
--- /work/SRC/openSUSE:Factory/haproxy/haproxy.changes 2022-07-22 19:19:54.668525094 +0200
+++ /work/SRC/openSUSE:Factory/.haproxy.new.1533/haproxy.changes 2022-07-31 23:01:03.311711131 +0200
@@ -1,0 +2,67 @@
+Thu Jul 28 20:04:58 UTC 2022 - dmueller(a)suse.com
+
+- Update to version 2.6.2+git0.16a3646fd:
+ * [RELEASE] Released version 2.6.2
+ * BUG/MINOR: backend: Fallback on RR algo if balance on source is impossible
+ * BUILD: quic: fix anonymous union for gcc-4.4
+ * BUG/MEDIUM: stconn: Only reset connect expiration when processing backend side
+ * BUILD: add detection for unsupported compiler models
+ * BUG/MEDIUM: mworker: proc_self incorrectly set crashes upon reload
+ * BUG/MAJOR: mux_quic: fix invalid PROTOCOL_VIOLATION on POST data overlap
+ * BUG/MINOR: mworker/cli: relative pid prefix not validated anymore
+ * BUG/MINOR: quic: do not send CONNECTION_CLOSE_APP in initial/handshake
+ * BUG/MINOR: tools: fix statistical_prng_range()'s output range
+ * BUG/MINOR: ssl: allow duplicate certificates in ca-file directories
+ * BUG/MINOR: resolvers: shut off the warning for the default resolvers
+ * MINOR: resolvers: resolvers_destroy() deinit and free a resolver
+ * BUG/MEDIUM: tools: avoid calling dlsym() in static builds (try 2)
+ * BUILD: makefile: Fix install(1) handling for OpenBSD/NetBSD/Solaris/AIX
+ * BUG/MEDIUM: tools: avoid calling dlsym() in static builds
+ * BUG/MINOR: debug: enter ha_panic() only once
+ * BUG/MEDIUM: cli/threads: make "show threads" more robust on applets
+ * BUG/MINOR: quic: fix closing state on NO_ERROR code sent
+ * BUG/MEDIUM: mux-quic: fix server chunked encoding response
+ * CLEANUP: h2: Typo fix in h2_unsubcribe() traces
+ * MINOR: qpack: properly handle invalid dynamic table references
+ * MINOR: h3: handle errors on HEADERS parsing/QPACK decoding
+ * MINOR: h3: add h3c pointer into h3s instance
+ * BUG/MINOR: mux-quic: do not signal FIN if gap in buffer
+ * MINOR: ncbuf: implement ncb_is_fragmented()
+ * MINOR: quic: Increase the QUIC connections RX buffer size (upto 64Kb)
+ * MINOR: quic: Improvements for the datagrams receipt
+ * MINOR: task: Add tasklet_wakeup_after()
+ * MINOR: quic: Duplicated QUIC_RX_BUFSZ definition
+ * MINOR: quic: Add new stats counter to diagnose RX buffer overrun
+ * BUG/MINOR: quic: Dropped packets not counted (with RX buffers full)
+ * BUILD: quic+h3: 32-bit compilation errors fixes
+ * BUG/MAJOR: quic: Big RX dgrams leak with POST requests
+ * BUG/MAJOR: quic: Big RX dgrams leak when fulfilling a buffer
+ * BUG/MINOR: quic: Wrong reuse of fulfilled dgram RX buffer
+ * BUG/MINOR: quic: Missing acknowledgments for trailing packets
+ * MEDIUM: mworker: set the iocb of the socketpair without using fd_insert()
+ * BUG/MEDIUM: mux-h1: Handle connection error after a synchronous send
+ * BUG/MEDIUM: http-ana: Don't wait to have an empty buf to switch in TUNNEL state
+ * BUG/MINOR: mux-h1: Be sure to commit htx changes in the demux buffer
+ * REGTEESTS: filters: Fix CONNECT request in random-forwarding script
+ * BUG/MEDIUM: http-fetch: Don't fetch the method if there is no stream
+ * MINOR: http-htx: Use new HTTP functions for the scheme based normalization
+ * BUG/MEDIUM: h1: Improve authority validation for CONNCET request
+ * MINOR: http: Add function to detect default port
+ * MINOR: http: Add function to get port part of a host
+ * BUG/MINOR: http-htx: Fix scheme based normalization for URIs wih userinfo
+ * BUG/MINOR: peers: fix possible NULL dereferences at config parsing
+ * BUG/MINOR: http-act: Properly generate 103 responses when several rules are used
+ * BUG/MINOR: http-check: Preserve headers if not redefined by an implicit rule
+ * BUG/MINOR: peers/config: always fill the bind_conf's argument
+ * MINOR: fd: Add BUG_ON checks on fd_insert()
+ * CI: re-enable gcc asan builds
+ * BUILD: Makefile: Add Lua 5.4 autodetect
+ * BUG/MEDIUM: ssl/fd: unexpected fd close using async engine
+ * MINOR: fd: add a new FD_DISOWN flag to prevent from closing a deleted FD
+ * BUG/MINOR: http-fetch: Use integer value when possible in "method" sample fetch
+ * BUG/MINOR: http-ana: Set method to HTTP_METH_OTHER when an HTTP txn is created
+ * BUG/MINOR: ssl: Do not look for key in extra files if already in pem
+ * MEDIUM: mux-h2: try to coalesce outgoing WINDOW_UPDATE frames
+- drop lua54.patch (upstream)
+
+-------------------------------------------------------------------
Old:
----
haproxy-2.6.1+git0.f6ca66d44.tar.gz
lua54.patch
New:
----
haproxy-2.6.2+git0.16a3646fd.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ haproxy.spec ++++++
--- /var/tmp/diff_new_pack.X2W8wy/_old 2022-07-31 23:01:03.947712980 +0200
+++ /var/tmp/diff_new_pack.X2W8wy/_new 2022-07-31 23:01:03.955713002 +0200
@@ -55,7 +55,7 @@
%endif
Name: haproxy
-Version: 2.6.1+git0.f6ca66d44
+Version: 2.6.2+git0.16a3646fd
Release: 0
#
#
@@ -103,7 +103,6 @@
Patch1: haproxy-1.6.0_config_haproxy_user.patch
Patch2: haproxy-1.6.0-makefile_lib.patch
Patch3: haproxy-1.6.0-sec-options.patch
-Patch4: lua54.patch
#
Source98: series
Source99: haproxy-rpmlintrc
@@ -139,7 +138,6 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%build
make %{?_smp_mflags} \
++++++ _service ++++++
--- /var/tmp/diff_new_pack.X2W8wy/_old 2022-07-31 23:01:03.999713130 +0200
+++ /var/tmp/diff_new_pack.X2W8wy/_new 2022-07-31 23:01:04.003713142 +0200
@@ -6,7 +6,7 @@
<param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@.%h</param>
<param name="versionrewrite-pattern">v(.*)</param>
<param name="versionrewrite-replacement">\1</param>
- <param name="revision">v2.6.1</param>
+ <param name="revision">v2.6.2</param>
<param name="changesgenerate">enable</param>
</service>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.X2W8wy/_old 2022-07-31 23:01:04.027713212 +0200
+++ /var/tmp/diff_new_pack.X2W8wy/_new 2022-07-31 23:01:04.027713212 +0200
@@ -5,6 +5,6 @@
</service>
<service name="tar_scm">
<param name="url">http://git.haproxy.org/git/haproxy-2.6.git</param>
- <param name="changesrevision">f6ca66d4495020969e1e9462ee2b2bc89695ca8e</param></service></servicedata>
+ <param name="changesrevision">16a3646fdff7315802913184a4e12c2a32344aed</param></service></servicedata>
(No newline at EOF)
++++++ haproxy-2.6.1+git0.f6ca66d44.tar.gz -> haproxy-2.6.2+git0.16a3646fd.tar.gz ++++++
++++ 2974 lines of diff (skipped)
1
0