October 2014 - openSUSE Commits - openSUSE Mailing Lists

commit iso-codes for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package iso-codes for openSUSE:Factory checked in at 2014-10-05 20:28:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iso-codes (Old) and /work/SRC/openSUSE:Factory/.iso-codes.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "iso-codes" Changes: -------- --- /work/SRC/openSUSE:Factory/iso-codes/iso-codes.changes 2014-07-21 21:39:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.iso-codes.new/iso-codes.changes 2014-10-05 20:28:06.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Sep 27 17:14:29 UTC 2014 - zaitor(a)opensuse.org + +- Update to version 3.56: + + Updated translations for ISO 3166-2, ISO 639-3, ISO 639-5 and + ISO 639. + +------------------------------------------------------------------- Old: ---- iso-codes-3.55.tar.xz New: ---- iso-codes-3.56.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iso-codes.spec ++++++ --- /var/tmp/diff_new_pack.MtG7eY/_old 2014-10-05 20:28:07.000000000 +0200 +++ /var/tmp/diff_new_pack.MtG7eY/_new 2014-10-05 20:28:07.000000000 +0200 @@ -17,7 +17,7 @@ Name: iso-codes -Version: 3.55 +Version: 3.56 Release: 0 Summary: ISO Code Lists and Translations License: LGPL-2.1+ ++++++ iso-codes-3.55.tar.xz -> iso-codes-3.56.tar.xz ++++++ ++++ 10843 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 webkitgtk for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package webkitgtk for openSUSE:Factory checked in at 2014-10-05 20:28:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/webkitgtk (Old) and /work/SRC/openSUSE:Factory/.webkitgtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "webkitgtk" Changes: -------- --- /work/SRC/openSUSE:Factory/webkitgtk/webkitgtk.changes 2014-09-30 19:36:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.webkitgtk.new/webkitgtk.changes 2014-10-05 20:28:04.000000000 +0200 @@ -1,0 +2,12 @@ +Mon Sep 29 14:00:02 UTC 2014 - dimstar(a)opensuse.org + +- Update to version 2.4.6: + + Use free icons for the web inspector. + + Make vimeo videos work again with the GStreamer media backend. + + Fix selection rendering when unfocused with recent GTK+ + versions. + + Fix toggle buttons rendering with recent GTK+ versions. + + Fix race condition when downloading a file due to the + intermediate temporary file. + +------------------------------------------------------------------- webkitgtk3.changes: same change Old: ---- webkitgtk-2.4.5.tar.xz New: ---- webkitgtk-2.4.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webkitgtk.spec ++++++ --- /var/tmp/diff_new_pack.wGNeWW/_old 2014-10-05 20:28:05.000000000 +0200 +++ /var/tmp/diff_new_pack.wGNeWW/_new 2014-10-05 20:28:05.000000000 +0200 @@ -47,7 +47,7 @@ Summary: Library for rendering web content, GTK+ Port License: LGPL-2.0+ and BSD-3-Clause Group: Development/Libraries/C and C++ -Version: 2.4.5 +Version: 2.4.6 Release: 0 # FIXME: at some point, figure out a way to remove the hack where we use -g0 to have successful builds # FIXME: get upstream to fix the conflict on gtk-doc docs between gtk2 and gtk3 versions webkitgtk3.spec: same change ++++++ webkitgtk-2.4.5.tar.xz -> webkitgtk-2.4.6.tar.xz ++++++ /work/SRC/openSUSE:Factory/webkitgtk/webkitgtk-2.4.5.tar.xz /work/SRC/openSUSE:Factory/.webkitgtk.new/webkitgtk-2.4.6.tar.xz differ: char 27, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gjs for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package gjs for openSUSE:Factory checked in at 2014-10-05 20:28:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gjs (Old) and /work/SRC/openSUSE:Factory/.gjs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gjs" Changes: -------- --- /work/SRC/openSUSE:Factory/gjs/gjs.changes 2014-09-30 19:37:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gjs.new/gjs.changes 2014-10-05 20:28:02.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 29 11:59:14 UTC 2014 - zaitor(a)opensuse.org + +- Update to version 1.42.0: + + Fix a regression caused by PPC fixes in 1.41.91. + +------------------------------------------------------------------- Old: ---- gjs-1.41.91.tar.xz New: ---- gjs-1.42.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gjs.spec ++++++ --- /var/tmp/diff_new_pack.gVzw9E/_old 2014-10-05 20:28:03.000000000 +0200 +++ /var/tmp/diff_new_pack.gVzw9E/_new 2014-10-05 20:28:03.000000000 +0200 @@ -17,14 +17,14 @@ Name: gjs -Version: 1.41.91 +Version: 1.42.0 Release: 0 # FIXME: find out if tapsets should really be in devel package or in main package Summary: JavaScript bindings based on gobject-introspection and Mozilla License: MIT Group: Development/Libraries/GNOME Url: http://live.gnome.org/Gjs -Source: http://download.gnome.org/sources/gjs/1.41/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gjs/1.42/%{name}-%{version}.tar.xz BuildRequires: gcc-c++ BuildRequires: python BuildRequires: readline-devel ++++++ gjs-1.41.91.tar.xz -> gjs-1.42.0.tar.xz ++++++ ++++ 5466 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gjs-1.41.91/NEWS new/gjs-1.42.0/NEWS --- old/gjs-1.41.91/NEWS 2014-09-01 23:38:04.000000000 +0200 +++ new/gjs-1.42.0/NEWS 2014-09-29 12:43:41.000000000 +0200 @@ -1,3 +1,8 @@ +Version 1.42.0 +-------------- + +- Fix a regression caused by PPC fixes in 1.41.91 + Version 1.41.91 --------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gjs-1.41.91/configure.ac new/gjs-1.42.0/configure.ac --- old/gjs-1.41.91/configure.ac 2014-09-01 23:41:23.000000000 +0200 +++ new/gjs-1.42.0/configure.ac 2014-09-29 12:39:34.000000000 +0200 @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. m4_define(pkg_major_version, 1) -m4_define(pkg_minor_version, 41) -m4_define(pkg_micro_version, 91) +m4_define(pkg_minor_version, 42) +m4_define(pkg_micro_version, 0) m4_define(pkg_version, pkg_major_version.pkg_minor_version.pkg_micro_version) m4_define(pkg_int_version, (pkg_major_version * 100 + pkg_minor_version) * 100 + pkg_micro_version) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gjs-1.41.91/gjs/importer.cpp new/gjs-1.42.0/gjs/importer.cpp --- old/gjs-1.41.91/gjs/importer.cpp 2014-09-01 23:34:02.000000000 +0200 +++ new/gjs-1.42.0/gjs/importer.cpp 2014-09-29 12:39:07.000000000 +0200 @@ -809,9 +809,10 @@ &element_val)) return JS_FALSE; - jsid id = idp; + jsid id; if (!JS_ValueToId(context, element_val, &id)) return JS_FALSE; + idp.set(id); break; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-control-center for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package gnome-control-center for openSUSE:Factory checked in at 2014-10-05 20:28:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-control-center (Old) and /work/SRC/openSUSE:Factory/.gnome-control-center.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-control-center" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-control-center/gnome-control-center.changes 2014-09-30 19:41:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-control-center.new/gnome-control-center.changes 2014-10-05 20:28:01.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Sep 30 11:30:07 UTC 2014 - dimstar(a)opensuse.org + +- Update gnome-control-center-allow-extra-tools-in-shell.patch: + dconf-editor.desktop was renamed to + ca.desrt.dconf-editor.desktop. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-control-center-allow-extra-tools-in-shell.patch ++++++ --- /var/tmp/diff_new_pack.JAJr16/_old 2014-10-05 20:28:02.000000000 +0200 +++ /var/tmp/diff_new_pack.JAJr16/_new 2014-10-05 20:28:02.000000000 +0200 @@ -66,7 +66,7 @@ - PANEL_TYPE("wacom", cc_wacom_panel_get_type ), + PANEL_TYPE("wacom", cc_wacom_panel_get_type ), #endif -+ PANEL_TYPE("dconf-editor", NULL ), ++ PANEL_TYPE("ca.desrt.dconf-editor", NULL ), + PANEL_TYPE("alacarte", NULL ), + PANEL_TYPE("gpk-prefs", NULL ), + PANEL_TYPE("tracker-preferences", NULL ), -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-packagekit for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package gnome-packagekit for openSUSE:Factory checked in at 2014-10-05 20:27:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-packagekit (Old) and /work/SRC/openSUSE:Factory/.gnome-packagekit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-packagekit" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-packagekit/gnome-packagekit.changes 2014-09-30 19:39:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-packagekit.new/gnome-packagekit.changes 2014-10-05 20:28:00.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 30 11:52:52 UTC 2014 - dimstar(a)opensuse.org + +- Add gpk-prefs to category X-GNOME-SystemSettings so it shows up + in gnome-control-center. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-packagekit.spec ++++++ --- /var/tmp/diff_new_pack.EWxTYy/_old 2014-10-05 20:28:01.000000000 +0200 +++ /var/tmp/diff_new_pack.EWxTYy/_new 2014-10-05 20:28:01.000000000 +0200 @@ -98,7 +98,7 @@ %suse_update_desktop_file gpk-dbus-service %suse_update_desktop_file gpk-install-local-file %suse_update_desktop_file gpk-log Settings -%suse_update_desktop_file gpk-prefs +%suse_update_desktop_file gpk-prefs X-GNOME-SystemSettings %suse_update_desktop_file gpk-update-viewer %clean -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-ldap for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package yast2-ldap for openSUSE:Factory checked in at 2014-10-05 20:27:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-ldap (Old) and /work/SRC/openSUSE:Factory/.yast2-ldap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-ldap" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-ldap/yast2-ldap.changes 2014-08-08 10:10:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-ldap.new/yast2-ldap.changes 2014-10-05 20:27:29.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Sep 25 10:21:52 UTC 2014 - varkoly(a)suse.com + +- bnc#897997 YaST2 User authentication not enumerating LDAP options +- 3.1.13 + +------------------------------------------------------------------- Old: ---- yast2-ldap-3.1.12.tar.bz2 New: ---- yast2-ldap-3.1.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ldap.spec ++++++ --- /var/tmp/diff_new_pack.b1FL5c/_old 2014-10-05 20:27:30.000000000 +0200 +++ /var/tmp/diff_new_pack.b1FL5c/_new 2014-10-05 20:27:30.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-ldap -Version: 3.1.12 +Version: 3.1.13 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -59,6 +59,8 @@ %{yast_moduledir}/* %{yast_clientdir}/* %{yast_scrconfdir}/*.scr +%dir %{yast_yncludedir}/ldap/ +%{yast_yncludedir}/ldap/* %{yast_plugindir}/libpy2ag_ldap.so.* %{yast_plugindir}/libpy2ag_ldap.so %{yast_plugindir}/libpy2ag_ldap.la ++++++ yast2-ldap-3.1.12.tar.bz2 -> yast2-ldap-3.1.13.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-3.1.12/MAINTAINER new/yast2-ldap-3.1.13/MAINTAINER --- old/yast2-ldap-3.1.12/MAINTAINER 2014-08-06 09:57:44.000000000 +0200 +++ new/yast2-ldap-3.1.13/MAINTAINER 2014-10-01 11:24:56.000000000 +0200 @@ -1 +1 @@ -Peter Varkoly <varkoly(a)suse.com> +Deprecated file. Use `osc maintainer yast2-ldap` instead. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-3.1.12/package/yast2-ldap.changes new/yast2-ldap-3.1.13/package/yast2-ldap.changes --- old/yast2-ldap-3.1.12/package/yast2-ldap.changes 2014-08-06 09:57:44.000000000 +0200 +++ new/yast2-ldap-3.1.13/package/yast2-ldap.changes 2014-10-01 12:20:54.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Sep 25 10:21:52 UTC 2014 - varkoly(a)suse.com + +- bnc#897997 YaST2 User authentication not enumerating LDAP options +- 3.1.13 + +------------------------------------------------------------------- Tue Aug 5 13:02:04 UTC 2014 - varkoly(a)suse.com - Set member_attribute to 'member'. We only use rfc2307bis.schema diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-3.1.12/package/yast2-ldap.spec new/yast2-ldap-3.1.13/package/yast2-ldap.spec --- old/yast2-ldap-3.1.12/package/yast2-ldap.spec 2014-08-06 09:57:44.000000000 +0200 +++ new/yast2-ldap-3.1.13/package/yast2-ldap.spec 2014-10-01 12:20:54.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-ldap -Version: 3.1.12 +Version: 3.1.13 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -52,6 +52,8 @@ %{yast_moduledir}/* %{yast_clientdir}/* %{yast_scrconfdir}/*.scr +%dir %{yast_yncludedir}/ldap/ +%{yast_yncludedir}/ldap/* %{yast_plugindir}/libpy2ag_ldap.so.* %{yast_plugindir}/libpy2ag_ldap.so %{yast_plugindir}/libpy2ag_ldap.la diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-3.1.12/src/Ldap.rb new/yast2-ldap-3.1.13/src/Ldap.rb --- old/yast2-ldap-3.1.12/src/Ldap.rb 2014-08-06 09:57:44.000000000 +0200 +++ new/yast2-ldap-3.1.13/src/Ldap.rb 2014-10-01 12:20:54.000000000 +0200 @@ -1410,6 +1410,89 @@ deep_copy(@groups_dn) end + # Check if given DN exist and if it points to some template + # @param [String] dn + # @return [Hash,nil] empty map if DN don't exist, template map if DN points + # to template object, nil if object with given DN is not template + def CheckTemplateDN(dn) + object = GetLDAPEntry(dn) + return object if object.nil? || object == {} + cls = Builtins.maplist(Ops.get_list(object, "objectClass", [])) do |c| + Builtins.tolower(c) + end + if Builtins.contains(cls, "suseobjecttemplate") + # exists as a template -> return object + object = ConvertDefaultValues(object) + Ops.set(object, "modified", "edited") + return AddMissingAttributes(object) + else + # error message + Popup.Error( + _( + "An object with the selected DN exists, but it is not a template object.\nSelect another one.\n" + ) + ) + return nil + end + end + + # Save the edited map of configuration modules to global map + def CommitConfigModules(modules) + modules = deep_copy(modules) + Builtins.foreach( + Convert.convert(modules, :from => "map", :to => "map <string, map>") + ) do |dn, modmap| + if !Builtins.haskey(@config_modules, dn) + Ops.set(@config_modules, dn, Builtins.eval(modmap)) + @ldap_modified = true + next + end + # 'val' can be list (most time), map (default_values), string + Builtins.foreach( + Convert.convert(modmap, :from => "map", :to => "map <string, any>") + ) do |attr, val| + if Ops.get(@config_modules, [dn, attr]) != val + Ops.set(@config_modules, [dn, attr], val) + if !Builtins.haskey(modmap, "modified") + Ops.set(@config_modules, [dn, "modified"], "edited") + end + @ldap_modified = true + Builtins.y2debug("modified value: %1", val) + end + end + end + true + end + + # Save the edited map of templates to global map + def CommitTemplates(templs) + templs = deep_copy(templs) + Builtins.foreach( + Convert.convert(templs, :from => "map", :to => "map <string, map>") + ) do |dn, template| + if !Builtins.haskey(@templates, dn) + # dn changed + Ops.set(@templates, dn, Builtins.eval(template)) + @ldap_modified = true + next + end + # 'val' can be list (most time), map (default_values), string + Builtins.foreach( + Convert.convert(template, :from => "map", :to => "map <string, any>") + ) do |attr, val| + if Ops.get(@templates, [dn, attr]) != val + Ops.set(@templates, [dn, attr], val) + if !Builtins.haskey(template, "modified") + Ops.set(@templates, [dn, "modified"], "edited") + end + @ldap_modified = true + Builtins.y2debug("modified value: %1", val) + end + end + end + true + end + # Writes map of objects to LDAP # @param [Hash] objects map of objects to write. It is in the form: # $[ DN: (map) attribute_values] @@ -1848,6 +1931,9 @@ publish :function => :GetDefaultObjectClasses, :type => "list (map)" publish :function => :ReadDN, :type => "list <string> (string, string)" publish :function => :GetGroupsDN, :type => "list (string)" + publish :function => :CheckTemplateDN, :type => "map (string)" + publish :function => :CommitConfigModules, :type => "boolean (map)" + publish :function => :CommitTemplates, :type => "boolean (map)" publish :function => :WriteToLDAP, :type => "map (map)" publish :function => :WriteLDAP, :type => "boolean (map)" publish :function => :WritePlusLine, :type => "boolean (boolean)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-3.1.12/src/Makefile.am new/yast2-ldap-3.1.13/src/Makefile.am --- old/yast2-ldap-3.1.12/src/Makefile.am 2014-08-06 09:57:45.000000000 +0200 +++ new/yast2-ldap-3.1.13/src/Makefile.am 2014-10-01 12:20:54.000000000 +0200 @@ -26,10 +26,17 @@ module_DATA = \ LdapServerAccess.pm \ - LdapPopup.rb Ldap.rb + LdapPopup.rb \ + Ldap.rb client_DATA = \ - ldap_browser.rb + ldap_browser.rb \ + ldap_config.rb -EXTRA_DIST = $(module_DATA) $(client_DATA) +yncludedir = @yncludedir@/ldap +ynclude_DATA = \ + routines.rb \ + ui.rb + +EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-3.1.12/src/ldap_config.rb new/yast2-ldap-3.1.13/src/ldap_config.rb --- old/yast2-ldap-3.1.12/src/ldap_config.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-ldap-3.1.13/src/ldap_config.rb 2014-10-01 12:20:54.000000000 +0200 @@ -0,0 +1,65 @@ +# encoding: utf-8 + +# ------------------------------------------------------------------------------ +# Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. +# +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of version 2 of the GNU General Public License as published by the +# Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, contact Novell, Inc. +# +# To contact Novell about this file by physical or electronic mail, you may find +# current contact information at www.novell.com. +# ------------------------------------------------------------------------------ + +# File: clients/ldap.ycp +# Module: Configuration of LDAP client +# Summary: Manage the configuration stored in LDAP directory +# (e.g. user/group templates) +# Authors: Jiri Suchomel <jsuchome(a)suse.cz> +# +# $Id$ +module Yast + class LdapConfigClient < Client + def main + Yast.import "UI" + Yast.import "Ldap" + Yast.import "Wizard" + + Yast.include self, "ldap/ui.rb" + + @param = "" + # Check arguments + if Ops.greater_than(Builtins.size(WFM.Args), 0) && + Ops.is_string?(WFM.Args(0)) + @param = Convert.to_string(WFM.Args(0)) + end + Builtins.y2debug("param=%1", @param) + + @ret = LDAPReadDialog() + return deep_copy(@ret) if @ret != :next + + Wizard.CreateDialog + Wizard.SetDesktopTitleAndIcon("ldap") + + @ret = ModuleConfigurationDialog() + + if @ret == :next && Ldap.ldap_modified + Ldap.WriteLDAP(Ldap.templates) if Ldap.WriteLDAP(Ldap.config_modules) + end + + Wizard.CloseDialog + + deep_copy(@ret) + end + end +end + +Yast::LdapConfigClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-3.1.12/src/routines.rb new/yast2-ldap-3.1.13/src/routines.rb --- old/yast2-ldap-3.1.12/src/routines.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-ldap-3.1.13/src/routines.rb 2014-10-01 12:20:54.000000000 +0200 @@ -0,0 +1,81 @@ +# encoding: utf-8 + +# ------------------------------------------------------------------------------ +# Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. +# +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of version 2 of the GNU General Public License as published by the +# Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, contact Novell, Inc. +# +# To contact Novell about this file by physical or electronic mail, you may find +# current contact information at www.novell.com. +# ------------------------------------------------------------------------------ + +# File: include/ldap/routines.ycp +# Package: Configuration of LDAP +# Summary: Helper routines for string manupulations +# Authors: Jiri Suchomel <jsuchome(a)suse.cz> +# +# $Id$ +# +module Yast + module LdapRoutinesInclude + def initialize_ldap_routines(include_target) + textdomain "ldap-client" + + Yast.import "Ldap" + end + + # Get RDN (relative distinguished name) from dn + def get_rdn(dn) + dn_list = Builtins.splitstring(dn, ",") + Ops.get_string(dn_list, 0, dn) + end + + # Get first value from dn (don't have to be "cn") + def get_cn(dn) + rdn = get_rdn(dn) + Builtins.issubstring(rdn, "=") ? + Builtins.substring(rdn, Ops.add(Builtins.search(rdn, "="), 1)) : + rdn + end + + # Create DN from cn by adding base config DN + # (Can't work in general cases!) + def get_dn(cn) + Builtins.sformat("cn=%1,%2", cn, Ldap.base_config_dn) + end + + # Create new DN from DN by changing leading cn value + # (Can't work in general cases!) + def get_new_dn(cn, dn) + Builtins.tolower( + Builtins.sformat( + "cn=%1%2", + cn, + Builtins.issubstring(dn, ",") ? + Builtins.substring(dn, Builtins.search(dn, ",")) : + "" + ) + ) + end + + # Get string value of attribute from map. + # (Generaly, it is supposed to be list or string.) + def get_string(object, attr) + object = deep_copy(object) + if Ops.is_list?(Ops.get(object, attr)) + return Ops.get_string(object, [attr, 0], "") + end + Ops.get_string(object, attr, "") + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-3.1.12/src/ui.rb new/yast2-ldap-3.1.13/src/ui.rb --- old/yast2-ldap-3.1.12/src/ui.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-ldap-3.1.13/src/ui.rb 2014-10-01 12:20:54.000000000 +0200 @@ -0,0 +1,815 @@ +# encoding: utf-8 + +# ------------------------------------------------------------------------------ +# Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. +# +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of version 2 of the GNU General Public License as published by the +# Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, contact Novell, Inc. +# +# To contact Novell about this file by physical or electronic mail, you may find +# current contact information at www.novell.com. +# ------------------------------------------------------------------------------ + +# File: include/ldap/ui.ycp +# Package: Configuration of LDAP +# Summary: User interface functions. +# Authors: Thorsten Kukuk <kukuk(a)suse.de> +# Anas Nashif <nashif(a)suse.de> +# +# $Id$ +# +# All user interface functions. +module Yast + module LdapUiInclude + def initialize_ldap_ui(include_target) + Yast.import "UI" + textdomain "ldap-client" + + Yast.import "Address" + Yast.import "Autologin" + Yast.import "Directory" + Yast.import "FileUtils" + Yast.import "Label" + Yast.import "Ldap" + Yast.import "LdapPopup" + Yast.import "Message" + Yast.import "Mode" + Yast.import "Package" + Yast.import "Pam" + Yast.import "Popup" + Yast.import "Report" + Yast.import "Service" + Yast.import "SLPAPI" + Yast.import "Stage" + Yast.import "Wizard" + + Yast.include include_target, "ldap/routines.rb" + end + + def Modified + Ldap.modified || Ldap.ldap_modified + end + + # The dialog that appears when the [Abort] button is pressed. + # @return `abort if user really wants to abort, `back otherwise + def ReallyAbort + ret = Modified() || Stage.cont ? Popup.ReallyAbort(true) : true + + if ret + return :abort + else + return :back + end + end + + # Read settings dialog + # @return `abort if aborted and `next otherwise + def ReadDialog + ret = Ldap.Read + ret ? :next : :abort + end + + # Write settings dialog + # @return `next + def WriteDialog + # popup text + abort = lambda do + if UI.PollInput == :abort && + # popup text + Popup.YesNo(_("Really abort the writing process?")) + next true + end + false + end + + if Modified() + # help text + Wizard.RestoreHelp(_("Writing LDAP Client Settings")) + return Ldap.Write(abort) + end + :next + end + + # Initialize connection to LDAP server, bind and read the settings. + # Everything is done before entering the Module Configuration Dialog. + def LDAPReadDialog + msg = "" + read_now = false + + if !Ldap.bound || Modified() + if !Ldap.bound || Ldap.modified + # re-init/re-bind only when server information was changed (#39908) + if !Ldap.bound || Ldap.old_server != Ldap.server || Ldap.BaseDNChanged + msg = Ldap.LDAPInitWithTLSCheck({}) + if msg != "" + Ldap.LDAPErrorMessage("init", msg) + return :back + end + end + + if !Ldap.bound || Ldap.old_server != Ldap.server + # Ldap::bind_pass might exist from server proposal... + if Stage.cont && Ldap.bind_pass != nil + msg = Ldap.LDAPBind(Ldap.bind_pass) + if msg != "" + Ldap.LDAPErrorMessage("bind", msg) + Ldap.bind_pass = Ldap.LDAPAskAndBind(true) + end + else + Ldap.bind_pass = Ldap.LDAPAskAndBind(true) + end + return :back if Ldap.bind_pass == nil + + read_now = true + + msg = Ldap.InitSchema + Ldap.LDAPErrorMessage("schema", msg) if msg != "" + end + end + return :back if !Ldap.CheckBaseConfig(Ldap.base_config_dn) + if read_now || Ldap.modified && !Ldap.ldap_modified || + Ldap.ldap_modified && + Popup.AnyQuestion( + Popup.NoHeadline, + # yes/no popup + _( + "If you reread settings from the server,\nall changes will be lost. Really reread?\n" + ), + Label.YesButton, + Label.NoButton, + :focus_no + ) + msg = Ldap.ReadConfigModules + Ldap.LDAPErrorMessage("read", msg) if msg != "" + + msg = Ldap.ReadTemplates + Ldap.LDAPErrorMessage("read", msg) if msg != "" + + Ldap.ldap_modified = false + end + Ldap.bound = true + end + :next + end + + # Dialog for configuration one object template + def TemplateConfigurationDialog(templ) + templ = deep_copy(templ) + # help text 1/3 + help_text = _( + "Configure the template used for creating \nnew objects (like users or groups).\n" + ) + + # help text 2/3 + _( + "Edit the template attribute values with Edit.\nChanging the cn value renames the template.\n" + ) + + # help text 3/3 + _( + "The second table contains a list of default values used\n" + + "for new objects. Modify the list by adding new values, editing or\n" + + "removing current ones.\n" + ) + + template_dn = Ldap.current_template_dn + + table_items = [] + template = Convert.convert( + Builtins.eval(templ), + :from => "map", + :to => "map <string, any>" + ) + + # helper function converting list value to string + to_table = lambda do |attr, val| + val = deep_copy(val) + if Ldap.SingleValued(attr) || attr == "cn" + return Ops.get(val, 0, "") + elsif Builtins.contains( + ["susesecondarygroup", "susedefaulttemplate"], + Builtins.tolower(attr) + ) + return Builtins.mergestring(val, " ") + else + return Builtins.mergestring(val, ",") + end + end + + Builtins.foreach(template) do |attr, value| + val = deep_copy(value) + # do not show internal attributes + if Builtins.contains( + [ + "susedefaultvalue", + "default_values", + "objectclass", + "modified", + "old_dn" + ], + Builtins.tolower(attr) + ) + next + end + if Ops.is_list?(value) + val = to_table.call( + attr, + Convert.convert(val, :from => "any", :to => "list <string>") + ) + end + table_items = Builtins.add(table_items, Item(Id(attr), attr, val)) + end + + default_items = [] + default_values = Ops.get_map(template, "default_values", {}) + Builtins.foreach(default_values) do |attr, value| + default_items = Builtins.add(default_items, Item(Id(attr), attr, value)) + end + + contents = HBox( + HSpacing(1.5), + VBox( + VSpacing(0.5), + Table( + Id(:table), + Opt(:notify), + Header( + # table header 1/2 + _("Attribute"), + # table header 2/2 + _("Value") + ), + table_items + ), + HBox(PushButton(Id(:edit), Label.EditButton), HStretch()), + # label (table folows) + Left(Label(_("Default Values for New Objects"))), + Table( + Id(:defaults), + Opt(:notify), + Header( + # table header 1/2 + _("Attribute of Object"), + # table header 2/2 + _("Default Value") + ), + default_items + ), + HBox( + # button label (with non-default shortcut) + PushButton(Id(:add_dfl), Opt(:key_F3), _("A&dd")), + # button label + PushButton(Id(:edit_dfl), Opt(:key_F4), _("&Edit")), + PushButton(Id(:delete_dfl), Opt(:key_F5), Label.DeleteButton), + HStretch() + ), + VSpacing(0.5) + ), + HSpacing(1.5) + ) + + Wizard.OpenNextBackDialog + # dialog label + Wizard.SetContentsButtons( + _("Object Template Configuration"), + contents, + help_text, + Label.CancelButton, + Label.OKButton + ) + Wizard.HideAbortButton + + UI.SetFocus(Id(:table)) if Ops.greater_than(Builtins.size(table_items), 0) + UI.ChangeWidget(Id(:edit_dfl), :Enabled, default_items != []) + UI.ChangeWidget(Id(:delete_dfl), :Enabled, default_items != []) + + result = nil + while true + result = UI.UserInput + attr = Convert.to_string(UI.QueryWidget(Id(:table), :CurrentItem)) + + # edit attribute + if result == :edit || result == :table + next if attr == nil + value = Ops.get_list(template, attr, []) + offer = [] + conflicts = [] + if Builtins.tolower(attr) == "susesecondarygroup" + offer = Ldap.GetGroupsDN(Ldap.GetBaseDN) + end + if Builtins.tolower(attr) == "susenamingattribute" + classes = Ldap.GetDefaultObjectClasses(template) + offer = Ldap.GetObjectAttributes(classes) + end + if attr == "cn" + base = Builtins.issubstring(template_dn, ",") ? + Builtins.substring( + template_dn, + Ops.add(Builtins.search(template_dn, ","), 1) + ) : + "" + Builtins.foreach(Ldap.ReadDN(base, "")) do |dn| + if Builtins.substring(dn, 0, 3) == "cn=" + conflicts = Builtins.add(conflicts, get_cn(dn)) + end + end + end + value = LdapPopup.EditAttribute( + { + "attr" => attr, + "value" => value, + "conflicts" => conflicts, + "single" => Ldap.SingleValued(attr) || attr == "cn", + "offer" => offer, + "browse" => Builtins.tolower(attr) == "susesecondarygroup" + } + ) + + next if value == Ops.get_list(template, attr, []) + UI.ChangeWidget( + Id(:table), + term(:Item, attr, 1), + to_table.call(attr, value) + ) + Ops.set(template, attr, value) + end + # add default value + if result == :add_dfl + conflicts = Builtins.maplist(default_values) { |attr3, val| attr3 } + classes = Ldap.GetDefaultObjectClasses(template) + available = Ldap.GetObjectAttributes(classes) + # filter out objectclass + dfl = LdapPopup.AddDefaultValue( + Builtins.sort(available), + Builtins.add(conflicts, "objectClass") + ) + next if Ops.get_string(dfl, "value", "") == "" + attr2 = Ops.get_string(dfl, "attr", "") + Ops.set(default_values, attr2, Ops.get_string(dfl, "value", "")) + default_items = Builtins.add( + default_items, + Item(Id(attr2), attr2, Ops.get_string(dfl, "value", "")) + ) + UI.ChangeWidget(Id(:defaults), :Items, default_items) + UI.ChangeWidget(Id(:edit_dfl), :Enabled, default_items != []) + UI.ChangeWidget(Id(:delete_dfl), :Enabled, default_items != []) + end + # edit default value + if result == :edit_dfl || result == :defaults + attr = Convert.to_string(UI.QueryWidget(Id(:defaults), :CurrentItem)) + next if attr == nil + value = Ops.get(default_values, attr, "") + l_value = LdapPopup.EditAttribute( + { "attr" => attr, "value" => [value], "single" => true } + ) + next if Ops.get_string(l_value, 0, "") == value + value = Ops.get_string(l_value, 0, "") + UI.ChangeWidget(Id(:defaults), term(:Item, attr, 1), value) + Ops.set(default_values, attr, value) + end + # delete default value + if result == :delete_dfl + attr = Convert.to_string(UI.QueryWidget(Id(:defaults), :CurrentItem)) + next if attr == nil + # yes/no popup, %1 is name + if !Popup.YesNo( + Builtins.sformat( + _("Really delete default attribute \"%1\"?"), + attr + ) + ) + next + end + default_values = Builtins.remove(default_values, attr) + default_items = Builtins.filter(default_items) do |it| + Ops.get_string(it, 1, "") != attr + end + UI.ChangeWidget(Id(:defaults), :Items, default_items) + UI.ChangeWidget(Id(:edit_dfl), :Enabled, default_items != []) + UI.ChangeWidget(Id(:delete_dfl), :Enabled, default_items != []) + end + if Ops.is_symbol?(result) && + Builtins.contains( + [:back, :cancel, :abort], + Convert.to_symbol(result) + ) + break + end + if result == :next + cont = false + + # check the template required attributes... + Builtins.foreach(Ops.get_list(template, "objectClass", [])) do |oc| + next if cont + Builtins.foreach(Ldap.GetRequiredAttributes(oc)) do |attr2| + val = Ops.get(template, attr2) + if !cont && val == nil || val == [] || val == "" + #error popup, %1 is attribute name + Popup.Error( + Builtins.sformat( + _("The \"%1\" attribute is mandatory.\nEnter a value."), + attr2 + ) + ) + UI.SetFocus(Id(:table)) + cont = true + end + end + end + next if cont + Ops.set(template, "default_values", default_values) + break + end + end + Wizard.CloseDialog + deep_copy(template) + end + + # Dialog for configuration of one "configuration module" + def ModuleConfigurationDialog + # helptext 1/4 + help_text = _( + "Manage the configuration stored in the LDAP directory." + ) + + # helptext 2/4 + _( + "Each configuration set is called a \"configuration module.\" If there\n" + + "is no configuration module in the provided location (base configuration),\n" + + "create one with New. Delete the current module\n" + + "using Delete.\n" + ) + + # helptext 3/4 + _( + "Edit the values of attributes in the table with Edit.\n" + + "Some values have special meanings, for example, changing the cn value renames the\n" + + "current module.\n" + ) + + # helptext 4/4 + _( + "To configure the default template of the current module,\n" + + "click Configure Template.\n" + + "\n" + ) + + current_dn = Ldap.current_module_dn + modules_attrs_items = {} # map of list (table items), index is cn + modules = Convert.convert( + Ldap.GetConfigModules, + :from => "map", + :to => "map <string, map <string, any>>" + ) + templates = Convert.convert( + Ldap.GetTemplates, + :from => "map", + :to => "map <string, map <string, any>>" + ) + names = [] + templates_dns = Builtins.maplist(templates) { |dn, t| dn } + + # Helper for creating table items in ModuleConfiguration Dialog + create_attrs_items = lambda do |cn| + attrs_items = [] + dn = get_dn(cn) + dn = Builtins.tolower(dn) if !Builtins.haskey(modules, dn) + Builtins.foreach(Ops.get(modules, dn, {})) do |attr, value| + val = deep_copy(value) + if Builtins.contains( + ["objectclass", "modified", "old_dn"], + Builtins.tolower(attr) + ) + next + end + if Ops.is_list?(value) + lvalue = Convert.to_list(value) + if Ldap.SingleValued(attr) || attr == "cn" + val = Ops.get_string(lvalue, 0, "") + else + val = Builtins.mergestring( + Convert.convert(value, :from => "any", :to => "list <string>"), + "," + ) + end + end + attrs_items = Builtins.add(attrs_items, Item(Id(attr), attr, val)) + end + + deep_copy(attrs_items) + end + + Builtins.foreach(modules) do |dn, mod| + cn = get_string(mod, "cn") + next if cn == "" + names = Builtins.add(names, cn) + # attributes for table + Ops.set(modules_attrs_items, cn, create_attrs_items.call(cn)) + current_dn = dn if current_dn == "" + end + current_cn = Ops.get_string(modules, [current_dn, "cn", 0]) do + get_cn(current_dn) + end + + # Helper for updating widgets in ModuleConfiguration Dialog + replace_module_names = lambda do + modules_items = [] # list of module names + Builtins.foreach(names) do |cn| + if Builtins.tolower(cn) == Builtins.tolower(current_cn) + modules_items = Builtins.add(modules_items, Item(Id(cn), cn, true)) + else + modules_items = Builtins.add(modules_items, Item(Id(cn), cn)) + end + end + UI.ReplaceWidget( + Id(:rp_modnames), + Left( + ComboBox( + Id(:modules), + Opt(:notify), + # combobox label + _("Configuration &Module"), + modules_items + ) + ) + ) + ena = names != [] + UI.ChangeWidget(Id(:delete), :Enabled, ena) + UI.ChangeWidget(Id(:edit), :Enabled, ena) + UI.ChangeWidget(Id(:modules), :Enabled, ena) + + nil + end + + # Helper for updating widgets in ModuleConfiguration Dialog + replace_templates_items = lambda do + items = Builtins.maplist( + Ops.get_list(modules, [current_dn, "suseDefaultTemplate"], []) + ) { |dn| Item(Id(dn), dn) } + UI.ReplaceWidget( + Id(:rp_templs), + PushButton( + Id(:templ_pb), + Opt(:key_F7), + # button label + _("C&onfigure Template") + ) + ) + UI.ChangeWidget(Id(:templ_pb), :Enabled, items != []) + + nil + end + + contents = HBox( + HSpacing(1.5), + VBox( + VSpacing(0.5), + HBox( + ReplacePoint(Id(:rp_modnames), Empty()) + ), + VSpacing(0.5), + Table( + Id(:table), + Opt(:notify), + Header( + # table header 1/2 + _("Attribute"), + # table header 2/2 + _("Value") + ), + Ops.get_list(modules_attrs_items, current_cn, []) + ), + HBox( + PushButton(Id(:edit), Opt(:key_F4), Label.EditButton), + HStretch(), + ReplacePoint(Id(:rp_templs), Empty()) + ), + VSpacing(0.5) + ), + HSpacing(1.5) + ) + + # dialog label + Wizard.SetContentsButtons( + _("Module Configuration"), + contents, + help_text, + Label.CancelButton, + Label.OKButton + ) + Wizard.HideAbortButton + + if Ops.greater_than( + Builtins.size(Ops.get_list(modules_attrs_items, current_cn, [])), + 0 + ) + UI.SetFocus(Id(:table)) + end + replace_templates_items.call + replace_module_names.call + + # result could be symbol or string + result = nil + while true + result = UI.UserInput + attr = Convert.to_string(UI.QueryWidget(Id(:table), :CurrentItem)) + + # check the correctness of entry + if Builtins.contains( + Ops.get_list(modules, [current_dn, "suseDefaultTemplate"], []), + result + ) || + result == :next || + result == :modules + Builtins.foreach( + Ops.get_list(modules, [current_dn, "objectClass"], []) + ) { |oc| Builtins.foreach(Ldap.GetRequiredAttributes(oc)) do |attr2| + val = Ops.get(modules, [current_dn, attr2]) + if val == nil || val == [] || val == "" + #error popup, %1 is attribute name + Popup.Error( + Builtins.sformat( + _("The \"%1\" attribute is mandatory.\nEnter a value."), + attr2 + ) + ) + UI.SetFocus(Id(:table)) + result = :notnext + next + end + end } + end + # change the focus to new module + if result == :modules + current_cn = Convert.to_string(UI.QueryWidget(Id(:modules), :Value)) + current_dn = get_dn(current_cn) + if !Builtins.haskey(modules, current_dn) + current_dn = Builtins.tolower(current_dn) + end + UI.ChangeWidget( + Id(:table), + :Items, + Ops.get_list(modules_attrs_items, current_cn, []) + ) + replace_templates_items.call + end + + # module attribute modification + if result == :edit || result == :table + next if attr == nil + value = Ops.get_list(modules, [current_dn, attr], []) + offer = [] + conflicts = [] + conflicts = deep_copy(names) if attr == "cn" + if Builtins.tolower(attr) == "susedefaulttemplate" + offer = deep_copy(templates_dns) + elsif Builtins.tolower(attr) == "susepasswordhash" + offer = deep_copy(Ldap.hash_schemas) + end + + value = LdapPopup.EditAttribute( + { + "attr" => attr, + "value" => value, + "conflicts" => conflicts, + "single" => Ldap.SingleValued(attr) || attr == "cn", + "offer" => offer, + "browse" => + # TODO function, that checks if value should be DN + Builtins.tolower(attr) == "susedefaultbase" || + Builtins.tolower(attr) == "susedefaulttemplate" + } + ) + + if value == Ops.get_list(modules, [current_dn, attr], []) #nothing was changed + next + end + Ops.set(modules, [current_dn, attr], value) + Ops.set( + modules_attrs_items, + current_cn, + create_attrs_items.call(current_cn) + ) + UI.ChangeWidget( + Id(:table), + :Items, + Ops.get_list(modules_attrs_items, current_cn, []) + ) + UI.ChangeWidget(Id(:table), :CurrentItem, attr) + if attr == "cn" && value != [] + cn = Ops.get(value, 0, current_cn) + Ops.set( + modules_attrs_items, + cn, + Ops.get_list(modules_attrs_items, current_cn, []) + ) + modules_attrs_items = Builtins.remove( + modules_attrs_items, + current_cn + ) + if Ops.get_string(modules, [current_dn, "modified"], "") != "added" && + Ops.get_string(modules, [current_dn, "modified"], "") != "renamed" + Ops.set(modules, [current_dn, "modified"], "renamed") + Ops.set(modules, [current_dn, "old_dn"], current_dn) + end + Ops.set(modules, get_dn(cn), Ops.get(modules, current_dn, {})) + if Builtins.tolower(get_dn(cn)) != Builtins.tolower(current_dn) + modules = Builtins.remove(modules, current_dn) + end + names = Builtins.filter(names) { |n| n != current_cn } + names = Builtins.add(names, cn) + current_cn = cn + current_dn = get_dn(cn) + replace_module_names.call + end + if Builtins.tolower(attr) == "susedefaulttemplate" + replace_templates_items.call + end + end + # configure template + if result == :templ_pb + template_dn = Ops.get_string( + modules, + [current_dn, "suseDefaultTemplate", 0], + "" + ) + Ldap.current_template_dn = template_dn + template = Builtins.eval(Ops.get(templates, template_dn, {})) + # template not loaded, check DN: + if template == {} + template = Ldap.CheckTemplateDN(template_dn) + if template == nil + next + elsif template == {} + next if !Ldap.ParentExists(template_dn) + template = Ldap.CreateTemplate( + get_cn(template_dn), + Ops.get_list(modules, [current_dn, "objectClass"], []) + ) + end + templates_dns = Builtins.add(templates_dns, template_dn) + end + Ops.set(templates, template_dn, TemplateConfigurationDialog(template)) + # check for template renaming + if Ops.get_list(templates, [template_dn, "cn"], []) != + Ops.get_list(template, "cn", []) + cn = get_string(Ops.get(templates, template_dn, {}), "cn") + new_dn = get_new_dn(cn, template_dn) + + Ops.set(templates, new_dn, Ops.get(templates, template_dn, {})) + if new_dn != template_dn + templates = Builtins.remove(templates, template_dn) + end + if Ops.get_string(templates, [new_dn, "modified"], "") != "added" + Ops.set(templates, [new_dn, "modified"], "renamed") + Ops.set(templates, [new_dn, "old_dn"], template_dn) + end + templates_dns = Builtins.filter(templates_dns) do |dn| + dn != template_dn + end + templates_dns = Builtins.add(templates_dns, new_dn) + # update list of templates + Ops.set( + modules, + [current_dn, "suseDefaultTemplate"], + Builtins.maplist( + Ops.get_list(modules, [current_dn, "suseDefaultTemplate"], []) + ) do |dn| + next new_dn if dn == template_dn + dn + end + ) + Ops.set( + modules_attrs_items, + current_cn, + create_attrs_items.call(current_cn) + ) + UI.ChangeWidget( + Id(:table), + :Items, + Ops.get_list(modules_attrs_items, current_cn, []) + ) + replace_templates_items.call + end + UI.SetFocus(Id(:table)) + end + if result == :next + Ldap.current_module_dn = current_dn + # save the edited values to global map... + Ldap.CommitConfigModules(modules) + # commit templates here! + Ldap.CommitTemplates(templates) + break + end + result = :not_next if result == :cancel && ReallyAbort() != :abort + break if result == :back || result == :cancel + end + + Convert.to_symbol(result) + end + end +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 yast2-bootloader for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2014-10-05 20:27:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-bootloader" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2014-09-07 11:09:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2014-10-05 20:27:28.000000000 +0200 @@ -1,0 +2,71 @@ +Tue Sep 30 09:30:52 UTC 2014 - jreidinger(a)suse.com + +- use short product name to avoid truncated text on small + resolution (bnc#873675) +- Avoid crash in clone_system on s390 (bnc#897399) +- propose missing attributes also during automatic upgrade which + propose grub2 configuratin (bnc#897058) +- 3.1.100 + +------------------------------------------------------------------- +Tue Sep 30 09:15:52 UTC 2014 - jreidinger(a)suse.com + +- move boot record backup functionality to own class to make code + easier to understand and better tested +- 3.1.99 + +------------------------------------------------------------------- +Mon Sep 29 07:42:06 UTC 2014 - jreidinger(a)suse.com + +- fix crash in lib_iface caused by typo (found by openQA and + bnc#898878) +- fix crash when using tmpfs +- fix crash when device have explicit mount by device name +- 3.1.98 + +------------------------------------------------------------------- +Thu Sep 18 07:28:13 UTC 2014 - jreidinger(a)suse.com + +- move udev mapping functionality to own class to make code easier + to understand and better tested +- 3.1.97 + +------------------------------------------------------------------- +Wed Sep 17 07:42:12 UTC 2014 - jreidinger(a)suse.com + +- pass vga mode if specified during installation + (bnc#896300,bnc#891060) + +------------------------------------------------------------------- +Mon Sep 15 14:18:20 UTC 2014 - jreidinger(a)suse.com + +- Fix API to remove or add kernel parameter for bootloader + (bnc#894603) + +------------------------------------------------------------------- +Tue Sep 9 15:38:15 UTC 2014 - jreidinger(a)suse.com + +- cleaning of section related code because we no longer support + any bootloader which allows direct write of sections + +------------------------------------------------------------------- +Mon Sep 8 14:03:36 UTC 2014 - jreidinger(a)suse.com + +- switch build tool from autotools to rake +- 3.1.96 + +------------------------------------------------------------------- +Mon Sep 8 13:26:45 UTC 2014 - jreidinger(a)suse.com + +- Drop remaining support for GRUB1 (fate#317700) +- 3.1.95 + +------------------------------------------------------------------- +Mon Sep 8 07:56:29 UTC 2014 - jreidinger(a)suse.com + +- Avoid configuration where to MBR we want grub2 and also + generic_mbr which can lead to unbootable configuration + (bnc#893626) +- 3.1.94 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-3.1.93.tar.bz2 New: ---- yast2-bootloader-3.1.100.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.SKUHvZ/_old 2014-10-05 20:27:28.000000000 +0200 +++ /var/tmp/diff_new_pack.SKUHvZ/_new 2014-10-05 20:27:28.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.93 +Version: 3.1.100 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -29,6 +29,7 @@ BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2-storage BuildRequires: rubygem(rspec) +BuildRequires: rubygem(yast-rake) PreReq: /bin/sed %fillup_prereq # Installation::*version variables # Wizard::SetDialogTitleAndIcon @@ -91,14 +92,14 @@ %prep %setup -n %{name}-%{version} -%build -%yast_build - %check -make check VERBOSE=1 +rake test:unit + +%build +yardoc %install -%yast_install +rake install DESTDIR="%{buildroot}" %post %{fillup_only -n bootloader} @@ -132,6 +133,8 @@ %dir %{yast_docdir} %doc %{yast_docdir}/COPYING +%doc %{yast_docdir}/README +%doc %{yast_docdir}/CONTRIBUTING.md %files devel-doc %defattr(-,root,root) ++++++ yast2-bootloader-3.1.93.tar.bz2 -> yast2-bootloader-3.1.100.tar.bz2 ++++++ ++++ 14378 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 libcap1 for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package libcap1 for openSUSE:Factory checked in at 2014-10-05 20:27:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libcap1 (Old) and /work/SRC/openSUSE:Factory/.libcap1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libcap1" Changes: -------- --- /work/SRC/openSUSE:Factory/libcap1/libcap1.changes 2014-09-28 19:53:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libcap1.new/libcap1.changes 2014-10-05 20:27:26.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Oct 1 07:39:56 UTC 2014 - meissner(a)suse.com + +- fixed download url, added gpg verification. + +------------------------------------------------------------------- +Fri Sep 26 18:35:17 UTC 2014 - schwab(a)linux-m68k.org + +- Update to libcap 1.97. +- Remove libcap-1.10.diff, libcap-gcc-warning-fixes.diff +- Refresh all other patches + +------------------------------------------------------------------- Old: ---- libcap-1.10.diff libcap-1.10.tar.bz2 libcap-gcc-warning-fixes.diff New: ---- libcap-1.97.tar.sign libcap-1.97.tar.xz libcap1.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcap1.spec ++++++ --- /var/tmp/diff_new_pack.4zIIyU/_old 2014-10-05 20:27:27.000000000 +0200 +++ /var/tmp/diff_new_pack.4zIIyU/_new 2014-10-05 20:27:27.000000000 +0200 @@ -16,19 +16,20 @@ # +BuildRequires: xz Name: libcap1 Summary: Library for Capabilities (linux-privs) Support License: BSD-3-Clause Group: System/Libraries -Version: 1.10 +Version: 1.97 Release: 0 -Source: ftp://ftp.de.kernel.org/pub/linux/libs/security/linux-privs/old/kernel-2.4/… -Source2: baselibs.conf -Patch: libcap-%{version}.diff -Patch2: header.patch +Source: http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap1/libcap-%{… +Source1: http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap1/libcap-%{… +Source2: %name.keyring +Source3: baselibs.conf Patch1: libcap-shlib-fix.diff +Patch2: header.patch Patch3: libcap.eal3.diff -Patch4: libcap-gcc-warning-fixes.diff Patch6: libcap-invalid-free-fix.diff Patch7: libcap-array-range-fix.diff Patch8: libcap-no-version-check.diff @@ -52,11 +53,9 @@ %prep %setup -q -n libcap-%{version} -%patch %patch1 %patch2 -%patch3 -p2 -%patch4 +%patch3 -p1 %patch6 %patch7 %patch8 ++++++ feature-tests.patch ++++++ --- /var/tmp/diff_new_pack.4zIIyU/_old 2014-10-05 20:27:27.000000000 +0200 +++ /var/tmp/diff_new_pack.4zIIyU/_new 2014-10-05 20:27:27.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libcap-1.10/doc/cap_get_proc.3 +Index: libcap-1.97/doc/cap_get_proc.3 =================================================================== ---- libcap-1.10.orig/doc/cap_get_proc.3 -+++ libcap-1.10/doc/cap_get_proc.3 +--- libcap-1.97.orig/doc/cap_get_proc.3 ++++ libcap-1.97/doc/cap_get_proc.3 @@ -15,8 +15,6 @@ arbitrary processes .br .BI "int cap_set_proc(cap_t " cap_p ); @@ -11,11 +11,11 @@ .B #include <sys/capability.h> .sp .BI "cap_t capgetp(pid_t " pid ", cap_t " cap_d ); -Index: libcap-1.10/doc/capget.2 +Index: libcap-1.97/doc/capget.2 =================================================================== ---- libcap-1.10.orig/doc/capget.2 -+++ libcap-1.10/doc/capget.2 -@@ -6,8 +6,6 @@ +--- libcap-1.97.orig/doc/capget.2 ++++ libcap-1.97/doc/capget.2 +@@ -5,8 +5,6 @@ .SH NAME capget, capset \- set/get process capabilities .SH SYNOPSIS @@ -24,11 +24,11 @@ .B #include <sys/capability.h> .sp .BI "int capget(cap_user_header_t " header ", cap_user_data_t " data ); -Index: libcap-1.10/libcap/include/sys/capability.h +Index: libcap-1.97/libcap/include/sys/capability.h =================================================================== ---- libcap-1.10.orig/libcap/include/sys/capability.h -+++ libcap-1.10/libcap/include/sys/capability.h -@@ -92,20 +92,15 @@ cap_t cap_from_text(const char *); +--- libcap-1.97.orig/libcap/include/sys/capability.h ++++ libcap-1.97/libcap/include/sys/capability.h +@@ -103,20 +103,15 @@ cap_t cap_from_text(const char *); char * cap_to_text(cap_t, ssize_t *); /* @@ -50,10 +50,10 @@ #ifdef __cplusplus } #endif -Index: libcap-1.10/progs/getpcaps.c +Index: libcap-1.97/progs/getpcaps.c =================================================================== ---- libcap-1.10.orig/progs/getpcaps.c -+++ libcap-1.10/progs/getpcaps.c +--- libcap-1.97.orig/progs/getpcaps.c ++++ libcap-1.97/progs/getpcaps.c @@ -11,7 +11,6 @@ #include <stdio.h> #include <string.h> @@ -62,11 +62,11 @@ #include <sys/capability.h> static void usage(void) -Index: libcap-1.10/progs/setpcaps.c +Index: libcap-1.97/progs/setpcaps.c =================================================================== ---- libcap-1.10.orig/progs/setpcaps.c -+++ libcap-1.10/progs/setpcaps.c -@@ -11,7 +11,6 @@ +--- libcap-1.97.orig/progs/setpcaps.c ++++ libcap-1.97/progs/setpcaps.c +@@ -9,7 +9,6 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> @@ -74,11 +74,11 @@ #include <sys/capability.h> #include <unistd.h> -Index: libcap-1.10/progs/sucap.c +Index: libcap-1.97/progs/sucap.c =================================================================== ---- libcap-1.10.orig/progs/sucap.c -+++ libcap-1.10/progs/sucap.c -@@ -8,18 +8,18 @@ +--- libcap-1.97.orig/progs/sucap.c ++++ libcap-1.97/progs/sucap.c +@@ -8,13 +8,12 @@ * privileges. All environment variables are inherited. */ @@ -93,9 +93,3 @@ #include <grp.h> #include <unistd.h> #include <sys/wait.h> - #include <errno.h> - #include <string.h> -+#include <stdlib.h> - - static void usage(void) - { ++++++ header.patch ++++++ --- /var/tmp/diff_new_pack.4zIIyU/_old 2014-10-05 20:27:27.000000000 +0200 +++ /var/tmp/diff_new_pack.4zIIyU/_new 2014-10-05 20:27:27.000000000 +0200 @@ -1,6 +1,8 @@ ---- libcap/_makenames.c-dist 1999-05-14 06:46:15.000000000 +0200 -+++ libcap/_makenames.c 2006-12-19 17:56:11.000000000 +0100 -@@ -9,7 +9,7 @@ +Index: libcap/_makenames.c +=================================================================== +--- libcap/_makenames.c.orig ++++ libcap/_makenames.c +@@ -7,7 +7,7 @@ #include <stdio.h> #include <stdlib.h> @@ -9,3 +11,23 @@ /* * #include 'sed' generated array +Index: libcap/include/sys/capability.h +=================================================================== +--- libcap/include/sys/capability.h.orig ++++ libcap/include/sys/capability.h +@@ -23,15 +23,6 @@ extern "C" { + #include <sys/types.h> + #include <stdint.h> + +-/* +- * Make sure we can be included from userland by preventing +- * capability.h from including other kernel headers +- */ +-#define _LINUX_TYPES_H +-#define _LINUX_FS_H +- +-typedef unsigned int __u32; +- + #include <linux/capability.h> + + /* ++++++ libcap-array-range-fix.diff ++++++ --- /var/tmp/diff_new_pack.4zIIyU/_old 2014-10-05 20:27:27.000000000 +0200 +++ /var/tmp/diff_new_pack.4zIIyU/_new 2014-10-05 20:27:27.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- libcap/cap_extint.c.orig +++ libcap/cap_extint.c -@@ -106,7 +106,7 @@ cap_t cap_copy_int(const void *cap_ext) +@@ -102,7 +102,7 @@ cap_t cap_copy_int(const void *cap_ext) to = (__u32 *) &cap_d->set; blen = export->length_of_capset; ++++++ libcap-invalid-free-fix.diff ++++++ --- /var/tmp/diff_new_pack.4zIIyU/_old 2014-10-05 20:27:27.000000000 +0200 +++ /var/tmp/diff_new_pack.4zIIyU/_new 2014-10-05 20:27:27.000000000 +0200 @@ -1,5 +1,7 @@ ---- progs/getpcaps.c-dist 1999-11-18 07:04:25.000000000 +0100 -+++ progs/getpcaps.c 2006-12-19 17:51:31.000000000 +0100 +Index: progs/getpcaps.c +=================================================================== +--- progs/getpcaps.c.orig ++++ progs/getpcaps.c @@ -52,9 +52,11 @@ int main(int argc, char **argv) continue; } else { @@ -15,9 +17,11 @@ } } ---- progs/setpcaps.c-dist 1999-11-18 07:04:26.000000000 +0100 -+++ progs/setpcaps.c 2006-12-19 17:51:57.000000000 +0100 -@@ -100,9 +100,11 @@ int main(int argc, char **argv) +Index: progs/setpcaps.c +=================================================================== +--- progs/setpcaps.c.orig ++++ progs/setpcaps.c +@@ -98,9 +98,11 @@ int main(int argc, char **argv) char *result; result = cap_to_text(cap_d, &length); ++++++ libcap-no-version-check.diff ++++++ --- /var/tmp/diff_new_pack.4zIIyU/_old 2014-10-05 20:27:27.000000000 +0200 +++ /var/tmp/diff_new_pack.4zIIyU/_new 2014-10-05 20:27:27.000000000 +0200 @@ -1,6 +1,8 @@ ---- libcap/libcap.h-dist 2008-04-28 18:55:18.000000000 +0200 -+++ libcap/libcap.h 2008-04-28 18:57:03.000000000 +0200 -@@ -51,6 +51,7 @@ struct _cap_struct { +Index: libcap/libcap.h +=================================================================== +--- libcap/libcap.h.orig ++++ libcap/libcap.h +@@ -47,6 +47,7 @@ struct _cap_struct { * Do we match the local kernel? */ @@ -8,7 +10,7 @@ #if !defined(_LINUX_CAPABILITY_VERSION) || \ (_LINUX_CAPABILITY_VERSION != 0x19980330) -@@ -58,6 +59,7 @@ struct _cap_struct { +@@ -54,6 +55,7 @@ struct _cap_struct { # error "file "libcap.h" --> fix and recompile libcap" #endif ++++++ libcap-shlib-fix.diff ++++++ --- /var/tmp/diff_new_pack.4zIIyU/_old 2014-10-05 20:27:27.000000000 +0200 +++ /var/tmp/diff_new_pack.4zIIyU/_new 2014-10-05 20:27:27.000000000 +0200 @@ -1,11 +1,22 @@ ---- progs/Makefile-dist 1999-04-18 00:16:31.000000000 +0200 -+++ progs/Makefile 2006-12-19 18:30:24.000000000 +0100 -@@ -36,15 +36,15 @@ - all: $(PROGS) +Index: libcap/Makefile +=================================================================== +--- libcap/Makefile.orig ++++ libcap/Makefile +@@ -43,7 +43,7 @@ $(MINLIBNAME): $(OBJS) + ln -sf $(MAJLIBNAME) $(LIBNAME) - $(PROGS): %: %.o -- $(CC) $(LDFLAGS) -o $@ $< $(LIBS) -+ $(CC) $(COPTFLAG) $(LDFLAGS) -o $@ $< $(LIBS) + %.o: %.c $(INCLS) +- $(CC) $(CFLAGS) -c $< -o $@ ++ $(CC) $(COPTFLAG) $(CFLAGS) -fpic -c $< -o $@ + + install: all + mkdir -p -m 0755 $(INCDIR)/sys +Index: progs/Makefile +=================================================================== +--- progs/Makefile.orig ++++ progs/Makefile +@@ -15,12 +15,12 @@ $(PROGS): %: %.o + $(CC) $(COPTFLAG) $(LDFLAGS) -o $@ $< $(LIBS) %.o: %.c $(INCS) - $(CC) $(CFLAGS) -c $< -o $@ @@ -19,24 +30,3 @@ done clean: ---- libcap/Makefile-dist 2006-12-19 18:28:36.000000000 +0100 -+++ libcap/Makefile 2006-12-19 18:30:53.000000000 +0100 -@@ -56,15 +56,15 @@ - # @sed -ne '/^#define[ \t]CAP[_A-Z]\+[ \t]\+[0-9]\+/{s/^#define CAP_$[^ \t]*$[ \t]*$[^ \t]*$/ \{ \2, \"\1\" \},/;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;p;}' < /usr/include/linux/capability.h | fgrep -v 0x > cap_names.sed - - $(MINLIBNAME): $(OBJS) -- $(LD) -soname $(MAJLIBNAME) -x -shared -o $@ $(OBJS) -+ $(CC) $(COPTFLAG) -Wl,-soname,$(MAJLIBNAME) -shared -o $@ $(OBJS) - ln -sf $(MINLIBNAME) $(MAJLIBNAME) - ln -sf $(MAJLIBNAME) $(LIBNAME) - - %.o: %.c $(INCLS) -- $(CC) $(CFLAGS) -c $< -o $@ -+ $(CC) $(COPTFLAG) $(CFLAGS) -fpic -c $< -o $@ - - cap_sys2.o: cap_sys2.c $(INCLS) -- $(CC) -Wall -O2 -c $< -o $@ -+ $(CC) $(COPTFLAG) $(CFLAGS) -fpic -c $< -o $@ - - install: all - mkdir -p -m 0755 $(INCDIR)/sys ++++++ libcap.eal3.diff ++++++ --- /var/tmp/diff_new_pack.4zIIyU/_old 2014-10-05 20:27:27.000000000 +0200 +++ /var/tmp/diff_new_pack.4zIIyU/_new 2014-10-05 20:27:27.000000000 +0200 @@ -1,7 +1,8 @@ -diff -pruN libcap/libcap-1.92/doc/capget.2 libcap.eal3/libcap-1.92/doc/capget.2 ---- libcap/libcap-1.92/doc/capget.2 1999-04-18 00:16:31.000000000 +0200 -+++ libcap.eal3/libcap-1.92/doc/capget.2 2003-11-17 13:36:34.000000000 +0100 -@@ -38,5 +38,9 @@ One of the arguments was invalid. +Index: libcap-1.97/doc/capget.2 +=================================================================== +--- libcap-1.97.orig/doc/capget.2 ++++ libcap-1.97/doc/capget.2 +@@ -37,5 +37,9 @@ One of the arguments was invalid. An attempt was made to add a capability to the Permitted set, or to set a capability in the Effective or Inheritable sets that is not in the Permitted set. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit grub2 for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2014-10-05 20:27:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub2 (Old) and /work/SRC/openSUSE:Factory/.grub2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "grub2" Changes: -------- --- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2014-09-28 19:56:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2014-10-05 20:27:23.000000000 +0200 @@ -1,0 +2,18 @@ +Tue Sep 30 03:45:04 UTC 2014 - mchang(a)suse.com + +- packaging 20_memtest86+ and 20_ppc_terminfo in corresponing grubarch + package + +------------------------------------------------------------------- +Mon Sep 29 07:22:29 UTC 2014 - fcastelli(a)suse.com + +- Add '80_suse_btrfs_snapshot' required to show btrfs snapshots inside + of the boot menu. + +------------------------------------------------------------------- +Sun Sep 28 06:16:35 UTC 2014 - arvidjaar(a)gmail.com + +- fix btrfs on big endian systems (ppc/ppc64) + * add grub2-btrfs-fix-get_root-key-comparison-failures-due-to-en.patch + +------------------------------------------------------------------- New: ---- 80_suse_btrfs_snapshot grub2-btrfs-fix-get_root-key-comparison-failures-due-to-en.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.L1tHxJ/_old 2014-10-05 20:27:25.000000000 +0200 +++ /var/tmp/diff_new_pack.L1tHxJ/_new 2014-10-05 20:27:25.000000000 +0200 @@ -122,6 +122,7 @@ Source10: openSUSE-UEFI-CA-Certificate.crt Source11: SLES-UEFI-CA-Certificate.crt Source12: grub2-snapper-plugin.sh +Source14: 80_suse_btrfs_snapshot Source1000: PATCH_POLICY Patch1: rename-grub-info-file-to-grub2.patch Patch2: grub2-linux.patch @@ -156,6 +157,7 @@ Patch45: grub2-efinet-reopen-SNP-protocol-for-exclusive-use-by-grub.patch Patch46: grub2-xen-legacy-config-device-name.patch Patch47: grub2-Initialized-initrd_ctx-so-we-don-t-free-a-random-poi.patch +Patch48: grub2-btrfs-fix-get_root-key-comparison-failures-due-to-en.patch # Btrfs snapshot booting related patches Patch101: grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch Patch102: grub2-btrfs-02-export-subvolume-envvars.patch @@ -361,6 +363,7 @@ %patch45 -p1 %patch46 -p1 %patch47 -p1 +%patch48 -p1 %patch101 -p1 %patch102 -p1 %patch103 -p1 @@ -619,6 +622,15 @@ install -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/default/grub install -m 755 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sbindir}/grub2-once install -m 755 -D %{SOURCE12} $RPM_BUILD_ROOT%{_libdir}/snapper/plugins/grub +install -m 755 -D %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/grub.d/80_suse_btrfs_snapshot + +%ifnarch %{ix86} x86_64 +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/grub.d/20_memtest86+ +%endif + +%ifnarch ppc ppc64 ppc64le +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/grub.d/20_ppc_terminfo +%endif %ifarch ppc ppc64 ppc64le # Rename grub2.chrp back to grub.chrp so it is found by tools @@ -766,7 +778,13 @@ %config(noreplace) %{_sysconfdir}/default/grub %dir %{_sysconfdir}/grub.d %{_sysconfdir}/grub.d/README -%config %{_sysconfdir}/grub.d/??_* +%config %{_sysconfdir}/grub.d/00_header +%config %{_sysconfdir}/grub.d/10_linux +%config %{_sysconfdir}/grub.d/20_linux_xen +%config %{_sysconfdir}/grub.d/30_os-prober +%config %{_sysconfdir}/grub.d/40_custom +%config %{_sysconfdir}/grub.d/41_custom +%config %{_sysconfdir}/grub.d/90_persistent %{_sbindir}/%{name}-bios-setup %{_sbindir}/%{name}-macbless %{_sbindir}/%{name}-mkconfig @@ -848,8 +866,12 @@ %files %{grubarch} %defattr(-,root,root,-) +%ifarch %{ix86} x86_64 +%config %{_sysconfdir}/grub.d/20_memtest86+ +%endif %dir %{_libdir}/%{name}/%{grubarch} %ifarch ppc ppc64 ppc64le +%config %{_sysconfdir}/grub.d/20_ppc_terminfo # This is intentionally "grub.chrp" and not "%{name}.chrp" %{_libdir}/%{name}/%{grubarch}/grub.chrp %{_libdir}/%{name}/%{grubarch}/bootinfo.txt @@ -898,6 +920,7 @@ %defattr(-,root,root,-) %dir %{_libdir}/snapper %dir %{_libdir}/snapper/plugins +%config %{_sysconfdir}/grub.d/80_suse_btrfs_snapshot %{_libdir}/snapper/plugins/grub %ifarch x86_64 ++++++ 80_suse_btrfs_snapshot ++++++ #! /bin/sh set -e if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" = "xtrue" ] && [ "x${GRUB_FS}" = "xbtrfs" ] ; then cat <<EOF if [ -f "/.snapshots/grub-snapshot.cfg" ]; then source "/.snapshots/grub-snapshot.cfg" fi EOF fi ++++++ grub2-btrfs-fix-get_root-key-comparison-failures-due-to-en.patch ++++++ >From 4afd0107efa6a2d9cbe6fc71c529264dc2b9fb8a Mon Sep 17 00:00:00 2001 From: Thomas Falcon <tlfalcon(a)linux.vnet.ibm.com> Date: Mon, 31 Mar 2014 15:32:30 +0100 Subject: [PATCH] btrfs: fix get_root key comparison failures due to endianness * grub-core/fs/btrfs.c (get_root): Convert GRUB_BTRFS_ROOT_VOL_OBJECTID to little-endian. --- ChangeLog | 7 +++++++ grub-core/fs/btrfs.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c index 89666b6..f7b6c15 100644 --- a/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c @@ -1201,7 +1201,7 @@ get_root (struct grub_btrfs_data *data, struct grub_btrfs_key *key, struct grub_btrfs_key key_out, key_in; struct grub_btrfs_root_item ri; - key_in.object_id = GRUB_BTRFS_ROOT_VOL_OBJECTID; + key_in.object_id = grub_cpu_to_le64_compile_time (GRUB_BTRFS_ROOT_VOL_OBJECTID); key_in.offset = 0; key_in.type = GRUB_BTRFS_ITEM_TYPE_ROOT_ITEM; err = lower_bound (data, &key_in, &key_out, -- 1.8.4.5 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit krb5 for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package krb5 for openSUSE:Factory checked in at 2014-10-05 20:27:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krb5 (Old) and /work/SRC/openSUSE:Factory/.krb5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "krb5" Changes: -------- --- /work/SRC/openSUSE:Factory/krb5/krb5.changes 2014-09-28 19:56:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.krb5.new/krb5.changes 2014-10-05 20:27:21.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Sep 25 12:48:32 UTC 2014 - ddiss(a)suse.com + +- Work around replay cache creation race; (bnc#898439). + krb5-1.13-work-around-replay-cache-creation-race.patch + +------------------------------------------------------------------- New: ---- krb5-1.13-work-around-replay-cache-creation-race.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krb5.spec ++++++ --- /var/tmp/diff_new_pack.5WykFm/_old 2014-10-05 20:27:23.000000000 +0200 +++ /var/tmp/diff_new_pack.5WykFm/_new 2014-10-05 20:27:23.000000000 +0200 @@ -84,6 +84,7 @@ Patch14: krb5-kvno-230379.patch Patch20: krb5-1.12-doxygen.patch Patch21: bnc#897874-CVE-2014-5351.diff +Patch22: krb5-1.13-work-around-replay-cache-creation-race.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: mktemp, grep, /bin/touch, coreutils PreReq: %fillup_prereq @@ -205,6 +206,7 @@ %patch14 -p1 %patch20 -p1 %patch21 -p1 +%patch22 -p1 %build # needs to be re-generated ++++++ krb5-1.13-work-around-replay-cache-creation-race.patch ++++++ >From 99e08376c14240e2141c6fa9289fafab8245c754 Mon Sep 17 00:00:00 2001 From: Greg Hudson <ghudson(a)mit.edu> Date: Wed, 17 Sep 2014 10:45:28 -0400 Subject: [PATCH] Work around replay cache creation race If two processes try to initialize the same replay cache at the same time, krb5_rc_io_creat can race between unlink and open, leading to a KRB5_RC_IO_PERM error. When this happens, make the losing process retry so that it can continue. This does not solve the replay cache creation race, nor is that the only replay cache race issue. It simply prevents the race from causing a spurious failure. (cherry picked from commit c61e8c0c6ad5fda8d23dd896c4aed0ac5b470020) ticket: 3498 version_fixed: 1.13 status: resolved --- src/lib/krb5/rcache/rc_io.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/lib/krb5/rcache/rc_io.c b/src/lib/krb5/rcache/rc_io.c index 7e3b7e9..b9859fe 100644 --- a/src/lib/krb5/rcache/rc_io.c +++ b/src/lib/krb5/rcache/rc_io.c @@ -158,7 +158,7 @@ krb5_rc_io_creat(krb5_context context, krb5_rc_iostuff *d, char **fn) { krb5_int16 rc_vno = htons(KRB5_RC_VNO); krb5_error_code retval = 0; - int do_not_unlink = 0; + int flags, do_not_unlink = 0; char *dir; size_t dirlen; @@ -166,9 +166,13 @@ krb5_rc_io_creat(krb5_context context, krb5_rc_iostuff *d, char **fn) if (fn && *fn) { if (asprintf(&d->fn, "%s%s%s", dir, PATH_SEPARATOR, *fn) < 0) return KRB5_RC_IO_MALLOC; - unlink(d->fn); - d->fd = THREEPARAMOPEN(d->fn, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL | - O_BINARY, 0600); + d->fd = -1; + do { + if (unlink(d->fn) == -1 && errno != ENOENT) + break; + flags = O_WRONLY | O_CREAT | O_TRUNC | O_EXCL | O_BINARY; + d->fd = THREEPARAMOPEN(d->fn, flags, 0600); + } while (d->fd == -1 && errno == EEXIST); } else { retval = krb5_rc_io_mkstemp(context, d, dir); if (retval) -- 1.8.4.5 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0