April 2016 - openSUSE Commits - openSUSE Mailing Lists

commit grep for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package grep for openSUSE:Factory checked in at 2016-04-30 23:22:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grep (Old) and /work/SRC/openSUSE:Factory/.grep.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "grep" Changes: -------- --- /work/SRC/openSUSE:Factory/grep/grep.changes 2015-12-03 13:24:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.grep.new/grep.changes 2016-04-30 23:22:54.000000000 +0200 @@ -1,0 +2,71 @@ +Fri Apr 22 13:49:18 UTC 2016 - astieger(a)suse.com + +- grep 2.25: + * In the C or POSIX locale, grep now treats all bytes as valid + characters even if the C runtime library says otherwise. + ( Fixes yast2-users and other build failures - boo#966780 ) + * grep -oz now uses null bytes, not newlines, to terminate output + lines. + * grep now outputs details more consistently when reporting a + write error. + +------------------------------------------------------------------- +Fri Mar 11 09:30:02 UTC 2016 - mpluskal(a)suse.com + +- Update to 2.24 + * grep -z would match strings it should not. To trigger the bug, + you'd have to use a regular expression including an anchor + (^ or $) and a feature like a range or a backreference, causing + grep to forego its DFA matcher and resort to using re_search. + With a multibyte locale, that matcher could mistakenly match a + string containing a newline. For example, this command: + printf 'a\nb\0' | LC_ALL=en_US.utf-8 grep -z '^[a-b]*b' + would mistakenly match and print all four input bytes. After + the fix, there is no match, as expected. + [bug introduced in grep-2.7] + * grep -Pz now diagnoses attempts to use patterns containing ^ + and $, instead of mishandling these patterns. This problem + seems to be inherent to the PCRE API; removing this limitation + is on PCRE's maint/README wish list. Patterns can continue to + match literal ^ and $ by escaping them with \ (now needed even + inside [...]). [bug introduced in grep-2.5] + +------------------------------------------------------------------- +Fri Feb 5 08:01:46 UTC 2016 - mpluskal(a)suse.com + +- Update to 2.23 + * Binary files are now less likely to generate diagnostics and + more likely to yield text matches. grep now reports "Binary + file FOO matches" and suppresses further output instead of + outputting a line containing an encoding error; hence grep can + now report matching text before a later binary match. + Formerly, grep reported FOO to be binary when it found an + encoding error in FOO before generating output for FOO, which + meant it never reported both matching text and matching binary + data; this was less useful for searching text containing + encoding errors in non-matching lines. [bug introduced in + grep-2.21] + * grep -c no longer stops counting when finding binary data. + [bug introduced in grep-2.21] + * grep no longer outputs encoding errors in unibyte locales. For + example, if the byte '\x81' is not a valid character in a + unibyte locale, grep treats the byte as binary data. [bug + introduced in grep-2.21] + * grep -oP is no longer susceptible to an infinite loop when + processing invalid UTF8 just before a match. [bug introduced in + grep-2.22] + * --exclude and related options are now matched against trailing + parts of command-line arguments, not against the entire + arguments. This partly reverts the --exclude-related change + in 2.22. [bug introduced in grep-2.22] + * --line-buffer is no longer ineffective when combined with -l. + [bug introduced in grep-2.5] + * -xw is now equivalent to -x more consistently, with -P and + with backrefs. [bug only partially fixed in grep-2.19] +- Update info handling scriplets + * move from postun to preun + * add dependeny for preun +- Refresh partially upstreamed patch + * testsuite.patch + +------------------------------------------------------------------- Old: ---- grep-2.22.tar.xz grep-2.22.tar.xz.sig New: ---- grep-2.25.tar.xz grep-2.25.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grep.spec ++++++ --- /var/tmp/diff_new_pack.jGrtLY/_old 2016-04-30 23:22:55.000000000 +0200 +++ /var/tmp/diff_new_pack.jGrtLY/_new 2016-04-30 23:22:55.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package grep # -# 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 @@ -17,7 +17,7 @@ Name: grep -Version: 2.22 +Version: 2.25 Release: 0 Summary: Print lines matching a pattern License: GPL-3.0+ @@ -31,6 +31,7 @@ BuildRequires: pcre-devel BuildRequires: xz Requires(pre): %{install_info_prereq} +Requires(preun): %{install_info_prereq} Provides: base:%{_bindir}/grep BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} < 1120 @@ -84,7 +85,7 @@ %post %install_info --info-dir=%{_infodir} %{_infodir}/grep.info.gz -%postun +%preun %install_info_delete --info-dir=%{_infodir} %{_infodir}/grep.info.gz %files -f %{name}.lang ++++++ grep-2.22.tar.xz -> grep-2.25.tar.xz ++++++ ++++ 42571 lines of diff (skipped) ++++++ testsuite.patch ++++++ --- /var/tmp/diff_new_pack.jGrtLY/_old 2016-04-30 23:22:56.000000000 +0200 +++ /var/tmp/diff_new_pack.jGrtLY/_new 2016-04-30 23:22:56.000000000 +0200 @@ -17,13 +17,13 @@ tests/mb-non-UTF8-performance | 5 +++++ 2 files changed, 10 insertions(+) -diff --git a/tests/long-pattern-perf b/tests/long-pattern-perf -index c222c02..2c9d080 100755 ---- a/tests/long-pattern-perf -+++ b/tests/long-pattern-perf -@@ -20,6 +20,11 @@ - - fail=0 +Index: grep-2.24/tests/long-pattern-perf +=================================================================== +--- grep-2.24.orig/tests/long-pattern-perf ++++ grep-2.24/tests/long-pattern-perf +@@ -25,6 +25,11 @@ fail=0 + # "expensive", making it less likely to be run by regular users. + expensive_ +# This test is susceptible to failure due to differences in +# system load during the two test runs, so we'll mark it as @@ -33,22 +33,3 @@ echo x > in || framework_failure_ # We could use seq -s '' (avoiding the tr filter), but I # suspect some version of seq does not honor that option. -diff --git a/tests/mb-non-UTF8-performance b/tests/mb-non-UTF8-performance -index 228361d..9bd5d39 100755 ---- a/tests/mb-non-UTF8-performance -+++ b/tests/mb-non-UTF8-performance -@@ -22,6 +22,11 @@ - - fail=0 - -+# This test is susceptible to failure due to differences in -+# system load during the two test runs, so we'll mark it as -+# "expensive", making it less likely to be run by regular users. -+expensive_ -+ - # Make this large enough so that even on high-end systems - # it incurs at least 5-10ms of user time. - yes $(printf '%078d' 0) | head -400000 > in || framework_failure_ --- -2.6.3 -

1 0

commit gettext-runtime for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package gettext-runtime for openSUSE:Factory checked in at 2016-04-30 23:22:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gettext-runtime (Old) and /work/SRC/openSUSE:Factory/.gettext-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gettext-runtime" Changes: -------- --- /work/SRC/openSUSE:Factory/gettext-runtime/gettext-csharp.changes 2015-10-14 16:34:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gettext-runtime.new/gettext-csharp.changes 2016-04-30 23:22:30.000000000 +0200 @@ -1,0 +2,11 @@ +Mon Apr 4 19:15:53 UTC 2016 - astieger(a)suse.com + +- GNU gettext 0.19.7: + * can now load custom string extraction rules in XML + Internationalization Tag Set (ITS) standard + * the existing XML-based language scanners (Glade, GSettings, and + AppData) rewritten using ITS + * Add msgfmt --xml option to merge translations back to the + original XML document. + +------------------------------------------------------------------- gettext-java.changes: same change --- /work/SRC/openSUSE:Factory/gettext-runtime/gettext-runtime-mini.changes 2016-04-17 22:14:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gettext-runtime.new/gettext-runtime-mini.changes 2016-04-30 23:22:30.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Apr 22 19:34:10 UTC 2016 - astieger(a)suse.com + +- drop gettext-runtime-grep-2.24.patch, no longer required for 2.25 + +------------------------------------------------------------------- +Sun Apr 17 17:56:27 UTC 2016 - astieger(a)suse.com + +- GNU gettext 0.19.7: + * can now load custom string extraction rules in XML + Internationalization Tag Set (ITS) standard + * the existing XML-based language scanners (Glade, GSettings, and + AppData) rewritten using ITS + * Add msgfmt --xml option to merge translations back to the + original XML document. + +------------------------------------------------------------------- gettext-runtime.changes: same change Old: ---- gettext-0.19.6.tar.xz gettext-0.19.6.tar.xz.sig gettext-runtime-grep-2.24.patch New: ---- gettext-0.19.7.tar.xz gettext-0.19.7.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gettext-csharp.spec ++++++ --- /var/tmp/diff_new_pack.aztGZJ/_old 2016-04-30 23:22:32.000000000 +0200 +++ /var/tmp/diff_new_pack.aztGZJ/_new 2016-04-30 23:22:32.000000000 +0200 @@ -29,7 +29,7 @@ BuildRequires: xz Requires: mono Url: http://www.gnu.org/software/gettext/ -Version: 0.19.6 +Version: 0.19.7 Release: 0 Summary: Native Language Support (NLS) for C# License: LGPL-2.1+ ++++++ gettext-java.spec ++++++ --- /var/tmp/diff_new_pack.aztGZJ/_old 2016-04-30 23:22:32.000000000 +0200 +++ /var/tmp/diff_new_pack.aztGZJ/_new 2016-04-30 23:22:32.000000000 +0200 @@ -28,7 +28,7 @@ BuildRequires: tcl BuildRequires: xz Url: http://www.gnu.org/software/gettext/ -Version: 0.19.6 +Version: 0.19.7 Release: 0 Summary: Java Support for Native Language Support (NLS) License: LGPL-2.1+ ++++++ gettext-runtime-mini.spec ++++++ --- /var/tmp/diff_new_pack.aztGZJ/_old 2016-04-30 23:22:32.000000000 +0200 +++ /var/tmp/diff_new_pack.aztGZJ/_new 2016-04-30 23:22:32.000000000 +0200 @@ -20,7 +20,7 @@ %bcond_without mini Name: gettext-runtime-mini -Version: 0.19.6 +Version: 0.19.7 Release: 0 BuildRequires: gcc-c++ BuildRequires: libtool @@ -70,8 +70,6 @@ Patch9: gettext-needlessly_init_vars.patch # PATCH-FIX-UPSTREAM boo#941629 -- pth(a)suse.com Patch11: boo941629-unnessary-rpath-on-standard-path.patch -# PATCH-FIX-UPSTREAM gettext-runtime-grep-2.24.patch dimstar(a)opensuse.org -- Fix testsuite execution with grep 2.24 -Patch12: gettext-runtime-grep-2.24.patch %description This package contains the intl library as well as tools that ease the @@ -132,7 +130,6 @@ %patch6 -p1 %patch9 %patch11 -p1 -%patch12 -p1 %build # expect a couple "You should update your `aclocal.m4' by running aclocal." @@ -286,6 +283,8 @@ %_datadir/%pacname/styles %_datadir/%pacname/archive.dir.tar.xz %_datadir/aclocal/* +%dir %{_datadir}/%{pacname}-%{version} +%{_datadir}/%{pacname}-%{version}/its %files tools-doc %defattr(-,root,root) ++++++ gettext-runtime.spec ++++++ --- /var/tmp/diff_new_pack.aztGZJ/_old 2016-04-30 23:22:32.000000000 +0200 +++ /var/tmp/diff_new_pack.aztGZJ/_new 2016-04-30 23:22:32.000000000 +0200 @@ -20,7 +20,7 @@ %bcond_with mini Name: gettext-runtime -Version: 0.19.6 +Version: 0.19.7 Release: 0 BuildRequires: gcc-c++ BuildRequires: libtool @@ -70,8 +70,6 @@ Patch9: gettext-needlessly_init_vars.patch # PATCH-FIX-UPSTREAM boo#941629 -- pth(a)suse.com Patch11: boo941629-unnessary-rpath-on-standard-path.patch -# PATCH-FIX-UPSTREAM gettext-runtime-grep-2.24.patch dimstar(a)opensuse.org -- Fix testsuite execution with grep 2.24 -Patch12: gettext-runtime-grep-2.24.patch %description This package contains the intl library as well as tools that ease the @@ -132,7 +130,6 @@ %patch6 -p1 %patch9 %patch11 -p1 -%patch12 -p1 %build # expect a couple "You should update your `aclocal.m4' by running aclocal." @@ -286,6 +283,8 @@ %_datadir/%pacname/styles %_datadir/%pacname/archive.dir.tar.xz %_datadir/aclocal/* +%dir %{_datadir}/%{pacname}-%{version} +%{_datadir}/%{pacname}-%{version}/its %files tools-doc %defattr(-,root,root) ++++++ gettext-0.19.6.tar.xz -> gettext-0.19.7.tar.xz ++++++ /work/SRC/openSUSE:Factory/gettext-runtime/gettext-0.19.6.tar.xz /work/SRC/openSUSE:Factory/.gettext-runtime.new/gettext-0.19.7.tar.xz differ: char 25, line 1 ++++++ gettext-0.19.6.tar.xz.sig -> gettext-0.19.7.tar.xz.sig ++++++ --- /work/SRC/openSUSE:Factory/gettext-runtime/gettext-0.19.6.tar.xz.sig 2015-10-14 16:34:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gettext-runtime.new/gettext-0.19.7.tar.xz.sig 2016-04-30 23:22:30.000000000 +0200 @@ -1,17 +1,17 @@ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 -iQIcBAABAgAGBQJV8k58AAoJENYFhI7X5phxf7AP/jDpNuWiBT3B4rDibkTQ9wzJ -uHM7dYniI/5B8MIUgUdl0NABNLMhKN3SI4Nr3EzMvt1vKqaDGA2J7uV+8KcyKGqF -KUx/bX2gEZ/BaRngsp5cRGpG+Rw5EalpVUvRADeUTJ1pzjAugkjfbAjJ2OGAdVV6 -F+Isbg00Zi8U8Ns+rAw+CkuEk4O1PZt53Y3TjJLUdmX4TEd74cJI8vZkOAUgkhHy -6wPJ3kvUhfNVYh0f6EU2PXL3E8g8tagICeoSnCm+mO6oWO/a+14ADp28Gh12n9IH -Ur7azrxS521m+SUfgV4GIL6w0P4Ha5Sp+ArYhVwpofFKyoBkNsHLQpdyTL5Inw6c -y/eTBHVmhwqWkNKfcuT4m7hEZ2M4D0d8awltDNDuZr0F52zn9m+9QWUL0PWqMlJH -uLgwBQdcLXl7962Dc1YO+OxBXLo05EgGd/B2b8MXjn0f5NtWpp4PWHKXxw2BVdhR -CR26+cNbyJ/X66PT3f2ZzY8s900y6liD1KBMxxQGYcJqjftkW07jUG6MZtaW/dV8 -LF9xwOajB96Fk7H31yTg3l3qlK+dPd28nC6H3TjBd+rLQH7XuebNrebNzNMBSjNq -BqomhJVUcOKqf8aadOQMtugOAMN2At8dDF57vFRu9hzf8MFJ0RQKqMaaGONS6KnW -tEbSHZHMJg9TutF6WmYl -=IGDw +iQIcBAABAgAGBQJWgJ7bAAoJENYFhI7X5phxjpIP/AxeNFsPjdiFkKW44SQfmXfa +m20MD6UN2uve/Ol3VECr6BI/texVkdJxIhEiy4KzqKfHTKzHsIFOYRQyg1ID1Jo6 +5hy5SWpFWNh5jw2E4q4Hwx/d6OtHGkk22dyAjgkMYxNRrLQdZ2vLCB1ga7dRCdwv +0vDH+lW7sDNgW99ym3jnOUCUlii4HvjjRU5IqyylNSDGpzCdw6kZRB88YkCQvnTj +eQeZxE67ubgKyEdFboMnsY0l+M5GcD38PiZIWNWTYRutlnEPDuYTNPd9ZxT9HPYV +hBUfGAdW7qALBBUwP/PrMxJtCO527sf3RkVddAq8HmuYhokO3Ed721Ai7pUQ4HEh +fKL9k8qKy/e6FfNH5OTqIF7v2LasIEA2UkxiHxboFfMw//ps1oUKzsk13FbkGMiw +rPcTsdrZUXXD8dBhd2OhpGDoqnH3wiHtcnA7PtQrIzv9TX8EDsolFucZImJDlANy +UUg7Y0fqtTmYgCvhjFPAHZ0Y3+zkaEHhKQfx51U/ZG1QqVVd2HPOWNJGMk3Qyfxd +g3tWEaS1kc5LUEDp7I6NcBjT+tOoem6UGP+G+sthvMRmLmSHNHeOttk9x2sSesc2 +8qQzojEy01ztNiQnqJ2S4dAGM99g208N3v8YYtAyfDHeFPCl9ner8EVSbIwr9feE +7pCr66G1TLtAMo22QpM8 +=Oy+9 -----END PGP SIGNATURE----- ++++++ gettext-dont-test-gnulib.patch ++++++ --- /var/tmp/diff_new_pack.aztGZJ/_old 2016-04-30 23:22:32.000000000 +0200 +++ /var/tmp/diff_new_pack.aztGZJ/_new 2016-04-30 23:22:32.000000000 +0200 @@ -1,29 +1,29 @@ Subject: This is not gnulib, so don't test it From: Stephan Kulow <coolo(a)suse.de> -Index: gettext-0.18.3.1/gettext-tools/Makefile.am +Index: gettext-0.19.7/gettext-tools/Makefile.am =================================================================== ---- gettext-0.18.3.1.orig/gettext-tools/Makefile.am -+++ gettext-0.18.3.1/gettext-tools/Makefile.am +--- gettext-0.19.7.orig/gettext-tools/Makefile.am ++++ gettext-0.19.7/gettext-tools/Makefile.am @@ -19,7 +19,7 @@ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 --SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples -+SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests examples +-SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples its ++SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests examples its EXTRA_DIST = misc/DISCLAIM MOSTLYCLEANFILES = core *.stackdump -Index: gettext-0.18.3.1/gettext-tools/Makefile.in +Index: gettext-0.19.7/gettext-tools/Makefile.in =================================================================== ---- gettext-0.18.3.1.orig/gettext-tools/Makefile.in -+++ gettext-0.18.3.1/gettext-tools/Makefile.in -@@ -1551,7 +1551,7 @@ top_builddir = @top_builddir@ +--- gettext-0.19.7.orig/gettext-tools/Makefile.in ++++ gettext-0.19.7/gettext-tools/Makefile.in +@@ -1865,7 +1865,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 --SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples -+SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests examples +-SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples its ++SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests examples its # Allow users to use "gnulib-tool --update".

1 0

commit libssh2_org for openSUSE:13.2:Update
by root＠hilbert.suse.de 29 Apr '16

29 Apr '16

Hello community, here is the log from the commit of package libssh2_org for openSUSE:13.2:Update checked in at 2016-04-29 10:35:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.2:Update/libssh2_org (Old) and /work/SRC/openSUSE:13.2:Update/.libssh2_org.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libssh2_org" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.Cjeowg/_old 2016-04-29 10:35:29.000000000 +0200 +++ /var/tmp/diff_new_pack.Cjeowg/_new 2016-04-29 10:35:29.000000000 +0200 @@ -1 +1 @@ -<link package='libssh2_org.4735' cicount='copy' /> +<link package='libssh2_org.5004' cicount='copy' />

1 0

commit libssh2_org.5004 for openSUSE:13.2:Update
by root＠hilbert.suse.de 29 Apr '16

29 Apr '16

Hello community, here is the log from the commit of package libssh2_org.5004 for openSUSE:13.2:Update checked in at 2016-04-29 10:35:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.2:Update/libssh2_org.5004 (Old) and /work/SRC/openSUSE:13.2:Update/.libssh2_org.5004.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libssh2_org.5004" Changes: -------- New Changes file: --- /dev/null 2016-04-07 01:36:33.300037506 +0200 +++ /work/SRC/openSUSE:13.2:Update/.libssh2_org.5004.new/libssh2_org.changes 2016-04-29 10:35:26.000000000 +0200 @@ -0,0 +1,339 @@ +------------------------------------------------------------------- +Thu Apr 21 14:57:27 UTC 2016 - pjanouch(a)suse.de + +- add bsc974691.patch (bsc#974691) + +------------------------------------------------------------------- +Tue Feb 23 13:56:38 UTC 2016 - vcizek(a)suse.com + +- fix CVE-2016-0787 (boo#967026) + * Weakness in diffie-hellman secret key generation + * add CVE-2016-0787.patch + +------------------------------------------------------------------- +Wed Mar 11 14:00:34 UTC 2015 - vcizek(a)suse.com + +- update to 1.5.0 + * fixes CVE-2015-1782 (bnc#921070) +Changes in 1.5.0: + Added Windows Cryptography API: Next Generation based backend +Bug fixes: + Security Advisory: Using `SSH_MSG_KEXINIT` data unbounded, CVE-2015-1782 + missing _libssh2_error in _libssh2_channel_write + knownhost: Fix DSS keys being detected as unknown. + knownhost: Restore behaviour of `libssh2_knownhost_writeline` with short buffer. + libssh2.h: on Windows, a socket is of type SOCKET, not int + libssh2_priv.h: a 1 bit bit-field should be unsigned + windows build: do not export externals from static library + Fixed two potential use-after-frees of the payload buffer + Fixed a few memory leaks in error paths + userauth: Fixed an attempt to free from stack on error + agent_list_identities: Fixed memory leak on OOM + knownhosts: Abort if the hosts buffer is too small + sftp_close_handle: ensure the handle is always closed + channel_close: Close the channel even in the case of errors + docs: added missing libssh2_session_handshake.3 file + docs: fixed a bunch of typos + userauth_password: pass on the underlying error code + _libssh2_channel_forward_cancel: accessed struct after free + _libssh2_packet_add: avoid using uninitialized memory + _libssh2_channel_forward_cancel: avoid memory leaks on error + _libssh2_channel_write: client spins on write when window full + windows build: fix build errors + publickey_packet_receive: avoid junk in returned pointers + channel_receive_window_adjust: store windows size always + userauth_hostbased_fromfile: zero assign to avoid uninitialized use + configure: change LIBS not LDFLAGS when checking for libs + agent_connect_unix: make sure there's a trailing zero + MinGW build: Fixed redefine warnings. + sftpdir.c: added authentication method detection. + Watcom build: added support for WinCNG build. + configure.ac: replace AM_CONFIG_HEADER with AC_CONFIG_HEADERS + sftp_statvfs: fix for servers not supporting statfvs extension + knownhost.c: use LIBSSH2_FREE macro instead of free + Fixed compilation using mingw-w64 + knownhost.c: fixed that 'key_type_len' may be used uninitialized + configure: Display individual crypto backends on separate lines + examples on Windows: check for WSAStartup return code + examples on Windows: check for socket return code + agent.c: check return code of MapViewOfFile + kex.c: fix possible NULL pointer de-reference with session->kex + packet.c: fix possible NULL pointer de-reference within listen_state + tests on Windows: check for WSAStartup return code + userauth.c: improve readability and clarity of for-loops + examples on Windows: use native SOCKET-type instead of int + packet.c: i < 256 was always true and i would overflow to 0 + kex.c: make sure mlist is not set to NULL + session.c: check return value of session_nonblock in debug mode + session.c: check return value of session_nonblock during startup + userauth.c: make sure that sp_len is positive and avoid overflows + knownhost.c: fix use of uninitialized argument variable wrote + openssl: initialise the digest context before calling EVP_DigestInit() + libssh2_agent_init: init ->fd to LIBSSH2_INVALID_SOCKET + configure.ac: Add zlib to Requires.private in libssh2.pc if using zlib + configure.ac: Rework crypto library detection + configure.ac: Reorder --with-* options in --help output + configure.ac: Call zlib zlib and not libz in text but keep option names + Fix non-autotools builds: Always define the LIBSSH2_OPENSSL CPP macro + sftp: seek: Don't flush buffers on same offset + sftp: statvfs: Along error path, reset the correct 'state' variable. + sftp: Add support for fsync (OpenSSH extension). + _libssh2_channel_read: fix data drop when out of window + comp_method_zlib_decomp: Improve buffer growing algorithm + _libssh2_channel_read: Honour window_size_initial + window_size: redid window handling for flow control reasons + knownhosts: handle unknown key types + +------------------------------------------------------------------- +Mon Jun 24 12:58:02 UTC 2013 - mvyskocil(a)suse.com + +- ignore groff-full to remove factory build cycle +- add groff to build requires to make tests passing + +------------------------------------------------------------------- +Wed Apr 24 07:54:17 UTC 2013 - boris(a)steki.net + +- fix building on older kernels and older OS / SLE + +------------------------------------------------------------------- +Thu Feb 28 21:13:29 UTC 2013 - crrodriguez(a)opensuse.org + +- Use AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER, fixes + build with new automake + +------------------------------------------------------------------- +Tue Jan 8 15:24:25 UTC 2013 - vcizek(a)suse.com + +- update to 1.4.3 + compression: add support for zlib(a)openssh.com + Bug fixes: + sftp_read: return error if a too large package arrives + libssh2_hostkey_hash.3: update the description of return value + examples: use stderr for messages, stdout for data + openssl: do not leak memory when handling errors + improved handling of disabled MD5 algorithm in OpenSSL + known_hosts: Fail when parsing unknown keys in known_hosts file + configure: gcrypt doesn't come with pkg-config support + session_free: wrong variable used for keeping state + libssh2_userauth_publickey_fromfile_ex.3: mention publickey == NULL + comp_method_zlib_decomp: handle Z_BUF_ERROR when inflating + Return LIBSSH2_ERROR_SOCKET_DISCONNECT on EOF when reading banner + userauth.c: fread() from public key file to correctly detect any errors + configure.ac: Add option to disable build of the example applications + Added 'Requires.private:' line to libssh2.pc + SFTP: filter off incoming "zombie" responses + gettimeofday: no need for a replacement under cygwin + SSH_MSG_CHANNEL_REQUEST: default to want_reply + win32/libssh2_config.h: Remove hardcoded #define LIBSSH2_HAVE_ZLIB + build error with gcrypt backend + always do "forced" window updates to avoid corner case stalls + aes: the init function fails when OpenSSL has AES support + transport_send: Finish in-progress key exchange before sending data + channel_write: acknowledge transport errors + examples/x11.c: Make sure sizeof passed to read operation is correct + examples/x11.c:,Fix suspicious sizeof usage + sftp_packet_add: verify the packet before accepting it + SFTP: preserve the original error code more + sftp_packet_read: adjust window size as necessary + Use safer snprintf rather then sprintf in several places + Define and use LIBSSH2_INVALID_SOCKET instead of INVALID_SOCKET + sftp_write: cannot return acked data *and* EAGAIN + sftp_read: avoid data *and* EAGAIN + libssh2.h: Add missing prototype for libssh2_session_banner_set() +- dropped patches (already in the upstream) + 0004-libssh2.h-Add-missing-prototype-for-libssh2_session_.patch + 0005-Add-symbol-versioning.patch + 0006-missing-libssh2_session_banner_set.patch + +------------------------------------------------------------------- +Thu Feb 2 13:36:17 UTC 2012 - crrodriguez(a)opensuse.org + +- fix license + +------------------------------------------------------------------- +Thu Feb 2 04:27:50 UTC 2012 - crrodriguez(a)opensuse.org + +- Update to version 1.4.0 plus git bugfixes + +------------------------------------------------------------------- +Tue Dec 27 03:41:32 UTC 2011 - crrodriguez(a)opensuse.org + +- Refresh patches. + +------------------------------------------------------------------- +Thu Dec 1 03:41:02 UTC 2011 - jengelh(a)medozas.de + +- Remove redundant/unwanted tags/section (cf. specfile guidelines) + +------------------------------------------------------------------- +Thu Dec 1 02:43:46 UTC 2011 - crrodriguez(a)opensuse.org + +- open library file descriptors with O_CLOEXEC + +------------------------------------------------------------------- +Fri Oct 21 18:15:49 UTC 2011 - crrodriguez(a)opensuse.org + +- Update to version 1.3.0 +* sftp_read: advance offset correctly for buffered copies +* libssh2_sftp_seek64: flush packetlist and buffered data +* _libssh2_packet_add: adjust window size when truncating +* sftp_read: a short read is not end of file + + +------------------------------------------------------------------- +Sat Oct 1 14:19:34 CEST 2011 - dmueller(a)suse.de + +- document the reason for the testsuite failure + +------------------------------------------------------------------- +Fri Sep 30 17:36:36 UTC 2011 - crrodriguez(a)opensuse.org + +- Workaround qemu-arm problems. + +------------------------------------------------------------------- +Tue Sep 6 04:42:00 UTC 2011 - crrodriguez(a)opensuse.org + +- respect user's openssl.cnf engine configuration, might + want to do crypto with aes-ni, intel-accell or use rdrand ++++ 142 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:13.2:Update/.libssh2_org.5004.new/libssh2_org.changes New: ---- CVE-2016-0787.patch baselibs.conf bsc974691.patch libssh2-1.5.0.tar.gz libssh2-ocloexec.patch libssh2_org.changes libssh2_org.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libssh2_org.spec ++++++ # # spec file for package libssh2_org # # 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Summary: A library implementing the SSH2 protocol License: BSD-3-Clause Group: Development/Libraries/C and C++ Name: libssh2_org Version: 1.5.0 Release: 0 Url: http://www.libssh2.org/ %define pkg_name libssh2 Source0: http://www.libssh2.org/download/%{pkg_name}-%{version}.tar.gz Source2: baselibs.conf BuildRequires: openssl-devel BuildRequires: pkgconfig BuildRequires: zlib-devel #for the test suite BuildRequires: groff BuildRequires: libtool BuildRequires: man BuildRequires: openssh # drops build cycle in Factory #!BuildIgnore: groff-full BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch0: libssh2-ocloexec.patch Patch1: CVE-2016-0787.patch Patch2: bsc974691.patch %description libssh2 is a library implementing the SSH2 protocol as defined by Internet Drafts: SECSH-TRANS, SECSH-USERAUTH, SECSH-CONNECTION, SECSH-ARCH, SECSH-FILEXFER, SECSH-DHGEX, SECSH-NUMBERS, and SECSH-PUBLICKEY. %package -n libssh2-1 Summary: A library implementing the SSH2 protocol Group: Development/Libraries/C and C++ %description -n libssh2-1 libssh2 is a library implementing the SSH2 protocol as defined by Internet Drafts: SECSH-TRANS, SECSH-USERAUTH, SECSH-CONNECTION, SECSH-ARCH, SECSH-FILEXFER, SECSH-DHGEX, SECSH-NUMBERS, and SECSH-PUBLICKEY. %package -n libssh2-devel Summary: A library implementing the SSH2 protocol Group: Development/Libraries/C and C++ Requires: glibc-devel Requires: libssh2-1 = %{version} %description -n libssh2-devel libssh2 is a library implementing the SSH2 protocol as defined by Internet Drafts: SECSH-TRANS, SECSH-USERAUTH, SECSH-CONNECTION, SECSH-ARCH, SECSH-FILEXFER, SECSH-DHGEX, SECSH-NUMBERS, and SECSH-PUBLICKEY. %prep %setup -q -n %{pkg_name}-%{version} # problem with sle 11 sp1 target as it has older kernel and as such fail this %if 0%{?suse_version} > 1110 %patch0 -p1 %endif %patch1 -p1 %patch2 -p1 %build sed -i -e 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@g' configure.ac cp src/libssh2_config.h.in example/libssh2_config.h # remove m4 macro files for libtool as they should be picked up by # autoreconf rm -v m4/libtool.m4 m4/lt* autoreconf -fiv export CFLAGS="%optflags -DOPENSSL_LOAD_CONF" %configure \ --disable-static --with-pic \ --disable-rpath --with-libz=%{_prefix} \ --with-openssl=%{_prefix} make %{?_smp_mflags} %if !0%{?sles_version} %if 0%{?suse_version} >= 1230 %check make check %endif %endif %install make install DESTDIR=%{buildroot} rm -f %{buildroot}%{_libdir}/*.la %{buildroot}%{_libdir}/*.a %post -n libssh2-1 -p /sbin/ldconfig %postun -n libssh2-1 -p /sbin/ldconfig %files -n libssh2-1 %defattr(-,root,root) %{_libdir}/libssh2.so.1* %files -n libssh2-devel %defattr(-,root,root) %doc NEWS %{_libdir}/libssh2.so %{_includedir}/*.h %{_mandir}/man3/* %{_libdir}/pkgconfig/libssh2.pc %changelog ++++++ CVE-2016-0787.patch ++++++ >From 8a453a7b0f1e667b7369eb73b00843a8decdecc9 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg <daniel(a)haxx.se> Date: Thu, 11 Feb 2016 13:52:20 +0100 Subject: [PATCH] diffie_hellman_sha256: convert bytes to bits As otherwise we get far too small numbers. CVE-2016-0787 --- src/kex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: libssh2-1.5.0/src/kex.c =================================================================== --- libssh2-1.5.0.orig/src/kex.c 2015-03-11 08:06:02.000000000 +0100 +++ libssh2-1.5.0/src/kex.c 2016-02-23 14:56:29.029375454 +0100 @@ -103,7 +103,7 @@ static int diffie_hellman_sha1(LIBSSH2_S memset(&exchange_state->req_state, 0, sizeof(packet_require_state_t)); /* Generate x and e */ - _libssh2_bn_rand(exchange_state->x, group_order, 0, -1); + _libssh2_bn_rand(exchange_state->x, group_order * 8 - 1, 0, -1); _libssh2_bn_mod_exp(exchange_state->e, g, exchange_state->x, p, exchange_state->ctx); ++++++ baselibs.conf ++++++ libssh2-1 obsoletes "libssh2-<targettype> <= <version>" provides "libssh2-<targettype> = <version>" ++++++ bsc974691.patch ++++++ commit 14d9ee01bc52ab55b44b1c402e810aa52e6a1364 Author: Will Cosgrove <will(a)panic.com> Date: Thu Mar 12 16:28:26 2015 +0000 Must init HMAC_CTX before using it. Must init ctx before using it or openssl will reuse the hmac which is not thread safe and causes a crash. Added libssh2_hmac_ctx_init macro. diff --git a/src/knownhost.c b/src/knownhost.c index d6ab821..102cdee 100644 --- a/src/knownhost.c +++ b/src/knownhost.c @@ -418,6 +418,7 @@ knownhost_check(LIBSSH2_KNOWNHOSTS *hosts, stored hash. */ libssh2_hmac_ctx ctx; + libssh2_hmac_ctx_init(ctx); unsigned char hash[SHA_DIGEST_LENGTH]; if(SHA_DIGEST_LENGTH != node->name_len) { diff --git a/src/libgcrypt.h b/src/libgcrypt.h index 813fd2a..2a50a20 100644 --- a/src/libgcrypt.h +++ b/src/libgcrypt.h @@ -82,6 +82,7 @@ gcry_md_hash_buffer (GCRY_MD_MD5, out, message, len) #define libssh2_hmac_ctx gcry_md_hd_t +#define libssh2_hmac_ctx_init(ctx) #define libssh2_hmac_sha1_init(ctx, key, keylen) \ gcry_md_open (ctx, GCRY_MD_SHA1, GCRY_MD_FLAG_HMAC), \ gcry_md_setkey (*ctx, key, keylen) diff --git a/src/mac.c b/src/mac.c index 76894fc..d95f740 100644 --- a/src/mac.c +++ b/src/mac.c @@ -113,6 +113,7 @@ mac_method_hmac_sha1_hash(LIBSSH2_SESSION * session, _libssh2_htonu32(seqno_buf, seqno); + libssh2_hmac_ctx_init(ctx); libssh2_hmac_sha1_init(&ctx, *abstract, 20); libssh2_hmac_update(ctx, seqno_buf, 4); libssh2_hmac_update(ctx, packet, packet_len); @@ -186,6 +186,7 @@ mac_method_hmac_md5_hash(LIBSSH2_SESSION * session, unsigned char *buf, _libssh2_htonu32(seqno_buf, seqno); + libssh2_hmac_ctx_init(ctx); libssh2_hmac_md5_init(&ctx, *abstract, 16); libssh2_hmac_update(ctx, seqno_buf, 4); libssh2_hmac_update(ctx, packet, packet_len); @@ -258,6 +259,7 @@ mac_method_hmac_ripemd160_hash(LIBSSH2_SESSION * session, _libssh2_htonu32(seqno_buf, seqno); + libssh2_hmac_ctx_init(ctx); libssh2_hmac_ripemd160_init(&ctx, *abstract, 20); libssh2_hmac_update(ctx, seqno_buf, 4); libssh2_hmac_update(ctx, packet, packet_len); diff --git a/src/openssl.h b/src/openssl.h index 5533014..46cf90c 100644 --- a/src/openssl.h +++ b/src/openssl.h @@ -121,6 +121,8 @@ int libssh2_md5_init(libssh2_md5_ctx *); void libssh2_md5(const unsigned char *message, unsigned long len, unsigned char *out); #define libssh2_hmac_ctx HMAC_CTX +#define libssh2_hmac_ctx_init(ctx) \ + HMAC_CTX_init(&ctx) #define libssh2_hmac_sha1_init(ctx, key, keylen) \ HMAC_Init(ctx, key, keylen, EVP_sha1()) #define libssh2_hmac_md5_init(ctx, key, keylen) \ ++++++ libssh2-ocloexec.patch ++++++ >From 33a59a1905feb5d786e9d457f287dd9e81a9f747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez(a)opensuse.org> Date: Tue, 27 Dec 2011 00:33:28 -0300 Subject: [PATCH] Use O_CLOEXEC where needed --- src/agent.c | 2 +- src/knownhost.c | 4 ++-- src/userauth.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) Index: libssh2-1.4.3/src/agent.c =================================================================== --- libssh2-1.4.3.orig/src/agent.c 2012-03-05 20:04:56.000000000 +0100 +++ libssh2-1.4.3/src/agent.c 2013-01-08 16:24:07.572195659 +0100 @@ -152,7 +152,7 @@ agent_connect_unix(LIBSSH2_AGENT *agent) return _libssh2_error(agent->session, LIBSSH2_ERROR_BAD_USE, "no auth sock variable"); - agent->fd = socket(PF_UNIX, SOCK_STREAM, 0); + agent->fd = socket(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0); if (agent->fd < 0) return _libssh2_error(agent->session, LIBSSH2_ERROR_BAD_SOCKET, "failed creating socket"); Index: libssh2-1.4.3/src/knownhost.c =================================================================== --- libssh2-1.4.3.orig/src/knownhost.c 2012-08-21 20:27:22.000000000 +0200 +++ libssh2-1.4.3/src/knownhost.c 2013-01-08 16:24:07.573195691 +0100 @@ -907,7 +907,7 @@ libssh2_knownhost_readfile(LIBSSH2_KNOWN "Unsupported type of known-host information " "store"); - file = fopen(filename, "r"); + file = fopen(filename, "re"); if(file) { while(fgets(buf, sizeof(buf), file)) { if(libssh2_knownhost_readline(hosts, buf, strlen(buf), type)) { @@ -1082,7 +1082,7 @@ libssh2_knownhost_writefile(LIBSSH2_KNOW "Unsupported type of known-host information " "store"); - file = fopen(filename, "w"); + file = fopen(filename, "we"); if(!file) return _libssh2_error(hosts->session, LIBSSH2_ERROR_FILE, "Failed to open file"); Index: libssh2-1.4.3/src/userauth.c =================================================================== --- libssh2-1.4.3.orig/src/userauth.c 2012-04-18 22:24:04.000000000 +0200 +++ libssh2-1.4.3/src/userauth.c 2013-01-08 16:24:07.573195691 +0100 @@ -467,7 +467,7 @@ file_read_publickey(LIBSSH2_SESSION * se _libssh2_debug(session, LIBSSH2_TRACE_AUTH, "Loading public key file: %s", pubkeyfile); /* Read Public Key */ - fd = fopen(pubkeyfile, "r"); + fd = fopen(pubkeyfile, "re"); if (!fd) { return _libssh2_error(session, LIBSSH2_ERROR_FILE, "Unable to open public key file");

1 0

commit yast2-slide-show for openSUSE:Factory
by root＠hilbert.suse.de 28 Apr '16

28 Apr '16

Hello community, here is the log from the commit of package yast2-slide-show for openSUSE:Factory checked in at 2016-04-28 20:31:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-slide-show (Old) and /work/SRC/openSUSE:Factory/.yast2-slide-show.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-slide-show" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-slide-show/yast2-slide-show.changes 2016-04-06 11:52:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-slide-show.new/yast2-slide-show.changes 2016-04-28 20:31:17.000000000 +0200 @@ -1,0 +2,34 @@ +Wed Apr 27 13:43:32 UTC 2016 - git(a)opensuse.org + +- Update to version 84.87.20160427.88aaafc: + * Call msgmerge with --previous + * Import of translations from LCN SVN + * Translated using Weblate (Slovak) + * Point to www.o.o instead of wiki + * Translated using Weblate (Catalan) + * Translated using Weblate (Japanese) + * Translated using Weblate (Portuguese (Brazil)) + * Translated using Weblate (Ukrainian) + * Update pot file + * Merge pot file to po files + +------------------------------------------------------------------- +Mon Apr 18 16:41:36 UTC 2016 - git(a)opensuse.org + +- Update to version 84.87.20160418.6f56730: + * ensure stylesheet is up-to-date (bsc#973609) + * SUSE Cloud => SUSE OpenStack Cloud + * 3.1.23 + * Sync also the openSUSE stylesheet + * Get rid of YaST build system + * Install to /CD1 directly + * replace 01_welcome.png with 02_opensuse.png + * update README + +------------------------------------------------------------------- +Mon Apr 18 15:09:03 UTC 2016 - git(a)opensuse.org + +- new package layout based on refactored git sources +- Version 84.87.20160418.6f56730: + +------------------------------------------------------------------- Old: ---- slideshow-po.tar.gz slideshow-sles-po.tar.gz yast2-slide-show-3.1.23.tar.bz2 New: ---- _service _servicedata yast2-slide-show-84.87.20160427.88aaafc.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-slide-show.spec ++++++ --- /var/tmp/diff_new_pack.9Bchpt/_old 2016-04-28 20:31:18.000000000 +0200 +++ /var/tmp/diff_new_pack.9Bchpt/_new 2016-04-28 20:31:18.000000000 +0200 @@ -16,122 +16,39 @@ # -Name: yast2-slide-show -Version: 3.1.23 -Release: 0 - -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: %{name}-%{version}.tar.bz2 - +%define version_unconverted 84.87.20160427.88aaafc # xml2po uses temporary files that do not like being called twice # xml2po probably is not thread-safe. %define jobs 1 +Name: yast2-slide-show +Version: 84.87.20160427.88aaafc +Release: 0 +Summary: Slide show displayed during package installation with YaST +License: GPL-2.0 +Group: Metapackages +Source0: %{name}-%{version}.tar.xz BuildRequires: docbook_4 BuildRequires: gnome-doc-utils BuildRequires: pkgconfig BuildRequires: sgml-skel -BuildRequires: yast2-devtools >= 3.1.10 -%if 0%{?suse_version} > 1120 -# was in gnome-doc-utils before BuildRequires: xml2po -%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -Summary: YaST2 - Slide Show -License: GPL-2.0 -Group: Metapackages -Source10: slideshow-po.tar.gz -Source12: slideshow-sles-po.tar.gz %description The slide show displayed during package installation with YaST. -%package SuSELinux -Summary: YaST - Slide Show (openSUSE) -Group: Metapackages - -%description SuSELinux -The slide show displayed during package installation with YaST. - -%package SLES -Summary: YaST - Slide Show (SUSE Linux Enterprise Server) -Group: Metapackages - -%description SLES -The slide show displayed during package installation with YaST. - -%package SLED -Summary: YaST - Slide Show (SUSE Linux Enterprise Desktop) -Group: Metapackages - -%description SLED -The slide show displayed during package installation with YaST. - %prep -%setup -n %{name}-%{version} -pushd SuSELinux -tar xf %{S:10} -langs=$(tar tf %{S:10}|sed 's=.*po/==;s=\.po$==;/^$/d'|sort -u|fmt -w1000) -sed -i "s|^langs *=.*$|langs = en $langs|" Makefile.am -popd - -pushd SLED -tar xf %{S:12} -langs=$(tar tf %{S:12}|sed 's=.*po/==;s=\.po$==;/^$/d'|sort -u|fmt -w1000) -sed -i "s|^langs *=.*$|langs = en $langs|" Makefile.am -popd - -pushd SLES -tar xf %{S:12} -langs=$(tar tf %{S:12}|sed 's=.*po/==;s=\.po$==;/^$/d'|sort -u|fmt -w1000) -sed -i "s|^langs *=.*$|langs = en $langs|" Makefile.am -popd +%setup -q %build -%yast_build -./tools/check_utf-8 -# on OS use the openSUSE logo everywhere; see # 216562 -%if %suse_version >= 1020 -for f in SuSELinux/txt/*/01*.rtf; do - sed -i 's/01_welcome.png/02_opensuse.png/' $f -done -%endif +make %{?_smp_mflags} %install -%yast_install - -# Get rid of README files etc. auto-created by yast2-devtools -# (but useless for this special package) -/bin/rm -rf %{buildroot}%{_datadir}/doc/packages/yast2-slide-show - -# Get rid of test environment during autobuild -/bin/rm -rf %{buildroot}%{_datadir}/YaST2/clients/slide-show.ycp -/bin/rm -rf %{buildroot}%{_datadir}/YaST2/modules/SlideTester.ycp - -%files SuSELinux -%defattr(-,root,root) -%dir /SuSE -%dir /SuSE/SuSE -%dir /SuSE/SuSE/CD1 -%dir /SuSE/SuSE/CD1/suse -%dir /SuSE/SuSE/CD1/suse/setup -/SuSE/SuSE/CD1/suse/setup/slide/ - -%files SLES -%defattr(-,root,root) -%dir /SuSE -%dir /SuSE/SuSE-SLES -%dir /SuSE/SuSE-SLES/CD1 -%dir /SuSE/SuSE-SLES/CD1/suse -%dir /SuSE/SuSE-SLES/CD1/suse/setup -/SuSE/SuSE-SLES/CD1/suse/setup/slide/ +make %{?_smp_mflags} DESTDIR=%{buildroot} install -%files SLED +%files %defattr(-,root,root) -%dir /SuSE -%dir /SuSE/SuSE-SLED -%dir /SuSE/SuSE-SLED/CD1 -%dir /SuSE/SuSE-SLED/CD1/suse -%dir /SuSE/SuSE-SLED/CD1/suse/setup -/SuSE/SuSE-SLED/CD1/suse/setup/slide/ +/CD1 %changelog ++++++ _service ++++++ <services> <service name="tar_scm" mode="localonly"> <param name="filename">yast2-slide-show</param> <param name="versionformat">%cd.%h</param>  <param name="versionprefix">84.87</param> <param name="url">git://github.com/openSUSE/yast-slide-show.git</param> <param name="scm">git</param> <param name="changesgenerate">enable</param> <param name="changesauthor">git(a)opensuse.org</param> </service> <service name="recompress" mode="localonly"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="localonly"/> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/lnussel/yast-slide-show.git</param> <param name="changesrevision">6f56730fc1760741bd3b6e95b3f02dad104347f0</param></service><service name="tar_scm"> <param name="url">git://github.com/openSUSE/yast-slide-show.git</param> <param name="changesrevision">88aaafc5ae0158bd722f7d0f51ce713ee904993e</param></service></servicedata>

1 0

commit yast2-installation for openSUSE:Factory
by root＠hilbert.suse.de 28 Apr '16

28 Apr '16

Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2016-04-28 20:31:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2016-04-22 16:18:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2016-04-28 20:31:05.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Apr 20 10:47:12 UTC 2016 - knut.anderssen(a)suse.com + +- Disk Activation step will be skipped in case of installer update + success (bsc#974409) +- License agreement will be remembered in case of going back after + a installer update. +- 3.1.182 + +------------------------------------------------------------------- Old: ---- yast2-installation-3.1.181.tar.bz2 New: ---- yast2-installation-3.1.182.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.A6VjZy/_old 2016-04-28 20:31:06.000000000 +0200 +++ /var/tmp/diff_new_pack.A6VjZy/_new 2016-04-28 20:31:06.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.181 +Version: 3.1.182 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -50,7 +50,7 @@ Requires: autoyast2-installation >= 3.1.105 # Moved proc_modules.scr -Requires: yast2 >= 3.1.180 +Requires: yast2 >= 3.1.186 # Language::GetLanguageItems and other API # Language::Set (handles downloading the translation extensions) @@ -63,7 +63,7 @@ Conflicts: yast2-mouse < 2.18.0 # New API for ProductLicense -Requires: yast2-packager >= 2.19.2 +Requires: yast2-packager >= 3.1.96 # Storage::GetDetectedDiskPaths Requires: yast2-storage >= 2.24.1 ++++++ yast2-installation-3.1.181.tar.bz2 -> yast2-installation-3.1.182.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.181/doc/SELF_UPDATE.md new/yast2-installation-3.1.182/doc/SELF_UPDATE.md --- old/yast2-installation-3.1.181/doc/SELF_UPDATE.md 2016-04-19 15:25:10.000000000 +0200 +++ new/yast2-installation-3.1.182/doc/SELF_UPDATE.md 2016-04-28 15:04:36.000000000 +0200 @@ -37,12 +37,12 @@ 1. The `SelfUpdate` boot option 2. The AutoYaST control file - in AutoYaST installation only, use the - `/generic/self_update_url` XML node: + `/general/self_update_url` XML node: ```xml - <generic> + <general> <self_update_url>http://example.com/updates/$arch</self_update_url> - </generic> + </general> ``` 3. Hard-coded in the `control.xml` file on the installation medium (thus it depends on the base product): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.181/package/yast2-installation.changes new/yast2-installation-3.1.182/package/yast2-installation.changes --- old/yast2-installation-3.1.181/package/yast2-installation.changes 2016-04-19 15:25:10.000000000 +0200 +++ new/yast2-installation-3.1.182/package/yast2-installation.changes 2016-04-28 15:04:36.000000000 +0200 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Apr 20 10:47:12 UTC 2016 - knut.anderssen(a)suse.com + +- Disk Activation step will be skipped in case of installer update + success (bsc#974409) +- License agreement will be remembered in case of going back after + a installer update. +- 3.1.182 + +------------------------------------------------------------------- Tue Apr 19 09:08:35 UTC 2016 - igonzalezsosa(a)suse.com - Fix handling of license acceptance in welcome screen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.181/package/yast2-installation.spec new/yast2-installation-3.1.182/package/yast2-installation.spec --- old/yast2-installation-3.1.181/package/yast2-installation.spec 2016-04-19 15:25:10.000000000 +0200 +++ new/yast2-installation-3.1.182/package/yast2-installation.spec 2016-04-28 15:04:36.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.181 +Version: 3.1.182 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -47,7 +47,7 @@ Requires: autoyast2-installation >= 3.1.105 # Moved proc_modules.scr -Requires: yast2 >= 3.1.180 +Requires: yast2 >= 3.1.186 # Language::GetLanguageItems and other API # Language::Set (handles downloading the translation extensions) @@ -60,7 +60,7 @@ Conflicts: yast2-mouse < 2.18.0 # New API for ProductLicense -Requires: yast2-packager >= 2.19.2 +Requires: yast2-packager >= 3.1.96 # Storage::GetDetectedDiskPaths Requires: yast2-storage >= 2.24.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.181/src/lib/installation/clients/inst_complex_welcome.rb new/yast2-installation-3.1.182/src/lib/installation/clients/inst_complex_welcome.rb --- old/yast2-installation-3.1.181/src/lib/installation/clients/inst_complex_welcome.rb 2016-04-19 15:25:10.000000000 +0200 +++ new/yast2-installation-3.1.182/src/lib/installation/clients/inst_complex_welcome.rb 2016-04-28 15:04:36.000000000 +0200 @@ -42,8 +42,10 @@ textdomain "installation" + @license_id = Ops.get(Pkg.SourceGetCurrent(true), 0, 0) + # ------------------------------------- main part of the client ----------- - if data_stored? && !GetInstArgs.going_back + if Installation.restarting? && data_stored? apply_data return :next end @@ -53,8 +55,6 @@ @language = Language.language @keyboard = "" - @license_id = Ops.get(Pkg.SourceGetCurrent(true), 0, 0) - # ---------------------------------------------------------------------- # Build dialog # ---------------------------------------------------------------------- @@ -100,7 +100,8 @@ Keyboard.Set(@keyboard) Keyboard.user_decision = true when :license_agreement - InstData.product_license_accepted = UI.QueryWidget(Id(:license_agreement), :Value) + read_ui_state + InstData.product_license_accepted = @license_accepted when :language next if Mode.config read_ui_state @@ -144,6 +145,7 @@ Wizard.EnableAbortButton UI.ChangeWidget(Id(:language), :Value, @language) + UI.ChangeWidget(Id(:license_agreement), :Value, @license_accepted) if Keyboard.user_decision UI.ChangeWidget(Id(:keyboard), :Value, Keyboard.current_kbd) @@ -286,8 +288,9 @@ end def read_ui_state - @language = UI.QueryWidget(Id(:language), :Value) - @keyboard = UI.QueryWidget(Id(:keyboard), :Value) + @language = UI.QueryWidget(Id(:language), :Value) + @keyboard = UI.QueryWidget(Id(:keyboard), :Value) + @license_accepted = UI.QueryWidget(Id(:license_agreement), :Value) end def retranslate_yast @@ -321,6 +324,7 @@ def setup_final_choice Keyboard.Set(@keyboard) + InstData.product_license_accepted = @license_accepted # Language has been set already. # On first run store users decision as default. @@ -357,8 +361,9 @@ def store_data data = { - "language" => @language, - "keyboard" => @keyboard + "language" => @language, + "keyboard" => @keyboard, + "license_accepted" => @license_accepted } File.write(DATA_PATH, data.to_yaml) @@ -366,8 +371,10 @@ def apply_data data = YAML.load(File.read(DATA_PATH)) - @language = data["language"] - @keyboard = data["keyboard"] + @language = data["language"] + @keyboard = data["keyboard"] + @license_accepted = data["license_accepted"] + ProductLicense.info_seen!(@license_id) change_language setup_final_choice diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.181/src/lib/installation/clients/inst_disks_activate.rb new/yast2-installation-3.1.182/src/lib/installation/clients/inst_disks_activate.rb --- old/yast2-installation-3.1.181/src/lib/installation/clients/inst_disks_activate.rb 2016-04-19 15:25:10.000000000 +0200 +++ new/yast2-installation-3.1.182/src/lib/installation/clients/inst_disks_activate.rb 2016-04-28 15:04:36.000000000 +0200 @@ -26,6 +26,9 @@ # # $Id$ # + +require "installation/clients/inst_update_installer" + module Yast class InstDisksActivateClient < Client def main @@ -55,6 +58,8 @@ @have_zfcp = false @want_fcoe = false + return :next if Installation.restarting? + if Arch.s390 # popup label UI.OpenDialog(Label(_("Detecting Available Controllers"))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.181/src/lib/installation/clients/inst_update_installer.rb new/yast2-installation-3.1.182/src/lib/installation/clients/inst_update_installer.rb --- old/yast2-installation-3.1.181/src/lib/installation/clients/inst_update_installer.rb 2016-04-19 15:25:10.000000000 +0200 +++ new/yast2-installation-3.1.182/src/lib/installation/clients/inst_update_installer.rb 2016-04-28 15:04:36.000000000 +0200 @@ -40,14 +40,16 @@ textdomain "installation" return :back if GetInstArgs.going_back + + Installation.finish_restarting! if Installation.restarting? + return :next unless try_to_update? log.info("Trying installer update") if update_installer ::FileUtils.touch(update_flag_file) # Indicates that the installer was updated. - ::FileUtils.touch(Installation.restart_file) - :restart_yast # restart YaST to apply modifications. + Installation.restart! else :next end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.181/test/inst_complex_welcome_test.rb new/yast2-installation-3.1.182/test/inst_complex_welcome_test.rb --- old/yast2-installation-3.1.181/test/inst_complex_welcome_test.rb 2016-04-19 15:25:10.000000000 +0200 +++ new/yast2-installation-3.1.182/test/inst_complex_welcome_test.rb 2016-04-28 15:04:36.000000000 +0200 @@ -13,6 +13,7 @@ before do stub_const("Yast::InstComplexWelcomeClient::DATA_PATH", store_path) + allow(Yast::ProductLicense).to receive(:info_seen?) { true } end after do @@ -20,6 +21,7 @@ end describe "#main" do + let(:restarting) { false } context "when installation Mode is auto" do it "returns :auto" do expect(Yast::Mode).to receive(:autoinst) { true } @@ -31,18 +33,29 @@ context "when installation mode is not auto" do before do expect(Yast::Mode).to receive(:autoinst) { false } + allow(Yast::Installation).to receive(:restarting?) { restarting } end - context "and previous data exist" do - it "applies data and returns :next" do + context "and installer is restarting" do + let(:restarting) { true } + it "applies data if exists and returns next" do allow(subject).to receive(:data_stored?) { true } expect(subject).to receive(:apply_data) expect(subject.main).to eql(:next) end + + it "does not apply data if not exists and continues as not restarting" do + allow(subject).to receive(:data_stored?) { false } + expect(subject).not_to receive(:apply_data) + allow(subject).to receive(:event_loop) + expect(subject).to receive(:initialize_dialog) + + subject.main + end end - context "and no previous data exist" do + context "and installer is not restarting" do before do allow(subject).to receive(:data_stored?) { false } end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.181/test/inst_disks_activate_test.rb new/yast2-installation-3.1.182/test/inst_disks_activate_test.rb --- old/yast2-installation-3.1.181/test/inst_disks_activate_test.rb 2016-04-19 15:25:10.000000000 +0200 +++ new/yast2-installation-3.1.182/test/inst_disks_activate_test.rb 2016-04-28 15:04:36.000000000 +0200 @@ -10,11 +10,11 @@ Yast.import "GetInstArgs" Yast.import "UI" Yast.import "Popup" - Yast.import "Storage" describe "#main" do let(:probed_disks) { [] } let(:s390) { false } + let(:restarting) { false } before do allow(Yast::Linuxrc).to receive(:InstallInf).with("WithFCoE").and_return("0") @@ -22,7 +22,18 @@ allow(Yast::UI).to receive(:CloseDialog) allow(Yast::Popup).to receive(:ConfirmAbort).with(:painless).and_return(true) allow(Yast::Arch).to receive(:s390).and_return(s390) - allow(Yast::Storage).to receive(:ReReadTargetMap) + allow(Yast::GetInstArgs).to receive(:going_back) { going_back } + allow(Yast::Installation).to receive(:restarting?) { restarting } + stub_const("Yast::Storage", double("Yast::Storage", ReReadTargetMap: true)) + end + + context "when installation is restarting" do + let(:restarting) { true } + it "returns next" do + expect(Yast::Arch).to_not receive(:s390) + + expect(subject.main).to eql(:next) + end end context "when architecture is s390" do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.181/test/inst_update_installer_test.rb new/yast2-installation-3.1.182/test/inst_update_installer_test.rb --- old/yast2-installation-3.1.181/test/inst_update_installer_test.rb 2016-04-19 15:25:10.000000000 +0200 +++ new/yast2-installation-3.1.182/test/inst_update_installer_test.rb 2016-04-28 15:04:36.000000000 +0200 @@ -23,6 +23,8 @@ allow(Yast::Mode).to receive(:auto).and_return(false) allow(Yast::NetworkService).to receive(:isNetworkRunning).and_return(network_running) allow(::Installation::UpdatesManager).to receive(:new).and_return(manager) + allow(Yast::Installation).to receive(:restarting?) + allow(Yast::Installation).to receive(:restart!) { :restart_yast } # stub the Profile module to avoid dependency on autoyast2-installation ay_profile = double("Yast::Profile") @@ -51,7 +53,7 @@ end it "creates update file and returns :restart_yast" do - expect(::FileUtils).to receive(:touch).twice + expect(::FileUtils).to receive(:touch).once allow(subject).to receive(:self_update_enabled?).and_return(true) expect(subject.main).to eq(:restart_yast) end

1 0

commit yast2-add-on for openSUSE:Factory
by root＠hilbert.suse.de 28 Apr '16

28 Apr '16

Hello community, here is the log from the commit of package yast2-add-on for openSUSE:Factory checked in at 2016-04-28 20:30:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-add-on (Old) and /work/SRC/openSUSE:Factory/.yast2-add-on.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-add-on" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-add-on/yast2-add-on.changes 2016-02-17 12:26:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-add-on.new/yast2-add-on.changes 2016-04-28 20:30:57.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Apr 27 16:52:55 CEST 2016 - schubi(a)suse.de + +- AutoYaST: Do not reset add-on signature handling by the general + signature handling. (bnc#976859) +- 3.1.14 + +------------------------------------------------------------------- +Fri Apr 22 11:49:43 UTC 2016 - lslezak(a)suse.cz + +- Added missing "priority" tag in the AutoYaST schema (bsc#976457) +- 3.1.13 + +------------------------------------------------------------------- Old: ---- yast2-add-on-3.1.12.tar.bz2 New: ---- yast2-add-on-3.1.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on.spec ++++++ --- /var/tmp/diff_new_pack.eNWzp2/_old 2016-04-28 20:30:58.000000000 +0200 +++ /var/tmp/diff_new_pack.eNWzp2/_new 2016-04-28 20:30:58.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-add-on -Version: 3.1.12 +Version: 3.1.14 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-add-on-3.1.12.tar.bz2 -> yast2-add-on-3.1.14.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.1.12/package/yast2-add-on.changes new/yast2-add-on-3.1.14/package/yast2-add-on.changes --- old/yast2-add-on-3.1.12/package/yast2-add-on.changes 2016-02-12 10:51:38.000000000 +0100 +++ new/yast2-add-on-3.1.14/package/yast2-add-on.changes 2016-04-27 17:18:27.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Wed Apr 27 16:52:55 CEST 2016 - schubi(a)suse.de + +- AutoYaST: Do not reset add-on signature handling by the general + signature handling. (bnc#976859) +- 3.1.14 + +------------------------------------------------------------------- +Fri Apr 22 11:49:43 UTC 2016 - lslezak(a)suse.cz + +- Added missing "priority" tag in the AutoYaST schema (bsc#976457) +- 3.1.13 + +------------------------------------------------------------------- Thu Feb 11 15:15:24 CET 2016 - schubi(a)suse.de - Confirming add-on product licenses while AutoYaST installation. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.1.12/package/yast2-add-on.spec new/yast2-add-on-3.1.14/package/yast2-add-on.spec --- old/yast2-add-on-3.1.12/package/yast2-add-on.spec 2016-02-12 10:51:38.000000000 +0100 +++ new/yast2-add-on-3.1.14/package/yast2-add-on.spec 2016-04-27 17:18:27.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-add-on -Version: 3.1.12 +Version: 3.1.14 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.1.12/src/autoyast-rnc/add-on.rnc new/yast2-add-on-3.1.14/src/autoyast-rnc/add-on.rnc --- old/yast2-add-on-3.1.12/src/autoyast-rnc/add-on.rnc 2016-02-12 10:51:38.000000000 +0100 +++ new/yast2-add-on-3.1.14/src/autoyast-rnc/add-on.rnc 2016-04-27 17:18:27.000000000 +0200 @@ -12,6 +12,7 @@ alias? & product_dir? & ask_on_error? & + priority? & element signature-handling { element accept_unsigned_file { BOOLEAN }? & element accept_file_without_checksum { BOOLEAN }? & @@ -45,6 +46,7 @@ alias = element alias { text } product_dir = element product_dir { text } ask_on_error = element ask_on_error { BOOLEAN } +priority = element priority { INTEGER } add_on_products = element add_on_products { attribute config:type { text }?, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.1.12/src/clients/add-on_auto.rb new/yast2-add-on-3.1.14/src/clients/add-on_auto.rb --- old/yast2-add-on-3.1.12/src/clients/add-on_auto.rb 2016-02-12 10:51:38.000000000 +0100 +++ new/yast2-add-on-3.1.14/src/clients/add-on_auto.rb 2016-04-27 17:18:27.000000000 +0200 @@ -207,8 +207,6 @@ # bugzilla #260613 AddOnProduct.Integrate(srcid) if srcid != -1 - # reset to global sig-handling - AutoinstGeneral.SetSignatureHandling end while Ops.get(@sources, [media, pth], -1) == -1 && Ops.get_boolean(prod, "ask_on_error", false) == true Ops.set(prod, "media", Ops.get(@sources, [media, pth], -1))

1 0

commit yast2-bootloader for openSUSE:Factory
by root＠hilbert.suse.de 28 Apr '16

28 Apr '16

Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2016-04-28 20:30:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-bootloader" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2016-04-22 16:18:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2016-04-28 20:30:47.000000000 +0200 @@ -1,0 +2,14 @@ +Wed Apr 27 10:43:14 CEST 2016 - schubi(a)suse.de + +- Adapted new version of bootloader to the AutoYaST configuration + module. + (related to FATE#317701) +- 3.1.78 + +------------------------------------------------------------------- +Tue Apr 26 10:27:20 CEST 2016 - schubi(a)suse.de + +- Added requirement in proposal. (bnc#977004) +- 3.1.177 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-3.1.176.tar.bz2 New: ---- yast2-bootloader-3.1.178.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.6QATPF/_old 2016-04-28 20:30:48.000000000 +0200 +++ /var/tmp/diff_new_pack.6QATPF/_new 2016-04-28 20:30:48.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.176 +Version: 3.1.178 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-3.1.176.tar.bz2 -> yast2-bootloader-3.1.178.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.176/package/yast2-bootloader.changes new/yast2-bootloader-3.1.178/package/yast2-bootloader.changes --- old/yast2-bootloader-3.1.176/package/yast2-bootloader.changes 2016-04-22 11:38:10.000000000 +0200 +++ new/yast2-bootloader-3.1.178/package/yast2-bootloader.changes 2016-04-27 12:44:17.000000000 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Wed Apr 27 10:43:14 CEST 2016 - schubi(a)suse.de + +- Adapted new version of bootloader to the AutoYaST configuration + module. + (related to FATE#317701) +- 3.1.78 + +------------------------------------------------------------------- +Tue Apr 26 10:27:20 CEST 2016 - schubi(a)suse.de + +- Added requirement in proposal. (bnc#977004) +- 3.1.177 + +------------------------------------------------------------------- Fri Apr 22 08:55:08 UTC 2016 - jreidinger(a)suse.com - smarter prep partition proposal (bnc#970152) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.176/package/yast2-bootloader.spec new/yast2-bootloader-3.1.178/package/yast2-bootloader.spec --- old/yast2-bootloader-3.1.176/package/yast2-bootloader.spec 2016-04-22 11:38:10.000000000 +0200 +++ new/yast2-bootloader-3.1.178/package/yast2-bootloader.spec 2016-04-27 12:44:17.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.176 +Version: 3.1.178 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.176/src/lib/bootloader/auto_client.rb new/yast2-bootloader-3.1.178/src/lib/bootloader/auto_client.rb --- old/yast2-bootloader-3.1.176/src/lib/bootloader/auto_client.rb 2016-04-22 11:38:10.000000000 +0200 +++ new/yast2-bootloader-3.1.178/src/lib/bootloader/auto_client.rb 2016-04-27 12:44:17.000000000 +0200 @@ -3,6 +3,7 @@ require "installation/auto_client" require "bootloader/bootloader_factory" require "bootloader/autoyast_converter" +require "bootloader/main_dialog" Yast.import "Bootloader" Yast.import "BootStorage" @@ -53,7 +54,7 @@ end def change - BootloaderAutoSequence() + ::Bootloader::MainDialog.new.run_auto end # Return configuration data diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.176/src/lib/bootloader/stage1.rb new/yast2-bootloader-3.1.178/src/lib/bootloader/stage1.rb --- old/yast2-bootloader-3.1.176/src/lib/bootloader/stage1.rb 2016-04-22 11:38:10.000000000 +0200 +++ new/yast2-bootloader-3.1.178/src/lib/bootloader/stage1.rb 2016-04-27 12:44:17.000000000 +0200 @@ -94,7 +94,7 @@ Yast::BootStorage.mbr_disk, Yast::BootStorage.ExtendedPartitionDevice ] - known_devices.compact! + known_devices.compact!.reject!(&:empty?) known_devices.map! { |d| Bootloader::UdevMapping.to_kernel_device(d) } devices.select do |dev| diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.176/src/lib/bootloader/udev_mapping.rb new/yast2-bootloader-3.1.178/src/lib/bootloader/udev_mapping.rb --- old/yast2-bootloader-3.1.176/src/lib/bootloader/udev_mapping.rb 2016-04-22 11:38:10.000000000 +0200 +++ new/yast2-bootloader-3.1.178/src/lib/bootloader/udev_mapping.rb 2016-04-27 12:44:17.000000000 +0200 @@ -22,7 +22,11 @@ # Converts full udev name to kernel device ( disk or partition ) # @param dev [String] device udev, mdadm or kernel name like /dev/disk/by-id/blabla # @raise when device have udev format but do not exists + # @return [String,nil] kernel device or nil when running AutoYaST configuration. def to_kernel_device(dev) + # AutoYaST configuration mode. There is no access to the system + return nil if Yast::Mode.config + log.info "call to_kernel_device for #{dev}" raise "invalid device nil" unless dev @@ -46,6 +50,7 @@ # option or kernel device if such udev device do not exists # @param dev [String] device udev or kernel one like /dev/disk/by-id/blabla # @raise when device have udev format but do not exists + # @return [String] udev name def to_mountby_device(dev) kernel_dev = to_kernel_device(dev) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.176/src/modules/Bootloader.rb new/yast2-bootloader-3.1.178/src/modules/Bootloader.rb --- old/yast2-bootloader-3.1.176/src/modules/Bootloader.rb 2016-04-22 11:38:10.000000000 +0200 +++ new/yast2-bootloader-3.1.178/src/modules/Bootloader.rb 2016-04-27 12:44:17.000000000 +0200 @@ -18,6 +18,7 @@ require "yast" require "bootloader/sysconfig" require "bootloader/bootloader_factory" +require "bootloader/autoyast_converter" require "cfa/matcher" Yast.import "UI" @@ -89,16 +90,18 @@ # @param [Hash] data map of bootloader settings # @return [Boolean] true on success def Import(data) - Yast::BootStorage.detect_disks + # AutoYaST configuration mode. There is no access to the system + Yast::BootStorage.detect_disks unless Mode.config imported_configuration = ::Bootloader::AutoyastConverter.import(data) ::Bootloader::BootloaderFactory.clear_cache proposed_configuration = ::Bootloader::BootloaderFactory .bootloader_by_name(imported_configuration.name) - proposed_configuration.propose - - proposed_configuration.merge(imported_configuration) + unless Mode.config # no AutoYaST configuration mode + proposed_configuration.propose + proposed_configuration.merge(imported_configuration) + end ::Bootloader::BootloaderFactory.current = proposed_configuration true @@ -178,6 +181,7 @@ config.read end ::Bootloader::BootloaderFactory.current = config + nil end # Propose bootloader settings

1 0

commit yast2-packager for openSUSE:Factory
by root＠hilbert.suse.de 28 Apr '16

28 Apr '16

Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at 2016-04-28 20:30:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old) and /work/SRC/openSUSE:Factory/.yast2-packager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-packager" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes 2016-04-11 09:12:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-packager.new/yast2-packager.changes 2016-04-28 20:30:38.000000000 +0200 @@ -1,0 +2,24 @@ +Fri Apr 22 16:23:17 UTC 2016 - lslezak(a)suse.cz + +- Move the default pattern selection to a different place to not + conflict with the pattern selection in the system upgrade mode + (FATE#320199) +- 3.1.97 + +------------------------------------------------------------------- +Fri Apr 22 11:48:52 UTC 2016 - knut.anderssen(a)suse.com + +- Added public methods to modify and know info about files read, + in this case to avoid display the welcome dialog again after + restart yast (bsc#974409) +- 3.1.96 + +------------------------------------------------------------------- +Mon Apr 11 17:35:17 UTC 2016 - lslezak(a)suse.cz + +- Select the default product patterns defined by the + 'defaultpattern()' provides in the initial installation + (FATE#320199) +- 3.1.95 + +------------------------------------------------------------------- Old: ---- yast2-packager-3.1.94.tar.bz2 New: ---- yast2-packager-3.1.97.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.WGlD0R/_old 2016-04-28 20:30:40.000000000 +0200 +++ /var/tmp/diff_new_pack.WGlD0R/_new 2016-04-28 20:30:40.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.94 +Version: 3.1.97 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -122,8 +122,10 @@ %defattr(-,root,root) %dir %{yast_yncludedir}/checkmedia %dir %{yast_yncludedir}/packager +%dir %{yast_libdir}/packager %{yast_yncludedir}/checkmedia/* %{yast_yncludedir}/packager/* +%{yast_libdir}/packager/* %{yast_clientdir}/*.rb %{yast_moduledir}/* %{yast_desktopdir}/*.desktop ++++++ yast2-packager-3.1.94.tar.bz2 -> yast2-packager-3.1.97.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.94/package/yast2-packager.changes new/yast2-packager-3.1.97/package/yast2-packager.changes --- old/yast2-packager-3.1.94/package/yast2-packager.changes 2016-04-06 14:52:57.000000000 +0200 +++ new/yast2-packager-3.1.97/package/yast2-packager.changes 2016-04-25 11:47:26.000000000 +0200 @@ -1,4 +1,28 @@ ------------------------------------------------------------------- +Fri Apr 22 16:23:17 UTC 2016 - lslezak(a)suse.cz + +- Move the default pattern selection to a different place to not + conflict with the pattern selection in the system upgrade mode + (FATE#320199) +- 3.1.97 + +------------------------------------------------------------------- +Fri Apr 22 11:48:52 UTC 2016 - knut.anderssen(a)suse.com + +- Added public methods to modify and know info about files read, + in this case to avoid display the welcome dialog again after + restart yast (bsc#974409) +- 3.1.96 + +------------------------------------------------------------------- +Mon Apr 11 17:35:17 UTC 2016 - lslezak(a)suse.cz + +- Select the default product patterns defined by the + 'defaultpattern()' provides in the initial installation + (FATE#320199) +- 3.1.95 + +------------------------------------------------------------------- Wed Apr 6 09:57:59 UTC 2016 - knut.anderssen(a)suse.com - Explicitly resolve shortcut conflicts proposing 'alt-w' for diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.94/package/yast2-packager.spec new/yast2-packager-3.1.97/package/yast2-packager.spec --- old/yast2-packager-3.1.94/package/yast2-packager.spec 2016-04-06 14:52:57.000000000 +0200 +++ new/yast2-packager-3.1.97/package/yast2-packager.spec 2016-04-25 11:47:26.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.94 +Version: 3.1.97 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -121,8 +121,10 @@ %defattr(-,root,root) %dir %{yast_yncludedir}/checkmedia %dir %{yast_yncludedir}/packager +%dir %{yast_libdir}/packager %{yast_yncludedir}/checkmedia/* %{yast_yncludedir}/packager/* +%{yast_libdir}/packager/* %{yast_clientdir}/*.rb %{yast_moduledir}/* %{yast_desktopdir}/*.desktop diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.94/src/Makefile.am new/yast2-packager-3.1.97/src/Makefile.am --- old/yast2-packager-3.1.94/src/Makefile.am 2016-04-06 14:52:57.000000000 +0200 +++ new/yast2-packager-3.1.97/src/Makefile.am 2016-04-25 11:47:26.000000000 +0200 @@ -51,6 +51,9 @@ include/packager/load_release_notes.rb \ include/packager/repositories_include.rb +ylibdir = @ylibdir@/packager +ylib_DATA = lib/packager/product_patterns.rb + ynclude1dir = @yncludedir@/checkmedia ynclude1_DATA = \ include/checkmedia/ui.rb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.94/src/lib/packager/product_patterns.rb new/yast2-packager-3.1.97/src/lib/packager/product_patterns.rb --- old/yast2-packager-3.1.94/src/lib/packager/product_patterns.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-3.1.97/src/lib/packager/product_patterns.rb 2016-04-25 11:47:26.000000000 +0200 @@ -0,0 +1,145 @@ + +# ------------------------------------------------------------------------------ +# Copyright (c) 2016 SUSE LLC +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of version 2 of the GNU General Public License as published by the +# Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# ------------------------------------------------------------------------------ +# + +require "yast" + +module Yast + # Evaluate the default patterns for the currently selected products + class ProductPatterns + include Yast::Logger + + def initialize + Yast.import "Pkg" + end + + # Find the default patterns for all selected products. + # @note The package management and the products needs to be initialized and + # selected *before* using this method. + # @return [Array<String>] pattern names + def names + @names ||= find + end + + # Select the default patterns to installation + # @note The package management and the products needs to be initialized and + # selected *before* using this method. + # @return [Boolean] true if all patterns were successfuly selected, + # false otherwise + def select + # use map + all? to try installing *all* patterns, plain all? would stop + # at the first failure + names.map { |p| Yast::Pkg.ResolvableInstall(p, :pattern) }.all? + end + + private + + # Find the default patterns for all selected products. + # @return [Array<String>] pattern names + def find + products = Yast::Pkg.ResolvableProperties("", :product, "") + remove_unselected(products) + products.map! { |product| product["name"] } + log.info "Found selected products: #{products}" + + patterns = products.map { |p| product_patterns(p) }.flatten.uniq + log.info "Default patterns for the selected products: #{patterns.inspect}" + + patterns + end + + # Find the default patterns for the product. + # @param [String] product product name + # @return [Array<String>] pattern names + def product_patterns(product) + product_dependencies = dependencies(product) + product_provides = provides(product_dependencies) + + default_patterns(product_provides) + end + + # Find dependencies for the product (it's product package). + # @param [String] product product name + # @return [Array<Hash>] product dependencies, e.g. [{"provides" => "foo"}, + # {"requires" => "bar"}, ...] + def dependencies(product) + product_dependencies = [] + + resolvables = Yast::Pkg.ResolvableProperties(product, :product, "") + remove_unselected(resolvables) + + resolvables.each do |resolvable| + prod_pkg = resolvable["product_package"] + next unless prod_pkg + + release_resolvables = Yast::Pkg.ResolvableDependencies(prod_pkg, :package, "") + remove_unselected(release_resolvables) + + release_resolvables.each do |release_resolvable| + deps = release_resolvable["deps"] + product_dependencies.concat(deps) if deps + end + end + + log.debug "Product #{product} depependencies: #{product_dependencies}" + + product_dependencies + end + # Remove not selected resolvables from the list + # @param [Array<Hash>] resolvables only the Hashes where the key "status" + # maps to :selected value are kept, the rest is removed + def remove_unselected(resolvables) + resolvables.select! { |p| p["status"] == :selected } + end + + # Collect "provides" dependencies from the list. + # @param [Array<Hash>] dependencies all dependencies + # @return [Array<String>] only the "provides" dependencies + # @example + # provides([{"provides" => "foo"}, {"requires" => "bar"}, ...]) => ["foo"] + def provides(dependencies) + provides = [] + + dependencies.each do |dependency| + prov = dependency["provides"] + provides << prov if prov + end + + log.debug "Collected provides dependencies: #{provides.inspect}" + + provides + end + + # Collect default pattern names from the provides list. + # The default pattern is described by the tag "defaultpattern(foo)" + # @param [Array<String>] provides the "provides" dependencies + # @return [Array<String>] the default pattern names, empty if no default + # pattern is found + def default_patterns(provides) + patterns = [] + + provides.each do |provide| + # is it a defaultpattern() provides? + if provide.match(/\Adefaultpattern$(.*)$\z/) + log.info "Found default pattern provide: #{provide}" + patterns << Regexp.last_match[1].strip + end + end + + log.info "Found default patterns: #{patterns.inspect}" + + patterns + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.94/src/modules/Packages.rb new/yast2-packager-3.1.97/src/modules/Packages.rb --- old/yast2-packager-3.1.94/src/modules/Packages.rb 2016-04-06 14:52:58.000000000 +0200 +++ new/yast2-packager-3.1.97/src/modules/Packages.rb 2016-04-25 11:47:26.000000000 +0200 @@ -2608,6 +2608,13 @@ (default_patterns | optional_default_patterns).inject(patterns, :<<) end + # preselect the default product patterns (FATE#320199) + # note: must be called *after* selecting the products + require "packager/product_patterns" + product_patterns = ProductPatterns.new + log.info "Found default product patterns: #{product_patterns.names}" + patterns.concat(product_patterns.names) + patterns end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.94/src/modules/ProductLicense.rb new/yast2-packager-3.1.97/src/modules/ProductLicense.rb --- old/yast2-packager-3.1.94/src/modules/ProductLicense.rb 2016-04-06 14:52:58.000000000 +0200 +++ new/yast2-packager-3.1.97/src/modules/ProductLicense.rb 2016-04-25 11:47:26.000000000 +0200 @@ -1500,24 +1500,23 @@ ) UI.ReplaceWidget(Id(replace_point_ID), rt) - id = Builtins.tostring(src_id) - - # Display info as a popup if exists - if @info_file != nil && - Ops.get(@info_file_already_seen, id, false) != true - if Mode.autoinst - Builtins.y2milestone("Autoinstallation: Skipping info file...") - else - InstShowInfo.show_info_txt(@info_file) - Ops.set(@info_file_already_seen, id, true) - end - end + display_info(src_id) if @info_file && !info_seen?(src_id) CleanUp() true end + # Check if installation info had been seen to given ID + def info_seen?(id) + @info_file_already_seen.fetch(id, false) + end + + # Mark given id as seen + def info_seen!(id) + @info_file_already_seen[id] = true + end + def AskInstalledLicenseAgreement(directory, action) # patterns are hard-coded AskLicenseAgreement( @@ -1610,6 +1609,16 @@ UI.ReplaceWidget(:printing_hint, Label(license_download_label(lic_url))) end end + + # Display info as a popup if exists + def display_info(id) + if Mode.autoinst + Builtins.y2milestone("Autoinstallation: Skipping info file...") + else + InstShowInfo.show_info_txt(@info_file) + info_seen!(id) + end + end end ProductLicense = ProductLicenseClass.new diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.94/test/Makefile.am new/yast2-packager-3.1.97/test/Makefile.am --- old/yast2-packager-3.1.94/test/Makefile.am 2016-04-06 14:52:58.000000000 +0200 +++ new/yast2-packager-3.1.97/test/Makefile.am 2016-04-25 11:47:26.000000000 +0200 @@ -1,5 +1,6 @@ TESTS = \ addon_product_test.rb \ + product_patterns_test.rb \ package_installation_test.rb \ packages_test.rb \ source_dialogs_test.rb \ @@ -8,4 +9,4 @@ TEST_EXTENSIONS = .rb RB_LOG_COMPILER = rspec VERBOSE = 1 -EXTRA_DIST = $(TESTS) +EXTRA_DIST = $(TESTS) product_factory.rb test_helper.rb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.94/test/packages_test.rb new/yast2-packager-3.1.97/test/packages_test.rb --- old/yast2-packager-3.1.94/test/packages_test.rb 2016-04-06 14:52:58.000000000 +0200 +++ new/yast2-packager-3.1.97/test/packages_test.rb 2016-04-25 11:47:26.000000000 +0200 @@ -13,6 +13,8 @@ Yast.import "Linuxrc" Yast.import "Pkg" +require "packager/product_patterns" + SCR_STRING_PATH = Yast::Path.new(".target.string") SCR_BASH_PATH = Yast::Path.new(".target.bash") SCR_PROC_CMDLINE_PATH = Yast::Path.new(".proc.cmdline") @@ -253,6 +255,20 @@ expect(logged_errors).to eq 4 end + + it "selects the default product patterns" do + allow(Yast::Packages).to receive(:ComputeSystemPatternList).and_return([]) + allow(Yast::Packages).to receive(:default_patterns).and_return([]) + allow(Yast::Packages).to receive(:optional_default_patterns).and_return([]) + allow(Yast::Pkg).to receive(:ResolvableProperties).and_return([{}]) + + product_patterns = [ "default_pattern_1", "default_pattern_2"] + expect_any_instance_of(Yast::ProductPatterns).to receive(:names).at_least(:once).and_return(product_patterns) + expect(Yast::Pkg).to receive(:ResolvableInstall).with(product_patterns[0], :pattern) + expect(Yast::Pkg).to receive(:ResolvableInstall).with(product_patterns[1], :pattern) + + Yast::Packages.SelectSystemPatterns(false) + end end describe "#log_software_selection" do @@ -390,6 +406,7 @@ context "when fips pattern is available" do before do + allow_any_instance_of(Yast::ProductPatterns).to receive(:names).and_return([]) allow(Yast::Pkg).to receive(:ResolvableProperties). with("fips", :pattern, "").and_return([{ "name" => "fips" }]) end @@ -407,6 +424,7 @@ context "when fips pattern is not available" do before do + allow_any_instance_of(Yast::ProductPatterns).to receive(:names).and_return([]) allow(Yast::Pkg).to receive(:ResolvableProperties). with("fips", :pattern, "").and_return([]) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.94/test/product_factory.rb new/yast2-packager-3.1.97/test/product_factory.rb --- old/yast2-packager-3.1.94/test/product_factory.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-3.1.97/test/product_factory.rb 2016-04-25 11:47:26.000000000 +0200 @@ -0,0 +1,73 @@ +# ------------------------------------------------------------------------------ +# Copyright (c) 2016 SUSE LLC +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of version 2 of the GNU General Public License as published by the +# Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# ------------------------------------------------------------------------------ +# + +# A factory which creates random libzypp products for testing. +class ProductFactory + # Create a product, the default random attributes can be customized via arguments. + # @return [Hash] product hash as returned by the Pkg.ResolvableProperties + # and Pkg.ResolvableDependencies functions + def self.create_product(attrs = {}) + product = {} + + # generate 12 random characters from a-z + charset = ("a".."z").to_a + name = (1..12).map { charset[rand(charset.size)] }.join + + # construct a "human readable" product name + product_name = name.capitalize + # construct the internal product ID + product_id = name[0..4] + # service pack level + sp = rand(4) + 1 + + product["arch"] = attrs["arch"] || "x86_64" + product["category"] = attrs["category"] || "addon" + product["description"] = attrs["description"] || "SUSE Linux Enterprise #{product_name}." + product["display_name"] = attrs["display_name"] || "SUSE Linux Enterprise #{product_name}" + product["download_size"] = attrs["download_size"] || 0 + product["eol"] = attrs["eol"] || 1730332800 + product["flags"] = attrs["flags"] || [] + product["flavor"] = attrs["flavor"] || "POOL" + product["inst_size"] = attrs["inst_size"] || 0 + product["locked"] = attrs.fetch("locked", false) + product["medium_nr"] = attrs["medium_nr"] || 0 + product["name"] = attrs["name"] || "sle-#{product_id}" + product["on_system_by_user"] = attrs.fetch("on_system_by_user", false) + product["product_file"] = attrs["product_file"] || "sle-#{product_id}.prod" + product["product_line"] = attrs["product_line"] || "" + product["product_package"] = attrs.fetch("product_package", "sle-#{product_id}-release") + product["register_release"] = attrs["register_release"] || "" + product["register_target"] = attrs["register_target"] || "sle-12-x86_64" + product["relnotes_url"] = attrs["relnotes_url"] || + "https://www.suse.com/releasenotes/#{product["arch"]}/SLE-#{product_id}/12-SP#{sp}/release-notes-#{product_id}.rpm" + product["relnotes_urls"] = attrs["relnotes_urls"] || [product["relnotes_url"]] + product["short_name"] = attrs["short_name"] || "SLE#{product_id.upcase}12-SP#{sp}" + product["source"] = attrs["source"] || rand(10) + product["status"] = attrs["status"] || :available + product["summary"] = attrs["summary"] || "SUSE Linux Enterprise #{product_name}" + product["transact_by"] = attrs["transact_by"] || :solver + product["type"] = attrs["type"] || "addon" + product["update_urls"] = attrs["update_urls"] || [] + product["vendor"] = attrs["vendor"] || "SUSE LLC <https://www.suse.com/>" + product["version"] = attrs["version"] || "12.#{sp}-0" + product["version_epoch"] = attrs["version_epoch"] || nil + product["version_release"] = attrs["version_release"] || "0" + product["version_version"] = attrs["version_version"] || "12.#{sp}" + + # add optional dependencies (returned only by ResolvableDependencies) + product["deps"] = attrs["deps"] if attrs.key?("deps") + + product + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.94/test/product_patterns_test.rb new/yast2-packager-3.1.97/test/product_patterns_test.rb --- old/yast2-packager-3.1.94/test/product_patterns_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-3.1.97/test/product_patterns_test.rb 2016-04-25 11:47:26.000000000 +0200 @@ -0,0 +1,137 @@ +#! /usr/bin/env rspec + +require_relative "test_helper" +require_relative "product_factory" + +require "packager/product_patterns" + +Yast.import "Pkg" + +describe Yast::ProductPatterns do + describe "#names" do + it "returns empty list when there are no products" do + expect(Yast::Pkg).to receive(:ResolvableProperties).with("", :product, "") + .and_return([]) + + expect(subject.names).to eq([]) + end + + it "returns empty list when there is no selected product" do + expect(Yast::Pkg).to receive(:ResolvableProperties).with("", :product, "") + .and_return([ProductFactory.create_product]) + + expect(subject.names).to eq([]) + end + + it "returns empty list when the product release package is not found" do + product = ProductFactory.create_product("status" => :selected, + "product_package" => nil) + + expect(Yast::Pkg).to receive(:ResolvableProperties).with("", :product, "") + .and_return([product]) + expect(Yast::Pkg).to receive(:ResolvableProperties).with(product["name"], :product, "") + .and_return([product]) + + expect(subject.names).to eq([]) + end + + it "returns the default pattern name from the release package" do + default_pattern = "def_pattern" + product_package_name = "product-release" + product_package = { "name" => product_package_name, "status" => :selected, + "deps" => [{ "requires" => "foo" }, { "provides" => "bar" }, + { "provides" => "defaultpattern(#{default_pattern})" }] } + product = ProductFactory.create_product("status" => :selected, + "product_package" => product_package_name) + + expect(Yast::Pkg).to receive(:ResolvableProperties).with("", :product, "") + .and_return([product]) + expect(Yast::Pkg).to receive(:ResolvableProperties).with(product["name"], :product, "") + .and_return([product]) + expect(Yast::Pkg).to receive(:ResolvableDependencies).with(product_package_name, :package, "") + .and_return([product_package]) + + expect(subject.names).to eq([default_pattern]) + end + + it "returns the default patterns from all products" do + default_pattern1 = "def_pattern1" + product_package_name1 = "product-release1" + product_package1 = { "name" => product_package_name1, "status" => :selected, + "deps" => [{ "requires" => "foo" }, { "provides" => "bar" }, + { "provides" => "defaultpattern(#{default_pattern1})" }] } + product1 = ProductFactory.create_product("status" => :selected, + "product_package" => product_package_name1) + + default_pattern2 = "def_pattern2" + product_package_name2 = "product-release2" + product_package2 = { "name" => product_package_name2, "status" => :selected, + "deps" => [{ "requires" => "foo" }, { "provides" => "bar" }, + { "provides" => "defaultpattern(#{default_pattern2})" }] } + product2 = ProductFactory.create_product("status" => :selected, + "product_package" => product_package_name2) + + expect(Yast::Pkg).to receive(:ResolvableProperties).with("", :product, "") + .and_return([product1, product2]) + expect(Yast::Pkg).to receive(:ResolvableProperties).with(product1["name"], :product, "") + .and_return([product1]) + expect(Yast::Pkg).to receive(:ResolvableProperties).with(product2["name"], :product, "") + .and_return([product2]) + expect(Yast::Pkg).to receive(:ResolvableDependencies).with(product_package_name1, :package, "") + .and_return([product_package1]) + expect(Yast::Pkg).to receive(:ResolvableDependencies).with(product_package_name2, :package, "") + .and_return([product_package2]) + + expect(subject.names.sort).to eq([default_pattern1, default_pattern2].sort) + end + end + + describe "#select" do + context "no default pattern found" do + before do + expect(subject).to receive(:names).and_return([]) + end + + it "does not select anything to install" do + expect(Yast::Pkg).to_not receive(:ResolvableInstall) + + subject.select + end + + it "returns true (success)" do + expect(subject.select).to eq(true) + end + end + + context "default patterns found" do + before do + expect(subject).to receive(:names).and_return(["pattern1", "pattern2"]) + end + + it "selects the default patterns to install" do + expect(Yast::Pkg).to receive(:ResolvableInstall).with("pattern1", :pattern) + expect(Yast::Pkg).to receive(:ResolvableInstall).with("pattern2", :pattern) + + subject.select + end + + it "returns true if all default patterns were selected" do + expect(Yast::Pkg).to receive(:ResolvableInstall).with("pattern1", :pattern) + .and_return(true) + expect(Yast::Pkg).to receive(:ResolvableInstall).with("pattern2", :pattern) + .and_return(true) + + expect(subject.select).to eq(true) + end + + it "returns false if any default pattern could not be selected" do + expect(Yast::Pkg).to receive(:ResolvableInstall).with("pattern1", :pattern) + .and_return(true) + expect(Yast::Pkg).to receive(:ResolvableInstall).with("pattern2", :pattern) + .and_return(false) + + expect(subject.select).to eq(false) + end + end + end +end

1 0

commit yast2 for openSUSE:Factory
by root＠hilbert.suse.de 28 Apr '16

28 Apr '16

Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2016-04-28 20:30:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2016-04-22 16:18:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2016-04-28 20:30:26.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Apr 22 14:37:28 UTC 2016 - knut.anderssen(a)suse.com + +- Added restarting state to Installation to for example recover + data or skip dialogs until the one wich restarted yast. + (related to bsc#974409) +- 3.1.186 + +------------------------------------------------------------------- Old: ---- yast2-3.1.185.tar.bz2 New: ---- yast2-3.1.186.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.fFH4CH/_old 2016-04-28 20:30:27.000000000 +0200 +++ /var/tmp/diff_new_pack.fFH4CH/_new 2016-04-28 20:30:27.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.185 +Version: 3.1.186 Release: 0 Summary: YaST2 - Main Package License: GPL-2.0 ++++++ yast2-3.1.185.tar.bz2 -> yast2-3.1.186.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.185/library/control/src/modules/Installation.rb new/yast2-3.1.186/library/control/src/modules/Installation.rb --- old/yast2-3.1.185/library/control/src/modules/Installation.rb 2016-04-21 18:07:51.000000000 +0200 +++ new/yast2-3.1.186/library/control/src/modules/Installation.rb 2016-04-25 08:53:55.000000000 +0200 @@ -36,6 +36,7 @@ # # $Id$ require "yast" +require "fileutils" module Yast class InstallationClass < Module @@ -108,6 +109,10 @@ # Running YaST in upgrade mode (initiated from running system) @run_update_file = Ops.add(Directory.vardir, "/run_system_update") + # A flag to know if current installation is restarting skipping dialogs or + # recovering values until the step just before the yast restart was done + @restarting_file = Ops.add(Directory.vardir, "/restarting_yast") + # Network should be started before the installation starts (continues) # bugzilla #258742 # @@ -244,6 +249,20 @@ Linuxrc.InstallInf("InstMode") || "cd" end + def restart! + ::FileUtils.touch(@restart_file) + ::FileUtils.touch(@restarting_file) + :restart_yast + end + + def restarting? + ::File.exist?(@restarting_file) + end + + def finish_restarting! + ::FileUtils.remove_file(@restarting_file, true) if restarting? + end + # run X11 configuration after inital boot # this is false in case of: # installation via serial console diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.185/library/network/src/modules/SuSEFirewallServices.rb new/yast2-3.1.186/library/network/src/modules/SuSEFirewallServices.rb --- old/yast2-3.1.185/library/network/src/modules/SuSEFirewallServices.rb 2016-04-21 18:07:51.000000000 +0200 +++ new/yast2-3.1.186/library/network/src/modules/SuSEFirewallServices.rb 2016-04-25 08:53:55.000000000 +0200 @@ -272,8 +272,8 @@ # @return [Boolean] whether service is defined by package # # @example - # ServiceDefinedByPackage ("http-server") -> false - # ServiceDefinedByPackage ("service:http-server") -> true + # ServiceDefinedByPackage ("http-server") -> false + # ServiceDefinedByPackage ("service:http-server") -> true def ServiceDefinedByPackage(service) service.start_with? DEFINED_BY_PKG_PREFIX end @@ -285,8 +285,8 @@ # @return [String] file name (e.g., 'abc') # # @example - # GetFilenameFromServiceDefinedByPackage ("service:abc") -> "abc" - # GetFilenameFromServiceDefinedByPackage ("abc") -> nil + # GetFilenameFromServiceDefinedByPackage ("service:abc") -> "abc" + # GetFilenameFromServiceDefinedByPackage ("abc") -> nil def GetFilenameFromServiceDefinedByPackage(service) if !ServiceDefinedByPackage(service) log.error "Service #{service} is not defined by package" @@ -299,7 +299,8 @@ # Returns SCR Agent definition. # # @return [Yast::Term] with agent definition - # @param string full filename path (to read by this agent) + # @param filefullpath [String] full filename path (to read by this agent) + # @api private def GetMetadataAgent(filefullpath) term( :IniAgent, @@ -337,12 +338,13 @@ # Returns service definition. # See @services for the format. - # If `silent` is not defined or set to `true`, function throws an exception - # SuSEFirewalServiceNotFound if service is not found on disk. + # If *silent* is `false` (the default), the method throws an exception + # {Yast::SuSEFirewalServiceNotFound} if service is not found on disk. # - # @param [String] service name + # @param [String] service name (including the "service:" prefix) # @param [String] (optional) whether to silently return nil # when service is not found (default false) + # @api private def service_details(service_name, silent = false) service = all_services[service_name] if service.nil? && !silent @@ -359,6 +361,7 @@ end # Returns all known services loaded from disk on-the-fly + # @api private def all_services ReadServicesDefinedByRPMPackages() if @services.nil? @services @@ -368,6 +371,7 @@ # in SuSEfirewall2. # # @return [Boolean] if successful + # @api private def ReadServicesDefinedByRPMPackages log.info "Reading SuSEfirewall2 services from #{SERVICES_DIR}" @services ||= {} @@ -470,7 +474,7 @@ # Function returns if the service_id is a known (defined) service # - # @param [String] service_id + # @param [String] service_id (including the "service:" prefix) # @return [Boolean] if is known (defined) def IsKnownService(service_id) !service_details(service_id, true).nil? @@ -480,15 +484,13 @@ # # @return [Hash{String => String}] supported services # - # # **Structure:** # - # - # $[ service_id : localized_service_name ] - # $[ - # "dns-server" : "DNS Server", - # "vnc" : "Remote Administration", - # ] + # { service_id => localized_service_name } + # { + # "service:dns-server" => "DNS Server", + # "service:vnc" => "Remote Administration", + # } def GetSupportedServices supported_services = {} @@ -509,6 +511,7 @@ end # Returns list of service-ids defined by packages. + # (including the "service:" prefix) # # @return [Array<String>] service ids def GetListOfServicesAddedByPackage @@ -517,7 +520,7 @@ # Function returns needed TCP ports for service # - # @param [String] service + # @param [String] service (including the "service:" prefix) # @return [Array<String>] of needed TCP ports def GetNeededTCPPorts(service) service_details(service)["tcp_ports"] || [] @@ -525,7 +528,7 @@ # Function returns needed UDP ports for service # - # @param [String] service + # @param [String] service (including the "service:" prefix) # @return [Array<String>] of needed UDP ports def GetNeededUDPPorts(service) service_details(service)["udp_ports"] || [] @@ -533,7 +536,7 @@ # Function returns needed RPC ports for service # - # @param [String] service + # @param [String] service (including the "service:" prefix) # @return [Array<String>] of needed RPC ports def GetNeededRPCPorts(service) service_details(service)["rpc_ports"] || [] @@ -541,7 +544,7 @@ # Function returns needed IP protocols for service # - # @param [String] service + # @param [String] service (including the "service:" prefix) # @return [Array<String>] of needed IP protocols def GetNeededIPProtocols(service) service_details(service)["ip_protocols"] || [] @@ -549,7 +552,7 @@ # Function returns description of a firewall service # - # @param [String] service + # @param [String] service (including the "service:" prefix) # @return [String] service description def GetDescription(service) service_details(service)["description"] || [] @@ -578,7 +581,7 @@ # Function returns needed ports allowing broadcast # - # @param [String] service + # @param [String] service (including the "service:" prefix) # @return [Array<String>] of needed broadcast ports def GetNeededBroadcastPorts(service) service_details(service)["broadcast_ports"] || [] @@ -589,17 +592,17 @@ # Function throws an exception SuSEFirewalServiceNotFound # if service is not known (undefined). # - # @param [String] service + # @param [String] service (including the "service:" prefix) # @return [Hash{String => Array<String>}] of needed ports and protocols # # @example - # GetNeededPortsAndProtocols ("service:aaa") -> $[ - # "tcp_ports" : [ "122", "ftp-data" ], - # "udp_ports" : [ "427" ], - # "rpc_ports" : [ "portmap", "ypbind" ], - # "ip_protocols" : [], - # "broadcast_ports" : [ "427" ], - # ]; + # GetNeededPortsAndProtocols ("service:aaa") -> { + # "tcp_ports" => [ "122", "ftp-data" ], + # "udp_ports" => [ "427" ], + # "rpc_ports" => [ "portmap", "ypbind" ], + # "ip_protocols" => [], + # "broadcast_ports"=> [ "427" ], + # } def GetNeededPortsAndProtocols(service) DEFAULT_SERVICE.merge(service_details(service)) end @@ -607,28 +610,28 @@ # Immediately writes the configuration of service defined by package to the # service definition file. Service must be defined by package, this function # doesn't work for hard-coded services (SuSEFirewallServices). - # Function throws an exception SuSEFirewalServiceNotFound + # Function throws an exception {Yast::SuSEFirewalServiceNotFound} # if service is not known (undefined) or it is not a service # defined by package. # # @param [String] service ID (e.g., "service:ssh") - # @param map <string, list <string> > of full service definition + # @param [Hash{String => Array<String>] store_definition of full service definition # @return [Boolean] if successful (nil in case of developer's mistake) # - # @see #IsKnownService() - # @see #ServiceDefinedByPackage() + # @see #IsKnownService + # @see #ServiceDefinedByPackage # # @example - # SetNeededPortsAndProtocols ( - # "service:something", - # $[ - # "tcp_ports" : [ "22", "ftp-data", "400:420" ], - # "udp_ports" : [ ], - # "rpc_ports" : [ "portmap", "ypbind" ], - # "ip_protocols" : [ "esp" ], - # "broadcast_ports" : [ ], - # ] - # ); + # SetNeededPortsAndProtocols ( + # "service:something", + # { + # "tcp_ports" => [ "22", "ftp-data", "400:420" ], + # "udp_ports" => [ ], + # "rpc_ports" => [ "portmap", "ypbind" ], + # "ip_protocols" => [ "esp" ], + # "broadcast_ports"=> [ ], + # } + # ) def SetNeededPortsAndProtocols(service, store_definition) if !IsKnownService(service) log.error "Service #{service} is unknown" @@ -717,7 +720,7 @@ # Function returns list of possibly conflicting services. # Conflicting services are for instance nis-client and nis-server. - # DEPRECATED - we currently don't have such services - services are defined by packages. + # @deprecated we currently don't have such services - services are defined by packages. # # @return [Array<String>] of conflicting services def GetPossiblyConflictServices diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.185/package/yast2.changes new/yast2-3.1.186/package/yast2.changes --- old/yast2-3.1.185/package/yast2.changes 2016-04-21 18:07:51.000000000 +0200 +++ new/yast2-3.1.186/package/yast2.changes 2016-04-25 08:53:55.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Apr 22 14:37:28 UTC 2016 - knut.anderssen(a)suse.com + +- Added restarting state to Installation to for example recover + data or skip dialogs until the one wich restarted yast. + (related to bsc#974409) +- 3.1.186 + +------------------------------------------------------------------- Tue Apr 19 12:02:28 UTC 2016 - jreidinger(a)suse.com - CWM: fix showing help for tabs widgets diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.185/package/yast2.spec new/yast2-3.1.186/package/yast2.spec --- old/yast2-3.1.185/package/yast2.spec 2016-04-21 18:07:51.000000000 +0200 +++ new/yast2-3.1.186/package/yast2.spec 2016-04-25 08:53:55.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.185 +Version: 3.1.186 Release: 0 Summary: YaST2 - Main Package License: GPL-2.0

1 0