April 2022 - openSUSE Commits - openSUSE Mailing Lists

commit python-cligj for openSUSE:Factory
by Source-Sync 28 Aug '24

28 Aug '24

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

commit 000release-packages for openSUSE:Factory
by Source-Sync 30 Apr '22

30 Apr '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 000release-packages for openSUSE:Factory checked in at 2022-04-30 23:43:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000release-packages (Old) and /work/SRC/openSUSE:Factory/.000release-packages.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000release-packages" Sat Apr 30 23:43:17 2022 rev:1584 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MicroOS-release.spec ++++++ --- /var/tmp/diff_new_pack.6ziztC/_old 2022-04-30 23:43:20.095831173 +0200 +++ /var/tmp/diff_new_pack.6ziztC/_new 2022-04-30 23:43:20.099831178 +0200 @@ -17,7 +17,7 @@ Name: MicroOS-release -Version: 20220429 +Version: 20220430 Release: 0 Summary: openSUSE MicroOS License: GPL-2.0-or-later @@ -176,9 +176,9 @@ %include %{SOURCE100} Provides: %name-%version Provides: product() = MicroOS -Provides: product(MicroOS) = 20220429-0 +Provides: product(MicroOS) = 20220430-0 Provides: product-label() = openSUSE%20MicroOS -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20220429 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20220430 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-endoflife() Requires: product_flavor(MicroOS) @@ -194,7 +194,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(MicroOS) = 20220429-0 +Provides: product_flavor(MicroOS) = 20220430-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description dvd @@ -210,7 +210,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(kubic-dvd) -Provides: product_flavor(MicroOS) = 20220429-0 +Provides: product_flavor(MicroOS) = 20220430-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description kubic-dvd @@ -226,7 +226,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(MicroOS) = 20220429-0 +Provides: product_flavor(MicroOS) = 20220430-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance @@ -242,7 +242,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-kubic) -Provides: product_flavor(MicroOS) = 20220429-0 +Provides: product_flavor(MicroOS) = 20220430-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance-kubic @@ -299,11 +299,11 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>MicroOS</name> - <version>20220429</version> + <version>20220430</version> <release>0</release> <endoflife></endoflife> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:microos:20220429</cpeid> + <cpeid>cpe:/o:opensuse:microos:20220430</cpeid> <productline>MicroOS</productline> <register> <pool> ++++++ openSUSE-Addon-NonOss-release.spec ++++++ --- /var/tmp/diff_new_pack.6ziztC/_old 2022-04-30 23:43:20.115831195 +0200 +++ /var/tmp/diff_new_pack.6ziztC/_new 2022-04-30 23:43:20.119831200 +0200 @@ -1,5 +1,5 @@ # -# spec file for package openSUSE-Addon-NonOss-release (Version 20220429) +# spec file for package openSUSE-Addon-NonOss-release (Version 20220430) # # Copyright (c) 2022 openSUSE. # @@ -16,16 +16,16 @@ Name: openSUSE-Addon-NonOss-release %define product openSUSE-Addon-NonOss Summary: openSUSE NonOSS Addon%{?betaversion: %{betaversion}} -Version: 20220429 +Version: 20220430 Release: 0 License: BSD-3-Clause Group: System/Fhs Provides: %name-%version Provides: product() = openSUSE-Addon-NonOss -Provides: product(openSUSE-Addon-NonOss) = 20220429-0 +Provides: product(openSUSE-Addon-NonOss) = 20220430-0 Provides: product-label() = non%20oss%20addon -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20220429 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20220430 AutoReqProv: on @@ -48,10 +48,10 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE-Addon-NonOss</name> - <version>20220429</version> + <version>20220430</version> <release>0</release> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20220429</cpeid> + <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20220430</cpeid> <register> <pool> </pool> ++++++ openSUSE-release.spec ++++++ --- /var/tmp/diff_new_pack.6ziztC/_old 2022-04-30 23:43:20.143831226 +0200 +++ /var/tmp/diff_new_pack.6ziztC/_new 2022-04-30 23:43:20.147831231 +0200 @@ -20,7 +20,7 @@ #define betaversion %{nil} %define codename Tumbleweed Name: openSUSE-release -Version: 20220429 +Version: 20220430 Release: 0 # 0 is the product release, not the build release of this package Summary: openSUSE Tumbleweed @@ -178,7 +178,7 @@ %include %{SOURCE100} Provides: %name-%version Provides: product() = openSUSE -Provides: product(openSUSE) = 20220429-0 +Provides: product(openSUSE) = 20220430-0 %ifarch x86_64 Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64 %endif @@ -192,7 +192,7 @@ Provides: product-register-target() = openSUSE%2DTumbleweed%2Daarch64 %endif Provides: product-label() = openSUSE -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20220429 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20220430 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-url(repository) = http%3A%2F%2Fdownload.opensuse.org%2Ftumbleweed%2Frepo%2Foss%2F Requires: product_flavor(openSUSE) @@ -206,7 +206,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(ftp) -Provides: product_flavor(openSUSE) = 20220429-0 +Provides: product_flavor(openSUSE) = 20220430-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description ftp @@ -221,7 +221,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(mini) -Provides: product_flavor(openSUSE) = 20220429-0 +Provides: product_flavor(openSUSE) = 20220430-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description mini @@ -236,7 +236,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE) = 20220429-0 +Provides: product_flavor(openSUSE) = 20220430-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description dvd @@ -251,7 +251,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-kde) -Provides: product_flavor(openSUSE) = 20220429-0 +Provides: product_flavor(openSUSE) = 20220430-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-kde @@ -266,7 +266,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-x11) -Provides: product_flavor(openSUSE) = 20220429-0 +Provides: product_flavor(openSUSE) = 20220430-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-x11 @@ -281,7 +281,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-gnome) -Provides: product_flavor(openSUSE) = 20220429-0 +Provides: product_flavor(openSUSE) = 20220430-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-gnome @@ -296,7 +296,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-xfce) -Provides: product_flavor(openSUSE) = 20220429-0 +Provides: product_flavor(openSUSE) = 20220430-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-xfce @@ -311,7 +311,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-kde) -Provides: product_flavor(openSUSE) = 20220429-0 +Provides: product_flavor(openSUSE) = 20220430-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-kde @@ -326,7 +326,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-gnome) -Provides: product_flavor(openSUSE) = 20220429-0 +Provides: product_flavor(openSUSE) = 20220430-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-gnome @@ -341,7 +341,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-x11) -Provides: product_flavor(openSUSE) = 20220429-0 +Provides: product_flavor(openSUSE) = 20220430-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-x11 @@ -356,7 +356,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(openSUSE) = 20220429-0 +Provides: product_flavor(openSUSE) = 20220430-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance @@ -371,7 +371,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-docker) -Provides: product_flavor(openSUSE) = 20220429-0 +Provides: product_flavor(openSUSE) = 20220430-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-docker @@ -386,7 +386,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-kvm) -Provides: product_flavor(openSUSE) = 20220429-0 +Provides: product_flavor(openSUSE) = 20220430-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-kvm @@ -401,7 +401,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-vmware) -Provides: product_flavor(openSUSE) = 20220429-0 +Provides: product_flavor(openSUSE) = 20220430-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-vmware @@ -416,7 +416,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-openstack) -Provides: product_flavor(openSUSE) = 20220429-0 +Provides: product_flavor(openSUSE) = 20220430-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-openstack @@ -431,7 +431,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-hyperv) -Provides: product_flavor(openSUSE) = 20220429-0 +Provides: product_flavor(openSUSE) = 20220430-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-hyperv @@ -446,7 +446,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-vagrant) -Provides: product_flavor(openSUSE) = 20220429-0 +Provides: product_flavor(openSUSE) = 20220430-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-vagrant @@ -461,7 +461,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-wsl) -Provides: product_flavor(openSUSE) = 20220429-0 +Provides: product_flavor(openSUSE) = 20220430-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-wsl @@ -476,7 +476,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-custom) -Provides: product_flavor(openSUSE) = 20220429-0 +Provides: product_flavor(openSUSE) = 20220430-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-custom @@ -557,10 +557,10 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE</name> - <version>20220429</version> + <version>20220430</version> <release>0</release> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse:20220429</cpeid> + <cpeid>cpe:/o:opensuse:opensuse:20220430</cpeid> <productline>openSUSE</productline> <register> <pool>

1 0

commit lbreakouthd for openSUSE:Factory
by Source-Sync 30 Apr '22

30 Apr '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package lbreakouthd for openSUSE:Factory checked in at 2022-04-30 22:53:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lbreakouthd (Old) and /work/SRC/openSUSE:Factory/.lbreakouthd.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lbreakouthd" Sat Apr 30 22:53:11 2022 rev:6 rq:974121 version:1.0.10 Changes: -------- --- /work/SRC/openSUSE:Factory/lbreakouthd/lbreakouthd.changes 2022-03-07 17:47:17.915113649 +0100 +++ /work/SRC/openSUSE:Factory/.lbreakouthd.new.1538/lbreakouthd.changes 2022-04-30 22:53:26.812298045 +0200 @@ -1,0 +2,7 @@ +Sat Apr 30 16:47:40 UTC 2022 - Carsten Ziepke <kieltux(a)gmail.com> + +- Update to version 1.0.10: + * config option for setting directory for user-specific data + * added french translation + +------------------------------------------------------------------- Old: ---- lbreakouthd-1.0.9.tar.gz New: ---- lbreakouthd-1.0.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lbreakouthd.spec ++++++ --- /var/tmp/diff_new_pack.16rXk1/_old 2022-04-30 22:53:27.384298819 +0200 +++ /var/tmp/diff_new_pack.16rXk1/_new 2022-04-30 22:53:27.388298824 +0200 @@ -18,7 +18,7 @@ Name: lbreakouthd -Version: 1.0.9 +Version: 1.0.10 Release: 0 Summary: Classic Breakout-Style Game License: GPL-2.0-or-later ++++++ lbreakouthd-1.0.9.tar.gz -> lbreakouthd-1.0.10.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbreakouthd-1.0.9/Changelog new/lbreakouthd-1.0.10/Changelog --- old/lbreakouthd-1.0.9/Changelog 2022-03-02 13:47:58.000000000 +0100 +++ new/lbreakouthd-1.0.10/Changelog 2022-04-30 10:41:25.000000000 +0200 @@ -1,3 +1,7 @@ +1.0.10: +- config option for setting directory for user-specific data (2022/04/23 MS) +- added french translation (2022/04/23 Pierre Faucillon) + 1.0.9: - fixed texture problem with old hardware (2022/03/02 MS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbreakouthd-1.0.9/README new/lbreakouthd-1.0.10/README --- old/lbreakouthd-1.0.9/README 2021-10-16 12:38:16.000000000 +0200 +++ new/lbreakouthd-1.0.10/README 2022-04-30 10:15:35.000000000 +0200 @@ -212,14 +212,8 @@ Troubleshooting --------------- -1) If bonuses/maluses are not shown properly on older machines it's an SDL2 -problem connected to older versions of OpenGL (already reported to SDL -thanks to Antoni Aloy Torrens). If you have this problem you can try to run - LIBGL_ALWAYS_SOFTWARE=1 lbreakouthd -to use software rendering. This might fix the problem of not showing -bonuses/maluses but will be slower. -2) If the screen is cut off this might be due to an older non-16:9 +1) If the screen is cut off this might be due to an older non-16:9 resolution like 1366x768. Either switch to 1280x720 or play in window mode. Enjoy, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbreakouthd-1.0.9/configure new/lbreakouthd-1.0.10/configure --- old/lbreakouthd-1.0.9/configure 2022-03-02 13:48:02.000000000 +0100 +++ new/lbreakouthd-1.0.10/configure 2022-04-30 10:17:22.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for lbreakouthd 1.0.9. +# Generated by GNU Autoconf 2.69 for lbreakouthd 1.0.10. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ # Identity of this package. PACKAGE_NAME='lbreakouthd' PACKAGE_TARNAME='lbreakouthd' -PACKAGE_VERSION='1.0.9' -PACKAGE_STRING='lbreakouthd 1.0.9' +PACKAGE_VERSION='1.0.10' +PACKAGE_STRING='lbreakouthd 1.0.10' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -794,6 +794,7 @@ with_libiconv_prefix with_included_gettext with_libintl_prefix +with_configdir enable_install enable_debug ' @@ -1359,7 +1360,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures lbreakouthd 1.0.9 to adapt to many kinds of systems. +\`configure' configures lbreakouthd 1.0.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1430,7 +1431,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of lbreakouthd 1.0.9:";; + short | recursive ) echo "Configuration of lbreakouthd 1.0.10:";; esac cat <<\_ACEOF @@ -1463,6 +1464,7 @@ --with-included-gettext use the GNU gettext library included here --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib --without-libintl-prefix don't search for libintl in includedir and libdir + --with-configdir=CONFIGDIR Set directory for config/data files in home directory (default: .lbreakouthd). Some influential environment variables: CC C compiler command @@ -1542,7 +1544,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -lbreakouthd configure 1.0.9 +lbreakouthd configure 1.0.10 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2228,7 +2230,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by lbreakouthd $as_me 1.0.9, which was +It was created by lbreakouthd $as_me 1.0.10, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3099,7 +3101,7 @@ # Define the identity of the package. PACKAGE='lbreakouthd' - VERSION='1.0.9' + VERSION='1.0.10' cat >>confdefs.h <<_ACEOF @@ -12084,10 +12086,17 @@ done -# Flags +configdir=.lbreakouthd + +# Check whether --with-configdir was given. +if test "${with_configdir+set}" = set; then : + withval=$with_configdir; configdir="$withval" +fi + + +# other flags datdir=$datadir/$PACKAGE hiscoredir=$localstatedir -configdir=.lbreakouthd debugflags="" # Check whether --enable-install was given. if test "${enable_install+set}" = set; then : @@ -12659,7 +12668,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by lbreakouthd $as_me 1.0.9, which was +This file was extended by lbreakouthd $as_me 1.0.10, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12725,7 +12734,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -lbreakouthd config.status 1.0.9 +lbreakouthd config.status 1.0.10 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbreakouthd-1.0.9/configure.ac new/lbreakouthd-1.0.10/configure.ac --- old/lbreakouthd-1.0.9/configure.ac 2022-03-02 13:47:51.000000000 +0100 +++ new/lbreakouthd-1.0.10/configure.ac 2022-04-30 10:17:15.000000000 +0200 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT(lbreakouthd, 1.0.9) +AC_INIT(lbreakouthd, 1.0.10) AC_CONFIG_SRCDIR([src/main.cpp]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE @@ -36,10 +36,15 @@ AC_FUNC_STRTOD AC_CHECK_FUNCS([memset strchr strdup strrchr]) -# Flags +dnl allow changing config dir +configdir=.lbreakouthd +AC_ARG_WITH( configdir, +[ --with-configdir=CONFIGDIR Set directory for config/data files in home directory (default: .lbreakouthd).], +configdir="$withval",) + +# other flags datdir=$datadir/$PACKAGE hiscoredir=$localstatedir -configdir=.lbreakouthd debugflags="" AC_ARG_ENABLE( install, [ --disable-install No installation. Start from source directory.], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbreakouthd-1.0.9/lbreakouthd.desktop.in new/lbreakouthd-1.0.10/lbreakouthd.desktop.in --- old/lbreakouthd-1.0.9/lbreakouthd.desktop.in 2018-10-30 20:00:30.000000000 +0100 +++ new/lbreakouthd-1.0.10/lbreakouthd.desktop.in 2022-04-09 13:24:17.000000000 +0200 @@ -1,7 +1,11 @@ [Desktop Entry] Name=LBreakoutHD +GenericName=Arkanoid / Breakout like game Comment=A ball-and-paddle game with nice graphics. Exec=lbreakouthd Icon= Type=Application +Keywords=arkanoid;breakout;ball;space;paddle; Categories=Game; +StartupNotify=false +Terminal=false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbreakouthd-1.0.9/po/LINGUAS new/lbreakouthd-1.0.10/po/LINGUAS --- old/lbreakouthd-1.0.9/po/LINGUAS 2021-04-02 16:22:07.000000000 +0200 +++ new/lbreakouthd-1.0.10/po/LINGUAS 2022-04-23 16:48:01.000000000 +0200 @@ -1 +1 @@ -de +de fr Binary files old/lbreakouthd-1.0.9/po/de.gmo and new/lbreakouthd-1.0.10/po/de.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbreakouthd-1.0.9/po/de.po new/lbreakouthd-1.0.10/po/de.po --- old/lbreakouthd-1.0.9/po/de.po 2022-03-02 13:48:30.000000000 +0100 +++ new/lbreakouthd-1.0.10/po/de.po 2022-04-30 10:17:30.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lbreakouthd 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-02 13:48+0100\n" +"POT-Creation-Date: 2022-04-30 10:17+0200\n" "PO-Revision-Date: 2019-06-26 10:11+0200\n" "Last-Translator: Wuzzy <almikes(a)aol.com>\n" "Language-Team: \n" @@ -143,7 +143,6 @@ msgstr "Kinder" #: src/view.cpp:1106 src/view.cpp:1613 -#, fuzzy msgid "Very Easy" msgstr "Leicht" @@ -192,7 +191,6 @@ msgstr "Schwierigkeit" #: src/view.cpp:1137 -#, fuzzy msgid "" "This affects lives, paddle size and ball speed. For Kids and Easy score is " "reduced, for Hard a bonus is given." @@ -591,6 +589,12 @@ msgid "Bonus Levels" msgstr "Bonusebenen" +#: src/view.cpp:1243 +msgid "" +"Add bonus levels with a mini game every 4 regular levels. Game over will end " +"the mini game without loosing a life." +msgstr "" + #: src/view.cpp:1247 msgid "New Game" msgstr "Neues Spiel" @@ -870,7 +874,6 @@ msgstr " von " #: src/selectdlg.cpp:211 -#, fuzzy msgid " levels)" msgstr " Ebenen) " Binary files old/lbreakouthd-1.0.9/po/fr.gmo and new/lbreakouthd-1.0.10/po/fr.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbreakouthd-1.0.9/po/fr.po new/lbreakouthd-1.0.10/po/fr.po --- old/lbreakouthd-1.0.9/po/fr.po 1970-01-01 01:00:00.000000000 +0100 +++ new/lbreakouthd-1.0.10/po/fr.po 2022-04-30 10:17:30.000000000 +0200 @@ -0,0 +1,915 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Michael Speck +# This file is distributed under the same license as the lbreakouthd package. +# Pierre Faucillon <pfaucillon(a)free.fr>, 2022. +# +msgid "" +msgstr "" +"Project-Id-Version: lbreakouthd 0.1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2022-04-30 10:17+0200\n" +"PO-Revision-Date: 2019-06-26 10:11+0200\n" +"Last-Translator: Wuzzy <almikes(a)aol.com>\n" +"Language-Team: \n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.2.1\n" + +#: libgame/game.c:63 libgame/levels.c:121 +#, c-format +msgid "Jumping Jack" +msgstr "Pantin" + +#: libgame/game.c:64 libgame/game.c:68 libgame/game.c:72 libgame/game.c:76 +#: libgame/game.c:80 libgame/game.c:84 +#, c-format +msgid "Bonus Level" +msgstr "Niveau bonus" + +#: libgame/game.c:67 libgame/levels.c:124 +#, c-format +msgid "Outbreak" +msgstr "Manifestation" + +#: libgame/game.c:71 libgame/levels.c:127 +#, c-format +msgid "Barrier" +msgstr "Barri��re" + +#: libgame/game.c:75 libgame/levels.c:130 +#, c-format +msgid "Sitting Ducks" +msgstr "Canards" + +#: libgame/game.c:79 libgame/levels.c:133 +#, c-format +msgid "Hunter" +msgstr "Chasseur" + +#: libgame/game.c:83 +#, c-format +msgid "Defender" +msgstr "D��fenseur" + +#: libgame/game.c:87 +#, c-format +msgid "Unknown Level Type" +msgstr "Type de niveau inconnnu" + +#: libgame/levels.h:23 +msgid "<CREATE SET>" +msgstr "<CR��ER NIVEAUX>" + +#: libgame/levels.h:24 +msgid "!FREAKOUT!" +msgstr "!BALLE_PERDUE!" + +#: libgame/levels.c:136 +msgid "Invaders" +msgstr "Envahisseurs" + +#: libgame/levels.c:139 +msgid "unknown" +msgstr "inconnu" + +#: libgame/levels.c:155 src/selectdlg.cpp:125 +msgid "!JUMPING_JACK!" +msgstr "!PANTIN!" + +#: libgame/levels.c:157 src/selectdlg.cpp:126 +msgid "!OUTBREAK!" +msgstr "!MANIFESTATION!" + +#: libgame/levels.c:159 src/selectdlg.cpp:127 +msgid "!BARRIER!" +msgstr "!BARRI��RE!" + +#: libgame/levels.c:161 src/selectdlg.cpp:128 +msgid "!SITTING_DUCKS!" +msgstr "!CANARDS!" + +#: libgame/levels.c:163 src/selectdlg.cpp:129 +msgid "!HUNTER!" +msgstr "!CHASSEUR!" + +#: libgame/levels.c:165 src/selectdlg.cpp:130 +msgid "!INVADERS!" +msgstr "!ENVAHISSEURS!" + +#: src/view.cpp:255 +msgid "Pause" +msgstr "Pause" + +#: src/view.cpp:264 +msgid "Restart level? y/n" +msgstr "Red��marrer le niveau ? o/n" + +#: src/view.cpp:265 +msgid "(Costs a life.)" +msgstr "(Une vie perdue.)" + +#: src/view.cpp:281 +msgid "Quit Game? y/n" +msgstr "Quitter la partie ? y/n" + +#: src/view.cpp:282 +msgid "(No hiscore entry yet, game can be resumed later.)" +msgstr "(Aucun point inscrit, la partie peut reprendre plus tard.)" + +#: src/view.cpp:390 +msgid "Buy Continue? y/n" +msgstr "Voulez-vous continuer la partie ? y/n" + +#: src/view.cpp:391 +msgid "(Costs ALL of your score.)" +msgstr "(Efface tous les points.)" + +#: src/view.cpp:684 +msgid "(Level " +msgstr "(Niveau " + +#: src/view.cpp:697 +msgid "Active Extras" +msgstr "Active Extras" + +#: src/view.cpp:715 +msgid "Hiscores" +msgstr "Tableau des points" + +#: src/view.cpp:1106 src/view.cpp:1613 +msgid "Kids" +msgstr "Enfants" + +#: src/view.cpp:1106 src/view.cpp:1613 +msgid "Very Easy" +msgstr "Tr��s Facile" + +#: src/view.cpp:1106 src/view.cpp:1613 +msgid "Easy" +msgstr "Facile" + +#: src/view.cpp:1106 src/view.cpp:1613 +msgid "Medium" +msgstr "Moyenne" + +#: src/view.cpp:1106 src/view.cpp:1613 +msgid "Hard" +msgstr "Difficile" + +#: src/view.cpp:1107 +msgid "No Limit" +msgstr "Sans limite" + +#: src/view.cpp:1107 +msgid "200 FPS" +msgstr "200 IPS" + +#: src/view.cpp:1107 +msgid "100 FPS" +msgstr "100 IPS" + +#: src/view.cpp:1129 +msgid "Start Original Levels" +msgstr "D��marre en mode classique" + +#: src/view.cpp:1130 +msgid "Start level set 'LBreakoutHD'." +msgstr "D��marre le jeu classique ��LBreakoutHD��." + +#: src/view.cpp:1132 +msgid "Start Custom Levels" +msgstr "D��marre les niveaux personnalis��s" + +#: src/view.cpp:1133 +msgid "Select and run a custom level set." +msgstr "S��lectionne et d��marre les niveaux personnalis��s." + +#: src/view.cpp:1136 +msgid "Difficulty" +msgstr "Difficult��e" + +#: src/view.cpp:1137 +msgid "" +"This affects lives, paddle size and ball speed. For Kids and Easy score is " +"reduced, for Hard a bonus is given." +msgstr "" +"Le nombre de vies, la taille du palet et la vitesse de la balle changent. " +"Moins de points pour ��Enfants�� et ��Facile��. Un bonus pour ��Difficile��" + +#: src/view.cpp:1140 +msgid "Players" +msgstr "Joueurs" + +#: src/view.cpp:1141 +msgid "Number and names of players. Players alternate whenever a life is lost." +msgstr "" +"Nombre et noms des joueurs. Quand une vie est perdue, on change de joueur." + +#: src/view.cpp:1143 +msgid "1st" +msgstr "1er" + +#: src/view.cpp:1144 +msgid "2nd" +msgstr "2��me" + +#: src/view.cpp:1145 +msgid "3rd" +msgstr "3��me" + +#: src/view.cpp:1146 +msgid "4th" +msgstr "4��me" + +#: src/view.cpp:1150 +msgid "Left" +msgstr "Gauche" + +#: src/view.cpp:1151 +msgid "Right" +msgstr "Droite" + +#: src/view.cpp:1152 +msgid "Left Fire" +msgstr "Tir gauche" + +#: src/view.cpp:1153 +msgid "" +"Fire balls to the left. Ignored if 'Ball Fire Angle' in 'Advanced Settings' " +"is 'Random'." +msgstr "" +"Tir de balles �� gauche. Ignor�� si ��Angle de tir�� dans ��Mode avanc�� est " +"��al��atoire��." + +#: src/view.cpp:1155 +msgid "Right Fire" +msgstr "Tir droit" + +#: src/view.cpp:1156 +msgid "" +"Fire balls to the right. Ignored if 'Ball Fire Angle' in 'Advanced Settings' " +"is 'Random'." +msgstr "" +"Tir de balles �� droite. Ignor�� si ��Angle de tir�� dans ��Mode avanc�� est " +"��al��atoire��." + +#: src/view.cpp:1158 +msgid "Paddle Turbo" +msgstr "Palet turbo" + +#: src/view.cpp:1159 +msgid "Speed up paddle movement." +msgstr "Acc��l��re les mouvements du palet." + +#: src/view.cpp:1161 src/view.cpp:1231 +msgid "Ball Turbo" +msgstr "Balle turbo" + +#: src/view.cpp:1162 +msgid "Speed up balls to limit 'Acc. Ball Speed' in 'Advanced Settings'." +msgstr "Acc��l��re les balles �� Vitesse de balle�� dans ��Mode avanc��." + +#: src/view.cpp:1164 +msgid "Idle Return" +msgstr "Ralenti" + +#: src/view.cpp:1165 +msgid "" +"Return all idle balls (no effective brick hits for some time) to the paddle." +msgstr "" +"Toutes les balles inactives reviennent vers le palet (si aucun contact avec " +"les briques apr��s un certain temps)." + +#: src/view.cpp:1168 +msgid "Key Speed" +msgstr "Touche vitesse" + +#: src/view.cpp:1169 +msgid "The higher the value the faster the paddle moves by keys." +msgstr "" +"Plus la frappe sur les touches est grande, plus les mouvements du palet sont " +"rapides." + +#: src/view.cpp:1171 +msgid "Mouse Input" +msgstr "Entr��e souris" + +#: src/view.cpp:1172 +msgid "" +"'Absolute' uses absolute mouse position. No fine tuning possible and you " +"might experience delay (if moving too far to the right you'll need to come " +"back to the paddle position first) but it will be more accurate for slow " +"movements.\n" +"'Relative' allows modifying paddle speed but might get inaccurate for slow " +"movements with high resolution and high frame rates." +msgstr "" +"��Absolu�� d��fini une position absolue de la souris. Pas de r��glage fin et il " +"y aura un d��lai (sur des mouvements trops �� droite vous devrez d'abords " +"revenir �� la position du palet) mais plus pr��cis pour des movements lents.\n" +"��Relatif�� permet la modificatifion de la vitesse du palet, mais impr��cis en " +"cas de mouvements lents pour de hautes r��solutions et un nombre ��lev�� " +"d'images/seconde." + +#: src/view.cpp:1173 +msgid "Absolute" +msgstr "Absolu" + +#: src/view.cpp:1173 +msgid "Relative" +msgstr "Relatif" + +#: src/view.cpp:1174 +msgid "Motion Modifier" +msgstr "Sensibilit�� souris" + +#: src/view.cpp:1175 +msgid "Adjust mouse sensitivity. (relative motion only)" +msgstr "R��gle la sensibilit�� de la souris (mouvements relatifs)." + +#: src/view.cpp:1177 +msgid "Invert Motion" +msgstr "Inversion souris" + +#: src/view.cpp:1178 +msgid "Invert mouse motion if needed. (relative motion only)" +msgstr "Inversion souris si besoins. (mouvements relatifs)" + +#: src/view.cpp:1183 +msgid "Theme" +msgstr "Th��me" + +#: src/view.cpp:1184 +msgid "Select theme. (not applied yet)" +msgstr "S��lecteur de th��me (indisponible)." + +#: src/view.cpp:1186 +msgid "Mode" +msgstr "Mode" + +#: src/view.cpp:1187 +msgid "Select mode. (not applied yet)" +msgstr "S��lectionner le mode (indisponible)." + +#: src/view.cpp:1189 +msgid "Antialiasing" +msgstr "Anticr��nelage" + +#: src/view.cpp:1190 +msgid "" +"'Auto' means no antialiasing for old LBreakout2 low resolution themes as " +"this might cause (slight) graphical errors. 'Always' means to use it even " +"for low resolution themes." +msgstr "" +"��Auto�� pas d'anticr��nelage pour les anciens th��mes de LBreakout2 en basse " +"r��solution car il y a un risque (faible) d'erreurs graphique. ��Toujours�� " +"utilise l'anticr��nelage m��me pour les th��mes en basse r��solution." + +#: src/view.cpp:1191 src/view.cpp:1233 src/view.cpp:1236 +msgid "Auto" +msgstr "Auto" + +#: src/view.cpp:1191 +msgid "Always" +msgstr "Toujours" + +#: src/view.cpp:1192 +msgid "Apply Theme&Mode" +msgstr "Appliquer th��me et mode" + +#: src/view.cpp:1193 +msgid "Apply the above settings." +msgstr "Appliquer les pr��f��rences ci-dessus." + +#: src/view.cpp:1195 +msgid "Frame Limit" +msgstr "Nb images/s" + +#: src/view.cpp:1196 +msgid "" +"Maximum number of frames per second.\n" +"Be careful: The higher the limit the more insensitive your mouse might " +"become to slow movements (because relative motion is used and program cycles " +"are shorter).\n" +"200 FPS should be a good value." +msgstr "" +"Nombre maximale d'images/seconde.\n" +"Attention : Plus la valeur est ��lev��e, moins la souris sera sensible aux " +"mouvements lents (les cyles du programme sont plus courts).\n" +"200 IPS semble ��tre une bonne valeur." + +#: src/view.cpp:1201 +msgid "Sound" +msgstr "Son" + +#: src/view.cpp:1202 +msgid "Volume" +msgstr "Volume" + +#: src/view.cpp:1203 +msgid "Speech" +msgstr "Voix" + +#: src/view.cpp:1205 +msgid "Buffer Size" +msgstr "Taille du tampon" + +#: src/view.cpp:1206 +msgid "" +"Reduce buffer size if you experience sound delays. Might have more CPU " +"impact though. (not applied yet)" +msgstr "" +"R��duisez la taille du tampon si vous avez des retards avec le son. N��cessite " +"plus de temps CPU (indisponible)" + +#: src/view.cpp:1208 +msgid "Channels" +msgstr "Canaux" + +#: src/view.cpp:1209 +msgid "" +"More channels gives more sound variety, less channels less (not applied yet)" +msgstr "" +"Plus de canaux augmente la diversit�� des sons, moins la diminue " +"(indisponible)" + +#: src/view.cpp:1211 +msgid "Apply Size&Channels" +msgstr "Appliquer taille et canaux" + +#: src/view.cpp:1212 +msgid "Apply above settings" +msgstr "Utiliser les pr��f��rences ci-dessus" + +#: src/view.cpp:1216 +msgid "Controls" +msgstr "Contr��les" + +#: src/view.cpp:1217 +msgid "Graphics" +msgstr "Graphique" + +#: src/view.cpp:1218 +msgid "Audio" +msgstr "Audio" + +#: src/view.cpp:1219 +msgid "Advanced" +msgstr "Avanc��es" + +#: src/view.cpp:1222 +msgid "Paddle Style" +msgstr "type de palet" + +#: src/view.cpp:1223 +msgid "" +"Use 'Convex' for casual play: The paddle is treated as convex allowing easy " +"aiming.\n" +"Use 'Normal' for regular behaviour. You will have to aim by using the side " +"hemispheres or giving balls momentum by moving at the right moment when they " +"hit the flat part. Only for experienced players." +msgstr "" +"��Convexe�� pour un jeu p��p��re : le palet est consid��r�� comme un corps convexe " +"afin de pouvoir viser sans mal.\n" +"��Normal�� pour un comportement standard. Vous devez viser en utilisant les " +"c��t��s arrondis du palet ou le d��placer au bon moment lorsqu'il frappe sa " +"partie plate, afin de donner une implusion �� la balle. Uniquement pour " +"joueur exp��riment��." + +#: src/view.cpp:1224 +msgid "Normal" +msgstr "Normal" + +#: src/view.cpp:1224 +msgid "Convex" +msgstr "Convexe" + +#: src/view.cpp:1225 +msgid "Ball Layer" +msgstr "Plan balles" + +#: src/view.cpp:1226 +msgid "" +"'Below Extras' is the normal layer. It might get hard with many extras and " +"effects though, so change to 'Above Extras' to have balls always on top of " +"everything (looks weird but helps to keep an eye on them)." +msgstr "" +"��Sous extras�� est le plan standard. Si c'est trop difficile avec beaucoup " +"d'extras et d'effets, changez en ��sur extras�� pour toujours laisser les " +"balles au-dessus de tout (��trange, mais permet de les garder �� l'��il!)." + +#: src/view.cpp:1227 +msgid "Below Extras" +msgstr "Sous extras" + +#: src/view.cpp:1227 +msgid "Above Extras" +msgstr "Sur extras" + +#: src/view.cpp:1228 +msgid "Ball Fire Angle" +msgstr "Angle de tir" + +#: src/view.cpp:1229 +msgid "" +"Either 50 degrees to the left/right or random no matter what fire key has " +"been pressed." +msgstr "" +"Soit 50�� de gauche �� droite, soit al��atoire, quelque soit la touche de tir " +"actionn��e." + +#: src/view.cpp:1230 src/view.cpp:1721 +msgid "Random" +msgstr "Al��atoire" + +#: src/view.cpp:1232 +msgid "" +"'Auto' will automatically speed up your balls (the farther away from the " +"paddle the more).\n" +"'Manually' puts them to maximum speed while key is pressed (default key is " +"c)." +msgstr "" +"��Auto�� acc��l��rera automatiquement vos balles (plus elles seront ��loign��es du " +"palet, plus vite elles iront).\n" +"��Manuelle�� les met �� la vitesse maximale quand la touche est actionn��e (par " +"d��faut : c)." + +#: src/view.cpp:1233 src/view.cpp:1236 +msgid "Manually" +msgstr "Manuelle" + +#: src/view.cpp:1234 +msgid "Return Balls" +msgstr "Retour de balle" + +#: src/view.cpp:1235 +msgid "" +"'Auto' returns all idle balls (no effective brick hits) after 10 seconds to " +"the paddle.\n" +"'Manually' requires you to press a key (default key is Backspace).\n" +"'Auto' is more convenient but 'Manually' might be required for (badly " +"designed) levels where balls need to bounce around a lot." +msgstr "" +"��Auto�� ram��ne sur le palet toutes les balles inactives (aucune touche sur " +"les briques) apr��s 10 secondes.\n" +"��Manuelle�� demande d'actionner la touche (par d��faut : backspace).\n" +"��Auto�� est plus commode, mais ��Manuelle�� peut ��tre utile pour les niveaux o�� " +"les balles ont besoin de beaucoup rebondir (mal impl��ment��)." + +#: src/view.cpp:1237 +msgid "Warp Limit" +msgstr "Niveau suivant" + +#: src/view.cpp:1238 +msgid "" +"If this percentage of bricks is destroyed you can warp to the next level (no " +"penalties) by pressing 'w'. A small icon at the lower right hand side is " +"shown when warp is ready." +msgstr "" +"Quand le pourcentage de briques d��truites est atteint, vous pouvez acc��der " +"au niveau suivant (sans p��nalit��e) en pressant la touche ��w��. Une petite " +"ic��ne en bas �� droite de l'��cran s'affiche indiquant ce moment." + +#: src/view.cpp:1240 +msgid "Acc. Ball Speed" +msgstr "Vitesse de balle" + +#: src/view.cpp:1241 +msgid "Maximum speed of accelerated balls." +msgstr "Vitesse maximale des balles." + +#: src/view.cpp:1243 +msgid "Bonus Levels" +msgstr "Niveau bonus" + +#: src/view.cpp:1243 +msgid "" +"Add bonus levels with a mini game every 4 regular levels. Game over will end " +"the mini game without loosing a life." +msgstr "" +"Ins��re un niveau bonus tous les quatre niveaux standard. Pas de perte de vie " +"quand la partie courte est finie." + +#: src/view.cpp:1247 +msgid "New Game" +msgstr "Nouvelle partie" + +#: src/view.cpp:1248 +msgid "Resume Game" +msgstr "Reprendre la partie" + +#: src/view.cpp:1252 +msgid "Settings" +msgstr "Pr��f��rences" + +#: src/view.cpp:1253 src/view.cpp:1680 +msgid "Help" +msgstr "Aide" + +#: src/view.cpp:1255 +msgid "Quit" +msgstr "Quitter" + +#: src/view.cpp:1608 +msgid "No saved game." +msgstr "La partie n'est pas sauvegard��e." + +#: src/view.cpp:1625 +msgid " player(s)\n" +msgstr " joueur(s)\n" + +#: src/view.cpp:1636 +msgid " (Lvl: " +msgstr " (Niv : " + +#: src/view.cpp:1655 +msgid "" +"You can control your paddle either with the mouse or keyboard. Destroying " +"bricks will release extras sometimes. Some are good, some are bad and some " +"may be good or bad. Some of the bricks take more than one shot, regenerate " +"over time, explode or grow new bricks (see README for more details). Balls " +"will get faster (until life is lost) and the difficulty setting will " +"influence number of lives, ball speed, paddle size and score.\n" +"\n" +"While playing you can press\n" +" - ESC to leave the game (you'll have to confirm)\n" +" - w to warp to next level (if enough bricks were destroyed)\n" +" - p to pause/unpause the game\n" +" - d to destroy a brick (workaround for bad level design)\n" +"\n" +"If you leave a game you can resume it later (no hiscores entry yet).\n" +"\n" +"If you loose all lives you can buy a continue (score set to 0, initial " +"number of lives restored). If you don't buy a continue the game is over " +"(hiscores entry is checked) and can no longer be resumed. \n" +"\n" +"Enjoy the game!\n" +" Michael Speck" +msgstr "" +"Le palet est contr��l�� soit par la souris, soit par le clavier.Parfois, la " +"suppression des briques fera appara��tre des extras.Ils seront positifs, " +"n��gatifs ou les deux. Certaines briques n��ss��citeront plus d'un tir, se " +"reg��n��reront, exploseront ou ajouteront de nouvelles briques (voir README " +"pour plus de d��tails). Les balles iront plus vite (jusqu'�� perdre une vie) " +"et le niveau de difficult�� influencera le nombre de vie, la vitesse de la " +"balle, la taille du palet et les points marqu��s.\n" +"\n" +"Touches accessibles pendant la partie\n" +" - ESC quitter le jeu (demande une confirmation)\n" +" - w acc��der au niveau suivant (si le seuil de briques effac��es est " +"atteint)\n" +" - p pause/reprise de la partie\n" +" - d efface une brique (en cas d'erreur d'impl��mentation)\n" +"\n" +"La partie peut ��tre abandonn��e et reprise �� tout moment (les points ne " +"seront alors pas comptabilis��s).\n" +"Quand toutes les vies sont perdues, on peut continue la partie (points remis " +"�� 0, restauration du nombre de vie). La partie est finie si vous ne " +"continuez pas (v��rification de l'historique des points marqu��s) et elle ne " +"pourra pas reprendre.\n" +"\n" +"Bon jeu !\n" +" Michael Speck" + +#: src/view.cpp:1688 +msgid "Extra Score" +msgstr "Points en plus" + +#: src/view.cpp:1689 +msgid "Gold Shower" +msgstr "Pluie d'or" + +#: src/view.cpp:1691 +msgid "Extra Life" +msgstr "Vie en plus" + +#: src/view.cpp:1692 +msgid "Extra Ball" +msgstr "Balle en plus" + +#: src/view.cpp:1694 +msgid "Expand Paddle" +msgstr "Palet ��largi" + +#: src/view.cpp:1695 +msgid "Shrink Paddle" +msgstr "Palet r��tr��ci" + +#: src/view.cpp:1697 +msgid "Sticky Paddle" +msgstr "Palet collant" + +#: src/view.cpp:1698 +msgid "Plasma Weapon" +msgstr "Arme au plasma" + +#: src/view.cpp:1700 +msgid "Slow Balls" +msgstr "Balles lentes" + +#: src/view.cpp:1701 +msgid "Fast Balls" +msgstr "Balles rapides" + +#: src/view.cpp:1703 +msgid "Energy Balls" +msgstr "Balles d'��nergie" + +#: src/view.cpp:1704 +msgid "Explosive Balls" +msgstr "Balles explosives" + +#: src/view.cpp:1706 +msgid "Extra Floor" +msgstr "��tage en plus" + +#: src/view.cpp:1707 +msgid "Joker (collect goodies)" +msgstr "Joker (collecte tous les bonus)" + +#: src/view.cpp:1709 +msgid "Bonus Magnet" +msgstr "Attire les bonus" + +#: src/view.cpp:1710 +msgid "Malus Magnet" +msgstr "Attire les malus" + +#: src/view.cpp:1712 +msgid "Chaotic Balls" +msgstr "Balles chaotiques" + +#: src/view.cpp:1713 +msgid "Weak Balls" +msgstr "Balles faibles" + +#: src/view.cpp:1715 +msgid "Frozen Paddle" +msgstr "Palet gel��e" + +#: src/view.cpp:1716 +msgid "Ghost Paddle" +msgstr "Palet fant��me" + +#: src/view.cpp:1718 +msgid "Extra Time" +msgstr "Temps en plus" + +#: src/view.cpp:1719 +msgid "Reset" +msgstr "r��-initialisation" + +#: src/view.cpp:1722 +msgid "Darkness" +msgstr "Nuit" + +#: src/view.cpp:1724 +msgid "Indestructible" +msgstr "Indestructible" + +#: src/view.cpp:1725 +msgid "Regular Wall" +msgstr "Mur standard" + +#: src/view.cpp:1727 +msgid "Chaotic Wall" +msgstr "Mur chaotique" + +#: src/view.cpp:1728 +msgid "Regular Brick" +msgstr "Brique basique" + +#: src/view.cpp:1730 +msgid "Multi-hit Brick" +msgstr "Brique multi coup" + +#: src/view.cpp:1731 +msgid "Regenerative Brick" +msgstr "Brique r��g��n��ratrice" + +#: src/view.cpp:1733 +msgid "Explosive Brick" +msgstr "Brique explosive" + +#: src/view.cpp:1734 +msgid "Growing Brick" +msgstr "Brique grandissante" + +#: src/view.cpp:1756 +msgid "Plane of Inner Stability" +msgstr "Zone de stabilit��" + +#: src/view.cpp:1760 +#, fuzzy, c-format +msgid "Left-click on any brick to destroy it (costs 10% score)." +msgstr "Clique gauche sur une brique pour l'effacer (coute 10% des points)." + +#: src/view.cpp:1763 +msgid "Press any key to cancel selection." +msgstr "Appuyer sur une touche pour annuler la s��lection." + +#: src/clientgame.cpp:229 +#, c-format +msgid "Congratulations, %s, you cleared all levels!" +msgstr "F��licitations, %s, vous avez passez tous les niveaux!" + +#: src/clientgame.cpp:236 +#, c-format +msgid "Game over, %s!" +msgstr "Fin de la partie, %s!" + +#: src/clientgame.cpp:330 +#, c-format +msgid "Level: %d, Size: %d/12" +msgstr "Niveau : %d, taille : %d/12" + +#: src/clientgame.cpp:334 +#, c-format +msgid "Total Hits: %d, Current Price: %d" +msgstr "Gesamttreffer: %d, Cout: %d" + +#: src/clientgame.cpp:338 +#, c-format +msgid "Wave: %d, Invaders: %d/%d" +msgstr "Vague : %d, Envahisseurs : %d/%d" + +#: src/clientgame.cpp:343 +#, c-format +msgid "Wave: %d, Infections: %d/%d, Active: %d/%d" +msgstr "Vague : %d, Infections : %d/%d, Actif : %d/%d" + +#: src/clientgame.cpp:349 src/clientgame.cpp:353 +#, c-format +msgid "Hits: %d, Current Price: %d, Time: %d secs" +msgstr "But : %d, Cout actuel : %d, Temps : %d s" + +#: src/selectdlg.cpp:55 +msgid "Superset with ALL levels" +msgstr "Ensemble des niveaux" + +#: src/selectdlg.cpp:57 +msgid "Mini Game" +msgstr "Partie courte" + +#: src/selectdlg.cpp:177 +msgid "Select Levelset (press ESC to exit)" +msgstr "Choisissez le niveau (touche ESC pour quitter)" + +#: src/selectdlg.cpp:186 +msgid "<Previous Page>" +msgstr "<Page pr��c��dante>" + +#: src/selectdlg.cpp:201 +msgid "<Next Page>" +msgstr "<Page suivante>" + +#: src/selectdlg.cpp:207 +msgid " by " +msgstr " par " + +#: src/selectdlg.cpp:211 +msgid " levels)" +msgstr " Niveaux) " + +#: src/sdl.h:41 +msgid "Fullscreen" +msgstr "Plein ��cran" + +#: src/sdl.h:42 +msgid "853x480 Window" +msgstr "Fen��tre 853x480" + +#: src/sdl.h:44 +msgid "1280x720 Window" +msgstr "Fen��tre 1280x720" + +#: src/sdl.h:46 +msgid "1366x768 Window" +msgstr "Fen��tre 1366x768" + +#: src/sdl.h:48 +msgid "1920x1080 Window" +msgstr "Fen��tre 1920x1080" + +#: src/menu.h:167 +msgid "Back" +msgstr "Retour" + +#: src/menu.h:274 +msgid "Off" +msgstr "D��sactiv��" + +#: src/menu.h:274 +msgid "On" +msgstr "Activ��" + +#: src/menu.h:313 +msgid "Enter Name" +msgstr "Entrez un Nom" + +#~ msgid "On Click" +#~ msgstr "sur clique" + +#~ msgid "Options" +#~ msgstr "Options" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbreakouthd-1.0.9/po/lbreakouthd.pot new/lbreakouthd-1.0.10/po/lbreakouthd.pot --- old/lbreakouthd-1.0.9/po/lbreakouthd.pot 2022-03-02 13:48:30.000000000 +0100 +++ new/lbreakouthd-1.0.10/po/lbreakouthd.pot 2022-04-30 10:17:30.000000000 +0200 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: lbreakouthd 1.0.9\n" +"Project-Id-Version: lbreakouthd 1.0.10\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-02 13:48+0100\n" +"POT-Creation-Date: 2022-04-30 10:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -532,6 +532,12 @@ msgid "Bonus Levels" msgstr "" +#: src/view.cpp:1243 +msgid "" +"Add bonus levels with a mini game every 4 regular levels. Game over will end " +"the mini game without loosing a life." +msgstr "" + #: src/view.cpp:1247 msgid "New Game" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbreakouthd-1.0.9/src/main.cpp new/lbreakouthd-1.0.10/src/main.cpp --- old/lbreakouthd-1.0.9/src/main.cpp 2021-04-06 20:52:31.000000000 +0200 +++ new/lbreakouthd-1.0.10/src/main.cpp 2022-04-30 10:30:12.000000000 +0200 @@ -35,7 +35,7 @@ #endif printf("%s %s\n", PACKAGE_NAME, PACKAGE_VERSION); - printf("Copyright 2018-2021 Michael Speck\n"); + printf("Copyright 2018-2022 Michael Speck\n"); printf("Published under GNU GPL\n"); printf("---\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbreakouthd-1.0.9/src/sdl.cpp new/lbreakouthd-1.0.10/src/sdl.cpp --- old/lbreakouthd-1.0.9/src/sdl.cpp 2022-03-02 13:30:28.000000000 +0100 +++ new/lbreakouthd-1.0.10/src/sdl.cpp 2022-04-15 11:29:14.000000000 +0200 @@ -388,7 +388,7 @@ if (ret == 2) { gw /= 2; gh /= 2; - _logerr("Grid image %s too big for hardware texture: scaled to half size %dx%d", + _logerr("Grid image %s too large for hardware texture: scaled to half size %dx%d\n", fname.c_str(),gw,gh); } return ret; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbreakouthd-1.0.9/src/view.cpp new/lbreakouthd-1.0.10/src/view.cpp --- old/lbreakouthd-1.0.9/src/view.cpp 2021-08-08 18:18:48.000000000 +0200 +++ new/lbreakouthd-1.0.10/src/view.cpp 2022-04-23 17:34:33.000000000 +0200 @@ -1240,7 +1240,7 @@ mAdv->add(new MenuItemRange(_("Acc. Ball Speed"), _("Maximum speed of accelerated balls."), AID_MAXBALLSPEEDCHANGED,config.maxballspeed_int1000,700,1200,50)); - mAdv->add(new MenuItemSwitch(_("Bonus Levels"),"Add bonus levels with a mini game every 4 regular levels. Game over will end the mini game without loosing a life. ",AID_NONE,config.add_bonus_levels)); + mAdv->add(new MenuItemSwitch(_("Bonus Levels"),_("Add bonus levels with a mini game every 4 regular levels. Game over will end the mini game without loosing a life."),AID_NONE,config.add_bonus_levels)); mAdv->add(new MenuItemSep()); mAdv->add(new MenuItemBack(mOptions));

1 0

commit arc-gtk-theme for openSUSE:Factory
by Source-Sync 30 Apr '22

30 Apr '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package arc-gtk-theme for openSUSE:Factory checked in at 2022-04-30 22:53:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/arc-gtk-theme (Old) and /work/SRC/openSUSE:Factory/.arc-gtk-theme.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "arc-gtk-theme" Sat Apr 30 22:53:10 2022 rev:14 rq:974117 version:20220405 Changes: -------- --- /work/SRC/openSUSE:Factory/arc-gtk-theme/arc-gtk-theme.changes 2021-05-13 22:18:45.727541985 +0200 +++ /work/SRC/openSUSE:Factory/.arc-gtk-theme.new.1538/arc-gtk-theme.changes 2022-04-30 22:53:24.504294922 +0200 @@ -1,0 +2,52 @@ +Sat Apr 30 10:04:59 UTC 2022 - Ferdinand Thiessen <rpm(a)fthiessen.de> + +- Update to version 20220405 + * GNOME Shell theme: Update for GNOME Shell 42 + * GTK 3 theme: + * Nautilus path-bar improvements + * Style redesigned path-bar in Nautilus 42 + * Various fixes + * GTK 4 theme: Add libadwaita public color definitions +- Update to version 20220223 + * GTK 3 theme: Various fixes and improvements + * GTK 4 theme: + * Add styling for libadwaita widgets + * Stop versioning the theme, as that seems unnecessary for GTK 4 + * Various fixes and improvements + * GNOME Shell theme: Fix dash-to-dock focused application icon + mouseover background +- Update to version 20220102 + * Cinnamon theme: + * Update for Cinnamon 5.2 + * Drop support for versions before 3.8 + * GTK 4 theme: Fix applications crashing with GTK 4.6 + * GTK 3 theme: + * Drop versioned themes, and only target GTK 3.24 for now on + * Xfce4 panel padding fixes + * Hide border on MATE panel sensors applet graph + * GNOME Shell theme: + * Drop Arc-Lighter variant for GNOME Shell 40 and later + * Drop support for versions before 3.28 + * Metacity theme: + * Add dark Metacity v3 variant, with distinct window border + * Adjust titlebar padding + * Increase rounded corner radius slightly + * Don't round corners for tiled windows + * Xfwm4 theme: + * Increase resize border width + * Make bottom decoration corners square + * Fix titlebar button spacing +- Update to version 20211018 + * Added Arc GTK 4 theme: Currently based on GTK 4.2, but should + work just as well with GTK 4.4. Any libadwaita specific styling + is not yet supported, so applications using it may appear + imperfectly themed. + * GTK 3 theme: + * Update style for libhandy + * Fix circular buttons appearing elliptical + * GNOME Shell theme: + * Add support for GNOME Shell 41 + * Various updates and fixes for GNOME Shell 40 + * Cinnamon theme: Support version 5.01 + +------------------------------------------------------------------- Old: ---- _service arc-theme-20210412.tar.xz New: ---- arc-theme-20220405.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arc-gtk-theme.spec ++++++ --- /var/tmp/diff_new_pack.IcRaAI/_old 2022-04-30 22:53:25.052295664 +0200 +++ /var/tmp/diff_new_pack.IcRaAI/_new 2022-04-30 22:53:25.056295669 +0200 @@ -1,7 +1,7 @@ # # spec file for package arc-gtk-theme # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,17 +19,16 @@ %define _theme Arc %define _name arc Name: arc-gtk-theme -Version: 20210412 +Version: 20220405 Release: 0 Summary: Arc GTK theme License: GPL-3.0-or-later URL: https://github.com/jnsh/arc-theme -Source: %{_name}-theme-%{version}.tar.xz +Source: https://github.com/jnsh/arc-theme/releases/download/%{version}/arc-theme-%{… BuildRequires: cinnamon BuildRequires: fdupes BuildRequires: gnome-shell -BuildRequires: inkscape -BuildRequires: meson +BuildRequires: meson >= 0.53 BuildRequires: optipng BuildRequires: pkgconfig BuildRequires: sassc @@ -77,9 +76,20 @@ This package contains the GTK 3 theme. +%package -n gtk4-metatheme-%{_name} +Summary: Arc GTK 4 Theme +Requires: gtk4 +Requires: metatheme-%{_name}-common = %{version} +Supplements: (metatheme-%{_name}-common and gtk4) + +%description -n gtk4-metatheme-%{_name} +Arc is a flat theme with transparent elements. +It supports MATE, GNOME, Budgie, Xfce, and Cinnamon. + +This package contains the GTK 4 theme. + %prep %setup -q -n %{_name}-theme-%{version} -sed -i 's/^$IconTheme=$.*$/\1Adwaita/' common/index/*/index.theme %build %meson @@ -106,4 +116,9 @@ %doc AUTHORS README.md %{_datadir}/themes/%{_theme}*/gtk-3.0/ +%files -n gtk4-metatheme-%{_name} +%license COPYING +%doc AUTHORS README.md +%{_datadir}/themes/%{_theme}*/gtk-4.0/ + %changelog ++++++ arc-theme-20210412.tar.xz -> arc-theme-20220405.tar.xz ++++++ ++++ 225678 lines of diff (skipped)

1 0

commit cilium-cli for openSUSE:Factory
by Source-Sync 30 Apr '22

30 Apr '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cilium-cli for openSUSE:Factory checked in at 2022-04-30 22:53:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cilium-cli (Old) and /work/SRC/openSUSE:Factory/.cilium-cli.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cilium-cli" Sat Apr 30 22:53:07 2022 rev:9 rq:974115 version:0.11.4 Changes: -------- --- /work/SRC/openSUSE:Factory/cilium-cli/cilium-cli.changes 2022-04-28 23:08:20.568710273 +0200 +++ /work/SRC/openSUSE:Factory/.cilium-cli.new.1538/cilium-cli.changes 2022-04-30 22:53:21.092290306 +0200 @@ -1,0 +2,13 @@ +Sat Apr 30 15:45:07 UTC 2022 - kastl(a)b1-systems.de + +- Update to version 0.11.4: + * hubble: Log Creation of Peer Service + * uninstall: Add Chart Directory Opt for Uninstall and Disable + * hubble: Log Deletion of Peer Service + * install: Wait for test pods to be cleaned up + * Extract all deamonsets of Cilium + * Add option to automatically detect the pid of the gops agent + * install: add encryption.enabled when encryption wireguard is used + * build(deps): bump docker/setup-buildx-action from 1.6.0 to 1.7.0 + +------------------------------------------------------------------- Old: ---- cilium-cli-0.11.3.tar.gz New: ---- cilium-cli-0.11.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cilium-cli.spec ++++++ --- /var/tmp/diff_new_pack.VAX14o/_old 2022-04-30 22:53:22.188291789 +0200 +++ /var/tmp/diff_new_pack.VAX14o/_new 2022-04-30 22:53:22.196291800 +0200 @@ -19,7 +19,7 @@ %define __arch_install_post export NO_BRP_STRIP_DEBUG=true Name: cilium-cli -Version: 0.11.3 +Version: 0.11.4 Release: 0 Summary: CLI to install, manage & troubleshoot Kubernetes clusters running Cilium License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.VAX14o/_old 2022-04-30 22:53:22.224291837 +0200 +++ /var/tmp/diff_new_pack.VAX14o/_new 2022-04-30 22:53:22.228291843 +0200 @@ -3,7 +3,7 @@ <param name="url">https://github.com/cilium/cilium-cli</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v0.11.3</param> + <param name="revision">v0.11.4</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> <param name="versionrewrite-pattern">v(.*)</param> @@ -16,7 +16,7 @@ <param name="compression">gz</param> </service> <service name="go_modules" mode="disabled"> - <param name="archive">cilium-cli-0.11.3.tar.gz</param> + <param name="archive">cilium-cli-0.11.4.tar.gz</param> </service> </services> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.VAX14o/_old 2022-04-30 22:53:22.244291865 +0200 +++ /var/tmp/diff_new_pack.VAX14o/_new 2022-04-30 22:53:22.248291870 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/cilium/cilium-cli</param> - <param name="changesrevision">2cab9e43b0fe1736116ace7c138904839c99466a</param></service></servicedata> + <param name="changesrevision">f7d68083bb496efeb3fa2ff77fb8eddb4107b924</param></service></servicedata> (No newline at EOF) ++++++ cilium-cli-0.11.3.tar.gz -> cilium-cli-0.11.4.tar.gz ++++++ /work/SRC/openSUSE:Factory/cilium-cli/cilium-cli-0.11.3.tar.gz /work/SRC/openSUSE:Factory/.cilium-cli.new.1538/cilium-cli-0.11.4.tar.gz differ: char 26, line 2 ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/cilium-cli/vendor.tar.gz /work/SRC/openSUSE:Factory/.cilium-cli.new.1538/vendor.tar.gz differ: char 5, line 1

1 0

commit metamath for openSUSE:Factory
by Source-Sync 30 Apr '22

30 Apr '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package metamath for openSUSE:Factory checked in at 2022-04-30 22:53:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/metamath (Old) and /work/SRC/openSUSE:Factory/.metamath.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "metamath" Sat Apr 30 22:53:06 2022 rev:7 rq:974104 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/metamath/metamath.changes 2022-01-16 23:19:05.770372499 +0100 +++ /work/SRC/openSUSE:Factory/.metamath.new.1538/metamath.changes 2022-04-30 22:53:20.080288937 +0200 @@ -1,0 +2,8 @@ +Sat Apr 30 12:04:31 UTC 2022 - Aaron Puchert <aaronpuchert(a)alice-dsl.net> + +- Disable build of metamath-book on Tumbleweed: it doesn't build + with TeXlive 2022 because of what seems to be a bug in + texlive-tabu. (gh#metamath/metamath-book#235) +- Use symbolic dependencies for required TeX packages. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ metamath.spec ++++++ --- /var/tmp/diff_new_pack.FuthJI/_old 2022-04-30 22:53:20.560289586 +0200 +++ /var/tmp/diff_new_pack.FuthJI/_new 2022-04-30 22:53:20.560289586 +0200 @@ -18,7 +18,9 @@ # Do not build LaTeX docs on SLES. -%if 0%{?is_opensuse} +# Also don't build on Tumbleweed. Seems that tabu broke with TeXlive 2022. +# https://github.com/metamath/metamath-book/issues/235. +%if 0%{?is_opensuse} && 0%{?suse_version} <= 1500 %bcond_without latex_doc %else %bcond_with latex_doc @@ -41,17 +43,18 @@ BuildRequires: automake BuildRequires: gcc %if %{with latex_doc} -BuildRequires: texlive-amsfonts -BuildRequires: texlive-anysize BuildRequires: texlive-bibtex-bin -BuildRequires: texlive-breqn -BuildRequires: texlive-hyperref BuildRequires: texlive-latex-bin -BuildRequires: texlive-makecell BuildRequires: texlive-makeindex-bin -BuildRequires: texlive-microtype -BuildRequires: texlive-needspace -BuildRequires: texlive-tabu +BuildRequires: tex(amssymb.sty) +BuildRequires: tex(anysize.sty) +BuildRequires: tex(breqn.sty) +BuildRequires: tex(hyperref.sty) +BuildRequires: tex(longtable.sty) +BuildRequires: tex(makecell.sty) +BuildRequires: tex(microtype.sty) +BuildRequires: tex(needspace.sty) +BuildRequires: tex(tabu.sty) Suggests: %{name}-book = %{book_version} %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build

1 0

commit arping2 for openSUSE:Factory
by Source-Sync 30 Apr '22

30 Apr '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package arping2 for openSUSE:Factory checked in at 2022-04-30 22:53:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/arping2 (Old) and /work/SRC/openSUSE:Factory/.arping2.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "arping2" Sat Apr 30 22:53:04 2022 rev:22 rq:974100 version:2.23 Changes: -------- --- /work/SRC/openSUSE:Factory/arping2/arping2.changes 2021-07-17 23:37:24.653612576 +0200 +++ /work/SRC/openSUSE:Factory/.arping2.new.1538/arping2.changes 2022-04-30 22:53:19.140287665 +0200 @@ -1,0 +2,8 @@ +Sat Apr 30 10:21:06 UTC 2022 - Ferdinand Thiessen <rpm(a)fthiessen.de> + +- Update to release 2.23 + * Work around VLAN bug in libpcap 1.7-1.9.0 + * Experimental support for seccomp (off by default) + * Made -P set target MAC address (-t) + +------------------------------------------------------------------- Old: ---- arping-2.22.tar.gz arping-2.22.tar.gz.asc New: ---- arping-2.23.tar.gz arping-2.23.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arping2.spec ++++++ --- /var/tmp/diff_new_pack.IzskrQ/_old 2022-04-30 22:53:19.680288396 +0200 +++ /var/tmp/diff_new_pack.IzskrQ/_new 2022-04-30 22:53:19.684288401 +0200 @@ -1,7 +1,7 @@ # # spec file for package arping2 # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,15 @@ Name: arping2 -Version: 2.22 +Version: 2.23 Release: 0 Summary: Layer-2 Ethernet pinger License: GPL-2.0-or-later Group: Productivity/Networking/Diagnostic -URL: http://www.habets.pp.se/synscan/programs.php?prog=arping +URL: https://www.habets.pp.se/synscan/programs.php?prog=arping #Git-Clone: git://github.com/ThomasHabets/arping -Source: http://www.habets.pp.se/synscan/files/arping-%version.tar.gz -Source2: http://www.habets.pp.se/synscan/files/arping-%version.tar.gz.asc +Source: https://www.habets.pp.se/synscan/files/arping-%version.tar.gz +Source2: https://www.habets.pp.se/synscan/files/arping-%version.tar.gz.asc Source3: %name.keyring BuildRequires: libnet-devel BuildRequires: libpcap-devel ++++++ arping-2.22.tar.gz -> arping-2.23.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.22/Makefile.in new/arping-2.23/Makefile.in --- old/arping-2.22/Makefile.in 2021-06-27 23:28:23.000000000 +0200 +++ new/arping-2.23/Makefile.in 2022-03-06 19:16:15.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. @@ -199,6 +199,8 @@ DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best DIST_TARGETS = dist-gzip +# Exists only to be overridden by the user if desired. +AM_DISTCHECK_DVI_TARGET = dvi distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -618,7 +620,7 @@ $(DISTCHECK_CONFIGURE_FLAGS) \ --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.22/README new/arping-2.23/README --- old/arping-2.22/README 2021-06-27 23:28:21.000000000 +0200 +++ new/arping-2.23/README 2022-03-06 19:16:13.000000000 +0100 @@ -6,7 +6,7 @@ http://www.habets.pp.se/synscan/ http://github.com/ThomasHabets/arping - git clone git://github.com/ThomasHabets/arping.git + git clone https://github.com/ThomasHabets/arping.git Introduction ------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.22/aclocal.m4 new/arping-2.23/aclocal.m4 --- old/arping-2.22/aclocal.m4 2021-06-27 23:28:22.000000000 +0200 +++ new/arping-2.23/aclocal.m4 2022-03-06 19:16:14.000000000 +0100 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.16.2 -*- Autoconf -*- +# generated automatically by aclocal 1.16.3 -*- Autoconf -*- # Copyright (C) 1996-2020 Free Software Foundation, Inc. @@ -35,7 +35,7 @@ [am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.16.2], [], +m4_if([$1], [1.16.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,7 +51,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.16.2])dnl +[AM_AUTOMAKE_VERSION([1.16.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -739,12 +739,7 @@ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.22/config.h.in new/arping-2.23/config.h.in --- old/arping-2.22/config.h.in 2021-06-27 23:28:23.000000000 +0200 +++ new/arping-2.23/config.h.in 2022-03-06 19:16:14.000000000 +0100 @@ -1,5 +1,8 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* Disable seccomp by default */ +#undef DEFAULT_SECCOMP + /* Define to 1 if you have the <arpa/inet.h> header file. */ #undef HAVE_ARPA_INET_H @@ -54,6 +57,9 @@ /* Define to 1 if you have the `rt' library (-lrt). */ #undef HAVE_LIBRT +/* Define to 1 if you have the `seccomp' library (-lseccomp). */ +#undef HAVE_LIBSECCOMP + /* Define to 1 if you have the `socket' library (-lsocket). */ #undef HAVE_LIBSOCKET @@ -87,6 +93,9 @@ /* Define to 1 if you have the <pwd.h> header file. */ #undef HAVE_PWD_H +/* Define to 1 if you have the <seccomp.h> header file. */ +#undef HAVE_SECCOMP_H + /* Define to 1 if you have the `select' function. */ #undef HAVE_SELECT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.22/configure new/arping-2.23/configure --- old/arping-2.22/configure 2021-06-27 23:28:23.000000000 +0200 +++ new/arping-2.23/configure 2022-03-06 19:16:14.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for arping 2.22. +# Generated by GNU Autoconf 2.69 for arping 2.23. # # Report bugs to <thomas(a)habets.se>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='arping' PACKAGE_TARNAME='arping' -PACKAGE_VERSION='2.22' -PACKAGE_STRING='arping 2.22' +PACKAGE_VERSION='2.23' +PACKAGE_STRING='arping 2.23' PACKAGE_BUGREPORT='thomas(a)habets.se' PACKAGE_URL='' @@ -735,6 +735,7 @@ enable_silent_rules enable_maintainer_mode enable_dependency_tracking +enable_seccomp enable_hardened enable_warnings ' @@ -1297,7 +1298,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures arping 2.22 to adapt to many kinds of systems. +\`configure' configures arping 2.23 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1369,7 +1370,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of arping 2.22:";; + short | recursive ) echo "Configuration of arping 2.23:";; esac cat <<\_ACEOF @@ -1386,6 +1387,7 @@ do not reject slow dependency extractors --disable-dependency-tracking speeds up one-time build +Enable seccomp priv drops by default (-z to turn on, -Z for off) --enable-hardened Enable security build options --enable-warnings Enable build warnings @@ -1465,7 +1467,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -arping configure 2.22 +arping configure 2.23 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1934,7 +1936,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by arping $as_me 2.22, which was +It was created by arping $as_me 2.23, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2599,12 +2601,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then @@ -2909,7 +2906,7 @@ # Define the identity of the package. PACKAGE='arping' - VERSION='2.22' + VERSION='2.23' cat >>confdefs.h <<_ACEOF @@ -4290,6 +4287,51 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for seccomp_init in -lseccomp" >&5 +$as_echo_n "checking for seccomp_init in -lseccomp... " >&6; } +if ${ac_cv_lib_seccomp_seccomp_init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lseccomp $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char seccomp_init (); +int +main () +{ +return seccomp_init (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_seccomp_seccomp_init=yes +else + ac_cv_lib_seccomp_seccomp_init=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_seccomp_seccomp_init" >&5 +$as_echo "$ac_cv_lib_seccomp_seccomp_init" >&6; } +if test "x$ac_cv_lib_seccomp_seccomp_init" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBSECCOMP 1 +_ACEOF + + LIBS="-lseccomp $LIBS" + +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5 $as_echo_n "checking for clock_gettime in -lrt... " >&6; } if ${ac_cv_lib_rt_clock_gettime+:} false; then : @@ -4526,6 +4568,24 @@ fi +# Check whether --enable-seccomp was given. +if test "${enable_seccomp+set}" = set; then : + enableval=$enable_seccomp; + if test "$ac_cv_lib_seccomp_seccomp_init" = "no"; then + as_fn_error $? "--enable-seccomp given but seccomp libraries not present" "$LINENO" 5 + fi + +$as_echo "#define DEFAULT_SECCOMP 1" >>confdefs.h + + +else + + +$as_echo "#define DEFAULT_SECCOMP 0" >>confdefs.h + + +fi + # Checks for header files. ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -4926,10 +4986,11 @@ for ac_header in \ arpa/inet.h \ +getopt.h \ netinet/in.h \ +seccomp.h \ stdlib.h \ sys/socket.h \ -getopt.h \ time.h \ grp.h \ sys/time.h \ @@ -6038,7 +6099,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by arping $as_me 2.22, which was +This file was extended by arping $as_me 2.23, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6104,7 +6165,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -arping config.status 2.22 +arping config.status 2.23 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.22/configure.ac new/arping-2.23/configure.ac --- old/arping-2.22/configure.ac 2021-06-27 23:28:21.000000000 +0200 +++ new/arping-2.23/configure.ac 2022-03-06 19:16:13.000000000 +0100 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT(arping, 2.22, thomas(a)habets.se) +AC_INIT(arping, 2.23, thomas(a)habets.se) AC_CANONICAL_SYSTEM AC_CONFIG_SRCDIR([src/arping.c]) AM_INIT_AUTOMAKE @@ -26,6 +26,7 @@ AC_CHECK_LIB([socket], [socket]) AC_CHECK_LIB([nsl], [gethostbyname]) AC_CHECK_LIB([cap], [cap_init]) +AC_CHECK_LIB([seccomp], [seccomp_init]) AC_CHECK_LIB([rt], [clock_gettime]) AC_CHECK_LIB([net], [libnet_name_resolve], [AC_MSG_ERROR([libnet 1.0.x found. Arping 2.x requires libnet 1.1 or newer])]) @@ -33,14 +34,23 @@ AC_CHECK_LIB([pcap], [pcap_open_live], ,[AC_MSG_ERROR([libpcap not found])]) AC_SEARCH_LIBS([clock_gettime], [rt]) +AC_ARG_ENABLE([seccomp], [Enable seccomp priv drops by default (-z to turn on, -Z for off)], [ + if test "$ac_cv_lib_seccomp_seccomp_init" = "no"; then + AC_MSG_ERROR([--enable-seccomp given but seccomp libraries not present]) + fi + AC_DEFINE([DEFAULT_SECCOMP], [1], [Enable seccomp by default]) +], [ + AC_DEFINE([DEFAULT_SECCOMP], [0], [Disable seccomp by default]) +]) # Checks for header files. AC_HEADER_STDC AC_CHECK_HEADERS([\ arpa/inet.h \ +getopt.h \ netinet/in.h \ +seccomp.h \ stdlib.h \ sys/socket.h \ -getopt.h \ time.h \ grp.h \ sys/time.h \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.22/doc/Makefile.in new/arping-2.23/doc/Makefile.in --- old/arping-2.22/doc/Makefile.in 2021-06-27 23:28:23.000000000 +0200 +++ new/arping-2.23/doc/Makefile.in 2022-03-06 19:16:15.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.22/doc/arping.8 new/arping-2.23/doc/arping.8 --- old/arping-2.22/doc/arping.8 2021-06-27 23:28:21.000000000 +0200 +++ new/arping-2.23/doc/arping.8 2022-03-06 19:16:13.000000000 +0100 @@ -109,12 +109,12 @@ .IP "\-T \fIIP\fP" Use \-T as target address when pinging MACs that won\(cq\&t respond to a broadcast ping but perhaps to a directed broadcast\&. -.IP +.PP \fIExample\fP: .nf .sp To check the address of MAC\-A, use knowledge of MAC\-B and IP\-B\&. -.IP +.PP $ arping \-S <IP\-B> \-s <MAC\-B> \-p <MAC\-A> .IP "\-u" Show index=received/sent instead of just index=received when @@ -123,7 +123,7 @@ Send unsolicited ARP\&. This sets the destination MAC address in the ARP frame to the broadcast address\&. Unsolicited ARP is used to update the neighbours\(cq\& ARP caches\&. -.IP +.PP \fIExample\fP: .nf .sp @@ -136,7 +136,10 @@ Specify a timeout before ping exits regardless of how many packets have been sent or received\&. .IP "\-W \fIsec\fP" Time to wait between pings\&. - +.IP "\-z" +Enable seccomp (default seccomp state depends on compile options) +.IP "\-Z" +Disable seccomp (default seccomp state depends on compile options) .PP .SH "EXAMPLES" .nf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.22/doc/arping.yodl new/arping-2.23/doc/arping.yodl --- old/arping-2.22/doc/arping.yodl 2021-06-27 23:28:21.000000000 +0200 +++ new/arping-2.23/doc/arping.yodl 2022-03-06 19:16:13.000000000 +0100 @@ -36,7 +36,6 @@ manpageoptions() -startdit() dit(--help) Show extended help. Not quite as extensive as this manpage, but more than -h. dit(-0) Use this option to ping with source IP address 0.0.0.0. Use this @@ -104,7 +103,8 @@ dit(-V em(vlan)) VLAN tag to set. Defaults to no VLAN tag. dit(-w em(sec)) Specify a timeout before ping exits regardless of how many packets have been sent or received. dit(-W em(sec)) Time to wait between pings. -enddit() + dit(-z) Enable seccomp (default seccomp state depends on compile options) + dit(-Z) Disable seccomp (default seccomp state depends on compile options) manpagesection(EXAMPLES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.22/install-sh new/arping-2.23/install-sh --- old/arping-2.22/install-sh 2021-06-27 23:28:23.000000000 +0200 +++ new/arping-2.23/install-sh 2022-03-06 19:16:15.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2018-03-11.20; # UTC +scriptversion=2020-11-14.01; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -69,6 +69,11 @@ # Desired mode of installed file. mode=0755 +# Create dirs (including intermediate dirs) using mode 755. +# This is like GNU 'install' as of coreutils 8.32 (2020). +mkdir_umask=22 + +backupsuffix= chgrpcmd= chmodcmd=$chmodprog chowncmd= @@ -99,18 +104,28 @@ --version display version info and exit. -c (ignored) - -C install only if different (preserve the last data modification time) + -C install only if different (preserve data modification time) -d create directories instead of installing files. -g GROUP $chgrpprog installed files to GROUP. -m MODE $chmodprog installed files to MODE. -o USER $chownprog installed files to USER. + -p pass -p to $cpprog. -s $stripprog installed files. + -S SUFFIX attempt to back up existing files, with suffix SUFFIX. -t DIRECTORY install into DIRECTORY. -T report an error if DSTFILE is a directory. Environment variables override the default commands: CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + +By default, rm is invoked with -f; when overridden with RMPROG, +it's up to you to specify -f if you want it. + +If -S is not specified, no backups are attempted. + +Email bug reports to bug-automake(a)gnu.org. +Automake home page: https://www.gnu.org/software/automake/ " while test $# -ne 0; do @@ -137,8 +152,13 @@ -o) chowncmd="$chownprog $2" shift;; + -p) cpprog="$cpprog -p";; + -s) stripcmd=$stripprog;; + -S) backupsuffix="$2" + shift;; + -t) is_target_a_directory=always dst_arg=$2 @@ -255,6 +275,10 @@ dstdir=$dst test -d "$dstdir" dstdir_status=$? + # Don't chown directories that already exist. + if test $dstdir_status = 0; then + chowncmd="" + fi else # Waiting for this to be detected by the "$cpprog $src $dsttmp" command @@ -301,22 +325,6 @@ if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - # With -d, create the new directory with the user-specified mode. # Otherwise, rely on $mkdir_umask. if test -n "$dir_arg"; then @@ -326,52 +334,49 @@ fi posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - # Note that $RANDOM variable is not portable (e.g. dash); Use it - # here however when possible just to lower collision chance. - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - - trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 - - # Because "mkdir -p" follows existing symlinks and we likely work - # directly in world-writeable /tmp, make sure that the '$tmpdir' - # directory is successfully created first before we actually test - # 'mkdir -p' feature. - if (umask $mkdir_umask && - $mkdirprog $mkdir_mode "$tmpdir" && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - test_tmpdir="$tmpdir/a" - ls_ld_tmpdir=`ls -ld "$test_tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null - fi - trap '' 0;; - esac;; + # The $RANDOM variable is not portable (e.g., dash). Use it + # here however when possible just to lower collision chance. + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + + trap ' + ret=$? + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null + exit $ret + ' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p'. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; esac if @@ -382,7 +387,7 @@ then : else - # The umask is ridiculous, or mkdir does not conform to POSIX, + # mkdir does not conform to POSIX, # or it failed possibly due to a race condition. Create the # directory the slow way, step by step, checking for races as we go. @@ -411,7 +416,7 @@ prefixes= else if $posix_mkdir; then - (umask=$mkdir_umask && + (umask $mkdir_umask && $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break # Don't fail if two instances are running concurrently. test -d "$prefix" || exit 1 @@ -488,6 +493,13 @@ then rm -f "$dsttmp" else + # If $backupsuffix is set, and the file being installed + # already exists, attempt a backup. Don't worry if it fails, + # e.g., if mv doesn't support -f. + if test -n "$backupsuffix" && test -f "$dst"; then + $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null + fi + # Rename the file to the real destination. $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || @@ -502,9 +514,9 @@ # file should still install successfully. { test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || + $doit $rmcmd "$dst" 2>/dev/null || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + { $doit $rmcmd "$rmtmp" 2>/dev/null; :; } } || { echo "$0: cannot unlink or rename $dst" >&2 (exit 1); exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.22/src/Makefile.in new/arping-2.23/src/Makefile.in --- old/arping-2.22/src/Makefile.in 2021-06-27 23:28:23.000000000 +0200 +++ new/arping-2.23/src/Makefile.in 2022-03-06 19:16:15.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. @@ -364,6 +364,7 @@ bases='$(TEST_LOGS)'; \ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ bases=`echo $$bases` +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' RECHECK_LOGS = $(TEST_LOGS) AM_RECURSIVE_TARGETS = check recheck TEST_SUITE_LOG = test-suite.log @@ -796,7 +797,7 @@ test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ fi; \ echo "$${col}$$br$${std}"; \ - echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \ echo "$${col}$$br$${std}"; \ create_testsuite_report --maybe-color; \ echo "$$col$$br$$std"; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.22/src/arping.c new/arping-2.23/src/arping.c --- old/arping-2.22/src/arping.c 2021-06-27 23:28:21.000000000 +0200 +++ new/arping-2.23/src/arping.c 2022-03-06 19:16:13.000000000 +0100 @@ -15,7 +15,7 @@ * */ /* - * Copyright (C) 2000-2019 Thomas Habets <thomas(a)habets.se> + * Copyright (C) 2000-2022 Thomas Habets <thomas(a)habets.se> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -109,6 +109,13 @@ #if HAVE_SYS_CAPABILITY_H #include <sys/capability.h> +#else +// It seems that some environments have a libc with cap_init, but do not have +// the header files. Without the header files we won't have the cap_t struct, so +// it won't actually work. +// +// TODO: Probably this logic should be in configure.ac instead. +#undef HAVE_CAP_INIT #endif #if HAVE_NET_BPF_H @@ -116,6 +123,13 @@ #endif #include <pcap.h> +#if defined(HAVE_SECCOMP_H) && defined(HAVE_LIBSECCOMP) +#define USE_SECCOMP 1 +#include <seccomp.h> +#else +#define USE_SECCOMP 0 +#endif + #include "arping.h" #ifndef ETH_ALEN @@ -192,6 +206,9 @@ static int dupfound = 0; /* set to 1 if dup found */ static char lastreplymac[ETH_ALEN]; /* if last different from this then dup */ +/* -z to turn on, -Z to turn off. Default is compile time option */ +static int use_seccomp = DEFAULT_SECCOMP; + unsigned int numsent = 0; /* packets sent */ unsigned int numrecvd = 0; /* packets received */ static unsigned int max_replies = UINT_MAX; /* exit after -C replies */ @@ -458,13 +475,80 @@ #endif } +#if USE_SECCOMP +static void seccomp_allow(scmp_filter_ctx ctx, const char* name) +{ + if (seccomp_rule_add(ctx, SCMP_ACT_ALLOW, seccomp_syscall_resolve_name(name), 0)) { + if (verbose) { + fprintf(stderr, "arping: seccomp_rule_add_exact(%s): %s", + name, strerror(errno)); + } + } +} + +static void drop_seccomp(int libnet_fd) +{ + //scmp_filter_ctx ctx = seccomp_init(SCMP_ACT_ERRNO(13)); + scmp_filter_ctx ctx = seccomp_init(SCMP_ACT_KILL); + if (!ctx) { + perror("seccomp_init()"); + exit(1); + } + + // + // Whitelist. + // + + // Write to stdout and stderr. + if (seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(fstat), 1, SCMP_A0(SCMP_CMP_EQ, STDOUT_FILENO))) { + perror("seccomp_rule_add(fstat stdout)"); + exit(1); + } + if (seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(write), 1, SCMP_A0(SCMP_CMP_EQ, STDOUT_FILENO))) { + perror("seccomp_rule_add(write stdout)"); + exit(1); + } + if (seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(write), 1, SCMP_A0(SCMP_CMP_EQ, STDERR_FILENO))) { + perror("seccomp_rule_add(write stderr)"); + exit(1); + } + + // Libnet. + if (seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(ioctl), 1, SCMP_A0(SCMP_CMP_EQ, libnet_fd))) { + perror("seccomp_rule_add(ioctl libnet)"); + exit(1); + } + if (seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendto), 1, SCMP_A0(SCMP_CMP_EQ, libnet_fd))) { + perror("seccomp_rule_add(sendto libnet)"); + exit(1); + } + + // Other. + seccomp_allow(ctx, "select"); + seccomp_allow(ctx, "pselect6"); + seccomp_allow(ctx, "newfstatat"); + seccomp_allow(ctx, "exit_group"); + seccomp_allow(ctx, "rt_sigreturn"); + + // Load. + if (seccomp_load(ctx)) { + perror("seccomp_load()"); + exit(1); + } + seccomp_release(ctx); + if (verbose > 1) { + printf("arping: Successfully applied seccomp policy\n"); + } +} +#endif + /** * drop even more privileges, where possible. * * After all setup is done and main loop is about to start. */ static void -drop_more_privileges() +drop_more_privileges(int libnet_fd) { #ifdef HAVE_PLEDGE if (pledge("stdio tty", "")) { @@ -475,8 +559,44 @@ printf("arping: Successfully pledged\n"); } #endif +#if USE_SECCOMP + if (use_seccomp) { + drop_seccomp(libnet_fd); + } +#endif } +/** + * Check for buggy libpcap version + * https://github.com/the-tcpdump-group/libpcap/issues/461 + * + * This list is not authoritative. + * + * If it's over matching wrong the only impact *should* be that too many packets + * come through the BPF filter. + * + * If it's under-matching then replies with dot1p nonzero will not be seen. + */ +static int +bug_pcap_vlan() +{ + const char* bad[] = { + // Broken in 1.7.0. + "libpcap version 1.7", + "libpcap version 1.8", + "libpcap version 1.9.0", + // Fixed in 1.9.1. + // Fixed in 1.10 and up. + NULL, + }; + const char* v = pcap_lib_version(); + for (const char** t = bad; *t; t++) { + if (!strncmp(v, *t, strlen(*t))) { + return 1; + } + } + return 0; +} /** * Do pcap_open_live(), except by using the pcap_create() interface @@ -626,17 +746,48 @@ /** * Init libnet with specified ifname. Destroy if already inited. - * If this function retries with different parameter it will preserve - * the original error message and print that. + * + * Libnet usually needs init before we have searched for the real + * interface. In that case, first we just give a NULL pointer as the + * interface. But libnet sometimes fails to find an interface (no idea + * why), so then we try to use "lo" and "lo0" explicitly. + * + * If even loopback fails, then it'll preserve the original error + * message. + * * Call with recursive=0. */ void -do_libnet_init(const char *ifname, int recursive) +do_libnet_init(const char *inifname, int recursive) { + const char* ifname = inifname; + int last = 0; + switch (recursive) { + case 0: + break; + case 1: + ifname = "lo"; // E.g. Linux. + break; + case 2: + ifname = "lo0"; // E.g. OpenBSD. + break; + default: + last = 1; + break; + } + + // If we're given an interface name then always use that. + // No need to be recursive about it. + if (inifname != NULL && recursive == 0) { + ifname = inifname; + last = 1; + } + char ebuf[LIBNET_ERRBUF_SIZE]; ebuf[0] = 0; if (verbose > 1) { - printf("arping: libnet_init(%s)\n", ifname ? ifname : "<null>"); + printf("arping: trying libnet_init(LIBNET_LINK, %s)\n", + ifname ? ifname : "<null>"); } if (libnet) { /* Probably going to switch interface from temp to real. */ @@ -644,28 +795,31 @@ libnet = 0; } - /* Try libnet_init() even though we aren't root. We may have + /* Try libnet_init() even though we maybe aren't root. We may have * a capability or something. */ if (!(libnet = libnet_init(LIBNET_LINK, (char*)ifname, ebuf))) { strip_newline(ebuf); - if (!ifname) { - /* Sometimes libnet guesses an interface that it then - * can't use. Work around that by attempting to - * use "lo". */ - do_libnet_init("lo", 1); + if (verbose) { + fprintf(stderr, + "arping: libnet_init(LIBNET_LINK, %s): %s\n", + ifname ? ifname : "<null>", + *ebuf ? ebuf : "<no error message>"); + } + if (!last) { + do_libnet_init(ifname, recursive+1); if (libnet != NULL) { return; } - } else if (recursive) { - /* Continue original execution to get that - * error message. */ - return; } - fprintf(stderr, "arping: libnet_init(LIBNET_LINK, %s): %s\n", - ifname ? ifname : "<null>", - *ebuf ? ebuf : "<no error message>"); + if (!verbose) { + // Prevent double-print when verbose. + fprintf(stderr, + "arping: libnet_init(LIBNET_LINK, %s): %s\n", + ifname ? ifname : "<null>", + *ebuf ? ebuf : "<no error message>"); + } if (getuid() && geteuid()) { fprintf(stderr, "arping: you may need to run as root\n"); @@ -790,9 +944,16 @@ " -U Send unsolicited ARP.\n" " -v Verbose output. Use twice for more messages.\n" " -V num 802.1Q tag to add. Defaults to no VLAN tag.\n" - " -w sec Specify a timeout before ping exits regardless of how" - " many\npackets have been sent or received.\n" - " -W sec Time to wait between pings.\n"); + " -w sec Specify a timeout before ping exits regardless of how many\n" + " packets have been sent or received.\n" + " -W sec Time to wait between pings.\n" +#if USE_SECCOMP + " -z Enable seccomp%s\n" + " -Z Disable seccomp%s\n", + DEFAULT_SECCOMP ? " (default)" : "", + DEFAULT_SECCOMP ? "" : " (default)" +#endif + ); printf("Report bugs to: thomas(a)habets.se\n" "Arping home page: <http://www.habets.pp.se/synscan/>\n" "Development repo: http://github.com/ThomasHabets/arping\n"); @@ -806,7 +967,7 @@ { printf("ARPing %s, by Thomas Habets <thomas(a)habets.se>\n", version); - printf("usage: arping [ -0aAbdDeFpPqrRuUv ] [ -w <sec> ] " + printf("usage: arping [ -0aAbdDeFpPqrRuUv%s ] [ -w <sec> ] " "[ -W <sec> ] " "[ -S <host/ip> ]\n" " " @@ -817,7 +978,7 @@ " [ -g <group> ]\n" " " "[ -V <vlan> ] [ -Q <priority> ] " - "<host/ip/MAC | -B>\n"); + "<host/ip/MAC | -B>\n", USE_SECCOMP ? "zZ" : ""); } /** @@ -837,6 +998,19 @@ } /** + * + */ +static void +print_library_versions() +{ + fprintf(stderr, "arping: %s\n", pcap_lib_version()); + if (bug_pcap_vlan()) { + fprintf(stderr, "arping: bug: https://github.com/the-tcpdump-group/libpcap/issues/461\n"); + } + fprintf(stderr, "arping: %s\n", libnet_version()); +} + +/** * Check to see if it looks somewhat like a MAC address. * * It was unclear from msdn.microsoft.com if their scanf() supported @@ -1125,7 +1299,7 @@ send_reply ? ARPOP_REPLY : ARPOP_REQUEST, srcmac, (uint8_t*)&srcip, - unsolicited ? (uint8_t*)ethxmas : (uint8_t*)ethnull, + unsolicited ? (uint8_t*)ethxmas : (send_reply ? dstmac : (uint8_t*)ethnull), (uint8_t*)&dstip, (uint8_t*)padding, sizeof padding, @@ -1188,7 +1362,7 @@ pingip_recv(const char *unused, struct pcap_pkthdr *h, const char * const packet) { const unsigned char *pkt_srcmac; - const struct libnet_802_1q_hdr *veth; + const struct libnet_802_1q_hdr *veth = NULL; struct libnet_802_3_hdr *heth; struct libnet_arp_hdr *harp; struct timespec arrival; @@ -1201,28 +1375,57 @@ getclock(&arrival); if (vlan_tag >= 0) { + if (h->caplen < LIBNET_802_1Q_H + LIBNET_ARP_H + 2*(ETH_ALEN + 4)) { + return; + } veth = (void*)packet; harp = (void*)((char*)veth + LIBNET_802_1Q_H); pkt_srcmac = veth->vlan_shost; } else { - // Short packet. if (h->caplen < LIBNET_ETH_H + LIBNET_ARP_H + 2*(ETH_ALEN + 4)) { return; } - heth = (void*)packet; harp = (void*)((char*)heth + LIBNET_ETH_H); pkt_srcmac = heth->_802_3_shost; - // Wrong length of hardware address. - if (harp->ar_hln != ETH_ALEN) { + } + if (verbose > 3) { + printf("arping: ... good length\n"); + } + + if (veth) { + if (veth->vlan_tpi != htons(0x8100)) { return; } - - // Wrong length of protocol address. - if (harp->ar_pln != 4) { + if (verbose > 3) { + printf("arping: ... is dot1q\n"); + } + if ((veth->vlan_priority_c_vid & 0xfff) == vlan_tag) { return; } - } + if (verbose > 3) { + printf("arping: ... right VLAN\n"); + } + } + + // Not checking ethertype because in theory this could be used for + // Ethernet II. + + // Wrong length of hardware address. + if (harp->ar_hln != ETH_ALEN) { + return; + } + if (verbose > 3) { + printf("arping: ... L2 addr len is correct\n"); + } + + // Wrong length of protocol address. + if (harp->ar_pln != 4) { + return; + } + if (verbose > 3) { + printf("arping: ... L3 addr len is correct\n"); + } // ARP reply. if (htons(harp->ar_op) != ARPOP_REPLY) { @@ -1365,7 +1568,7 @@ { const unsigned char *pkt_dstmac; const unsigned char *pkt_srcmac; - const struct libnet_802_1q_hdr *veth; + const struct libnet_802_1q_hdr *veth = NULL; struct libnet_802_3_hdr *heth; struct libnet_ipv4_hdr *hip; struct libnet_icmpv4_hdr *hicmp; @@ -1379,18 +1582,45 @@ getclock(&arrival); if (vlan_tag >= 0) { + if (h->caplen < LIBNET_ETH_H + LIBNET_IPV4_H + LIBNET_ICMPV4_H) { + return; + } veth = (void*)packet; hip = (void*)((char*)veth + LIBNET_802_1Q_H); hicmp = (void*)((char*)hip + LIBNET_IPV4_H); pkt_srcmac = veth->vlan_shost; pkt_dstmac = veth->vlan_dhost; } else { + if (h->caplen < LIBNET_ETH_H + LIBNET_ARP_H + LIBNET_ICMPV4_H) { + return; + } heth = (void*)packet; hip = (void*)((char*)heth + LIBNET_ETH_H); hicmp = (void*)((char*)hip + LIBNET_IPV4_H); pkt_srcmac = heth->_802_3_shost; pkt_dstmac = heth->_802_3_dhost; } + if (verbose > 3) { + printf("arping: ... good length\n"); + } + + if (veth) { + if (veth->vlan_tpi != htons(0x8100)) { + return; + } + if (verbose > 3) { + printf("arping: ... is dot1q\n"); + } + if ((veth->vlan_priority_c_vid & 0xfff) == vlan_tag) { + return; + } + if (verbose > 3) { + printf("arping: ... right VLAN\n"); + } + } + + // Not checking ethertype because in theory this could be used for + // Ethernet II. // Dest MAC must be me. if (memcmp(pkt_dstmac, srcmac, ETH_ALEN)) { @@ -1641,7 +1871,6 @@ break; } } - if (trydispatch) { int ret; if (0 > (ret = pcap_dispatch(pcap, -1, @@ -1722,7 +1951,7 @@ memcpy(dstmac, ethxmas, ETH_ALEN); while (EOF != (c = getopt(argc, argv, - "0aAbBC:c:dDeFg:hi:I:m:pPqQ:rRs:S:t:T:uUvV:w:W:"))) { + "0aAbBC:c:dDeFg:hi:I:m:pPqQ:rRs:S:t:T:uUvV:w:W:zZ"))) { switch(c) { case '0': srcip_opt = "0.0.0.0"; @@ -1850,6 +2079,12 @@ case 'W': packetwait = (unsigned)(1000000.0 * atof(optarg)); break; + case 'z': + use_seccomp = 1; + break; + case 'Z': + use_seccomp = 0; + break; default: usage(1); } @@ -1862,6 +2097,10 @@ exit(1); } + if (verbose > 2) { + print_library_versions(); + } + // Generate random payload suffix for MAC pings, to be able to // differentiate from unrelated ping replies. if (payload_suffix_size < 0) { @@ -2022,6 +2261,9 @@ * libnet init (may be done already for resolving) */ do_libnet_init(ifname, 0); + if (verbose > 1) { + printf("arping: libnet_getfd(): %d\n", libnet_getfd(libnet)); + } /* * Make sure dstip and parm like eachother @@ -2143,9 +2385,14 @@ } #endif + if (vlan_tag >= 0 && bug_pcap_vlan() && verbose) { + fprintf(stderr, + "arping: Working around bug in libpcap 1.7-1.9.0.\n"); + } + if (mode == PINGIP) { /* FIXME: better filter with addresses? */ - if (vlan_tag >= 0) { + if (vlan_tag >= 0 && !bug_pcap_vlan()) { snprintf(bpf_filter, sizeof(bpf_filter), "vlan %u and arp", vlan_tag); } else { @@ -2158,7 +2405,7 @@ } } else { /* ping mac */ /* FIXME: better filter with addresses? */ - if (vlan_tag >= 0) { + if (vlan_tag >= 0 && !bug_pcap_vlan()) { snprintf(bpf_filter, sizeof(bpf_filter), "vlan %u and icmp", vlan_tag); } else { @@ -2208,7 +2455,7 @@ format_mac(srcmac, buf, sizeof(buf))); } - drop_more_privileges(); + drop_more_privileges(libnet_getfd(libnet)); if (display == NORMAL) { printf("ARPING %s\n", parm); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.22/src/windows.c new/arping-2.23/src/windows.c --- old/arping-2.22/src/windows.c 2021-06-27 23:28:21.000000000 +0200 +++ new/arping-2.23/src/windows.c 2022-03-06 19:16:13.000000000 +0100 @@ -54,7 +54,7 @@ while (!done && !time_to_die) { struct pcap_pkthdr *pkt_header; u_char *pkt_data; - if (pcap_next_ex(pcap, &pkt_header, &pkt_data) == 1) { + if (pcap_next_ex(pcap, &pkt_header, &pkt_data) > 0) { func(pcap, pkt_header, pkt_data); } getclock(&tv); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.22/test-driver new/arping-2.23/test-driver --- old/arping-2.22/test-driver 2021-06-27 23:28:23.000000000 +0200 +++ new/arping-2.23/test-driver 2022-03-06 19:16:15.000000000 +0100 @@ -42,11 +42,13 @@ { cat <<END Usage: - test-driver --test-name=NAME --log-file=PATH --trs-file=PATH - [--expect-failure={yes|no}] [--color-tests={yes|no}] - [--enable-hard-errors={yes|no}] [--] + test-driver --test-name NAME --log-file PATH --trs-file PATH + [--expect-failure {yes|no}] [--color-tests {yes|no}] + [--enable-hard-errors {yes|no}] [--] TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS] + The '--test-name', '--log-file' and '--trs-file' options are mandatory. +See the GNU Automake documentation for information. END }

1 0

commit OpenSceneGraph for openSUSE:Factory
by Source-Sync 30 Apr '22

30 Apr '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package OpenSceneGraph for openSUSE:Factory checked in at 2022-04-30 22:53:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/OpenSceneGraph (Old) and /work/SRC/openSUSE:Factory/.OpenSceneGraph.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "OpenSceneGraph" Sat Apr 30 22:53:03 2022 rev:20 rq:974099 version:3.6.5 Changes: -------- --- /work/SRC/openSUSE:Factory/OpenSceneGraph/OpenSceneGraph.changes 2021-08-16 10:14:23.146895045 +0200 +++ /work/SRC/openSUSE:Factory/.OpenSceneGraph.new.1538/OpenSceneGraph.changes 2022-04-30 22:53:18.296286523 +0200 @@ -1,0 +2,7 @@ +Thu Apr 28 00:14:40 UTC 2022 - Jan Engelhardt <jengelh(a)inai.de> + +- Resolve rpmlint report "libOpenSceneGraph158.x86_64: E: + shlib-policy-name-error SONAME: libosg.so.161, expected package + suffix: 161" + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenSceneGraph.spec ++++++ --- /var/tmp/diff_new_pack.1GlGLe/_old 2022-04-30 22:53:18.872287302 +0200 +++ /var/tmp/diff_new_pack.1GlGLe/_new 2022-04-30 22:53:18.876287308 +0200 @@ -1,7 +1,7 @@ # # spec file for package OpenSceneGraph # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,7 @@ # -%define _osg_so_nr 158 +%define _osg_so_nr 161 %define _opt_so_nr 21 %if 0%{?is_opensuse} %bcond_without gdal @@ -112,9 +112,10 @@ %package -n libOpenSceneGraph%{_osg_so_nr} Summary: Shared libraries for OpenSceneGraph -# try to cover up past mistakes Group: System/Libraries -Obsoletes: libOpenSceneGraph100 +# try to cover up past mistakes +Conflicts: libOpenSceneGraph100 +Conflicts: libOpenSceneGraph158 %description -n libOpenSceneGraph%{_osg_so_nr} The OpenSceneGraph is a graphics toolkit for the development of @@ -131,7 +132,7 @@ Requires: curl-devel Requires: freeglut-devel Requires: giflib-devel -Requires: libOpenSceneGraph%{_osg_so_nr} = %{version} +Requires: libOpenSceneGraph%{_osg_so_nr} = %{version}-%{release} Requires: libOpenThreads-devel = %{version} Requires: libjpeg-devel Requires: libpng-devel

1 0

commit libfsapfs for openSUSE:Factory
by Source-Sync 30 Apr '22

30 Apr '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libfsapfs for openSUSE:Factory checked in at 2022-04-30 22:53:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libfsapfs (Old) and /work/SRC/openSUSE:Factory/.libfsapfs.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libfsapfs" Sat Apr 30 22:53:01 2022 rev:5 rq:974089 version:20220430 Changes: -------- --- /work/SRC/openSUSE:Factory/libfsapfs/libfsapfs.changes 2022-01-23 12:17:01.667930658 +0100 +++ /work/SRC/openSUSE:Factory/.libfsapfs.new.1538/libfsapfs.changes 2022-04-30 22:53:16.108283563 +0200 @@ -1,0 +2,7 @@ +Sat Apr 30 07:57:12 UTC 2022 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release 20220430 + * Unspecified updates to extended attributes, snapshot + support and Python bindings + +------------------------------------------------------------------- Old: ---- _service libfsapfs-20210513.tar.xz New: ---- libfsapfs-experimental-20220430.tar.gz libfsapfs-experimental-20220430.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libfsapfs.spec ++++++ --- /var/tmp/diff_new_pack.K5IMB3/_old 2022-04-30 22:53:16.572284191 +0200 +++ /var/tmp/diff_new_pack.K5IMB3/_new 2022-04-30 22:53:16.580284201 +0200 @@ -17,13 +17,14 @@ Name: libfsapfs -Version: 20210513 +Version: 20220430 Release: 0 Summary: Library and tools to access the Apple File System (APFS) License: LGPL-3.0-only Group: System/Filesystems URL: https://github.com/libyal/libfsapfs -Source: %name-%version.tar.xz +Source: https://github.com/libyal/libfsapfs/releases/download/%version/libfsapfs-ex… +Source2: https://github.com/libyal/libfsapfs/releases/download/%version/libfsapfs-ex… Patch1: system-libs.patch BuildRequires: %{python_module devel} BuildRequires: c_compiler @@ -32,22 +33,22 @@ BuildRequires: pkg-config BuildRequires: python-rpm-macros BuildRequires: pkgconfig(fuse) >= 2.6 -BuildRequires: pkgconfig(libbfio) >= 20201229 -BuildRequires: pkgconfig(libcaes) >= 20201012 -BuildRequires: pkgconfig(libcdata) >= 20200509 -BuildRequires: pkgconfig(libcerror) >= 20201121 -BuildRequires: pkgconfig(libcfile) >= 20201229 -BuildRequires: pkgconfig(libclocale) >= 20200913 -BuildRequires: pkgconfig(libcnotify) >= 20200913 -BuildRequires: pkgconfig(libcpath) >= 20200623 -BuildRequires: pkgconfig(libcsplit) >= 20200703 -BuildRequires: pkgconfig(libcthreads) >= 20200508 -BuildRequires: pkgconfig(libfcache) >= 20200708 -BuildRequires: pkgconfig(libfdata) >= 20201129 -BuildRequires: pkgconfig(libfdatetime) >= 20180910 -BuildRequires: pkgconfig(libfguid) >= 20180724 -BuildRequires: pkgconfig(libhmac) >= 20200104 -BuildRequires: pkgconfig(libuna) >= 20201204 +BuildRequires: pkgconfig(libbfio) >= 20220120 +BuildRequires: pkgconfig(libcaes) >= 20220424 +BuildRequires: pkgconfig(libcdata) >= 20220115 +BuildRequires: pkgconfig(libcerror) >= 20220101 +BuildRequires: pkgconfig(libcfile) >= 20210409 +BuildRequires: pkgconfig(libclocale) >= 20220107 +BuildRequires: pkgconfig(libcnotify) >= 20220108 +BuildRequires: pkgconfig(libcpath) >= 20220108 +BuildRequires: pkgconfig(libcsplit) >= 20220109 +BuildRequires: pkgconfig(libcthreads) >= 20220102 +BuildRequires: pkgconfig(libfcache) >= 20220110 +BuildRequires: pkgconfig(libfdata) >= 20211023 +BuildRequires: pkgconfig(libfdatetime) >= 20220112 +BuildRequires: pkgconfig(libfguid) >= 20220113 +BuildRequires: pkgconfig(libhmac) >= 20220425 +BuildRequires: pkgconfig(libuna) >= 20220102 BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(python3) BuildRequires: pkgconfig(zlib) >= 1.2.5

1 0

commit perl-Image-ExifTool for openSUSE:Factory
by Source-Sync 30 Apr '22

30 Apr '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package perl-Image-ExifTool for openSUSE:Factory checked in at 2022-04-30 22:52:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Image-ExifTool (Old) and /work/SRC/openSUSE:Factory/.perl-Image-ExifTool.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Image-ExifTool" Sat Apr 30 22:52:58 2022 rev:43 rq:974087 version:12.41 Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Image-ExifTool/perl-Image-ExifTool.changes 2022-02-02 22:45:01.858060773 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Image-ExifTool.new.1538/perl-Image-ExifTool.changes 2022-04-30 22:53:13.124279526 +0200 @@ -1,0 +2,44 @@ +Fri Apr 29 06:35:45 UTC 2022 - Paolo Stivanin <info(a)paolostivanin.com> + +- update to version 12.41: + * Added support for "OM SYSTEM" maker notes + * Added 2 new Sony LensType values (thanks Jos Roost) + * Added some new Canon lenses (thanks LibRaw) + * Added a new Nikon LensID (thanks Bert Ligtvoet) + * Added a new Canon ContinuousDrive value (thanks Wolfgang Gulcker) + * Enhanced -v0 option to also print new file name when renaming, moving or + copying a file + * Updated xmp2exif.args and exif2xmp.args helper files to reflect the IPTC + Photometadata Mapping Guidelines version 2202.1 + * Made "Invalid Xxx data" a minor warning for MakerNote data + * Patched to allow writing of MP4 videos which have other tracks with a + missing sample description entry + * Patched MacOS version to specify directory for external utilities (setfile, + xattr, stat, mdls and osascript from /usr/bin, and tag from /usr/local/bin) + * Fixed long-standing problem where Windows version could behave differently + for -if conditions containing undefined tags + * Fixed problem where -W+! combined with -j or -X produced invalid JSON or XML + when processing multiple files + * Fixed potential "uninitialized value $time in division" runtime warning when + reading MP4 videos + * Added PageCount tag to return the number of pages in a multi-page TIFF + * Added a new Nikon LensID (thanks Wolfgang Exler) + * Added a few more Sony LensTypes (thanks Jos Roost) + * Decode some new Canon tags (thanks Mark Reid) + * Decode another Nikon Z9 tag (thanks Warren Hatch) + * Decode Nikon NKSC GPSImgDirection (thanks Olaf) + * Improved handling of empty XMP structures in lists + * Tolerate leading UTF-8 BOM in -geotag log files + * Updated photoshop_paths.config to include WorkingPath + * Patched to allow writing of MP4 videos which have url tracks with a missing + sample description entry + * Fixed deep recursion error when reading multi-page TIFF images with more + than 100 pages + * Fixed potential deep recursion runtime error when writing nested XMP + structures + * Fixed warning which could be generated when writing new + Composite:GPSCoordinates tag + * Fixed description of GPR (General Purpose RAW) file type + * Fixed typo in the name of a new Nikon tag (thanks Herb) + +------------------------------------------------------------------- Old: ---- Image-ExifTool-12.39.tar.gz New: ---- Image-ExifTool-12.41.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Image-ExifTool.spec ++++++ --- /var/tmp/diff_new_pack.vOj2TE/_old 2022-04-30 22:53:13.740280359 +0200 +++ /var/tmp/diff_new_pack.vOj2TE/_new 2022-04-30 22:53:13.744280365 +0200 @@ -17,8 +17,9 @@ %define cpan_name Image-ExifTool + Name: perl-Image-ExifTool -Version: 12.39 +Version: 12.41 Release: 0 License: Artistic-1.0 OR GPL-1.0-or-later Summary: Read and write meta information ++++++ Image-ExifTool-12.39.tar.gz -> Image-ExifTool-12.41.tar.gz ++++++ ++++ 16025 lines of diff (skipped)

1 0