openSUSE Commits
Threads by month
- ----- 2024 -----
- 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
August 2023
- 1 participants
- 1989 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 000product for openSUSE:Factory checked in at 2023-08-31 23:06:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/000product (Old)
and /work/SRC/openSUSE:Factory/.000product.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "000product"
Thu Aug 31 23:06:48 2023 rev:3730 rq: version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
openSUSE-Addon-NonOss-ftp-ftp-x86_64.kiwi: same change
openSUSE-cd-mini-x86_64.kiwi: same change
openSUSE-dvd5-dvd-x86_64.kiwi: same change
openSUSE-ftp-ftp-x86_64.kiwi: same change
stub.kiwi: same change
++++++ unsorted.yml ++++++
--- /var/tmp/diff_new_pack.TBEKcI/_old 2023-08-31 23:06:54.379810727 +0200
+++ /var/tmp/diff_new_pack.TBEKcI/_new 2023-08-31 23:06:54.387811013 +0200
@@ -12710,6 +12710,7 @@
- libjanet1_28
- libjansson-devel
- libjasper-devel
+ - libjasper7-32bit
- libjavamapscript
- libjavascriptcoregtk-4_0-18-32bit
- libjaylink-devel
1
0
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 2023-08-31 23:06:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/000release-packages (Old)
and /work/SRC/openSUSE:Factory/.000release-packages.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "000release-packages"
Thu Aug 31 23:06:45 2023 rev:2475 rq: version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
openSUSE-Addon-NonOss-release.spec: same change
openSUSE-release.spec: same change
stub.spec: same change
++++++ weakremovers.inc ++++++
--- /var/tmp/diff_new_pack.0xawjy/_old 2023-08-31 23:06:50.415669092 +0200
+++ /var/tmp/diff_new_pack.0xawjy/_new 2023-08-31 23:06:50.423669378 +0200
@@ -13139,7 +13139,6 @@
Provides: weakremover(libjasper4-32bit)
Provides: weakremover(libjasper6)
Provides: weakremover(libjasper6-32bit)
-Provides: weakremover(libjasper7-32bit)
Provides: weakremover(libjavascriptcoregtk-1_0-0)
Provides: weakremover(libjavascriptcoregtk-1_0-0-32bit)
Provides: weakremover(libjavascriptcoregtk-3_0-0)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package 000update-repos for openSUSE:Factory checked in at 2023-08-31 21:02:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/000update-repos (Old)
and /work/SRC/openSUSE:Factory/.000update-repos.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "000update-repos"
Thu Aug 31 21:02:58 2023 rev:2324 rq: version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
New:
----
15.4:update_1693468332.packages.zst
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package 000product for openSUSE:Factory checked in at 2023-08-31 19:06:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/000product (Old)
and /work/SRC/openSUSE:Factory/.000product.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "000product"
Thu Aug 31 19:06:09 2023 rev:3729 rq: version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ MicroOS-dvd5-dvd-x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.1CZ2Fe/_old 2023-08-31 19:06:15.091761557 +0200
+++ /var/tmp/diff_new_pack.1CZ2Fe/_new 2023-08-31 19:06:15.095761699 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__MicroOS___20230830" schemaversion="4.1">
+<image name="OBS__MicroOS___20230831" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -35,11 +35,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20230830</productvar>
+ <productvar name="VERSION">20230831</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:microos:20230830,openSUSE MicroOS</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:microos:20230831,openSUSE MicroOS</productinfo>
<productinfo name="LINGUAS">en_US </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20230830/x86_64</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20230831/x86_64</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
@@ -882,7 +882,7 @@
<repopackage name="libavcodec60"/>
<repopackage name="libavfilter9"/>
<repopackage name="libavformat60"/>
- <repopackage name="libavif15"/>
+ <repopackage name="libavif16"/>
<repopackage name="libavtp0"/>
<repopackage name="libavutil58"/>
<repopackage name="libbase"/>
++++++ openSUSE-Addon-NonOss-ftp-ftp-x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.1CZ2Fe/_old 2023-08-31 19:06:15.123762698 +0200
+++ /var/tmp/diff_new_pack.1CZ2Fe/_new 2023-08-31 19:06:15.131762984 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE-Addon-NonOss___20230830" schemaversion="4.1">
+<image name="OBS__openSUSE-Addon-NonOss___20230831" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -35,11 +35,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20230830</productvar>
+ <productvar name="VERSION">20230831</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20230830,openSUSE NonOSS Addon</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20230831,openSUSE NonOSS Addon</productinfo>
<productinfo name="LINGUAS">af ar be_BY bg br ca cy el et ga gl gu_IN he hi_IN hr ka km ko lt mk nn pa_IN rw sk sl sr_CS ss st tg th tr uk ve vi xh zu </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2023…</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2023…</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
++++++ openSUSE-cd-mini-x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.1CZ2Fe/_old 2023-08-31 19:06:15.151763698 +0200
+++ /var/tmp/diff_new_pack.1CZ2Fe/_new 2023-08-31 19:06:15.155763841 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20230830" schemaversion="4.1">
+<image name="OBS__openSUSE___20230831" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -35,11 +35,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20230830</productvar>
+ <productvar name="VERSION">20230831</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20230830,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20230831,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20230830/x86_64</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20230831/x86_64</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
++++++ openSUSE-dvd5-dvd-x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.1CZ2Fe/_old 2023-08-31 19:06:15.175764555 +0200
+++ /var/tmp/diff_new_pack.1CZ2Fe/_new 2023-08-31 19:06:15.179764698 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20230830" schemaversion="4.1">
+<image name="OBS__openSUSE___20230831" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -35,11 +35,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20230830</productvar>
+ <productvar name="VERSION">20230831</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20230830,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20230831,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20230830/x86_64</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20230831/x86_64</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
@@ -705,8 +705,6 @@
<repopackage name="gpm"/>
<repopackage name="gptfdisk"/>
<repopackage name="grantlee5"/>
- <repopackage name="grantleetheme"/>
- <repopackage name="grantleetheme-lang"/>
<repopackage name="grep"/>
<repopackage name="grep-lang"/>
<repopackage name="grilo-lang"/>
@@ -1271,7 +1269,7 @@
<repopackage name="libavfilter9"/>
<repopackage name="libavformat58_76"/>
<repopackage name="libavformat60"/>
- <repopackage name="libavif15"/>
+ <repopackage name="libavif16"/>
<repopackage name="libavtp0"/>
<repopackage name="libavutil56_70"/>
<repopackage name="libavutil58"/>
@@ -1834,7 +1832,7 @@
<repopackage name="libkdegames-qt5-imports"/>
<repopackage name="libkdepim"/>
<repopackage name="libkdepim-lang"/>
- <repopackage name="libkdevplatform511"/>
+ <repopackage name="libkdevplatform512"/>
<repopackage name="libkdsoap2"/>
<repopackage name="libkeduvocdocument-lang"/>
<repopackage name="libKEduVocDocument5"/>
@@ -1898,7 +1896,6 @@
<repopackage name="libKF5JobWidgets5"/>
<repopackage name="libKF5JobWidgets5-lang"/>
<repopackage name="libKF5JS5"/>
- <repopackage name="libKF5JSApi5"/>
<repopackage name="libKF5KCMUtils5"/>
<repopackage name="libKF5KCMUtils5-lang"/>
<repopackage name="libKF5KCMUtilsCore5"/>
@@ -1924,8 +1921,6 @@
<repopackage name="libKF5NotifyConfig5-lang"/>
<repopackage name="libKF5Parts5"/>
<repopackage name="libKF5Parts5-lang"/>
- <repopackage name="libKF5PimCommon5"/>
- <repopackage name="libKF5PimCommonAkonadi5"/>
<repopackage name="libKF5Plasma5"/>
<repopackage name="libKF5Plotting5"/>
<repopackage name="libKF5Prison5"/>
@@ -1951,8 +1946,12 @@
<repopackage name="libKF5Syndication5"/>
<repopackage name="libKF5SyntaxHighlighting5"/>
<repopackage name="libKF5SyntaxHighlighting5-lang"/>
- <repopackage name="libKF5TextAutoCorrection1"/>
+ <repopackage name="libKF5TextAddonsWidgets1"/>
+ <repopackage name="libKF5TextAutoCorrectionCore1"/>
+ <repopackage name="libKF5TextAutoCorrectionWidgets1"/>
<repopackage name="libKF5TextEditTextToSpeech1"/>
+ <repopackage name="libKF5TextEmoticonsCore1"/>
+ <repopackage name="libKF5TextEmoticonsWidgets1"/>
<repopackage name="libKF5TextGrammarCheck1"/>
<repopackage name="libKF5TextTranslator1"/>
<repopackage name="libKF5TextWidgets5"/>
@@ -2028,10 +2027,11 @@
<repopackage name="libKPim5MailImporter5"/>
<repopackage name="libKPim5MailImporterAkonadi5"/>
<repopackage name="libKPim5MailTransport5"/>
- <repopackage name="libKPim5MailTransportAkonadi5"/>
<repopackage name="libKPim5Mbox5"/>
<repopackage name="libKPim5Mime5"/>
<repopackage name="libKPim5Mime5-lang"/>
+ <repopackage name="libKPim5PimCommon5"/>
+ <repopackage name="libKPim5PimCommonAkonadi5"/>
<repopackage name="libKPim5PkPass5"/>
<repopackage name="libKPim5SMTP5"/>
<repopackage name="libKPim5SMTP5-lang"/>
++++++ openSUSE-ftp-ftp-x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.1CZ2Fe/_old 2023-08-31 19:06:15.199765411 +0200
+++ /var/tmp/diff_new_pack.1CZ2Fe/_new 2023-08-31 19:06:15.203765554 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20230830" schemaversion="4.1">
+<image name="OBS__openSUSE___20230831" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -23,7 +23,7 @@
<productvar name="DISTNAME">openSUSE</productvar>
<productvar name="FLAVOR">ftp</productvar>
<productvar name="MAKE_LISTINGS">true</productvar>
- <productvar name="MEDIUM_NAME">openSUSE-20230830-x86_64</productvar>
+ <productvar name="MEDIUM_NAME">openSUSE-20230831-x86_64</productvar>
<productvar name="MULTIPLE_MEDIA">true</productvar>
<productvar name="PRODUCT_DIR">/</productvar>
<productvar name="PRODUCT_NAME">$DISTNAME-$FLAVOR</productvar>
@@ -35,11 +35,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20230830</productvar>
+ <productvar name="VERSION">20230831</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20230830,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20230831,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20230830/x86_64</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20230831/x86_64</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="DEBUGMEDIUM">2</productoption>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
++++++ MicroOS.product ++++++
--- /var/tmp/diff_new_pack.1CZ2Fe/_old 2023-08-31 19:06:15.247767125 +0200
+++ /var/tmp/diff_new_pack.1CZ2Fe/_new 2023-08-31 19:06:15.251767267 +0200
@@ -6,7 +6,7 @@
<name>MicroOS</name>
<releasepkgname>MicroOS-release</releasepkgname>
<endoflife/>
- <version>20230830</version>
+ <version>20230831</version>
<!-- release is no longer optional -->
<release>0</release>
<productline>MicroOS</productline>
++++++ dvd.group ++++++
--- /var/tmp/diff_new_pack.1CZ2Fe/_old 2023-08-31 19:06:15.331770123 +0200
+++ /var/tmp/diff_new_pack.1CZ2Fe/_new 2023-08-31 19:06:15.335770265 +0200
@@ -711,8 +711,6 @@
<package name="gpm" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
<package name="gptfdisk" supportstatus="unsupported"/> <!-- reason: dvd:grub2 -->
<package name="grantlee5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
- <package name="grantleetheme" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
- <package name="grantleetheme-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
<package name="grep" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_yast -->
<package name="grep-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_yast -->
<package name="grilo-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -1279,7 +1277,6 @@
<package name="libKF5ItemViews5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
<package name="libKF5ItemViews5-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
<package name="libKF5JS5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
- <package name="libKF5JSApi5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
<package name="libKF5JobWidgets5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
<package name="libKF5JobWidgets5-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
<package name="libKF5KCMUtils5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
@@ -1307,8 +1304,6 @@
<package name="libKF5NotifyConfig5-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
<package name="libKF5Parts5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
<package name="libKF5Parts5-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
- <package name="libKF5PimCommon5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
- <package name="libKF5PimCommonAkonadi5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
<package name="libKF5Plasma5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
<package name="libKF5Plotting5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_edutainment -->
<package name="libKF5Prison5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
@@ -1334,8 +1329,12 @@
<package name="libKF5Syndication5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
<package name="libKF5SyntaxHighlighting5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
<package name="libKF5SyntaxHighlighting5-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
- <package name="libKF5TextAutoCorrection1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
+ <package name="libKF5TextAddonsWidgets1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
+ <package name="libKF5TextAutoCorrectionCore1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
+ <package name="libKF5TextAutoCorrectionWidgets1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
<package name="libKF5TextEditTextToSpeech1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
+ <package name="libKF5TextEmoticonsCore1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
+ <package name="libKF5TextEmoticonsWidgets1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
<package name="libKF5TextGrammarCheck1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
<package name="libKF5TextTranslator1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
<package name="libKF5TextWidgets5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
@@ -1395,10 +1394,11 @@
<package name="libKPim5MailImporter5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
<package name="libKPim5MailImporterAkonadi5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
<package name="libKPim5MailTransport5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
- <package name="libKPim5MailTransportAkonadi5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
<package name="libKPim5Mbox5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
<package name="libKPim5Mime5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
<package name="libKPim5Mime5-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
+ <package name="libKPim5PimCommon5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
+ <package name="libKPim5PimCommonAkonadi5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
<package name="libKPim5PkPass5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
<package name="libKPim5SMTP5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
<package name="libKPim5SMTP5-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
@@ -1613,7 +1613,7 @@
<package name="libavfilter9" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
<package name="libavformat58_76" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_multimedia -->
<package name="libavformat60" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
- <package name="libavif15" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
+ <package name="libavif16" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
<package name="libavtp0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
<package name="libavutil56_70" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_multimedia -->
<package name="libavutil58" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
@@ -2160,7 +2160,7 @@
<package name="libkdegames-qt5-imports" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
<package name="libkdepim" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
<package name="libkdepim-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
- <package name="libkdevplatform511" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_ide -->
+ <package name="libkdevplatform512" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_ide -->
<package name="libkdsoap2" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
<package name="libkeduvocdocument-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_edutainment -->
<package name="libkerfuffle23" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
++++++ openSUSE-Addon-NonOss.product ++++++
--- /var/tmp/diff_new_pack.1CZ2Fe/_old 2023-08-31 19:06:15.355770979 +0200
+++ /var/tmp/diff_new_pack.1CZ2Fe/_new 2023-08-31 19:06:15.359771122 +0200
@@ -4,7 +4,7 @@
<product>
<vendor>openSUSE</vendor>
<name>openSUSE-Addon-NonOss</name>
- <version>20230830</version>
+ <version>20230831</version>
<release>0</release>
<summary>openSUSE NonOSS Addon</summary>
<shortsummary>non oss addon</shortsummary>
++++++ openSUSE.product ++++++
--- /var/tmp/diff_new_pack.1CZ2Fe/_old 2023-08-31 19:06:15.379771836 +0200
+++ /var/tmp/diff_new_pack.1CZ2Fe/_new 2023-08-31 19:06:15.383771979 +0200
@@ -4,7 +4,7 @@
<product>
<vendor>openSUSE</vendor>
<name>openSUSE</name>
- <version>20230830</version>
+ <version>20230831</version>
<release>0</release>
<productline>openSUSE</productline>
++++++ opensuse_microos.group ++++++
--- /var/tmp/diff_new_pack.1CZ2Fe/_old 2023-08-31 19:06:15.411772978 +0200
+++ /var/tmp/diff_new_pack.1CZ2Fe/_new 2023-08-31 19:06:15.419773264 +0200
@@ -1067,7 +1067,7 @@
<package name="libavcodec60" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
<package name="libavfilter9" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
<package name="libavformat60" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
- <package name="libavif15" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
+ <package name="libavif16" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
<package name="libavtp0" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-gnome -->
<package name="libavutil58" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
<package name="libbase" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
++++++ unsorted.yml ++++++
--- /var/tmp/diff_new_pack.1CZ2Fe/_old 2023-08-31 19:06:15.467774977 +0200
+++ /var/tmp/diff_new_pack.1CZ2Fe/_new 2023-08-31 19:06:15.475775263 +0200
@@ -496,7 +496,6 @@
- akonadi-search-devel
- akonadi-server-apparmor
- akonadi-server-devel
- - akonadi-server-sqlite
- akonadiconsole
- akonadiconsole-lang
- alac
@@ -7140,7 +7139,9 @@
- grantlee-editor
- grantlee-editor-lang
- grantlee5-devel
+ - grantleetheme
- grantleetheme-devel
+ - grantleetheme-lang
- graphite2
- graphite2-devel
- graphviz
@@ -8698,9 +8699,6 @@
- junit5-bom
- junit5-guide
- junit5-javadoc
- - junitperf
- - junitperf-demo
- - junitperf-javadoc
- jupyter-bqplot-jupyterlab
- jupyter-bqplot-notebook
- jupyter-cadabra2-kernel
@@ -9959,6 +9957,7 @@
- libIrrlicht1_8
- libKDb3-4
- libKF5Emoticons5
+ - libKF5JSApi5
- libKF5JsEmbed5
- libKF5JsEmbed5-lang
- libKF5KDGantt2-5
@@ -9966,6 +9965,7 @@
- libKF5MediaPlayer5
- libKF5ModemManagerQt-devel
- libKF5NetworkManagerQt-devel
+ - libKF5TextUtils1
- libKF5Torrent6
- libKF5XmlRpcClient5
- libKF5XmlRpcClient5-lang
@@ -10759,7 +10759,7 @@
- libavformat60-32bit
- libavfs0
- libavif-devel
- - libavif15-32bit
+ - libavif16-32bit
- libavrdude1
- libavresample4_0
- libavresample4_0-32bit
@@ -13342,10 +13342,6 @@
- libmypaint-gegl0
- libmysofa-devel
- libmysofa1-32bit
- - libmysqlcppconn-devel
- - libmysqlcppconn8-2
- - libmysqlcppconn8-devel
- - libmysqlcppconn9
- libnanomsg6
- libnanosvg0
- libnanosvgrast0
@@ -16634,6 +16630,9 @@
- maelstrom
- maeparser-devel
- mage
+ - magpie
+ - magpie-devel
+ - magpie-lang
- mailcommon-devel
- maildir-utils
- mailgraph
@@ -17107,6 +17106,9 @@
- mercurial-extension-hg-git
- mercurial-lang
- mercurial-tests
+ - merkuro
+ - merkuro-lang
+ - merkuro-plasmoid
- meshlab
- meslo-lg-fonts
- meson
@@ -17902,7 +17904,6 @@
- mvapich2_2_3_7-gnu-hpc-doc
- mvapich2_2_3_7-gnu-hpc-macros-devel
- mwic
- - mx4j
- mxml-devel
- mxml-doc
- mybatis
@@ -23805,7 +23806,6 @@
- python310-cssselect2
- python310-cssutils
- python310-cstruct
- - python310-csv23
- python310-csvkit
- python310-cu2qu
- python310-cufflinks
@@ -27251,7 +27251,6 @@
- python311-cssselect2
- python311-cssutils
- python311-cstruct
- - python311-csv23
- python311-csvkit
- python311-cu2qu
- python311-cufflinks
@@ -30635,7 +30634,6 @@
- python39-cssselect2
- python39-cssutils
- python39-cstruct
- - python39-csv23
- python39-csvkit
- python39-cu2qu
- python39-cufflinks
@@ -34320,11 +34318,6 @@
- saxon10-javadoc
- saxon10-manual
- saxon10-scripts
- - saxon9
- - saxon9-demo
- - saxon9-javadoc
- - saxon9-manual
- - saxon9-scripts
- saxpath
- saxpath-javadoc
- sbc-devel
@@ -45621,9 +45614,6 @@
- wrapsix
- writerperfect
- wrk
- - ws-jaxme
- - ws-jaxme-javadoc
- - ws-jaxme-manual
- wsdl4j
- wsdl4j-javadoc
- wsl-appx
@@ -46046,10 +46036,6 @@
- xplayer-plugins
- xplr
- xplsprinters
- - xpp2
- - xpp2-demo
- - xpp2-javadoc
- - xpp2-manual
- xpp3
- xpp3-javadoc
- xpp3-minimal
1
0
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 2023-08-31 19:06:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/000release-packages (Old)
and /work/SRC/openSUSE:Factory/.000release-packages.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "000release-packages"
Thu Aug 31 19:06:04 2023 rev:2474 rq: version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
openSUSE-Addon-NonOss-release.spec: same change
openSUSE-release.spec: same change
stub.spec: same change
++++++ weakremovers.inc ++++++
--- /var/tmp/diff_new_pack.iueuRk/_old 2023-08-31 19:06:08.919541260 +0200
+++ /var/tmp/diff_new_pack.iueuRk/_new 2023-08-31 19:06:08.927541546 +0200
@@ -7730,6 +7730,9 @@
Provides: weakremover(julia-doc)
Provides: weakremover(julia-examples)
Provides: weakremover(jumpnbump)
+Provides: weakremover(junitperf)
+Provides: weakremover(junitperf-demo)
+Provides: weakremover(junitperf-javadoc)
Provides: weakremover(jupyter-hide-code)
Provides: weakremover(jupyter-hide_code)
Provides: weakremover(jupyter-imatlab)
@@ -8778,6 +8781,8 @@
Provides: weakremover(libKF5Notifications5-32bit)
Provides: weakremover(libKF5NotifyConfig5-32bit)
Provides: weakremover(libKF5Parts5-32bit)
+Provides: weakremover(libKF5PimCommon5)
+Provides: weakremover(libKF5PimCommonAkonadi5)
Provides: weakremover(libKF5PimCommonAutoCorrection5)
Provides: weakremover(libKF5PimTextEdit5)
Provides: weakremover(libKF5Plasma5-32bit)
@@ -8801,6 +8806,7 @@
Provides: weakremover(libKF5Style5-32bit)
Provides: weakremover(libKF5Su5-32bit)
Provides: weakremover(libKF5SyntaxHighlighting5-32bit)
+Provides: weakremover(libKF5TextAutoCorrection1)
Provides: weakremover(libKF5TextWidgets5-32bit)
Provides: weakremover(libKF5ThreadWeaver5-32bit)
Provides: weakremover(libKF5Tnef5)
@@ -8813,6 +8819,7 @@
Provides: weakremover(libKF5WindowSystem5-32bit)
Provides: weakremover(libKF5XmlGui5-32bit)
Provides: weakremover(libKF5XmlRpcClient5-32bit)
+Provides: weakremover(libKPim5MailTransportAkonadi5)
Provides: weakremover(libKPimAddressbookImportExport5)
Provides: weakremover(libKPimAddressbookImportExport5-devel)
Provides: weakremover(libKPimGAPIBlogger5)
@@ -9670,6 +9677,8 @@
Provides: weakremover(libavif13-32bit)
Provides: weakremover(libavif14)
Provides: weakremover(libavif14-32bit)
+Provides: weakremover(libavif15)
+Provides: weakremover(libavif15-32bit)
Provides: weakremover(libavif2)
Provides: weakremover(libavif3)
Provides: weakremover(libavif4)
@@ -13236,6 +13245,7 @@
Provides: weakremover(libkdepimlibs4-32bit)
Provides: weakremover(libkdepimlibs4-devel)
Provides: weakremover(libkdevplatform510)
+Provides: weakremover(libkdevplatform511)
Provides: weakremover(libkdevplatform53)
Provides: weakremover(libkdevplatform54)
Provides: weakremover(libkdevplatform55)
@@ -13860,8 +13870,12 @@
Provides: weakremover(libmysqlclient18-32bit)
Provides: weakremover(libmysqlclient_r18)
Provides: weakremover(libmysqlclient_r18-32bit)
+Provides: weakremover(libmysqlcppconn-devel)
Provides: weakremover(libmysqlcppconn7)
Provides: weakremover(libmysqlcppconn8-1)
+Provides: weakremover(libmysqlcppconn8-2)
+Provides: weakremover(libmysqlcppconn8-devel)
+Provides: weakremover(libmysqlcppconn9)
Provides: weakremover(libmysqld18)
Provides: weakremover(libmysqld19)
Provides: weakremover(libnanomsg5)
@@ -17507,6 +17521,7 @@
Provides: weakremover(mvapich2_2_3_6-gnu-hpc-devel-static)
Provides: weakremover(mvapich2_2_3_6-gnu-hpc-doc)
Provides: weakremover(mvapich2_2_3_6-gnu-hpc-macros-devel)
+Provides: weakremover(mx4j)
Provides: weakremover(mxml)
Provides: weakremover(mycroft-core)
Provides: weakremover(myspell-eo_EO)
@@ -23133,6 +23148,7 @@
Provides: weakremover(python3-coverage-env-plugin)
Provides: weakremover(python3-coveralls)
Provides: weakremover(python3-cram)
+Provides: weakremover(python3-csv23)
Provides: weakremover(python3-ctypescrypto)
Provides: weakremover(python3-ctypesgen)
Provides: weakremover(python3-curses)
@@ -23598,6 +23614,7 @@
Provides: weakremover(python310-cirq-web)
Provides: weakremover(python310-cloud-sptheme)
Provides: weakremover(python310-contextlib2)
+Provides: weakremover(python310-csv23)
Provides: weakremover(python310-ctypescrypto)
Provides: weakremover(python310-django-oscar)
Provides: weakremover(python310-django-tagging)
@@ -23731,6 +23748,7 @@
Provides: weakremover(python311-cirq-rigetti)
Provides: weakremover(python311-cirq-web)
Provides: weakremover(python311-cloud-sptheme)
+Provides: weakremover(python311-csv23)
Provides: weakremover(python311-django-oscar)
Provides: weakremover(python311-django-tagging)
Provides: weakremover(python311-djvulibre)
@@ -27513,6 +27531,7 @@
Provides: weakremover(python39-coverage-config-reload-plugin)
Provides: weakremover(python39-coverage-env-plugin)
Provides: weakremover(python39-coveralls)
+Provides: weakremover(python39-csv23)
Provides: weakremover(python39-ctypescrypto)
Provides: weakremover(python39-demjson)
Provides: weakremover(python39-dephell)
@@ -36420,6 +36439,11 @@
Provides: weakremover(saxon8-sql)
Provides: weakremover(saxon8-xom)
Provides: weakremover(saxon8-xpath)
+Provides: weakremover(saxon9)
+Provides: weakremover(saxon9-demo)
+Provides: weakremover(saxon9-javadoc)
+Provides: weakremover(saxon9-manual)
+Provides: weakremover(saxon9-scripts)
Provides: weakremover(sblim-sfcc)
Provides: weakremover(sca-patterns-edir)
Provides: weakremover(sca-patterns-filr)
@@ -37383,6 +37407,9 @@
Provides: weakremover(wok-plugins-gingerbase)
Provides: weakremover(wok-plugins-kimchi)
Provides: weakremover(wordpass)
+Provides: weakremover(ws-jaxme)
+Provides: weakremover(ws-jaxme-javadoc)
+Provides: weakremover(ws-jaxme-manual)
Provides: weakremover(wt-dbo)
Provides: weakremover(wvdial)
Provides: weakremover(wvstreams)
@@ -37491,6 +37518,10 @@
Provides: weakremover(xorg-x11-libs)
Provides: weakremover(xournal)
Provides: weakremover(xplatproviders)
+Provides: weakremover(xpp2)
+Provides: weakremover(xpp2-demo)
+Provides: weakremover(xpp2-javadoc)
+Provides: weakremover(xpp2-manual)
Provides: weakremover(xrx)
Provides: weakremover(xstereograph)
Provides: weakremover(xtrabackup)
1
0
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 2023-08-31 14:41:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/000release-packages (Old)
and /work/SRC/openSUSE:Factory/.000release-packages.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "000release-packages"
Thu Aug 31 14:41:29 2023 rev:2473 rq: version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ MicroOS-release.spec ++++++
--- /var/tmp/diff_new_pack.mzsKX1/_old 2023-08-31 14:41:33.483968405 +0200
+++ /var/tmp/diff_new_pack.mzsKX1/_new 2023-08-31 14:41:33.487968548 +0200
@@ -17,7 +17,7 @@
Name: MicroOS-release
-Version: 20230830
+Version: 20230831
Release: 0
Summary: openSUSE MicroOS
License: GPL-2.0-or-later
@@ -177,9 +177,9 @@
%include %{SOURCE100}
Provides: %name-%version
Provides: product() = MicroOS
-Provides: product(MicroOS) = 20230830-0
+Provides: product(MicroOS) = 20230831-0
Provides: product-label() = openSUSE%20MicroOS
-Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20230830
+Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20230831
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)
@@ -195,7 +195,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(dvd)
-Provides: product_flavor(MicroOS) = 20230830-0
+Provides: product_flavor(MicroOS) = 20230831-0
Summary: openSUSE MicroOS%{?betaversion: %{betaversion}}
%description dvd
@@ -211,7 +211,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance)
-Provides: product_flavor(MicroOS) = 20230830-0
+Provides: product_flavor(MicroOS) = 20230831-0
Summary: openSUSE MicroOS%{?betaversion: %{betaversion}}
%description appliance
@@ -276,11 +276,11 @@
<product schemeversion="0">
<vendor>openSUSE</vendor>
<name>MicroOS</name>
- <version>20230830</version>
+ <version>20230831</version>
<release>0</release>
<endoflife></endoflife>
<arch>%{_target_cpu}</arch>
- <cpeid>cpe:/o:opensuse:microos:20230830</cpeid>
+ <cpeid>cpe:/o:opensuse:microos:20230831</cpeid>
<productline>MicroOS</productline>
<register>
<pool>
++++++ openSUSE-Addon-NonOss-release.spec ++++++
--- /var/tmp/diff_new_pack.mzsKX1/_old 2023-08-31 14:41:33.511969406 +0200
+++ /var/tmp/diff_new_pack.mzsKX1/_new 2023-08-31 14:41:33.519969692 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package openSUSE-Addon-NonOss-release (Version 20230830)
+# spec file for package openSUSE-Addon-NonOss-release (Version 20230831)
#
# Copyright (c) 2023 openSUSE.
#
@@ -16,7 +16,7 @@
Name: openSUSE-Addon-NonOss-release
%define product openSUSE-Addon-NonOss
Summary: openSUSE NonOSS Addon%{?betaversion: %{betaversion}}
-Version: 20230830
+Version: 20230831
Release: 0
License: BSD-3-Clause
Group: System/Fhs
@@ -24,9 +24,9 @@
Provides: %name-%version
Provides: product() = openSUSE%2DAddon%2DNonOss
-Provides: product(openSUSE-Addon-NonOss) = 20230830-0
+Provides: product(openSUSE-Addon-NonOss) = 20230831-0
Provides: product-label() = non%20oss%20addon
-Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20230830
+Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20230831
AutoReqProv: on
@@ -49,10 +49,10 @@
<product schemeversion="0">
<vendor>openSUSE</vendor>
<name>openSUSE-Addon-NonOss</name>
- <version>20230830</version>
+ <version>20230831</version>
<release>0</release>
<arch>%{_target_cpu}</arch>
- <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20230830</cpeid>
+ <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20230831</cpeid>
<register>
<pool>
</pool>
++++++ openSUSE-release.spec ++++++
--- /var/tmp/diff_new_pack.mzsKX1/_old 2023-08-31 14:41:33.539970407 +0200
+++ /var/tmp/diff_new_pack.mzsKX1/_new 2023-08-31 14:41:33.543970550 +0200
@@ -20,7 +20,7 @@
#define betaversion %{nil}
%define codename Tumbleweed
Name: openSUSE-release
-Version: 20230830
+Version: 20230831
Release: 0
# 0 is the product release, not the build release of this package
Summary: openSUSE Tumbleweed
@@ -181,7 +181,7 @@
%include %{SOURCE100}
Provides: %name-%version
Provides: product() = openSUSE
-Provides: product(openSUSE) = 20230830-0
+Provides: product(openSUSE) = 20230831-0
%ifarch x86_64
Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64
%endif
@@ -195,7 +195,7 @@
Provides: product-register-target() = openSUSE%2DTumbleweed%2Daarch64
%endif
Provides: product-label() = openSUSE
-Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20230830
+Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20230831
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)
@@ -209,7 +209,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(ftp)
-Provides: product_flavor(openSUSE) = 20230830-0
+Provides: product_flavor(openSUSE) = 20230831-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description ftp
@@ -224,7 +224,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(mini)
-Provides: product_flavor(openSUSE) = 20230830-0
+Provides: product_flavor(openSUSE) = 20230831-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description mini
@@ -239,7 +239,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(dvd)
-Provides: product_flavor(openSUSE) = 20230830-0
+Provides: product_flavor(openSUSE) = 20230831-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description dvd
@@ -254,7 +254,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-kde)
-Provides: product_flavor(openSUSE) = 20230830-0
+Provides: product_flavor(openSUSE) = 20230831-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description livecd-kde
@@ -269,7 +269,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-x11)
-Provides: product_flavor(openSUSE) = 20230830-0
+Provides: product_flavor(openSUSE) = 20230831-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description livecd-x11
@@ -284,7 +284,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-gnome)
-Provides: product_flavor(openSUSE) = 20230830-0
+Provides: product_flavor(openSUSE) = 20230831-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description livecd-gnome
@@ -299,7 +299,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-xfce)
-Provides: product_flavor(openSUSE) = 20230830-0
+Provides: product_flavor(openSUSE) = 20230831-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description livecd-xfce
@@ -314,7 +314,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(usb-kde)
-Provides: product_flavor(openSUSE) = 20230830-0
+Provides: product_flavor(openSUSE) = 20230831-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description usb-kde
@@ -329,7 +329,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(usb-gnome)
-Provides: product_flavor(openSUSE) = 20230830-0
+Provides: product_flavor(openSUSE) = 20230831-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description usb-gnome
@@ -344,7 +344,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(usb-x11)
-Provides: product_flavor(openSUSE) = 20230830-0
+Provides: product_flavor(openSUSE) = 20230831-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description usb-x11
@@ -359,7 +359,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance)
-Provides: product_flavor(openSUSE) = 20230830-0
+Provides: product_flavor(openSUSE) = 20230831-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance
@@ -374,7 +374,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-docker)
-Provides: product_flavor(openSUSE) = 20230830-0
+Provides: product_flavor(openSUSE) = 20230831-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-docker
@@ -389,7 +389,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-kvm)
-Provides: product_flavor(openSUSE) = 20230830-0
+Provides: product_flavor(openSUSE) = 20230831-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-kvm
@@ -404,7 +404,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-vmware)
-Provides: product_flavor(openSUSE) = 20230830-0
+Provides: product_flavor(openSUSE) = 20230831-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-vmware
@@ -419,7 +419,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-openstack)
-Provides: product_flavor(openSUSE) = 20230830-0
+Provides: product_flavor(openSUSE) = 20230831-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-openstack
@@ -434,7 +434,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-hyperv)
-Provides: product_flavor(openSUSE) = 20230830-0
+Provides: product_flavor(openSUSE) = 20230831-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-hyperv
@@ -449,7 +449,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-vagrant)
-Provides: product_flavor(openSUSE) = 20230830-0
+Provides: product_flavor(openSUSE) = 20230831-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-vagrant
@@ -464,7 +464,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-wsl)
-Provides: product_flavor(openSUSE) = 20230830-0
+Provides: product_flavor(openSUSE) = 20230831-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-wsl
@@ -479,7 +479,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-custom)
-Provides: product_flavor(openSUSE) = 20230830-0
+Provides: product_flavor(openSUSE) = 20230831-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-custom
@@ -559,10 +559,10 @@
<product schemeversion="0">
<vendor>openSUSE</vendor>
<name>openSUSE</name>
- <version>20230830</version>
+ <version>20230831</version>
<release>0</release>
<arch>%{_target_cpu}</arch>
- <cpeid>cpe:/o:opensuse:opensuse:20230830</cpeid>
+ <cpeid>cpe:/o:opensuse:opensuse:20230831</cpeid>
<productline>openSUSE</productline>
<register>
<target>openSUSE-Tumbleweed-x86_64</target>
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package pam_p11 for openSUSE:Factory checked in at 2023-08-31 13:46:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pam_p11 (Old)
and /work/SRC/openSUSE:Factory/.pam_p11.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pam_p11"
Thu Aug 31 13:46:20 2023 rev:27 rq:1108233 version:0.5.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/pam_p11/pam_p11.changes 2023-02-16 16:56:50.378937506 +0100
+++ /work/SRC/openSUSE:Factory/.pam_p11.new.1766/pam_p11.changes 2023-08-31 13:52:30.562787709 +0200
@@ -1,0 +2,13 @@
+Tue Aug 29 13:36:20 UTC 2023 - Otto Hollmann <otto.hollmann(a)suse.com>
+
+- Update to version 0.5.0
+ * Add support for tokens that only contain a certificate
+ (and no public key)
+ * Fixed never-ending loop if the PIN is locked
+
+- Update to version 0.4.0
+ * Add Russian translation
+ * Add support for building with LibreSSL
+ * Add support for building with OpenSSL 3.0 and later
+
+-------------------------------------------------------------------
Old:
----
pam_p11-0.3.1.tar.gz
New:
----
pam_p11-0.5.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pam_p11.spec ++++++
--- /var/tmp/diff_new_pack.RtewwR/_old 2023-08-31 13:52:31.678827599 +0200
+++ /var/tmp/diff_new_pack.RtewwR/_new 2023-08-31 13:52:31.682827742 +0200
@@ -17,7 +17,7 @@
Name: pam_p11
-Version: 0.3.1
+Version: 0.5.0
Release: 0
Summary: PAM Authentication Module for Using Cryptographic Tokens
License: LGPL-2.1-or-later
++++++ pam_p11-0.3.1.tar.gz -> pam_p11-0.5.0.tar.gz ++++++
++++ 5453 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/pam_p11-0.3.1/NEWS new/pam_p11-0.5.0/NEWS
--- old/pam_p11-0.3.1/NEWS 2019-09-11 22:36:09.000000000 +0200
+++ new/pam_p11-0.5.0/NEWS 2023-08-03 01:35:31.000000000 +0200
@@ -1,5 +1,14 @@
NEWS for Pam_p11 -- History of user visible changes
+New in 0.5.0; 2023-08-03; Frank Morgner
+* Add support for tokens that only contain a certificate (and no public key)
+* Fixed never-ending loop if the PIN is locked
+
+New in 0.4.0; 2023-06-08; Frank Morgner
+* Add Russian translation
+* Add support for building with LibreSSL
+* Add support for building with OpenSSL 3.0 and later
+
New in 0.3.1; 2019-09-11; Frank Morgner
* CVE-2019-16058: Fixed buffer overflow when creating signatures longer than 256 bytes
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/pam_p11-0.3.1/README.md new/pam_p11-0.5.0/README.md
--- old/pam_p11-0.3.1/README.md 2019-09-11 22:29:30.000000000 +0200
+++ new/pam_p11-0.5.0/README.md 2023-08-03 01:38:33.000000000 +0200
@@ -13,16 +13,16 @@
Pam_p11 was written by an international team and is licensed as Open Source software under the LGPL license.
-[![Build Status](https://travis-ci.org/OpenSC/pam_p11.svg?branch=master)](https://tr… [![Coverity Scan Status](https://scan.coverity.com/projects/15452/badge.svg)](https://scan.c…
+[![GitHub CI Status](https://img.shields.io/github/actions/workflow/status/OpenSC/pam_p1… [![Coverity Scan CI Status](https://img.shields.io/coverity/scan/15452.svg?label=Coverity%20Sca… [![CodeQL CI Status](https://img.shields.io/github/actions/workflow/status/OpenSC/pam_p1…
## Installing pam_p11
Installation is quite easy:
```
-wget https://github.com/OpenSC/pam_p11/releases/download/pam_p11-0.1.6/pam_p11-0…
-tar xfvz pam_p11-0.1.6.tar.gz
-cd pam_p11-0.1.6
+wget https://github.com/OpenSC/pam_p11/releases/download/pam_p11-0.5.0/pam_p11-0…
+tar xfvz pam_p11-0.5.0.tar.gz
+cd pam_p11-0.5.0
./configure --prefix=/usr --libdir=/lib/
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/pam_p11-0.3.1/compile new/pam_p11-0.5.0/compile
--- old/pam_p11-0.3.1/compile 2017-01-25 19:15:10.000000000 +0100
+++ new/pam_p11-0.5.0/compile 2020-02-05 15:31:03.000000000 +0100
@@ -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-2018 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
@@ -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/pam_p11-0.3.1/config.h.in new/pam_p11-0.5.0/config.h.in
--- old/pam_p11-0.3.1/config.h.in 2019-09-11 22:36:22.000000000 +0200
+++ new/pam_p11-0.5.0/config.h.in 2023-08-03 01:39:01.000000000 +0200
@@ -25,15 +25,6 @@
/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
#undef HAVE_DOPRNT
-/* Define to 1 if you have the `EVP_MD_CTX_free' function. */
-#undef HAVE_EVP_MD_CTX_FREE
-
-/* Define to 1 if you have the `EVP_MD_CTX_new' function. */
-#undef HAVE_EVP_MD_CTX_NEW
-
-/* Define to 1 if you have the `EVP_MD_CTX_reset' function. */
-#undef HAVE_EVP_MD_CTX_RESET
-
/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_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/pam_p11-0.3.1/configure.ac new/pam_p11-0.5.0/configure.ac
--- old/pam_p11-0.3.1/configure.ac 2019-09-11 22:30:15.000000000 +0200
+++ new/pam_p11-0.5.0/configure.ac 2023-08-03 01:37:50.000000000 +0200
@@ -1,8 +1,8 @@
AC_PREREQ(2.60)
define([PACKAGE_VERSION_MAJOR], [0])
-define([PACKAGE_VERSION_MINOR], [3])
-define([PACKAGE_VERSION_FIX], [1])
+define([PACKAGE_VERSION_MINOR], [5])
+define([PACKAGE_VERSION_FIX], [0])
define([PACKAGE_SUFFIX], [])
define([PRODUCT_BUGREPORT], [https://github.com/OpenSC/pam_p11/issues]
@@ -50,7 +50,7 @@
AM_GNU_GETTEXT_VERSION(0.18.3)
dnl Add the languages which your application supports here.
-ALL_LINGUAS="de it"
+ALL_LINGUAS="de it ru"
dnl Checks for programs.
AC_PROG_CPP
@@ -70,11 +70,11 @@
PKG_CHECK_MODULES([LIBP11], [libp11 >= 0.2.4],, [AC_MSG_ERROR([libp11 is required])])
PKG_CHECK_MODULES(
[OPENSSL],
- [libcrypto >= 0.9.7],
+ [libcrypto >= 1.1.1],
,
[PKG_CHECK_MODULES(
[OPENSSL],
- [openssl >= 0.9.7],
+ [openssl >= 1.1.1],
,
[AC_CHECK_LIB(
[crypto],
@@ -85,10 +85,10 @@
)]
)
-saved_LIBS="$LIBS"
-LIBS="$OPENSSL_LIBS $LIBS"
-AC_CHECK_FUNCS(EVP_MD_CTX_new EVP_MD_CTX_free EVP_MD_CTX_reset)
-LIBS="$saved_LIBS"
+#saved_LIBS="$LIBS"
+#LIBS="$OPENSSL_LIBS $LIBS"
+#AC_CHECK_FUNCS(EVP_MD_CTX_new EVP_MD_CTX_free EVP_MD_CTX_reset)
+#LIBS="$saved_LIBS"
if test -z "${PAM_LIBS}"; then
AC_ARG_VAR([PAM_CFLAGS], [C compiler flags for pam])
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/pam_p11-0.3.1/m4/libtool.m4 new/pam_p11-0.5.0/m4/libtool.m4
--- old/pam_p11-0.3.1/m4/libtool.m4 2016-08-20 14:34:31.000000000 +0200
+++ new/pam_p11-0.5.0/m4/libtool.m4 2020-03-02 10:35:42.000000000 +0100
@@ -1041,8 +1041,8 @@
_LT_EOF
echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
$LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
- echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
- $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+ echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+ $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
$RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
cat > conftest.c << _LT_EOF
@@ -1492,7 +1492,7 @@
m4_defun([_LT_PROG_AR],
[AC_CHECK_TOOLS(AR, [ar], false)
: ${AR=ar}
-: ${AR_FLAGS=cru}
+: ${AR_FLAGS=cr}
_LT_DECL([], [AR], [1], [The archiver])
_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
@@ -4063,7 +4063,8 @@
if AC_TRY_EVAL(ac_compile); then
# Now try to grab the symbols.
nlist=conftest.nm
- if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+ $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD
+ if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
@@ -4703,6 +4704,12 @@
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
+ # flang / f18. f95 an alias for gfortran or flang on Debian
+ flang* | f18* | f95*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
# icc used to be incompatible with GCC.
# ICC 10 doesn't accept -KPIC any more.
icc* | ifort*)
@@ -6438,7 +6445,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
else
GXX=no
@@ -6813,7 +6820,7 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
if test yes = "$GXX"; then
@@ -6878,7 +6885,7 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
if test yes = "$GXX"; then
@@ -7217,7 +7224,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
else
# FIXME: insert proper C++ library support
@@ -7301,7 +7308,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
else
# g++ 2.7 appears to require '-G' NOT '-shared' on this
# platform.
@@ -7312,7 +7319,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
fi
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
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/pam_p11-0.3.1/missing new/pam_p11-0.5.0/missing
--- old/pam_p11-0.3.1/missing 2017-01-25 19:15:10.000000000 +0100
+++ new/pam_p11-0.5.0/missing 2020-02-05 15:31:03.000000000 +0100
@@ -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-2018 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:
Binary files old/pam_p11-0.3.1/po/de.gmo and new/pam_p11-0.5.0/po/de.gmo differ
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/pam_p11-0.3.1/po/de.po new/pam_p11-0.5.0/po/de.po
--- old/pam_p11-0.3.1/po/de.po 2019-09-11 22:42:23.000000000 +0200
+++ new/pam_p11-0.5.0/po/de.po 2023-08-03 01:43:58.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: pam_p11 0.1.7_git\n"
"Report-Msgid-Bugs-To: https://github.com/OpenSC/pam_p11/issues\n"
-"POT-Creation-Date: 2019-09-11 22:42+0200\n"
+"POT-Creation-Date: 2023-08-03 01:39+0200\n"
"PO-Revision-Date: 2018-04-05 11:14+0200\n"
"Last-Translator: Frank Morgner <frankmorgner(a)gmail.com>\n"
"Language-Team: German\n"
@@ -17,98 +17,98 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/pam_p11.c:205
+#: src/pam_p11.c:194
msgid "Error loading PKCS#11 module"
msgstr "Fehler beim Laden des PKCS#11-Moduls"
-#: src/pam_p11.c:213 src/pam_p11.c:265
+#: src/pam_p11.c:202 src/pam_p11.c:254
msgid "Error initializing PKCS#11 module"
msgstr "Fehler beim Initialisieren des PKCS#11-Moduls"
-#: src/pam_p11.c:333
+#: src/pam_p11.c:322
msgid " (last try)"
msgstr " (letzter Versuch)"
-#: src/pam_p11.c:340
+#: src/pam_p11.c:329
#, c-format
msgid "Login on PIN pad with %s%s"
msgstr "Login auf dem PIN-Pad mit %s%s"
-#: src/pam_p11.c:346
+#: src/pam_p11.c:335
#, c-format
msgid "Login with %s%s: "
msgstr "Login mit %s%s: "
-#: src/pam_p11.c:370
+#: src/pam_p11.c:359
msgid "Invalid PIN"
msgstr ""
-#: src/pam_p11.c:378
+#: src/pam_p11.c:367
msgid "PIN not verified; PIN locked"
msgstr "PIN nicht verifiziert; PIN gesperrt"
-#: src/pam_p11.c:380
+#: src/pam_p11.c:369
msgid "PIN not verified; one try remaining"
msgstr "PIN nicht verifiziert; ein Versuch verbleibend"
-#: src/pam_p11.c:382
+#: src/pam_p11.c:371
msgid "PIN not verified"
msgstr "PIN nicht verifiziert"
-#: src/pam_p11.c:424
+#: src/pam_p11.c:413
#, c-format
msgid "Change PIN with PUK on PIN pad for %s"
msgstr "Ändere PIN mit PUK auf dem PIN-Pad für %s"
-#: src/pam_p11.c:428
+#: src/pam_p11.c:417
#, c-format
msgid "Change PIN on PIN pad for %s"
msgstr "Ändere PIN auf dem PIN-Pad für %s"
-#: src/pam_p11.c:435
+#: src/pam_p11.c:424
#, c-format
msgid "PUK for %s: "
msgstr "PUK für %s: "
-#: src/pam_p11.c:446
+#: src/pam_p11.c:435
msgid "Current PIN: "
msgstr "Aktuelle PIN: "
-#: src/pam_p11.c:464
+#: src/pam_p11.c:453
msgid "Enter new PIN: "
msgstr "Neue PIN eingeben: "
-#: src/pam_p11.c:467
+#: src/pam_p11.c:456
msgid "Retype new PIN: "
msgstr "Neue PIN wiederholen: "
-#: src/pam_p11.c:471
+#: src/pam_p11.c:460
msgid "PINs don't match"
msgstr "PINs verschieden"
-#: src/pam_p11.c:478
+#: src/pam_p11.c:467
#, fuzzy
msgid "PIN not changed; PIN locked"
msgstr "PIN nicht verifiziert; PIN gesperrt"
-#: src/pam_p11.c:480
+#: src/pam_p11.c:469
#, fuzzy
msgid "PIN not changed; one try remaining"
msgstr "PIN nicht verifiziert; ein Versuch verbleibend"
-#: src/pam_p11.c:482
+#: src/pam_p11.c:471
#, fuzzy
msgid "PIN not changed"
msgstr "PIN nicht verifiziert"
-#: src/pam_p11.c:610
+#: src/pam_p11.c:596
msgid "No token found"
msgstr "Kein Token gefunden"
-#: src/pam_p11.c:612
-msgid "No authorized keys on token"
-msgstr "Keine autorisierten Schlüssel auf dem Token"
+#: src/pam_p11.c:599
+msgid "Could not find authorized keys on any of the tokens."
+msgstr "Auf keinem der Token konnten autorisierte Schlüssel gefunden werden."
-#: src/pam_p11.c:674
+#: src/pam_p11.c:660
msgid "Error verifying key"
msgstr "Fehler beim Verifizieren des Schlüssels"
Binary files old/pam_p11-0.3.1/po/it.gmo and new/pam_p11-0.5.0/po/it.gmo differ
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/pam_p11-0.3.1/po/it.po new/pam_p11-0.5.0/po/it.po
--- old/pam_p11-0.3.1/po/it.po 2019-09-11 22:42:23.000000000 +0200
+++ new/pam_p11-0.5.0/po/it.po 2023-08-03 01:43:58.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: pam-p11\n"
"Report-Msgid-Bugs-To: https://github.com/OpenSC/pam_p11/issues\n"
-"POT-Creation-Date: 2019-09-11 22:42+0200\n"
+"POT-Creation-Date: 2023-08-03 01:39+0200\n"
"PO-Revision-Date: 2019-02-28 14:03+0000\n"
"Last-Translator: Milo Casagrande <milo(a)milo.name>\n"
"Language-Team: Italian <tp(a)lists.linux.it>\n"
@@ -16,95 +16,95 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/pam_p11.c:205
+#: src/pam_p11.c:194
msgid "Error loading PKCS#11 module"
msgstr "Errore nel caricare il modulo PKCS#11"
-#: src/pam_p11.c:213 src/pam_p11.c:265
+#: src/pam_p11.c:202 src/pam_p11.c:254
msgid "Error initializing PKCS#11 module"
msgstr "Errore nell'inizializzare il modulo PKCS#11"
-#: src/pam_p11.c:333
+#: src/pam_p11.c:322
msgid " (last try)"
msgstr " (ultimo tentativo)"
-#: src/pam_p11.c:340
+#: src/pam_p11.c:329
#, c-format
msgid "Login on PIN pad with %s%s"
msgstr "Accesso su dispositivo inserimento PIN con %s%s"
-#: src/pam_p11.c:346
+#: src/pam_p11.c:335
#, c-format
msgid "Login with %s%s: "
msgstr "Accesso con %s%s: "
-#: src/pam_p11.c:370
+#: src/pam_p11.c:359
msgid "Invalid PIN"
msgstr ""
-#: src/pam_p11.c:378
+#: src/pam_p11.c:367
msgid "PIN not verified; PIN locked"
msgstr "PIN non verificato; PIN bloccato"
-#: src/pam_p11.c:380
+#: src/pam_p11.c:369
msgid "PIN not verified; one try remaining"
msgstr "PIN non verificato; un tentativo rimasto"
-#: src/pam_p11.c:382
+#: src/pam_p11.c:371
msgid "PIN not verified"
msgstr "PIN non verificato"
-#: src/pam_p11.c:424
+#: src/pam_p11.c:413
#, c-format
msgid "Change PIN with PUK on PIN pad for %s"
msgstr "Modifica del PIN con PUK su dispositivo inserimento PIN per %s"
-#: src/pam_p11.c:428
+#: src/pam_p11.c:417
#, c-format
msgid "Change PIN on PIN pad for %s"
msgstr "Modifica del PIN su dispositivo inserimento PIN per %s"
-#: src/pam_p11.c:435
+#: src/pam_p11.c:424
#, c-format
msgid "PUK for %s: "
msgstr "PUK per %s: "
-#: src/pam_p11.c:446
+#: src/pam_p11.c:435
msgid "Current PIN: "
msgstr "PIN attuale: "
-#: src/pam_p11.c:464
+#: src/pam_p11.c:453
msgid "Enter new PIN: "
msgstr "Inserire nuovo PIN: "
-#: src/pam_p11.c:467
+#: src/pam_p11.c:456
msgid "Retype new PIN: "
msgstr "Ripetere nuovo PIN: "
-#: src/pam_p11.c:471
+#: src/pam_p11.c:460
msgid "PINs don't match"
msgstr "I PIN non sono uguali"
-#: src/pam_p11.c:478
+#: src/pam_p11.c:467
msgid "PIN not changed; PIN locked"
msgstr "PIN non modificato; PIN bloccato"
-#: src/pam_p11.c:480
+#: src/pam_p11.c:469
msgid "PIN not changed; one try remaining"
msgstr "PIN non modificato; un tentativo rimasto"
-#: src/pam_p11.c:482
+#: src/pam_p11.c:471
msgid "PIN not changed"
msgstr "PIN non modificato"
-#: src/pam_p11.c:610
+#: src/pam_p11.c:596
msgid "No token found"
msgstr "Nessun token trovato"
-#: src/pam_p11.c:612
-msgid "No authorized keys on token"
-msgstr "Nessuna chiave autorizzata sul token"
+#: src/pam_p11.c:599
+msgid "Could not find authorized keys on any of the tokens."
+msgstr "Impossibile trovare chiavi autorizzate su nessuno dei token."
-#: src/pam_p11.c:674
+#: src/pam_p11.c:660
msgid "Error verifying key"
msgstr "Errore nel verificare la chiave"
Binary files old/pam_p11-0.3.1/po/ru.gmo and new/pam_p11-0.5.0/po/ru.gmo differ
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/pam_p11-0.3.1/po/ru.po new/pam_p11-0.5.0/po/ru.po
--- old/pam_p11-0.3.1/po/ru.po 1970-01-01 01:00:00.000000000 +0100
+++ new/pam_p11-0.5.0/po/ru.po 2023-08-03 23:15:52.000000000 +0200
@@ -0,0 +1,104 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: pam_p11 0.5.0\n"
+"Report-Msgid-Bugs-To: https://github.com/OpenSC/pam_p11/issues\n"
+"POT-Creation-Date: 2023-08-03 01:39+0200\n"
+"Last-Translator: Mikhail Novosyolov <m.novosyolov(a)rosalinux.ru\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/pam_p11.c:194
+msgid "Error loading PKCS#11 module"
+msgstr "Ошибка при загрузке модуля PKCS#11"
+
+#: src/pam_p11.c:202 src/pam_p11.c:254
+msgid "Error initializing PKCS#11 module"
+msgstr "Ошибка при инициализации модуля PKCS#11"
+
+#: src/pam_p11.c:322
+msgid " (last try)"
+msgstr " (последняя попытка)"
+
+#: src/pam_p11.c:329
+#, c-format
+msgid "Login on PIN pad with %s%s"
+msgstr "Войдите на панели ввода с %s%s"
+
+#: src/pam_p11.c:335
+#, c-format
+msgid "Login with %s%s: "
+msgstr "Вход с %s%s: "
+
+#: src/pam_p11.c:359
+msgid "Invalid PIN"
+msgstr "Неправильный PIN"
+
+#: src/pam_p11.c:367
+msgid "PIN not verified; PIN locked"
+msgstr "PIN не прошел проверку; PIN заблокирован"
+
+#: src/pam_p11.c:369
+msgid "PIN not verified; one try remaining"
+msgstr "PIN не прошел проверку; осталась одна попытка"
+
+#: src/pam_p11.c:371
+msgid "PIN not verified"
+msgstr "PIN не прошел проверку"
+
+#: src/pam_p11.c:413
+#, c-format
+msgid "Change PIN with PUK on PIN pad for %s"
+msgstr "Замените PIN вводом PUK-кода на панели ввода %s"
+
+#: src/pam_p11.c:417
+#, c-format
+msgid "Change PIN on PIN pad for %s"
+msgstr "Замените PIN на панели ввода %s"
+
+#: src/pam_p11.c:424
+#, c-format
+msgid "PUK for %s: "
+msgstr "PUK для %s: "
+
+#: src/pam_p11.c:435
+msgid "Current PIN: "
+msgstr "Текущий PIN: "
+
+#: src/pam_p11.c:453
+msgid "Enter new PIN: "
+msgstr "Введите новый PIN: "
+
+#: src/pam_p11.c:456
+msgid "Retype new PIN: "
+msgstr "Еще раз введите новый PIN: "
+
+#: src/pam_p11.c:460
+msgid "PINs don't match"
+msgstr "PIN-коды не совпадают"
+
+#: src/pam_p11.c:467
+msgid "PIN not changed; PIN locked"
+msgstr "PIN не заменен; PIN заблокирован"
+
+#: src/pam_p11.c:469
+msgid "PIN not changed; one try remaining"
+msgstr "PIN не заменен; осталась одна попытка"
+
+#: src/pam_p11.c:471
+msgid "PIN not changed"
+msgstr "PIN не заменен"
+
+#: src/pam_p11.c:596
+msgid "No token found"
+msgstr "Не найден ни один токен"
+
+#: src/pam_p11.c:599
+#, fuzzy
+msgid "Could not find authorized keys on any of the tokens."
+msgstr "Не удалось найти авторизованные ключи ни на одном из токенов."
+
+#: src/pam_p11.c:660
+msgid "Error verifying key"
+msgstr "Ошибка при проверке ключа"
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/pam_p11-0.3.1/src/base64.c new/pam_p11-0.5.0/src/base64.c
--- old/pam_p11-0.3.1/src/base64.c 2019-08-12 23:28:30.000000000 +0200
+++ new/pam_p11-0.5.0/src/base64.c 2023-08-03 16:07:36.000000000 +0200
@@ -50,7 +50,7 @@
unsigned char b;
int k = *in;
- if (k < 0 || k >= (int)sizeof(bin_table))
+ if (k < 0)
return -1;
if (k == 0 && c == 0)
return 0;
@@ -75,8 +75,8 @@
int sc_base64_decode(const char *in, unsigned char *out, size_t outlen)
{
- int len = 0, r, skip;
- unsigned int i;
+ int len = 0, r = 0, skip = 0;
+ unsigned int i = 0;
while ((r = from_base64(in, &i, &skip)) > 0) {
int finished = 0, s = 16;
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/pam_p11-0.3.1/src/match_opensc.c new/pam_p11-0.5.0/src/match_opensc.c
--- old/pam_p11-0.3.1/src/match_opensc.c 2019-04-17 01:28:53.000000000 +0200
+++ new/pam_p11-0.5.0/src/match_opensc.c 2023-05-17 14:30:54.000000000 +0200
@@ -48,9 +48,15 @@
if (key == NULL)
continue;
+#if OPENSSL_VERSION_NUMBER < 0x30000000L
if (1 == EVP_PKEY_cmp(authkey, key)) {
found = 1;
}
+#else
+ if (1 == EVP_PKEY_eq(authkey, key)) {
+ found = 1;
+ }
+#endif
EVP_PKEY_free(key);
} while (found == 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/pam_p11-0.3.1/src/match_openssh.c new/pam_p11-0.5.0/src/match_openssh.c
--- old/pam_p11-0.3.1/src/match_openssh.c 2019-04-17 01:28:53.000000000 +0200
+++ new/pam_p11-0.5.0/src/match_openssh.c 2023-06-08 17:05:53.000000000 +0200
@@ -6,6 +6,11 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <openssl/opensslv.h>
+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
+#include <openssl/param_build.h>
+#include <openssl/core_names.h>
+#endif
#include <openssl/evp.h>
#include <openssl/bn.h>
#include <openssl/x509.h>
@@ -17,7 +22,8 @@
#define OPENSSH_LINE_MAX 16384 /* from openssh SSH_MAX_PUBKEY_BYTES */
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined (LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3000000L)
void RSA_get0_key(const RSA *r,
const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
{
@@ -57,21 +63,133 @@
#endif
-static EVP_PKEY *ssh1_line_to_key(char *line)
+static EVP_PKEY *init_evp_pkey_rsa(BIGNUM *rsa_n, BIGNUM *rsa_e)
{
- EVP_PKEY *key;
- RSA *rsa;
- char *b, *e, *m, *c;
- BIGNUM *rsa_e, *rsa_n;
+ EVP_PKEY *key = NULL;
+ if (!rsa_e || !rsa_n)
+ return NULL;
+
+#if OPENSSL_VERSION_NUMBER < 0x30000000L
key = EVP_PKEY_new();
if (!key)
return NULL;
- rsa = RSA_new();
+ RSA *rsa = RSA_new();
+ if (!rsa) {
+ EVP_PKEY_free(key);
+ return NULL;
+ }
- if (!rsa)
- goto err;
+ /* set e and n */
+ if (!RSA_set0_key(rsa, rsa_n, rsa_e, NULL)) {
+ RSA_free(rsa);
+ EVP_PKEY_free(key);
+ return NULL;
+ }
+
+ EVP_PKEY_assign_RSA(key, rsa);
+#else
+ OSSL_PARAM_BLD *bld = NULL;
+ OSSL_PARAM *params = NULL;
+ EVP_PKEY_CTX *pctx = NULL;
+
+ if ((pctx = EVP_PKEY_CTX_new_from_name(NULL, "RSA", NULL)) == NULL
+ || (bld = OSSL_PARAM_BLD_new()) == NULL
+ || !OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_RSA_N, rsa_n)
+ || !OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_RSA_E, rsa_e)
+ || (params = OSSL_PARAM_BLD_to_param(bld)) == NULL
+ || EVP_PKEY_fromdata_init(pctx) <= 0
+ || EVP_PKEY_fromdata(pctx, &key, EVP_PKEY_PUBLIC_KEY, params) <= 0) {
+ EVP_PKEY_CTX_free(pctx);
+ OSSL_PARAM_free(params);
+ OSSL_PARAM_BLD_free(bld);
+ return NULL;
+ }
+#endif
+
+ return key;
+}
+
+static EVP_PKEY *init_evp_pkey_ec(int nid_curve, const unsigned char *buf, size_t len)
+{
+ EVP_PKEY *key = NULL;
+
+#if defined(LIBRESSL_VERSION_NUMBER)
+ BIGNUM *x = NULL;
+ BIGNUM *y = NULL;
+ EC_KEY *ec_key = NULL;
+
+ if ((key = EVP_PKEY_new()) == NULL
+ || (x = BN_bin2bn(buf + 1, len >> 1, NULL)) == NULL
+ || (y = BN_bin2bn(buf + 1 + (len >> 1), len >> 1, NULL)) == NULL
+ || ((ec_key = EC_KEY_new_by_curve_name(nid_curve)) == NULL
+ || (1 != EC_KEY_set_public_key_affine_coordinates(ec_key, x, y))
+ || (1 != EVP_PKEY_assign_EC_KEY(key, ec_key)))) {
+ EVP_PKEY_free(key);
+ BN_free(x);
+ BN_free(y);
+ EC_KEY_free(ec_key);
+ EVP_PKEY_free(key);
+ return NULL;
+ }
+#else
+
+#if OPENSSL_VERSION_NUMBER < 0x30000000L
+ BN_CTX *ctx = NULL;
+ EC_KEY *ec_key = NULL;
+
+ if ((key = EVP_PKEY_new()) == NULL
+ || (ctx = BN_CTX_new()) == NULL
+ || (ec_key = EC_KEY_new_by_curve_name(nid_curve)) == NULL
+ || (1 != EC_KEY_oct2key(ec_key, buf, len, ctx))
+ || (1 != EVP_PKEY_assign_EC_KEY(key, ec_key))) {
+ EC_KEY_free(ec_key);
+ BN_CTX_free(ctx);
+ EVP_PKEY_free(key);
+ return NULL;
+ }
+#else
+ OSSL_PARAM_BLD *bld = NULL;
+ OSSL_PARAM *params = NULL;
+ EVP_PKEY_CTX *pctx = NULL;
+ char *group_name;
+ switch (nid_curve) {
+ case NID_X9_62_prime256v1:
+ group_name = SN_X9_62_prime256v1;
+ break;
+ case NID_secp384r1:
+ group_name = SN_secp384r1;
+ break;
+ case NID_secp521r1:
+ group_name = SN_secp521r1;
+ break;
+ default:
+ return NULL;
+ }
+
+ if ((pctx = EVP_PKEY_CTX_new_from_name(NULL, "EC", NULL)) == NULL
+ || (bld = OSSL_PARAM_BLD_new()) == NULL
+ || !OSSL_PARAM_BLD_push_utf8_string(bld, OSSL_PKEY_PARAM_GROUP_NAME, group_name, 0)
+ || !OSSL_PARAM_BLD_push_octet_string(bld, OSSL_PKEY_PARAM_PUB_KEY, buf, len)
+ || (params = OSSL_PARAM_BLD_to_param(bld)) == NULL
+ || EVP_PKEY_fromdata_init(pctx) <= 0
+ || EVP_PKEY_fromdata(pctx, &key, EVP_PKEY_PUBLIC_KEY, params) <= 0) {
+ EVP_PKEY_CTX_free(pctx);
+ OSSL_PARAM_free(params);
+ OSSL_PARAM_BLD_free(bld);
+ return NULL;
+ }
+#endif
+#endif
+ return key;
+}
+
+static EVP_PKEY *ssh1_line_to_key(char *line)
+{
+ EVP_PKEY *key = NULL;
+ char *b, *e, *m, *c;
+ BIGNUM *rsa_e = NULL, *rsa_n = NULL;
/* first digitstring: the bits */
b = line;
@@ -82,7 +200,7 @@
/* must be a whitespace */
if (*e != ' ' && *e != '\t')
- return NULL;
+ goto err;
/* cut the string in two part */
*e = 0;
@@ -98,7 +216,7 @@
/* must be a whitespace */
if (*m != ' ' && *m != '\t')
- return NULL;
+ goto err;
/* cut the string in two part */
*m = 0;
@@ -113,7 +231,7 @@
/* could be a whitespace or end of line */
if (*c != ' ' && *c != '\t' && *c != '\n' && *c != '\r' && *c != 0)
- return NULL;
+ goto err;
if (*c == ' ' || *c == '\t') {
*c = 0;
@@ -139,24 +257,26 @@
BN_dec2bn(&rsa_e, e);
BN_dec2bn(&rsa_n, m);
- if (!RSA_set0_key(rsa, rsa_n, rsa_e, NULL))
- goto err;
- EVP_PKEY_assign_RSA(key, rsa);
- return key;
+ key = init_evp_pkey_rsa(rsa_n, rsa_e);
- err:
- EVP_PKEY_free(key);
- return NULL;
+err:
+ if (!key) {
+ if (rsa_n)
+ BN_free(rsa_n);
+ if (rsa_e)
+ BN_free(rsa_e);
+ }
+
+ return key;
}
extern int sc_base64_decode(const char *in, unsigned char *out, size_t outlen);
static EVP_PKEY *ssh2_line_to_key(char *line)
{
- EVP_PKEY *key;
- RSA *rsa;
- BIGNUM *rsa_e, *rsa_n;
+ EVP_PKEY *key = NULL;
+ BIGNUM *rsa_e = NULL, *rsa_n = NULL;
unsigned char decoded[OPENSSH_LINE_MAX];
int len;
@@ -167,7 +287,7 @@
b = line;
if (!b)
- return NULL;
+ goto err;
/* find the first whitespace */
while (*b && *b != ' ')
@@ -184,7 +304,7 @@
/* decode binary data */
if (sc_base64_decode(b, decoded, OPENSSH_LINE_MAX) < 0)
- return NULL;
+ goto err;
i = 0;
@@ -196,13 +316,13 @@
/* now: key_from_blob */
if (strncmp((char *)&decoded[i], "ssh-rsa", 7) != 0)
- return NULL;
+ goto err;
i += len;
/* to prevent access beyond 'decoded' array, index 'i' must be always checked */
if ( i + 4 > OPENSSH_LINE_MAX )
- return NULL;
+ goto err;
/* get integer from blob */
len =
(decoded[i] << 24) + (decoded[i + 1] << 16) +
@@ -210,13 +330,13 @@
i += 4;
if ( i + len > OPENSSH_LINE_MAX )
- return NULL;
+ goto err;
/* get bignum */
rsa_e = BN_bin2bn(decoded + i, len, NULL);
i += len;
if ( i + 4 > OPENSSH_LINE_MAX )
- return NULL;
+ goto err;
/* get integer from blob */
len =
(decoded[i] << 24) + (decoded[i + 1] << 16) +
@@ -224,31 +344,25 @@
i += 4;
if ( i + len > OPENSSH_LINE_MAX )
- return NULL;
+ goto err;
/* get bignum */
rsa_n = BN_bin2bn(decoded + i, len, NULL);
- key = EVP_PKEY_new();
- rsa = RSA_new();
+ key = init_evp_pkey_rsa(rsa_n, rsa_e);
- /* set e and n */
- if (!RSA_set0_key(rsa, rsa_n, rsa_e, NULL)) {
- EVP_PKEY_free(key);
- RSA_free(rsa);
- return NULL;
+err:
+ if (!key) {
+ if (rsa_n)
+ BN_free(rsa_n);
+ if (rsa_e)
+ BN_free(rsa_e);
}
- EVP_PKEY_assign_RSA(key, rsa);
return key;
}
static EVP_PKEY *ssh_nistp_line_to_key(char *line)
{
- EVP_PKEY *key;
- EC_KEY *ec_key;
- BIGNUM *x;
- BIGNUM *y;
-
unsigned char decoded[OPENSSH_LINE_MAX];
int len;
int flen;
@@ -332,27 +446,8 @@
/* check uncompressed indicator */
if (decoded[i] != 4 )
return NULL;
- i++;
-
- /* create key */
- ec_key = EC_KEY_new_by_curve_name(nid);
- /* read point coordinates */
- x = BN_bin2bn(decoded + i, flen, NULL);
- i += flen;
- y = BN_bin2bn(decoded + i, flen, NULL);
-
- /* do error checking here: valid x, y, ec_key, point on curve.. */
- if (!EC_KEY_set_public_key_affine_coordinates(ec_key, x, y)) {
- EC_KEY_free(ec_key);
- BN_free(x);
- BN_free(y);
- return NULL;
- }
-
- key = EVP_PKEY_new();
- EVP_PKEY_assign_EC_KEY(key, ec_key);
- return key;
+ return init_evp_pkey_ec(nid, decoded + i, len);
}
extern int match_user_openssh(EVP_PKEY *authkey, const char *login)
@@ -400,9 +495,15 @@
if (key == NULL)
continue;
+#if OPENSSL_VERSION_NUMBER < 0x30000000L
if (1 == EVP_PKEY_cmp(authkey, key)) {
found = 1;
}
+#else
+ if (1 == EVP_PKEY_eq(authkey, key)) {
+ found = 1;
+ }
+#endif
EVP_PKEY_free(key);
} while (found == 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/pam_p11-0.3.1/src/pam_p11.c new/pam_p11-0.5.0/src/pam_p11.c
--- old/pam_p11-0.3.1/src/pam_p11.c 2019-09-08 21:20:21.000000000 +0200
+++ new/pam_p11-0.5.0/src/pam_p11.c 2023-08-03 01:23:19.000000000 +0200
@@ -33,17 +33,6 @@
#include <regex.h>
#include <stdlib.h>
-/* openssl deprecated API emulation */
-#ifndef HAVE_EVP_MD_CTX_NEW
-#define EVP_MD_CTX_new() EVP_MD_CTX_create()
-#endif
-#ifndef HAVE_EVP_MD_CTX_FREE
-#define EVP_MD_CTX_free(ctx) EVP_MD_CTX_destroy((ctx))
-#endif
-#ifndef HAVE_EVP_MD_CTX_RESET
-#define EVP_MD_CTX_reset(ctx) EVP_MD_CTX_cleanup((ctx))
-#endif
-
#ifdef ENABLE_NLS
#include <libintl.h>
#include <locale.h>
@@ -507,7 +496,8 @@
static int key_find(pam_handle_t *pamh, int flags, const char *user,
PKCS11_CTX *ctx, PKCS11_SLOT *slots, unsigned int nslots,
- PKCS11_SLOT **authslot, PKCS11_KEY **authkey)
+ PKCS11_SLOT **authslot, PKCS11_KEY **authkey,
+ EVP_PKEY **authpubkey, PKCS11_CERT **authcert)
{
int token_found = 0;
@@ -517,6 +507,7 @@
*authkey = NULL;
*authslot = NULL;
+ *authcert = NULL;
/* search all valuable slots for a key that is authorized by the user */
while (0 < nslots) {
@@ -532,6 +523,14 @@
break;
}
token_found = 1;
+ /* Update "slots" pointer: PKCS11 slots are implemented as array,
+ * so starting to look at slot + 1 and decrementing nslots accordingly
+ * will search the rest of slots. */
+ nslots -= (slot + 1 - slots);
+ slots = slot + 1;
+
+ if (slot->token->initialized == 0)
+ continue;
if (slot->token->loginRequired && slot->token->userPinLocked) {
pam_syslog(pamh, LOG_DEBUG, "%s: PIN locked",
@@ -551,10 +550,8 @@
if (1 != r) {
r = match_user_openssh(pubkey, user);
}
- if (NULL != pubkey) {
- EVP_PKEY_free(pubkey);
- }
if (1 == r) {
+ *authpubkey = pubkey;
*authkey = keys;
*authslot = slot;
pam_syslog(pamh, LOG_DEBUG, "Found %s",
@@ -577,14 +574,9 @@
if (1 != r) {
r = match_user_openssh(pubkey, user);
}
- if (NULL != pubkey) {
- EVP_PKEY_free(pubkey);
- }
if (1 == r) {
- *authkey = PKCS11_find_key(certs);
- if (NULL == *authkey) {
- continue;
- }
+ *authpubkey = pubkey;
+ *authcert = certs;
*authslot = slot;
pam_syslog(pamh, LOG_DEBUG, "Found %s",
certs->label);
@@ -596,20 +588,15 @@
count--;
}
}
-
- /* Try the next possible slot: PKCS11 slots are implemented as array,
- * so starting to look at slot++ and decrementing nslots accordingly
- * will search the rest of slots. */
- slot++;
- nslots -= (slot - slots);
- slots = slot;
- pam_syslog(pamh, LOG_DEBUG, "No authorized key found");
+ pam_syslog(pamh, LOG_DEBUG, "No authorized key found on token %s",
+ slot->token->label);
}
if (0 == token_found) {
prompt(flags, pamh, PAM_ERROR_MSG , NULL, _("No token found"));
} else {
- prompt(flags, pamh, PAM_ERROR_MSG , NULL, _("No authorized keys on token"));
+ prompt(flags, pamh, PAM_ERROR_MSG, NULL,
+ _("Could not find authorized keys on any of the tokens."));
}
return 0;
@@ -631,7 +618,7 @@
return ok;
}
-static int key_verify(pam_handle_t *pamh, int flags, PKCS11_KEY *authkey)
+static int key_verify(pam_handle_t *pamh, int flags, PKCS11_KEY *authkey, EVP_PKEY *pubkey)
{
int ok = 0;
unsigned char challenge[30];
@@ -640,7 +627,6 @@
const EVP_MD *md = EVP_sha1();
EVP_MD_CTX *md_ctx = EVP_MD_CTX_new();
EVP_PKEY *privkey = PKCS11_get_private_key(authkey);
- EVP_PKEY *pubkey = PKCS11_get_public_key(authkey);
if (NULL == privkey)
goto err;
@@ -695,6 +681,8 @@
PKCS11_CTX *ctx;
unsigned int nslots;
PKCS11_KEY *authkey;
+ PKCS11_CERT *authcert;
+ EVP_PKEY *authpubkey = NULL;
PKCS11_SLOT *slots, *authslot;
const char *user;
const char *pin_regex;
@@ -706,12 +694,21 @@
}
if (1 != key_find(pamh, flags, user, ctx, slots, nslots,
- &authslot, &authkey)) {
+ &authslot, &authkey, &authpubkey, &authcert)) {
r = PAM_AUTHINFO_UNAVAIL;
goto err;
}
- if (1 != key_login(pamh, flags, authslot, pin_regex)
- || 1 != key_verify(pamh, flags, authkey)) {
+
+ if (1 != key_login(pamh, flags, authslot, pin_regex))
+ goto err;
+
+ if (authkey == NULL && authcert) {
+ if (NULL == (authkey = PKCS11_find_key(authcert))) {
+ r = PAM_AUTHINFO_UNAVAIL;
+ goto err;
+ }
+ }
+ if (1 != key_verify(pamh, flags, authkey, authpubkey)) {
if (authslot->token->userPinLocked) {
r = PAM_MAXTRIES;
} else {
@@ -768,6 +765,8 @@
PKCS11_CTX *ctx;
unsigned int nslots;
PKCS11_KEY *authkey;
+ PKCS11_CERT *authcert;
+ EVP_PKEY *authpubkey = NULL;
PKCS11_SLOT *slots, *authslot;
const char *user, *pin_regex;
@@ -785,7 +784,7 @@
}
if (1 != key_find(pamh, flags, user, ctx, slots, nslots,
- &authslot, &authkey)) {
+ &authslot, &authkey, &authpubkey, &authcert)) {
r = PAM_AUTHINFO_UNAVAIL;
goto err;
}
@@ -809,6 +808,7 @@
r = PAM_SUCCESS;
err:
+ EVP_PKEY_free(authpubkey);
#ifdef TEST
module_data_cleanup(pamh, global_module_data, r);
#endif
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/pam_p11-0.3.1/src/test.c new/pam_p11-0.5.0/src/test.c
--- old/pam_p11-0.3.1/src/test.c 2019-04-17 01:28:53.000000000 +0200
+++ new/pam_p11-0.5.0/src/test.c 2023-06-08 17:05:53.000000000 +0200
@@ -58,8 +58,12 @@
/* initialize default values */
strcpy(module, LIBDIR "/opensc-pkcs11.so");
- if (0 != getlogin_r(user, sizeof user))
- goto err;
+ if (argc < 3) {
+ if (0 != getlogin_r(user, sizeof user)) {
+ perror("getlogin_r");
+ goto err;
+ }
+ }
switch (argc) {
case 3:
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-whatthepatch for openSUSE:Factory checked in at 2023-08-31 13:46:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-whatthepatch (Old)
and /work/SRC/openSUSE:Factory/.python-whatthepatch.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-whatthepatch"
Thu Aug 31 13:46:19 2023 rev:4 rq:1108221 version:1.0.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-whatthepatch/python-whatthepatch.changes 2022-11-16 15:44:05.888011585 +0100
+++ /work/SRC/openSUSE:Factory/.python-whatthepatch.new.1766/python-whatthepatch.changes 2023-08-31 13:52:28.146701352 +0200
@@ -1,0 +2,11 @@
+Wed Aug 30 03:47:25 UTC 2023 - Tony Jones <tonyj(a)suse.com>
+
+- Update to v1.0.5
+ * bugfix:min line in binary diff (#57)
+- from v1.0.4
+ * git binary patch explore (#53)
+ * nixify (#54)
+ * Rename default branch on build yaml (#52)
+ * Remove redundant wheel dep from pyproject.toml (#51)
+
+-------------------------------------------------------------------
Old:
----
whatthepatch-1.0.3.tar.gz
New:
----
whatthepatch-1.0.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-whatthepatch.spec ++++++
--- /var/tmp/diff_new_pack.RYGtCg/_old 2023-08-31 13:52:29.742758399 +0200
+++ /var/tmp/diff_new_pack.RYGtCg/_new 2023-08-31 13:52:29.786759972 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-whatthepatch
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%define skip_python2 1
Name: python-whatthepatch
-Version: 1.0.3
+Version: 1.0.5
Release: 0
Summary: A patch parsing and application library
License: MIT
@@ -29,8 +29,8 @@
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module wheel}
-BuildRequires: ed
BuildRequires: dos2unix
+BuildRequires: ed
BuildRequires: fdupes
BuildRequires: patch
BuildRequires: python-rpm-macros
++++++ whatthepatch-1.0.3.tar.gz -> whatthepatch-1.0.5.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whatthepatch-1.0.3/PKG-INFO new/whatthepatch-1.0.5/PKG-INFO
--- old/whatthepatch-1.0.3/PKG-INFO 2022-11-13 19:03:31.936101000 +0100
+++ new/whatthepatch-1.0.5/PKG-INFO 2023-05-06 16:59:53.663455200 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: whatthepatch
-Version: 1.0.3
+Version: 1.0.5
Summary: A patch parsing and application library.
Maintainer-email: "Christopher S. Corley" <cscorley(a)gmail.com>
Project-URL: Homepage, https://github.com/cscorley/whatthepatch
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whatthepatch-1.0.3/pyproject.toml new/whatthepatch-1.0.5/pyproject.toml
--- old/whatthepatch-1.0.3/pyproject.toml 2022-11-13 19:03:17.000000000 +0100
+++ new/whatthepatch-1.0.5/pyproject.toml 2023-05-06 16:59:42.000000000 +0200
@@ -1,6 +1,6 @@
[project]
name = "whatthepatch"
-version = "1.0.3"
+version = "1.0.5"
maintainers = [{ name = "Christopher S. Corley", email = "cscorley(a)gmail.com" }]
requires-python = ">=3.7"
readme = "README.rst"
@@ -31,5 +31,5 @@
"Bug Tracker" = "https://github.com/cscorley/whatthepatch/issues"
[build-system]
-requires = ["setuptools>=65.0.0", "wheel"]
+requires = ["setuptools>=65.0.0"]
build-backend = "setuptools.build_meta"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whatthepatch-1.0.3/src/whatthepatch/patch.py new/whatthepatch-1.0.5/src/whatthepatch/patch.py
--- old/whatthepatch-1.0.3/src/whatthepatch/patch.py 2022-11-13 19:03:17.000000000 +0100
+++ new/whatthepatch-1.0.5/src/whatthepatch/patch.py 2023-05-06 16:59:42.000000000 +0200
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
-
+import base64
import re
+import zlib
from collections import namedtuple
from . import exceptions
@@ -50,6 +51,10 @@
git_header_new_line = re.compile(r"^\+\+\+ (.+)$")
git_header_file_mode = re.compile(r"^(new|deleted) file mode \d{6}$")
git_header_binary_file = re.compile("^Binary files (.+) and (.+) differ")
+git_binary_patch_start = re.compile(r"^GIT binary patch$")
+git_binary_literal_start = re.compile(r"^literal (\d+)$")
+git_binary_delta_start = re.compile(r"^delta (\d+)$")
+base85string = re.compile(r"^[0-9A-Za-z!#$%&()*+;<=>?@^_`{|}~-]+$")
bzr_header_index = re.compile("=== (.+)")
bzr_header_old_line = unified_header_old_line
@@ -85,6 +90,7 @@
unified_header_old_line,
]
+ diffs = []
for c in check:
diffs = split_by_regex(lines, c)
if len(diffs) > 1:
@@ -184,12 +190,14 @@
(default_hunk_start, parse_default_diff),
(ed_hunk_start, parse_ed_diff),
(rcs_ed_hunk_start, parse_rcs_ed_diff),
+ (git_binary_patch_start, parse_git_binary_diff),
]
for hunk, parser in check:
diffs = findall_regex(lines, hunk)
if len(diffs) > 0:
return parser(lines)
+ return None
def parse_git_header(text):
@@ -248,7 +256,6 @@
# if we go through all of the text without finding our normal info,
# use the cmd if available
if cmd_old_path and cmd_new_path and old_version and new_version:
- print("returning from dumb path")
if cmd_old_path.startswith("a/"):
cmd_old_path = cmd_old_path[2:]
@@ -914,3 +921,87 @@
return changes
return None
+
+
+def parse_git_binary_diff(text):
+ try:
+ lines = text.splitlines()
+ except AttributeError:
+ lines = text
+
+ changes = list()
+
+ old_version = None
+ new_version = None
+ cmd_old_path = None
+ cmd_new_path = None
+ # the sizes are used as latch-up
+ old_size = None
+ new_size = None
+ old_encoded = ""
+ new_encoded = ""
+ for line in lines:
+ if cmd_old_path is None and cmd_new_path is None:
+ hm = git_diffcmd_header.match(line)
+ if hm:
+ cmd_old_path = hm.group(1)
+ cmd_new_path = hm.group(2)
+ continue
+
+ if old_version is None and new_version is None:
+ g = git_header_index.match(line)
+ if g:
+ old_version = g.group(1)
+ new_version = g.group(2)
+ continue
+
+ # the first is added file
+ if new_size is None:
+ literal = git_binary_literal_start.match(line)
+ if literal:
+ new_size = int(literal.group(1))
+ continue
+ delta = git_binary_delta_start.match(line)
+ if delta:
+ # not supported
+ new_size = 0
+ continue
+ elif new_size > 0:
+ if base85string.match(line):
+ assert len(line) >= 6 and ((len(line) - 1) % 5) == 0
+ new_encoded += line[1:]
+ elif 0 == len(line):
+ decoded = base64.b85decode(new_encoded)
+ added_data = zlib.decompress(decoded)
+ assert new_size == len(added_data)
+ change = Change(None, 0, added_data, None)
+ changes.append(change)
+ new_size = 0
+ else:
+ break
+
+ # the second is removed file
+ if old_size is None:
+ literal = git_binary_literal_start.match(line)
+ if literal:
+ old_size = int(literal.group(1))
+ delta = git_binary_delta_start.match(line)
+ if delta:
+ # not supported
+ old_size = 0
+ continue
+ elif old_size > 0:
+ if base85string.match(line):
+ assert len(line) >= 6 and ((len(line) - 1) % 5) == 0
+ old_encoded += line[1:]
+ elif 0 == len(line):
+ decoded = base64.b85decode(old_encoded)
+ removed_data = zlib.decompress(decoded)
+ assert old_size == len(removed_data)
+ change = Change(0, None, None, removed_data)
+ changes.append(change)
+ old_size = 0
+ else:
+ break
+
+ return changes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whatthepatch-1.0.3/src/whatthepatch.egg-info/PKG-INFO new/whatthepatch-1.0.5/src/whatthepatch.egg-info/PKG-INFO
--- old/whatthepatch-1.0.3/src/whatthepatch.egg-info/PKG-INFO 2022-11-13 19:03:31.000000000 +0100
+++ new/whatthepatch-1.0.5/src/whatthepatch.egg-info/PKG-INFO 2023-05-06 16:59:53.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: whatthepatch
-Version: 1.0.3
+Version: 1.0.5
Summary: A patch parsing and application library.
Maintainer-email: "Christopher S. Corley" <cscorley(a)gmail.com>
Project-URL: Homepage, https://github.com/cscorley/whatthepatch
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whatthepatch-1.0.3/src/whatthepatch.egg-info/SOURCES.txt new/whatthepatch-1.0.5/src/whatthepatch.egg-info/SOURCES.txt
--- old/whatthepatch-1.0.3/src/whatthepatch.egg-info/SOURCES.txt 2022-11-13 19:03:31.000000000 +0100
+++ new/whatthepatch-1.0.5/src/whatthepatch.egg-info/SOURCES.txt 2023-05-06 16:59:53.000000000 +0200
@@ -33,6 +33,7 @@
tests/casefiles/eclipse-attachment-126343.header
tests/casefiles/efg
tests/casefiles/embedded-diff.comment
+tests/casefiles/git-bin.patch
tests/casefiles/git-binary-files.diff
tests/casefiles/git-header-long.diff
tests/casefiles/git-header.diff
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whatthepatch-1.0.3/tests/casefiles/git-bin.patch new/whatthepatch-1.0.5/tests/casefiles/git-bin.patch
--- old/whatthepatch-1.0.3/tests/casefiles/git-bin.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/whatthepatch-1.0.5/tests/casefiles/git-bin.patch 2023-05-06 16:59:42.000000000 +0200
@@ -0,0 +1,63 @@
+---
+ fox.bin | Bin 0 -> 44 bytes
+ fox.txt | 2 +-
+ lorem.bin | Bin 0 -> 446 bytes
+ lorem.zip | Bin 431 -> 432 bytes
+ 4 files changed, 1 insertion(+), 1 deletion(-)
+ create mode 100644 fox.bin
+ create mode 100644 lorem.bin
+
+diff --git a/fox.bin b/fox.bin
+new file mode 100644
+index 0000000000000000000000000000000000000000..e7683ad05fd121a9ca86cab5a827d471d29b4d4f
+GIT binary patch
+literal 44
+ycmWH^NL45-%}mZ#NGi%N&r?XtuTaP;%`GTa$S+GRQYZmR=Ok8DDx~D6GXMZ<wh!6>
+
+literal 0
+HcmV?d00001
+
+diff --git a/fox.txt b/fox.txt
+index ff3bb63..8fe2a4b 100644
+--- a/fox.txt
++++ b/fox.txt
+@@ -1 +1 @@
+-The quick brown fox jumps over the lazy dog
+\ No newline at end of file
++The quick brown fox jumps over the lazy dog.
+\ No newline at end of file
+diff --git a/lorem.bin b/lorem.bin
+new file mode 100644
+index 0000000000000000000000000000000000000000..aef2724fd9ff72caf4eb1ac8333f0b5b322d82fb
+GIT binary patch
+literal 446
+zcmXw#&2d992!vD07T|eRB)42s0Fkh>Gy1ax9+w~Fm)wMaW%v8+Q!6-@SL9y$#G*l}
+z+6Ae%rODKMLNW(eV!J^Lqq#K40+haL&oHecme~?Bvp0hqihPGW)J|zdm0J@?;oarH
+zmq8nAXrppJ9#KlY;O<;#ecAL3ed<g!G4=*8MQZA&@*d*izVwphh+(LN@fx1`86ZyC
+zf%h#bZVFBhPiIy(OdV5yv}K(UJU$-1_=s~Fb|NWsEk$A}|AZot<LWnxp>0DLGNbT$
+z;NzKem<F)LV9-+%O)-~zFiWULtcEc=v$joflZvCs%aENL{d#4hAnVe(yS0~XLpC4=
+Lj`hdY>+$vrMRcVJ
+
+literal 0
+HcmV?d00001
+
+diff --git a/lorem.zip b/lorem.zip
+index 0f6beb70488e2b29fcaadf724b6f48ef0ab5bc4e..3c8a65bf1a97bb4180c83a0e31352b4edb4c245e 100644
+GIT binary patch
+delta 275
+zcmZ3_yn#6)z?+#xgn@y9gP}7+C2a4}O*1$c85s5gF(-ozLr#8CYOY>MMM-D~Cj+xl
+z?ABymATF)oW?*D_!OXw_CQK(BEOa*HaEZRjWV65P$+T=Pg^u?VBeY_ymt>hupAyrM
+zu_ldGFZao&vTKV}cPYzE-4`VHX!@1~7xxOUc%}T}z;fqZ+pf4>{#%je`L@mdh12$@
+z##~QSCtp2z)oM{#R?hTKa+j9=zO;TxpG;eTRQ}78>li9e@lU*`!E<hhw&gFg7Dwam
+z8SImV7?t(so$}Jyl=3cb^RC<rY)d+m{}%R^{b303W@M6M#^TAz$&AWOMzNDS7!}#P
+Jfj(wn0067{YH|Po
+
+delta 274
+zcmdnMyq-BCz?+#xgn@y9gW*b=N|;w+e?B`S1H&F5=46mz$jL8C&DATZC<zVWWMKXf
+zwKe%I5SLbPGcdBeU}j(d6Q&am7CIYpxJ2J%vRS9J^XV)mjz|9|Mrg$d2bs?H_R@1O
+z3ERvx-K;3mI{Tu~UBN!DcuoF~-cc7`ykS}Oi(}X0%ZjnlS&LuR*=$}?c38P&;q6b7
+zte+;GeDx$tHc;Din|CGu%S*K{!-L%UoHcs4e@O{%uz6ZO@ty`xpT$&}TIoXzX1boS
+zo-D+utS58IOJh^YyS&Z2axbtg=}i7x*!zt+z?+dtjv0#|C#NtfGku7f+{viO<^}XH
+G0|Nj=Vq`=B
+
+--
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whatthepatch-1.0.3/tests/test_patch.py new/whatthepatch-1.0.5/tests/test_patch.py
--- old/whatthepatch-1.0.3/tests/test_patch.py 2022-11-13 19:03:17.000000000 +0100
+++ new/whatthepatch-1.0.5/tests/test_patch.py 2023-05-06 16:59:42.000000000 +0200
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-
+import hashlib
import os
import time
import unittest
@@ -1449,6 +1449,65 @@
# Really all we care about is that this parses faster than it used to (200s+)
self.assertGreater(20, time.time() - start_time)
+ def test_git_bin_patch(self):
+ with open("tests/casefiles/git-bin.patch") as f:
+ text = f.read()
+
+ result = list(wtp.patch.parse_patch(text))
+ assert result
+ assert len(result) == 4
+ assert (
+ result[0].changes[0].line
+ == b"The quick brown fox jumps over the lazy dog\x00"
+ )
+ assert (
+ result[1].changes[0].line == "The quick brown fox jumps over the lazy dog"
+ )
+ assert (
+ result[1].changes[1].line == "The quick brown fox jumps over the lazy dog."
+ )
+ assert (
+ result[2].changes[0].line
+ == b"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt"
+ b" ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco"
+ b" laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit"
+ b" in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat"
+ b" cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\x00"
+ )
+ assert len(result[3].changes) == 0
+
+ def test_git_bin_patch_minline(self):
+ # test path with minimal line in binary diff
+ text = """---
+ 95 | Bin 94 -> 95 bytes
+ 1 files changed, 0 insertions(+), 0 deletions(-)
+
+diff --git a/95 b/95
+index cf104291536b187e299023ae37523f4649ca0600..edf50979da25419fbb399ffa6b93142e50dbbba7 100644
+GIT binary patch
+literal 95
+zcmV-l0HFT>FaHM=!1loEo7=$@IDCW@J2o!_PR6;*Rs73Fmit;^XEfl3aOa~j;?1+w
+z`|Sh7<pH~|jb8KHD!MpYia}Lyu+Ot@)&HI>XeZ(}tCx^}pPZlER5Jer^*}gX^QK-R
+BGb8{2
+
+literal 94
+zcmV-k0HObM)Jh!P2BexYI{K1M2*Xhjg<rBg95P)btB3SD62E>3TEDprVXYw<r9s|q
+z3<q^r!wu=+9KVuWwwGi0e7gXw>S|c&%Px9;9nEE3cL}-^F2dKtTQun3NbDG}SFOY=
+AaR2}S
+
+--"""
+ result = list(wtp.patch.parse_patch(text))
+ assert result
+ assert len(result) == 1
+ assert (
+ hashlib.sha1(result[0].changes[0].line).hexdigest()
+ == "732e7e005ff8b71ab4b72398db0320f2fa012b81"
+ )
+ assert (
+ hashlib.sha1(result[0].changes[1].hunk).hexdigest()
+ == "b07b94142cfce2094b5be04e9d30b653a7c63917"
+ )
+
if __name__ == "__main__":
unittest.main()
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-google-api-python-client for openSUSE:Factory checked in at 2023-08-31 13:46:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-google-api-python-client (Old)
and /work/SRC/openSUSE:Factory/.python-google-api-python-client.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-google-api-python-client"
Thu Aug 31 13:46:18 2023 rev:36 rq:1108220 version:2.97.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-google-api-python-client/python-google-api-python-client.changes 2023-07-18 22:09:21.715404109 +0200
+++ /work/SRC/openSUSE:Factory/.python-google-api-python-client.new.1766/python-google-api-python-client.changes 2023-08-31 13:52:26.970659318 +0200
@@ -1,0 +2,199 @@
+Wed Aug 30 14:24:22 UTC 2023 - John Paul Adrian Glaubitz <adrian.glaubitz(a)suse.com>
+
+- Update to 2.97.0
+ * **adexperiencereport:** Update the api
+ * **aiplatform:** Update the api
+ * **analyticsadmin:** Update the api
+ * **androidmanagement:** Update the api
+ * **androidpublisher:** Update the api
+ * **appengine:** Update the api
+ * **artifactregistry:** Update the api
+ * **assuredworkloads:** Update the api
+ * **baremetalsolution:** Update the api
+ * **beyondcorp:** Update the api
+ * **bigquery:** Update the api
+ * **binaryauthorization:** Update the api
+ * **cloudbuild:** Update the api
+ * **composer:** Update the api
+ * **connectors:** Update the api
+ * **container:** Update the api
+ * **contentwarehouse:** Update the api
+ * **dataform:** Update the api
+ * **dataproc:** Update the api
+ * **dialogflow:** Update the api
+ * **discoveryengine:** Update the api
+ * **documentai:** Update the api
+ * **gkehub:** Update the api
+ * **healthcare:** Update the api
+ * **identitytoolkit:** Update the api
+ * **migrationcenter:** Update the api
+ * **monitoring:** Update the api
+ * **networkmanagement:** Update the api
+ * **paymentsresellersubscription:** Update the api
+ * **redis:** Update the api
+ * **run:** Update the api
+ * **tagmanager:** Update the api
+ * **vmmigration:** Update the api
+- from version 2.96.0
+ * **admin:** Update the api
+ * **analyticsadmin:** Update the api
+ * **analyticshub:** Update the api
+ * **androidmanagement:** Update the api
+ * **artifactregistry:** Update the api
+ * **assuredworkloads:** Update the api
+ * **beyondcorp:** Update the api
+ * **bigquerydatatransfer:** Update the api
+ * **chat:** Update the api
+ * **checks:** Update the api
+ * **cloudbuild:** Update the api
+ * **clouddeploy:** Update the api
+ * **compute:** Update the api
+ * **connectors:** Update the api
+ * **contactcenteraiplatform:** Update the api
+ * **containeranalysis:** Update the api
+ * **container:** Update the api
+ * **container:** Update the api
+ * **content:** Update the api
+ * **content:** Update the api
+ * **contentwarehouse:** Update the api
+ * **dataflow:** Update the api
+ * **dataform:** Update the api
+ * **datamigration:** Update the api
+ * **dataplex:** Update the api
+ * **dataproc:** Update the api
+ * **datastore:** Update the api
+ * **datastream:** Update the api
+ * **dialogflow:** Update the api
+ * **discoveryengine:** Update the api
+ * **displayvideo:** Update the api
+ * **documentai:** Update the api
+ * **drivelabels:** Update the api
+ * **firebase:** Update the api
+ * **firestore:** Update the api
+ * **gkebackup:** Update the api
+ * **gkehub:** Update the api
+ * **gkehub:** Update the api
+ * **gkeonprem:** Update the api
+ * **healthcare:** Update the api
+ * **integrations:** Update the api
+ * **migrationcenter:** Update the api
+ * **monitoring:** Update the api
+ * **networkconnectivity:** Update the api
+ * **networkconnectivity:** Update the api
+ * **notebooks:** Update the api
+ * **osconfig:** Update the api
+ * **oslogin:** Update the api
+ * **places:** Update the api
+ * **policysimulator:** Update the api
+ * **retail:** Update the api
+ * **securitycenter:** Update the api
+ * **servicecontrol:** Update the api
+ * **servicemanagement:** Update the api
+ * **servicenetworking:** Update the api
+ * **servicenetworking:** Update the api
+ * **serviceusage:** Update the api
+ * **smartdevicemanagement:** Update the api
+ * **toolresults:** Update the api
+ * **tpu:** Update the api
+ * **verifiedaccess:** Update the api
+ * **youtube:** Update the api
+ * **places:** Update the api
+- from version 2.95.0
+ * **apigee:** Update the api
+ * **bigquery:** Update the api
+ * **bigtableadmin:** Update the api
+ * **checks:** Update the api
+ * **cloudbuild:** Update the api
+ * **clouddeploy:** Update the api
+ * **cloudfunctions:** Update the api
+ * **compute:** Update the api
+ * **containeranalysis:** Update the api
+ * **datacatalog:** Update the api
+ * **dataplex:** Update the api
+ * **datastream:** Update the api
+ * **dialogflow:** Update the api
+ * **discoveryengine:** Update the api
+ * **documentai:** Update the api
+ * **drive:** Update the api
+ * **firebaseappcheck:** Update the api
+ * **firestore:** Update the api
+ * **gkeonprem:** Update the api
+ * **healthcare:** Update the api
+ * **monitoring:** Update the api
+ * **networksecurity:** Update the api
+ * **ondemandscanning:** Update the api
+ * **retail:** Update the api
+ * **securitycenter:** Update the api
+ * **serviceconsumermanagement:** Update the api
+ * **servicedirectory:** Update the api
+ * **servicenetworking:** Update the api
+ * **serviceusage:** Update the api
+ * **sheets:** Update the api
+ * **sqladmin:** Update the api
+ * **tpu:** Update the api
+ * **trafficdirector:** Update the api
+ * **translate:** Update the api
+ * **vault:** Update the api
+ * **verifiedaccess:** Update the api
+ * **videointelligence:** Update the api
+ * **vmmigration:** Update the api
+ * **workloadmanager:** Update the api
+- from version 2.94.0
+ * **analyticsdata:** Update the api
+ * **androidenterprise:** Update the api
+ * **androidpublisher:** Update the api
+ * **appengine:** Update the api
+ * **artifactregistry:** Update the api
+ * **assuredworkloads:** Update the api
+ * **baremetalsolution:** Update the api
+ * **batch:** Update the api
+ * **bigquery:** Update the api
+ * **chat:** Update the api
+ * **checks:** Update the api
+ * **classroom:** Update the api
+ * **cloudasset:** Update the api
+ * **cloudbilling:** Update the api
+ * **clouddebugger:** Update the api
+ * **compute:** Update the api
+ * **containeranalysis:** Update the api
+ * **container:** Update the api
+ * **content:** Update the api
+ * **contentwarehouse:** Update the api
+ * **datacatalog:** Update the api
+ * **dataform:** Update the api
+ * **datamigration:** Update the api
+ * **discovery:** Update the api
+ * **documentai:** Update the api
+ * **doubleclickbidmanager:** Update the api
+ * **drive:** Update the api
+ * **firestore:** Update the api
+ * **gkehub:** Update the api
+ * **gkeonprem:** Update the api
+ * **homegraph:** Update the api
+ * **iam:** Update the api
+ * **identitytoolkit:** Update the api
+ * **integrations:** Update the api
+ * **lifesciences:** Update the api
+ * **logging:** Update the api
+ * **memcache:** Update the api
+ * **networkmanagement:** Update the api
+ * **networksecurity:** Update the api
+ * **notebooks:** Update the api
+ * **ondemandscanning:** Update the api
+ * **pubsublite:** Update the api
+ * **pubsub:** Update the api
+ * **sasportal:** Update the api
+ * **securitycenter:** Update the api
+ * **servicecontrol:** Update the api
+ * **servicemanagement:** Update the api
+ * **serviceusage:** Update the api
+ * **slides:** Update the api
+ * **speech:** Update the api
+ * **sqladmin:** Update the api
+ * **tpu:** Update the api
+ * **verifiedaccess:** Update the api
+ * **vision:** Update the api
+ * **youtube:** Update the api
+ * **smartdevicemanagement:** Update the api
++++ 2 more lines (skipped)
++++ between /work/SRC/openSUSE:Factory/python-google-api-python-client/python-google-api-python-client.changes
++++ and /work/SRC/openSUSE:Factory/.python-google-api-python-client.new.1766/python-google-api-python-client.changes
Old:
----
google-api-python-client-2.93.0.tar.gz
New:
----
google-api-python-client-2.97.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-google-api-python-client.spec ++++++
--- /var/tmp/diff_new_pack.X3ajd1/_old 2023-08-31 13:52:28.018696777 +0200
+++ /var/tmp/diff_new_pack.X3ajd1/_new 2023-08-31 13:52:28.022696920 +0200
@@ -19,7 +19,7 @@
%define skip_python2 1
%{?sle15_python_module_pythons}
Name: python-google-api-python-client
-Version: 2.93.0
+Version: 2.97.0
Release: 0
Summary: Google APIs Python Client
License: Apache-2.0
++++++ google-api-python-client-2.93.0.tar.gz -> google-api-python-client-2.97.0.tar.gz ++++++
/work/SRC/openSUSE:Factory/python-google-api-python-client/google-api-python-client-2.93.0.tar.gz /work/SRC/openSUSE:Factory/.python-google-api-python-client.new.1766/google-api-python-client-2.97.0.tar.gz differ: char 5, line 1
1
0