February 2015 - openSUSE Commits - openSUSE Mailing Lists

commit mozldap for openSUSE:Factory
by root＠hilbert.suse.de 20 Feb '15

20 Feb '15

Hello community, here is the log from the commit of package mozldap for openSUSE:Factory checked in at 2015-02-20 12:01:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mozldap (Old) and /work/SRC/openSUSE:Factory/.mozldap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mozldap" Changes: -------- --- /work/SRC/openSUSE:Factory/mozldap/mozldap.changes 2015-01-09 20:50:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mozldap.new/mozldap.changes 2015-02-20 12:01:31.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 17 16:40:17 UTC 2015 - lars(a)linux-schulserver.de + +- rebased all patches to cleanly apply with fuzz=0 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozldap.spec ++++++ --- /var/tmp/diff_new_pack.tmb04l/_old 2015-02-20 12:01:32.000000000 +0100 +++ /var/tmp/diff_new_pack.tmb04l/_new 2015-02-20 12:01:32.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package mozldap # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2009-2011 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties @@ -65,7 +65,6 @@ %package devel Summary: Development libraries and examples for Mozilla LDAP C SDK -License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Group: Development/Libraries/Other Requires: %{name}-libs = %{version}-%{release} Requires: mozilla-nspr-devel @@ -77,8 +76,8 @@ %prep %setup -q -%patch0 -p3 -%patch1 -p3 +%patch0 -p1 +%patch1 -p1 %patch2 -p1 %build ++++++ mozldap-6.0.7-fix_typo.patch ++++++ --- /var/tmp/diff_new_pack.tmb04l/_old 2015-02-20 12:01:32.000000000 +0100 +++ /var/tmp/diff_new_pack.tmb04l/_new 2015-02-20 12:01:32.000000000 +0100 @@ -1,6 +1,8 @@ ---- mozldap-6.0.5.orig/mozilla/directory/c-sdk/ldap/libraries/libssldap/sslerrstrs.h 2006-10-10 14:37:35.000000000 +0100 -+++ mozldap-6.0.5/mozilla/directory/c-sdk/ldap/libraries/libssldap/sslerrstrs.h 2013-09-07 16:35:55.767321281 +0100 -@@ -247,7 +247,7 @@ +Index: mozldap-6.0.7/c-sdk/ldap/libraries/libssldap/sslerrstrs.h +=================================================================== +--- mozldap-6.0.7.orig/c-sdk/ldap/libraries/libssldap/sslerrstrs.h ++++ mozldap-6.0.7/c-sdk/ldap/libraries/libssldap/sslerrstrs.h +@@ -247,7 +247,7 @@ ER3(SSL_ERROR_HANDSHAKE_UNEXPECTED_ALERT "SSL peer was not expecting a handshake message it received.") ER3(SSL_ERROR_DECOMPRESSION_FAILURE_ALERT , (SSL_ERROR_BASE + 60), ++++++ mozldap-6.0.7-replace_mktemp.patch ++++++ --- /var/tmp/diff_new_pack.tmb04l/_old 2015-02-20 12:01:32.000000000 +0100 +++ /var/tmp/diff_new_pack.tmb04l/_new 2015-02-20 12:01:32.000000000 +0100 @@ -1,7 +1,9 @@ -diff -Ppru mozldap-6.0.7.orig/c-sdk/ldap/clients/tools/ldaptool.h mozldap-6.0.7/c-sdk/ldap/clients/tools/ldaptool.h ---- mozldap-6.0.7.orig/c-sdk/ldap/clients/tools/ldaptool.h 2011-01-06 13:05:39.000000000 +0100 -+++ mozldap-6.0.7/c-sdk/ldap/clients/tools/ldaptool.h 2014-12-17 22:08:44.852233413 +0100 -@@ -69,13 +69,13 @@ +Index: mozldap-6.0.7/c-sdk/ldap/clients/tools/ldaptool.h +=================================================================== +--- mozldap-6.0.7.orig/c-sdk/ldap/clients/tools/ldaptool.h ++++ mozldap-6.0.7/c-sdk/ldap/clients/tools/ldaptool.h +@@ -68,14 +68,14 @@ + #define WIN32_LEAN_AND_MEAN #include <windows.h> extern int getopt (int argc, char *const *argv, const char *optstring); -#include <io.h> /* for _mktemp() */ ++++++ mozldap-6.0.7-support-tls1.1-and-later.patch ++++++ --- /var/tmp/diff_new_pack.tmb04l/_old 2015-02-20 12:01:32.000000000 +0100 +++ /var/tmp/diff_new_pack.tmb04l/_new 2015-02-20 12:01:32.000000000 +0100 @@ -5,10 +5,11 @@ - Support TLS 1.1 and newer using the NSS Version Range APIs. ---- mozldap-6.0.5/mozilla/directory/c-sdk/ldap/libraries/libssldap/ldapsinit.c.orig 2006-10-10 06:37:35.000000000 -0700 -+++ mozldap-6.0.5/mozilla/directory/c-sdk/ldap/libraries/libssldap/ldapsinit.c 2014-11-03 14:18:59.908337004 -0800 -@@ -59,8 +59,9 @@ - #endif /* OSF1V4D */ +Index: mozldap-6.0.7/c-sdk/ldap/libraries/libssldap/ldapsinit.c +=================================================================== +--- mozldap-6.0.7.orig/c-sdk/ldap/libraries/libssldap/ldapsinit.c ++++ mozldap-6.0.7/c-sdk/ldap/libraries/libssldap/ldapsinit.c +@@ -60,6 +60,7 @@ #include <errno.h> #include <nspr.h> @@ -16,9 +17,7 @@ #include <cert.h> #include <key.h> #include <ssl.h> - #include <sslproto.h> -@@ -70,8 +71,21 @@ - #include <ldap.h> +@@ -71,6 +72,19 @@ #include <ldap_ssl.h> #include <ldappr.h> #include <pk11func.h> @@ -38,9 +37,7 @@ /* * Macro that determines how many SSL options we support. As of June, 2002 - * NSS supports 14 options numbered 1-14 (see nss/ssl.h). We allow some -@@ -247,8 +261,20 @@ - PRLDAPSocketInfo soi; +@@ -248,6 +262,18 @@ ldapssl_connect(const char *hostlist, in LDAPSSLSocketInfo *ssoip = NULL; LDAPSSLSessionInfo *sseip; PRFileDesc *sslfd = NULL; @@ -59,9 +56,7 @@ /* * Determine if secure option is set. Also, clear secure bit in options - * the we pass to the standard connect() function (since it doesn't know -@@ -305,9 +331,18 @@ - if (( sslfd = SSL_ImportFD( NULL, soi.soinfo_prfd )) == NULL ) { +@@ -306,7 +332,16 @@ ldapssl_connect(const char *hostlist, in goto close_socket_and_exit_with_error; } @@ -78,9 +73,7 @@ SSL_OptionSet( sslfd, SSL_HANDSHAKE_AS_CLIENT, secure ) != SECSuccess || ( secure && SSL_ResetHandshake( sslfd, PR_FALSE ) != SECSuccess )) { - goto close_socket_and_exit_with_error; -@@ -515,8 +550,20 @@ - LBER_SOCKET intfd = -1; +@@ -516,6 +551,18 @@ ldaptls_complete(LDAP *ld) int rc = LDAP_LOCAL_ERROR; char *hostlist = NULL; struct lextiof_socket_private *socketargp = NULL; @@ -99,9 +92,7 @@ /* * Get hostlist from LDAP Handle - */ -@@ -580,10 +627,18 @@ - rc = LDAP_LOCAL_ERROR; +@@ -581,8 +628,16 @@ ldaptls_complete(LDAP *ld) goto close_socket_and_exit_with_error; } @@ -118,9 +109,7 @@ SSL_OptionSet( sslfd, SSL_HANDSHAKE_AS_CLIENT, secure ) != SECSuccess || ( secure && SSL_ResetHandshake( sslfd, PR_FALSE ) != SECSuccess ) ) { rc = LDAP_LOCAL_ERROR; - goto close_socket_and_exit_with_error; -@@ -1370,13 +1425,25 @@ - PRLDAPSocketInfo soi; +@@ -1371,11 +1426,23 @@ ldapssl_import_fd ( LDAP *ld, int secure LDAPSSLSocketInfo *ssoip = NULL; LDAPSSLSessionInfo *sseip; PRFileDesc *sslfd = NULL; @@ -148,9 +137,7 @@ * Get hostlist from LDAP Handle */ if ( ldap_get_option(ld, LDAP_OPT_HOST_NAME, &hostlist) < 0 ) { - return( -1 ); -@@ -1431,10 +1498,18 @@ - if (( sslfd = SSL_ImportFD( NULL, soi.soinfo_prfd )) == NULL ) { +@@ -1432,8 +1499,16 @@ ldapssl_import_fd ( LDAP *ld, int secure goto reset_socket_and_exit_with_error; } @@ -168,4 +155,3 @@ SSL_OptionSet( sslfd, SSL_HANDSHAKE_AS_CLIENT, secure ) != SECSuccess || ( secure && SSL_ResetHandshake( sslfd, PR_FALSE ) != SECSuccess )) { - goto reset_socket_and_exit_with_error; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit inn for openSUSE:Factory
by root＠hilbert.suse.de 20 Feb '15

20 Feb '15

Hello community, here is the log from the commit of package inn for openSUSE:Factory checked in at 2015-02-20 12:01:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/inn (Old) and /work/SRC/openSUSE:Factory/.inn.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "inn" Changes: -------- --- /work/SRC/openSUSE:Factory/inn/inn.changes 2014-12-21 12:04:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.inn.new/inn.changes 2015-02-20 12:01:30.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Dec 13 21:41:00 UTC 2014 - Led <ledest(a)gmail.com> + +- fix bashisms +- updated patches: + + inn-2.5.4.diff + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inn-2.5.4.diff ++++++ --- /var/tmp/diff_new_pack.1dWcQV/_old 2015-02-20 12:01:31.000000000 +0100 +++ /var/tmp/diff_new_pack.1dWcQV/_new 2015-02-20 12:01:31.000000000 +0100 @@ -108,10 +108,11 @@ } --- ./convertspool.orig 2014-07-16 12:26:26.872925643 +0000 +++ ./convertspool 2014-07-16 12:26:26.872925643 +0000 -@@ -0,0 +1,141 @@ +@@ -0,0 +1,142 @@ +#!/bin/sh +. /usr/lib/news/lib/innshellvars + ++test -n "$UID" || UID="$(id -ru)" +test "x$UID" = x0 && { + echo "Please run me as user 'news'!" + exit 1 @@ -345,7 +346,7 @@ +export PATH --- ./rc.orig 2014-07-16 12:26:26.875925625 +0000 +++ ./rc 2014-07-16 12:26:26.875925625 +0000 -@@ -0,0 +1,68 @@ +@@ -0,0 +1,69 @@ +#! /bin/sh +# +# Copyright (c) 1998 Florian La Roche @@ -362,8 +363,9 @@ + +. /etc/rc.status + -+function run_as_news () ++run_as_news() +{ ++ test -n "$UID" || UID="$(id -ru)" + if test "x$UID" = x0 ; then + su news -c "$*" + else -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-jbuilder for openSUSE:Factory
by root＠hilbert.suse.de 20 Feb '15

20 Feb '15

Hello community, here is the log from the commit of package rubygem-jbuilder for openSUSE:Factory checked in at 2015-02-20 12:01:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-jbuilder (Old) and /work/SRC/openSUSE:Factory/.rubygem-jbuilder.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-jbuilder" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-jbuilder/rubygem-jbuilder.changes 2015-02-16 21:10:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-jbuilder.new/rubygem-jbuilder.changes 2015-02-20 12:01:27.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Feb 15 05:29:08 UTC 2015 - coolo(a)suse.com + +- updated to version 2.2.7 + +------------------------------------------------------------------- Old: ---- jbuilder-2.2.6.gem New: ---- jbuilder-2.2.7.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-jbuilder.spec ++++++ --- /var/tmp/diff_new_pack.Gzq0ca/_old 2015-02-20 12:01:28.000000000 +0100 +++ /var/tmp/diff_new_pack.Gzq0ca/_new 2015-02-20 12:01:28.000000000 +0100 @@ -24,7 +24,7 @@ # Name: rubygem-jbuilder -Version: 2.2.6 +Version: 2.2.7 Release: 0 %define mod_name jbuilder %define mod_full_name %{mod_name}-%{version} ++++++ jbuilder-2.2.6.gem -> jbuilder-2.2.7.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/.travis.yml new/.travis.yml --- old/.travis.yml 2014-12-18 03:55:38.000000000 +0100 +++ new/.travis.yml 2015-02-15 05:10:00.000000000 +0100 @@ -15,10 +15,18 @@ - gemfiles/rails_3_2.gemfile - gemfiles/rails_4_0.gemfile - gemfiles/rails_4_1.gemfile + - gemfiles/rails_4_2.gemfile matrix: - allow_failures: + exclude: + - rvm: 2.2 + gemfile: gemfiles/rails_3_0.gemfile + - rvm: 2.2 + gemfile: gemfiles/rails_3_1.gemfile - rvm: 2.2 + gemfile: gemfiles/rails_3_2.gemfile + + allow_failures: - rvm: jruby-19mode - rvm: rbx - rvm: ruby-head diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Appraisals new/Appraisals --- old/Appraisals 2014-12-18 03:55:38.000000000 +0100 +++ new/Appraisals 2015-02-15 05:10:00.000000000 +0100 @@ -22,3 +22,8 @@ gem "railties", "~> 4.1.0" gem "actionpack", "~> 4.1.0" end + +appraise "rails-4-2" do + gem "railties", "~> 4.2.0" + gem "actionpack", "~> 4.2.0" +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHANGELOG.md new/CHANGELOG.md --- old/CHANGELOG.md 2014-12-18 03:55:38.000000000 +0100 +++ new/CHANGELOG.md 2015-02-15 05:10:00.000000000 +0100 @@ -1,5 +1,9 @@ # Changelog +2.2.7 +----- +* [Make Blank object serializable with Marshal](https://github.com/rails/jbuilder/commit/7083f28d8b665aa60d0d1b192… + 2.2.6 ----- * [Make sure dependency tracker loads after template handler](https://github.com/rails/jbuilder/commit/3ba404b1207b557e14771c90b… Files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gemfiles/rails_4_2.gemfile new/gemfiles/rails_4_2.gemfile --- old/gemfiles/rails_4_2.gemfile 1970-01-01 01:00:00.000000000 +0100 +++ new/gemfiles/rails_4_2.gemfile 2015-02-15 05:10:00.000000000 +0100 @@ -0,0 +1,11 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rake" +gem "mocha", :require => false +gem "appraisal" +gem "railties", "~> 4.2.0" +gem "actionpack", "~> 4.2.0" + +gemspec :path => "../" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jbuilder.gemspec new/jbuilder.gemspec --- old/jbuilder.gemspec 2014-12-18 03:55:38.000000000 +0100 +++ new/jbuilder.gemspec 2015-02-15 05:10:00.000000000 +0100 @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = 'jbuilder' - s.version = '2.2.6' + s.version = '2.2.7' s.authors = ['David Heinemeier Hansson', 'Pavel Pravosud'] s.email = ['david(a)37signals.com', 'pavel(a)pravosud.com'] s.summary = 'Create JSON structures via a Builder-style DSL' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/jbuilder/blank.rb new/lib/jbuilder/blank.rb --- old/lib/jbuilder/blank.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/lib/jbuilder/blank.rb 2015-02-15 05:10:00.000000000 +0100 @@ -0,0 +1,7 @@ +class Jbuilder + class Blank + def ==(other) + super || Blank === other + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/jbuilder.rb new/lib/jbuilder.rb --- old/lib/jbuilder.rb 2014-12-18 03:55:38.000000000 +0100 +++ new/lib/jbuilder.rb 2015-02-15 05:10:00.000000000 +0100 @@ -1,4 +1,5 @@ require 'jbuilder/jbuilder' +require 'jbuilder/blank' require 'jbuilder/key_formatter' require 'jbuilder/errors' require 'multi_json' @@ -21,7 +22,7 @@ new(*args, &block).target! end - BLANK = ::Object.new + BLANK = Blank.new def set!(key, value = BLANK, *args, &block) result = if block diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2014-12-18 03:55:38.000000000 +0100 +++ new/metadata 2015-02-15 05:10:00.000000000 +0100 @@ -1,7 +1,7 @@ --- !ruby/object:Gem::Specification name: jbuilder version: !ruby/object:Gem::Version - version: 2.2.6 + version: 2.2.7 platform: ruby authors: - David Heinemeier Hansson @@ -9,7 +9,7 @@ autorequire: bindir: bin cert_chain: [] -date: 2014-12-18 00:00:00.000000000 Z +date: 2015-02-15 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: activesupport @@ -66,6 +66,7 @@ - gemfiles/rails_3_2.gemfile - gemfiles/rails_4_0.gemfile - gemfiles/rails_4_1.gemfile +- gemfiles/rails_4_2.gemfile - jbuilder.gemspec - lib/generators/rails/jbuilder_generator.rb - lib/generators/rails/scaffold_controller_generator.rb @@ -73,6 +74,7 @@ - lib/generators/rails/templates/index.json.jbuilder - lib/generators/rails/templates/show.json.jbuilder - lib/jbuilder.rb +- lib/jbuilder/blank.rb - lib/jbuilder/dependency_tracker.rb - lib/jbuilder/errors.rb - lib/jbuilder/jbuilder.rb @@ -105,7 +107,7 @@ version: '0' requirements: [] rubyforge_project: -rubygems_version: 2.4.3 +rubygems_version: 2.4.5 signing_key: specification_version: 4 summary: Create JSON structures via a Builder-style DSL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/jbuilder_template_test.rb new/test/jbuilder_template_test.rb --- old/test/jbuilder_template_test.rb 2014-12-18 03:55:38.000000000 +0100 +++ new/test/jbuilder_template_test.rb 2015-02-15 05:10:00.000000000 +0100 @@ -190,6 +190,27 @@ assert_equal '{"posts":[]}', json end + test 'cache an empty block' do + undef_context_methods :fragment_name_with_digest, :cache_fragment_name + + render_jbuilder <<-JBUILDER + json.cache! 'nothing' do + end + JBUILDER + + json = nil + + assert_nothing_raised do + json = render_jbuilder <<-JBUILDER + json.foo 'bar' + json.cache! 'nothing' do + end + JBUILDER + end + + assert_equal 'bar', MultiJson.load(json)['foo'] + end + test 'fragment caching a JSON object' do undef_context_methods :fragment_name_with_digest, :cache_fragment_name diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/test_helper.rb new/test/test_helper.rb --- old/test/test_helper.rb 2014-12-18 03:55:38.000000000 +0100 +++ new/test/test_helper.rb 2015-02-15 05:10:00.000000000 +0100 @@ -1,4 +1,5 @@ require "bundler/setup" +require "active_support" require "rails/version" if Rails::VERSION::STRING > "4.0" @@ -7,4 +8,7 @@ require "test/unit" end -require "active_support/test_case" + +if ActiveSupport.respond_to?(:test_order=) + ActiveSupport.test_order = :random +end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kwallet for openSUSE:Factory
by root＠hilbert.suse.de 20 Feb '15

20 Feb '15

Hello community, here is the log from the commit of package kwallet for openSUSE:Factory checked in at 2015-02-20 12:01:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwallet (Old) and /work/SRC/openSUSE:Factory/.kwallet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kwallet" Changes: -------- --- /work/SRC/openSUSE:Factory/kwallet/kwallet.changes 2015-02-16 17:32:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kwallet.new/kwallet.changes 2015-02-20 12:01:26.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Feb 18 01:48:33 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Added 0001-Retrofitting-the-fix-for-a-bug-found-in-Applications.patch + (kde#343718) + +------------------------------------------------------------------- New: ---- 0001-Retrofitting-the-fix-for-a-bug-found-in-Applications.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwallet.spec ++++++ --- /var/tmp/diff_new_pack.XVce1s/_old 2015-02-20 12:01:27.000000000 +0100 +++ /var/tmp/diff_new_pack.XVce1s/_new 2015-02-20 12:01:27.000000000 +0100 @@ -45,6 +45,8 @@ Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/kwallet-%{version}.t… Source1: baselibs.conf +# PATCH-FIX-UPSTREAM 0001-Retrofitting-the-fix-for-a-bug-found-in-Applications.patch +Patch0: 0001-Retrofitting-the-fix-for-a-bug-found-in-Applications.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -102,6 +104,7 @@ %lang_package -n kwalletd5 %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build ++++++ 0001-Retrofitting-the-fix-for-a-bug-found-in-Applications.patch ++++++ >From d14b2da6fe4d4ed415c6a8f2361ce4e5fc685d2d Mon Sep 17 00:00:00 2001 From: Valentin Rusu <kde(a)rusu.info> Date: Tue, 17 Feb 2015 22:45:03 +0100 Subject: [PATCH 1/1] Retrofitting the fix for a bug found in Applications/14.12 Commit 345e36a8b35 from Applications/14.12 Fix for the random wallet open failure when updating The problem seems to be caused by the use of BackendPersistHandler singleton when the user has several wallets on his system and not all of them have been updated to the new schema. BUG: 343718 --- .../kwalletd/backend/backendpersisthandler.cpp | 31 +++++----------------- src/runtime/kwalletd/backend/kwalletbackend.cc | 5 +++- 2 files changed, 11 insertions(+), 25 deletions(-) diff --git a/src/runtime/kwalletd/backend/backendpersisthandler.cpp b/src/runtime/kwalletd/backend/backendpersisthandler.cpp index d98980dafc14bb06a8397e925b83d6e693365b25..8795f77b8c3875bcccb52418d82d7f362e769db8 100644 --- a/src/runtime/kwalletd/backend/backendpersisthandler.cpp +++ b/src/runtime/kwalletd/backend/backendpersisthandler.cpp @@ -155,25 +155,14 @@ static int getRandomBlock(QByteArray &randBlock) #endif } -static BlowfishPersistHandler *blowfishHandler = 0; -#ifdef HAVE_QGPGME -static GpgPersistHandler *gpgHandler = 0; -#endif // HAVE_QGPGME - BackendPersistHandler *BackendPersistHandler::getPersistHandler(BackendCipherType cipherType) { switch (cipherType) { case BACKEND_CIPHER_BLOWFISH: - if (0 == blowfishHandler) { - blowfishHandler = new BlowfishPersistHandler; - } - return blowfishHandler; + return new BlowfishPersistHandler; #ifdef HAVE_QGPGME case BACKEND_CIPHER_GPG: - if (0 == gpgHandler) { - gpgHandler = new GpgPersistHandler; - } - return gpgHandler; + return new GpgPersistHandler; #endif // HAVE_QGPGME default: Q_ASSERT(0); @@ -185,22 +174,16 @@ BackendPersistHandler *BackendPersistHandler::getPersistHandler(char magicBuf[12 { if ((magicBuf[2] == KWALLET_CIPHER_BLOWFISH_ECB || magicBuf[2] == KWALLET_CIPHER_BLOWFISH_CBC) && (magicBuf[3] == KWALLET_HASH_SHA1 || magicBuf[3] == KWALLET_HASH_PBKDF2_SHA512)) { - if (0 == blowfishHandler) { - bool useECBforReading = magicBuf[2] == KWALLET_CIPHER_BLOWFISH_ECB; - if (useECBforReading) { - qDebug() << "this wallet uses ECB encryption. It'll be converted to CBC on next save."; - } - blowfishHandler = new BlowfishPersistHandler(useECBforReading); + bool useECBforReading = magicBuf[2] == KWALLET_CIPHER_BLOWFISH_ECB; + if (useECBforReading) { + qDebug() << "this wallet uses ECB encryption. It'll be converted to CBC on next save."; } - return blowfishHandler; + return new BlowfishPersistHandler(useECBforReading); } #ifdef HAVE_QGPGME if (magicBuf[2] == KWALLET_CIPHER_GPG && magicBuf[3] == 0) { - if (0 == gpgHandler) { - gpgHandler = new GpgPersistHandler; - } - return gpgHandler; + return new GpgPersistHandler; } #endif // HAVE_QGPGME return 0; // unknown cipher or hash diff --git a/src/runtime/kwalletd/backend/kwalletbackend.cc b/src/runtime/kwalletd/backend/kwalletbackend.cc index e95866c01e3dfd007240119515221c45a1bddd8d..34e0419ea8c5cdedad40aee2cf05feebbfd00be9 100644 --- a/src/runtime/kwalletd/backend/kwalletbackend.cc +++ b/src/runtime/kwalletd/backend/kwalletbackend.cc @@ -374,7 +374,9 @@ int Backend::openInternal(WId w) if (0 == phandler) { return 42; // unknown cipher or hash } - return phandler->read(this, db, w); + int result = phandler->read(this, db, w); + delete phandler; + return result; } void Backend::swapToNewHash() @@ -456,6 +458,7 @@ int Backend::sync(WId w) notification->setText(i18n("Failed to sync wallet %1 to disk. Error codes are:\nRC %2\nSF %3. Please file a BUG report using this information to bugs.kde.org").arg(_name).arg(rc).arg(sf.errorString())); notification->sendEvent(); } + delete phandler; return rc; } -- 2.2.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-apache-libcloud for openSUSE:Factory
by root＠hilbert.suse.de 20 Feb '15

20 Feb '15

Hello community, here is the log from the commit of package python-apache-libcloud for openSUSE:Factory checked in at 2015-02-20 12:01:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-apache-libcloud (Old) and /work/SRC/openSUSE:Factory/.python-apache-libcloud.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-apache-libcloud" Changes: -------- --- /work/SRC/openSUSE:Factory/python-apache-libcloud/python-apache-libcloud.changes 2014-07-24 01:16:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-apache-libcloud.new/python-apache-libcloud.changes 2015-02-20 12:01:25.000000000 +0100 @@ -1,0 +2,99 @@ +Wed Feb 18 19:28:50 UTC 2015 - aboe76(a)gmail.com + +- Updated to Apache Libcloud 0.17.0 +- skipped 0.16.0 but the changes are listed here also. +- General: + - Use match_hostname function from backports.ssl_match_hostname package to verify the SSL certificate hostname instead of relying on our own logic. (GITHUB-374) [Alex Gaynor] + - Add new OpenStackIdentity_3_0_Connection class for working with OpenStack Identity (Keystone) service API v3. [Tomaz Muraus] + - Add support for prettifying JSON or XML response body which is printed to a file like object when using LIBCLOUD_DEBUG environment variable. This option can be enabled by setting LIBCLOUD_DEBUG_PRETTY_PRINT_RESPONSE environment variable. [Tomaz Muraus] + - Add support for using an HTTP proxy for outgoing HTTP and HTTPS requests. [Tomaz Muraus, Philip Kershaw] +- Compute: + - GCE driver updated to include ex_stop_node() and ex_start_node() methods. (GITHUB-442) [Eric Johnson] + - GCE driver now raises ResourceNotFoundError when the specified image is not found in any image project. Previously, this would return None but now raises the not-found exception instead. This fixes a bug where returning None caused ex_delete_image to raise an AttributeError. (GITHUB-441) [Eric Johnson] + - GCE driver update to support JSON format Service Account files and a PY3 fix from Siim Põder for LIBCLOUD-627. (LIBCLOUD-627, LIBCLOUD-657, GITHUB-438) [Eric Johnson] + - GCE driver fixed for missing param on ex_add_access_config. (GITHUB-435) [Peter Mooshammer] + - GCE driver support for HTTP load-balancer resources. (LIBCLOUD-605, GITHUB-429) [Lee Verberne] + - GCE driver updated to make better use of GCEDiskTypes. (GITHUB-428) [Eric Johnson] + - GCE driver list_images() now returns all non-deprecated images by default. (LIBCLOUD-602, GITHUB-423) [Eric Johnson] + - Improve GCE API coverage for create_node(). (GITHUB-419) [Eric Johnson] + - GCE Licenses added to the GCE driver. (GITHUB-420) [Eric Johnson] + - GCE Projects support common instance metadata and usage export buckets. (GITHUB-409) [Eric Johnson] + - Improvements to TargetPool resource in GCE driver. (GITHUB-414) [Eric Johnson] + - Adding TargetInstances resource to GCE driver. (GITHUB-393) [Eric Johnson] + - Adding DiskTypes resource to GCE driver. (GITHUB-391) [Eric Johnson] + - Fix boot disk auto_delete in GCE driver. (GITHUB-412) [Igor Bogomazov] + - Add Routes to GCE driver. (GITHUB-410) [Eric Johnson] + - Add missing ubuntu-os-cloud images to the GCE driver. (LIBCLOUD-632, GITHUB-385) [Borja Martin] + - Add new us-east-2 and us-east-3 region to the Joyent driver. (GITHUB-386) [ZuluPro] + - Add missing t2. instance types to the us-west-1 region in the EC2 driver. (GITHUB-388) [Matt Lehman] + - Add option to expunge VM on destroy in CloudStack driver. (GITHUB-382) [Roeland Kuipers] + - Add extra attribute in list_images for CloudStack driver. (GITHUB-389) [Loic Lambiel] + - Add ex_security_group_ids argument to the create_node method in the EC2 driver. This way users can launch VPC nodes with security groups. (GITHUB-373) [Itxaka Serrano] + - Add description argument to GCE Network. (GITHUB-397) [Eric Johnson] + - GCE: Improve MachineType (size) coverage of GCE API. (GITHUB-396) [Eric Johnson] + - GCE: Improved Images coverage. (GITHUB-395) [Eric Johnson] + - GCE: Support for global IP addresses. (GITHUB-390, GITHUB-394) [Eric Johnson] + - GCE: Add missing snapshot attributes. (GITHUB-401) [Eric Johnson] + - AWS: Set proper disk size in c3.X instance types. (GITHUB-405) [Itxaka Serrano] + - Fix a bug with handling of the ex_keyname argument in the Softlayer driver. (GITHUB-416, LIBCLOUD-647) [Dustin Oberloh] + - Update CloudSigma region list (remove Las Vegas, NV region and add new San Jose, CA and Miami, FL region). (GITHUB-417) [Viktor Petersson] + - Add ex_get_node method to the Joyent driver. (GITHUB-421) [ZuluPro] + - Add support for placement group management to the EC2 driver. (GITHUB-418) [Mikhail Ovsyannikov] + - Add new tok02 region to the Softlayer driver. (GITHUB-436, LIBCLOUD-656) [Dustin Oberloh] + - Add new Honolulu, HI endpoint to the CloudSigma driver. (GITHUB-439) [Stephen D. Spencer] + - Fix a bug with config_drive attribute in the OpenStack driver. New versions of OpenStack now return a boolean and not a string. (GITHUB-433) [quilombo] + - Add support for Abiquo API v3.x, remove support for now obsolete API v2.x. (GITHUB-433, LIBCLOUD-652) [David Freedman] + - Allow rootdisksize parameter in create_node CloudStack driver (GITHUB-440, LIBCLOUD-658) [Loic Lambiel] + - Fix an issue with LIBCLOUD_DEBUG not working correctly with the Linode driver. [Tomaz Muraus, Juan Carlos Moreno] (LIBCLOUD-598, GITHUB-342) + - Add new driver for VMware vSphere (http://www.vmware.com/products/vsphere/) based clouds. [Tomaz Muraus] + - Add two new default node states - NodeState.SUSPENDED and NodeState.ERROR. [Tomaz Muraus] + - Fix to join networks properly in deploy_node in the CloudStack driver. (LIBCLOUD-593, GITUHB-336) [Atsushi Sasaki] + - Create CloudStackFirewallRule class and corresponding methods. (LIBCLOUD-594, GITHUB-337) [Atsushi Sasaki] + - Add support for SSD disks to Google Compute driver. (GITHUB-339) [Eric Johnson] + - Add utility get_regions and get_service_names methods to the OpenStackServiceCatalog class. [Andrew Mann, Tomaz Muraus] + - Fix a bug in ex_get_console_output in the EC2 driver which would cause an exception to be thrown if there was no console output for a particular node. + Reported by Chris DeRamus. [Tomaz Muraus] + - Add ip_address parameter in CloudStack driver create_node method. (GITHUB-346) [Roeland Kuipers] + - Fix ParamikoSSHClient.run and deploy_node method to work correctly under Python 3. (GITHUB-347) [Eddy Reyes] + - Update OpenStack driver to map more node states to states recognized by Libcloud. [Chris DeRamus] + - Fix a bug with ex_metadata argument handling in the Google Compute Engine driver create_node method. (LIBCLOUD-544, GITHUB-349, GITHUB-353) [Raphael Theberge] + - Add SSH key pair management methods to the Softlayer driver. (GITHUB-321, GITHUB-354) [Itxaka Serrano] + - Correctly categorize node IP addresses into public and private when dealing with OpenStack floating IPs. [Andrew Mann] + - Add new t2 instance types to the EC2 driver. [Tomaz Muraus] + - Add support for Amazon GovCloud to the EC2 driver (us-gov-west-1 region). [Chris DeRamus] + - Allow user to pass "gp2" for "ex_volume_type" argument to the create_volume method in the EC2 driver. + Reported by Xavier Barbosa. [Tomaz Muraus, Xavier Barbosa] + - Add new driver for ProfitBricks provider. (LIBCLOUD-589, GITHUB-352) [Matt Baldwin] + - Various improvements and bugs fixes in the GCE driver. For a list, see https://github.com/apache/libcloud/pull/360/commits (GITHUB-360) [Evgeny Egorochkin] + - Allow user to specify virtualization type when registering an EC2 image by passing virtualization_type argument to the ex_register_image method. (GITHUB-361) [Andy Grimm] + - Add ex_create_image method to the GCE driver. (GITHUB-358, LIBCLOUD-611) [Katriel Traum] + - Add some methods to CloudStack driver: create_volume_snapshot, list_snapshots, destroy_volume_snapshot create_snapshot_template, ex_list_os_types) (GITHUB-363, LIBCLOUD-616) [Oleg Suharev] + - Added VPC support and Egress Firewall rule support fo CloudStack (GITHUB-363) [Jeroen de Korte] + - Add additional attributes to the extra dictionary of OpenStack StorageVolume object. (GITHUB-366) [Gertjan Oude Lohuis] + - Fix create_volume method in the OpenStack driver to return a created volume object (instance of StorageVolume) on success, instead of a boolean indicating operation success. (GITHUB-365) [Gertjan Oude Lohuis] + - Add optional project parameters for ex_list_networks() to CloudStack driver (GITHUB-367, LIBCLOUD-615) [Rene Moser] + - CLOUDSTACK: option to start VM in a STOPPED state (GITHUB-368) [Roeland Kuipers] + - Support "config_drive" in the OpenStack driver. Allow users to pass ex_config_drive argument to the create_node and ex_rebuild_node method. (GITHUB-370) [Nirmal Ranganathan] + - Add support for service scopes to the create_node method in the GCE driver. (LIBCLOUD-578, GITHUB-373) [Eric Johnson] + - Update GCE driver to allow for authentication with internal metadata service. (LIBCLOUD-625, LIBCLOUD-276, GITHUB-276) [Eric Johnson] + - Fix a bug in Elasticstack node creation method where it would raise exceptions because of missing data in a response, and also fix pulling the IP from the proper data item. (GITHUB-325) [Michael Bennett] + - Fix a bug which prevented user to connect and instantiate multiple EC2 driver instances for different regions at the same time. (GITHUB-325) [Michael Bennett] + - Add methods in CloudStack driver to manage mutiple nics per vm. (GITHUB-369) [Roeland Kuipers] + - Implements VPC network ACLs for CloudStack driver. (GITHUB-371) [Jeroen de Korte] +- Storage: + - Allow user to pass headers argument to the upload_object and upload_object_via_stream method. + This way user can specify CORS headers with the drivers which support that. (GITHUB-403, GITHUB-404) [Peter Schmidt] + - Fix upload_object_via_stream so it works correctly under Python 3.x if user manually passes an iterator to the method. + Also improve how reading a file in chunks works with drivers which support chunked encoding - always try to fill a chunk with CHUNK_SIZE bytes instead of directly streaming the chunk which iterator returns. + Previously, if iterator returned 1 byte in one iteration, we would directly send this as a single chunk to the API. (GITHUB-408, LIBCLOUD-639) [Peter Schmidt] + - Fix a bug with CDN requests in the CloudFiles driver. [Tomaz Muraus] + - Fix a bug with not being able to specify meta_data / tags when uploading an object using Google Storage driver. (LIBCLOUD-612, GITHUB-356) [Stefan Friesel] +- Loadbalancer: + - Updates to CloudStack driver. (GITHUB-434) [Jeroen de Korte] + - Allow user to specify session affinity algorithm in the GCE driver by passing ex_session_affinity argument to the create_balancer method. (LIBCLOUD-595, GITHUB-341) [Lee Verberne, Eric Johnson] +- DNS: + - New driver for Softlayer DNS service. (GITHUB-413, LIBCLOUD-640) [Vanč Levstik] + - Fix a bug with ex_create_multi_value_record method in the Route53 driver only returning a single record. (GITHUB-431, LIBCLOUD-650) [Itxaka Serrano] + - Various fixes in the Google DNS driver. (GITHUB-378) [Franck Cuny] + +------------------------------------------------------------------- Old: ---- apache-libcloud-0.15.1.tar.bz2 New: ---- apache-libcloud-0.17.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-apache-libcloud.spec ++++++ --- /var/tmp/diff_new_pack.zUSaVZ/_old 2015-02-20 12:01:25.000000000 +0100 +++ /var/tmp/diff_new_pack.zUSaVZ/_new 2015-02-20 12:01:25.000000000 +0100 @@ -17,7 +17,7 @@ Name: python-apache-libcloud -Version: 0.15.1 +Version: 0.17.0 Release: 0 Summary: Abstract away differences among multiple cloud provider APIs License: Apache-2.0 ++++++ apache-libcloud-0.15.1.tar.bz2 -> apache-libcloud-0.17.0.tar.bz2 ++++++ ++++ 30349 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cabal-rpm for openSUSE:Factory
by root＠hilbert.suse.de 20 Feb '15

20 Feb '15

Hello community, here is the log from the commit of package cabal-rpm for openSUSE:Factory checked in at 2015-02-20 12:01:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cabal-rpm (Old) and /work/SRC/openSUSE:Factory/.cabal-rpm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cabal-rpm" Changes: -------- --- /work/SRC/openSUSE:Factory/cabal-rpm/cabal-rpm.changes 2015-02-16 22:12:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cabal-rpm.new/cabal-rpm.changes 2015-02-20 12:01:23.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Feb 18 18:36:09 UTC 2015 - mimi.vx(a)gmail.com + +- Bump to version 0.9.4 ++ remove requires-space.patch +* use dnf if installed instead of yum for install and repoquery +* update now only commits changes and new source if git origin is ssh +* allow Cabal-1.22 + +------------------------------------------------------------------- Old: ---- cabal-rpm-0.9.3.tar.gz requires-space.patch New: ---- cabal-rpm-0.9.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cabal-rpm.spec ++++++ --- /var/tmp/diff_new_pack.CntBTk/_old 2015-02-20 12:01:24.000000000 +0100 +++ /var/tmp/diff_new_pack.CntBTk/_new 2015-02-20 12:01:24.000000000 +0100 @@ -17,7 +17,7 @@ Name: cabal-rpm -Version: 0.9.3 +Version: 0.9.4 Release: 0 Summary: RPM packaging tool for Haskell Cabal-based packages License: GPL-3.0+ @@ -25,8 +25,6 @@ Url: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.t… Source2: cabal-rpm.1 -# PATCH-FIX-UPSTREAM requires-space.patch - fix missed space in Requires - Ondřej Súkup mimi.vx(a)gmail.com -Patch0: requires-space.patch BuildRequires: ghc-Cabal-devel # Begin cabal-rpm deps: BuildRequires: ghc-directory-devel @@ -52,7 +50,6 @@ %prep %setup -q -%patch0 -p1 %build %{ghc_bin_build} ++++++ cabal-rpm-0.9.3.tar.gz -> cabal-rpm-0.9.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.3/ChangeLog new/cabal-rpm-0.9.4/ChangeLog --- old/cabal-rpm-0.9.3/ChangeLog 2015-02-05 16:50:49.000000000 +0100 +++ new/cabal-rpm-0.9.4/ChangeLog 2015-02-17 14:43:22.000000000 +0100 @@ -1,3 +1,8 @@ +* 0.9.4 (2015-02-17) +- use dnf if installed instead of yum for install and repoquery +- update now only commits changes and new source if git origin is ssh +- allow Cabal-1.22 + * 0.9.3 (2015-02-05) - make sure tarball destdir exists before copying - improve output for listing missing packages diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.3/README.md new/cabal-rpm-0.9.4/README.md --- old/cabal-rpm-0.9.3/README.md 2015-02-05 16:50:49.000000000 +0100 +++ new/cabal-rpm-0.9.4/README.md 2015-02-17 14:43:22.000000000 +0100 @@ -4,7 +4,7 @@ # cabal-rpm cabal-rpm is a tool for RPM packaging of Haskell Cabal-based packages. -It interacts with yum to install build dependencies and can also act as +It interacts with yum/dnf to install build dependencies and can also act as a cabal-install wrapper installing dependencies packaged in Fedora before running "cabal install". @@ -58,7 +58,7 @@ $ cblrpm install [pkg][-ver] -will yum install available missing dependencies and +will yum/dnf install available missing dependencies and run "cabal install" to build the package. ## Development diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.3/cabal-rpm.cabal new/cabal-rpm-0.9.4/cabal-rpm.cabal --- old/cabal-rpm-0.9.3/cabal-rpm.cabal 2015-02-05 16:50:49.000000000 +0100 +++ new/cabal-rpm-0.9.4/cabal-rpm.cabal 2015-02-17 14:43:22.000000000 +0100 @@ -1,11 +1,11 @@ Name: cabal-rpm -Version: 0.9.3 +Version: 0.9.4 Synopsis: RPM packaging tool for Haskell Cabal-based packages Description: This package provides a RPM packaging tool for Haskell Cabal-based packages. . cblrpm has commands to generate a RPM spec file and srpm for a package. - It can rpmbuild packages, yum install their dependencies, prep packages, + It can rpmbuild packages, yum/dnf install their dependencies, prep packages, and install them. There are commands to list package dependencies and missing dependencies. The diff command compares the current spec file with a freshly generated one and the update command updates the spec file @@ -30,7 +30,7 @@ Executable cblrpm Main-is: Main.hs Build-depends: base < 5, - Cabal > 1.10 && < 1.21, + Cabal > 1.10 && < 1.23, directory, filepath, old-locale, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.3/src/Commands/Depends.hs new/cabal-rpm-0.9.4/src/Commands/Depends.hs --- old/cabal-rpm-0.9.3/src/Commands/Depends.hs 2015-02-05 16:50:49.000000000 +0100 +++ new/cabal-rpm-0.9.4/src/Commands/Depends.hs 2015-02-17 14:43:22.000000000 +0100 @@ -5,7 +5,7 @@ -- Maintainer : Jens Petersen <petersen(a)fedoraproject.org> -- Stability : alpha -- --- Explanation: cabal wrapper which yum installs dependencies +-- Explanation: determines dependencies -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ import Dependencies (dependencies, missingPackages, packageDependencies) import PackageUtils (PackageData (..), prepare, stripPkgDevel) import Setup (quiet) -import SysCmd (cmd, (+-+)) +import SysCmd (repoquery, (+-+)) import Control.Applicative ((<$>)) import Control.Monad (filterM, unless, void) @@ -61,7 +61,7 @@ return $ nub $ accum2 ++ more notAvail :: String -> IO Bool -notAvail pkg = null <$> cmd "repoquery" [pkg] +notAvail pkg = null <$> repoquery [] pkg missingDepsPkg :: String -> IO [String] missingDepsPkg pkg = do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.3/src/Commands/Install.hs new/cabal-rpm-0.9.4/src/Commands/Install.hs --- old/cabal-rpm-0.9.3/src/Commands/Install.hs 2015-02-05 16:50:49.000000000 +0100 +++ new/cabal-rpm-0.9.4/src/Commands/Install.hs 2015-02-17 14:43:22.000000000 +0100 @@ -6,7 +6,7 @@ -- Stability : alpha -- Portability : portable -- --- Explanation: cabal wrapper which yum installs dependencies +-- Explanation: cabal wrapper which installs rpm dependencies -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ import Dependencies (missingPackages, notInstalled) import PackageUtils (PackageData (..), RpmStage (..), stripPkgDevel) import Setup (RpmFlags (..)) -import SysCmd (cmd, cmd_, sudo, yumInstall, (+-+)) +import SysCmd (cmd, cmd_, pkgInstall, rpmInstall, (+-+)) import Control.Applicative ((<$>)) import Control.Monad (unless, when) @@ -32,7 +32,7 @@ let pkgDesc = packageDesc pkgdata missing <- missingPackages pkgDesc unless (null missing) $ do - yumInstall missing False + pkgInstall missing False stillMissing <- missingPackages pkgDesc unless (null stillMissing) $ do putStrLn $ "Missing:" +-+ unwords stillMissing @@ -42,7 +42,7 @@ rpmdir <- cmd "rpm" ["--eval", "%{_rpmdir}"] rpms <- (map (\ p -> rpmdir </> arch </> p ++ ".rpm") . lines) <$> cmd "rpmspec" ["-q", spec] - sudo "yum" $ ["-y", "localinstall"] ++ rpms + rpmInstall rpms installMissing :: String -> IO () installMissing pkg = do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.3/src/Commands/RpmBuild.hs new/cabal-rpm-0.9.4/src/Commands/RpmBuild.hs --- old/cabal-rpm-0.9.3/src/Commands/RpmBuild.hs 2015-02-05 16:50:49.000000000 +0100 +++ new/cabal-rpm-0.9.4/src/Commands/RpmBuild.hs 2015-02-17 14:43:22.000000000 +0100 @@ -24,7 +24,7 @@ import PackageUtils (copyTarball, isScmDir, PackageData (..), packageName, packageVersion, rpmbuild, RpmStage (..)) import Setup (RpmFlags (..)) -import SysCmd (cmd, yumInstall, (+-+)) +import SysCmd (cmd, pkgInstall, (+-+)) --import Control.Exception (bracket) import Control.Monad (unless, void, when) @@ -62,7 +62,7 @@ name = packageName pkg when (stage `elem` [Binary,BuildDep]) $ do missing <- missingPackages pkgDesc - yumInstall missing (stage == Binary) + pkgInstall missing (stage == Binary) unless (stage == BuildDep) $ do srcdir <- cmd "rpm" ["--eval", "%{_sourcedir}"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.3/src/Commands/Update.hs new/cabal-rpm-0.9.4/src/Commands/Update.hs --- old/cabal-rpm-0.9.3/src/Commands/Update.hs 2015-02-05 16:50:49.000000000 +0100 +++ new/cabal-rpm-0.9.4/src/Commands/Update.hs 2015-02-17 14:43:22.000000000 +0100 @@ -18,10 +18,10 @@ import Commands.Spec (createSpecFile) import FileUtils (withTempDirectory) -import PackageUtils (PackageData (..), bringTarball, isGitDir, latestPkg, +import PackageUtils (PackageData (..), bringTarball, latestPkg, packageName, packageVersion, prepare, removePrefix) import Setup (RpmFlags (..)) -import SysCmd (cmd_, shell, (+-+)) +import SysCmd (cmd_, cmdBool, shell, (+-+)) import Control.Monad (when) import Distribution.PackageDescription (PackageDescription (..)) @@ -43,9 +43,9 @@ then error $ current +-+ "is latest version." else do bringTarball latest - pkgGit <- isGitDir "." - when pkgGit $ - cmd_ "fedpkg" ["new-sources", latest ++ ".tar.gz"] + rwGit <- cmdBool "grep -q 'url = ssh://' .git/config" + when rwGit $ + cmd_ "fedpkg" ["new-sources", latest ++ ".tar.gz"] withTempDirectory $ \cwd -> do curspec <- createSpecVersion current spec newspec <- createSpecVersion latest spec @@ -54,7 +54,7 @@ cmd_ "sed" ["-i", "-e s/^\$Release: \$.*/\\10%{?dist}/", spec] let newver = removePrefix (name ++ "-") latest cmd_ "rpmdev-bumpspec" ["-c", "update to" +-+ newver, spec] - when pkgGit $ + when rwGit $ cmd_ "git" ["commit", "-a", "-m", "update to" +-+ newver] where createSpecVersion :: String -> String -> IO FilePath diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.3/src/Dependencies.hs new/cabal-rpm-0.9.4/src/Dependencies.hs --- old/cabal-rpm-0.9.3/src/Dependencies.hs 2015-02-05 16:50:49.000000000 +0100 +++ new/cabal-rpm-0.9.4/src/Dependencies.hs 2015-02-17 14:43:22.000000000 +0100 @@ -23,7 +23,7 @@ ) where import PackageUtils (packageName) -import SysCmd (cmd, cmdBool, optionalProgram, (+-+)) +import SysCmd (cmd, cmdBool, repoquery, (+-+)) import Control.Applicative ((<$>)) import Control.Monad (filterM, liftM) @@ -67,6 +67,8 @@ clibs = concatMap extraLibs buildinfo return (deps, tools, nub clibs, pkgcfgs, selfdep) +data RepoQueryType = Rpm | Repoquery deriving Eq + resolveLib :: String -> IO (Maybe String) resolveLib lib = do lib64 <- doesDirectoryExist "/usr/lib64" @@ -74,21 +76,16 @@ let lib_path = "/usr/lib" ++ libsuffix ++ "/lib" ++ lib ++ ".so" libInst <- doesFileExist lib_path if libInst - then rpmqueryFile "rpm" lib_path + then rpmqueryFile Rpm lib_path else do - haveRpqry <- optionalProgram "repoquery" - if haveRpqry - then do - putStrLn $ "Running repoquery on" +-+ "lib" ++ lib - rpmqueryFile "repoquery" lib_path - else do - warning $ "Install yum-utils to resolve package that provides uninstalled" +-+ lib_path - return Nothing + putStrLn $ "Running repoquery on" +-+ "lib" ++ lib + rpmqueryFile Repoquery lib_path -- use repoquery or rpm -q to query which package provides file -rpmqueryFile :: String -> FilePath -> IO (Maybe String) -rpmqueryFile qc file = do - out <- cmd qc ["-q", "--qf=%{name}", "-f", file] +rpmqueryFile :: RepoQueryType -> FilePath -> IO (Maybe String) +rpmqueryFile qt file = do + let args = ["-q", "--qf=%{name}", "-f"] + out <- if qt == Rpm then cmd "rpm" (args ++ [file]) else repoquery args file let pkgs = nub $ words out -- EL5 repoquery can return "No package provides <file>" case pkgs of @@ -141,7 +138,7 @@ derefPkg :: String -> IO String derefPkg req = do - res <- singleLine <$> cmd "repoquery" ["--qf", "%{name}", "--whatprovides", req] + res <- singleLine <$> repoquery ["--qf", "%{name}", "--whatprovides"] req if null res then error $ req +-+ "provider not found by repoquery" else return res diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.3/src/SysCmd.hs new/cabal-rpm-0.9.4/src/SysCmd.hs --- old/cabal-rpm-0.9.3/src/SysCmd.hs 2015-02-05 16:50:49.000000000 +0100 +++ new/cabal-rpm-0.9.4/src/SysCmd.hs 2015-02-17 14:43:22.000000000 +0100 @@ -22,16 +22,18 @@ cmdBool, cmdQuiet, cmdSilent, + pkgInstall, + repoquery, + rpmInstall, trySystem, shell, sudo, - yumInstall, (+-+)) where import Control.Monad (unless, void, when) import Data.Functor ((<$>)) import Data.List ((\\)) -import Data.Maybe (fromMaybe, isJust, isNothing) +import Data.Maybe (fromMaybe, isJust, isNothing, maybeToList) import Distribution.Simple.Utils (die, warn, findProgramLocation) import Distribution.Verbosity (normal) @@ -114,16 +116,31 @@ then init str else str +infixr 4 +-+ (+-+) :: String -> String -> String "" +-+ s = s s +-+ "" = s s +-+ t = s ++ " " ++ t -yumInstall :: [String] -> Bool -> IO () -yumInstall [] _ = return () -yumInstall pkgs hard = do +packageManager :: IO String +packageManager = do + havednf <- optionalProgram "dnf" + if havednf + then return "dnf" + else requireProgram "yum" >> return "yum" + +repoquery :: [String] -> String -> IO String +repoquery args key = do + havednf <- optionalProgram "dnf" + let (prog, subcmd) = if havednf then ("dnf", Just "repoquery") else ("repoquery", Nothing) + cmd prog (maybeToList subcmd ++ args ++ [key]) + +pkgInstall :: [String] -> Bool -> IO () +pkgInstall [] _ = return () +pkgInstall pkgs hard = do + pkginstaller <- packageManager putStrLn $ "Running repoquery" +-+ unwords pkgs - repopkgs <- lines <$> readProcess "repoquery" (["--qf", "%{name}"] ++ pkgs) [] + repopkgs <- mapM (repoquery ["--qf", "%{name}"]) pkgs let missing = pkgs \\ repopkgs if not (null missing) && hard then error $ unwords missing +-+ "not available." @@ -141,13 +158,18 @@ else do havesudo <- optionalProgram "sudo" return $ if havesudo then Just "sudo" else Nothing - requireProgram "yum" let args = map showPkg repopkgs - putStrLn $ "Running:" +-+ fromMaybe "" maybeSudo +-+ "yum install" +-+ unwords args + putStrLn $ "Running:" +-+ fromMaybe "" maybeSudo +-+ pkginstaller +-+ "install" +-+ unwords args let exec = if hard then cmd_ else trySystem fedora <- cmd "rpm" ["--eval", "%fedora"] let nogpgcheck = ["--nogpgcheck" | fedora `elem` ["21", "22"]] - exec (fromMaybe "yum" maybeSudo) $ maybe [] (const "yum") maybeSudo : "install" : args ++ nogpgcheck + exec (fromMaybe pkginstaller maybeSudo) $ maybe [] (const pkginstaller) maybeSudo : "install" : args ++ nogpgcheck showPkg :: String -> String showPkg p = if '(' `elem` p then show p else p + +rpmInstall :: [String] -> IO () +rpmInstall rpms = do + pkginstaller <- packageManager + let (inst, arg) = if pkginstaller == "dnf" then ("dnf", "install") else ("yum", "localinstall") + sudo inst $ ["-y", arg] ++ rpms -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit roundcubemail for openSUSE:Factory
by root＠hilbert.suse.de 20 Feb '15

20 Feb '15

Hello community, here is the log from the commit of package roundcubemail for openSUSE:Factory checked in at 2015-02-20 12:01:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/roundcubemail (Old) and /work/SRC/openSUSE:Factory/.roundcubemail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "roundcubemail" Changes: -------- --- /work/SRC/openSUSE:Factory/roundcubemail/roundcubemail.changes 2015-02-03 11:40:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.roundcubemail.new/roundcubemail.changes 2015-02-20 12:01:21.000000000 +0100 @@ -1,0 +2,131 @@ +Tue Feb 10 12:27:59 UTC 2015 - aj(a)ajaissle.de + +- Update to 1.1.0 + + New features: + - Allow searching across multiple folders + - Improved support for screen readers and assistive technology using + WCAG 2.0 andWAI ARIA standards + - Update to TinyMCE 4.1 to support images in HTML signatures (copy & paste) + - Added namespace filter and folder searching in folder manager + - New config option to disable UI elements/actions + - Stronger password encryption using OpenSSL + - Support for the IMAP SPECIAL-USE extension + - Support for Oracle as database backend + - Manage 3rd party libs with Composer + - Secure URLs [1] (disabled by default) + + Changelog: + Make SMTP error log more verbose - include server response and error code + Fix download options menu (added by zipdownload plugin) in classic skin (#1490228) + Fix blocked.gif image usage with assets_dir set + Fix bug where max_group_members was ignored when adding a new contact (#1490214) + Hide MDN and DSN options in compose if disabled by admin (#1490221) + Fix checks based on window.ActiveXObject in IE > 10 + Fix XSS issue in style attribute handling (#1490227) + Fix bug where Drafts list wasn't updated on draft-save action in new window (#1490225) + Fix so "set as default" option is hidden if identities_level > 1 (#1490226) + Fix bug where search was reset after returning from compose visited for reply + Fix javascript error in "IE 8.0/Tablet PC" browser (#1490210) + Fix bug where Reply-To address was ignored on reply to messages sent by self (#1490233) + Fix bug where empty fieldmap config entries caused empty results of ldap search (#1490229) + Fix bug where drafts list wasn't refreshed after draft message was sent from another window (#1490238) + Fix keyboard navigation and css in datepicker widget across many Firefox versions + Fix false warning when opening attached text/plain files (#1490241) + Fix bug where signature could have been inserted twice after plain-to-html switch (#1490239) + Fix security issue in DBMail driver of password plugin (#1490261) + Enable FollowSymLinks? option in .htaccess file which is required by rewrite rules (#1490255) + Fix so JSON.parse() errors on localStorage items are ignored (#1490249) + +[1] http://trac.roundcube.net/wiki/Howto_Config/Secure_URLs + +------------------------------------------------------------------- +Sun Feb 1 12:37:13 UTC 2015 - aj(a)ajaissle.de + +- Update to 1.1-rc (1.0.95) + Update jQuery to version 2.1.3 + Improve system security by using optional special URL with security token - use_secure_urls + Allow to define separate server/path for image/js/css files - assets_url/assets_dir + Sync vendor folder if exists in source package (#1490145) + Avoid useless reloading list when resetting search with active filter (#1490057) + Fix invalid folder selection if clicked while busy (#1490158) + Fix import of multiple contact email addresses from Outlook-csv format (#1490169) + Fix drag-n-drop to folders expanded while dragging (#1490157) + Fix import of multiple contact groups from Google-csv format (#1490159) + Fix import of contacts with multiple email addresses from Google-csv format (#1490178) + Fix bugs where CSRF attacks were still possible on some requests + Fix some rcube_utils::anytodatetime() corner cases with timezone mismatches (#1490163) + Improve move-to and contact-export button in classic skin (#1490166) + Fix wrong icon for download button in classic skin + Fix bug where sent message was saved in Sent folder even if disabled by user (#1490208) + +- Update to 1.1-beta (1.0.90) + Fix skin path handling in plugin context (#1488967) + Prevent memory exhaustion on image resizing with GD on Windows (#1489937) + Add plugin hook for database table name lookups as requested in #1489837 + Added Oracle database support + Support contacts import in GMail CSV format + Added namespace filter in Folder Manager + Added folder searching in Folder Manager + Fix restoring draft messages from localStorage if editor mode differs (#1490016) + Added config option/user preference to disable saving messages in localStorage (#1489979) + Added config option 'imap_log_session' to enable Roundcube <-> IMAP session ID logging + Added config option 'log_session_id' to control the length of the session identifier in logs + Implemented 'storage_connected' API hook after successful IMAP login (#1490025) + Integrate Net_LDAP3 and rcube_ldap_generic classes + Add option (disabled_actions) to disable UI elements/actions (#1489638) + Support password encryption using openssl extension (#1489989) + Create/rename groups in UI dialogs (#1489951) + Added 'contact_search_name' option to define autocompletion entry format + Display quota information for current folder not INBOX only (#1487993) + Support images in HTML signatures (#1488676) + Display full quota information in popup (#1485769, #1486604) + Mail compose: Selecting contact inserts recipient to previously focused input - to/cc/bcc accordingly (#1489684) + Close "no subject" prompt with Enter key (#1489580) + Password: Add option to force new users to change their password (#1486884) + Improve support for screen readers and assistive technology using WCAG 2.0 and WAI ARIA standards + Enable basic keyboard navigation throughout the UI (#1487845) + Select/scroll to previously selected message when returning from message page (#1489023) + Display a warning if popup window was blocked (#1489618) + Remove (was: ...) from message subject on reply (#1489375) + Update to TinyMCE 4.1 (#1489057) + Enable autolink plugin in TinyMCE (#1488845) + Support image operations with Imagick extension (#1489734) + Support upload progress with session.upload_progress and PECL uploadprogress module (#1488702) + Make identity name field optional (#1489510) + Utility script to remove user records from the local database + Plugin API: Added message_saved hook (#1489752) + Plugin API: Added imap_search_before hook + Support messages import from zip archives + Zipdownload: Added mbox format support (#1486069) + Drop support for IE6, move IE7/IE8 support to legacy_browser plugin + Update to jQuery-2.1.1 + Search across multiple folders (#1485234) + Improve UI integration of ACL settings + Drop support for PHP < 5.3.7 + Set In-Reply-To and References for forwarded messages (#1489593) + Removed redundant default_folders config option (#1489737) + Implemented IMAP SPECIAL-USE extension support [RFC6154] (#1487830) + Optimize some framed pages content for better performance (#1489792) + Improve text messages display and conversion to HTML (#1488937) + Don't remove links when html signature is converted to text (#1489621) + Fix page title when using search filter (#1490023) + Fix mbox files import + Fix some character sets detection (#1490135) + Fix so attachment charset is set in headers of forward/draft message (#1490109) + Fix bug where wrong charset could be used for text attachment preview page (#1490106) + Fix setting flags on servers with no PERMANENTFLAGS response (#1490087) + Fix regression in SHAA password generation in ldap driver of password plugin (#1490094) + Fix displaying of HTML messages with absolutely positioned elements in Larry skin (#1490103) + Fix font style display issue in HTML messages with styled elements (#1490101) + Fix download of attachments that are part of TNEF message (#1490091) + Fix handling of uuencoded messages if messages_cache is enabled (#1490108) + Fix handling of base64-encoded attachments with extra spaces (#1490111) + Fix handling of UNKNOWN-CTE response, try do decode content client-side (#1490046) + Fix bug where creating subfolders in shared folders wasn't possible without ACL extension (#1490113) + Fix reply scrolling issue with text mode and start message below the quote (#1490114) + Fix possible issues in skin/skin_path config handling (#1490125) + +- Rebased roundcubemail-0.9.1_config-dir.patch as roundcubemail-1.1-beta-config_dir.patch + +------------------------------------------------------------------- @@ -14,0 +146 @@ +- Update to 1.1-rc (1.0.95) Old: ---- roundcubemail-0.9.1_config-dir.patch roundcubemail-1.0.5-dep.tar.gz New: ---- roundcubemail-1.1-beta-config_dir.patch roundcubemail-1.1.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ roundcubemail.spec ++++++ --- /var/tmp/diff_new_pack.1QGRrf/_old 2015-02-20 12:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.1QGRrf/_new 2015-02-20 12:01:22.000000000 +0100 @@ -17,21 +17,20 @@ Name: roundcubemail -Version: 1.0.5 +Version: 1.1.0 Release: 0 Summary: A modern browser-based multilingual IMAP client License: GPL-3.0+ and GPL-2.0 and BSD-3-Clause Group: Productivity/Networking/Email/Clients Url: http://www.roundcube.net/ -Source0: %{name}-%{version}-dep.tar.gz +Source0: %{name}-%{version}.tar.gz Source1: %{name}-rpmlintrc Source2: %{name}-httpd.conf Source4: README.openSUSE Source5: %{name}.logrotate -Source100: %{name}-rpmlintrc -# PATCH-FIX-OPENSUSE roundcubemail-0.9.1_config-dir.patch -- use the general config directory /etc -Patch0: %{name}-0.9.1_config-dir.patch +# PATCH-FIX-OPENSUSE roundcubemail-1.1-beta-config_dir.patch -- use the general config directory /etc +Patch0: %{name}-1.1-beta-config_dir.patch BuildArch: noarch BuildRequires: apache2-devel @@ -87,7 +86,7 @@ %prep -%setup -q -n %{name}-%{version}-dep +%setup -q %patch0 -p1 cp %{SOURCE4} . @@ -102,7 +101,7 @@ # remove shebang from chpass-wrapper sed -i '1d' plugins/password/helpers/chpass-wrapper.py # remove INSTALL doc -%{__rm} INSTALL +%{__rm} INSTALL Dockerfile %build ++++++ roundcubemail-1.1-beta-config_dir.patch ++++++ diff -Ppru roundcubemail-1.1-beta-dep.orig/installer/index.php roundcubemail-1.1-beta-dep/installer/index.php --- roundcubemail-1.1-beta-dep.orig/installer/index.php 2014-11-10 20:54:51.000000000 +0100 +++ roundcubemail-1.1-beta-dep/installer/index.php 2015-01-02 19:49:03.914591933 +0100 @@ -41,7 +41,7 @@ ini_set('display_errors', 1); define('INSTALL_PATH', realpath(__DIR__ . '/../').'/'); define('RCUBE_INSTALL_PATH', INSTALL_PATH); -define('RCUBE_CONFIG_DIR', INSTALL_PATH . 'config/'); +define('RCUBE_CONFIG_DIR', '/etc/roundcubemail/'); $include_path = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR; $include_path .= INSTALL_PATH . 'program/include' . PATH_SEPARATOR; diff -Ppru roundcubemail-1.1-beta-dep.orig/program/include/iniset.php roundcubemail-1.1-beta-dep/program/include/iniset.php --- roundcubemail-1.1-beta-dep.orig/program/include/iniset.php 2014-11-10 20:54:51.000000000 +0100 +++ roundcubemail-1.1-beta-dep/program/include/iniset.php 2015-01-02 19:50:06.909427933 +0100 @@ -29,7 +29,7 @@ if (!defined('INSTALL_PATH')) { } if (!defined('RCMAIL_CONFIG_DIR')) { - define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config'); + define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail'); } if (!defined('RCUBE_LOCALIZATION_DIR')) { ++++++ roundcubemail-1.0.5-dep.tar.gz -> roundcubemail-1.1.0.tar.gz ++++++ ++++ 135524 lines of diff (skipped) ++++++ roundcubemail-httpd.conf ++++++ --- /var/tmp/diff_new_pack.1QGRrf/_old 2015-02-20 12:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.1QGRrf/_new 2015-02-20 12:01:23.000000000 +0100 @@ -66,6 +66,7 @@ # security rules RewriteRule .git - [F] RewriteRule ^/?(README(.md)?|INSTALL|LICENSE|SQL|bin|CHANGELOG)$ - [F] + RewriteRule ^(?!installer|[a-f0-9]{16})(\.?[^\.]+)$ - [F] </IfModule> <IfModule mod_deflate.c> ++++++ roundcubemail.logrotate ++++++ --- /var/tmp/diff_new_pack.1QGRrf/_old 2015-02-20 12:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.1QGRrf/_new 2015-02-20 12:01:23.000000000 +0100 @@ -3,5 +3,6 @@ compress notifempty size 30k + su wwwrun www create 0660 wwwrun www -} \ No newline at end of file +} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-po_to_json for openSUSE:Factory
by root＠hilbert.suse.de 20 Feb '15

20 Feb '15

Hello community, here is the log from the commit of package rubygem-po_to_json for openSUSE:Factory checked in at 2015-02-20 12:01:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-po_to_json (Old) and /work/SRC/openSUSE:Factory/.rubygem-po_to_json.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-po_to_json" Changes: -------- New Changes file: --- /dev/null 2014-12-25 22:38:16.200041506 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-po_to_json.new/rubygem-po_to_json.changes 2015-02-20 12:01:09.000000000 +0100 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Wed Dec 17 10:05:39 UTC 2014 - tboerger(a)suse.com + +- Initial packaging of 0.0.7 + New: ---- gem2rpm.yml po_to_json-0.0.7.gem rubygem-po_to_json.changes rubygem-po_to_json.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-po_to_json.spec ++++++ # # spec file for package rubygem-po_to_json # # Copyright (c) 2014 SUSE LINUX Products 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/ # # # This file was generated with a gem2rpm.yml and not just plain gem2rpm. # All sections marked as MANUAL, license headers, summaries and descriptions # can be maintained in that file. Please consult this file before editing any # of those fields # Name: rubygem-po_to_json Version: 0.0.7 Release: 0 %define mod_name po_to_json %define mod_full_name %{mod_name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ruby-macros >= 5 BuildRequires: %{ruby} BuildRequires: %{rubygem gem2rpm} Url: https://github.com/nubis/po_to_json Source: http://rubygems.org/gems/%{mod_full_name}.gem Source1: gem2rpm.yml Summary: Convert gettext PO files to json License: MIT Group: Development/Languages/Ruby %description Convert gettext PO files to json to use in your javascript app, based po2json.pl (by DuckDuckGo, Inc. http://duckduckgo.com/, Torsten Raudssus <torsten(a)raudss.us>.). %prep %build %install %gem_install \ --doc-files="README.md MIT-LICENSE" \ -f %gem_packages %changelog ++++++ gem2rpm.yml ++++++ # --- # ## used by gem2rpm # :summary: this is a custom summary # ## used by gem2rpm # :description: |- # this is a custom description # # it can be multiline # ## used by gem2rpm # :license: MIT or Ruby # ## used by gem2rpm and gem_packages # :version_suffix: -x_y # ## used by gem2rpm and gem_packages # :disable_docs: true # ## used by gem2rpm # :disable_automatic_rdoc_dep: true # ## used by gem2rpm # :preamble: |- # BuildRequires: foobar # Requires: foobar # ## used by gem2rpm # :patches: # foo.patch: -p1 # bar.patch: # ## used by gem2rpm # :sources: # - foo.desktop # - bar.desktop # :gem_install_args: '....' # ## used by gem2rpm # :pre_install: |- # %if 0%{?use_system_libev} # export USE_VENDORED_LIBEV="no" # %endif # ## used by gem2rpm # :post_install: |- # # delete custom files here or do other fancy stuff # install -D -m 0644 %{S:1} %{buildroot}%{_bindir}/gem2rpm-opensuse # ## used by gem2rpm # :testsuite_command: |- # (pushd %{buildroot}%{gem_base}/gems/%{mod_full_name} && rake test) # ## used by gem2rpm # :filelist: |- # /usr/bin/gem2rpm-opensuse # ## used by gem2rpm # :scripts: # :post: |- # /bin/echo foo # ## used by gem_packages # :main: # :preamble: |- # Requires: util-linux # Recommends: pwgen # :filelist: |- # /usr/bin/gem2rpm-opensuse # ## used by gem_packages # :custom: # apache: # :preamble: |- # Requires: ..... # :filelist: |- # /etc/apache2/conf.d/passenger.conf # :summary: Custom summary is optional # :description: |- # Custom description is optional # # bar # :post: |- # /bin/echo foo # --- :license: MIT -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-js-routes for openSUSE:Factory
by root＠hilbert.suse.de 20 Feb '15

20 Feb '15

Hello community, here is the log from the commit of package rubygem-js-routes for openSUSE:Factory checked in at 2015-02-20 12:01:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-js-routes (Old) and /work/SRC/openSUSE:Factory/.rubygem-js-routes.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-js-routes" Changes: -------- New Changes file: --- /dev/null 2014-12-25 22:38:16.200041506 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-js-routes.new/rubygem-js-routes.changes 2015-02-20 12:01:07.000000000 +0100 @@ -0,0 +1,15 @@ +------------------------------------------------------------------- +Tue Feb 10 17:58:15 UTC 2015 - coolo(a)suse.com + +- updated to version 1.0.0 + +------------------------------------------------------------------- +Mon Oct 13 14:18:35 UTC 2014 - coolo(a)suse.com + +- adapt to new rubygem packaging + +------------------------------------------------------------------- +Wed Apr 23 09:42:34 UTC 2014 - tboerger(a)suse.com + +- Initial packaging of 0.9.7 + New: ---- gem2rpm.yml js-routes-1.0.0.gem rubygem-js-routes.changes rubygem-js-routes.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-js-routes.spec ++++++ # # spec file for package rubygem-js-routes # # Copyright (c) 2015 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/ # # # This file was generated with a gem2rpm.yml and not just plain gem2rpm. # All sections marked as MANUAL, license headers, summaries and descriptions # can be maintained in that file. Please consult this file before editing any # of those fields # Name: rubygem-js-routes Version: 1.0.0 Release: 0 %define mod_name js-routes %define mod_full_name %{mod_name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: %{rubygem gem2rpm} BuildRequires: %{ruby} BuildRequires: ruby-macros >= 5 Url: http://github.com/railsware/js-routes Source: http://rubygems.org/gems/%{mod_full_name}.gem Source1: gem2rpm.yml Summary: Brings Rails named routes to javascript License: MIT Group: Development/Languages/Ruby %description Generates javascript file that defines all Rails named routes as javascript helpers. %prep %build %install %gem_install \ --doc-files="CHANGELOG.md LICENSE.txt Readme.md" \ -f %gem_packages %changelog ++++++ gem2rpm.yml ++++++ # --- # ## used by gem2rpm # :summary: this is a custom summary # ## used by gem2rpm # :description: |- # this is a custom description # # it can be multiline # ## used by gem2rpm # :license: MIT or Ruby # ## used by gem2rpm and gem_packages # :version_suffix: -x_y # ## used by gem2rpm and gem_packages # :disable_docs: true # ## used by gem2rpm # :disable_automatic_rdoc_dep: true # ## used by gem2rpm # :preamble: |- # BuildRequires: foobar # Requires: foobar # ## used by gem2rpm # :patches: # foo.patch: -p1 # bar.patch: # ## used by gem2rpm :sources: # - foo.desktop # - bar.desktop # :gem_install_args: '....' # ## used by gem2rpm # :pre_install: |- # %if 0%{?use_system_libev} # export USE_VENDORED_LIBEV="no" # %endif # ## used by gem2rpm # :post_install: |- # # delete custom files here or do other fancy stuff # install -D -m 0644 %{S:1} %{buildroot}%{_bindir}/gem2rpm-opensuse # ## used by gem2rpm # :testsuite_command: |- # (pushd %{buildroot}%{gem_base}/gems/%{mod_full_name} && rake test) # ## used by gem2rpm # :filelist: |- # /usr/bin/gem2rpm-opensuse # ## used by gem2rpm # :scripts: # :post: |- # /bin/echo foo # ## used by gem_packages # :main: # :preamble: |- # Requires: util-linux # Recommends: pwgen # :filelist: |- # /usr/bin/gem2rpm-opensuse # ## used by gem_packages # :custom: # apache: # :preamble: |- # Requires: ..... # :filelist: |- # /etc/apache2/conf.d/passenger.conf # :summary: Custom summary is optional # :description: |- # Custom description is optional # # bar # :post: |- # /bin/echo foo # -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sysconfig for openSUSE:Factory
by root＠hilbert.suse.de 20 Feb '15

20 Feb '15

Hello community, here is the log from the commit of package sysconfig for openSUSE:Factory checked in at 2015-02-20 12:00:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sysconfig (Old) and /work/SRC/openSUSE:Factory/.sysconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sysconfig" Changes: -------- --- /work/SRC/openSUSE:Factory/sysconfig/sysconfig.changes 2015-01-21 21:56:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sysconfig.new/sysconfig.changes 2015-02-20 12:00:55.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 17 11:23:22 UTC 2015 - mt(a)suse.de + +- dhcp: add variables for handling of DHCPv4 user-class (bsc#909307) + [+ 0001-dhcp-network-variables-for-dhcp4-user-class.909307.patch] + +------------------------------------------------------------------- @@ -5 +11 @@ -- netconfig: use domain name from hostname (bug#912891) +- netconfig: use domain name from hostname (bnc#912891) @@ -9 +15 @@ -- netconfig: merge NetworkManager settings on -m (bug#900982) +- netconfig: merge NetworkManager settings on -m (bnc#900982) New: ---- 0001-dhcp-network-variables-for-dhcp4-user-class.909307.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.CvYqLJ/_old 2015-02-20 12:00:56.000000000 +0100 +++ /var/tmp/diff_new_pack.CvYqLJ/_new 2015-02-20 12:00:56.000000000 +0100 @@ -33,6 +33,7 @@ %define udevdir /lib/udev %endif Source: %name-%version.tar.bz2 +Patch1: 0001-dhcp-network-variables-for-dhcp4-user-class.909307.patch Requires: /sbin/ifup Requires: /sbin/netconfig Requires: sysvinit(network) @@ -74,6 +75,7 @@ %prep %setup -n sysconfig-%{version} +%patch1 -p1 %build autoreconf --force --install ++++++ 0001-dhcp-network-variables-for-dhcp4-user-class.909307.patch ++++++ >From 59b8496ff57b745d988cff32596a6988cd045e34 Mon Sep 17 00:00:00 2001 From: Karol Mroz <kmroz(a)suse.de> Date: Thu, 22 Jan 2015 17:17:54 -0800 Subject: [PATCH] dhcp-network: add sysconfig variables for handling DHCP user-class References: (bsc#909307) Upstream: yes diff --git a/config/sysconfig.dhcp-network b/config/sysconfig.dhcp-network index 5c36ae6..ca3d8f2 100644 --- a/config/sysconfig.dhcp-network +++ b/config/sysconfig.dhcp-network @@ -77,6 +77,30 @@ DHCLIENT_CLIENT_ID="" # DHCLIENT_VENDOR_CLASS_ID="" +## Type: list<rfc3004,string> +## Default: string +# +# Specifies the format of the DHCLIENT_USER_CLASS_ID variable. +# +# The DHCPv4 option and it's format is specified by RFC3004 as an array +# of class identifiers, but most DHCP clients/servers aren't compliant +# with the specification and send/expect a single string without proper +# RFC3004 length-value tuple format instead. +# +# When set to "rfc3004" DHCLIENT_USER_CLASS_ID[SUFFIX] permit an RFC +# compliant array, otherwise DHCLIENT_USER_CLASS_ID is used as string. +# +DHCLIENT_USER_CLASS_FORMAT="" + +## Type: string +## Default: "" +## Suffix: yes +# +# Specifies the user class identifier (array) to send in dhcp requests. +# The DHCLIENT_USER_CLASS_FORMAT variable specified how to interpret it. +# +DHCLIENT_USER_CLASS_ID="" + ## Type: integer ## Default: "" # -- 2.1.4 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0