June 2017 - openSUSE Commits - openSUSE Mailing Lists

commit rstcheck for openSUSE:Factory
by root＠hilbert.suse.de 24 Jun '17

24 Jun '17

Hello community, here is the log from the commit of package rstcheck for openSUSE:Factory checked in at 2017-06-24 08:34:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rstcheck (Old) and /work/SRC/openSUSE:Factory/.rstcheck.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rstcheck" Sat Jun 24 08:34:41 2017 rev:3 rq:505844 version:3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/rstcheck/rstcheck.changes 2016-07-14 09:50:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rstcheck.new/rstcheck.changes 2017-06-24 08:34:58.064032837 +0200 @@ -1,0 +2,12 @@ +Fri Jun 16 08:16:09 UTC 2017 - jhura(a)suse.com + +- bump to verion 3.1 +- Add support for checking XML code blocks (thanks to Sameer Singh). +- Support UTF-8 byte order marks (BOM). Previously, ``docutils`` would + interpret the BOM as a visible character, which would lead to false + positives about underlines being too short. +- Optionally support Sphinx 1.5. Sphinx support will be enabled if Sphinx is + installed. +- Support loading settings from configuration files. + +------------------------------------------------------------------- Old: ---- rstcheck-1.5.1.tar.gz New: ---- rstcheck-3.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rstcheck.spec ++++++ --- /var/tmp/diff_new_pack.TlvQu4/_old 2017-06-24 08:34:58.523967802 +0200 +++ /var/tmp/diff_new_pack.TlvQu4/_new 2017-06-24 08:34:58.523967802 +0200 @@ -1,7 +1,7 @@ # # spec file for package rstcheck # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,20 +17,19 @@ Name: rstcheck -Version: 1.5.1 +Version: 3.1 Release: 0 Summary: Checks syntax of rST and code blocks nested within it License: MIT Group: Development/Languages/Python Url: https://github.com/myint/rstcheck -Source: http://pypi.python.org/packages/source/r/rstcheck/rstcheck-%{version}.tar.gz +Source: https://files.pythonhosted.org/packages/source/r/rstcheck/rstcheck-%{versio… BuildRequires: python3-Sphinx BuildRequires: python3-devel BuildRequires: python3-docutils BuildRequires: python3-setuptools Requires: python3-Sphinx Requires: python3-docutils -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description ++++++ rstcheck-1.5.1.tar.gz -> rstcheck-3.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rstcheck-1.5.1/LICENSE new/rstcheck-3.1/LICENSE --- old/rstcheck-1.5.1/LICENSE 2015-08-16 20:15:34.000000000 +0200 +++ new/rstcheck-3.1/LICENSE 2016-07-24 23:24:23.000000000 +0200 @@ -1,4 +1,4 @@ -Copyright (C) 2013-2015 Steven Myint +Copyright (C) 2013-2016 Steven Myint Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rstcheck-1.5.1/PKG-INFO new/rstcheck-3.1/PKG-INFO --- old/rstcheck-1.5.1/PKG-INFO 2016-03-29 17:13:30.000000000 +0200 +++ new/rstcheck-3.1/PKG-INFO 2017-03-08 17:00:34.000000000 +0100 @@ -1,7 +1,7 @@ Metadata-Version: 1.1 Name: rstcheck -Version: 1.5.1 -Summary: Checks syntax of reStructuredText and code blocks nested within it. +Version: 3.1 +Summary: Checks syntax of reStructuredText and code blocks nested within it Home-page: https://github.com/myint/rstcheck Author: UNKNOWN Author-email: UNKNOWN @@ -17,12 +17,15 @@ Checks syntax of reStructuredText and code blocks nested within it. + .. contents:: + + Installation ============ From pip:: - $ pip install --upgrade rstcheck + $ pip install rstcheck Supported languages in code blocks @@ -33,6 +36,7 @@ - C (C99) - C++ (C++11) - JSON + - XML - Python - reStructuredText @@ -42,13 +46,13 @@ With bad Python syntax: - .. code-block:: rst + .. code:: rst ==== Test ==== - .. code-block:: python + .. code:: python print( @@ -59,13 +63,13 @@ With bad C++ syntax: - .. code-block:: rst + .. code:: rst ==== Test ==== - .. code-block:: cpp + .. code:: cpp int main() { @@ -79,7 +83,7 @@ With bad syntax in the reStructuredText document itself: - .. code-block:: rst + .. code:: rst ==== Test @@ -175,12 +179,26 @@ $ rstcheck docs/foo/bar.rst + Sphinx + ====== + + To enable Sphinx:: + + $ pip install sphinx + + The installed Sphinx version must be at least 1.5. + + To check that Sphinx support is enabled:: + + $ rstcheck -h | grep 'Sphinx is enabled' + + Usage in Vim ============ To check reStructuredText in Vim using Syntastic_: - .. code-block:: vim + .. code:: vim let g:syntastic_rst_checkers = ['rstcheck'] @@ -200,6 +218,44 @@ Note that this does not load any configuration as that would mutate the ``docutils`` registries. + + History + ======= + + 3.1 (2017-03-08) + ---------------- + + - Add support for checking XML code blocks (thanks to Sameer Singh). + + 3.0.1 (2017-03-01) + ------------------ + + - Support UTF-8 byte order marks (BOM). Previously, ``docutils`` would + interpret the BOM as a visible character, which would lead to false positives + about underlines being too short. + + 3.0 (2016-12-19) + ---------------- + + - Optionally support Sphinx 1.5. Sphinx support will be enabled if Sphinx is + installed. + + 2.0 (2015-07-27) + ---------------- + + - Support loading settings from configuration files. + + 1.0 (2015-03-14) + ---------------- + + - Add Sphinx support. + + 0.1 (2013-12-02) + ---------------- + + - Initial version. + + .. rstcheck: ignore-language=cpp,python,rst Keywords: restructuredtext,lint,check,pypi,readme,rst,analyze @@ -211,4 +267,5 @@ Classifier: Programming Language :: Python :: 3.3 Classifier: Programming Language :: Python :: 3.4 Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 Classifier: Topic :: Software Development :: Quality Assurance diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rstcheck-1.5.1/README.rst new/rstcheck-3.1/README.rst --- old/rstcheck-1.5.1/README.rst 2016-01-24 19:36:55.000000000 +0100 +++ new/rstcheck-3.1/README.rst 2017-03-08 16:59:53.000000000 +0100 @@ -9,12 +9,15 @@ Checks syntax of reStructuredText and code blocks nested within it. +.. contents:: + + Installation ============ From pip:: - $ pip install --upgrade rstcheck + $ pip install rstcheck Supported languages in code blocks @@ -25,6 +28,7 @@ - C (C99) - C++ (C++11) - JSON +- XML - Python - reStructuredText @@ -34,13 +38,13 @@ With bad Python syntax: -.. code-block:: rst +.. code:: rst ==== Test ==== - .. code-block:: python + .. code:: python print( @@ -51,13 +55,13 @@ With bad C++ syntax: -.. code-block:: rst +.. code:: rst ==== Test ==== - .. code-block:: cpp + .. code:: cpp int main() { @@ -71,7 +75,7 @@ With bad syntax in the reStructuredText document itself: -.. code-block:: rst +.. code:: rst ==== Test @@ -167,12 +171,26 @@ $ rstcheck docs/foo/bar.rst +Sphinx +====== + +To enable Sphinx:: + + $ pip install sphinx + +The installed Sphinx version must be at least 1.5. + +To check that Sphinx support is enabled:: + + $ rstcheck -h | grep 'Sphinx is enabled' + + Usage in Vim ============ To check reStructuredText in Vim using Syntastic_: -.. code-block:: vim +.. code:: vim let g:syntastic_rst_checkers = ['rstcheck'] @@ -192,4 +210,42 @@ Note that this does not load any configuration as that would mutate the ``docutils`` registries. + +History +======= + +3.1 (2017-03-08) +---------------- + +- Add support for checking XML code blocks (thanks to Sameer Singh). + +3.0.1 (2017-03-01) +------------------ + +- Support UTF-8 byte order marks (BOM). Previously, ``docutils`` would + interpret the BOM as a visible character, which would lead to false positives + about underlines being too short. + +3.0 (2016-12-19) +---------------- + +- Optionally support Sphinx 1.5. Sphinx support will be enabled if Sphinx is + installed. + +2.0 (2015-07-27) +---------------- + +- Support loading settings from configuration files. + +1.0 (2015-03-14) +---------------- + +- Add Sphinx support. + +0.1 (2013-12-02) +---------------- + +- Initial version. + + .. rstcheck: ignore-language=cpp,python,rst diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rstcheck-1.5.1/rstcheck.egg-info/PKG-INFO new/rstcheck-3.1/rstcheck.egg-info/PKG-INFO --- old/rstcheck-1.5.1/rstcheck.egg-info/PKG-INFO 2016-03-29 17:13:30.000000000 +0200 +++ new/rstcheck-3.1/rstcheck.egg-info/PKG-INFO 2017-03-08 17:00:33.000000000 +0100 @@ -1,7 +1,7 @@ Metadata-Version: 1.1 Name: rstcheck -Version: 1.5.1 -Summary: Checks syntax of reStructuredText and code blocks nested within it. +Version: 3.1 +Summary: Checks syntax of reStructuredText and code blocks nested within it Home-page: https://github.com/myint/rstcheck Author: UNKNOWN Author-email: UNKNOWN @@ -17,12 +17,15 @@ Checks syntax of reStructuredText and code blocks nested within it. + .. contents:: + + Installation ============ From pip:: - $ pip install --upgrade rstcheck + $ pip install rstcheck Supported languages in code blocks @@ -33,6 +36,7 @@ - C (C99) - C++ (C++11) - JSON + - XML - Python - reStructuredText @@ -42,13 +46,13 @@ With bad Python syntax: - .. code-block:: rst + .. code:: rst ==== Test ==== - .. code-block:: python + .. code:: python print( @@ -59,13 +63,13 @@ With bad C++ syntax: - .. code-block:: rst + .. code:: rst ==== Test ==== - .. code-block:: cpp + .. code:: cpp int main() { @@ -79,7 +83,7 @@ With bad syntax in the reStructuredText document itself: - .. code-block:: rst + .. code:: rst ==== Test @@ -175,12 +179,26 @@ $ rstcheck docs/foo/bar.rst + Sphinx + ====== + + To enable Sphinx:: + + $ pip install sphinx + + The installed Sphinx version must be at least 1.5. + + To check that Sphinx support is enabled:: + + $ rstcheck -h | grep 'Sphinx is enabled' + + Usage in Vim ============ To check reStructuredText in Vim using Syntastic_: - .. code-block:: vim + .. code:: vim let g:syntastic_rst_checkers = ['rstcheck'] @@ -200,6 +218,44 @@ Note that this does not load any configuration as that would mutate the ``docutils`` registries. + + History + ======= + + 3.1 (2017-03-08) + ---------------- + + - Add support for checking XML code blocks (thanks to Sameer Singh). + + 3.0.1 (2017-03-01) + ------------------ + + - Support UTF-8 byte order marks (BOM). Previously, ``docutils`` would + interpret the BOM as a visible character, which would lead to false positives + about underlines being too short. + + 3.0 (2016-12-19) + ---------------- + + - Optionally support Sphinx 1.5. Sphinx support will be enabled if Sphinx is + installed. + + 2.0 (2015-07-27) + ---------------- + + - Support loading settings from configuration files. + + 1.0 (2015-03-14) + ---------------- + + - Add Sphinx support. + + 0.1 (2013-12-02) + ---------------- + + - Initial version. + + .. rstcheck: ignore-language=cpp,python,rst Keywords: restructuredtext,lint,check,pypi,readme,rst,analyze @@ -211,4 +267,5 @@ Classifier: Programming Language :: Python :: 3.3 Classifier: Programming Language :: Python :: 3.4 Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 Classifier: Topic :: Software Development :: Quality Assurance diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rstcheck-1.5.1/rstcheck.egg-info/requires.txt new/rstcheck-3.1/rstcheck.egg-info/requires.txt --- old/rstcheck-1.5.1/rstcheck.egg-info/requires.txt 2016-03-29 17:13:30.000000000 +0200 +++ new/rstcheck-3.1/rstcheck.egg-info/requires.txt 2017-03-08 17:00:33.000000000 +0100 @@ -1,2 +1 @@ -docutils -sphinx +docutils >= 0.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rstcheck-1.5.1/rstcheck.py new/rstcheck-3.1/rstcheck.py --- old/rstcheck-1.5.1/rstcheck.py 2016-03-29 17:12:36.000000000 +0200 +++ new/rstcheck-3.1/rstcheck.py 2017-03-08 16:57:21.000000000 +0100 @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Copyright (C) 2013-2015 Steven Myint +# Copyright (C) 2013-2016 Steven Myint # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -37,9 +37,11 @@ import multiprocessing import os import re +import shutil import subprocess import sys import tempfile +from xml.etree import ElementTree try: import configparser @@ -53,24 +55,36 @@ import docutils.utils import docutils.writers -import sphinx -import sphinx.directives -import sphinx.domains.c -import sphinx.domains.cpp -import sphinx.domains.javascript -import sphinx.domains.python -import sphinx.domains.std -import sphinx.roles +try: + import sphinx + SPHINX_INSTALLED = sphinx.version_info >= (1, 5) +except ImportError: + SPHINX_INSTALLED = False +if SPHINX_INSTALLED: + import sphinx.application + import sphinx.directives + import sphinx.domains.c + import sphinx.domains.cpp + import sphinx.domains.javascript + import sphinx.domains.python + import sphinx.domains.std + import sphinx.roles -__version__ = '1.5.1' +__version__ = '3.1' -SPHINX_CODE_BLOCK_DELTA = -1 if sphinx.version_info >= (1, 3) else 0 + +if SPHINX_INSTALLED: + SPHINX_CODE_BLOCK_DELTA = -1 RSTCHECK_COMMENT_RE = re.compile(r'\.\. rstcheck:') +# This is for the cases where code in a readme uses includes in that directory. +INCLUDE_FLAGS = ['-I.', '-I..'] + + class Error(Exception): """rstcheck exception.""" @@ -80,6 +94,45 @@ Exception.__init__(self, message) +class CodeBlockDirective(docutils.parsers.rst.Directive): + + """Code block directive.""" + + has_content = True + optional_arguments = 1 + + def run(self): + """Run directive.""" + try: + language = self.arguments[0] + except IndexError: + language = '' + code = '\n'.join(self.content) + literal = docutils.nodes.literal_block(code, code) + literal['classes'].append('code-block') + literal['language'] = language + return [literal] + + +def register_code_directive(): + """Register code directive.""" + if not SPHINX_INSTALLED: + docutils.parsers.rst.directives.register_directive('code', + CodeBlockDirective) + docutils.parsers.rst.directives.register_directive('code-block', + CodeBlockDirective) + docutils.parsers.rst.directives.register_directive('sourcecode', + CodeBlockDirective) + + +def strip_byte_order_mark(text): + """Return text with byte order mark (BOM) removed.""" + try: + return text.encode('utf-8').decode('utf-8-sig') + except UnicodeError: + return text + + def check(source, filename='<string>', report_level=docutils.utils.Reporter.INFO_LEVEL, @@ -98,6 +151,11 @@ Each code block is checked asynchronously in a subprocess. """ + # Do this at call time rather than import time to avoid unnecessarily + # mutating state. + register_code_directive() + ignore_sphinx() + ignore = ignore or [] try: @@ -109,6 +167,11 @@ string_io = io.StringIO() + # This is a hack to avoid false positive from docutils (#23). docutils + # mistakes BOMs for actual visible letters. This results in the "underline + # too short" warning firing. + source = strip_byte_order_mark(source) + try: docutils.core.publish_string( source, writer=writer, @@ -185,7 +248,7 @@ ignore_from_config(os.path.dirname(os.path.realpath(filename))) ignore_directives_and_roles(args.ignore_directives, args.ignore_roles) - ignore_sphinx() + for substitution in args.ignore_substitutions: contents = contents.replace('|{}|'.format(substitution), 'None') @@ -222,6 +285,21 @@ yield (int(line_number), message) +def check_xml(code): + """Yield errors.""" + try: + ElementTree.fromstring(code) + except ElementTree.ParseError as exception: + message = '{}'.format(exception) + line_number = 0 + + found = re.search(r': line\s+([0-9]+)[^:]*$', message) + if found: + line_number = int(found.group(1)) + + yield (int(line_number), message) + + def check_rst(code, ignore): """Yield errors in nested RST code.""" filename = '<string>' @@ -263,16 +341,6 @@ directives = get_and_split(options, 'ignore_directives') roles = get_and_split(options, 'ignore_roles') - # Deprecated since 1.3. - try: - roles = split_comma_separated(parser.get('roles', 'ignore')) - except (configparser.NoOptionError, configparser.NoSectionError): - pass - try: - directives = split_comma_separated(parser.get('directives', 'ignore')) - except (configparser.NoOptionError, configparser.NoSectionError): - pass - return (directives, roles) @@ -288,21 +356,71 @@ def _get_directives_and_roles_from_sphinx(): """Return a tuple of Sphinx directive and roles.""" - sphinx_directives = list(sphinx.domains.std.StandardDomain.directives) - sphinx_roles = list(sphinx.domains.std.StandardDomain.roles) - - for domain in [sphinx.domains.c.CDomain, - sphinx.domains.cpp.CPPDomain, - sphinx.domains.javascript.JavaScriptDomain, - sphinx.domains.python.PythonDomain]: - - sphinx_directives += list(domain.directives) + [ - '{}:{}'.format(domain.name, item) - for item in list(domain.directives)] - - sphinx_roles += list(domain.roles) + [ - '{}:{}'.format(domain.name, item) - for item in list(domain.roles)] + if SPHINX_INSTALLED: + sphinx_directives = list(sphinx.domains.std.StandardDomain.directives) + sphinx_roles = list(sphinx.domains.std.StandardDomain.roles) + + for domain in [sphinx.domains.c.CDomain, + sphinx.domains.cpp.CPPDomain, + sphinx.domains.javascript.JavaScriptDomain, + sphinx.domains.python.PythonDomain]: + + sphinx_directives += list(domain.directives) + [ + '{}:{}'.format(domain.name, item) + for item in list(domain.directives)] + + sphinx_roles += list(domain.roles) + [ + '{}:{}'.format(domain.name, item) + for item in list(domain.roles)] + else: + sphinx_roles = [ + 'abbr', + 'command', + 'dfn', + 'doc', + 'download', + 'envvar', + 'file', + 'guilabel', + 'kbd', + 'keyword', + 'mailheader', + 'makevar', + 'manpage', + 'menuselection', + 'mimetype', + 'newsgroup', + 'option', + 'program', + 'py:func', + 'ref', + 'regexp', + 'samp', + 'term', + 'token'] + + sphinx_directives = [ + 'autosummary', + 'currentmodule', + 'centered', + 'c:function', + 'c:type', + 'include', + 'deprecated', + 'envvar', + 'glossary', + 'index', + 'no-code-block', + 'literalinclude', + 'hlist', + 'option', + 'productionlist', + 'py:function', + 'seealso', + 'toctree', + 'todo', + 'versionadded', + 'versionchanged'] return (sphinx_directives, sphinx_roles) @@ -425,14 +543,15 @@ def c_checker(code, working_directory): """Return checker.""" - return gcc_checker(code, '.c', [os.getenv('CC', 'gcc'), '-std=c99', '-I.'], + return gcc_checker(code, '.c', + [os.getenv('CC', 'gcc'), '-std=c99'] + INCLUDE_FLAGS, working_directory=working_directory) def cpp_checker(code, working_directory): """Return checker.""" - return gcc_checker(code, '.cpp', [os.getenv('CXX', 'g++'), '-std=c++0x', - '-I.'], + return gcc_checker(code, '.cpp', + [os.getenv('CXX', 'g++'), '-std=c++0x'] + INCLUDE_FLAGS, working_directory=working_directory) @@ -523,11 +642,23 @@ self._add_check(node=node, run=lambda: check_doctest(node.rawsource), - language='doctest') + language='doctest', + is_code_node=False) def visit_literal_block(self, node): """Check syntax of code block.""" + # For "..code-block:: language" language = node.get('language', None) + is_code_node = False + if not language: + # For "..code:: language" + is_code_node = True + classes = node.get('classes') + if 'code' in classes: + language = classes[-1] + else: + return + if language in self.ignore: return @@ -542,6 +673,7 @@ 'c': c_checker, 'cpp': cpp_checker, 'json': lambda source, _: lambda: check_json(source), + 'xml': lambda source, _: lambda: check_xml(source), 'python': lambda source, _: lambda: check_python(source), 'rst': lambda source, _: lambda: check_rst(source, ignore=self.ignore) @@ -549,11 +681,14 @@ if checker: run = checker(node.rawsource, self.working_directory) - self._add_check(node=node, run=run, language=language) + self._add_check(node=node, + run=run, + language=language, + is_code_node=is_code_node) raise docutils.nodes.SkipNode - def _add_check(self, node, run, language): + def _add_check(self, node, run, language, is_code_node): """Add checker that will be run.""" def run_check(): """Yield errors.""" @@ -563,14 +698,16 @@ for result in all_results: error_offset = result[0] - 1 - try: + line_number = getattr(node, 'line', None) + if line_number is not None: yield ( - beginning_of_code_block(node, self.contents) + + beginning_of_code_block( + node=node, + line_number=line_number, + full_contents=self.contents, + is_code_node=is_code_node) + error_offset, '({}) {}'.format(language, result[1])) - except TypeError: - # Ignore case where node's line_number is None. - pass else: yield (self.filename, 0, 'unknown error') self.checkers.append(run_check) @@ -582,14 +719,37 @@ """Ignore.""" -def beginning_of_code_block(node, full_contents): +def beginning_of_code_block(node, line_number, full_contents, is_code_node): """Return line number of beginning of code block.""" - line_number = node.line - delta = len(node.non_default_attributes()) - current_line_contents = full_contents.splitlines()[line_number:] - blank_lines = next((i for (i, x) in enumerate(current_line_contents) if x), - 0) - return line_number + delta - 1 + blank_lines - 1 + SPHINX_CODE_BLOCK_DELTA + if SPHINX_INSTALLED and not is_code_node: + delta = len(node.non_default_attributes()) + current_line_contents = full_contents.splitlines()[line_number:] + blank_lines = next( + (i for (i, x) in enumerate(current_line_contents) if x), + 0) + return ( + line_number + + delta - 1 + + blank_lines - 1 + + SPHINX_CODE_BLOCK_DELTA) + else: + lines = full_contents.splitlines() + code_block_length = len(node.rawsource.splitlines()) + + try: + # Case where there are no extra spaces. + if lines[line_number - 1].strip(): + return line_number - code_block_length + 1 + except IndexError: + pass + + # The offsets are wrong if the RST text has multiple blank lines after + # the code block. This is a workaround. + for line_number in range(line_number, 1, -1): + if lines[line_number - 2].strip(): + break + + return line_number - code_block_length class CheckWriter(docutils.writers.Writer): @@ -625,7 +785,11 @@ """Return parsed command-line arguments.""" threshold_choices = docutils.frontend.OptionParser.threshold_choices - parser = argparse.ArgumentParser(description=__doc__, prog='rstcheck') + parser = argparse.ArgumentParser( + description=__doc__ + (' Sphinx is enabled.' + if SPHINX_INSTALLED else ''), + prog='rstcheck') + parser.add_argument('files', nargs='+', type=decode_filename, help='files to check') parser.add_argument('--report', metavar='level', @@ -649,9 +813,10 @@ metavar='roles', default='', help='comma-separated list of roles to ignore') parser.add_argument('--debug', action='store_true', - help='show helpful for debugging') + help='show messages helpful for debugging') parser.add_argument('--version', action='version', version='%(prog)s ' + __version__) + args = parser.parse_args() if '-' in args.files and len(args.files) > 1: @@ -681,42 +846,62 @@ print(text, file=file) +(a)contextlib.contextmanager +def enable_sphinx_if_possible(): + """Register Sphinx directives and roles.""" + if SPHINX_INSTALLED: + temporary_directory = tempfile.mkdtemp() + try: + sphinx.application.Sphinx(srcdir=temporary_directory, + confdir=None, + outdir=temporary_directory, + doctreedir=temporary_directory, + buildername='dummy', + status=None) + yield + finally: + shutil.rmtree(temporary_directory) + else: + yield + + def main(): """Return 0 on success.""" args = parse_args() - status = 0 - pool = multiprocessing.Pool(multiprocessing.cpu_count()) - try: - if len(args.files) > 1: - # Run in separate process to avoid mutating the global docutils - # settings based on the local configuration. It also avoids - # mutating the settings when rstcheck is used as a module. - results = pool.map( - _check_file, - [(name, args) for name in args.files]) - else: - # This is for the case where we read from standard in. - results = [_check_file((args.files[0], args))] - - for (filename, errors) in results: - for error in errors: - line_number = error[0] - message = error[1] - - if not re.match(r'$[A-Z]+/[0-9]+$', message): - message = '(ERROR/3) ' + message - - output_message('{}:{}: {}'.format(filename, - line_number, - message)) - - status = 1 - except IOError as exception: - output_message(exception) - status = 1 + with enable_sphinx_if_possible(): + status = 0 + pool = multiprocessing.Pool(multiprocessing.cpu_count()) + try: + if len(args.files) > 1: + # Run in separate process to avoid mutating the global docutils + # settings based on the local configuration. It also avoids + # mutating the settings when rstcheck is used as a module. + results = pool.map( + _check_file, + [(name, args) for name in args.files]) + else: + # This is for the case where we read from standard in. + results = [_check_file((args.files[0], args))] + + for (filename, errors) in results: + for error in errors: + line_number = error[0] + message = error[1] + + if not re.match(r'$[A-Z]+/[0-9]+$', message): + message = '(ERROR/3) ' + message + + output_message('{}:{}: {}'.format(filename, + line_number, + message)) + + status = 1 + except (IOError, UnicodeError) as exception: + output_message(exception) + status = 1 - return status + return status if __name__ == '__main__': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rstcheck-1.5.1/setup.cfg new/rstcheck-3.1/setup.cfg --- old/rstcheck-1.5.1/setup.cfg 2016-03-29 17:13:30.000000000 +0200 +++ new/rstcheck-3.1/setup.cfg 2017-03-08 17:00:34.000000000 +0100 @@ -1,5 +1,5 @@ [egg_info] -tag_svn_revision = 0 tag_build = tag_date = 0 +tag_svn_revision = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rstcheck-1.5.1/setup.py new/rstcheck-3.1/setup.py --- old/rstcheck-1.5.1/setup.py 2015-09-18 16:58:09.000000000 +0200 +++ new/rstcheck-3.1/setup.py 2017-01-29 17:31:19.000000000 +0100 @@ -22,7 +22,7 @@ version=version(), url='https://github.com/myint/rstcheck', description='Checks syntax of reStructuredText and code blocks nested ' - 'within it.', + 'within it', long_description=readme.read(), classifiers=[ 'License :: OSI Approved :: MIT License', @@ -32,10 +32,10 @@ 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', 'Topic :: Software Development :: Quality Assurance', ], keywords='restructuredtext,lint,check,pypi,readme,rst,analyze', py_modules=['rstcheck'], entry_points={'console_scripts': ['rstcheck = rstcheck:main']}, - install_requires=['docutils', 'sphinx'] - ) + install_requires=['docutils >= 0.7'])

1 0

commit ceph for openSUSE:Factory
by root＠hilbert.suse.de 24 Jun '17

24 Jun '17

Hello community, here is the log from the commit of package ceph for openSUSE:Factory checked in at 2017-06-24 08:34:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ceph (Old) and /work/SRC/openSUSE:Factory/.ceph.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ceph" Sat Jun 24 08:34:21 2017 rev:13 rq:505855 version:12.0.3+git.1498202776.b806032985 Changes: -------- --- /work/SRC/openSUSE:Factory/ceph/ceph-test.changes 2017-06-16 10:53:10.837036460 +0200 +++ /work/SRC/openSUSE:Factory/.ceph.new/ceph-test.changes 2017-06-24 08:34:24.676753851 +0200 @@ -1,0 +2,25 @@ +Fri Jun 23 08:11:22 UTC 2017 - ncutler(a)suse.com + +- Update to version 12.0.3+git.1498202776.b806032985: + + Integration testing changes: + * add DeepSea integration suite test definitions for teuthology + * re-enable several RGW tests that upstream only runs on Ubuntu + + ceph_ver_hack.sh: use git describe --match + + ReplicatedPG: add CHECKSUM->CMPEXT req translation + +------------------------------------------------------------------- +Wed Jun 14 08:00:43 UTC 2017 - ncutler(a)suse.com + +- Update to version 12.0.3+git.1497426468.6984d41b5d: + + qa: add initial deepsea suite (task and test yaml) + + fix "ceph osd df" (regression in latest upstream master) (pr#15675, issue#20256) + * mon: move creating_pgs and reweight_by_utilization into new MonPGStatService + * mon: move most PGMapStatService into PGMap; rename PGMon's to PGMonStatService + * mon: mgr: move 'osd df' handling to manager + * mon: inherit PGMonStatService from the PGMapStatService + * move the OSDUtilizationDumper code into OSDMap + * mon: mgr: enable "osd df" on the manager + * qa: add a check_commands.sh script which looks for commands with no tests + * qa: test 'osd df' in cephtool/test.sh + +------------------------------------------------------------------- ceph.changes: same change Old: ---- ceph-12.0.3+git.1496909744.9f667dc335.tar.bz2 New: ---- ceph-12.0.3+git.1498202776.b806032985.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ceph-test.spec ++++++ --- /var/tmp/diff_new_pack.Kemjxu/_old 2017-06-24 08:34:56.276285627 +0200 +++ /var/tmp/diff_new_pack.Kemjxu/_new 2017-06-24 08:34:56.280285062 +0200 @@ -69,7 +69,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 12.0.3+git.1496909744.9f667dc335 +Version: 12.0.3+git.1498202776.b806032985 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 1 ++++++ ceph.spec ++++++ --- /var/tmp/diff_new_pack.Kemjxu/_old 2017-06-24 08:34:56.300282234 +0200 +++ /var/tmp/diff_new_pack.Kemjxu/_new 2017-06-24 08:34:56.304281669 +0200 @@ -69,7 +69,7 @@ # main package definition ################################################################################# Name: ceph -Version: 12.0.3+git.1496909744.9f667dc335 +Version: 12.0.3+git.1498202776.b806032985 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 1 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.Kemjxu/_old 2017-06-24 08:34:56.368272620 +0200 +++ /var/tmp/diff_new_pack.Kemjxu/_new 2017-06-24 08:34:56.372272055 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/SUSE/ceph.git</param> - <param name="changesrevision">9f667dc3351c4c5388389f825097d7e178f6177e</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">b806032985d029d5ae667099b1a050e07516a96e</param></service></servicedata> \ No newline at end of file ++++++ ceph-12.0.3+git.1496909744.9f667dc335.tar.bz2 -> ceph-12.0.3+git.1498202776.b806032985.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/ceph/ceph-12.0.3+git.1496909744.9f667dc335.tar.bz2 /work/SRC/openSUSE:Factory/.ceph.new/ceph-12.0.3+git.1498202776.b806032985.tar.bz2 differ: char 11, line 1

1 0

commit pcp for openSUSE:Factory
by root＠hilbert.suse.de 24 Jun '17

24 Jun '17

Hello community, here is the log from the commit of package pcp for openSUSE:Factory checked in at 2017-06-24 08:34:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcp (Old) and /work/SRC/openSUSE:Factory/.pcp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pcp" Sat Jun 24 08:34:15 2017 rev:40 rq:505504 version:3.11.9 Changes: -------- --- /work/SRC/openSUSE:Factory/pcp/pcp.changes 2015-04-22 01:11:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pcp.new/pcp.changes 2017-06-24 08:34:19.589473201 +0200 @@ -1,0 +2,72 @@ +Mon Jun 19 23:09:32 UTC 2017 - ddiss(a)suse.com + +- Follow the shared library packaging policy and split libpcp_gui.so.2, + libpcp_mmv.so.1, libpcp_trace.so.2, libpcp_import.so.1 and libpcp_web.so.1 + out from libpcp3 into separate packages. +- Drop a number of unneeded explicit library package Requires. +- Fix a number of file manifest conflicts. +- Drop lio pmda on SUSE systems without proper rtslib-fb dependency. + +------------------------------------------------------------------- +Sun Jun 18 19:53:55 UTC 2017 - ddiss(a)suse.com + +- Update to 3.11.9 + See http://git.pcp.io/cgi-bin/gitweb.cgi?p=pcp/pcp.git;a=blob_plain;f=CHANGELOG… + for details. + +------------------------------------------------------------------- +Fri Mar 31 12:42:00 UTC 2017 - ddiss(a)suse.com + +- Disable remote _service execution + + Run locally and add generated tarball and spec file + +------------------------------------------------------------------- +Mon Mar 27 15:13:39 UTC 2017 - ddiss(a)suse.com + +- Update to 3.11.8 + See http://git.pcp.io/cgi-bin/gitweb.cgi?p=pcp/pcp.git;a=blob_plain;f=CHANGELOG… + for details. + +- Remove 0010-build-do-not-include-.gitignore-in-installed-file-se.patch + + Upstream + +- Drop pcp-webjs.src.tar.gz + + https://github.com/performancecopilot/pcp-webjs/issues/3 + + Vector will be pulled in from the upstream source in future + +- Enable pmda-systemd package + + libsystemd pkg-config detection fixed upstream + +- New packages + + pcp-devel: Upstream split of non-essential devel packages from + libpcp-devel + + pcp-pmda-bind2 + + pcp-pmda-docker + + pcp-pmda-lio + + pcp-pmda-nutcracker + + pcp-pmda-oracle + + pcp-pmda-redis + + pcp-pmda-libvirt + + pcp-export-pcp2influxdb + +------------------------------------------------------------------- +Wed Mar 22 15:06:13 UTC 2017 - ddiss(a)suse.com + +- Update to 3.10.9 + See http://git.pcp.io/cgi-bin/gitweb.cgi?p=pcp/pcp.git;a=blob_plain;f=CHANGELOG… + for details. + +- Drop obsolete 0001-Fix-XEN-build.patch + + PCP_PS_ALL_FLAGS now used explicitly +- Add 0010-build-do-not-include-.gitignore-in-installed-file-se.patch + +- Split out a number of agents from the base package into separate rpms +- Disable sheet2pcp + + As per upstream: "until BZ 830923 and BZ 754678 are resolved". + +------------------------------------------------------------------- +Tue Feb 28 18:09:50 UTC 2017 - ddiss(a)suse.com + +- Add _service file for pulling directly from the upstream Git repository. + +------------------------------------------------------------------- Old: ---- 0001-Fix-XEN-build.patch pcp-3.10.4.src.tar.gz pcp-webjs.src.tar.gz New: ---- _service pcp-3.11.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcp.spec ++++++ ++++ 3135 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/pcp/pcp.spec ++++ and /work/SRC/openSUSE:Factory/.pcp.new/pcp.spec ++++++ 0002-Install-libraries-without-exec-permission.patch ++++++ --- /var/tmp/diff_new_pack.PcaD0W/_old 2017-06-24 08:34:20.617327861 +0200 +++ /var/tmp/diff_new_pack.PcaD0W/_new 2017-06-24 08:34:20.617327861 +0200 @@ -22,10 +22,10 @@ src/pmdas/solaris/GNUmakefile | 3 ++- 16 files changed, 29 insertions(+), 23 deletions(-) -Index: pcp-3.10.4/src/genpmda/genpmda +Index: pcp-3.11.9/src/genpmda/genpmda =================================================================== ---- pcp-3.10.4.orig/src/genpmda/genpmda -+++ pcp-3.10.4/src/genpmda/genpmda +--- pcp-3.11.9.orig/src/genpmda/genpmda ++++ pcp-3.11.9/src/genpmda/genpmda @@ -909,7 +909,7 @@ install: default \$(INSTALL) -m 755 -d \$(PCP_VAR_DIR)/pmdas \$(INSTALL) -m 755 -d \$(PMDADIR) @@ -44,11 +44,11 @@ \$(INSTALL) -m 755 -f $oflag/Install \$(PMDADIR)/Install \$(INSTALL) -m 755 -f $oflag/Remove \$(PMDADIR)/Remove \$(INSTALL) -m 644 -f $oflag/Makefile.install \$(PMDADIR)/Makefile -Index: pcp-3.10.4/src/libpcp/src/GNUmakefile +Index: pcp-3.11.9/src/libpcp/src/GNUmakefile =================================================================== ---- pcp-3.10.4.orig/src/libpcp/src/GNUmakefile -+++ pcp-3.10.4/src/libpcp/src/GNUmakefile -@@ -125,7 +125,7 @@ endif +--- pcp-3.11.9.orig/src/libpcp/src/GNUmakefile ++++ pcp-3.11.9/src/libpcp/src/GNUmakefile +@@ -111,7 +111,7 @@ endif install : default ifneq ($(LIBTARGET),) @@ -57,7 +57,7 @@ endif ifneq ($(SYMTARGET),) for tt in $(SYMTARGET); do \ -@@ -133,7 +133,7 @@ ifneq ($(SYMTARGET),) +@@ -119,7 +119,7 @@ ifneq ($(SYMTARGET),) done endif ifneq ($(STATICLIBTARGET),) @@ -66,10 +66,10 @@ endif default_pcp : default -Index: pcp-3.10.4/src/libpcp_gui/src/GNUmakefile +Index: pcp-3.11.9/src/libpcp_gui/src/GNUmakefile =================================================================== ---- pcp-3.10.4.orig/src/libpcp_gui/src/GNUmakefile -+++ pcp-3.10.4/src/libpcp_gui/src/GNUmakefile +--- pcp-3.11.9.orig/src/libpcp_gui/src/GNUmakefile ++++ pcp-3.11.9/src/libpcp_gui/src/GNUmakefile @@ -54,7 +54,7 @@ include $(BUILDRULES) install: default @@ -88,10 +88,10 @@ endif default_pcp: default -Index: pcp-3.10.4/src/libpcp_import/src/GNUmakefile +Index: pcp-3.11.9/src/libpcp_import/src/GNUmakefile =================================================================== ---- pcp-3.10.4.orig/src/libpcp_import/src/GNUmakefile -+++ pcp-3.10.4/src/libpcp_import/src/GNUmakefile +--- pcp-3.11.9.orig/src/libpcp_import/src/GNUmakefile ++++ pcp-3.11.9/src/libpcp_import/src/GNUmakefile @@ -53,7 +53,7 @@ include $(BUILDRULES) install: default @@ -110,11 +110,11 @@ endif default_pcp: default -Index: pcp-3.10.4/src/libpcp_mmv/src/GNUmakefile +Index: pcp-3.11.9/src/libpcp_mmv/src/GNUmakefile =================================================================== ---- pcp-3.10.4.orig/src/libpcp_mmv/src/GNUmakefile -+++ pcp-3.10.4/src/libpcp_mmv/src/GNUmakefile -@@ -48,7 +48,7 @@ include $(BUILDRULES) +--- pcp-3.11.9.orig/src/libpcp_mmv/src/GNUmakefile ++++ pcp-3.11.9/src/libpcp_mmv/src/GNUmakefile +@@ -47,7 +47,7 @@ include $(BUILDRULES) install: default ifneq ($(LIBTARGET),) @@ -123,7 +123,7 @@ endif ifneq ($(SYMTARGET),) for tt in $(SYMTARGET); do \ -@@ -56,7 +56,7 @@ ifneq ($(SYMTARGET),) +@@ -55,7 +55,7 @@ ifneq ($(SYMTARGET),) done endif ifneq ($(STATICLIBTARGET),) @@ -132,11 +132,11 @@ endif default_pcp: default -Index: pcp-3.10.4/src/libpcp_pmda/src/GNUmakefile +Index: pcp-3.11.9/src/libpcp_pmda/src/GNUmakefile =================================================================== ---- pcp-3.10.4.orig/src/libpcp_pmda/src/GNUmakefile -+++ pcp-3.10.4/src/libpcp_pmda/src/GNUmakefile -@@ -60,7 +60,7 @@ include $(BUILDRULES) +--- pcp-3.11.9.orig/src/libpcp_pmda/src/GNUmakefile ++++ pcp-3.11.9/src/libpcp_pmda/src/GNUmakefile +@@ -61,7 +61,7 @@ include $(BUILDRULES) install: default ifneq ($(LIBTARGET),) @@ -145,7 +145,7 @@ endif ifneq ($(SYMTARGET),) for tt in $(SYMTARGET); do \ -@@ -68,7 +68,7 @@ ifneq ($(SYMTARGET),) +@@ -69,7 +69,7 @@ ifneq ($(SYMTARGET),) done endif ifneq ($(STATICLIBTARGET),) @@ -154,10 +154,10 @@ endif default_pcp: default -Index: pcp-3.10.4/src/libpcp_trace/src/GNUmakefile +Index: pcp-3.11.9/src/libpcp_trace/src/GNUmakefile =================================================================== ---- pcp-3.10.4.orig/src/libpcp_trace/src/GNUmakefile -+++ pcp-3.10.4/src/libpcp_trace/src/GNUmakefile +--- pcp-3.11.9.orig/src/libpcp_trace/src/GNUmakefile ++++ pcp-3.11.9/src/libpcp_trace/src/GNUmakefile @@ -56,13 +56,13 @@ include $(BUILDRULES) install : default @@ -174,11 +174,11 @@ endif default_pcp : default -Index: pcp-3.10.4/src/pmdas/aix/GNUmakefile +Index: pcp-3.11.9/src/pmdas/aix/GNUmakefile =================================================================== ---- pcp-3.10.4.orig/src/pmdas/aix/GNUmakefile -+++ pcp-3.10.4/src/pmdas/aix/GNUmakefile -@@ -43,7 +43,8 @@ build-me: common.h root_aix domain.h $(C +--- pcp-3.11.9.orig/src/pmdas/aix/GNUmakefile ++++ pcp-3.11.9/src/pmdas/aix/GNUmakefile +@@ -44,7 +44,8 @@ build-me: common.h root_aix $(CMDTARGET) install: build-me $(INSTALL) -m 755 -d $(PMDADIR) $(INSTALL) -m 644 domain.h help.dir help.pag $(PMDADIR) @@ -188,11 +188,11 @@ $(INSTALL) -m 644 root_aix $(PCP_VAR_DIR)/pmns/root_aix else build-me: -Index: pcp-3.10.4/src/pmdas/darwin/GNUmakefile +Index: pcp-3.11.9/src/pmdas/darwin/GNUmakefile =================================================================== ---- pcp-3.10.4.orig/src/pmdas/darwin/GNUmakefile -+++ pcp-3.10.4/src/pmdas/darwin/GNUmakefile -@@ -47,7 +47,8 @@ build-me: root_darwin domain.h $(LIBTARG +--- pcp-3.11.9.orig/src/pmdas/darwin/GNUmakefile ++++ pcp-3.11.9/src/pmdas/darwin/GNUmakefile +@@ -48,7 +48,8 @@ build-me: root_darwin $(LIBTARGET) $(CMD install: build-me $(INSTALL) -m 755 -d $(PMDADIR) $(INSTALL) -m 644 domain.h help.dir help.pag $(PMDADIR) @@ -202,11 +202,11 @@ $(INSTALL) -m 644 root_darwin $(PCP_VAR_DIR)/pmns/root_darwin else build-me: -Index: pcp-3.10.4/src/pmdas/freebsd/GNUmakefile +Index: pcp-3.11.9/src/pmdas/freebsd/GNUmakefile =================================================================== ---- pcp-3.10.4.orig/src/pmdas/freebsd/GNUmakefile -+++ pcp-3.10.4/src/pmdas/freebsd/GNUmakefile -@@ -48,7 +48,8 @@ build-me: domain.h $(LIBTARGET) $(CMDTAR +--- pcp-3.11.9.orig/src/pmdas/freebsd/GNUmakefile ++++ pcp-3.11.9/src/pmdas/freebsd/GNUmakefile +@@ -48,7 +48,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) help install: default $(INSTALL) -m 755 -d $(PMDADIR) $(INSTALL) -m 644 domain.h help help.dir help.pag $(PMDADIR) @@ -216,25 +216,25 @@ $(INSTALL) -m 644 root_freebsd $(PCP_VAR_DIR)/pmns/root_freebsd else build-me: -Index: pcp-3.10.4/src/pmdas/linux/GNUmakefile +Index: pcp-3.11.9/src/pmdas/linux/GNUmakefile =================================================================== ---- pcp-3.10.4.orig/src/pmdas/linux/GNUmakefile -+++ pcp-3.10.4/src/pmdas/linux/GNUmakefile -@@ -75,7 +75,8 @@ build-me: domain.h $(LIBTARGET) $(CMDTAR - install: default +--- pcp-3.11.9.orig/src/pmdas/linux/GNUmakefile ++++ pcp-3.11.9/src/pmdas/linux/GNUmakefile +@@ -78,7 +78,8 @@ install: default $(INSTALL) -m 755 -d $(PMDADIR) $(INSTALL) -m 644 domain.h help $(HELPTARGETS) $(PMDADIR) + $(INSTALL) -m 644 bandwidth.conf $(PMDADIR)/samplebandwidth.conf - $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(PMDADIR) + $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET) + $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET) $(INSTALL) -m 644 root_linux $(PCP_VAR_DIR)/pmns/root_linux $(INSTALL) -m 644 proc_net_snmp_migrate.conf $(LOGREWRITEDIR)/linux_proc_net_snmp_migrate.conf - else -Index: pcp-3.10.4/src/pmdas/linux_proc/GNUmakefile + $(INSTALL) -m 644 proc_net_tcp_migrate.conf $(LOGREWRITEDIR)/linux_proc_net_tcp_migrate.conf +Index: pcp-3.11.9/src/pmdas/linux_proc/GNUmakefile =================================================================== ---- pcp-3.10.4.orig/src/pmdas/linux_proc/GNUmakefile -+++ pcp-3.10.4/src/pmdas/linux_proc/GNUmakefile -@@ -66,7 +66,8 @@ build-me: domain.h root_proc $(LIBTARGET +--- pcp-3.11.9.orig/src/pmdas/linux_proc/GNUmakefile ++++ pcp-3.11.9/src/pmdas/linux_proc/GNUmakefile +@@ -68,7 +68,8 @@ build-me: root_proc $(LIBTARGET) $(CMDTA install: default $(INSTALL) -m 755 -d $(PMDADIR) $(INSTALL) -m 644 domain.h help help.dir help.pag root root_proc samplehotproc.conf $(PMDADIR) @@ -244,11 +244,11 @@ $(INSTALL) -m 644 root_proc $(PCP_VAR_DIR)/pmns/root_proc $(INSTALL) -m 644 $(LOGREWRITERS) $(PCP_VAR_DIR)/config/pmlogrewrite @$(INSTALL_MAN) -Index: pcp-3.10.4/src/pmdas/lustrecomm/GNUmakefile +Index: pcp-3.11.9/src/pmdas/lustrecomm/GNUmakefile =================================================================== ---- pcp-3.10.4.orig/src/pmdas/lustrecomm/GNUmakefile -+++ pcp-3.10.4/src/pmdas/lustrecomm/GNUmakefile -@@ -50,7 +50,7 @@ build-me: domain.h $(TARGETS) +--- pcp-3.11.9.orig/src/pmdas/lustrecomm/GNUmakefile ++++ pcp-3.11.9/src/pmdas/lustrecomm/GNUmakefile +@@ -51,7 +51,7 @@ build-me: $(TARGETS) install: default $(INSTALL) -m 755 -d $(PMDADIR) $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET) @@ -257,11 +257,11 @@ $(INSTALL) -m 755 Install Remove $(PMDADIR) $(INSTALL) -m 644 $(DFILES) root pmns domain.h help $(PMDADIR) @$(INSTALL_MAN) -Index: pcp-3.10.4/src/pmdas/pmcd/src/GNUmakefile +Index: pcp-3.11.9/src/pmdas/pmcd/src/GNUmakefile =================================================================== ---- pcp-3.10.4.orig/src/pmdas/pmcd/src/GNUmakefile -+++ pcp-3.10.4/src/pmdas/pmcd/src/GNUmakefile -@@ -54,7 +54,7 @@ default: $(LIBTARGET) domain.h +--- pcp-3.11.9.orig/src/pmdas/pmcd/src/GNUmakefile ++++ pcp-3.11.9/src/pmdas/pmcd/src/GNUmakefile +@@ -55,7 +55,7 @@ default: $(LIBTARGET) install: default $(INSTALL) -m 755 -d $(PCP_PMDAS_DIR)/pmcd @@ -270,11 +270,11 @@ include $(BUILDRULES) -Index: pcp-3.10.4/src/pmdas/sendmail/GNUmakefile +Index: pcp-3.11.9/src/pmdas/sendmail/GNUmakefile =================================================================== ---- pcp-3.10.4.orig/src/pmdas/sendmail/GNUmakefile -+++ pcp-3.10.4/src/pmdas/sendmail/GNUmakefile -@@ -39,7 +39,7 @@ include $(BUILDRULES) +--- pcp-3.11.9.orig/src/pmdas/sendmail/GNUmakefile ++++ pcp-3.11.9/src/pmdas/sendmail/GNUmakefile +@@ -40,7 +40,7 @@ include $(BUILDRULES) install install_pcp: default $(INSTALL) -m 755 -d $(PMDADIR) @@ -283,11 +283,11 @@ $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/pmda$(IAM)$(EXECSUFFIX) $(INSTALL) -m 755 $(SCRIPTS) $(PMDADIR) $(INSTALL) -m 644 $(DFILES) pmns help root domain.h $(PMDADIR) -Index: pcp-3.10.4/src/pmdas/solaris/GNUmakefile +Index: pcp-3.11.9/src/pmdas/solaris/GNUmakefile =================================================================== ---- pcp-3.10.4.orig/src/pmdas/solaris/GNUmakefile -+++ pcp-3.10.4/src/pmdas/solaris/GNUmakefile -@@ -53,7 +53,8 @@ build-me: root_solaris domain.h $(LIBTAR +--- pcp-3.11.9.orig/src/pmdas/solaris/GNUmakefile ++++ pcp-3.11.9/src/pmdas/solaris/GNUmakefile +@@ -53,7 +53,8 @@ build-me: root_solaris $(LIBTARGET) $(CM install: build-me $(INSTALL) -m 755 -d $(PMDADIR) $(INSTALL) -m 644 domain.h $(HELPTARGETS) $(PMDADIR) @@ -297,3 +297,144 @@ $(INSTALL) -m 644 root_solaris $(PCP_VAR_DIR)/pmns/root_solaris else build-me: +Index: pcp-3.11.9/src/libpcp_fault/src/GNUmakefile +=================================================================== +--- pcp-3.11.9.orig/src/libpcp_fault/src/GNUmakefile ++++ pcp-3.11.9/src/libpcp_fault/src/GNUmakefile +@@ -132,7 +132,7 @@ endif + + install : default + ifneq ($(LIBTARGET),) +- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) ++ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) + endif + ifneq ($(SYMTARGET),) + for tt in $(SYMTARGET); do \ +@@ -140,7 +140,7 @@ ifneq ($(SYMTARGET),) + done + endif + ifneq ($(STATICLIBTARGET),) +- $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) ++ $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) + endif + $(INSTALL) -m 644 $(TOPDIR)/src/include/pcp/fault.h $(PCP_INC_DIR)/fault.h + +Index: pcp-3.11.9/src/pmdas/jbd2/GNUmakefile +=================================================================== +--- pcp-3.11.9.orig/src/pmdas/jbd2/GNUmakefile ++++ pcp-3.11.9/src/pmdas/jbd2/GNUmakefile +@@ -54,7 +54,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HE + install: default + $(INSTALL) -m 755 -d $(PMDADIR) + $(INSTALL) -m 644 domain.h help $(HELPTARGETS) root root_jbd2 $(PMDADIR) +- $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(SCRIPTS) $(PMDADIR) ++ $(INSTALL) -m 755 $(CMDTARGET) $(SCRIPTS) $(PMDADIR) ++ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET) + $(INSTALL) -m 644 root_jbd2 $(PCP_VAR_DIR)/pmns/root_jbd2 + $(INSTALL) -m 644 jbd2_kernel_ulong.conf $(LOGREWRITEDIR)/jbd2_kernel_ulong.conf + @$(INSTALL_MAN) +Index: pcp-3.11.9/src/pmdas/linux_xfs/GNUmakefile +=================================================================== +--- pcp-3.11.9.orig/src/pmdas/linux_xfs/GNUmakefile ++++ pcp-3.11.9/src/pmdas/linux_xfs/GNUmakefile +@@ -55,7 +55,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HE + install: default + $(INSTALL) -m 755 -d $(PMDADIR) + $(INSTALL) -m 644 domain.h help help.dir help.pag root root_xfs $(PMDADIR) +- $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(SCRIPTS) $(PMDADIR) ++ $(INSTALL) -m 755 $(CMDTARGET) $(SCRIPTS) $(PMDADIR) ++ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET) + $(INSTALL) -m 644 root_xfs $(PCP_VAR_DIR)/pmns/root_xfs + $(INSTALL) -m 644 linux_xfs_migrate.conf $(PCP_VAR_DIR)/config/pmlogrewrite/linux_xfs_migrate.conf + @$(INSTALL_MAN) +Index: pcp-3.11.9/src/pmdas/nvidia/GNUmakefile +=================================================================== +--- pcp-3.11.9.orig/src/pmdas/nvidia/GNUmakefile ++++ pcp-3.11.9/src/pmdas/nvidia/GNUmakefile +@@ -37,7 +37,8 @@ include $(BUILDRULES) + install: default + $(INSTALL) -m 755 -d $(PMDADIR) + $(INSTALL) -m 755 Install Remove $(PMDADIR) +- $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(PMDADIR) ++ $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET) ++ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET) + $(INSTALL) -m 644 $(DFILES) root help pmns domain.h $(PMDADIR) + + $(OBJECTS): domain.h +Index: pcp-3.11.9/src/zabbix-agent/src/GNUmakefile +=================================================================== +--- pcp-3.11.9.orig/src/zabbix-agent/src/GNUmakefile ++++ pcp-3.11.9/src/zabbix-agent/src/GNUmakefile +@@ -37,7 +37,7 @@ include $(BUILDRULES) + install: default + $(INSTALL) -m 755 -d $(ZABBIX_DIR) + $(INSTALL) -m 755 -d $(MODULE_DIR) +- $(INSTALL) -m 755 $(LIBTARGET) $(MODULE_DIR)/$(LIBTARGET) ++ $(INSTALL) -m 644 $(LIBTARGET) $(MODULE_DIR)/$(LIBTARGET) + @$(INSTALL_MAN) + + default_pcp: default +Index: pcp-3.11.9/src/pmdas/rpm/GNUmakefile +=================================================================== +--- pcp-3.11.9.orig/src/pmdas/rpm/GNUmakefile ++++ pcp-3.11.9/src/pmdas/rpm/GNUmakefile +@@ -45,7 +45,8 @@ build-me: $(CMDTARGET) $(LIBTARGET) + install_pcp install: default + $(INSTALL) -m 755 -d $(PMDADIR) + $(INSTALL) -m 644 root pmns domain.h help $(PMDADIR) +- $(INSTALL) -m 755 $(CMDTARGET) $(LIBTARGET) $(SCRIPTS) $(PMDADIR) ++ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET) ++ $(INSTALL) -m 755 $(CMDTARGET) $(SCRIPTS) $(PMDADIR) + $(INSTALL) -m 644 migrate.conf $(PCP_VAR_DIR)/config/pmlogrewrite/rpm_migrate.conf + else + build-me: +Index: pcp-3.11.9/src/pmdas/docker/GNUmakefile +=================================================================== +--- pcp-3.11.9.orig/src/pmdas/docker/GNUmakefile ++++ pcp-3.11.9/src/pmdas/docker/GNUmakefile +@@ -46,7 +46,8 @@ build-me: $(CMDTARGET) $(LIBTARGET) + + install_pcp install: default + $(INSTALL) -m 755 -d $(PMDADIR) +- $(INSTALL) -m 755 Install Remove $(CMDTARGET) $(LIBTARGET) $(PMDADIR) ++ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET) ++ $(INSTALL) -m 755 Install Remove $(CMDTARGET) $(PMDADIR) + $(INSTALL) -m 644 root pmns domain.h $(DFILES) $(PMDADIR) + @$(INSTALL_MAN) + else +Index: pcp-3.11.9/src/pmdas/cifs/GNUmakefile +=================================================================== +--- pcp-3.11.9.orig/src/pmdas/cifs/GNUmakefile ++++ pcp-3.11.9/src/pmdas/cifs/GNUmakefile +@@ -43,8 +43,8 @@ build-me: $(CMDTARGET) $(LIBTARGET) + install: default + $(INSTALL) -m 755 -d $(PMDADIR) + $(INSTALL) -m 644 root pmns domain.h help $(PMDADIR) ++ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET) + $(INSTALL) -m 755 Install Remove $(CMDTARGET) $(PMDADIR) +- $(INSTALL) -m 755 Install Remove $(LIBTARGET) $(PMDADIR) + @$(INSTALL_MAN) + else + build-me: +Index: pcp-3.11.9/src/libpcp_web/src/GNUmakefile +=================================================================== +--- pcp-3.11.9.orig/src/libpcp_web/src/GNUmakefile ++++ pcp-3.11.9/src/libpcp_web/src/GNUmakefile +@@ -43,7 +43,7 @@ endif + + install: default + ifneq ($(LIBTARGET),) +- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) ++ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) + endif + ifneq ($(SYMTARGET),) + for tt in $(SYMTARGET); do \ +@@ -51,7 +51,7 @@ ifneq ($(SYMTARGET),) + done + endif + ifneq ($(STATICLIBTARGET),) +- $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) ++ $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) + endif + + default_pcp: default ++++++ 0003-pcp-legacy-init-lsb.patch ++++++ --- /var/tmp/diff_new_pack.PcaD0W/_old 2017-06-24 08:34:20.629326164 +0200 +++ /var/tmp/diff_new_pack.PcaD0W/_new 2017-06-24 08:34:20.629326164 +0200 @@ -7,10 +7,10 @@ src/pmcd/rc_pcp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) -diff --git a/src/pmcd/rc_pcp b/src/pmcd/rc_pcp -index 974ca06c2f4a..8d6872cfad9c 100644 ---- a/src/pmcd/rc_pcp -+++ b/src/pmcd/rc_pcp +Index: pcp-3.11.8/src/pmcd/rc_pcp +=================================================================== +--- pcp-3.11.8.orig/src/pmcd/rc_pcp ++++ pcp-3.11.8/src/pmcd/rc_pcp @@ -31,12 +31,12 @@ # e.g. SuSE, where chkconfig is a perl script. ### BEGIN INIT INFO @@ -30,8 +30,8 @@ # Short-Description: Legacy control for PCP daemons # Description: Legacy init script wrapper for the Performance Co-Pilot (PCP) daemons ### END INIT INFO -@@ -53,6 +53,8 @@ _usage() - echo "Usage: $pmprog [-v] {start|restart|condrestart|stop|status|reload|force-reload}" +@@ -79,6 +79,8 @@ _service() + fi } +echo "The pcp init script is depricated, pmcd and pmlogger should be used instead" @@ -39,6 +39,3 @@ case "$1" in 'start'|'restart'|'condrestart'|'reload'|'force-reload') --- -2.1.2 - ++++++ 0006-create-pmlogger-and-pmie-logdirs-during-install.patch ++++++ --- /var/tmp/diff_new_pack.PcaD0W/_old 2017-06-24 08:34:20.645323902 +0200 +++ /var/tmp/diff_new_pack.PcaD0W/_new 2017-06-24 08:34:20.649323337 +0200 @@ -8,32 +8,29 @@ src/pmlogger/GNUmakefile | 2 ++ 2 files changed, 4 insertions(+) -diff --git a/src/pmie/GNUmakefile b/src/pmie/GNUmakefile -index 4c8e971d519b..9c6d09445dbd 100644 ---- a/src/pmie/GNUmakefile -+++ b/src/pmie/GNUmakefile -@@ -55,6 +55,8 @@ endif - $(INSTALL) -m 775 -o $(PCP_USER) -g $(PCP_GROUP) -d $(PCP_TMP_DIR)/pmie - ifeq ($(TARGET_OS),linux) +Index: pcp-3.10.9/src/pmie/GNUmakefile +=================================================================== +--- pcp-3.10.9.orig/src/pmie/GNUmakefile ++++ pcp-3.10.9/src/pmie/GNUmakefile +@@ -58,6 +58,8 @@ ifeq ($(TARGET_OS),linux) + # Docker version of the crontab into the hosts /etc/cron.d directory. + $(INSTALL) -m 644 crontab.docker $(PCP_VAR_DIR)/config/pmie/crontab.docker $(INSTALL) -m 755 -d `dirname $(CRONTAB_PATH)` + $(INSTALL) -m 755 -d $(PCP_LOG_DIR)/pmie + $(INSTALL) -m 1777 -d $(PCP_TMP_DIR)/pmie endif $(INSTALL) -m 644 crontab $(CRONTAB_PATH) -diff --git a/src/pmlogger/GNUmakefile b/src/pmlogger/GNUmakefile -index ae728faff2af..483087dbd39f 100644 ---- a/src/pmlogger/GNUmakefile -+++ b/src/pmlogger/GNUmakefile -@@ -56,6 +56,8 @@ endif - $(INSTALL) -m 775 -o $(PCP_USER) -g $(PCP_GROUP) -d $(PCP_TMP_DIR)/pmlogger - ifeq ($(TARGET_OS),linux) +Index: pcp-3.10.9/src/pmlogger/GNUmakefile +=================================================================== +--- pcp-3.10.9.orig/src/pmlogger/GNUmakefile ++++ pcp-3.10.9/src/pmlogger/GNUmakefile +@@ -62,6 +62,8 @@ ifeq ($(TARGET_OS),linux) + # Docker version of the crontab into the hosts cron.d directory. + $(INSTALL) -m 644 crontab.docker $(PCP_VAR_DIR)/config/pmlogger/crontab.docker $(INSTALL) -m 755 -d `dirname $(CRONTAB_PATH)` + $(INSTALL) -m 755 -d $(PCP_LOG_DIR)/pmlogger + $(INSTALL) -m 1777 -d $(PCP_TMP_DIR)/pmlogger endif $(INSTALL) -m 644 crontab $(CRONTAB_PATH) - --- -2.1.2 - + $(INSTALL) -m 644 utilproc.sh $(PCP_SHARE_DIR)/lib/utilproc.sh ++++++ 0007-Honor-CFLAGS-in-qmake.patch ++++++ --- /var/tmp/diff_new_pack.PcaD0W/_old 2017-06-24 08:34:20.661321640 +0200 +++ /var/tmp/diff_new_pack.PcaD0W/_new 2017-06-24 08:34:20.661321640 +0200 @@ -15,22 +15,22 @@ src/pmtime/pmtime.pro | 1 + 6 files changed, 6 insertions(+) -diff --git a/src/libpcp_qed/src/libpcp_qed.pro b/src/libpcp_qed/src/libpcp_qed.pro -index 6a3c872a4b87..c67f1d63290d 100644 ---- a/src/libpcp_qed/src/libpcp_qed.pro -+++ b/src/libpcp_qed/src/libpcp_qed.pro -@@ -6,6 +6,7 @@ INCLUDEPATH += ../../include ../../libpcp_qmc/src +Index: pcp-3.11.8/src/libpcp_qed/src/libpcp_qed.pro +=================================================================== +--- pcp-3.11.8.orig/src/libpcp_qed/src/libpcp_qed.pro ++++ pcp-3.11.8/src/libpcp_qed/src/libpcp_qed.pro +@@ -6,6 +6,7 @@ INCLUDEPATH += ../../include ../../libpc release:DESTDIR = build/debug debug:DESTDIR = build/release - QT = core gui network svg + QT = core gui network printsupport svg widgets +QMAKE_CXXFLAGS += $$(PCP_CFLAGS) HEADERS = qed.h \ qed_actionlist.h \ -diff --git a/src/libpcp_qmc/src/libpcp_qmc.pro b/src/libpcp_qmc/src/libpcp_qmc.pro -index 39671ab2dceb..b59ffa4e6bb9 100644 ---- a/src/libpcp_qmc/src/libpcp_qmc.pro -+++ b/src/libpcp_qmc/src/libpcp_qmc.pro +Index: pcp-3.11.8/src/libpcp_qmc/src/libpcp_qmc.pro +=================================================================== +--- pcp-3.11.8.orig/src/libpcp_qmc/src/libpcp_qmc.pro ++++ pcp-3.11.8/src/libpcp_qmc/src/libpcp_qmc.pro @@ -5,6 +5,7 @@ CONFIG += qt staticlib warn_on INCLUDEPATH += ../../include release:DESTDIR = build/debug @@ -39,45 +39,42 @@ HEADERS = qmc_context.h qmc_desc.h qmc_group.h \ qmc_indom.h qmc_metric.h qmc_source.h \ -diff --git a/src/libpcp_qwt/src/libpcp_qwt.pro b/src/libpcp_qwt/src/libpcp_qwt.pro -index 1a7b1d8b736c..6badfc328605 100644 ---- a/src/libpcp_qwt/src/libpcp_qwt.pro -+++ b/src/libpcp_qwt/src/libpcp_qwt.pro -@@ -5,6 +5,7 @@ CONFIG += qt staticlib warn_on - release:DESTDIR = build/debug - debug:DESTDIR = build/release - QT = core gui network svg +Index: pcp-3.11.8/src/libpcp_qwt/src/libpcp_qwt.pro +=================================================================== +--- pcp-3.11.8.orig/src/libpcp_qwt/src/libpcp_qwt.pro ++++ pcp-3.11.8/src/libpcp_qwt/src/libpcp_qwt.pro +@@ -8,6 +8,7 @@ QT = core gui network svg + greaterThan(QT_MAJOR_VERSION, 4) { + QT += concurrent printsupport + } +QMAKE_CXXFLAGS += $$(PCP_CFLAGS) HEADERS += \ qwt.h \ -diff --git a/src/pmdumptext/pmdumptext.pro b/src/pmdumptext/pmdumptext.pro -index d521e2f40cb7..f9048bb1a037 100644 ---- a/src/pmdumptext/pmdumptext.pro -+++ b/src/pmdumptext/pmdumptext.pro -@@ -9,3 +9,4 @@ LIBS += -L../libpcp/src - LIBS += -L../libpcp_qmc/src -L../libpcp_qmc/src/$$DESTDIR +Index: pcp-3.11.8/src/pmdumptext/pmdumptext.pro +=================================================================== +--- pcp-3.11.8.orig/src/pmdumptext/pmdumptext.pro ++++ pcp-3.11.8/src/pmdumptext/pmdumptext.pro +@@ -10,3 +10,4 @@ LIBS += -L../libpcp_qmc/src -L../libpcp LIBS += -lpcp_qmc -lpcp + win32:LIBS += -lwsock32 -liphlpapi QT -= gui +QMAKE_CXXFLAGS += $$(PCP_CFLAGS) -diff --git a/src/pmquery/pmquery.pro b/src/pmquery/pmquery.pro -index 6a4293fb7a23..d9392931888c 100644 ---- a/src/pmquery/pmquery.pro -+++ b/src/pmquery/pmquery.pro -@@ -7,3 +7,4 @@ RESOURCES = pmquery.qrc - CONFIG += qt warn_on +Index: pcp-3.11.8/src/pmquery/pmquery.pro +=================================================================== +--- pcp-3.11.8.orig/src/pmquery/pmquery.pro ++++ pcp-3.11.8/src/pmquery/pmquery.pro +@@ -8,3 +8,4 @@ CONFIG += qt warn_on + QT += widgets release:DESTDIR = build/debug debug:DESTDIR = build/release +QMAKE_CXXFLAGS += $$(PCP_CFLAGS) -diff --git a/src/pmtime/pmtime.pro b/src/pmtime/pmtime.pro -index ad3e1932e7b1..4605765cab79 100644 ---- a/src/pmtime/pmtime.pro -+++ b/src/pmtime/pmtime.pro +Index: pcp-3.11.8/src/pmtime/pmtime.pro +=================================================================== +--- pcp-3.11.8.orig/src/pmtime/pmtime.pro ++++ pcp-3.11.8/src/pmtime/pmtime.pro @@ -22,3 +22,4 @@ LIBS += -lpcp_qwt -lpcp_qmc -lpcp - win32:LIBS += -lwsock32 - QT += network + win32:LIBS += -lwsock32 -liphlpapi + QT += network widgets QMAKE_INFO_PLIST = pmtime.info +QMAKE_CXXFLAGS += $$(PCP_CFLAGS) --- -2.1.2 - ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/performancecopilot/pcp.git</param> <param name="filename">pcp</param> <param name="revision">6a273f2027f9d052316b81f2beb1b5efe12c4ae5</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">disable</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">bz2</param> </service> <service name="set_version" mode="disabled"> <param name="basename">pcp</param> </service> </services> ++++++ pcp-3.10.4.src.tar.gz -> pcp-3.11.9.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/pcp/pcp-3.10.4.src.tar.gz /work/SRC/openSUSE:Factory/.pcp.new/pcp-3.11.9.tar.bz2 differ: char 1, line 1

1 0

commit psmisc for openSUSE:Factory
by root＠hilbert.suse.de 24 Jun '17

24 Jun '17

Hello community, here is the log from the commit of package psmisc for openSUSE:Factory checked in at 2017-06-24 08:34:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/psmisc (Old) and /work/SRC/openSUSE:Factory/.psmisc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "psmisc" Sat Jun 24 08:34:09 2017 rev:61 rq:505275 version:23.0 Changes: -------- --- /work/SRC/openSUSE:Factory/psmisc/psmisc.changes 2015-05-23 12:43:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.psmisc.new/psmisc.changes 2017-06-24 08:34:11.090674947 +0200 @@ -1,0 +2,54 @@ +Tue Jun 20 15:06:43 UTC 2017 - werner(a)suse.de + +- Update to version 23.0 + * killall: Fix process age race condition !11 Debian #822861 + * killall: only use scope of current namespace by default + * killall: better parsing of command names + * pstree: add cgroup namespaces !10 + * peekfd: Help give long options too !5 + * killall: correctly report when 32+ procs match !8 + * prtat: Remove duplicate options in man page !3 Debian #846387 + * pslog: New program to check what logs are open merge !1 + * fuser: increase path length for octal escaping SF [#37] + * Make usage of linked lists of devices found in + /proc/self/mountinfo optional + * Make timeout() in timeout.c work with shared mmap to + reduce the load due write/read the stat buffers + * Add list_sort() to lists.h to be able to sort lists + * fuser: Fixed typo for -M flag. Debian #740275 + * pstree: by default doesn't show threadnames, use -t to show + as it disables compaction. SF [#33] Debian #815902 + * pstree: Removed need for PATH_MAX Debian #750405 + * pstree: ignores disappeared processes. SF [#34] + * killall: -o and -y work with -r flags. SF [#64] + * m4/gettext.m4: Upgrade to gettext-0.19.4. + * m4/iconv.m4: Upgrade to gettext-0.19.4. + * m4/lib-ld.m4: Upgrade to gettext-0.19.4. + * m4/lib-link.m4: Upgrade to gettext-0.19.4. + * m4/lib-prefix.m4: Upgrade to gettext-0.19.4. + * m4/nls.m4: Upgrade to gettext-0.19.4. + * m4/po.m4: Upgrade to gettext-0.19.4. + * m4/progtest.m4: Upgrade to gettext-0.19.4. + * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.19.4. +- Make it build, that is create a po/POTFILES.in +- Remove obsolete patches + * psmisc-22.21-boo908063.patch + * psmisc-22.12-tigetstr.patch + * psmisc-22.21-upstream.patch + * psmisc-git-3638cc55b4d08851faba46635d737b24d016665b.patch +- Rename patch psmisc-22.21.dif which becomes psmisc-23.0.dif +- Make /bin/fuser a symblic link of /usr/bin/fuser (boo#1029973) +- Last revision was 78 + +------------------------------------------------------------------- +Tue Jun 20 14:00:36 UTC 2017 - werner(a)suse.de + +- Modify psmisc-22.21.dif to enforce the usage of `m' flag in + sscanf() instead of `a' for allocation. Also avoid to small + buffers and include sys/sysmacros.h for makedev macro. +- Add the patch psmisc-22.21-lessnfs.patch to support device + files of mount points as well (boo#1044638) +- Add the patch psmisc-22.21-mntpt.patch to do strinfg comparision + only for NFS shares + +------------------------------------------------------------------- Old: ---- psmisc-22.12-tigetstr.patch psmisc-22.21-boo908063.patch psmisc-22.21-upstream.patch psmisc-22.21.dif psmisc-22.21.tar.gz psmisc-git-3638cc55b4d08851faba46635d737b24d016665b.patch New: ---- psmisc-22.21-lessnfs.patch psmisc-22.21-mntpt.patch psmisc-23.0.dif psmisc-23.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ psmisc.spec ++++++ --- /var/tmp/diff_new_pack.rGEaFI/_old 2017-06-24 08:34:11.978549399 +0200 +++ /var/tmp/diff_new_pack.rGEaFI/_new 2017-06-24 08:34:11.982548834 +0200 @@ -1,7 +1,7 @@ # # spec file for package psmisc # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,26 +19,26 @@ Name: psmisc BuildRequires: automake BuildRequires: gcc-c++ +BuildRequires: gettext-devel BuildRequires: glibc-devel BuildRequires: libselinux-devel BuildRequires: ncurses-devel -Url: http://sourceforge.net/projects/psmisc/ -Version: 22.21 +Url: https://gitlab.com/psmisc/psmisc/ +Version: 23.0 Release: 0 Provides: ps:/usr/bin/killall Recommends: %{name}-lang Summary: Utilities for managing processes on your system License: GPL-2.0+ Group: System/Monitoring -Source: http://sourceforge.net/projects/psmisc/files/psmisc/%{name}-%{version}.tar.… -Patch0: %name-22.21.dif -Patch1: %name-22.12-tigetstr.patch -Patch2: %name-22.21-pstree.patch -# PATCH-FIX-SUSE boo#boo908063 -- partly upstream already -Patch3: %name-22.21-boo908063.patch -Patch42: %{name}-22.21-upstream.patch -# PATCH-FIX-UPSTREAM psmisc-git-3638cc55b4d08851faba46635d737b24d016665b.patch bnc#874983 -Patch43: %{name}-git-3638cc55b4d08851faba46635d737b24d016665b.patch +%define hash 67b1da268f4c0ce6859980e3dfcfaec5b2448e80 +Source: https://gitlab.com/%{name}/%{name}/repository/archive.tar.bz2?ref=v%{versio… +Patch0: %{name}-%{version}.dif +Patch2: %{name}-22.21-pstree.patch +# PATCH-FIX-SUSE boo#908068 -- fuser -m not handling block devices properly +Patch4: %{name}-22.21-mntpt.patch +# PATCH-ADD-SUSE use string comparision only for nfs shares +Patch5: %{name}-22.21-lessnfs.patch %define have_peekfd %ix86 x86_64 ppc ppc64 ppc64le %arm mipsel m68k @@ -53,17 +53,21 @@ %lang_package %prep -%setup -q -%patch42 -p0 -b .up -%patch1 -p0 -b .tigetstr +ln -sf %{name}-v%{version}-%{hash} %{name}-%version +%setup -q -D -n %{name}-%version %patch2 -p0 -b .pstree -%patch3 -p0 -b .thread +%patch4 -p0 -b .mntpt +%patch5 -p0 -b .lessnfs %patch0 -p0 -b .0 -%patch43 -p1 -b .fuserfix %build +grep -h src/ po/*.po|\ + sed -r 's/^#: //'|\ + tr ' ' '\n'|\ + sort -t : -k1,1 -u|\ + sed -r 's/:[0-9]+$//' > po/POTFILES.in autoreconf -fi -CFLAGS="-D_GNU_SOURCE ${RPM_OPT_FLAGS} -pipe" +CFLAGS="-D_GNU_SOURCE -D_DEFAULT_SOURCE ${RPM_OPT_FLAGS} -pipe" CXXFLAGS="$CFLAGS" export CFLAGS CXXFLAGS %configure --disable-rpath \ @@ -74,22 +78,24 @@ make %{?_smp_mflags} CFLAGS="$CFLAGS" "CC=$CC" %install -make DESTDIR=$RPM_BUILD_ROOT install -mkdir -p $RPM_BUILD_ROOT/bin/ -mv $RPM_BUILD_ROOT/usr/bin/fuser $RPM_BUILD_ROOT/bin/ +make DESTDIR=%{buildroot} install +mkdir -p %{buildroot}/bin/ +ln -sf %{_bindir}/fuser %{buildroot}/bin/ %ifnarch %have_peekfd -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/peekfd.1* +rm -f %{buildroot}%{_mandir}/man1/peekfd.1* %endif %find_lang psmisc %files %defattr (-,root,root,755) /bin/fuser +%{_bindir}/fuser %{_bindir}/killall %ifarch %have_peekfd %{_bindir}/peekfd %endif %{_bindir}/prtstat +%{_bindir}/pslog %{_bindir}/pstree %{_bindir}/pstree.x11 %{_mandir}/man1/fuser.1* @@ -98,6 +104,7 @@ %{_mandir}/man1/peekfd.1* %endif %{_mandir}/man1/prtstat.1* +%{_mandir}/man1/pslog.1* %{_mandir}/man1/pstree.1* %files lang -f %{name}.lang ++++++ psmisc-22.21-lessnfs.patch ++++++ Use string comparision only if case of searching for NFS shares --- src/fuser.c | 29 +++++++++++++++++++++-------- src/fuser.h | 2 +- 2 files changed, 22 insertions(+), 9 deletions(-) --- src/fuser.c +++ src/fuser.c 2017-06-20 14:30:08.176217649 +0000 @@ -2007,6 +2007,7 @@ static void clear_mntinfo(void) static void init_mntinfo(void) { + char type[256]; char mpoint[PATH_MAX*4 + 1]; // octal escaping takes 4 chars per 1 char int mid, parid, max = 0; uint maj, min; @@ -2018,8 +2019,8 @@ static void init_mntinfo(void) if ((mnt = fopen("/proc/self/mountinfo", "r")) == (FILE *) 0) return; while (fscanf - (mnt, "%i %i %u:%u %*s %s %*[^\n]", &mid, &parid, &maj, &min, - &mpoint[0]) == 5) { + (mnt, "%i %i %u:%u %*s %s %*s %*s - %s %*[^\n]", + &mid, &parid, &maj, &min, &mpoint[0], &type[0]) == 6) { const size_t nlen = strlen(mpoint); mntinfo_t *restrict mnt; if (posix_memalign @@ -2038,6 +2039,9 @@ static void init_mntinfo(void) mnt->parid = parid; mnt->dev = makedev(maj, min); mnt->id = mid; + if (strncmp("nfs", type, 3) == 0) + mnt->nfs = 1; + else mnt->nfs = 0; if (mid > max) max = mid; } @@ -2105,16 +2109,25 @@ static int mntstat(const char *path, str if (nlen < mnt->nlen) continue; if (mnt->nlen == 1) { /* root fs is the last entry */ - buf->st_dev = mnt->dev; - buf->st_ino = 0; - return 0; + if (mnt->nfs) { + fprintf(stderr, "NFS %s\n", use); + buf->st_dev = mnt->dev; + buf->st_ino = 0; + return 0; + } + errno = 0; + return stat(path, buf); } if (use[mnt->nlen] != '\0' && use[mnt->nlen] != '/') continue; if (strncmp(use, mnt->mpoint, mnt->nlen) == 0) { - buf->st_dev = mnt->dev; - buf->st_ino = 0; - return 0; + if (mnt->nfs) { + buf->st_dev = mnt->dev; + buf->st_ino = 0; + return 0; + } + errno = 0; + return stat(path, buf); } } errno = ENOENT; --- src/fuser.h +++ src/fuser.h 2017-06-20 14:28:48.013689702 +0000 @@ -91,7 +91,7 @@ struct mount_list { # include "lists.h" typedef struct mntinfo_s { list_t this; - int id, parid; + int id, parid, nfs:1; dev_t dev; size_t nlen; char *mpoint; ++++++ psmisc-22.21-mntpt.patch ++++++ For bug boo#908068: fuser -m not handling block devices properly Avoid string comparision for device files --- src/fuser.c | 7 +++++++ 1 file changed, 7 insertions(+) --- src/fuser.c +++ src/fuser.c 2017-06-20 13:56:29.717283482 +0000 @@ -1915,6 +1915,13 @@ static int mntstat(const char *path, str errno = 0; return stat(path, buf); } + if (strncmp("/dev/", use, 5) == 0) { + /* + * Could be a special file (socket, pipe, inotify) + */ + errno = 0; + return stat(path, buf); + } nlen = strlen(use); list_for_each(ptr, &mntinfo) { ++++++ psmisc-22.21-pstree.patch ++++++ --- /var/tmp/diff_new_pack.rGEaFI/_old 2017-06-24 08:34:12.010544875 +0200 +++ /var/tmp/diff_new_pack.rGEaFI/_new 2017-06-24 08:34:12.010544875 +0200 @@ -1,6 +1,10 @@ +--- + src/pstree.c | 37 ++++++++++++++++++++++++++++++------- + 1 file changed, 30 insertions(+), 7 deletions(-) + --- src/pstree.c -+++ src/pstree.c 2014-03-24 15:54:58.905193559 +0000 -@@ -69,6 +69,7 @@ extern const char *__progname; ++++ src/pstree.c 2017-06-20 14:24:15.670691071 +0000 +@@ -70,6 +70,7 @@ extern const char *__progname; #define UTF_HD "\342\224\254" /* U+252C, Horizontal and down */ #define VT_BEG "\033(0\017" /* use graphic chars */ @@ -8,7 +12,7 @@ #define VT_END "\033(B" /* back to normal char set */ #define VT_V "x" /* see UTF definitions above */ #define VT_VR "t" -@@ -397,6 +398,27 @@ static void out_scontext(security_contex +@@ -450,6 +451,27 @@ static void out_scontext(security_contex out_string("'"); } @@ -36,7 +40,7 @@ static void out_newline(void) { if (last_char && cur_x == output_width) -@@ -605,11 +627,12 @@ dump_tree(PROC * current, int level, int +@@ -662,11 +684,12 @@ dump_tree(PROC * current, int level, int for (lvl = 0; lvl < level; lvl++) { for (i = width[lvl] + 1; i; i--) out_char(' '); @@ -54,7 +58,7 @@ } if (rep < 2) add = 0; -@@ -714,7 +737,7 @@ dump_tree(PROC * current, int level, int +@@ -773,7 +796,7 @@ dump_tree(PROC * current, int level, int } width[level] = comm_len + cur_x - offset + add; if (cur_x >= output_width && trunc) { @@ -63,7 +67,7 @@ out_string("+"); out_newline(); return; -@@ -736,7 +759,7 @@ dump_tree(PROC * current, int level, int +@@ -797,7 +820,7 @@ dump_tree(PROC * current, int level, int } } if (first) { ++++++ psmisc-22.21.dif -> psmisc-23.0.dif ++++++ --- /work/SRC/openSUSE:Factory/psmisc/psmisc-22.21.dif 2014-03-27 06:16:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.psmisc.new/psmisc-23.0.dif 2017-06-24 08:34:10.318784093 +0200 @@ -1,6 +1,12 @@ +--- + configure.ac | 4 ++-- + doc/Makefile.am | 2 +- + src/fuser.c | 13 ++++++++----- + 3 files changed, 11 insertions(+), 8 deletions(-) + --- configure.ac -+++ configure.ac 2010-10-15 09:00:33.000000000 +0000 -@@ -40,7 +40,7 @@ fi ++++ configure.ac 2017-06-20 14:31:15.914973762 +0000 +@@ -42,7 +42,7 @@ fi if test "$enable_timeout_stat" = "static"; then AC_DEFINE([WITH_TIMEOUT_STAT], [2], [Use timeout on stat calls]) fi @@ -9,7 +15,7 @@ # Use string search for network based file systems but only if the system # has /proc/self/mountinfo -@@ -121,7 +121,7 @@ AC_CHECK_MEMBERS([struct user_regs_struc +@@ -126,7 +126,7 @@ AC_CHECK_MEMBERS([struct user_regs_struc struct user_regs_struct.rdi, struct user_regs_struct.rsi, struct user_regs_struct.rdx], [],[], @@ -18,9 +24,18 @@ #include <sys/user.h>]) AC_CHECK_MEMBERS([struct pt_regs.orig_gpr3, struct pt_regs.gpr], [],[], [#include <linux/ptrace.h>]) +--- doc/Makefile.am ++++ doc/Makefile.am 2017-06-20 15:23:10.973015404 +0000 +@@ -1,5 +1,5 @@ + +-man_MANS = killall.1 peekfd.1 prtstat.1 pstree.1 ++man_MANS = killall.1 peekfd.1 prtstat.1 pstree.1 pslog.1 + EXTRA_MANS = + + if WANT_FUSER --- src/fuser.c -+++ src/fuser.c 2014-03-24 15:56:40.134235583 +0000 -@@ -901,6 +901,7 @@ int main(int argc, char *argv[]) ++++ src/fuser.c 2017-06-20 14:33:26.908568387 +0000 +@@ -1041,6 +1041,7 @@ int main(int argc, char *argv[]) struct option *optr; char *nsptr; int skip_argv; @@ -28,23 +43,23 @@ struct option options[] = { {"all", 0, NULL, 'a'}, -@@ -941,6 +942,7 @@ int main(int argc, char *argv[]) - fill_unix_cache(&unixsockets); +@@ -1084,6 +1085,7 @@ int main(int argc, char *argv[]) #endif + atexit(atexit_free_lists); + seen_file = 0; for (argc_cnt = 1; argc_cnt < argc; argc_cnt++) { current_argv = argv[argc_cnt]; if (current_argv[0] == '-') { /* its an option */ -@@ -1093,6 +1095,7 @@ int main(int argc, char *argv[]) +@@ -1234,6 +1236,7 @@ int main(int argc, char *argv[]) } } this_name->matched_procs = NULL; + seen_file = 1; if (opts & (OPT_MOUNTS | OPT_ISMOUNTPOINT) - && this_name->name_space != NAMESPACE_FILE) - usage(_ -@@ -1144,7 +1147,7 @@ int main(int argc, char *argv[]) + && this_name->name_space != NAMESPACE_FILE) { + free(this_name); +@@ -1287,7 +1290,7 @@ int main(int argc, char *argv[]) names_tail->next = this_name; names_tail = this_name; } /* for across the argvs */ @@ -53,3 +68,25 @@ usage(_("No process specification given")); /* Check if -M flag was used and if so check mounts */ +@@ -1551,17 +1554,17 @@ check_dir(const pid_t pid, const char *d + struct device_list *dev_tmp; + struct unixsocket_list *sock_tmp; + struct stat st, lst; +- char dirpath[MAX_PATHNAME]; +- char filepath[MAX_PATHNAME]; ++ char dirpath[PATH_MAX+1]; ++ char filepath[PATH_MAX+1]; + +- snprintf(dirpath, MAX_PATHNAME, "/proc/%d/%s", pid, dirname); ++ snprintf(dirpath, PATH_MAX , "/proc/%d/%s", pid, dirname); + if ((dirp = opendir(dirpath)) == NULL) + return; + while ((direntry = readdir(dirp)) != NULL) { + if (direntry->d_name[0] < '0' || direntry->d_name[0] > '9') + continue; + +- snprintf(filepath, MAX_PATHNAME, "/proc/%d/%s/%s", ++ snprintf(filepath, PATH_MAX, "/proc/%d/%s/%s", + pid, dirname, direntry->d_name); + + if (timeout(thestat, filepath, &st, 5) != 0) { ++++++ psmisc-22.21.tar.gz -> psmisc-23.0.tar.bz2 ++++++ ++++ 45564 lines of diff (skipped)

1 0

commit skelcd-control-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 24 Jun '17

24 Jun '17

Hello community, here is the log from the commit of package skelcd-control-openSUSE for openSUSE:Factory checked in at 2017-06-24 08:34:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/skelcd-control-openSUSE (Old) and /work/SRC/openSUSE:Factory/.skelcd-control-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "skelcd-control-openSUSE" Sat Jun 24 08:34:04 2017 rev:187 rq:505264 version:42.3.99.8 Changes: -------- --- /work/SRC/openSUSE:Factory/skelcd-control-openSUSE/skelcd-control-openSUSE-promo.changes 2017-06-07 13:09:12.676869445 +0200 +++ /work/SRC/openSUSE:Factory/.skelcd-control-openSUSE.new/skelcd-control-openSUSE-promo.changes 2017-06-24 08:34:08.243077602 +0200 @@ -1,0 +2,7 @@ +Tue Jun 20 15:44:27 UTC 2017 - cwh(a)suse.com + +- added yast2-s390 as a requirement for s390(x) as a Storage NG + requirement (fate#318196) +- 42.3.99.8 + +------------------------------------------------------------------- skelcd-control-openSUSE.changes: same change Old: ---- skelcd-control-openSUSE-42.3.99.7.tar.bz2 New: ---- skelcd-control-openSUSE-42.3.99.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-control-openSUSE-promo.spec ++++++ --- /var/tmp/diff_new_pack.K3wLbz/_old 2017-06-24 08:34:08.779001821 +0200 +++ /var/tmp/diff_new_pack.K3wLbz/_new 2017-06-24 08:34:08.779001821 +0200 @@ -27,7 +27,7 @@ # ###################################################################### Name: skelcd-control-openSUSE-promo -Version: 42.3.99.7 +Version: 42.3.99.8 Release: 0 Summary: The openSUSE Installation Control file License: MIT @@ -83,6 +83,7 @@ # Architecture specific packages %ifarch s390 s390x Requires: yast2-reipl >= 3.1.4 +Requires: yast2-s390 %endif %ifarch %ix86 x86_64 skelcd-control-openSUSE.spec: same change ++++++ skelcd-control-openSUSE-42.3.99.7.tar.bz2 -> skelcd-control-openSUSE-42.3.99.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-openSUSE-42.3.99.7/package/skelcd-control-openSUSE.changes new/skelcd-control-openSUSE-42.3.99.8/package/skelcd-control-openSUSE.changes --- old/skelcd-control-openSUSE-42.3.99.7/package/skelcd-control-openSUSE.changes 2017-06-07 10:27:29.583651448 +0200 +++ new/skelcd-control-openSUSE-42.3.99.8/package/skelcd-control-openSUSE.changes 2017-06-21 12:49:45.743439349 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jun 20 15:44:27 UTC 2017 - cwh(a)suse.com + +- added yast2-s390 as a requirement for s390(x) as a Storage NG + requirement (fate#318196) +- 42.3.99.8 + +------------------------------------------------------------------- Wed Jun 7 07:22:12 UTC 2017 - mfilka(a)suse.com - bnc#1042482 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-openSUSE-42.3.99.7/package/skelcd-control-openSUSE.spec new/skelcd-control-openSUSE-42.3.99.8/package/skelcd-control-openSUSE.spec --- old/skelcd-control-openSUSE-42.3.99.7/package/skelcd-control-openSUSE.spec 2017-06-07 10:27:29.583651448 +0200 +++ new/skelcd-control-openSUSE-42.3.99.8/package/skelcd-control-openSUSE.spec 2017-06-21 12:49:45.743439349 +0200 @@ -27,7 +27,7 @@ # ###################################################################### Name: skelcd-control-openSUSE -Version: 42.3.99.7 +Version: 42.3.99.8 Release: 0 Summary: The openSUSE Installation Control file License: MIT @@ -83,6 +83,7 @@ # Architecture specific packages %ifarch s390 s390x Requires: yast2-reipl >= 3.1.4 +Requires: yast2-s390 %endif %ifarch %ix86 x86_64

1 0

commit libapr-util1 for openSUSE:Factory
by root＠hilbert.suse.de 24 Jun '17

24 Jun '17

Hello community, here is the log from the commit of package libapr-util1 for openSUSE:Factory checked in at 2017-06-24 08:33:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libapr-util1 (Old) and /work/SRC/openSUSE:Factory/.libapr-util1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libapr-util1" Sat Jun 24 08:33:56 2017 rev:48 rq:505151 version:1.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libapr-util1/libapr-util1.changes 2016-04-30 23:23:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libapr-util1.new/libapr-util1.changes 2017-06-24 08:34:05.663442367 +0200 @@ -1,0 +2,12 @@ +Mon Jun 19 15:46:13 UTC 2017 - crrodriguez(a)opensuse.org + +- APR-util 1.6.0 +* Update MySQL build to stop using libmysqlclient_r +* apr_siphash: Implement keyed hash function SipHash +* apr_buckets: Add apr_bucket_file_set_buf_size() +* apr_crypto: avoid excessive iteration in bcrypt hash. +* apr_xml_to_text: Add style APR_XML_X2T_PARSED. +* see http://www.apache.org/dist/apr/CHANGES-APR-UTIL-1.6 for + extra details + +------------------------------------------------------------------- Old: ---- apr-util-1.5.4.tar.bz2 New: ---- apr-util-1.6.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libapr-util1.spec ++++++ --- /var/tmp/diff_new_pack.HsiNLj/_old 2017-06-24 08:34:07.163230295 +0200 +++ /var/tmp/diff_new_pack.HsiNLj/_new 2017-06-24 08:34:07.167229729 +0200 @@ -1,7 +1,7 @@ # # spec file for package libapr-util1 # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ %define dso_libdir %{_libdir}/apr-util-%{apuver} %define includedir %{_includedir}/apr-%{apuver} Name: libapr-util1 -Version: 1.5.4 +Version: 1.6.0 Release: 0 Summary: Apache Portable Runtime (APR) Library License: Apache-2.0 @@ -51,10 +51,10 @@ %package devel Summary: Apache Portable Runtime (APR) Library -License: Apache-2.0 -Group: Development/Libraries/Other # apu-config returns -lldap -lber -ldb-<dbversion> -lexpat # until this is fixed the devel package should require those +License: Apache-2.0 +Group: Development/Libraries/Other Requires: %{name} = %{version} Requires: db-devel Requires: libapr1-devel ++++++ apr-util-1.5.4.tar.bz2 -> apr-util-1.6.0.tar.bz2 ++++++ ++++ 89775 lines of diff (skipped)

1 0

commit patterns-desktop for openSUSE:Factory
by root＠hilbert.suse.de 24 Jun '17

24 Jun '17

Hello community, here is the log from the commit of package patterns-desktop for openSUSE:Factory checked in at 2017-06-24 08:33:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/patterns-desktop (Old) and /work/SRC/openSUSE:Factory/.patterns-desktop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patterns-desktop" Sat Jun 24 08:33:51 2017 rev:4 rq:504993 version:20170319 Changes: -------- --- /work/SRC/openSUSE:Factory/patterns-desktop/patterns-desktop.changes 2017-06-02 10:33:10.845190052 +0200 +++ /work/SRC/openSUSE:Factory/.patterns-desktop.new/patterns-desktop.changes 2017-06-24 08:34:04.583595060 +0200 @@ -1,0 +2,5 @@ +Tue Jun 20 07:45:37 UTC 2017 - mlin(a)suse.com + +- Do not require basesystem but base. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patterns-desktop.spec ++++++ --- /var/tmp/diff_new_pack.pRecD2/_old 2017-06-24 08:34:05.023532852 +0200 +++ /var/tmp/diff_new_pack.pRecD2/_new 2017-06-24 08:34:05.027532286 +0200 @@ -165,12 +165,12 @@ %pattern_basetechnologies Summary: Laptop Group: Metapackages +Provides: patterns-openSUSE-laptop = %{version} Provides: pattern() = laptop Provides: pattern-icon() = yast-bluetooth Provides: pattern-order() = 1200 Provides: pattern-visible() -Requires: pattern() = basesystem -Provides: patterns-openSUSE-laptop = %{version} +Requires: pattern() = base Obsoletes: patterns-openSUSE-laptop < %{version} Recommends: pcmciautils

1 0

commit yast2-bootloader for openSUSE:Factory
by root＠hilbert.suse.de 24 Jun '17

24 Jun '17

Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2017-06-24 08:33:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-bootloader" Sat Jun 24 08:33:28 2017 rev:248 rq:505833 version:3.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2017-06-17 10:18:18.399384381 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2017-06-24 08:33:29.932494796 +0200 @@ -1,0 +2,8 @@ +Fri Jun 23 09:14:05 CEST 2017 - schubi(a)suse.de + +- AuotYaST configuration: Set StorageDevices flag disks_valid + to true. So libstorage can scan valid disks and "/" partition + can be found. (bnc#1043132) +- 3.3.0 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-3.2.22.tar.bz2 New: ---- yast2-bootloader-3.3.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.m7oghD/_old 2017-06-24 08:33:30.516412229 +0200 +++ /var/tmp/diff_new_pack.m7oghD/_new 2017-06-24 08:33:30.520411663 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.2.22 +Version: 3.3.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-3.2.22.tar.bz2 -> yast2-bootloader-3.3.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.2.22/package/yast2-bootloader.changes new/yast2-bootloader-3.3.0/package/yast2-bootloader.changes --- old/yast2-bootloader-3.2.22/package/yast2-bootloader.changes 2017-06-15 08:56:02.918822057 +0200 +++ new/yast2-bootloader-3.3.0/package/yast2-bootloader.changes 2017-06-23 09:31:14.505722806 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Jun 23 09:14:05 CEST 2017 - schubi(a)suse.de + +- AuotYaST configuration: Set StorageDevices flag disks_valid + to true. So libstorage can scan valid disks and "/" partition + can be found. (bnc#1043132) +- 3.3.0 + +------------------------------------------------------------------- Wed Jun 14 14:54:38 UTC 2017 - jreidinger(a)suse.com - Use udev device for prep partition if it is available diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.2.22/package/yast2-bootloader.spec new/yast2-bootloader-3.3.0/package/yast2-bootloader.spec --- old/yast2-bootloader-3.2.22/package/yast2-bootloader.spec 2017-06-15 08:56:02.918822057 +0200 +++ new/yast2-bootloader-3.3.0/package/yast2-bootloader.spec 2017-06-23 09:31:14.505722806 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.2.22 +Version: 3.3.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.2.22/src/modules/BootStorage.rb new/yast2-bootloader-3.3.0/src/modules/BootStorage.rb --- old/yast2-bootloader-3.2.22/src/modules/BootStorage.rb 2017-06-15 08:56:03.198822057 +0200 +++ new/yast2-bootloader-3.3.0/src/modules/BootStorage.rb 2017-06-23 09:31:14.637722806 +0200 @@ -192,8 +192,10 @@ if Mode.config Mode.SetMode("normal") log.info "Initialize libstorage in readonly mode" # bnc#942360 + # Set StorageDevices flag disks_valid to true. So InitLibstorage + # can scan valid disks. (bnc#1043132) + StorageDevices.InitDone Storage.InitLibstorage(true) - StorageDevices.InitDone # Set StorageDevices flag disks_valid to true end # The AutoYaST config mode does access to the system.

1 0

commit yast2 for openSUSE:Factory
by root＠hilbert.suse.de 24 Jun '17

24 Jun '17

Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2017-06-24 08:33:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2" Sat Jun 24 08:33:23 2017 rev:404 rq:505698 version:3.2.39 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2017-06-20 09:32:37.381824443 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2017-06-24 08:33:25.133173431 +0200 @@ -1,0 +2,6 @@ +Thu Jun 22 11:27:46 UTC 2017 - jreidinger(a)suse.com + +- Add hint for UI about application name and its icon (bsc#1037891) +- 3.2.39 + +------------------------------------------------------------------- Old: ---- yast2-3.2.38.tar.bz2 New: ---- yast2-3.2.39.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.kR4AQy/_old 2017-06-24 08:33:25.721090298 +0200 +++ /var/tmp/diff_new_pack.kR4AQy/_new 2017-06-24 08:33:25.721090298 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.2.38 +Version: 3.2.39 Release: 0 Summary: YaST2 - Main Package License: GPL-2.0 ++++++ yast2-3.2.38.tar.bz2 -> yast2-3.2.39.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.2.38/package/yast2.changes new/yast2-3.2.39/package/yast2.changes --- old/yast2-3.2.38/package/yast2.changes 2017-06-16 15:53:41.986328511 +0200 +++ new/yast2-3.2.39/package/yast2.changes 2017-06-22 16:34:32.606119103 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jun 22 11:27:46 UTC 2017 - jreidinger(a)suse.com + +- Add hint for UI about application name and its icon (bsc#1037891) +- 3.2.39 + +------------------------------------------------------------------- Tue Jun 6 10:33:22 UTC 2017 - jreidinger(a)suse.com - Fix showing help text when CWM::ReplacePoint contains another diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.2.38/package/yast2.spec new/yast2-3.2.39/package/yast2.spec --- old/yast2-3.2.38/package/yast2.spec 2017-06-16 15:53:41.986328511 +0200 +++ new/yast2-3.2.39/package/yast2.spec 2017-06-22 16:34:32.606119103 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.2.38 +Version: 3.2.39 Release: 0 Summary: YaST2 - Main Package License: GPL-2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.2.38/scripts/yast2 new/yast2-3.2.39/scripts/yast2 --- old/yast2-3.2.38/scripts/yast2 2017-06-16 15:53:41.986328511 +0200 +++ new/yast2-3.2.39/scripts/yast2 2017-06-22 16:34:32.610119103 +0200 @@ -67,7 +67,8 @@ # --fullscreen # --noborder # well also for gtk and ncurses -Y2UI_ARGS="" +# add hints for ui about app name and icon +Y2UI_ARGS="-name YaST2 -icon yast" GNOME_SHELL="$ybindir/y2controlcenter-gnome" KDE_SHELL="$ybindir/y2controlcenter"

1 0

commit yast2-kdump for openSUSE:Factory
by root＠hilbert.suse.de 24 Jun '17

24 Jun '17

Hello community, here is the log from the commit of package yast2-kdump for openSUSE:Factory checked in at 2017-06-24 08:33:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-kdump (Old) and /work/SRC/openSUSE:Factory/.yast2-kdump.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-kdump" Sat Jun 24 08:33:17 2017 rev:83 rq:505690 version:3.2.6 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-kdump/yast2-kdump.changes 2017-06-22 10:35:36.742060583 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-kdump.new/yast2-kdump.changes 2017-06-24 08:33:20.013897308 +0200 @@ -1,0 +2,7 @@ +Wed Jun 21 09:10:56 UTC 2017 - gsouza(a)suse.com + +- Fixed regular expression that verifies alloc_mem parameter + (bsc#1045098). +- 3.2.6 + +------------------------------------------------------------------- Old: ---- yast2-kdump-3.2.5.tar.bz2 New: ---- yast2-kdump-3.2.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-kdump.spec ++++++ --- /var/tmp/diff_new_pack.4farrv/_old 2017-06-24 08:33:20.793787030 +0200 +++ /var/tmp/diff_new_pack.4farrv/_new 2017-06-24 08:33:20.793787030 +0200 @@ -17,7 +17,7 @@ Name: yast2-kdump -Version: 3.2.5 +Version: 3.2.6 Release: 0 Summary: Configuration of kdump License: GPL-2.0 ++++++ yast2-kdump-3.2.5.tar.bz2 -> yast2-kdump-3.2.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kdump-3.2.5/package/yast2-kdump.changes new/yast2-kdump-3.2.6/package/yast2-kdump.changes --- old/yast2-kdump-3.2.5/package/yast2-kdump.changes 2017-06-20 16:35:47.736649735 +0200 +++ new/yast2-kdump-3.2.6/package/yast2-kdump.changes 2017-06-22 15:29:27.273595575 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jun 21 09:10:56 UTC 2017 - gsouza(a)suse.com + +- Fixed regular expression that verifies alloc_mem parameter + (bsc#1045098). +- 3.2.6 + +------------------------------------------------------------------- Tue Jun 20 12:19:21 UTC 2017 - gsouza(a)suse.com - The alloc_mem parameter is verified to be in accordance with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kdump-3.2.5/package/yast2-kdump.spec new/yast2-kdump-3.2.6/package/yast2-kdump.spec --- old/yast2-kdump-3.2.5/package/yast2-kdump.spec 2017-06-20 16:35:47.736649735 +0200 +++ new/yast2-kdump-3.2.6/package/yast2-kdump.spec 2017-06-22 15:29:27.273595575 +0200 @@ -17,7 +17,7 @@ Name: yast2-kdump -Version: 3.2.5 +Version: 3.2.6 Release: 0 Summary: Configuration of kdump License: GPL-2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kdump-3.2.5/src/clients/kdump.rb new/yast2-kdump-3.2.6/src/clients/kdump.rb --- old/yast2-kdump-3.2.5/src/clients/kdump.rb 2017-06-20 16:35:47.736649735 +0200 +++ new/yast2-kdump-3.2.6/src/clients/kdump.rb 2017-06-22 15:29:27.273595575 +0200 @@ -735,20 +735,20 @@ # Only numbers are allowed as allow_mem_high and allow_mem_low values - ALLOC_MEM_REGEXP = /\D/ + ALLOC_MEM_REGEXP = /\A\d+\z/ def cmdKdumpStartup(options) options = deep_copy(options) if Ops.get(options, "enable") != nil && Ops.get(options, "alloc_mem") != nil - Kdump.add_crashkernel_param = true alloc_mem_low, alloc_mem_high = options["alloc_mem"].split(',') - Kdump.allocated_memory = { low: alloc_mem_low, high: alloc_mem_high } unless alloc_mem_low =~ ALLOC_MEM_REGEXP && (alloc_mem_high.nil? || alloc_mem_high =~ ALLOC_MEM_REGEXP) - CommandLine.Error(_("Invalid allocation memory parameter")) + CommandLine.Error(_("alloc_mem parameter used with invalid values")) return false end + Kdump.add_crashkernel_param = true + Kdump.allocated_memory = { low: alloc_mem_low, high: alloc_mem_high } #TRANSLATORS: CommandLine printed text if Kdump.crashkernel_list_ranges CommandLine.Print( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kdump-3.2.5/test/client_test.rb new/yast2-kdump-3.2.6/test/client_test.rb --- old/yast2-kdump-3.2.5/test/client_test.rb 2017-06-20 16:35:47.760649735 +0200 +++ new/yast2-kdump-3.2.6/test/client_test.rb 2017-06-22 15:29:27.277595575 +0200 @@ -1,12 +1,21 @@ require_relative "./test_helper" require_relative "../src/clients/kdump" +Yast.import "CommandLine" describe Yast::KdumpClient do describe ".cmdKdumpStartup" do let(:alloc_mem_high) {"100"} let(:alloc_mem_low) {"50"} - + + context "When using wrong inputs in alloc memory" do + let(:options) {{"enable"=>"", "alloc_mem"=>"#{alloc_mem_low}:#{alloc_mem_high}"}} + + it "does not enable kdump and returns false" do + expect(subject.cmdKdumpStartup(options)).to be false + end + end + context "When using alloc memory high and low" do let(:options) {{"enable"=>"", "alloc_mem"=>"#{alloc_mem_low},#{alloc_mem_high}"}} @@ -17,7 +26,7 @@ expect(Yast::Kdump.add_crashkernel_param).to be true end end - + context "when using only alloc memory low" do let(:options) {{"enable"=>"", "alloc_mem"=>"#{alloc_mem_low}"}}

1 0