March 2017 - openSUSE Commits - openSUSE Mailing Lists

commit libgphoto2 for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '17

31 Mar '17

Hello community, here is the log from the commit of package libgphoto2 for openSUSE:Factory checked in at 2017-03-31 15:01:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgphoto2 (Old) and /work/SRC/openSUSE:Factory/.libgphoto2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libgphoto2" Fri Mar 31 15:01:11 2017 rev:110 rq:481925 version:2.5.12.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libgphoto2/libgphoto2.changes 2017-01-10 10:37:47.479468537 +0100 +++ /work/SRC/openSUSE:Factory/.libgphoto2.new/libgphoto2.changes 2017-03-31 15:01:13.978401926 +0200 @@ -1,0 +2,18 @@ +Tue Mar 21 16:33:10 UTC 2017 - meissner(a)suse.com + +- updated to 2.5.12.1 temporary snapshot + ptp2: + * iPhone iOS 10.2 storage handling fixed, added dynamic storage handling + * Sony Alpha Live View support. + * Canon EOS M series capture enabled. (might not fully work yet) + * Various crashes and endless loops fixed that were found by the AFL fuzzer. + * Various bugfixes in Nikon, Canon capture + * New USB Ids: + * Sony: SLT A37, DSC-RX100M5 + * Nikon KeyMission 360 + * Canon PowerShot G16 + * Canon EOS M5 + * Fuji Fujifilm XT-2 + * GoPro Hero 5 Black + +------------------------------------------------------------------- Old: ---- libgphoto2-2.5.12.tar.bz2 libgphoto2-2.5.12.tar.bz2.asc New: ---- libgphoto2-2.5.12.1.tar.bz2 libgphoto2-2.5.12.1.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgphoto2.spec ++++++ --- /var/tmp/diff_new_pack.4p3qwl/_old 2017-03-31 15:01:15.006256625 +0200 +++ /var/tmp/diff_new_pack.4p3qwl/_new 2017-03-31 15:01:15.010256060 +0200 @@ -49,10 +49,12 @@ Summary: A Digital Camera Library License: LGPL-2.1+ Group: Hardware/Camera -Version: 2.5.12 +Version: 2.5.12.1 Release: 0 -Source0: https://downloads.sourceforge.net/project/gphoto/libgphoto/%{version}/%{nam… -Source1: https://downloads.sourceforge.net/project/gphoto/libgphoto/%{version}//%{na… +#Source0: https://downloads.sourceforge.net/project/gphoto/libgphoto/%{version}/%{nam… +#Source1: https://downloads.sourceforge.net/project/gphoto/libgphoto/%{version}//%{na… +Source0: %{name}-%{version}.tar.bz2 +Source1: %{name}-%{version}.tar.bz2.asc Source2: %name.keyring Source3: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ libgphoto2-2.5.12.tar.bz2 -> libgphoto2-2.5.12.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/libgphoto2/libgphoto2-2.5.12.tar.bz2 /work/SRC/openSUSE:Factory/.libgphoto2.new/libgphoto2-2.5.12.1.tar.bz2 differ: char 11, line 1

1 0

commit libQtWebKit4 for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '17

31 Mar '17

Hello community, here is the log from the commit of package libQtWebKit4 for openSUSE:Factory checked in at 2017-03-31 15:01:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libQtWebKit4 (Old) and /work/SRC/openSUSE:Factory/.libQtWebKit4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libQtWebKit4" Fri Mar 31 15:01:06 2017 rev:45 rq:481842 version:4.8.7+2.3.4 Changes: -------- --- /work/SRC/openSUSE:Factory/libQtWebKit4/libQtWebKit4.changes 2015-08-02 22:44:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libQtWebKit4.new/libQtWebKit4.changes 2017-03-31 15:01:07.479320657 +0200 @@ -1,0 +2,7 @@ +Mon Mar 20 08:41:42 UTC 2017 - rguenther(a)suse.com + +- Disable -Wextra due to noisy -Wexpansion_to_defined which is enabled + with -Wextra starting with GCC 7. Otherwise we run into + "Logfile got too big, killed job.". + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libQtWebKit4.spec ++++++ --- /var/tmp/diff_new_pack.c7E9GX/_old 2017-03-31 15:01:09.643014791 +0200 +++ /var/tmp/diff_new_pack.c7E9GX/_new 2017-03-31 15:01:09.647014225 +0200 @@ -1,7 +1,7 @@ # # spec file for package libQtWebKit4 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2011 Asterios Dramis <asterios.dramis(a)gmail.com>. # # All modifications and additions to the file contributed by third parties @@ -150,7 +150,7 @@ %ifnarch x86_64 --no-force-sse2 \ %endif - --qmakearg="CONFIG+=production_build CONFIG+=use_system_icu QMAKE_CFLAGS+=\"${RPM_OPT_FLAGS} $(getconf LFS_CFLAGS)\" QMAKE_CXXFLAGS+=\"${RPM_OPT_FLAGS} $(getconf LFS_CFLAGS)\" QMAKE_LFLAGS+="-Wl,--as-needed" DEFINES+=USE_GSTREAMER=1 DEFINES+=HAVE_LIBWEBP=1 $jitopts" + --qmakearg="CONFIG+=production_build CONFIG+=use_system_icu QMAKE_CFLAGS+=\"${RPM_OPT_FLAGS} $(getconf LFS_CFLAGS) -Wno-extra\" QMAKE_CXXFLAGS+=\"${RPM_OPT_FLAGS} $(getconf LFS_CFLAGS) -Wno-extra\" QMAKE_LFLAGS+="-Wl,--as-needed" DEFINES+=USE_GSTREAMER=1 DEFINES+=HAVE_LIBWEBP=1 $jitopts" pushd tools/designer/src/plugins/qwebview/ qmake

1 0

commit vigra for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '17

31 Mar '17

Hello community, here is the log from the commit of package vigra for openSUSE:Factory checked in at 2017-03-31 15:00:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vigra (Old) and /work/SRC/openSUSE:Factory/.vigra.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vigra" Fri Mar 31 15:00:59 2017 rev:33 rq:481800 version:1.11.0 Changes: -------- --- /work/SRC/openSUSE:Factory/vigra/vigra.changes 2017-02-16 16:43:50.308303560 +0100 +++ /work/SRC/openSUSE:Factory/.vigra.new/vigra.changes 2017-03-31 15:01:00.452314016 +0200 @@ -1,0 +2,6 @@ +Mon Mar 20 13:35:28 UTC 2017 - mliska(a)suse.cz + +- Add patch gcc7-Fix-parameter-of-ImagePyramid-swap.patch in order + to fix using the library with a GCC 7. + +------------------------------------------------------------------- New: ---- gcc7-Fix-parameter-of-ImagePyramid-swap.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vigra.spec ++++++ --- /var/tmp/diff_new_pack.FPiPjH/_old 2017-03-31 15:01:02.316050553 +0200 +++ /var/tmp/diff_new_pack.FPiPjH/_new 2017-03-31 15:01:02.320049987 +0200 @@ -26,6 +26,8 @@ Url: http://ukoethe.github.io/vigra/ Source: https://github.com/ukoethe/vigra/releases/download/Version-1-11-0/vigra-1.1… Source1: baselibs.conf +# PATCH-FIX-UPSTREAM gcc7-Fix-parameter-of-ImagePyramid-swap.patch +Patch0: gcc7-Fix-parameter-of-ImagePyramid-swap.patch %if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel BuildRequires: libboost_python-devel @@ -91,6 +93,7 @@ %prep %setup -q +%patch0 -p1 %build %cmake \ ++++++ gcc7-Fix-parameter-of-ImagePyramid-swap.patch ++++++ >From 18675a51fca27b324eb4e4b49593bcee9bc4535e Mon Sep 17 00:00:00 2001 From: Jonathan Wakely <jwakely(a)redhat.com> Date: Fri, 17 Feb 2017 00:55:25 +0000 Subject: [PATCH] Fix parameter of ImagePyramid::swap You can't swap with a const object. This fixes a compilation failure with GCC 7 which rejects the incorrect function even if it isn't instantiated. --- include/vigra/imagecontainer.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/vigra/imagecontainer.hxx b/include/vigra/imagecontainer.hxx index a6f0f807..636cc647 100644 --- a/include/vigra/imagecontainer.hxx +++ b/include/vigra/imagecontainer.hxx @@ -763,7 +763,7 @@ public: /** swap contents of this array with the contents of other (STL-Container interface) */ - void swap(const ImagePyramid<ImageType, Alloc> &other) + void swap(ImagePyramid<ImageType, Alloc> &other) { images_.swap(other.images_); std::swap(lowestLevel_, other.lowestLevel_); -- 2.12.0

1 0

commit ruby2.2 for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '17

31 Mar '17

Hello community, here is the log from the commit of package ruby2.2 for openSUSE:Factory checked in at 2017-03-31 15:00:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ruby2.2 (Old) and /work/SRC/openSUSE:Factory/.ruby2.2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ruby2.2" Fri Mar 31 15:00:52 2017 rev:8 rq:481787 version:2.2.6 Changes: -------- --- /work/SRC/openSUSE:Factory/ruby2.2/ruby2.2.changes 2017-01-10 10:34:51.840268789 +0100 +++ /work/SRC/openSUSE:Factory/.ruby2.2.new/ruby2.2.changes 2017-03-31 15:00:54.545149069 +0200 @@ -1,0 +2,25 @@ +Tue Mar 21 12:40:39 UTC 2017 - mrueckert(a)suse.de + +- added patch by rguenther@ to fix building with GCC7: + 0005-RB_GC_GUARD-stronger-than-gcc7.patch + +------------------------------------------------------------------- +Thu Mar 16 15:53:48 UTC 2017 - mrueckert(a)suse.de + +- switched to git branch based patching. we replace all patches in + this round: + removed: + - 0001-GC-Use-__builtin_ppc_get_timebase-for-POWER-arch.patch + - make-gem-build-reproducible.patch + - ruby-1.9.2p290_tcl_no_stupid_rpaths.patch + + - ruby2.2.x_rbinstall_gem_buildroot.patch (unused) + - rubygems-1.5.0_buildroot.patch (unused) + added: + - 0001-tcl-no-stupid-rpaths.patch + - 0002-make-gem-build-reproducible.patch + - 0003-gc.c-tick-for-POWER-arch.patch +- added 0004-manual-backport-for-CVE-2016-2339.patch + CVE-2016-2339 (boo#1018808) + +------------------------------------------------------------------- Old: ---- 0001-GC-Use-__builtin_ppc_get_timebase-for-POWER-arch.patch make-gem-build-reproducible.patch ruby-1.9.2p290_tcl_no_stupid_rpaths.patch ruby2.2.x_rbinstall_gem_buildroot.patch rubygems-1.5.0_buildroot.patch New: ---- 0001-tcl-no-stupid-rpaths.patch 0002-make-gem-build-reproducible.patch 0003-gc.c-tick-for-POWER-arch.patch 0004-manual-backport-for-CVE-2016-2339.patch 0005-RB_GC_GUARD-stronger-than-gcc7.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ruby2.2.spec ++++++ --- /var/tmp/diff_new_pack.i8Kh2D/_old 2017-03-31 15:00:56.508871472 +0200 +++ /var/tmp/diff_new_pack.i8Kh2D/_new 2017-03-31 15:00:56.512870907 +0200 @@ -114,13 +114,11 @@ Source3: %{name}-default.macros Source99: %{name}-rpmlintrc -# to be regenerated patches? -Source100: rubygems-1.5.0_buildroot.patch -Source101: ruby2.2.x_rbinstall_gem_buildroot.patch - -Patch0: ruby-1.9.2p290_tcl_no_stupid_rpaths.patch -Patch1: make-gem-build-reproducible.patch -Patch2: 0001-GC-Use-__builtin_ppc_get_timebase-for-POWER-arch.patch +Patch01: 0001-tcl-no-stupid-rpaths.patch +Patch02: 0002-make-gem-build-reproducible.patch +Patch03: 0003-gc.c-tick-for-POWER-arch.patch +Patch04: 0004-manual-backport-for-CVE-2016-2339.patch +Patch05: 0005-RB_GC_GUARD-stronger-than-gcc7.patch # Summary: An Interpreted Object-Oriented Scripting Language License: BSD-2-Clause or Ruby @@ -297,9 +295,11 @@ %prep %setup -q -n ruby-%{pkg_version} -%patch0 -%patch1 -p1 -%patch2 -p1 +%patch01 -p1 +%patch02 -p1 +%patch03 -p1 +%patch04 -p1 +%patch05 -p1 find sample -type f -print0 | xargs -r0 chmod a-x grep -Erl '^#! */' benchmark bootstraptest ext lib sample test \ | xargs -r perl -p -i -e 's|^#!\s*\S+(\s+.*)?$|#!/usr/bin/ruby%{rb_binary_suffix} $1|' ++++++ 0001-tcl-no-stupid-rpaths.patch ++++++ >From bdcc1e3113b2595e531d785c3fcb57898cc4843b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <mrueckert(a)suse.de> Date: Wed, 8 Mar 2017 17:56:36 +0100 Subject: [PATCH 1/5] tcl no stupid rpaths --- ext/tk/extconf.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb index c6a2dd52ff..c29d8541fe 100644 --- a/ext/tk/extconf.rb +++ b/ext/tk/extconf.rb @@ -224,9 +224,7 @@ def get_shlib_path_head else [ - '/opt', '/pkg', '/share', - '/usr/local/opt', '/usr/local/pkg', '/usr/local/share', '/usr/local', - '/usr/opt', '/usr/pkg', '/usr/share', '/usr/contrib', '/usr' + '/usr' ].each{|dir| next unless File.directory?(dir) -- 2.12.0 ++++++ 0002-make-gem-build-reproducible.patch ++++++ >From e955cdc91a10ee969e7400e4ebcb24c8b75b953e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <mrueckert(a)suse.de> Date: Wed, 8 Mar 2017 17:56:58 +0100 Subject: [PATCH 2/5] make gem build reproducible --- lib/rubygems/package.rb | 4 ++++ lib/rubygems/package/tar_writer.rb | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/rubygems/package.rb b/lib/rubygems/package.rb index e8b8b38b06..b5a876c1be 100644 --- a/lib/rubygems/package.rb +++ b/lib/rubygems/package.rb @@ -108,9 +108,12 @@ class Gem::Package def self.build spec, skip_validation=false gem_file = spec.file_name + spec_file = spec.loaded_from + spec_file = "Gemfile" if spec_file.nil? || spec_file.empty? package = new gem_file package.spec = spec + package.build_time = File.stat(spec_file).mtime.to_i package.build skip_validation gem_file @@ -187,6 +190,7 @@ class Gem::Package digests = tar.add_file_signed 'data.tar.gz', 0444, @signer do |io| gzip_to io do |gz_io| Gem::Package::TarWriter.new gz_io do |data_tar| + data_tar.mtime = @build_time add_files data_tar end end diff --git a/lib/rubygems/package/tar_writer.rb b/lib/rubygems/package/tar_writer.rb index dfd635724b..3a49cf7f81 100644 --- a/lib/rubygems/package/tar_writer.rb +++ b/lib/rubygems/package/tar_writer.rb @@ -90,12 +90,15 @@ class Gem::Package::TarWriter nil end + attr_accessor :mtime + ## # Creates a new TarWriter that will write to +io+ def initialize(io) @io = io @closed = false + @mtime = Time.now end ## @@ -124,7 +127,7 @@ class Gem::Package::TarWriter header = Gem::Package::TarHeader.new :name => name, :mode => mode, :size => size, :prefix => prefix, - :mtime => Time.now + :mtime => mtime @io.write header @io.pos = final_pos @@ -217,7 +220,7 @@ class Gem::Package::TarWriter header = Gem::Package::TarHeader.new(:name => name, :mode => mode, :size => size, :prefix => prefix, - :mtime => Time.now).to_s + :mtime => mtime).to_s @io.write header os = BoundedStream.new @io, size @@ -279,7 +282,7 @@ class Gem::Package::TarWriter header = Gem::Package::TarHeader.new :name => name, :mode => mode, :typeflag => "5", :size => 0, :prefix => prefix, - :mtime => Time.now + :mtime => mtime @io.write header -- 2.12.0 ++++++ 0003-gc.c-tick-for-POWER-arch.patch ++++++ >From dd01286860e6bcd9a6b7ac050a75605f832efc6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <mrueckert(a)suse.de> Date: Wed, 8 Mar 2017 17:57:11 +0100 Subject: [PATCH 3/5] gc.c tick for POWER arch --- gc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gc.c b/gc.c index 51872f26dd..9037760ab8 100644 --- a/gc.c +++ b/gc.c @@ -871,6 +871,18 @@ tick(void) return ((unsigned long long)lo)|( ((unsigned long long)hi)<<32); } +#elif defined(__powerpc64__) && \ + ( __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) +typedef unsigned long long tick_t; +#define PRItick "llu" + +static __inline__ tick_t +tick(void) +{ + unsigned long long val = __builtin_ppc_get_timebase(); + return val; +} + #elif defined(_WIN32) && defined(_MSC_VER) #include <intrin.h> typedef unsigned __int64 tick_t; -- 2.12.0 ++++++ 0004-manual-backport-for-CVE-2016-2339.patch ++++++ >From 82c431b6285e279398bb744e07bf68d334ab8d88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <mrueckert(a)suse.de> Date: Thu, 9 Mar 2017 17:05:41 +0100 Subject: [PATCH 4/5] manual backport for CVE-2016-2339 --- ext/fiddle/function.c | 49 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/ext/fiddle/function.c b/ext/fiddle/function.c index e0da8b69cb..5203fd5e9a 100644 --- a/ext/fiddle/function.c +++ b/ext/fiddle/function.c @@ -14,12 +14,16 @@ VALUE cFiddleFunction; #define MAX_ARGS (SIZE_MAX / (sizeof(void *) + sizeof(fiddle_generic)) - 1) #define Check_Max_Args(name, len) \ + Check_Max_Args_(name, len, "") +#define Check_Max_Args_Long(name, len) \ + Check_Max_Args_(name, len, "l") +#define Check_Max_Args_(name, len, fmt) \ if ((size_t)(len) < MAX_ARGS) { \ /* OK */ \ } \ else { \ rb_raise(rb_eTypeError, \ - name" is so large that it can cause integer overflow (%d)", \ + name" is so large that it can cause integer overflow (%"fmt"d)", \ (len)); \ } @@ -87,16 +91,34 @@ static VALUE initialize(int argc, VALUE argv[], VALUE self) { ffi_cif * cif; - ffi_type **arg_types; + ffi_type **arg_types, *rtype; ffi_status result; - VALUE ptr, args, ret_type, abi, kwds; - int i; + VALUE ptr, args, ret_type, abi, kwds, ary; + int i, len; + int nabi; + void *cfunc; rb_scan_args(argc, argv, "31:", &ptr, &args, &ret_type, &abi, &kwds); - if(NIL_P(abi)) abi = INT2NUM(FFI_DEFAULT_ABI); + ptr = rb_Integer(ptr); + cfunc = NUM2PTR(ptr); + PTR2NUM(cfunc); + nabi = NIL_P(abi) ? FFI_DEFAULT_ABI : NUM2INT(abi); + abi = INT2FIX(nabi); + i = NUM2INT(ret_type); + rtype = INT2FFI_TYPE(i); + ret_type = INT2FIX(i); Check_Type(args, T_ARRAY); - Check_Max_Args("args", RARRAY_LENINT(args)); + len = RARRAY_LENINT(args); + Check_Max_Args("args", len); + ary = rb_ary_subseq(args, 0, len); + for (i = 0; i < RARRAY_LEN(args); i++) { + VALUE a = RARRAY_PTR(args)[i]; + int type = NUM2INT(a); + (void)INT2FFI_TYPE(type); /* raise */ + if (INT2FIX(type) != a) rb_ary_store(ary, i, INT2FIX(type)); + } + OBJ_FREEZE(ary); rb_iv_set(self, "@ptr", ptr); rb_iv_set(self, "@args", args); @@ -107,20 +129,15 @@ initialize(int argc, VALUE argv[], VALUE self) TypedData_Get_Struct(self, ffi_cif, &function_data_type, cif); - arg_types = xcalloc(RARRAY_LEN(args) + 1, sizeof(ffi_type *)); + arg_types = xcalloc(len + 1, sizeof(ffi_type *)); for (i = 0; i < RARRAY_LEN(args); i++) { - int type = NUM2INT(RARRAY_PTR(args)[i]); + int type = NUM2INT(RARRAY_AREF(args, i)); arg_types[i] = INT2FFI_TYPE(type); } - arg_types[RARRAY_LEN(args)] = NULL; - - result = ffi_prep_cif ( - cif, - NUM2INT(abi), - RARRAY_LENINT(args), - INT2FFI_TYPE(NUM2INT(ret_type)), - arg_types); + arg_types[len] = NULL; + + result = ffi_prep_cif(cif, nabi, len, rtype, arg_types); if (result) rb_raise(rb_eRuntimeError, "error creating CIF %d", result); -- 2.12.0 ++++++ 0005-RB_GC_GUARD-stronger-than-gcc7.patch ++++++ >From cb85d94f376a5d4fca33f7f7e2822dc30c1cfe66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <mrueckert(a)suse.de> Date: Tue, 21 Mar 2017 13:33:40 +0100 Subject: [PATCH 5/5] RB_GC_GUARD stronger than gcc7 >From 9eb54f7fb4672a4b0f39772be819965a4b7088f5 Mon Sep 17 00:00:00 2001 From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> Date: Mon, 13 Feb 2017 08:14:19 +0000 Subject: [PATCH] ruby.h: RB_GC_GUARD stronger than gcc7 * include/ruby/ruby.h (RB_GC_GUARD): prevent guarded pointer from optimization by using as an input to inline asm. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57619 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- include/ruby/ruby.h | 6 +++++- marshal.c | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) --- include/ruby/ruby.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 6e430da179..84b6ff8d99 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -512,7 +512,7 @@ static inline int rb_type(VALUE obj); * itself. don't use it directly */ #ifdef __GNUC__ #define RB_GC_GUARD_PTR(ptr) \ - __extension__ ({volatile VALUE *rb_gc_guarded_ptr = (ptr); rb_gc_guarded_ptr;}) + __extension__ ({volatile VALUE *rb_gc_guarded_ptr = (ptr); __asm__("### RB_GC_GUARD" : : "m"(rb_gc_guarded_ptr)); rb_gc_guarded_ptr;}) #else #ifdef _MSC_VER #pragma optimize("", off) -- 2.12.0

1 0

commit ruby2.3 for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '17

31 Mar '17

Hello community, here is the log from the commit of package ruby2.3 for openSUSE:Factory checked in at 2017-03-31 15:00:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ruby2.3 (Old) and /work/SRC/openSUSE:Factory/.ruby2.3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ruby2.3" Fri Mar 31 15:00:44 2017 rev:3 rq:481786 version:2.3.3 Changes: -------- --- /work/SRC/openSUSE:Factory/ruby2.3/ruby2.3.changes 2017-01-10 10:35:08.613900672 +0100 +++ /work/SRC/openSUSE:Factory/.ruby2.3.new/ruby2.3.changes 2017-03-31 15:00:46.582274721 +0200 @@ -1,0 +2,22 @@ +Tue Mar 21 12:39:15 UTC 2017 - mrueckert(a)suse.de + +- added patch by rguenther@ to fix building with GCC7: + 0004-RB_GC_GUARD-stronger-than-gcc7.patch + +------------------------------------------------------------------- +Thu Mar 16 15:59:41 UTC 2017 - mrueckert(a)suse.de + +- switched to git branch based patching. we replace all patches in + this round: + removed: + - 0001-gc.c-tick-for-POWER-arch.patch + - make-gem-build-reproducible.patch + - ruby-1.9.2p290_tcl_no_stupid_rpaths.patch + - ruby2.2.x_rbinstall_gem_buildroot.patch (unused) + - rubygems-1.5.0_buildroot.patch (unused) + added: + - 0001-tcl-no-stupid-rpaths.patch + - 0002-make-gem-build-reproducible.patch + - 0003-gc.c-tick-for-POWER-arch.patch + +------------------------------------------------------------------- Old: ---- 0001-gc.c-tick-for-POWER-arch.patch make-gem-build-reproducible.patch ruby-1.9.2p290_tcl_no_stupid_rpaths.patch ruby2.2.x_rbinstall_gem_buildroot.patch rubygems-1.5.0_buildroot.patch New: ---- 0001-tcl-no-stupid-rpaths.patch 0002-make-gem-build-reproducible.patch 0003-gc.c-tick-for-POWER-arch.patch 0004-RB_GC_GUARD-stronger-than-gcc7.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ruby2.3.spec ++++++ --- /var/tmp/diff_new_pack.4SFQF4/_old 2017-03-31 15:00:47.790103979 +0200 +++ /var/tmp/diff_new_pack.4SFQF4/_new 2017-03-31 15:00:47.794103414 +0200 @@ -114,13 +114,11 @@ Source3: %{name}-default.macros Source99: %{name}-rpmlintrc -# to be regenerated patches? -Source100: rubygems-1.5.0_buildroot.patch -Source101: ruby2.2.x_rbinstall_gem_buildroot.patch - -Patch0: ruby-1.9.2p290_tcl_no_stupid_rpaths.patch -Patch1: make-gem-build-reproducible.patch -Patch2: 0001-gc.c-tick-for-POWER-arch.patch +Patch01: 0001-tcl-no-stupid-rpaths.patch +Patch02: 0002-make-gem-build-reproducible.patch +Patch03: 0003-gc.c-tick-for-POWER-arch.patch +Patch04: 0004-RB_GC_GUARD-stronger-than-gcc7.patch + # Summary: An Interpreted Object-Oriented Scripting Language License: BSD-2-Clause or Ruby @@ -302,9 +300,10 @@ %prep %setup -q -n ruby-%{pkg_version} -%patch0 -%patch1 -p1 -%patch2 -p1 +%patch01 -p1 +%patch02 -p1 +%patch03 -p1 +%patch04 -p1 find sample -type f -print0 | xargs -r0 chmod a-x grep -Erl '^#! */' benchmark bootstraptest ext lib sample test \ | xargs -r perl -p -i -e 's|^#!\s*\S+(\s+.*)?$|#!/usr/bin/ruby%{rb_binary_suffix} $1|' ++++++ 0001-tcl-no-stupid-rpaths.patch ++++++ >From 4b3d7a777fee4250e3f51f93476072256626d86e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <mrueckert(a)suse.de> Date: Wed, 8 Mar 2017 17:56:36 +0100 Subject: [PATCH 1/4] tcl no stupid rpaths --- ext/tk/extconf.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb index c4ea4067bd..5c35dde04d 100644 --- a/ext/tk/extconf.rb +++ b/ext/tk/extconf.rb @@ -225,9 +225,7 @@ def get_shlib_path_head else [ - '/opt', '/pkg', '/share', - '/usr/local/opt', '/usr/local/pkg', '/usr/local/share', '/usr/local', - '/usr/opt', '/usr/pkg', '/usr/share', '/usr/contrib', '/usr' + '/usr' ].each{|dir| next unless File.directory?(dir) -- 2.12.0 ++++++ 0002-make-gem-build-reproducible.patch ++++++ >From 5797bc4db5c6aac2532c19546d6b40b0909ce7cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <mrueckert(a)suse.de> Date: Wed, 8 Mar 2017 17:56:58 +0100 Subject: [PATCH 2/4] make gem build reproducible --- lib/rubygems/package.rb | 4 ++++ lib/rubygems/package/tar_writer.rb | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/rubygems/package.rb b/lib/rubygems/package.rb index 0d9adba26e..ff8c668522 100644 --- a/lib/rubygems/package.rb +++ b/lib/rubygems/package.rb @@ -109,9 +109,12 @@ class TarInvalidError < Error; end def self.build spec, skip_validation=false gem_file = spec.file_name + spec_file = spec.loaded_from + spec_file = "Gemfile" if spec_file.nil? || spec_file.empty? package = new gem_file package.spec = spec + package.build_time = File.stat(spec_file).mtime.to_i package.build skip_validation gem_file @@ -195,6 +198,7 @@ def add_contents tar # :nodoc: digests = tar.add_file_signed 'data.tar.gz', 0444, @signer do |io| gzip_to io do |gz_io| Gem::Package::TarWriter.new gz_io do |data_tar| + data_tar.mtime = @build_time add_files data_tar end end diff --git a/lib/rubygems/package/tar_writer.rb b/lib/rubygems/package/tar_writer.rb index ab0313c9f8..f73254daaf 100644 --- a/lib/rubygems/package/tar_writer.rb +++ b/lib/rubygems/package/tar_writer.rb @@ -91,12 +91,15 @@ def self.new(io) nil end + attr_accessor :mtime + ## # Creates a new TarWriter that will write to +io+ def initialize(io) @io = io @closed = false + @mtime = Time.now end ## @@ -125,7 +128,7 @@ def add_file(name, mode) # :yields: io header = Gem::Package::TarHeader.new :name => name, :mode => mode, :size => size, :prefix => prefix, - :mtime => Time.now + :mtime => mtime @io.write header @io.pos = final_pos @@ -218,7 +221,7 @@ def add_file_simple(name, mode, size) # :yields: io header = Gem::Package::TarHeader.new(:name => name, :mode => mode, :size => size, :prefix => prefix, - :mtime => Time.now).to_s + :mtime => mtime).to_s @io.write header os = BoundedStream.new @io, size @@ -299,7 +302,7 @@ def mkdir(name, mode) header = Gem::Package::TarHeader.new :name => name, :mode => mode, :typeflag => "5", :size => 0, :prefix => prefix, - :mtime => Time.now + :mtime => mtime @io.write header -- 2.12.0 ++++++ 0001-gc.c-tick-for-POWER-arch.patch -> 0003-gc.c-tick-for-POWER-arch.patch ++++++ --- /work/SRC/openSUSE:Factory/ruby2.3/0001-gc.c-tick-for-POWER-arch.patch 2016-06-06 14:25:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ruby2.3.new/0003-gc.c-tick-for-POWER-arch.patch 2017-03-31 15:00:46.382302990 +0200 @@ -1,26 +1,16 @@ -From a5456a1d8308cec5461846418500f77b69a01e4d Mon Sep 17 00:00:00 2001 -From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> -Date: Thu, 17 Mar 2016 08:14:53 +0000 -Subject: [PATCH] gc.c: tick for POWER arch +From 7e0dd0db948cfd3cca9a38b0f13e3758ad29e05a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <mrueckert(a)suse.de> +Date: Wed, 8 Mar 2017 17:57:11 +0100 +Subject: [PATCH 3/4] gc.c tick for POWER arch -* gc.c (tick): Use __builtin_ppc_get_timebase for POWER arch. - [Fix GH-1291] - -This gives a little performance improvement - - user system total real -Before: 20.870000 0.000000 20.870000 ( 20.893959) -After: 20.720000 0.000000 20.720000 ( 20.733970) - -git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54145 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- - gc.c | 12 ++++++++++++ - 1 files changed, 12 insertions(+) + gc.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) -Index: ruby-2.3.0/gc.c -=================================================================== ---- ruby-2.3.0.orig/gc.c -+++ ruby-2.3.0/gc.c +diff --git a/gc.c b/gc.c +index 8a345db0cc..a612e17359 100644 +--- a/gc.c ++++ b/gc.c @@ -915,6 +915,18 @@ tick(void) return ((unsigned long long)lo)|( ((unsigned long long)hi)<<32); } @@ -40,3 +30,6 @@ #elif defined(_WIN32) && defined(_MSC_VER) #include <intrin.h> typedef unsigned __int64 tick_t; +-- +2.12.0 + ++++++ 0004-RB_GC_GUARD-stronger-than-gcc7.patch ++++++ >From c7837b835738dc81f5343f5f655f3553f3fb271a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <mrueckert(a)suse.de> Date: Tue, 21 Mar 2017 13:35:56 +0100 Subject: [PATCH 4/4] RB_GC_GUARD stronger than gcc7 >From 9eb54f7fb4672a4b0f39772be819965a4b7088f5 Mon Sep 17 00:00:00 2001 From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> Date: Mon, 13 Feb 2017 08:14:19 +0000 Subject: [PATCH] ruby.h: RB_GC_GUARD stronger than gcc7 * include/ruby/ruby.h (RB_GC_GUARD): prevent guarded pointer from optimization by using as an input to inline asm. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57619 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- include/ruby/ruby.h | 6 +++++- marshal.c | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) --- include/ruby/ruby.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 60cfb1174e..fec93e1d14 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -555,7 +555,7 @@ static inline int rb_type(VALUE obj); * itself. don't use it directly */ #ifdef __GNUC__ #define RB_GC_GUARD_PTR(ptr) \ - __extension__ ({volatile VALUE *rb_gc_guarded_ptr = (ptr); rb_gc_guarded_ptr;}) + __extension__ ({volatile VALUE *rb_gc_guarded_ptr = (ptr); __asm__("### RB_GC_GUARD" : : "m"(rb_gc_guarded_ptr)); rb_gc_guarded_ptr;}) #else #ifdef _MSC_VER #pragma optimize("", off) -- 2.12.0

1 0

commit rubygem-fast_gettext for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '17

31 Mar '17

Hello community, here is the log from the commit of package rubygem-fast_gettext for openSUSE:Factory checked in at 2017-03-31 15:00:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-fast_gettext (Old) and /work/SRC/openSUSE:Factory/.rubygem-fast_gettext.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-fast_gettext" Fri Mar 31 15:00:38 2017 rev:20 rq:481719 version:1.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-fast_gettext/rubygem-fast_gettext.changes 2016-11-03 12:57:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-fast_gettext.new/rubygem-fast_gettext.changes 2017-03-31 15:00:39.423286731 +0200 @@ -1,0 +2,6 @@ +Sat Mar 18 05:29:57 UTC 2017 - coolo(a)suse.com + +- updated to version 1.4.0 + see installed CHANGELOG + +------------------------------------------------------------------- Old: ---- fast_gettext-1.3.0.gem New: ---- fast_gettext-1.4.0.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-fast_gettext.spec ++++++ --- /var/tmp/diff_new_pack.wS8art/_old 2017-03-31 15:00:40.207175919 +0200 +++ /var/tmp/diff_new_pack.wS8art/_new 2017-03-31 15:00:40.207175919 +0200 @@ -1,7 +1,7 @@ # # spec file for package rubygem-fast_gettext # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ # Name: rubygem-fast_gettext -Version: 1.3.0 +Version: 1.4.0 Release: 0 %define mod_name fast_gettext %define mod_full_name %{mod_name}-%{version} ++++++ fast_gettext-1.3.0.gem -> fast_gettext-1.4.0.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Readme.md new/Readme.md --- old/Readme.md 2016-10-19 18:48:48.000000000 +0200 +++ new/Readme.md 2017-03-17 21:19:05.000000000 +0100 @@ -44,46 +44,60 @@ ===== ### 1. Install - sudo gem install fast_gettext +```Bash +gem install fast_gettext +``` ### 2. Add a translation repository From mo files (traditional/default) - FastGettext.add_text_domain('my_app', path: 'locale') +```Ruby +FastGettext.add_text_domain('my_app', path: 'locale') +``` Or po files (less maintenance than mo) - FastGettext.add_text_domain('my_app', path: 'locale', type: :po) - # :ignore_fuzzy => true to not use fuzzy translations - # :report_warning => false to hide warnings about obsolete/fuzzy translations +```Ruby +FastGettext.add_text_domain('my_app', path: 'locale', type: :po) +# :ignore_fuzzy => true to not use fuzzy translations +# :report_warning => false to hide warnings about obsolete/fuzzy translations +``` Or yaml files (use I18n syntax/indentation) - FastGettext.add_text_domain('my_app', path: 'config/locales', type: :yaml) +```Ruby +FastGettext.add_text_domain('my_app', path: 'config/locales', type: :yaml) +``` Or database (scaleable, good for many locales/translators) - # db access is cached <-> only first lookup hits the db - require "fast_gettext/translation_repository/db" - FastGettext::TranslationRepository::Db.require_models #load and include default models - FastGettext.add_text_domain('my_app', type: :db, model: TranslationKey) +```Ruby +# db access is cached <-> only first lookup hits the db +require "fast_gettext/translation_repository/db" +FastGettext::TranslationRepository::Db.require_models #load and include default models +FastGettext.add_text_domain('my_app', type: :db, model: TranslationKey) +``` ### 3. Choose text domain and locale for translation Do this once in every Thread. (e.g. Rails -> ApplicationController) - FastGettext.text_domain = 'my_app' - FastGettext.available_locales = ['de','en','fr','en_US','en_UK'] # only allow these locales to be set (optional) - FastGettext.locale = 'de' +```Ruby +FastGettext.text_domain = 'my_app' +FastGettext.available_locales = ['de','en','fr','en_US','en_UK'] # only allow these locales to be set (optional) +FastGettext.locale = 'de' +``` ### 4. Start translating - include FastGettext::Translation - _('Car') == 'Auto' - _('not-found') == 'not-found' - s_('Namespace|not-found') == 'not-found' - n_('Axis','Axis',3) == 'Achsen' #German plural of Axis - _('Hello %{name}!') % {name: "Pete"} == 'Hello Pete!' +```Ruby +include FastGettext::Translation +_('Car') == 'Auto' +_('not-found') == 'not-found' +s_('Namespace|not-found') == 'not-found' +n_('Axis','Axis',3) == 'Achsen' #German plural of Axis +_('Hello %{name}!') % {name: "Pete"} == 'Hello Pete!' +``` Managing translations @@ -93,12 +107,14 @@ Tell Gettext where your .mo or .po files lie, e.g. for locale/de/my_app.po and locale/de/LC_MESSAGES/my_app.mo - FastGettext.add_text_domain('my_app', path: 'locale') +```Ruby +FastGettext.add_text_domain('my_app', path: 'locale') +``` Use the [original GetText](http://github.com/mutoh/gettext) to create and manage po/mo-files. (Work on a po/mo parser & reader that is easier to use has started, contributions welcome @ [get_pomo](http://github.com/grosser/get_pomo) ) -###Database +### Database [Example migration for ActiveRecord](http://github.com/grosser/fast_gettext/blob/master/examples/d…<br/> The default plural seperator is `||||` but you may overwrite it (or suggest a better one..). @@ -115,22 +131,24 @@ Setting `available_locales`,`text_domain` or `locale` will not work inside the `evironment.rb`, since it runs in a different thread then e.g. controllers, so set them inside your application_controller. - #environment.rb after initializers - Object.send(:include, FastGettext::Translation) - FastGettext.add_text_domain('accounting', path: 'locale') - FastGettext.add_text_domain('frontend', path: 'locale') - ... - - #application_controller.rb - class ApplicationController ... - include FastGettext::Translation - before_filter :set_locale - def set_locale - FastGettext.available_locales = ['de','en',...] - FastGettext.text_domain = 'frontend' - FastGettext.set_locale(params[:locale] || session[:locale] || request.env['HTTP_ACCEPT_LANGUAGE']) - session[:locale] = I18n.locale = FastGettext.locale - end +```Ruby +# config/environment.rb after initializers +Object.send(:include, FastGettext::Translation) +FastGettext.add_text_domain('accounting', path: 'locale') +FastGettext.add_text_domain('frontend', path: 'locale') +... + +# app/controllers/application_controller.rb +class ApplicationController ... + include FastGettext::Translation + before_filter :set_locale + def set_locale + FastGettext.available_locales = ['de','en',...] + FastGettext.text_domain = 'frontend' + FastGettext.set_locale(params[:locale] || session[:locale] || request.env['HTTP_ACCEPT_LANGUAGE']) + session[:locale] = I18n.locale = FastGettext.locale + end +``` Advanced features @@ -142,102 +160,132 @@ Via Ruby: - FastGettext.pluralisation_rule = lambda{|count| count > 5 ? 1 : (count > 2 ? 0 : 2)} +```Ruby +FastGettext.pluralisation_rule = lambda{|count| count > 5 ? 1 : (count > 2 ? 0 : 2)} +``` Via mo/pofile: - Plural-Forms: nplurals=2; plural=n==2?3:4; +``` +Plural-Forms: nplurals=2; plural=n==2?3:4; +``` [Plural expressions for all languages](http://translate.sourceforge.net/wiki/l10n/pluralforms). -###default_text_domain +### default_text_domain If you only use one text domain, setting `FastGettext.default_text_domain = 'app'` is sufficient and no more `text_domain=` is needed -###default_locale +### default_locale If the simple rule of "first `availble_locale` or 'en'" is not suficcient for you, set `FastGettext.default_locale = 'de'`. -###default_available_locales +### default_available_locales Fallback when no available_locales are set -###Chains +### with_locale +If there is content from different locales that you wish to display, you should use the with_locale option as below: + +```Ruby +FastGettext.with_locale 'gsw_CH' do + FastGettext._('Car was successfully created.') +end +# => "Z auto isch erfolgriich gspeicharat worda." +``` + +### Chains You can use any number of repositories to find a translation. Simply add them to a chain and when the first cannot translate a given key, the next is asked and so forth. - repos = [ - FastGettext::TranslationRepository.build('new', path: '....'), - FastGettext::TranslationRepository.build('old', path: '....') - ] - FastGettext.add_text_domain 'combined', type: :chain, :chain: repos +```Ruby +repos = [ + FastGettext::TranslationRepository.build('new', path: '....'), + FastGettext::TranslationRepository.build('old', path: '....') +] +FastGettext.add_text_domain 'combined', type: :chain, :chain: repos +``` -###Merge +### Merge In some cases you can benefit from using merge repositories as an alternative to chains. They behave nearly the same. The difference is in the internal data structure. While chain repos iterate over the whole chain for each translation, merge repositories select and store the first translation at the time a subordinate repository is added. This puts the burden on the load phase and speeds up the translations. - repos = [ - FastGettext::TranslationRepository.build('new', :path: '....'), - FastGettext::TranslationRepository.build('old', :path: '....') - ] - domain = FastGettext.add_text_domain 'combined', type: :merge, chain: repos +```Ruby +repos = [ + FastGettext::TranslationRepository.build('new', :path: '....'), + FastGettext::TranslationRepository.build('old', :path: '....') +] +domain = FastGettext.add_text_domain 'combined', type: :merge, chain: repos +``` Downside of this approach is that you have to reload the merge repo each time a language is changed. - FastGettext.locale = 'de' - domain.reload +```Ruby +FastGettext.locale = 'de' +domain.reload +``` -###Logger +### Logger When you want to know which keys could not be translated or were used, add a Logger to a Chain: - repos = [ - FastGettext::TranslationRepository.build('app', path: '....') - FastGettext::TranslationRepository.build('logger', type: :logger, callback: lambda{|key_or_array_of_ids| ... }), - } - FastGettext.add_text_domain 'combined', type: :chain, chain: repos +```Ruby +repos = [ + FastGettext::TranslationRepository.build('app', path: '....') + FastGettext::TranslationRepository.build('logger', type: :logger, callback: lambda{|key_or_array_of_ids| ... }), +} +FastGettext.add_text_domain 'combined', type: :chain, chain: repos +``` If the Logger is in position #1 it will see all translations, if it is in position #2 it will only see the unfound. Unfound may not always mean missing, if you choose not to translate a word because the key is a good translation, it will appear nevertheless. A lambda or anything that responds to `call` will do as callback. A good starting point may be `examples/missing_translations_logger.rb`. -###Plugins +### Plugins Want a xml version ? Write your own TranslationRepository! - #fast_gettext/translation_repository/xxx.rb - module FastGettext - module TranslationRepository - class Wtf - define initialize(name,options), [key], plural(*keys) and - either inherit from TranslationRepository::Base or define available_locales and pluralisation_rule - end - end +```Ruby +# fast_gettext/translation_repository/xxx.rb +module FastGettext + module TranslationRepository + class Wtf + define initialize(name,options), [key], plural(*keys) and + either inherit from TranslationRepository::Base or define available_locales and pluralisation_rule end + end +end +``` -###Multi domain support +### Multi domain support If you have more than one gettext domain, there are two sets of functions available: - include FastGettext::TranslationMultidomain +```Ruby +include FastGettext::TranslationMultidomain - d_("domainname", "string") # finds 'string' in domain domainname - dn_("domainname", "string", "strings", 1) # ditto - # etc. +d_("domainname", "string") # finds 'string' in domain domainname +dn_("domainname", "string", "strings", 1) # ditto +# etc. +``` These are helper methods so you don't need to write: - FastGettext.text_domain = "domainname" - _("string") +```Ruby +FastGettext.text_domain = "domainname" +_("string") +``` It is useful in Rails plugins in the views for example. The second set of functions are D functions which search for string in _all_ domains. If there are multiple translations in different domains, it returns them in random order (depends on the Ruby hash implementation): - include FastGettext::TranslationMultidomain +```Ruby +include FastGettext::TranslationMultidomain - D_("string") # finds 'string' in any domain - # etc. +D_("string") # finds 'string' in any domain +# etc. +``` Alternatively you can use [merge repository](https://github.com/grosser/fast_gettext#merge) to achieve the same behaviour. @@ -274,6 +322,7 @@ - [Lukáš Zapletal](https://github.com/lzap) - [Dominic Cleal](https://github.com/domcleal) - [Tomas Strachota](https://github.com/tstrachota) + - [Martin Meier](https://github.com/mameier) [Michael Grosser](http://grosser.it)<br/> michael(a)grosser.it<br/> Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/fast_gettext/translation_repository/base.rb new/lib/fast_gettext/translation_repository/base.rb --- old/lib/fast_gettext/translation_repository/base.rb 2016-10-19 18:48:48.000000000 +0200 +++ new/lib/fast_gettext/translation_repository/base.rb 2017-03-17 21:19:05.000000000 +0100 @@ -4,6 +4,9 @@ # - base for all repositories # - fallback as empty repository, that cannot translate anything but does not crash class Base + + attr_reader :name, :options + def initialize(name,options={}) @name = name @options = options diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/fast_gettext/version.rb new/lib/fast_gettext/version.rb --- old/lib/fast_gettext/version.rb 2016-10-19 18:48:48.000000000 +0200 +++ new/lib/fast_gettext/version.rb 2017-03-17 21:19:05.000000000 +0100 @@ -1,3 +1,3 @@ module FastGettext - VERSION = Version = '1.3.0' + VERSION = Version = '1.4.0' end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2016-10-19 18:48:48.000000000 +0200 +++ new/metadata 2017-03-17 21:19:05.000000000 +0100 @@ -1,14 +1,14 @@ --- !ruby/object:Gem::Specification name: fast_gettext version: !ruby/object:Gem::Version - version: 1.3.0 + version: 1.4.0 platform: ruby authors: - Michael Grosser autorequire: bindir: bin cert_chain: [] -date: 2016-10-19 00:00:00.000000000 Z +date: 2017-03-17 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: rake

1 0

commit rubygem-nokogiri for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '17

31 Mar '17

Hello community, here is the log from the commit of package rubygem-nokogiri for openSUSE:Factory checked in at 2017-03-31 15:00:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-nokogiri (Old) and /work/SRC/openSUSE:Factory/.rubygem-nokogiri.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-nokogiri" Fri Mar 31 15:00:33 2017 rev:33 rq:481714 version:1.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-nokogiri/rubygem-nokogiri.changes 2017-01-23 11:30:27.604837183 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-nokogiri.new/rubygem-nokogiri.changes 2017-03-31 15:00:35.047905244 +0200 @@ -1,0 +2,23 @@ +Mon Mar 20 05:34:25 UTC 2017 - coolo(a)suse.com + +- updated to version 1.7.1 + see installed CHANGELOG.md + + # 1.7.1 / unreleased + + ## Security Notes + + [MRI] Upstream libxml2 patches are applied to the vendored libxml 2.9.4 which address CVE-2016-4658 and CVE-2016-5131. + + For more information: + + * https://github.com/sparklemotion/nokogiri/issues/1615 + * http://people.canonical.com/~ubuntu-security/cve/2016/CVE-2016-4658.html + * http://people.canonical.com/~ubuntu-security/cve/2016/CVE-2016-5131.html + + + ## Dependencies + + * [Windows] Upgrade zlib from 1.2.8 to 1.2.11 (unless --use-system-libraries) + +------------------------------------------------------------------- Old: ---- nokogiri-1.7.0.1.gem New: ---- nokogiri-1.7.1.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-nokogiri.spec ++++++ --- /var/tmp/diff_new_pack.h0ctwD/_old 2017-03-31 15:00:35.783801217 +0200 +++ /var/tmp/diff_new_pack.h0ctwD/_new 2017-03-31 15:00:35.783801217 +0200 @@ -24,7 +24,7 @@ # Name: rubygem-nokogiri -Version: 1.7.0.1 +Version: 1.7.1 Release: 0 %define mod_name nokogiri %define mod_full_name %{mod_name}-%{version} ++++++ nokogiri-1.7.0.1.gem -> nokogiri-1.7.1.gem ++++++ /work/SRC/openSUSE:Factory/rubygem-nokogiri/nokogiri-1.7.0.1.gem /work/SRC/openSUSE:Factory/.rubygem-nokogiri.new/nokogiri-1.7.1.gem differ: char 133, line 1

1 0

commit yast2-product-creator for openSUSE:Factory
by root＠hilbert.suse.de 29 Mar '17

29 Mar '17

Hello community, here is the log from the commit of package yast2-product-creator for openSUSE:Factory checked in at 2017-03-29 13:25:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-product-creator (Old) and /work/SRC/openSUSE:Factory/.yast2-product-creator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-product-creator" Wed Mar 29 13:25:03 2017 rev:117 rq:483257 version:3.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-product-creator/yast2-product-creator.changes 2016-06-07 23:48:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-product-creator.new/yast2-product-creator.changes 2017-03-29 13:25:04.580168166 +0200 @@ -1,0 +2,14 @@ +Wed Mar 29 07:09:03 UTC 2017 - mfilka(a)suse.com + +- bnc#1026027 + - removed calls to insserv +- 3.2.0 + +------------------------------------------------------------------- +Fri Mar 17 12:07:40 UTC 2017 - igonzalezsosa(a)suse.com + +- Fix patterns list initialization (bsc#1028661) +- Fix 'Next' button behaviour in pattern selection +- 3.1.9 + +------------------------------------------------------------------- Old: ---- yast2-product-creator-3.1.8.tar.bz2 New: ---- yast2-product-creator-3.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-product-creator.spec ++++++ --- /var/tmp/diff_new_pack.EU5L7B/_old 2017-03-29 13:25:05.847988862 +0200 +++ /var/tmp/diff_new_pack.EU5L7B/_new 2017-03-29 13:25:05.851988296 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-product-creator # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-product-creator -Version: 3.1.8 +Version: 3.2.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-product-creator-3.1.8.tar.bz2 -> yast2-product-creator-3.2.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-3.1.8/.travis.yml new/yast2-product-creator-3.2.0/.travis.yml --- old/yast2-product-creator-3.1.8/.travis.yml 2016-06-06 09:50:48.707267516 +0200 +++ new/yast2-product-creator-3.2.0/.travis.yml 2017-03-29 10:29:07.182185430 +0200 @@ -1,16 +1,11 @@ -language: cpp -compiler: - - gcc +sudo: required +language: bash +services: + - docker + before_install: - # disable rvm, use system Ruby - - rvm reset - - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/tr… - - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2" -g "yast-rake gettext" + - docker build -t yast-product-creator-image . script: - - rake check:syntax - - rake check:pot - - make -f Makefile.cvs - - make - - sudo make install - - make check - + # the "yast-travis-ruby" script is included in the base yastdevel/ruby image + # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby + - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-product-creator-image yast-travis-ruby diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-3.1.8/CONTRIBUTING.md new/yast2-product-creator-3.2.0/CONTRIBUTING.md --- old/yast2-product-creator-3.1.8/CONTRIBUTING.md 2016-06-06 09:50:48.715267516 +0200 +++ new/yast2-product-creator-3.2.0/CONTRIBUTING.md 2017-03-29 10:29:07.190185430 +0200 @@ -3,7 +3,7 @@ YaST is an open source project and as such it welcomes all kinds of contributions. If you decide to contribute, please follow these guidelines to -ensure the process is effective and pleasant both for you and YaST maintainers. +ensure the process is effective and pleasant both for you and the YaST maintainers. There are two main forms of contribution: reporting bugs and performing code changes. @@ -17,13 +17,11 @@ registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount… if you don't have an account yet.) -If you find a problem, please report it either using -[Bugzilla](https://bugzilla.suse.com/) or GitHub issues. We can't guarantee -that every bug will be fixed, but we'll try. - When creating a bug report, please follow our [bug reporting guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). +We can't guarantee that every bug will be fixed, but we'll try. + Code Changes ------------ @@ -44,15 +42,22 @@ to the [Ruby style guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). - 4. Make sure your change didn't break anything by building the RPM package + 4. Update the package version (in `packages/*.spec`, usually by + `rake version:bump`) and add a new entry to the `package/*.changes` file + (by `osc vc package`). + For bigger changes or changes which need longer discussion it is advised to + add this as a separate last commit so it can be easily updated when another + change is merged in the meantime. + + 5. Make sure your change didn't break anything by building the RPM package (`rake osc:build`). The build process includes running the full testsuite. - 5. Publish the branch and create a pull request. + 6. Publish the branch and create a pull request. - 6. YaST developers will review your change and possibly point out issues. + 7. YaST developers will review your change and possibly point out issues. Adapt the code under their guidance until they are all resolved. - 7. Finally, the pull request will get merged or rejected. + 8. Finally, the pull request will get merged or rejected. See also [GitHub's guide on contributing](https://help.github.com/articles/fork-a-repo). @@ -60,9 +65,6 @@ If you want to do multiple unrelated changes, use separate branches and pull requests. -Do not change the `VERSION` and `*.changes` files as this could lead to -conflicts. - ### Commits Each commit in the pull request should do only one thing, which is clearly diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-3.1.8/Dockerfile new/yast2-product-creator-3.2.0/Dockerfile --- old/yast2-product-creator-3.1.8/Dockerfile 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-product-creator-3.2.0/Dockerfile 2017-03-29 10:29:07.202185430 +0200 @@ -0,0 +1,5 @@ +FROM yastdevel/ruby +RUN zypper --gpg-auto-import-keys --non-interactive in --no-recommends \ + yast2-add-on-creator +COPY . /usr/src/app + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-3.1.8/data/kiwi_templates/iso/config.sh new/yast2-product-creator-3.2.0/data/kiwi_templates/iso/config.sh --- old/yast2-product-creator-3.1.8/data/kiwi_templates/iso/config.sh 2016-06-06 09:50:48.779267516 +0200 +++ new/yast2-product-creator-3.2.0/data/kiwi_templates/iso/config.sh 2017-03-29 10:29:07.250185430 +0200 @@ -51,8 +51,6 @@ patch -p0 < /tmp/config.patch rm /tmp/config.patch -insserv - rm -rf /var/cache/zypp/raw/* zypper addrepo -d http://download.opensuse.org/distribution/SL-OSS-factory/inst-source/ factory-oss diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-3.1.8/package/yast2-product-creator.changes new/yast2-product-creator-3.2.0/package/yast2-product-creator.changes --- old/yast2-product-creator-3.1.8/package/yast2-product-creator.changes 2016-06-06 09:50:48.791267516 +0200 +++ new/yast2-product-creator-3.2.0/package/yast2-product-creator.changes 2017-03-29 10:29:07.258185430 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Wed Mar 29 07:09:03 UTC 2017 - mfilka(a)suse.com + +- bnc#1026027 + - removed calls to insserv +- 3.2.0 + +------------------------------------------------------------------- +Fri Mar 17 12:07:40 UTC 2017 - igonzalezsosa(a)suse.com + +- Fix patterns list initialization (bsc#1028661) +- Fix 'Next' button behaviour in pattern selection +- 3.1.9 + +------------------------------------------------------------------- Mon Jun 6 07:25:59 UTC 2016 - igonzalezsosa(a)suse.com - Stop generating autodocs (fate#320356) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-3.1.8/package/yast2-product-creator.spec new/yast2-product-creator-3.2.0/package/yast2-product-creator.spec --- old/yast2-product-creator-3.1.8/package/yast2-product-creator.spec 2016-06-06 09:50:48.791267516 +0200 +++ new/yast2-product-creator-3.2.0/package/yast2-product-creator.spec 2017-03-29 10:29:07.258185430 +0200 @@ -17,7 +17,7 @@ Name: yast2-product-creator -Version: 3.1.8 +Version: 3.2.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-3.1.8/src/include/product-creator/dialogs.rb new/yast2-product-creator-3.2.0/src/include/product-creator/dialogs.rb --- old/yast2-product-creator-3.1.8/src/include/product-creator/dialogs.rb 2016-06-06 09:50:48.807267516 +0200 +++ new/yast2-product-creator-3.2.0/src/include/product-creator/dialogs.rb 2017-03-29 10:29:07.278185430 +0200 @@ -794,13 +794,14 @@ false end - # Dialog for selecting the sources # @return [Symbol] def sourceDialog # dialog caption caption = _("Source Selection") + ProductCreator.restore_repos_state + SourceManager.ReadSources sources = fillSourceTable([], true, "") Builtins.y2debug("sources: %1", sources) @@ -1028,6 +1029,8 @@ # finish the target Pkg.TargetFinish + else + ProductCreator.enable_needed_repos(selected_items) end @going_back = false @@ -1464,7 +1467,7 @@ result = nil end end - end until result == :cancel || result == :accept + end until result == :cancel || result == :accept || result == :next result = :next if result == :accept diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-3.1.8/src/modules/ProductCreator.rb new/yast2-product-creator-3.2.0/src/modules/ProductCreator.rb --- old/yast2-product-creator-3.1.8/src/modules/ProductCreator.rb 2016-05-03 15:44:02.006151399 +0200 +++ new/yast2-product-creator-3.2.0/src/modules/ProductCreator.rb 2017-03-29 10:29:07.282185430 +0200 @@ -32,6 +32,11 @@ module Yast class ProductCreatorClass < Module + include Yast::Logger + + # @return [Array<Integer>] Temporarily enabled repositories + attr_accessor :tmp_enabled + def main Yast.import "UI" Yast.import "Pkg" @@ -126,6 +131,10 @@ # map additional products to "Addon" directory @product_map = {} + + # temporarily enabled repositories + @tmp_enabled = [] + ProductCreator() end @@ -3729,6 +3738,40 @@ true end + # Enable needed repositories + # + # The idea is to make patterns/packages available during selection + # (bsc#1028661). The list of enabled repositories is stored at + # ProductCreator.Config. + # + # @param selected [Array<Integer>] Selected sources + # @see restore_repos_state + def enable_needed_repos(selected) + self.tmp_enabled = selected.each_with_object([]) do |src, list| + general_info = Pkg.SourceGeneralData(src) + list << src unless general_info["enabled"] + end + + tmp_enabled.each do |src| + log.info "Enabling and refreshing repository #{src}" + Pkg.SourceSetEnabled(src, true) + Pkg.SourceRefreshNow(src) + end + end + + # Restore repositories state + # + # Undo changes introduced by #enabled_needed_repos. + # + # @see enable_needed_repos + def restore_repos_state + tmp_enabled.each do |src| + log.info "Disabling repository #{src}" + Pkg.SourceSetEnabled(src, false) + end + tmp_enabled.clear + end + # Constructor def ProductCreator configSetup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-3.1.8/test/product_creator_test.rb new/yast2-product-creator-3.2.0/test/product_creator_test.rb --- old/yast2-product-creator-3.1.8/test/product_creator_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-product-creator-3.2.0/test/product_creator_test.rb 2017-03-29 10:29:07.282185430 +0200 @@ -0,0 +1,64 @@ +#!/usr/bin/env rspec + +require_relative "test_helper" + +Yast.import "Pkg" +Yast.import "ProductCreator" +Yast.import "AddOnCreator" + +describe Yast::ProductCreator do + subject { Yast::ProductCreator } + + before { Yast::ProductCreator.main } + + describe "#enable_needed_repos" do + REPOS = { + 1 => { "id" => 1, "enabled" => true }, + 2 => { "id" => 2, "enabled" => false } + } + + before do + allow(Yast::Pkg).to receive(:SourceGeneralData) { |i| REPOS[i] } + end + + it "enables disabled repositories" do + expect(Yast::Pkg).to receive(:SourceSetEnabled).with(2, true) + expect(Yast::Pkg).to receive(:SourceRefreshNow).with(2) + expect(Yast::Pkg).to_not receive(:SourceRefreshNow).with(1) + subject.enable_needed_repos([1, 2]) + end + + it "register repositories to restore their state later" do + subject.enable_needed_repos([1, 2]) + expect(subject.tmp_enabled).to eq([2]) + end + end + + describe "#restore_repos_state" do + before do + allow(Yast::Pkg).to receive(:SourceGeneralData).and_return("id" => 1, "enabled" => false) + allow(Yast::Pkg).to receive(:SourceSetEnabled) + allow(Yast::Pkg).to receive(:SourceRefreshNow) + end + + context "when some repositories were enabled" do + let(:source) { 1 } + + before do + subject.enable_needed_repos([source]) + end + + it "it disables previously enabled repositories" do + expect(Yast::Pkg).to receive(:SourceSetEnabled).with(source, false) + subject.restore_repos_state + end + end + + context "when no repositories were enabled" do + it "does not disable any repository" do + expect(Yast::Pkg).to_not receive(:SourceSetEnabled) + subject.restore_repos_state + end + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-3.1.8/test/test_helper.rb new/yast2-product-creator-3.2.0/test/test_helper.rb --- old/yast2-product-creator-3.1.8/test/test_helper.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-product-creator-3.2.0/test/test_helper.rb 2017-03-29 10:29:07.282185430 +0200 @@ -0,0 +1,59 @@ +# Copyright (c) 2017 SUSE LLC. +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of version 2 or 3 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. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, contact SUSE LLC. +# +# To contact SUSE about this file by physical or electronic mail, +# you may find current contact information at www.suse.com +# +# Set the paths +src_path = File.expand_path("../../src", __FILE__) +ENV["Y2DIR"] = src_path + +require "yast" +require "yast/rspec" +require "pathname" + +if ENV["COVERAGE"] + require "simplecov" + SimpleCov.start do + add_filter "/test/" + end + + # Files to track for code coverage + SimpleCov.track_files("#{src_path}/**/*.rb") + + # use coveralls for on-line code coverage reporting at Travis CI + if ENV["TRAVIS"] + require "coveralls" + SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[ + SimpleCov::Formatter::HTMLFormatter, + Coveralls::SimpleCov::Formatter + ] + end +end + +# configure RSpec +RSpec.configure do |config| + config.mock_with :rspec do |c| + # https://relishapp.com/rspec/rspec-mocks/v/3-0/docs/verifying-doubles/partia… + c.verify_partial_doubles = true + + config.extend Yast::I18n # available in context/describe + config.include Yast::I18n # available in it/let/before/... + end +end + +TESTS_PATH = Pathname.new(File.dirname(__FILE__)) +FIXTURES_PATH = TESTS_PATH.join("fixtures")

1 0

commit hp-drive-guard for openSUSE:Factory
by root＠hilbert.suse.de 29 Mar '17

29 Mar '17

Hello community, here is the log from the commit of package hp-drive-guard for openSUSE:Factory checked in at 2017-03-29 13:25:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hp-drive-guard (Old) and /work/SRC/openSUSE:Factory/.hp-drive-guard.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hp-drive-guard" Wed Mar 29 13:25:00 2017 rev:15 rq:481708 version:0.3.12 Changes: -------- --- /work/SRC/openSUSE:Factory/hp-drive-guard/hp-drive-guard.changes 2012-11-12 07:03:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.hp-drive-guard.new/hp-drive-guard.changes 2017-03-29 13:25:01.328628023 +0200 @@ -1,0 +2,8 @@ +Wed Mar 15 13:40:42 UTC 2017 - dimstar(a)opensuse.org + +- Correctly install the systemd service as a .service file (not + .spec) +- Drop the sysV script on systemd setups +- Only call insserv on sysV systems. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hp-drive-guard.spec ++++++ --- /var/tmp/diff_new_pack.7LdivU/_old 2017-03-29 13:25:02.160510372 +0200 +++ /var/tmp/diff_new_pack.7LdivU/_new 2017-03-29 13:25:02.164509806 +0200 @@ -1,7 +1,7 @@ # # spec file for package hp-drive-guard # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -54,6 +54,8 @@ %if %{with_systemd} BuildRequires: pkgconfig(systemd) %{?systemd_requires} +%else +PreReq: %insserv_prereq %endif Version: 0.3.12 Release: 0 @@ -115,7 +117,9 @@ %makeinstall %if %with_systemd mkdir -p $RPM_BUILD_ROOT%{_unitdir} -install -c -m 0644 %{S:1} $RPM_BUILD_ROOT%{_unitdir}/hp-drive-guard.spec +install -c -m 0644 %{S:1} $RPM_BUILD_ROOT%{_unitdir}/hp-drive-guard.service +# do not ship the init.d script on a systemd setup +rm %{buildroot}%{_sysconfdir}/init.d/hp-drive-guard %endif %find_lang %{name} %fdupes $RPM_BUILD_ROOT @@ -127,29 +131,28 @@ %if %{with_systemd} %service_add_pre hp-drive-guard.service %endif -exit 0 %post -%{fillup_and_insserv -n hp-drive-guard} %if %{with_systemd} %service_add_post hp-drive-guard.service +%else +%{fillup_and_insserv -n hp-drive-guard} %endif -exit 0 %preun -%{stop_on_removal hp-drive-guard} %if %{with_systemd} %service_del_preun hp-drive-guard.service +%else +%{stop_on_removal hp-drive-guard} %endif -exit 0 %postun -%{restart_on_update hp-drive-guard} -%insserv_cleanup %if %{with_systemd} %service_del_postun hp-drive-guard.service +%else +%{restart_on_update hp-drive-guard} +%insserv_cleanup %endif -exit 0 %files -f %{name}.lang %defattr(-,root,root) @@ -160,10 +163,11 @@ %{_libexecdir}/hp-drive-guard %{_sysconfdir}/xdg/autostart/hp-drive-guard-client.desktop %{_sysconfdir}/dbus-1/system.d/hp-drive-guard-dbus.conf -%{_sysconfdir}/init.d/hp-drive-guard %{polkitdir}/* %if %{with_systemd} -%{_unitdir}/hp-drive-guard.spec +%{_unitdir}/hp-drive-guard.service +%else +%{_sysconfdir}/init.d/hp-drive-guard %endif %changelog

1 0

commit ghc-hstatistics for openSUSE:Factory
by root＠hilbert.suse.de 29 Mar '17

29 Mar '17

Hello community, here is the log from the commit of package ghc-hstatistics for openSUSE:Factory checked in at 2017-03-29 13:24:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-hstatistics (Old) and /work/SRC/openSUSE:Factory/.ghc-hstatistics.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-hstatistics" Wed Mar 29 13:24:58 2017 rev:2 rq:480943 version:0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-hstatistics/ghc-hstatistics.changes 2017-03-10 21:38:29.520927118 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-hstatistics.new/ghc-hstatistics.changes 2017-03-29 13:24:58.944965138 +0200 @@ -1,0 +2,10 @@ +Sun Feb 12 14:15:04 UTC 2017 - psimons(a)suse.com + +- Update to version 0.3 with cabal2obs. + +------------------------------------------------------------------- +Mon Nov 14 09:29:49 UTC 2016 - psimons(a)suse.com + +- Update to version 0.2.5.4 with cabal2obs. + +------------------------------------------------------------------- Old: ---- hstatistics-0.2.5.3.tar.gz New: ---- hstatistics-0.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-hstatistics.spec ++++++ --- /var/tmp/diff_new_pack.g1sA4A/_old 2017-03-29 13:24:59.632867850 +0200 +++ /var/tmp/diff_new_pack.g1sA4A/_new 2017-03-29 13:24:59.636867283 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-hstatistics # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,15 +18,14 @@ %global pkg_name hstatistics Name: ghc-%{pkg_name} -Version: 0.2.5.3 +Version: 0.3 Release: 0 Summary: Statistics License: BSD-3-Clause -Group: System/Libraries +Group: Development/Languages/Other Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… BuildRequires: ghc-Cabal-devel -# Begin cabal-rpm deps: BuildRequires: ghc-array-devel BuildRequires: ghc-hmatrix-devel BuildRequires: ghc-hmatrix-gsl-stats-devel @@ -34,7 +33,6 @@ BuildRequires: ghc-rpm-macros BuildRequires: ghc-vector-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build -# End cabal-rpm deps %description Purely functional interface for statistics based on hmatrix and @@ -60,15 +58,12 @@ %prep %setup -q -n %{pkg_name}-%{version} - %build %ghc_lib_build - %install %ghc_lib_install - %post devel %ghc_pkg_recache @@ -81,6 +76,6 @@ %files devel -f %{name}-devel.files %defattr(-,root,root,-) -%doc README +%doc CHANGES README %changelog ++++++ hstatistics-0.2.5.3.tar.gz -> hstatistics-0.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hstatistics-0.2.5.3/CHANGES new/hstatistics-0.3/CHANGES --- old/hstatistics-0.2.5.3/CHANGES 2015-10-10 07:49:48.000000000 +0200 +++ new/hstatistics-0.3/CHANGES 2017-02-06 02:48:46.000000000 +0100 @@ -106,3 +106,10 @@ 0.2.5.3: updated for hmatrix 0.17 + +0.2.5.4: + updated for hmatrix 0.18 + +0.3: + changed PCA to use SVD as suggested by Pavol Klacansky + (issue #3) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hstatistics-0.2.5.3/hstatistics.cabal new/hstatistics-0.3/hstatistics.cabal --- old/hstatistics-0.2.5.3/hstatistics.cabal 2015-10-10 07:49:48.000000000 +0200 +++ new/hstatistics-0.3/hstatistics.cabal 2017-02-06 02:48:46.000000000 +0100 @@ -1,8 +1,8 @@ Name: hstatistics -Version: 0.2.5.3 +Version: 0.3 License: BSD3 License-file: LICENSE -Copyright: (c) A.V.H. McPhail 2010, 2011, 2012, 2013, 2014 +Copyright: (c) A.V.H. McPhail 2010--2014, 2016, 2017 Author: Vivian McPhail Maintainer: haskell.vivian.mcphail <at> gmail <dot> com Stability: provisional @@ -16,7 +16,7 @@ . Feature requests, suggestions, and bug fixes welcome. Category: Math, Statistics -tested-with: GHC ==7.10.2 +tested-with: GHC ==8.0.1 cabal-version: >=1.8 @@ -30,8 +30,8 @@ Build-Depends: base >= 4 && < 5, array, random, vector, - hmatrix >= 0.17, - hmatrix-gsl-stats >= 0.4 + hmatrix >= 0.18, + hmatrix-gsl-stats >= 0.4.1.6 Extensions: @@ -46,12 +46,9 @@ other-modules: C-sources: - ghc-prof-options: -auto - ghc-options: -Wall -fno-warn-missing-signatures -fno-warn-orphans -fno-warn-unused-binds - -O2 source-repository head type: git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hstatistics-0.2.5.3/lib/Numeric/Statistics/PCA.hs new/hstatistics-0.3/lib/Numeric/Statistics/PCA.hs --- old/hstatistics-0.2.5.3/lib/Numeric/Statistics/PCA.hs 2015-10-10 07:49:48.000000000 +0200 +++ new/hstatistics-0.3/lib/Numeric/Statistics/PCA.hs 2017-02-06 02:48:46.000000000 +0100 @@ -1,7 +1,7 @@ ----------------------------------------------------------------------------- -- | -- Module : Numeric.Statistics.PCA --- Copyright : (c) A. V. H. McPhail 2010, 2014 +-- Copyright : (c) A. V. H. McPhail 2010, 2014, 2017 -- License : BSD3 -- -- Maintainer : haskell.vivian.mcphail <at> gmail <dot> com @@ -27,38 +27,47 @@ import Numeric.GSL.Statistics -import Numeric.Statistics +--import Numeric.Statistics ----------------------------------------------------------------------------- -- | find the principal components of multidimensional data greater than -- the threshhold -pca :: I.Array Int (Vector Double) -- the data +pca :: I.Array Int (Vector Double) -- the data -> Double -- eigenvalue threshold - -> Matrix Double + -> (Vector Double, Matrix Double) -- Eignevalues, Principal components pca d q = let d' = fmap (\x -> x - (scalar $ mean x)) d -- remove the mean from each dimension - cv = covarianceMatrix d' - (val',vec') = eigSH $ trustSym cv -- the covariance matrix is real symmetric - val = toList val' - vec = toColumns vec' - v' = zip val vec + d'' = fromColumns $ I.elems d' + (_,vec',uni') = svd d'' + vec = toList vec' + uni = toColumns uni' + v' = zip vec uni v = filter (\(x,_) -> x > q) v' -- keep only eigens > than parameter - in fromColumns $ snd $ unzip v + (eigs,vs) = unzip v + in (fromList eigs,fromColumns vs) -- | find N greatest principal components of multidimensional data -- according to size of the eigenvalue pcaN :: I.Array Int (Vector Double) -- the data -> Int -- number of components to return - -> Matrix Double + -> (Vector Double, Matrix Double) -- Eignevalues, Principal components pcaN d n = let d' = fmap (\x -> x - (scalar $ mean x)) d -- remove the mean from each dimension - cv = covarianceMatrix d' - (val',vec') = eigSH $ trustSym cv -- the covariance matrix is real symmetric - val = toList val' - vec = toColumns vec' - v' = zip val vec + d'' = fromColumns $ I.elems d' + (_,vec',uni') = svd d'' + vec = toList vec' + uni = toColumns uni' + v' = zip vec uni v = take n $ reverse $ sortBy (comparing fst) v' - in fromColumns $ snd $ unzip v + (eigs,vs) = unzip v + in (fromList eigs,fromColumns vs) +v1 = fromList [1,2,3,4,5,6::Double] +v2 = fromList [2,3,4,5,6,7::Double] +v3 = fromList [3,4,5,6,7,8::Double] + +a = fromColumns [v1,v2,v3] +b = I.listArray (1,3::Int) [v1,v2,v3] :: I.Array Int (Vector Double) + -- | perform a PCA transform of the original data (remove mean) -- | Final = M^T Data^T pcaTransform :: I.Array Int (Vector Double) -- ^ the data @@ -74,11 +83,11 @@ -> I.Array Int (Vector Double) -- ^ the reduced data pcaReduce d q = let u = fmap (scalar . mean) d d' = zipWith (-) (I.elems d) (I.elems u) - cv = covarianceMatrix $ I.listArray (I.bounds d) d' - (val',vec') = eigSH $ trustSym cv -- the covariance matrix is real symmetric - val = toList val' - vec = toColumns vec' - v' = zip val vec + d'' = fromColumns d' + (_,vec',uni') = svd d'' + vec = toList vec' + uni = toColumns uni' + v' = zip vec uni v = filter (\(x,_) -> x > q) v' -- keep only eigens > than parameter m = fromColumns $ snd $ unzip v in I.listArray (I.bounds d) $ zipWith (+) (toRows $ m <> (tr' m) <> fromRows d') (I.elems u) @@ -89,11 +98,11 @@ -> I.Array Int (Vector Double) -- ^ the reduced data, with n principal components pcaReduceN d n = let u = fmap (scalar . mean) d d' = zipWith (-) (I.elems d) (I.elems u) - cv = covarianceMatrix $ I.listArray (I.bounds d) d' - (val',vec') = eigSH $ trustSym cv -- the covariance matrix is real symmetric - val = toList val' - vec = toColumns vec' - v' = zip val vec + d'' = fromColumns d' + (_,vec',uni') = svd d'' + vec = toList vec' + uni = toColumns uni' + v' = zip vec uni v = take n $ reverse $ sortBy (comparing fst) v' m = fromColumns $ snd $ unzip v in I.listArray (I.bounds d) $ zipWith (+) (toRows $ m <> (tr' m) <> fromRows d') (I.elems u) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hstatistics-0.2.5.3/lib/Numeric/Statistics.hs new/hstatistics-0.3/lib/Numeric/Statistics.hs --- old/hstatistics-0.2.5.3/lib/Numeric/Statistics.hs 2015-10-10 07:49:48.000000000 +0200 +++ new/hstatistics-0.3/lib/Numeric/Statistics.hs 2017-02-06 02:48:46.000000000 +0100 @@ -79,7 +79,7 @@ meanArray a = meanList $ I.elems a -- | the mean of a matrix with data series in rows -meanMatrix :: (Container Vector a, Num (Vector a), Element a, Fractional a) => Matrix a -> Sample a +meanMatrix :: (Container Vector a, Num (Vector a), Fractional a) => Matrix a -> Sample a meanMatrix a = meanList $ toRows a ----------------------------------------------------------------------------- @@ -93,11 +93,11 @@ in mxs - msx -- | the variance of an array of vectors -varianceArray :: (Container Vector a, Floating (Vector a), Num a, Fractional a) => Samples a -> Sample a +varianceArray :: (Container Vector a, Floating (Vector a), Fractional a) => Samples a -> Sample a varianceArray a = varianceList $ I.elems a -- | the variance of a matrix with data series in rows -varianceMatrix :: (Container Vector a, Floating (Vector a), Element a, Num a, Fractional a) => Matrix a -> Sample a +varianceMatrix :: (Container Vector a, Floating (Vector a), Fractional a) => Matrix a -> Sample a varianceMatrix a = varianceList $ toRows a ----------------------------------------------------------------------------- @@ -253,7 +253,7 @@ ----------------------------------------------------------------------------- -- | count the number of runs greater than or equal to @n@ in the data -run_count :: (Num a, Num t, Ord b, Ord a, Storable b, Container Vector b) +run_count :: (Num a, Num t, Ord b, Ord a, Container Vector b) => a -- ^ longest run to count -> Vector b -- ^ data -> [(a, t)] -- ^ [(run length,count)]

1 0