June 2016 - openSUSE Commits - openSUSE Mailing Lists

commit modem-manager-gui for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package modem-manager-gui for openSUSE:Factory checked in at 2016-06-29 15:09:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/modem-manager-gui (Old) and /work/SRC/openSUSE:Factory/.modem-manager-gui.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "modem-manager-gui" Changes: -------- --- /work/SRC/openSUSE:Factory/modem-manager-gui/modem-manager-gui.changes 2015-11-24 22:33:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.modem-manager-gui.new/modem-manager-gui.changes 2016-06-29 15:09:51.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Jun 22 15:12:13 UTC 2016 - dap.darkness(a)gmail.com + +- Reverted previous commit. It was wrong. + +------------------------------------------------------------------- +Sun Jun 19 19:45:11 UTC 2016 - dap.darkness(a)gmail.com + +- Let's conflict with evolution-data-server >= 3.16 to finally + resolve bnc#985560 & bnc#927724. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ modem-manager-gui.spec ++++++ --- /var/tmp/diff_new_pack.X6lH3C/_old 2016-06-29 15:09:51.000000000 +0200 +++ /var/tmp/diff_new_pack.X6lH3C/_new 2016-06-29 15:09:51.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package modem-manager-gui # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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

1 0

commit duplicity for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package duplicity for openSUSE:Factory checked in at 2016-06-29 15:09:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/duplicity (Old) and /work/SRC/openSUSE:Factory/.duplicity.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "duplicity" Changes: -------- --- /work/SRC/openSUSE:Factory/duplicity/duplicity.changes 2015-12-17 15:52:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.duplicity.new/duplicity.changes 2016-06-29 15:09:46.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Jun 15 05:29:10 UTC 2016 - wr(a)rosenauer.org + +- update to 0.7.07.1 + * upgrade dropbox backend: update to SDK v2, use chunked upload + * added --ssl-cacert-path parameter + * Backend for https://www.mediafire.com + (Requires https://pypi.python.org/pypi/mediafire/ installed) + * support GSSAPI authentication in webdav backend + * further bugfixes as outlined here + http://duplicity.nongnu.org/CHANGELOG + +------------------------------------------------------------------- Old: ---- duplicity-0.7.06.tar.gz New: ---- duplicity-0.7.07.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ duplicity.spec ++++++ --- /var/tmp/diff_new_pack.xvLsnK/_old 2016-06-29 15:09:47.000000000 +0200 +++ /var/tmp/diff_new_pack.xvLsnK/_new 2016-06-29 15:09:47.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package duplicity # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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,7 +19,7 @@ %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Name: duplicity -Version: 0.7.06 +Version: 0.7.07.1 Release: 0 Summary: Encrypted bandwidth-efficient backup using the rsync algorithm License: GPL-3.0+ ++++++ duplicity-0.7.06.tar.gz -> duplicity-0.7.07.1.tar.gz ++++++ ++++ 84041 lines of diff (skipped)

1 0

commit glslang for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package glslang for openSUSE:Factory checked in at 2016-06-29 15:09:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glslang (Old) and /work/SRC/openSUSE:Factory/.glslang.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "glslang" Changes: -------- --- /work/SRC/openSUSE:Factory/glslang/glslang.changes 2016-05-13 09:23:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.glslang.new/glslang.changes 2016-06-29 15:09:39.000000000 +0200 @@ -1,0 +2,28 @@ +Sun Jun 12 14:06:11 UTC 2016 - jengelh(a)inai.de + +- Update to 2.3g537 +* HLSL: Implement proper nesting of symbol-table scopes and + identifier searching. +* HLSL: Add all int/float/bool/uint matrix types, void for + functions, and a few others. +* Types: Add an isOpaque() helper +* remapper: do not eliminate interface variables in dce by default +* Initial implementation of direct-mapped subset of HLSL intrinsics + with type subset. +* SPV: Don't shadow sampler parameters when performing function calls +* Check for linking multiple ES shaders to the same stage +* Vulkan: Finish semantics for what creates spec-const-semantics. +* HLSL: Add more matrix types to the grammar. +* Full stack: distinguish between a scalar and a vector of size 1. +* SPV: Don't emit memory barrier for ESSL barrier(), but still do + for GLSL barrier(). +* Add support for querying vertex attributes in reflection API +* SPV: Don't add clip/cull distance capabilities unless used. +* Tests: Add a set of gtest-file-based HLSL tests. +* SPV: Handle matrix's OpFConvert vector by vector. +* HLSL: Add function call syntax and AST building. +* SPV: Add capability ImageGatherExtended if necessary. +* SPIR-V do not decorate: members of plain structs with location; + non-top level members with interp. + +------------------------------------------------------------------- Old: ---- glslang-2.3.g401.tar.xz New: ---- glslang-2.3.g537.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glslang.spec ++++++ --- /var/tmp/diff_new_pack.l57ke6/_old 2016-06-29 15:09:40.000000000 +0200 +++ /var/tmp/diff_new_pack.l57ke6/_new 2016-06-29 15:09:40.000000000 +0200 @@ -16,10 +16,10 @@ # -%define version_unconverted 2.3.g401 +%define version_unconverted 2.3.g537 Name: glslang -Version: 2.3.g401 +Version: 2.3.g537 Release: 0 Summary: OpenGL and OpenGL ES shader front end and validator License: BSD-3-Clause ++++++ glslang-2.3.g401.tar.xz -> glslang-2.3.g537.tar.xz ++++++ ++++ 23629 lines of diff (skipped)

1 0

commit php5 for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package php5 for openSUSE:Factory checked in at 2016-06-29 15:09:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5 (Old) and /work/SRC/openSUSE:Factory/.php5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5" Changes: -------- --- /work/SRC/openSUSE:Factory/php5/php5.changes 2016-06-05 14:18:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.php5.new/php5.changes 2016-06-29 15:09:32.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Jun 28 09:06:36 UTC 2016 - pgajdos(a)suse.com + +- updated to 5.6.23: Several bugs were fixed in this release, + including security-related ones. + +------------------------------------------------------------------- +Mon Jun 20 11:40:13 UTC 2016 - pgajdos(a)suse.com + +- systemd unit: remove syslog.target from After [bsc#983938] + +------------------------------------------------------------------- Old: ---- php-5.6.22.tar.xz php-5.6.22.tar.xz.asc New: ---- php-5.6.23.tar.xz php-5.6.23.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.BlEdmm/_old 2016-06-29 15:09:33.000000000 +0200 +++ /var/tmp/diff_new_pack.BlEdmm/_new 2016-06-29 15:09:33.000000000 +0200 @@ -46,7 +46,7 @@ %define need_libxml2_hack %(if [ -e %{_includedir}/libxml/parser.h ]; then if grep -q XML_PARSE_OLDSAX %{_includedir}/libxml/parser.h; then echo 1; else echo 0; fi; else echo 0; fi) Name: php5 -Version: 5.6.22 +Version: 5.6.23 Release: 0 Summary: PHP5 Core Files License: PHP-3.01 @@ -76,11 +76,11 @@ Patch7: php5-systzdata-r12.patch Patch8: php5-systemd-unit.patch Patch9: php5-depdb-path.patch +Patch10: php5-mbstring-missing-return.patch ## Bugfix patches # this is from https://raw.github.com/NewEraCracker/suhosin-patches/, check for official # one from suhosin git -Patch10: php5-mbstring-missing-return.patch Patch11: php5-BNC-457056.patch Patch12: php5-cloexec.patch Patch13: php5-missing-extdeps.patch @@ -1017,7 +1017,7 @@ %patch5 %patch6 %patch7 -%patch8 +%patch8 -p1 %patch10 %if %{need_libxml2_hack} echo "*** APPLY LIBXML2.7 FIX ***" ++++++ build-test.sh ++++++ --- /var/tmp/diff_new_pack.BlEdmm/_old 2016-06-29 15:09:34.000000000 +0200 +++ /var/tmp/diff_new_pack.BlEdmm/_new 2016-06-29 15:09:34.000000000 +0200 @@ -28,7 +28,7 @@ if [ ! -z "$apiurl" ]; then apiurl="-A $apiurl" fi -osc $apiurl build $@ --no-verify --with make_test php5.spec +osc $apiurl build $@ --no-verify --with make_test -x valgrind php5.spec if [ $? -ne 0 ]; then echo "ERROR: build failed. See $OSC_BUILD_ROOT/.build.log for details." exit 1 ++++++ php-5.6.22.tar.xz -> php-5.6.23.tar.xz ++++++ /work/SRC/openSUSE:Factory/php5/php-5.6.22.tar.xz /work/SRC/openSUSE:Factory/.php5.new/php-5.6.23.tar.xz differ: char 41, line 2 ++++++ php5-mbstring-missing-return.patch ++++++ --- /var/tmp/diff_new_pack.BlEdmm/_old 2016-06-29 15:09:34.000000000 +0200 +++ /var/tmp/diff_new_pack.BlEdmm/_new 2016-06-29 15:09:34.000000000 +0200 @@ -1,16 +1,3 @@ -Index: ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c -=================================================================== ---- ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c.orig 2013-09-18 07:48:57.000000000 +0200 -+++ ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c 2013-09-25 11:59:19.925758346 +0200 -@@ -672,6 +672,8 @@ - CK(mbfl_filt_conv_illegal_output(c, filter)); - } - } -+ -+ return c; - } - - int Index: ext/mbstring/libmbfl/filters/mbfilter_utf8.c =================================================================== --- ext/mbstring/libmbfl/filters/mbfilter_utf8.c.orig 2013-09-18 07:48:57.000000000 +0200 ++++++ php5-systemd-unit.patch ++++++ --- /var/tmp/diff_new_pack.BlEdmm/_old 2016-06-29 15:09:34.000000000 +0200 +++ /var/tmp/diff_new_pack.BlEdmm/_new 2016-06-29 15:09:34.000000000 +0200 @@ -1,9 +1,12 @@ ---- sapi/fpm/php-fpm.service.in.orig -+++ sapi/fpm/php-fpm.service.in +Index: php-5.6.22/sapi/fpm/php-fpm.service.in +=================================================================== +--- php-5.6.22.orig/sapi/fpm/php-fpm.service.in 2016-05-26 03:08:57.000000000 +0200 ++++ php-5.6.22/sapi/fpm/php-fpm.service.in 2016-06-20 13:39:39.790849850 +0200 @@ -1,12 +1,15 @@ [Unit] Description=The PHP FastCGI Process Manager - After=syslog.target network.target +-After=syslog.target network.target ++After=network.target +Before=apache2.service nginx.service lighttpd.service [Service]

1 0

commit libreoffice for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2016-06-29 15:09:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libreoffice" Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2016-06-14 23:06:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2016-06-29 15:09:18.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Jun 24 19:44:10 UTC 2016 - tchvatal(a)suse.com + +- Version update to 5.2.0.1: + * Various bugfixes for the rc1 candidate + +------------------------------------------------------------------- +Fri Jun 17 17:25:11 UTC 2016 - tchvatal(a)suse.com + +- Reduce constraints based on resource usage reported by OBS + +------------------------------------------------------------------- Old: ---- libreoffice-5.2.0.0.beta2.tar.xz libreoffice-help-5.2.0.0.beta2.tar.xz libreoffice-translations-5.2.0.0.beta2.tar.xz New: ---- libreoffice-5.2.0.1.tar.xz libreoffice-help-5.2.0.1.tar.xz libreoffice-translations-5.2.0.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.sIcTtQ/_old 2016-06-29 15:09:28.000000000 +0200 +++ /var/tmp/diff_new_pack.sIcTtQ/_new 2016-06-29 15:09:28.000000000 +0200 @@ -30,7 +30,7 @@ %bcond_with kdeintegration %endif Name: libreoffice -Version: 5.2.0.0.beta2 +Version: 5.2.0.1 Release: 0 Summary: A Free Office Suite (Framework) License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.sIcTtQ/_old 2016-06-29 15:09:28.000000000 +0200 +++ /var/tmp/diff_new_pack.sIcTtQ/_new 2016-06-29 15:09:28.000000000 +0200 @@ -9,7 +9,7 @@ <size unit="M">2000</size> </physicalmemory> <disk> - <size unit="G">30</size> + <size unit="G">15</size> </disk> </hardware> </overwrite> @@ -22,10 +22,10 @@ </conditions> <hardware> <physicalmemory> - <size unit="M">6000</size> + <size unit="M">4000</size> </physicalmemory> <disk> - <size unit="G">30</size> + <size unit="G">15</size> </disk> </hardware> </overwrite> ++++++ libreoffice-5.2.0.0.beta2.tar.xz -> libreoffice-5.2.0.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-5.2.0.0.beta2.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-5.2.0.1.tar.xz differ: char 26, line 1 ++++++ libreoffice-help-5.2.0.0.beta2.tar.xz -> libreoffice-help-5.2.0.1.tar.xz ++++++ ++++ 3925 lines of diff (skipped) ++++++ libreoffice-translations-5.2.0.0.beta2.tar.xz -> libreoffice-translations-5.2.0.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-5.2.0.0.beta2.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-translations-5.2.0.1.tar.xz differ: char 26, line 1

1 0

commit python3-setuptools for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package python3-setuptools for openSUSE:Factory checked in at 2016-06-29 15:09:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-setuptools (Old) and /work/SRC/openSUSE:Factory/.python3-setuptools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-setuptools" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-setuptools/python3-setuptools.changes 2016-06-03 16:34:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3-setuptools.new/python3-setuptools.changes 2016-06-29 15:09:05.000000000 +0200 @@ -1,0 +2,44 @@ +Fri Jun 24 16:38:56 UTC 2016 - arun(a)gmx.de + +- update to version 23.1.0: + * #619: Deprecated tag_svn_revision distribution option. + +------------------------------------------------------------------- +Sat Jun 18 15:08:45 UTC 2016 - arun(a)gmx.de + +- update to version 23.0.0: + * #611: Removed ARM executables for CLI and GUI script launchers on + Windows. If this was a feature you cared about, please comment in + the ticket. + * #604: Removed docs building support. The project now relies on + documentation hosted at https://setuptools.readthedocs.io/. + +- changes from version 22.0.5: + * #604: Restore repository for upload_docs command to restore + publishing of docs during release. + +- changes from version 22.0.4: + * #589: Upload releases to pypi.io using the upload hostname and + legacy path. + +- changes from version 22.0.3: + * #589: Releases are now uploaded to pypi.io (Warehouse) even when + releases are made on Twine via Travis. + +- changes from version 22.0.2: + * #589: Releases are now uploaded to pypi.io (Warehouse). + +- changes from version 22.0.1: + * #190: On Python 2, if unicode is passed for packages to build_py + command, it will be handled just as with text on Python 3. + +- changes from version 22.0.0: + * Intended to be v21.3.0, but jaraco accidentally released as a + major bump. + * #598: Setuptools now lists itself first in the User-Agent for web + requests, better following the guidelines in RFC 7231. + +- changes from version 21.2.2: + * Minor fixes to changelog and docs. + +------------------------------------------------------------------- Old: ---- setuptools-21.2.1.tar.gz New: ---- setuptools-23.1.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-setuptools.spec ++++++ --- /var/tmp/diff_new_pack.6Eokw4/_old 2016-06-29 15:09:06.000000000 +0200 +++ /var/tmp/diff_new_pack.6Eokw4/_new 2016-06-29 15:09:06.000000000 +0200 @@ -17,7 +17,7 @@ Name: python3-setuptools -Version: 21.2.1 +Version: 23.1.0 Release: 0 Url: http://pypi.python.org/pypi/setuptools Summary: Easily download, build, install, upgrade, and uninstall Python packages ++++++ setuptools-21.2.1.tar.gz -> setuptools-23.1.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-21.2.1/CHANGES.rst new/setuptools-23.1.0/CHANGES.rst --- old/setuptools-21.2.1/CHANGES.rst 2016-05-22 22:12:04.000000000 +0200 +++ new/setuptools-23.1.0/CHANGES.rst 2016-06-24 16:22:31.000000000 +0200 @@ -2,6 +2,68 @@ CHANGES ======= +v23.1.0 +------- + +* #619: Deprecated ``tag_svn_revision`` distribution + option. + +v23.0.0 +------- + +* #611: Removed ARM executables for CLI and GUI script + launchers on Windows. If this was a feature you cared + about, please comment in the ticket. +* #604: Removed docs building support. The project + now relies on documentation hosted at + https://setuptools.readthedocs.io/. + +v22.0.5 +------- + +* #604: Restore repository for upload_docs command + to restore publishing of docs during release. + +v22.0.4 +------- + +* #589: Upload releases to pypi.io using the upload + hostname and legacy path. + +v22.0.3 +------- + +* #589: Releases are now uploaded to pypi.io (Warehouse) + even when releases are made on Twine via Travis. + +v22.0.2 +------- + +* #589: Releases are now uploaded to pypi.io (Warehouse). + +v22.0.1 +------- + +* #190: On Python 2, if unicode is passed for packages to + ``build_py`` command, it will be handled just as with + text on Python 3. + +v22.0.0 +------- + +Intended to be v21.3.0, but jaraco accidentally released as +a major bump. + +* #598: Setuptools now lists itself first in the User-Agent + for web requests, better following the guidelines in + `RFC 7231 + <https://tools.ietf.org/html/rfc7231#section-5.5.3>`_. + +v21.2.2 +------- + +* Minor fixes to changelog and docs. + v21.2.1 ------- @@ -109,7 +171,7 @@ 20.5 ---- -* BB Pull Request #185: Add support for environment markers +* BB Pull Request #185, #470: Add support for environment markers in requirements in install_requires, setup_requires, tests_require as well as adding a test for the existing extra_requires machinery. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-21.2.1/PKG-INFO new/setuptools-23.1.0/PKG-INFO --- old/setuptools-21.2.1/PKG-INFO 2016-05-22 22:14:31.000000000 +0200 +++ new/setuptools-23.1.0/PKG-INFO 2016-06-24 16:22:50.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: setuptools -Version: 21.2.1 +Version: 23.1.0 Summary: Easily download, build, install, upgrade, and uninstall Python packages Home-page: https://github.com/pypa/setuptools Author: Python Packaging Authority @@ -13,7 +13,8 @@ .. contents:: **Table of Contents** - `Change History <https://pythonhosted.org/setuptools/history.html>`_. + .. image:: https://setuptools.readthedocs.io/en/latest/?badge=latest + :target: https://setuptools.readthedocs.io ------------------------- Installation Instructions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-21.2.1/README.rst new/setuptools-23.1.0/README.rst --- old/setuptools-21.2.1/README.rst 2016-05-22 22:12:04.000000000 +0200 +++ new/setuptools-23.1.0/README.rst 2016-06-24 16:22:31.000000000 +0200 @@ -5,7 +5,8 @@ .. contents:: **Table of Contents** -`Change History <https://pythonhosted.org/setuptools/history.html>`_. +.. image:: https://setuptools.readthedocs.io/en/latest/?badge=latest + :target: https://setuptools.readthedocs.io ------------------------- Installation Instructions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-21.2.1/docs/conf.py new/setuptools-23.1.0/docs/conf.py --- old/setuptools-21.2.1/docs/conf.py 2016-05-22 22:12:04.000000000 +0200 +++ new/setuptools-23.1.0/docs/conf.py 2016-06-24 16:22:31.000000000 +0200 @@ -200,7 +200,7 @@ #latex_use_modindex = True link_files = { - 'CHANGES.rst': dict( + '../CHANGES.rst': dict( using=dict( BB='https://bitbucket.org', GH='https://github.com', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-21.2.1/docs/easy_install.txt new/setuptools-23.1.0/docs/easy_install.txt --- old/setuptools-21.2.1/docs/easy_install.txt 2016-05-22 22:12:04.000000000 +0200 +++ new/setuptools-23.1.0/docs/easy_install.txt 2016-06-24 16:22:31.000000000 +0200 @@ -677,7 +677,7 @@ until and unless you override them explicitly in an ``[easy_install]`` section. For more information, see also the current Python documentation on the `use and -location of distutils configuration files <http://docs.python.org/inst/config-syntax.html>`_. +location of distutils configuration files <https://docs.python.org/install/index.html#inst-config-files>`_. Notice that ``easy_install`` will use the ``setup.cfg`` from the current working directory only if it was triggered from ``setup.py`` through the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-21.2.1/docs/requirements.txt new/setuptools-23.1.0/docs/requirements.txt --- old/setuptools-21.2.1/docs/requirements.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/setuptools-23.1.0/docs/requirements.txt 2016-06-24 16:22:31.000000000 +0200 @@ -0,0 +1 @@ +rst.linker>=1.6.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-21.2.1/docs/setuptools.txt new/setuptools-23.1.0/docs/setuptools.txt --- old/setuptools-21.2.1/docs/setuptools.txt 2016-05-22 22:12:04.000000000 +0200 +++ new/setuptools-23.1.0/docs/setuptools.txt 2016-06-24 16:22:31.000000000 +0200 @@ -917,7 +917,7 @@ a quick example of converting code that uses ``__file__`` to use ``pkg_resources`` instead. -.. _Resource Management API: http://peak.telecommunity.com/DevCenter/PythonEggs#resource-management +.. _Resource Management API: http://peak.telecommunity.com/DevCenter/PkgResources#resourcemanager-api .. _Accessing Package Resources: http://peak.telecommunity.com/DevCenter/PythonEggs#accessing-package-resour… diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-21.2.1/msvc-build-launcher.cmd new/setuptools-23.1.0/msvc-build-launcher.cmd --- old/setuptools-21.2.1/msvc-build-launcher.cmd 2016-05-22 22:12:04.000000000 +0200 +++ new/setuptools-23.1.0/msvc-build-launcher.cmd 2016-06-24 16:22:31.000000000 +0200 @@ -35,21 +35,5 @@ echo Windows SDK 6.1 not found to build Windows 64-bit version ) -REM Windows RT ARM build requires both freeware -REM "Visual Studio Express 2012 for Windows 8" and -REM "Visual Studio Express 2012 for Windows Desktop" to be installed from -REM http://www.microsoft.com/visualstudio/eng/products/visual-studio-express-pr… -set PATH=%PATH_OLD% -set PATH=C:\Program Files\Microsoft Visual Studio 11.0\VC;%PATH% -set PATH=C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC;%PATH% -call VCVARSALL x86_arm >nul 2>&1 -if "%ERRORLEVEL%"=="0" ( - echo Building Windows RT Version ... - cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" /D _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE launcher.c /O2 /link /MACHINE:ARM /SUBSYSTEM:CONSOLE /out:setuptools/cli-arm-32.exe - cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" /D _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE launcher.c /O2 /link /MACHINE:ARM /SUBSYSTEM:WINDOWS /out:setuptools/gui-arm-32.exe -) else ( - echo Visual Studio ^(Express^) 2012 not found to build Windows RT Version -) - set PATH=%PATH_OLD% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-21.2.1/setup.cfg new/setuptools-23.1.0/setup.cfg --- old/setuptools-21.2.1/setup.cfg 2016-05-22 22:14:31.000000000 +0200 +++ new/setuptools-23.1.0/setup.cfg 2016-06-24 16:22:50.000000000 +0200 @@ -1,5 +1,5 @@ [bumpversion] -current_version = 21.2.1 +current_version = 23.1.0 commit = True tag = True @@ -10,18 +10,13 @@ [aliases] clean_egg_info = egg_info -RDb '' -release = clean_egg_info sdist bdist_wheel build_sphinx +release = clean_egg_info sdist bdist_wheel source = register sdist binary binary = bdist_egg upload --show-response test = pytest -[build_sphinx] -source-dir = docs/ -build-dir = docs/build -all_files = 1 - -[upload_docs] -upload-dir = docs/build/html +[upload] +repository = https://upload.pypi.io/legacy/ [sdist] formats = gztar zip diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-21.2.1/setup.py new/setuptools-23.1.0/setup.py --- old/setuptools-21.2.1/setup.py 2016-05-22 22:12:04.000000000 +0200 +++ new/setuptools-23.1.0/setup.py 2016-06-24 16:22:31.000000000 +0200 @@ -61,14 +61,12 @@ needs_pytest = set(['ptr', 'pytest', 'test']).intersection(sys.argv) pytest_runner = ['pytest-runner'] if needs_pytest else [] -needs_sphinx = set(['build_sphinx', 'upload_docs', 'release']).intersection(sys.argv) -sphinx = ['sphinx', 'rst.linker>=1.5'] if needs_sphinx else [] needs_wheel = set(['release', 'bdist_wheel']).intersection(sys.argv) wheel = ['wheel'] if needs_wheel else [] setup_params = dict( name="setuptools", - version="21.2.1", + version="23.1.0", description="Easily download, build, install, upgrade, and uninstall " "Python packages", author="Python Packaging Authority", @@ -158,7 +156,7 @@ 'pytest>=2.8', ] + (['mock'] if sys.version_info[:2] < (3, 3) else []), setup_requires=[ - ] + sphinx + pytest_runner + wheel, + ] + pytest_runner + wheel, ) if __name__ == '__main__': Files old/setuptools-21.2.1/setuptools/cli-arm-32.exe and new/setuptools-23.1.0/setuptools/cli-arm-32.exe differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-21.2.1/setuptools/command/build_py.py new/setuptools-23.1.0/setuptools/command/build_py.py --- old/setuptools-21.2.1/setuptools/command/build_py.py 2016-05-22 22:12:04.000000000 +0200 +++ new/setuptools-23.1.0/setuptools/command/build_py.py 2016-06-24 16:22:31.000000000 +0200 @@ -8,6 +8,7 @@ import distutils.errors import itertools +from setuptools.extern import six from setuptools.extern.six.moves import map, filter, filterfalse try: @@ -66,6 +67,9 @@ return orig.build_py.__getattr__(self, attr) def build_module(self, module, module_file, package): + if six.PY2 and isinstance(package, six.string_types): + # avoid errors on Python 2 when unicode is passed (#190) + package = package.split('.') outfile, copied = orig.build_py.build_module(self, module, module_file, package) if copied: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-21.2.1/setuptools/command/easy_install.py new/setuptools-23.1.0/setuptools/command/easy_install.py --- old/setuptools-21.2.1/setuptools/command/easy_install.py 2016-05-22 22:12:04.000000000 +0200 +++ new/setuptools-23.1.0/setuptools/command/easy_install.py 2016-06-24 16:22:31.000000000 +0200 @@ -32,7 +32,6 @@ import re import stat import random -import platform import textwrap import warnings import site @@ -2203,8 +2202,6 @@ Returns the executable as a byte string. """ launcher_fn = '%s.exe' % type - if platform.machine().lower() == 'arm': - launcher_fn = launcher_fn.replace(".", "-arm.") if is_64bit(): launcher_fn = launcher_fn.replace(".", "-64.") else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-21.2.1/setuptools/command/egg_info.py new/setuptools-23.1.0/setuptools/command/egg_info.py --- old/setuptools-21.2.1/setuptools/command/egg_info.py 2016-05-22 22:12:04.000000000 +0200 +++ new/setuptools-23.1.0/setuptools/command/egg_info.py 2016-06-24 16:22:31.000000000 +0200 @@ -52,8 +52,10 @@ ] boolean_options = ['tag-date', 'tag-svn-revision'] - negative_opt = {'no-svn-revision': 'tag-svn-revision', - 'no-date': 'tag-date'} + negative_opt = { + 'no-svn-revision': 'tag-svn-revision', + 'no-date': 'tag-date', + } def initialize_options(self): self.egg_name = None @@ -197,6 +199,10 @@ if self.tag_build: version += self.tag_build if self.tag_svn_revision: + warnings.warn( + "tag_svn_revision is deprecated and will not be honored " + "in a future release" + ) version += '-r%s' % self.get_svn_revision() if self.tag_date: version += time.strftime("-%Y%m%d") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-21.2.1/setuptools/command/test.py new/setuptools-23.1.0/setuptools/command/test.py --- old/setuptools-21.2.1/setuptools/command/test.py 2016-05-22 22:12:04.000000000 +0200 +++ new/setuptools-23.1.0/setuptools/command/test.py 2016-06-24 16:22:31.000000000 +0200 @@ -1,6 +1,7 @@ +import sys +import contextlib from distutils.errors import DistutilsOptionError from unittest import TestLoader -import sys from setuptools.extern import six from setuptools.extern.six.moves import map @@ -102,6 +103,14 @@ yield self.test_suite def with_project_on_sys_path(self, func): + """ + Backward compatibility for project_on_sys_path context. + """ + with self.project_on_sys_path(): + func() + + @contextlib.contextmanager + def project_on_sys_path(self): with_2to3 = six.PY3 and getattr(self.distribution, 'use_2to3', False) if with_2to3: @@ -137,7 +146,7 @@ working_set.__init__() add_activation_listener(lambda dist: dist.activate()) require('%s==%s' % (ei_cmd.egg_name, ei_cmd.egg_version)) - func() + yield finally: sys.path[:] = old_path sys.modules.clear() @@ -154,9 +163,11 @@ cmd = ' '.join(self._argv) if self.dry_run: self.announce('skipping "%s" (dry run)' % cmd) - else: - self.announce('running "%s"' % cmd) - self.with_project_on_sys_path(self.run_tests) + return + + self.announce('running "%s"' % cmd) + with self.project_on_sys_path(): + self.run_tests() def run_tests(self): # Purge modules under test from sys.modules. The test loader will diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-21.2.1/setuptools/command/upload_docs.py new/setuptools-23.1.0/setuptools/command/upload_docs.py --- old/setuptools-21.2.1/setuptools/command/upload_docs.py 2016-05-22 22:12:04.000000000 +0200 +++ new/setuptools-23.1.0/setuptools/command/upload_docs.py 2016-06-24 16:22:31.000000000 +0200 @@ -13,6 +13,8 @@ import zipfile import tempfile import shutil +import itertools +import functools from setuptools.extern import six from setuptools.extern.six.moves import http_client, urllib @@ -21,15 +23,9 @@ from .upload import upload -errors = 'surrogateescape' if six.PY3 else 'strict' - - -# This is not just a replacement for byte literals -# but works as a general purpose encoder -def b(s, encoding='utf-8'): - if isinstance(s, six.text_type): - return s.encode(encoding, errors) - return s +def _encode(s): + errors = 'surrogateescape' if six.PY3 else 'strict' + return s.encode('utf-8', errors) class upload_docs(upload): @@ -101,10 +97,48 @@ finally: shutil.rmtree(tmp_dir) + @staticmethod + def _build_part(item, sep_boundary): + key, values = item + title = '\nContent-Disposition: form-data; name="%s"' % key + # handle multiple entries for the same name + if not isinstance(values, list): + values = [values] + for value in values: + if type(value) is tuple: + title += '; filename="%s"' % value[0] + value = value[1] + else: + value = _encode(value) + yield sep_boundary + yield _encode(title) + yield b"\n\n" + yield value + if value and value[-1:] == b'\r': + yield b'\n' # write an extra newline (lurve Macs) + + @classmethod + def _build_multipart(cls, data): + """ + Build up the MIME payload for the POST data + """ + boundary = b'--------------GHSKFJDLGDS7543FJKLFHRE75642756743254' + sep_boundary = b'\n--' + boundary + end_boundary = sep_boundary + b'--' + end_items = end_boundary, b"\n", + builder = functools.partial( + cls._build_part, + sep_boundary=sep_boundary, + ) + part_groups = map(builder, data.items()) + parts = itertools.chain.from_iterable(part_groups) + body_items = itertools.chain(parts, end_items) + content_type = 'multipart/form-data; boundary=%s' % boundary + return b''.join(body_items), content_type + def upload_file(self, filename): - f = open(filename, 'rb') - content = f.read() - f.close() + with open(filename, 'rb') as f: + content = f.read() meta = self.distribution.metadata data = { ':action': 'doc_upload', @@ -112,37 +146,13 @@ 'content': (os.path.basename(filename), content), } # set up the authentication - credentials = b(self.username + ':' + self.password) + credentials = _encode(self.username + ':' + self.password) credentials = standard_b64encode(credentials) if six.PY3: credentials = credentials.decode('ascii') auth = "Basic " + credentials - # Build up the MIME payload for the POST data - boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254' - sep_boundary = b('\n--') + b(boundary) - end_boundary = sep_boundary + b('--') - body = [] - for key, values in six.iteritems(data): - title = '\nContent-Disposition: form-data; name="%s"' % key - # handle multiple entries for the same name - if not isinstance(values, list): - values = [values] - for value in values: - if type(value) is tuple: - title += '; filename="%s"' % value[0] - value = value[1] - else: - value = b(value) - body.append(sep_boundary) - body.append(b(title)) - body.append(b("\n\n")) - body.append(value) - if value and value[-1:] == b('\r'): - body.append(b('\n')) # write an extra newline (lurve Macs) - body.append(end_boundary) - body.append(b("\n")) - body = b('').join(body) + body, ct = self._build_multipart(data) self.announce("Submitting documentation to %s" % (self.repository), log.INFO) @@ -164,7 +174,7 @@ try: conn.connect() conn.putrequest("POST", url) - content_type = 'multipart/form-data; boundary=%s' % boundary + content_type = ct conn.putheader('Content-type', content_type) conn.putheader('Content-length', str(len(body))) conn.putheader('Authorization', auth) Files old/setuptools-21.2.1/setuptools/gui-arm-32.exe and new/setuptools-23.1.0/setuptools/gui-arm-32.exe differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-21.2.1/setuptools/package_index.py new/setuptools-23.1.0/setuptools/package_index.py --- old/setuptools-21.2.1/setuptools/package_index.py 2016-05-22 22:12:04.000000000 +0200 +++ new/setuptools-23.1.0/setuptools/package_index.py 2016-06-24 16:22:31.000000000 +0200 @@ -17,6 +17,7 @@ from setuptools.extern import six from setuptools.extern.six.moves import urllib, http_client, configparser, map +import setuptools from pkg_resources import ( CHECKOUT_DIST, Distribution, BINARY_DIST, normalize_path, SOURCE_DIST, require, Environment, find_distributions, safe_name, safe_version, @@ -46,6 +47,11 @@ _SOCKET_TIMEOUT = 15 + +_tmpl = "setuptools/{setuptools.__version__} Python-urllib/{py_major}" +user_agent = _tmpl.format(py_major=sys.version[:3], **globals()) + + def parse_bdist_wininst(name): """Return (base,pyversion) or (None,None) for possible .exe name""" @@ -202,9 +208,6 @@ if match: yield urllib.parse.urljoin(url, htmldecode(match.group(1))) -user_agent = "Python-urllib/%s setuptools/%s" % ( - sys.version[:3], require('setuptools')[0].version -) class ContentChecker(object): """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-21.2.1/setuptools/tests/test_upload_docs.py new/setuptools-23.1.0/setuptools/tests/test_upload_docs.py --- old/setuptools-21.2.1/setuptools/tests/test_upload_docs.py 2016-05-22 22:12:04.000000000 +0200 +++ new/setuptools-23.1.0/setuptools/tests/test_upload_docs.py 2016-06-24 16:22:31.000000000 +0200 @@ -57,3 +57,15 @@ with contextlib.closing(zipfile.ZipFile(tmp_file)) as zip_file: assert zip_file.namelist() == ['index.html'] + + def test_build_multipart(self): + data = dict( + a="foo", + b="bar", + file=('file.txt', b'content'), + ) + body, content_type = upload_docs._build_multipart(data) + assert 'form-data' in content_type + assert isinstance(body, bytes) + assert b'foo' in body + assert b'content' in body diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-21.2.1/setuptools.egg-info/PKG-INFO new/setuptools-23.1.0/setuptools.egg-info/PKG-INFO --- old/setuptools-21.2.1/setuptools.egg-info/PKG-INFO 2016-05-22 22:14:31.000000000 +0200 +++ new/setuptools-23.1.0/setuptools.egg-info/PKG-INFO 2016-06-24 16:22:50.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: setuptools -Version: 21.2.1 +Version: 23.1.0 Summary: Easily download, build, install, upgrade, and uninstall Python packages Home-page: https://github.com/pypa/setuptools Author: Python Packaging Authority @@ -13,7 +13,8 @@ .. contents:: **Table of Contents** - `Change History <https://pythonhosted.org/setuptools/history.html>`_. + .. image:: https://setuptools.readthedocs.io/en/latest/?badge=latest + :target: https://setuptools.readthedocs.io ------------------------- Installation Instructions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-21.2.1/setuptools.egg-info/SOURCES.txt new/setuptools-23.1.0/setuptools.egg-info/SOURCES.txt --- old/setuptools-21.2.1/setuptools.egg-info/SOURCES.txt 2016-05-22 22:14:31.000000000 +0200 +++ new/setuptools-23.1.0/setuptools.egg-info/SOURCES.txt 2016-06-24 16:22:50.000000000 +0200 @@ -21,6 +21,7 @@ docs/pkg_resources.txt docs/python3.txt docs/releases.txt +docs/requirements.txt docs/roadmap.txt docs/setuptools.txt docs/_templates/indexsidebar.html @@ -51,14 +52,12 @@ setuptools/archive_util.py setuptools/cli-32.exe setuptools/cli-64.exe -setuptools/cli-arm-32.exe setuptools/cli.exe setuptools/depends.py setuptools/dist.py setuptools/extension.py setuptools/gui-32.exe setuptools/gui-64.exe -setuptools/gui-arm-32.exe setuptools/gui.exe setuptools/launch.py setuptools/lib2to3_ex.py

1 0

commit inkscape for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package inkscape for openSUSE:Factory checked in at 2016-06-29 15:08:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/inkscape (Old) and /work/SRC/openSUSE:Factory/.inkscape.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "inkscape" Changes: -------- --- /work/SRC/openSUSE:Factory/inkscape/inkscape.changes 2016-03-29 14:49:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.inkscape.new/inkscape.changes 2016-06-29 15:09:00.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jun 24 10:45:25 UTC 2016 - zaitor(a)opensuse.org + +- Export -std=c++11 in CXXFLAGS, needed now after removal of patch + in libsig++ forcing the flag previously. May be removed when + lp#1488079 is fixed. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inkscape.spec ++++++ --- /var/tmp/diff_new_pack.DK6CNs/_old 2016-06-29 15:09:01.000000000 +0200 +++ /var/tmp/diff_new_pack.DK6CNs/_new 2016-06-29 15:09:01.000000000 +0200 @@ -172,7 +172,9 @@ export LDFLAGS+="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads" %endif export CFLAGS="%{optflags} -fno-strict-aliasing" -export CXXFLAGS="%{optflags} -fno-strict-aliasing" +# This (-std=c++11) is still needed with gcc6 until this is fixed: +# https://bugs.launchpad.net/inkscape/+bug/1488079 +export CXXFLAGS="%{optflags} -std=c++11 -fno-strict-aliasing" %configure\ --enable-lcms \

1 0

commit w3m for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package w3m for openSUSE:Factory checked in at 2016-06-29 15:08:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/w3m (Old) and /work/SRC/openSUSE:Factory/.w3m.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "w3m" Changes: -------- --- /work/SRC/openSUSE:Factory/w3m/w3m.changes 2015-03-23 12:12:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.w3m.new/w3m.changes 2016-06-29 15:08:55.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Jun 24 08:09:45 UTC 2016 - fweiss(a)suse.com + +- w3mman-formatting.patch: w3mman now doesn't show invalid + characters anymore (bsc#950800) + +------------------------------------------------------------------- +Wed Jun 22 12:43:27 UTC 2016 - max(a)suse.com + +- Add w3m-scheme.patch to fix a segfault when doing a https request + to an unresolvable host (bsc#950468). + +------------------------------------------------------------------- New: ---- w3m-scheme.patch w3mman-formatting.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ w3m.spec ++++++ --- /var/tmp/diff_new_pack.IuYTQN/_old 2016-06-29 15:08:56.000000000 +0200 +++ /var/tmp/diff_new_pack.IuYTQN/_new 2016-06-29 15:08:56.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package w3m # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -38,6 +38,8 @@ Patch12: w3m-closedir.patch Patch13: w3m-parallel-make.patch Patch14: w3m-fix-build-with-imlib2-1.4.6.patch +Patch15: w3m-scheme.patch +Patch16: w3mman-formatting.patch Patch503: w3m-fh-def.patch Patch504: w3m-openssl.patch Patch505: w3m-gc7.diff @@ -105,6 +107,8 @@ %patch12 %patch13 -p1 %patch14 -p1 +%patch15 -p1 +%patch16 -p1 %patch503 %patch504 %patch -P 505 -p1 ++++++ w3m-scheme.patch ++++++ >From c155b93830b353a68468fb063df67987ed284142 Mon Sep 17 00:00:00 2001 From: AIDA Shinra <shinra(a)j10n.org> Date: Mon, 14 Oct 2013 22:39:55 +0900 Subject: Define schemeNumToName() to fix scheme bug Patch from <http://www.j10n.org/files/w3m-cvs-1.1055-schemebug.patch>, [w3m-dev:04470] on 2013-10-14. --- url.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/url.c b/url.c index ed6062e..6dbd5d3 100644 --- a/url.c +++ b/url.c @@ -121,6 +121,7 @@ static struct table2 DefaultGuess[] = { }; static void add_index_file(ParsedURL *pu, URLFile *uf); +static char * schemeNumToName(int scheme); /* #define HTTP_DEFAULT_FILE "/index.html" */ @@ -1280,6 +1281,18 @@ getURLScheme(char **url) } static char * +schemeNumToName(int scheme) +{ + int i; + + for (i = 0; schemetable[i].cmdname != NULL; i++) { + if (schemetable[i].cmd == scheme) + return schemetable[i].cmdname; + } + return NULL; +} + +static char * otherinfo(ParsedURL *target, ParsedURL *current, char *referer) { Str s = Strnew(); @@ -1603,7 +1616,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current, pu->host != NULL && !check_no_proxy(pu->host)) { hr->flag |= HR_FLAG_PROXY; sock = openSocket(FTP_proxy_parsed.host, - schemetable[FTP_proxy_parsed.scheme].cmdname, + schemeNumToName(FTP_proxy_parsed.scheme), FTP_proxy_parsed.port); if (sock < 0) return uf; @@ -1645,15 +1658,15 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current, } else if (pu->scheme == SCM_HTTPS) { sock = openSocket(HTTPS_proxy_parsed.host, - schemetable[HTTPS_proxy_parsed.scheme]. - cmdname, HTTPS_proxy_parsed.port); + schemeNumToName(HTTPS_proxy_parsed.scheme), + HTTPS_proxy_parsed.port); sslh = NULL; } else { #endif /* USE_SSL */ sock = openSocket(HTTP_proxy_parsed.host, - schemetable[HTTP_proxy_parsed.scheme]. - cmdname, HTTP_proxy_parsed.port); + schemeNumToName(HTTP_proxy_parsed.scheme), + HTTP_proxy_parsed.port); #ifdef USE_SSL sslh = NULL; } @@ -1685,8 +1698,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current, } } else { - sock = openSocket(pu->host, - schemetable[pu->scheme].cmdname, pu->port); + sock = openSocket(pu->host, schemeNumToName(pu->scheme), pu->port); if (sock < 0) { *status = HTST_MISSING; return uf; @@ -1750,7 +1762,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current, pu->host != NULL && !check_no_proxy(pu->host)) { hr->flag |= HR_FLAG_PROXY; sock = openSocket(GOPHER_proxy_parsed.host, - schemetable[GOPHER_proxy_parsed.scheme].cmdname, + schemeNumToName(GOPHER_proxy_parsed.scheme), GOPHER_proxy_parsed.port); if (sock < 0) return uf; @@ -1758,8 +1770,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current, tmp = HTTPrequest(pu, current, hr, extra_header); } else { - sock = openSocket(pu->host, - schemetable[pu->scheme].cmdname, pu->port); + sock = openSocket(pu->host, schemeNumToName(pu->scheme), pu->port); if (sock < 0) return uf; if (pu->file == NULL) -- cgit v0.12 ++++++ w3mman-formatting.patch ++++++ Index: w3m-0.5.3/scripts/w3mman/w3mman2html.cgi.in =================================================================== --- w3m-0.5.3.orig/scripts/w3mman/w3mman2html.cgi.in +++ w3m-0.5.3/scripts/w3mman/w3mman2html.cgi.in @@ -76,7 +76,7 @@ if ($query{"local"}) { if (! ($file =~ /^\//)) { $file = $query{"pwd"} . '/' . $file; } - open(F, "MAN_KEEP_FORMATTING=1 $MAN -l $file 2> /dev/null |"); + open(F, "$MAN -l $file 2> /dev/null |"); } else { $man = $query{"man"}; if ($man =~ s/$(\w+)$$//) { @@ -92,7 +92,7 @@ if ($query{"local"}) { $section =~ s:([^-\w\200-\377.,])::g; $man =~ s:([^-\w\200-\377.,])::g; - open(F, "MAN_KEEP_FORMATTING=1 $MAN $section $man 2> /dev/null |"); + open(F, "$MAN $section $man 2> /dev/null |"); } $ok = 0; undef $header;

1 0

commit openldap2 for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package openldap2 for openSUSE:Factory checked in at 2016-06-29 15:08:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openldap2 (Old) and /work/SRC/openSUSE:Factory/.openldap2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openldap2" Changes: -------- --- /work/SRC/openSUSE:Factory/openldap2/openldap2.changes 2016-05-20 11:55:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openldap2.new/openldap2.changes 2016-06-29 15:08:49.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Jun 16 10:10:36 UTC 2016 - hguo(a)suse.com + +- Move schema files into tarball addonschema.tar.gz: + ldapns.ldif ldapns.schema rfc2307bis.ldif rfc2307bis.schema + yast.ldif yast.schema +- Package previously missing schema files in LDIF format: + amavisd-new.ldif dhcp.ldif dlz.ldif dnszone.ldif samba3.ldif + sudo.ldif suse-mailserver.ldif (bsc#984691) +- Fix a minor issue in schema2ldif script that led to missing + attribute in the generated LDIF. + +------------------------------------------------------------------- Old: ---- ldapns.ldif ldapns.schema rfc2307bis.ldif rfc2307bis.schema yast.ldif yast.schema New: ---- addonschema.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openldap2.spec ++++++ --- /var/tmp/diff_new_pack.oDYeAO/_old 2016-06-29 15:08:50.000000000 +0200 +++ /var/tmp/diff_new_pack.oDYeAO/_new 2016-06-29 15:08:50.000000000 +0200 @@ -44,17 +44,12 @@ Source5: README.module-loading Source6: schema2ldif Source7: baselibs.conf -Source9: ldapns.schema -Source10: rfc2307bis.schema -Source11: yast.schema +Source9: addonschema.tar.gz Source12: slapd.conf.example Source13: start Source14: slapd.service Source15: SuSEfirewall2.openldap Source16: sysconfig.openldap -Source17: ldapns.ldif -Source18: rfc2307bis.ldif -Source19: yast.ldif Patch3: 0003-LDAPI-socket-location.dif Patch5: 0005-pie-compile.dif Patch6: 0006-No-Build-date-and-time-in-binaries.dif @@ -251,7 +246,7 @@ gzip -k %{S:203} # Unpack and patch OpenLDAP 2.4 -%setup -q -n openldap-%{version_main} +%setup -q -a 9 -n openldap-%{version_main} %patch3 -p1 %patch5 -p1 %patch6 -p1 @@ -382,12 +377,8 @@ mkdir -p ${RPM_BUILD_ROOT}/var/adm/fillup-templates install -m 644 %{SOURCE16} ${RPM_BUILD_ROOT}/var/adm/fillup-templates/sysconfig.openldap -install -m 644 %{SOURCE9} ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap/schema -install -m 644 %{SOURCE10} ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap/schema -install -m 644 %{SOURCE11} ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap/schema -install -m 644 %{SOURCE17} ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap/schema -install -m 644 %{SOURCE18} ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap/schema -install -m 644 %{SOURCE19} ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap/schema +install -m 644 *.ldif ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap/schema +install -m 644 *.schema ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap/schema # Install default and sample configuration files install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap install -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap ++++++ schema2ldif ++++++ --- /var/tmp/diff_new_pack.oDYeAO/_old 2016-06-29 15:08:51.000000000 +0200 +++ /var/tmp/diff_new_pack.oDYeAO/_new 2016-06-29 15:08:51.000000000 +0200 @@ -44,6 +44,7 @@ $1 = tolower($1) ; gsub("^objectclass$","olcObjectclasses:",$1) gsub("^attributetype$","olcAttributeTypes:",$1) + gsub("^attributetypes$","olcAttributeTypes:",$1) gsub("^objectidentifier$","olcObjectIdentifier:",$1) buffer = $0; }

1 0

commit yast2-network for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package yast2-network for openSUSE:Factory checked in at 2016-06-29 15:04:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-network (Old) and /work/SRC/openSUSE:Factory/.yast2-network.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-network" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes 2016-06-13 21:49:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes 2016-06-29 15:04:26.000000000 +0200 @@ -1,0 +2,34 @@ +Thu Jun 23 06:54:43 UTC 2016 - mfilka(a)suse.com + +- bnc#970320, bnc#865132, bnc#852604 + - do not overwrite Postfix MTA configuration when saving network + setup +- 3.1.158 + +------------------------------------------------------------------- +Tue Jun 21 05:37:31 UTC 2016 - igonzalezsosa(a)suse.com + +- bsc#984146 + - set AutoYaST keep_install_network parameter to 'true' by + default + - restore the default behavior present in SLE 12 SP1 and + openSUSE Leap 42.1 +- 3.1.157 + +------------------------------------------------------------------- +Tue Jun 14 05:43:26 UTC 2016 - mfilka(a)suse.com + +- bnc#983201 + - do not crash with internal error when configuring new device on + s390 +- 3.1.156 + +------------------------------------------------------------------- +Mon Jun 13 17:48:52 UTC 2016 - mfilka(a)suse.com + +- fate#318787 + - detect modifications when closing module, do not restart when + not needed. +- 3.1.155 + +------------------------------------------------------------------- Old: ---- yast2-network-3.1.154.tar.bz2 New: ---- yast2-network-3.1.158.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.FfLs6c/_old 2016-06-29 15:04:27.000000000 +0200 +++ /var/tmp/diff_new_pack.FfLs6c/_new 2016-06-29 15:04:27.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.154 +Version: 3.1.158 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-network-3.1.154.tar.bz2 -> yast2-network-3.1.158.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.154/package/yast2-network.changes new/yast2-network-3.1.158/package/yast2-network.changes --- old/yast2-network-3.1.154/package/yast2-network.changes 2016-06-09 15:23:31.000000000 +0200 +++ new/yast2-network-3.1.158/package/yast2-network.changes 2016-06-23 10:23:17.000000000 +0200 @@ -1,4 +1,38 @@ ------------------------------------------------------------------- +Thu Jun 23 06:54:43 UTC 2016 - mfilka(a)suse.com + +- bnc#970320, bnc#865132, bnc#852604 + - do not overwrite Postfix MTA configuration when saving network + setup +- 3.1.158 + +------------------------------------------------------------------- +Tue Jun 21 05:37:31 UTC 2016 - igonzalezsosa(a)suse.com + +- bsc#984146 + - set AutoYaST keep_install_network parameter to 'true' by + default + - restore the default behavior present in SLE 12 SP1 and + openSUSE Leap 42.1 +- 3.1.157 + +------------------------------------------------------------------- +Tue Jun 14 05:43:26 UTC 2016 - mfilka(a)suse.com + +- bnc#983201 + - do not crash with internal error when configuring new device on + s390 +- 3.1.156 + +------------------------------------------------------------------- +Mon Jun 13 17:48:52 UTC 2016 - mfilka(a)suse.com + +- fate#318787 + - detect modifications when closing module, do not restart when + not needed. +- 3.1.155 + +------------------------------------------------------------------- Wed Jun 1 14:16:08 UTC 2016 - igonzalezsosa(a)suse.com - Drop yast2-network-devel-doc package (fate#320356) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.154/package/yast2-network.spec new/yast2-network-3.1.158/package/yast2-network.spec --- old/yast2-network-3.1.154/package/yast2-network.spec 2016-06-09 15:23:31.000000000 +0200 +++ new/yast2-network-3.1.158/package/yast2-network.spec 2016-06-23 10:23:17.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.154 +Version: 3.1.158 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.154/src/clients/lan_auto.rb new/yast2-network-3.1.158/src/clients/lan_auto.rb --- old/yast2-network-3.1.154/src/clients/lan_auto.rb 2016-06-09 15:23:31.000000000 +0200 +++ new/yast2-network-3.1.158/src/clients/lan_auto.rb 2016-06-23 10:23:17.000000000 +0200 @@ -363,7 +363,7 @@ Ops.set( ret, "keep_install_network", - Ops.get_boolean(settings, "keep_install_network", false) + Ops.get_boolean(settings, "keep_install_network", true) ) if Ops.greater_than(Builtins.size(modules), 0) Ops.set(ret, "modules", modules) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.154/src/include/network/lan/complex.rb new/yast2-network-3.1.158/src/include/network/lan/complex.rb --- old/yast2-network-3.1.154/src/include/network/lan/complex.rb 2016-06-09 15:23:31.000000000 +0200 +++ new/yast2-network-3.1.158/src/include/network/lan/complex.rb 2016-06-23 10:23:17.000000000 +0200 @@ -171,7 +171,6 @@ def WriteDialog return :next if !Lan.Modified - LanItems.SetModified Wizard.RestoreHelp(Ops.get_string(@help, "write", "")) Lan.AbortFunction = -> { PollAbort() && ReallyAbort() } ret = Lan.Write @@ -508,7 +507,7 @@ if Stage.initial return Popup.ConfirmAbort(:painless) else - return ReallyAbort() if LanItems.modified + return ReallyAbort() if LanItems.GetModified return true end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.154/src/include/network/lan/hardware.rb new/yast2-network-3.1.158/src/include/network/lan/hardware.rb --- old/yast2-network-3.1.154/src/include/network/lan/hardware.rb 2016-06-09 15:23:31.000000000 +0200 +++ new/yast2-network-3.1.158/src/include/network/lan/hardware.rb 2016-06-23 10:23:17.000000000 +0200 @@ -787,7 +787,7 @@ end def devname_from_hw_dialog - UI.QueryWidget(Id(:ifcfg_name), :Value) + UI.QueryWidget(Id(:ifcfg_name), :Value) if UI.WidgetExists(Id(:ifcfg_name)) end def validate_hw(_key, _event) @@ -1157,11 +1157,6 @@ break elsif ret == :next if LanItems.type == "iucv" - # #176330, must be static - LanItems.nm_name = Ops.add( - "static-iucv-id-", - Convert.to_string(UI.QueryWidget(Id(:iucv_user), :Value)) - ) LanItems.device = Ops.add( "id-", Convert.to_string(UI.QueryWidget(Id(:iucv_user), :Value)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.154/src/include/network/runtime.rb new/yast2-network-3.1.158/src/include/network/runtime.rb --- old/yast2-network-3.1.154/src/include/network/runtime.rb 2016-06-09 15:23:32.000000000 +0200 +++ new/yast2-network-3.1.158/src/include/network/runtime.rb 2016-06-23 10:23:17.000000000 +0200 @@ -43,7 +43,6 @@ path(".target.bash"), "/usr/lib/sendmail.d/update 2>/dev/null" ) - SCR.Execute(path(".target.bash"), "/usr/sbin/config.postfix 2>/dev/null") end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.154/src/lib/network/network_autoyast.rb new/yast2-network-3.1.158/src/lib/network/network_autoyast.rb --- old/yast2-network-3.1.154/src/lib/network/network_autoyast.rb 2016-06-09 15:23:32.000000000 +0200 +++ new/yast2-network-3.1.158/src/lib/network/network_autoyast.rb 2016-06-23 10:23:17.000000000 +0200 @@ -128,7 +128,7 @@ # Checks if the profile asks for keeping installation network configuration def keep_net_config? - ret = ay_networking_section.fetch("keep_install_network", false) + ret = ay_networking_section.fetch("keep_install_network", true) log.info("NetworkAutoYast: keep installation network: #{ret}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.154/src/modules/Lan.rb new/yast2-network-3.1.158/src/modules/Lan.rb --- old/yast2-network-3.1.154/src/modules/Lan.rb 2016-06-09 15:23:32.000000000 +0200 +++ new/yast2-network-3.1.158/src/modules/Lan.rb 2016-06-23 10:23:17.000000000 +0200 @@ -96,10 +96,14 @@ # Return a modification status # @return true if data was modified def Modified - ret = LanItems.GetModified || DNS.modified || Routing.Modified || - NetworkConfig.Modified || - NetworkService.Modified - ret + return true if LanItems.GetModified + return true if DNS.modified + return true if Routing.Modified + return true if NetworkConfig.Modified + return true if NetworkService.Modified + return true if SuSEFirewall.GetModified + + false end # function for use from autoinstallation (Fate #301032) @@ -412,7 +416,6 @@ Builtins.sleep(sl) return false if Abort() - LanItems.modified = false @initialized = true Progress.Finish if @gui @@ -709,7 +712,7 @@ "keep_install_network" => Ops.get_boolean( LanItems.autoinstall_settings, "keep_install_network", - false + true ) } Builtins.y2milestone("Exported map: %1", ay) @@ -988,7 +991,7 @@ configure_as_bridge_port(ifcfg) Ops.set(LanItems.Items, [current, "ifcfg"], new_ifcfg) - LanItems.modified = true + LanItems.SetModified LanItems.force_restart = true Builtins.y2internal("List %1", NetworkInterfaces.List("")) # re-read configuration to see new items in UI diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.154/src/modules/LanItems.rb new/yast2-network-3.1.158/src/modules/LanItems.rb --- old/yast2-network-3.1.154/src/modules/LanItems.rb 2016-06-09 15:23:32.000000000 +0200 +++ new/yast2-network-3.1.158/src/modules/LanItems.rb 2016-06-23 10:23:17.000000000 +0200 @@ -200,12 +200,6 @@ "datagram" => _("datagram") } - # propose options - @proposal_valid = false - - # NetworkModules:: name - @nm_name = "" - Yast.include self, "network/hardware.rb" # Default values used when creating an emulated NIC for physical s390 hardware. @@ -380,7 +374,7 @@ if Ops.greater_than( Builtins.size(Ops.get_string(@driver_options, driver, "")), 0 - ) + ) " " else "" @@ -434,36 +428,43 @@ value end + # It replaces a tuple identified by replace_key in current item's udev rule + # + # Note that the tuple is identified by key only. However modification flag is + # set only if value was changed (in case when replace_key == new_key) + # + # @param replace_key [string] udev key which identifies tuple to be replaced + # @param new_key [string] new key to by used + # @param new_val [string] value for new key + # @return updated rule when replace_key is found, current rule otherwise def ReplaceItemUdev(replace_key, new_key, new_val) - new_rules = [] + new_rule = [] # udev syntax distinguishes among others: # = for assignment # == for equality checks operator = new_key == "NAME" ? "=" : "==" + current_rule = getUdevFallback - Builtins.foreach(getUdevFallback) do |row| - if Builtins.issubstring(row, replace_key) - row = Builtins.sformat("%1%2\"%3\"", new_key, operator, new_val) - end - new_rules = Builtins.add(new_rules, row) - end + return current_rule if !new_key || new_key.empty? + return current_rule if !new_val || new_val.empty? - Builtins.y2debug( - "LanItems::ReplaceItemUdev: udev rules %1", - Ops.get_list(@Items, [@current, "udev", "net"], []) - ) + i = current_rule.find_index { |tuple| tuple =~ /#{replace_key}/ } + if i + # deep_copy is most probably not neccessary because getUdevFallback does + # deep_copy on return value. However, getUdevFallback will be subect of refactoring + # so caution is must. Moreover new_rule is also return value so it should be + # copied anyway + new_rule = deep_copy(current_rule) + new_rule[i] = "#{new_key}#{operator}\"#{new_val}\"" + + SetModified() if current_rule != new_rule + end - Ops.set(@Items, [@current, "udev", "net"], new_rules) + log.info("LanItems#ReplaceItemUdev: #{current_rule} -> #{new_rule}") - Builtins.y2debug( - "LanItems::ReplaceItemUdev(%1, %2, %3) %4", - replace_key, - new_key, - new_val, - new_rules - ) + Items()[@current]["udev"]["net"] = new_rule - deep_copy(new_rules) + new_rule end # Updates device name. @@ -509,8 +510,9 @@ # Sets new device name for current item def rename(name) - if (GetCurrentName() != name) + if GetCurrentName() != name @Items[@current]["renamed_to"] = name + SetModified() else @Items[@current].delete("renamed_to") end @@ -676,6 +678,7 @@ def GetModified @modified end + # Function sets internal variable, which indicates, that any # settings were modified, to "true" def SetModified @@ -1012,6 +1015,8 @@ # It is full outer join in -> you can have hwinfo part with no coresponding # netconfig part (or vice versa) in @Items when the method is done. def Read + reset_cache + ReadHw() NetworkInterfaces.Read NetworkInterfaces.CleanHotplugSymlink @@ -1097,7 +1102,7 @@ autoinstall_settings["start_immediately"] = settings.fetch("start_immediately", false) autoinstall_settings["strict_IP_check_timeout"] = settings.fetch("strict_IP_check_timeout", -1) - autoinstall_settings["keep_install_network"] = settings.fetch("keep_install_network", false) + autoinstall_settings["keep_install_network"] = settings.fetch("keep_install_network", true) # FIXME: createS390Device does two things, it # - updates internal structures @@ -1133,12 +1138,12 @@ @Items, [key, "table_descr", "rich_descr"], "" -), + ), "table_descr" => Ops.get_list( @Items, [key, "table_descr", "table_descr"], [] -) + ) ) end end @@ -1151,7 +1156,7 @@ if Builtins.haskey( @request_firmware, Ops.get_string(@Items, [@current, "hwinfo", "driver"], "") - ) + ) need = true end else @@ -1161,7 +1166,7 @@ if Builtins.haskey( @request_firmware, Ops.get_string(driver, ["modules", 0, 0], "") - ) + ) Builtins.y2milestone( "driver %1 needs firmware", Ops.get_string(driver, ["modules", 0, 0], "") @@ -1180,7 +1185,7 @@ if Builtins.haskey( @request_firmware, Ops.get_string(@Items, [@current, "hwinfo", "driver"], "") - ) + ) kernel_module = Ops.get_string( @Items, [@current, "hwinfo", "driver"], @@ -1194,7 +1199,7 @@ if Builtins.haskey( @request_firmware, Ops.get_string(driver, ["modules", 0, 0], "") - ) + ) kernel_module = Ops.get_string(driver, ["modules", 0, 0], "") raise Break end @@ -1414,7 +1419,7 @@ rich << physical_port_id if physical_port_id?(ifcfg_name) # display it only if we need it, don't duplicate "ifcfg_name" above if IsNotEmpty(item_hwinfo["dev_name"]) && ifcfg_name.empty? - dev_name = _("Device Name: %s") % item_hwinfo["dev_name"] + dev_name = _("Device Name: %s") % item_hwinfo["dev_name"] rich << HTML.Bold(dev_name) << "<br>" end rich = HTML.Bold(descr) + rich @@ -1455,11 +1460,7 @@ # Is current device hotplug or not? I.e. is connected via usb/pcmci? def isCurrentHotplug hotplugtype = Ops.get_string(getCurrentItem, ["hwinfo", "hotplug"], "") - if hotplugtype == "usb" || hotplugtype == "pcmci" - return true - else - return false - end + hotplugtype == "usb" || hotplugtype == "pcmci" end # Check if currently edited device gets its IP address @@ -1554,17 +1555,17 @@ ), 4 ) - if DriverType(@type) == "ctc" || DriverType(@type) == "lcs" - @qeth_chanids = Builtins.sformat("%1%2 %1%3", devstr, devid0, devid1) - else - @qeth_chanids = Builtins.sformat( - "%1%2 %1%3 %1%4", - devstr, - devid0, - devid1, - devid2 - ) - end + @qeth_chanids = if DriverType(@type) == "ctc" || DriverType(@type) == "lcs" + Builtins.sformat("%1%2 %1%3", devstr, devid0, devid1) + else + Builtins.sformat( + "%1%2 %1%3 %1%4", + devstr, + devid0, + devid1, + devid2 + ) + end end nil @@ -1743,18 +1744,18 @@ Builtins.y2milestone("Startmode by product: #{product_startmode}") - case product_startmode - when "ifplugd" - if replace_ifplugd? - startmode = hotplug_usable? ? "hotplug" : "auto" - else - startmode = product_startmode - end - when "auto" - startmode = "auto" - else - startmode = hotplug_usable? ? "hotplug" : "auto" - end + startmode = case product_startmode + when "ifplugd" + if replace_ifplugd? + hotplug_usable? ? "hotplug" : "auto" + else + product_startmode + end + when "auto" + "auto" + else + hotplug_usable? ? "hotplug" : "auto" + end Builtins.y2milestone("New device startmode: #{startmode}") @@ -1817,7 +1818,8 @@ # Sets device map items related to dhclient def setup_dhclient_options(devmap) if isCurrentDHCP - devmap["DHCLIENT_SET_DEFAULT_ROUTE"] = TRISTATE_TO_S.fetch(@set_default_route) + val = TRISTATE_TO_S.fetch(@set_default_route) + devmap["DHCLIENT_SET_DEFAULT_ROUTE"] = val if val end devmap end @@ -1831,7 +1833,7 @@ devmap["STARTMODE"] = @startmode devmap["IFPLUGD_PRIORITY"] = @ifplugd_priority.to_i if @startmode == "ifplugd" devmap["BOOTPROTO"] = @bootproto - devmap["_aliases"] = @aliases + devmap["_aliases"] = @aliases if @aliases && !(a)aliases.empty? log.info("aliases #{@aliases}") @@ -1839,6 +1841,11 @@ end # Commit pending operation + # + # It commits *only* content of the corresponding ifcfg into NetworkInterfaces. + # All other stuff which is managed by LanItems (like udev's, ...) is handled + # elsewhere + # # @return true if success def Commit if @operation != :add && @operation != :edit @@ -2018,21 +2025,28 @@ newdev["INTERFACETYPE"] = @type end - NetworkInterfaces.Name = Ops.get_string(@Items, [@current, "ifcfg"], "") - NetworkInterfaces.Current = deep_copy(newdev) + current_map = (GetCurrentMap() || {}).select { |_, v| !v.nil? && !v.empty? } + new_map = newdev.select { |_, v| !v.nil? && !v.empty? } + + # CanonicalizeIP is called to get new device map into the same shape as + # NetworkInterfaces provides the current one. + if current_map != NetworkInterfaces.CanonicalizeIP(new_map) + keep_existing = false + ifcfg_name = Items()[@current]["ifcfg"] + ifcfg_name.replace("") if !NetworkInterfaces.Change2(ifcfg_name, newdev, keep_existing) + + # bnc#752464 - can leak wireless passwords + # useful only for debugging. Writes huge struct mostly filled by defaults. + Builtins.y2debug("%1", NetworkInterfaces.ConcealSecrets1(newdev)) + + # configure bridge ports + if @bridge_ports + @bridge_ports.split.each { |bp| configure_as_bridge_port(bp) } + end - # bnc#752464 - can leak wireless passwords - # useful only for debugging. Writes huge struct mostly filled by defaults. - Builtins.y2debug("%1", NetworkInterfaces.ConcealSecrets1(newdev)) - - Ops.set(@Items, [@current, "ifcfg"], "") if !NetworkInterfaces.Commit - - # configure bridge ports - if @bridge_ports - @bridge_ports.split.each { |bp| configure_as_bridge_port(bp) } + SetModified() end - @modified = true @operation = nil true end @@ -2044,11 +2058,9 @@ log.info "rollback item #{@current}" if getCurrentItem.fetch("hwinfo", {}).empty? LanItems.Items.delete(@current) - else - if IsCurrentConfigured() - if !getNetworkInterfaces.include?(getCurrentItem["ifcfg"]) - LanItems.Items[(a)current].delete("ifcfg") - end + elsif IsCurrentConfigured() + if !getNetworkInterfaces.include?(getCurrentItem["ifcfg"]) + LanItems.Items[(a)current].delete("ifcfg") end end end @@ -2203,17 +2215,26 @@ # Creates eth emulation for s390 devices # - # @param [Hash] an s390 device description as obtained from AY profile - def createS390Device(rule) - Builtins.y2milestone("creating device s390 network device, #{rule}") - - Select("") - @type = rule["type"] || "" - @qeth_chanids = rule["chanids"] || "" - @qeth_layer2 = rule.fetch("layer2", false) - @qeth_portname = rule["portname"] || "" - @chan_mode = rule["protocol"] || "" - @iucv_user = rule["router"] || "" + # @param [Hash] an s390 device description (e.g. as obtained from AY profile). + # If it contains s390 device attributes definition, then these definitions takes + # precendence over values assigned to corresponding LanItems' global variables + # before the method invocation. Hash keys are strings named after LanItems' + # s390 globals. + def createS390Device(dev_attrs = {}) + Builtins.y2milestone("creating device s390 network device, #{dev_attrs}") + + # FIXME: leftover from dropping LanUdevAuto module. This was its way how to + # configure s390 specific globals. When running in "normal" mode these attributes + # are initialized elsewhere (see S390Dialog in include/network/lan/hardware.rb) + if !dev_attrs.empty? + Select("") + @type = dev_attrs["type"] || "" + @qeth_chanids = dev_attrs["chanids"] || "" + @qeth_layer2 = dev_attrs.fetch("layer2", false) + @qeth_portname = dev_attrs["portname"] || "" + @chan_mode = dev_attrs["protocol"] || "" + @iucv_user = dev_attrs["router"] || "" + end result = true # command to create device @@ -2286,7 +2307,7 @@ SCR.Execute(path(".target.bash_output"), command1), from: "any", to: "map <string, any>" - ) + ) if Ops.get_integer(output1, "exit", -1) == 0 && Builtins.size(Ops.get_string(output1, "stderr", "")) == 0 Builtins.y2milestone("Success : %1", output1) @@ -2365,8 +2386,6 @@ udev_rules end - private - # This helper allows YARD to extract DSL-defined attributes. # Unfortunately YARD has problems with the Capitalized ones, # so those must be done manually. @@ -2377,6 +2396,8 @@ publish variable: name, type: type end + private + # Checks if given lladdr can be written into ifcfg # # @param lladdr [String] logical link address, usually MAC address in case @@ -2460,7 +2481,7 @@ if Ops.greater_than( Builtins.size(Ops.get_string(chan_ids, "stdout", "")), 0 - ) + ) chanids = String.CutBlanks(Ops.get_string(chan_ids, "stdout", "")) end port_name = Convert.convert( @@ -2477,7 +2498,7 @@ if Ops.greater_than( Builtins.size(Ops.get_string(port_name, "stdout", "")), 0 - ) + ) portname = String.CutBlanks(Ops.get_string(port_name, "stdout", "")) end proto = Convert.convert( @@ -2494,7 +2515,7 @@ if Ops.greater_than( Builtins.size(Ops.get_string(proto, "stdout", "")), 0 - ) + ) protocol = String.CutBlanks(Ops.get_string(proto, "stdout", "")) end layer2_ret = SCR.Execute( @@ -2502,8 +2523,8 @@ Builtins.sformat( "grep -q 1 /sys/class/net/%1/device/layer2", device + ) ) - ) layer2 = layer2_ret == 0 Ops.set(ay, ["s390-devices", device], "type" => device_type) if Ops.greater_than(Builtins.size(chanids), 0) @@ -2531,7 +2552,7 @@ if Ops.greater_than( Builtins.size(Ops.get_string(port0, "stdout", "")), 0 - ) + ) value = Ops.get_string(port0, "stdout", "") Ops.set( ay, @@ -2564,8 +2585,6 @@ deep_copy(ay) end - public - # @attribute Items # @return [Hash<Integer, Hash<String, Object> >] # Each item, indexed by an Integer in a Hash, aggregates several aspects @@ -2581,7 +2600,6 @@ publish_variable :udev_net_rules, "map <string, any>" publish_variable :driver_options, "map <string, any>" publish_variable :autoinstall_settings, "map" - publish_variable :modified, "boolean" publish_variable :operation, "symbol" publish_variable :force_restart, "boolean" publish_variable :description, "string" @@ -2642,7 +2660,6 @@ publish_variable :tunnel_set_owner, "string" publish_variable :tunnel_set_group, "string" publish_variable :proposal_valid, "boolean" - publish_variable :nm_name, "string" publish function: :GetLanItem, type: "map (integer)" publish function: :getCurrentItem, type: "map ()" publish function: :IsItemConfigured, type: "boolean (integer)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.154/src/modules/SuSEFirewall4Network.rb new/yast2-network-3.1.158/src/modules/SuSEFirewall4Network.rb --- old/yast2-network-3.1.154/src/modules/SuSEFirewall4Network.rb 2016-06-09 15:23:32.000000000 +0200 +++ new/yast2-network-3.1.158/src/modules/SuSEFirewall4Network.rb 2016-06-23 10:23:17.000000000 +0200 @@ -205,6 +205,23 @@ Ops.greater_than(Builtins.size(interfaces), 0) end + # Checks if interface of given name is assigned to given FW zone + def iface_in_zone?(interface, zone) + SuSEFirewall.GetInterfacesInZone(zone).include?(interface) + end + + # Enables and starts fw service + def start_fw_service + SuSEFirewall.SetEnableService(true) + SuSEFirewall.SetStartService(true) + end + + # Disables and stops fw service + def stop_fw_service + SuSEFirewall.SetEnableService(false) + SuSEFirewall.SetStartService(false) + end + # Functions sets protection of interface by the protect-status.<br> # protect==true -> add interface into selected firewall zone, sets firewall # to be started and enabled when booting.<br> @@ -218,28 +235,24 @@ # @return [Boolean] if successful def ProtectByFirewall(interface, zone, protect_status) # Adding protection - if protect_status == true - Builtins.y2milestone( - "Enabling firewall because of '%1' interface", - interface - ) - SuSEFirewall.AddInterfaceIntoZone(interface, zone) - SuSEFirewall.SetEnableService(true) - SuSEFirewall.SetStartService(true) - # Removing protection + if protect_status + log.info("Enabling firewall because of '#{interface}' interface") + + SuSEFirewall.AddInterfaceIntoZone(interface, zone) if !iface_in_zone?(interface, zone) + + start_fw_service + # Removing protection else # removing from all known zones - Builtins.foreach(SuSEFirewall.GetKnownFirewallZones) do |remove_from_zone| + zones = SuSEFirewall.GetKnownFirewallZones.select { |fw_zone| iface_in_zone?(interface, fw_zone) } + zones.each do |remove_from_zone| SuSEFirewall.RemoveInterfaceFromZone(interface, remove_from_zone) end # if there are no other interfaces in configuration, stop firewall # and remove it from boot process if !AnyInterfacesHandledByFirewall() - Builtins.y2milestone( - "Disabling firewall, no interfaces are protected." - ) - SuSEFirewall.SetEnableService(false) - SuSEFirewall.SetStartService(false) + log.info("Disabling firewall, no interfaces are protected.") + stop_fw_service end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.154/test/complex_test.rb new/yast2-network-3.1.158/test/complex_test.rb --- old/yast2-network-3.1.154/test/complex_test.rb 2016-06-09 15:23:32.000000000 +0200 +++ new/yast2-network-3.1.158/test/complex_test.rb 2016-06-23 10:23:17.000000000 +0200 @@ -39,7 +39,7 @@ it "asks user for abort confirmation for input equal to :abort and user did modifications" do allow(Yast::LanItems) - .to receive(:modified) + .to receive(:GetModified) .and_return(true) expect(subject) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.154/test/lan_test.rb new/yast2-network-3.1.158/test/lan_test.rb --- old/yast2-network-3.1.154/test/lan_test.rb 2016-06-09 15:23:32.000000000 +0200 +++ new/yast2-network-3.1.158/test/lan_test.rb 2016-06-23 10:23:17.000000000 +0200 @@ -148,7 +148,7 @@ } } } - } + }.freeze expect(Yast::Lan.Import(AY_PROFILE)).to be true expect(Yast::LanItems.GetModified).to be true @@ -159,3 +159,54 @@ expect(Yast::LanItems.Items).to be_empty end end + +describe "LanClass#Modified" do + def reset_modification_statuses + allow(Yast::LanItems).to receive(:GetModified).and_return false + allow(Yast::DNS).to receive(:modified).and_return false + allow(Yast::Routing).to receive(:Modified).and_return false + allow(Yast::NetworkConfig).to receive(:Modified).and_return false + allow(Yast::NetworkService).to receive(:Modified).and_return false + allow(Yast::SuSEFirewall).to receive(:GetModified).and_return false + end + + def expect_modification_succeedes(modname, method) + reset_modification_statuses + + allow(modname) + .to receive(method) + .and_return true + + expect(modname.send(method)).to be true + expect(Yast::Lan.Modified).to be true + end + + it "returns true when LanItems module was modified" do + expect_modification_succeedes(Yast::LanItems, :GetModified) + end + + it "returns true when DNS module was modified" do + expect_modification_succeedes(Yast::DNS, :modified) + end + + it "returns true when Routing module was modified" do + expect_modification_succeedes(Yast::Routing, :Modified) + end + + it "returns true when NetworkConfig module was modified" do + expect_modification_succeedes(Yast::NetworkConfig, :Modified) + end + + it "returns true when NetworkService module was modified" do + expect_modification_succeedes(Yast::NetworkService, :Modified) + end + + it "returns true when SuSEFirewall module was modified" do + expect_modification_succeedes(Yast::SuSEFirewall, :GetModified) + end + + it "returns false when no module was modified" do + reset_modification_statuses + expect(Yast::Lan.Modified).to be false + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.154/test/network_autoyast_test.rb new/yast2-network-3.1.158/test/network_autoyast_test.rb --- old/yast2-network-3.1.154/test/network_autoyast_test.rb 2016-06-09 15:23:32.000000000 +0200 +++ new/yast2-network-3.1.158/test/network_autoyast_test.rb 2016-06-23 10:23:17.000000000 +0200 @@ -244,9 +244,9 @@ expect(network_autoyast.keep_net_config?).to be false end - it "fails when keep_install_network is not present in AY profile" do + it "succeedes when keep_install_network is not present in AY profile" do keep_install_network_value({}) - expect(network_autoyast.keep_net_config?).to be false + expect(network_autoyast.keep_net_config?).to be true end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.154/test/suse_firewall_4_network_test.rb new/yast2-network-3.1.158/test/suse_firewall_4_network_test.rb --- old/yast2-network-3.1.154/test/suse_firewall_4_network_test.rb 2016-06-09 15:23:32.000000000 +0200 +++ new/yast2-network-3.1.158/test/suse_firewall_4_network_test.rb 2016-06-23 10:23:17.000000000 +0200 @@ -63,5 +63,41 @@ end end end + + describe "ProtectByFirewall" do + Yast.import "SuSEFirewall" + + context "when interface is not in fw zone" do + before(:each) do + allow(SuSEFirewall) + .to receive(:SetEnableService) + allow(SuSEFirewall) + .to receive(:SetStartService) + end + + it "doesn't cause modification flag to be set when protect status is true" do + allow(SuSEFirewall) + .to receive(:GetInterfacesInZone) + .and_return(["eth0"]) + + SuSEFirewall4Network.ProtectByFirewall("eth0", "INT", true) + + # interface is in the zone already => no adding / modification needed + expect(SuSEFirewall.GetModified).to be false + end + + it "doesn't cause modification flag to be set when protect status is false" do + allow(SuSEFirewall) + .to receive(:GetInterfacesInZone) + .and_return([]) + + # Note: zone is not important in this case + SuSEFirewall4Network.ProtectByFirewall("eth0", "INT", false) + + # every zone is empty => no removal / modification needed + expect(SuSEFirewall.GetModified).to be false + end + end + end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.154/test/udev_test.rb new/yast2-network-3.1.158/test/udev_test.rb --- old/yast2-network-3.1.154/test/udev_test.rb 2016-06-09 15:23:32.000000000 +0200 +++ new/yast2-network-3.1.158/test/udev_test.rb 2016-06-23 10:23:17.000000000 +0200 @@ -78,17 +78,29 @@ describe "LanItems#ReplaceItemUdev" do Yast.import "LanItems" + before(:each) do + Yast::LanItems.current = 0 + + # LanItems should create "udev" and "net" subkeys for each item + # during Read + allow(Yast::LanItems) + .to receive(:Items) + .and_return(0 => { "udev" => { "net" => [] } }) + end + it "replaces triplet in the rule as requested" do allow(Yast::LanItems) .to receive(:getUdevFallback) .and_return( [ - "KERNELS=\"invalid\"", + "KERNELS==\"invalid\"", "KERNEL=\"eth*\"", "NAME=\"eth1\"" ] ) + expect(Yast::LanItems).to receive(:SetModified) + updated_rule = Yast::LanItems.ReplaceItemUdev( "KERNELS", "ATTR{address}", @@ -96,4 +108,24 @@ ) expect(updated_rule).to include "ATTR{address}==\"xx:01:02:03:04:05\"" end + + it "do not set modification flag in case of no change" do + allow(Yast::LanItems) + .to receive(:getUdevFallback) + .and_return( + [ + "ATTR{address}==\"xx:01:02:03:04:05\"", + "KERNEL=\"eth*\"", + "NAME=\"eth1\"" + ] + ) + + Yast::LanItems.ReplaceItemUdev( + "KERNELS", + "ATTR{address}", + "xx:01:02:03:04:05" + ) + + expect(Yast::LanItems).not_to receive(:SetModified) + end end

1 0