January 2011 - openSUSE Commits - openSUSE Mailing Lists

commit MozillaFirefox for openSUSE:Factory
by root＠hilbert.suse.de 25 Jan '11

25 Jan '11

Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at Tue Jan 25 09:00:23 CET 2011. -------- --- MozillaFirefox/MozillaFirefox.changes 2011-01-13 12:12:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/MozillaFirefox/MozillaFirefox.changes 2011-01-24 10:14:26.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 22 22:21:52 UTC 2011 - wr(a)rosenauer.org + +- update to version 4.0b10 +- removed obsolete firefox-shell-bmo624267.patch +- testpilot moved to distribution/extensions +- updated locale provides and removed bn-IN from locales +- use new macros for desktop file and icon registration + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- firefox-4.0b9-source.tar.bz2 firefox-shell-bmo624267.patch l10n-4.0b9.tar.bz2 New: ---- firefox-4.0b10-source.tar.bz2 l10n-4.0b10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.W3v3eM/_old 2011-01-25 09:00:06.000000000 +0100 +++ /var/tmp/diff_new_pack.W3v3eM/_new 2011-01-25 09:00:06.000000000 +0100 @@ -29,14 +29,14 @@ BuildRequires: wireless-tools %endif %if 0%{?use_xulrunner} -BuildRequires: %{xulrunner}-devel = 2.0b9 +BuildRequires: %{xulrunner}-devel = 2.0b10 %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Version: 4.0b9 +Version: 4.0b10 Release: 1 Provides: web_browser Provides: firefox = %{version} -%define releasedate 2011011000 +%define releasedate 2011012100 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -62,8 +62,7 @@ Patch8: firefox-libxulsdk-locales.patch Patch9: firefox-no-default-ualocale.patch Patch10: firefox-multilocale-chrome.patch -Patch11: firefox-shell-bmo624267.patch -Patch12: firefox-shellservice.patch +Patch11: firefox-shellservice.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): coreutils shared-mime-info desktop-file-utils Requires(postun): shared-mime-info desktop-file-utils @@ -121,7 +120,7 @@ %package translations-other Summary: Extra translations for MozillaFirefox License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Provides: locale(%{name}:af;as;be;bg;bn_BD;bn_IN;cy;el;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hr;id;is;ka;kk;kn;ku;lt;lv;mk;ml;mr;nn_NO;oc;or;pa_IN;rm;ro;si;sk;sl;sq;sr;ta;ta_LK;te;th;tr;uk;vi) +Provides: locale(%{name}:af;ak;ast;be;bg;bn_BD;br;cy;el;en_ZA;eo;et;eu;fy_NL;ga_IE;gd;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk) Group: System/Localization Requires: %{name} = %{version} Obsoletes: %{name}-translations < %{version}-%{release} @@ -173,7 +172,6 @@ %patch9 -p1 %patch10 -p1 %patch11 -p1 -%patch12 -p1 %build export MOZ_BUILD_DATE=%{releasedate} @@ -243,7 +241,7 @@ touch %{_tmppath}/translations.{common,other} for locale in $(awk '{ print $1; }' ../mozilla/browser/locales/shipped-locales); do case $locale in - ja-JP-mac|en-US) + ja-JP-mac|en-US|bn-IN) ;; *) pushd $RPM_BUILD_DIR/compare-locales @@ -320,26 +318,40 @@ %post # update mime and desktop database +%if %suse_version > 1130 +%mime_database_post +%desktop_database_post +%icon_theme_cache_post +%else if [ -f usr/bin/update-mime-database ] ; then usr/bin/update-mime-database %{_datadir}/mime > /dev/null || : fi if [ -f usr/bin/update-desktop-database ] ; then usr/bin/update-desktop-database > /dev/null || : fi +%endif exit 0 %postun +%if %suse_version > 1130 +%icon_theme_cache_postun +%desktop_database_postun +%mime_database_postun +%else if [ -f usr/bin/update-mime-database ] ; then usr/bin/update-mime-database %{_datadir}/mime > /dev/null || : fi if [ -f usr/bin/update-desktop-database ] ; then usr/bin/update-desktop-database > /dev/null || : fi +%endif +exit 0 %files %defattr(-,root,root) %dir %{progdir} %dir %{progdir}/chrome/ +%dir %{progdir}/distribution/ %{progdir}/chrome/browser.* %{progdir}/chrome/localized.manifest %{progdir}/chrome/nonlocalized.manifest @@ -349,7 +361,7 @@ %exclude %{progdir}/defaults/profile/bookmarks.html %{progdir}/defaults/ %dir %{progdir}/extensions/ -%{progdir}/extensions/testpilot(a)labs.mozilla.com +%{progdir}/distribution/extensions/ %{progdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} %{progdir}/icons/ %{progdir}/modules/ ++++++ compare-locales.tar.bz2 ++++++ ++++++ firefox-4.0b9-source.tar.bz2 -> firefox-4.0b10-source.tar.bz2 ++++++ MozillaFirefox/firefox-4.0b9-source.tar.bz2 /mounts/work_src_done/STABLE/MozillaFirefox/firefox-4.0b10-source.tar.bz2 differ: char 11, line 1 ++++++ firefox-kde.patch ++++++ --- /var/tmp/diff_new_pack.W3v3eM/_old 2011-01-25 09:00:06.000000000 +0100 +++ /var/tmp/diff_new_pack.W3v3eM/_new 2011-01-25 09:00:06.000000000 +0100 @@ -23,7 +23,7 @@ new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1058 @@ +@@ -0,0 +1,1062 @@ +#filter substitution +<?xml version="1.0"?> +# -*- Mode: HTML -*- @@ -569,6 +569,7 @@ + onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'" + onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);"> + <box id="notification-popup-box" hidden="true" align="center"> ++ <image id="default-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/> @@ -821,9 +822,9 @@ + aria-label="&tabsToolbar.label;" + context="toolbar-context-menu" +#ifdef APPMENU_ON_TABBAR -+ defaultset="appmenu-toolbar-button,tabbrowser-tabs,new-tab-button,alltabs-button,tabview-button,tabs-closebutton" ++ defaultset="appmenu-toolbar-button,tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton" +#else -+ defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabview-button,tabs-closebutton" ++ defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton" +#endif + collapsed="true"> + @@ -868,13 +869,6 @@ + position="after_end"/> + </toolbarbutton> + -+ <toolbarbutton id="tabview-button" class="toolbarbutton-1 chromeclass-toolbar-additional" -+ label="&tabGroupsButton.label;" -+ command="Browser:ToggleTabView" -+ tooltiptext="&tabGroupsButton.tooltip;" -+ removable="true" -+ observes="tabviewGroupsNumber"/> -+ + <toolbarbutton id="tabs-closebutton" + class="close-button tabs-closebutton" + command="cmd_close" @@ -982,6 +976,12 @@ + oncommand="return FeedHandler.subscribeToFeed(null, event);" + onclick="checkForMiddleClick(this, event);"/> + </toolbarbutton> ++ ++ <toolbarbutton id="tabview-button" class="toolbarbutton-1 chromeclass-toolbar-additional" ++ label="&tabGroupsButton.label;" ++ command="Browser:ToggleTabView" ++ tooltiptext="&tabGroupsButton.tooltip;" ++ observes="tabviewGroupsNumber"/> + </toolbarpalette> + </toolbox> + @@ -1040,6 +1040,10 @@ +#endif +#ifdef XP_MACOSX + <svg:svg height="0"> ++ <svg:mask id="pinstripe-keyhole-forward-mask" maskContentUnits="objectBoundingBox"> ++ <svg:rect x="0" y="0" width="1" height="1" fill="white"/> ++ <svg:circle cx="-0.46" cy="0.48" r="0.65"/> ++ </svg:mask> + <svg:mask id="pinstripe-tab-ontop-left-curve-mask" maskContentUnits="userSpaceOnUse"> + <svg:circle cx="9" cy="3" r="3" fill="white"/> + <svg:rect x="9" y="0" width="3" height="3" fill="white"/> ++++++ firefox-multilocale-chrome.patch ++++++ --- /var/tmp/diff_new_pack.W3v3eM/_old 2011-01-25 09:00:06.000000000 +0100 +++ /var/tmp/diff_new_pack.W3v3eM/_new 2011-01-25 09:00:06.000000000 +0100 @@ -1,12 +1,12 @@ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> -# Parent 80550b99f4e1c3bfe561edf396dec27d47bf1696 +# Parent e3da64303bf904a8da2410754026b7a00480a589 Add searchplugins to chrome packaging for proper localization diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -319,16 +319,20 @@ pref("browser.download.manager.scanWhenD +@@ -321,16 +321,20 @@ pref("browser.download.manager.scanWhenD pref("browser.download.manager.resumeOnWakeDelay", 10000); // search engines URL @@ -83,13 +83,16 @@ diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn -@@ -87,8 +87,9 @@ +@@ -81,11 +81,12 @@ + locale/browser-region/region.properties (%chrome/browser-region/region.properties) + # the following files are browser-specific overrides + * locale/browser/netError.dtd (%chrome/overrides/netError.dtd) + * locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties) + * locale/browser/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd) % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties % override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd - #if MOZ_UPDATE_CHANNEL == beta ++ locale/browser/searchplugins/list.txt (%searchplugins/list.txt) % locale testpilot @AB_CD@ %locale/feedback/ locale/feedback/main.dtd (%feedback/main.dtd) locale/feedback/main.properties (%feedback/main.properties) - #endif -+ locale/browser/searchplugins/list.txt (%searchplugins/list.txt) ++++++ l10n-4.0b9.tar.bz2 -> l10n-4.0b10.tar.bz2 ++++++ MozillaFirefox/l10n-4.0b9.tar.bz2 /mounts/work_src_done/STABLE/MozillaFirefox/l10n-4.0b10.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- 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 24 Jan '11

24 Jan '11

Hello community, here is the log from the commit of package sysconfig for openSUSE:Factory checked in at Mon Jan 24 22:27:15 CET 2011. -------- --- sysconfig/sysconfig.changes 2011-01-18 11:12:17.000000000 +0100 +++ sysconfig/sysconfig.changes 2011-01-24 17:27:50.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Jan 24 16:24:30 UTC 2011 - mt(a)suse.de + +- Fixed gawk patch to skip oldnet2new.sh - not in dist archive. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.rq9XXC/_old 2011-01-24 22:26:31.000000000 +0100 +++ /var/tmp/diff_new_pack.rq9XXC/_new 2011-01-24 22:26:31.000000000 +0100 @@ -20,7 +20,7 @@ Name: sysconfig Version: 0.74.4 -Release: 2 +Release: 3 Summary: The system configuration scheme Url: http://gitorious.org/opensuse/sysconfig Group: System/Base ++++++ 0002-Use-gawk-directly-instead-of-just-awk.patch ++++++ --- /var/tmp/diff_new_pack.rq9XXC/_old 2011-01-24 22:26:31.000000000 +0100 +++ /var/tmp/diff_new_pack.rq9XXC/_new 2011-01-24 22:26:31.000000000 +0100 @@ -14,7 +14,6 @@ scripts/ifup-route | 4 ++-- scripts/ifup-sysctl | 2 +- scripts/ifup-wireless | 4 ++-- - scripts/oldnet2new.sh | 12 ++++++------ 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/scripts/functions.netconfig b/scripts/functions.netconfig @@ -180,36 +179,6 @@ if (length()>10) for (i=0;i<26-length();i++) KEY=KEY"0" for (i=1;i<length(KEY)-1;i+=2) FKEY=FKEY substr(KEY, i, 2)":" FKEY=FKEY substr(KEY, i, 2) -diff --git a/scripts/oldnet2new.sh b/scripts/oldnet2new.sh -index 5d9ece3..a475c95 100755 ---- a/scripts/oldnet2new.sh -+++ b/scripts/oldnet2new.sh -@@ -377,9 +377,9 @@ while read inline; do - break - ;; - *) -- UNIQUESTR=`echo $netconf | awk '{print $1}'` -- CONF=`echo $netconf | awk '{print $2}'` -- CONFNUMBER=`echo $CONF | awk -F';' '{print $2}'` -+ UNIQUESTR=`echo $netconf | gawk '{print $1}'` -+ CONF=`echo $netconf | gawk '{print $2}'` -+ CONFNUMBER=`echo $CONF | gawk -F';' '{print $2}'` - if [ "$CONFNUMBER" = "" ]; then - CONFNUMBER="0"; - fi; -@@ -524,9 +524,9 @@ if ( [ -r etc/rc.dialout ] && `grep --quiet "^[^# ]" etc/rc.dialout` ) || - break - ;; - *) -- UNIQUESTR=`echo $netconf | awk '{print $1}'` -- CONF=`echo $netconf | awk '{print $2}'` -- CONFNUMBER=`echo $CONF | awk -F';' '{print $2}'` -+ UNIQUESTR=`echo $netconf | gawk '{print $1}'` -+ CONF=`echo $netconf | gawk '{print $2}'` -+ CONFNUMBER=`echo $CONF | gawk -F';' '{print $2}'` - if [ "$CONFNUMBER" = "" ]; then - CONFNUMBER="0"; - fi; -- 1.7.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit systemd for openSUSE:Factory
by root＠hilbert.suse.de 24 Jan '11

24 Jan '11

Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at Mon Jan 24 22:26:16 CET 2011. -------- --- systemd/systemd.changes 2011-01-08 21:00:56.000000000 +0100 +++ systemd/systemd.changes 2011-01-22 14:54:02.000000000 +0100 @@ -1,0 +2,50 @@ +Sat Jan 22 14:42:34 CET 2011 - kay.sievers(a)novell.com + +- new snapshot + - clang: fix some issues found with clang-analyzer + - gcc: make gcc shut up + +------------------------------------------------------------------- +Sat Jan 22 14:40:24 CET 2011 - kay.sievers(a)novell.com + +- version 17 + - vala 0.10 seem to work fine + - cryptsetup: fix ordering loop when dealing with encrypted + swap devices + - main: don't warn if /etc/mtab is a symlink to /proc/mounts + - socket: don't crash if the .service unit for a .socket unit + is not found + - mount: ignore if an fsck is requested for a bind mount, + so that we don't wait for the bind 'device' to show up + - automount: fix segfault when shutting down + - man: give an example for vconsole.conf + - dbus: don't try to connect to the system bus before it is + actually up + - service: make chain of main commands and control commands + independent of each other, so that both can be executed + simultaneously and independently + - service: don't allow reload operations for oneshot services + - vala: convert from dbus-glib to gdbus + - systemctl: highlight failed processes in systemctl status + - systemctl: show process type along process exit codes + - service: when reloading a service fails don't fail the entire + service but just the reload job + +------------------------------------------------------------------- +Wed Jan 19 12:55:40 CET 2011 - kay.sievers(a)novell.com + +- new snapshot + - shutdown: use correct kexec options + - serial-getty: do not invoke /sbin/securetty; recent + pam_securetty looks for console= in /proc/cmdline + - systemctl: before spawning pager cache number of columns + - pam: optionally keep processes of root user around + - service: if a reload operation fails, don't shut down + the service + - execute: make sending of SIGKILL on shutdown optional + - mount: do not translate uuids to lowercase + - man: document missing KillSignal= and swap options +- require recent util-linux +- drop mtab symlink creation which is done in util-linux + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- systemd-16.tar.bz2 New: ---- systemd-17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.B8S8XR/_old 2011-01-24 22:25:19.000000000 +0100 +++ /var/tmp/diff_new_pack.B8S8XR/_new 2011-01-24 22:25:19.000000000 +0100 @@ -20,7 +20,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 16 +Version: 17 Release: 1 License: GPLv2+ Group: System/Base @@ -33,13 +33,12 @@ BuildRequires: pam-devel BuildRequires: libcryptsetup-devel BuildRequires: pkg-config -BuildRequires: dbus-1-glib-devel gtk2-devel libnotify-devel +BuildRequires: gtk2-devel libnotify-devel BuildRequires: libselinux-devel libsepol-devel Requires: udev >= 164 Requires: dbus-1 >= 1.4.0 Requires: kbd -Requires: util-linux -Requires: fsck-with-dev-lock +Requires: util-linux >= 2.18.91 Conflicts: mkinitrd < 2.6.0-5 Source0: http://www.freedesktop.org/software/systemd/releases/%{name}-%{version}.tar… Source1: systemd-rpmlintrc @@ -136,8 +135,6 @@ systemd-readahead-replay.service \ remote-fs.target >/dev/null 2>&1 || : fi -# regular mtab is not written/cleaned-up/supported -ln -sf /proc/self/mounts /etc/mtab || : %preun if [ $1 -eq 0 ]; then ++++++ systemd-16.tar.bz2 -> systemd-17.tar.bz2 ++++++ ++++ 30411 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit linuxrc for openSUSE:Factory
by root＠hilbert.suse.de 24 Jan '11

24 Jan '11

Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at Mon Jan 24 22:25:00 CET 2011. -------- --- linuxrc/linuxrc.changes 2010-12-06 14:49:21.000000000 +0100 +++ linuxrc/linuxrc.changes 2011-01-20 13:52:07.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Jan 20 13:51:03 CET 2011 - snwint(a)suse.de + +- allow for user defined options (those options are ignored by + linuxrc but added unchanged to /etc/install.inf) +- brokenmodules accepts '+' and '-' now +- add status info also to log + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- linuxrc-3.5.7.tar.bz2 New: ---- linuxrc-3.5.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.xhXex4/_old 2011-01-24 22:17:29.000000000 +0100 +++ /var/tmp/diff_new_pack.xhXex4/_new 2011-01-24 22:17:29.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package linuxrc (Version 3.5.7) +# spec file for package linuxrc # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -24,9 +24,9 @@ Group: System/Boot AutoReqProv: on Summary: SUSE Installation Program -Version: 3.5.7 +Version: 3.5.8 Release: 1 -Source: linuxrc-3.5.7.tar.bz2 +Source: linuxrc-3.5.8.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ linuxrc-3.5.7.tar.bz2 -> linuxrc-3.5.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.7/VERSION new/linuxrc-3.5.8/VERSION --- old/linuxrc-3.5.7/VERSION 2010-12-06 14:45:26.000000000 +0100 +++ new/linuxrc-3.5.8/VERSION 2011-01-20 13:50:56.000000000 +0100 @@ -1 +1 @@ -3.5.7 +3.5.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.7/changelog new/linuxrc-3.5.8/changelog --- old/linuxrc-3.5.7/changelog 2010-12-06 14:45:28.000000000 +0100 +++ new/linuxrc-3.5.8/changelog 2011-01-20 13:50:58.000000000 +0100 @@ -1,4 +1,12 @@ -2010-12-06: HEAD +2011-01-19: HEAD + - more user option fixes + - brokenmodules accepts '+' and '-' now + - add status info also to log + - fix user option parsing + - allow for user defined options + - those options are ignored by linuxrc but added unchanged to /etc/install.inf + +2010-12-06: 3.5.7 - don't check keyboard status too often to speed up media check 2010-12-03: 3.5.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.7/dialog.c new/linuxrc-3.5.8/dialog.c --- old/linuxrc-3.5.7/dialog.c 2010-12-03 15:11:52.000000000 +0100 +++ new/linuxrc-3.5.8/dialog.c 2011-01-19 14:52:17.000000000 +0100 @@ -1519,7 +1519,7 @@ *((unsigned char *) NULL) = 7; } else if(i == -71) { - util_status_info(); + util_status_info(0); } else if(i == -73) { i = dia_input(txt_get(TXT_CHANGE_CONFIG), s, sizeof s - 1, 35, 0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.7/file.c new/linuxrc-3.5.8/file.c --- old/linuxrc-3.5.7/file.c 2010-12-03 15:11:52.000000000 +0100 +++ new/linuxrc-3.5.8/file.c 2011-01-19 16:55:32.000000000 +0100 @@ -305,6 +305,7 @@ { key_udevrule, "udev.rule", kf_cfg + kf_cmd_early }, { key_dhcpfail, "DHCPFail", kf_cfg + kf_cmd }, { key_namescheme, "NameScheme", kf_cfg + kf_cmd + kf_cmd_early }, + { key_ptoptions, "PTOptions", kf_cfg + kf_cmd_early }, }; static struct { @@ -393,11 +394,11 @@ * Compare strings, ignoring '-', '_', and '.' characters in strings not * starting with '_'. */ -static int strcasecmpignorestrich(const char* s1, const char* s2) +static int strcasecmpignorestrich(const char *s1, const char *s2) { - char* str1 = strdup(s1); - char* str2 = strdup(s2); - char* s; + char *str1 = strdup(s1); + char *str2 = strdup(s2); + char *s; int i; /* remove all '-' and '_' */ @@ -421,25 +422,35 @@ } i = strcasecmp(str1, str2); - free(str1); free(str2); + + free(str1); + free(str2); + return i; } -/* !!! str is overwritten !!! */ + file_key_t file_str2key(char *str, file_key_flag_t flags) { int i; + slist_t *sl; if(!str || !*str || flags == kf_none) return key_none; if(!*str) return key_none; - for(i = 0; (unsigned) i < sizeof keywords / sizeof *keywords; i++) { + for(i = 0; i < sizeof keywords / sizeof *keywords; i++) { if((keywords[i].flags & flags) && !strcasecmpignorestrich(keywords[i].value, str)) { return keywords[i].key; } } + if(flags & (kf_cmd + kf_cfg)) { + for(sl = config.ptoptions; sl; sl = sl->next) { + if(!strcasecmpignorestrich(sl->key, str)) return key_is_ptoption; + } + } + return key_none; } @@ -537,7 +548,7 @@ *ft = calloc(1, sizeof **ft); (*ft)->key_str = strdup(s); - (*ft)->key = file_str2key(s, flags); /* destroys s!!! */ + (*ft)->key = file_str2key(s, flags); (*ft)->value = strdup(t); parse_value(*ft); @@ -598,6 +609,9 @@ } +/* + * Note: may modify f->key if f->key is key_none. + */ void file_do_info(file_t *f0, file_key_flag_t flags) { file_t *f; @@ -976,8 +990,7 @@ break; case key_brokenmodules: - slist_free(config.module.broken); - config.module.broken = slist_split(',', f->value); + slist_assign_values(&config.module.broken, f->value); if(config.module.broken && !config.test) { if((w = fopen("/etc/modprobe.d/blacklist", "w"))) { for(sl = config.module.broken; sl; sl = sl->next) { @@ -1241,6 +1254,20 @@ break; case key_none: + case key_is_ptoption: + if((flags & (kf_cmd + kf_cfg))) { + for(sl = config.ptoptions; sl; sl = sl->next) { + if(!strcasecmpignorestrich(sl->key, f->key_str)) { + str_copy(&sl->value, f->value); + f->key = key_is_ptoption; + break; + } + } + } + + /* was user defined option */ + if(f->key == key_is_ptoption) break; + /* assume kernel module option if it can be parsed as 'module.option' */ /* Note: f->unparsed is only set when we read from cmdline/argv *NOT* from files. */ @@ -1587,6 +1614,10 @@ str_copy(&config.namescheme, f->value); break; + case key_ptoptions: + slist_assign_values(&config.ptoptions, f->value); + break; + default: break; } @@ -1916,6 +1947,10 @@ fprintf(f, "Brailledevice: %s\n", config.braille.dev); } + for(sl = config.ptoptions; sl; sl = sl->next) { + if(sl->value) fprintf(f, "%s: %s\n", sl->key, sl->value); + } + ft0 = file_read_cmdline(kf_cmd + kf_cmd_early + kf_boot); for(i = 0, ft = ft0; ft; ft = ft->next) { @@ -2104,7 +2139,7 @@ (*ft)->unparsed = t1; (*ft)->key_str = strdup(t); - (*ft)->key = file_str2key(t, flags); /* destroys t!!! */ + (*ft)->key = file_str2key(t, flags); (*ft)->value = strdup(s1 ?: ""); parse_value(*ft); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.7/file.h new/linuxrc-3.5.8/file.h --- old/linuxrc-3.5.7/file.h 2010-12-03 15:11:52.000000000 +0100 +++ new/linuxrc-3.5.8/file.h 2011-01-18 17:57:02.000000000 +0100 @@ -51,7 +51,7 @@ key_kexec_reboot, key_devbyid, key_braille, key_nfsopts, key_ipv4, key_ipv4only, key_ipv6, key_ipv6only, key_usesax2, key_efi, key_supporturl, key_portno, key_osahwaddr, key_zen, key_zenconfig, key_udevrule, key_dhcpfail, - key_namescheme + key_namescheme, key_ptoptions, key_is_ptoption } file_key_t; typedef enum { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.7/global.h new/linuxrc-3.5.8/global.h --- old/linuxrc-3.5.7/global.h 2010-12-03 15:11:52.000000000 +0100 +++ new/linuxrc-3.5.8/global.h 2011-01-18 13:58:49.000000000 +0100 @@ -413,6 +413,7 @@ slist_t *extend_list; /* list of loaded instsys extensions */ slist_t *udevrules; /* udev rules */ char *namescheme; /* device name scheme (e.g.: by-id, by-label, by-path) */ + slist_t *ptoptions; /* pass-through options: options that just need to be added /etc/install.inf */ struct { char *instsys_default; /* default instsys url */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.7/install.c new/linuxrc-3.5.8/install.c --- old/linuxrc-3.5.7/install.c 2010-12-03 15:11:52.000000000 +0100 +++ new/linuxrc-3.5.8/install.c 2011-01-19 14:51:25.000000000 +0100 @@ -960,6 +960,8 @@ inst_choose_display() ) err = 1; #endif + + if(config.debug >= 2) util_status_info(1); if(!err) err = inst_execute_yast(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.7/settings.c new/linuxrc-3.5.8/settings.c --- old/linuxrc-3.5.7/settings.c 2010-12-03 15:11:52.000000000 +0100 +++ new/linuxrc-3.5.8/settings.c 2011-01-19 14:52:09.000000000 +0100 @@ -678,7 +678,7 @@ break; case di_extras_info: - util_status_info(); + util_status_info(0); break; case di_extras_change: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.7/util.c new/linuxrc-3.5.8/util.c --- old/linuxrc-3.5.7/util.c 2010-12-03 15:11:52.000000000 +0100 +++ new/linuxrc-3.5.8/util.c 2011-01-19 15:01:23.000000000 +0100 @@ -1107,7 +1107,7 @@ } -void util_status_info() +void util_status_info(int log_it) { int i, j; char *s, *t; @@ -1472,6 +1472,15 @@ } } + if(config.ptoptions) { + strcpy(buf, "user defined options:"); + slist_append_str(&sl0, buf); + for(sl = config.ptoptions; sl; sl = sl->next) { + sprintf(buf, " %s: %s", sl->key, sl->value ?: "<unset>"); + slist_append_str(&sl0, buf); + } + } + if(config.module.options) { strcpy(buf, "module options:"); slist_append_str(&sl0, buf); @@ -1481,7 +1490,17 @@ } } - dia_show_lines2("Linuxrc v" LXRC_FULL_VERSION " (" __DATE__ ", " __TIME__ ")", sl0, 76); + if(log_it || config.debug >= 1) { + fprintf(stderr, "------ Linuxrc v" LXRC_FULL_VERSION " (" __DATE__ ", " __TIME__ ") ------\n"); + for(sl = sl0; sl; sl = sl->next) { + fprintf(stderr, " %s\n", sl->key); + } + fprintf(stderr, "------ ------\n"); + } + + if(!log_it) { + dia_show_lines2("Linuxrc v" LXRC_FULL_VERSION " (" __DATE__ ", " __TIME__ ")", sl0, 76); + } slist_free(sl0); @@ -2744,6 +2763,31 @@ } +slist_t *slist_free_entry(slist_t **sl0, char *str) +{ + slist_t *sl, *sl_prev, sl_tmp = { }; + + if(!str) return *sl0; + + sl_tmp.next = *sl0; + + for(sl_prev = &sl_tmp, sl = sl_prev->next; sl; sl = sl->next) { + if(sl->key && !strcmp(sl->key, str)) { + free(sl->key); + if(sl->value) free(sl->value); + sl_prev->next = sl->next; + free(sl); + sl = sl_prev; + } + else { + sl_prev = sl; + } + } + + return *sl0 = sl_tmp.next; +} + + slist_t *slist_append(slist_t **sl0, slist_t *sl) { for(; *sl0; sl0 = &(*sl0)->next); @@ -2769,6 +2813,51 @@ } +slist_t *slist_assign_values(slist_t **sl0, char *str) +{ + int todo = 0; + slist_t *sl, *sl1; + + if(!sl0) return NULL; + + if(!str) str = ""; + + switch(*str) { + case '+': + todo = 1; + str++; + break; + + case '-': + todo = -1; + str++; + break; + } + + sl1 = slist_split(',', str); + + if(todo) { + for(sl = sl1; sl; sl = sl->next) { + if(todo > 0) { + if(!slist_getentry(*sl0, sl->key)) slist_append_str(sl0, sl->key); + } + else { + slist_free_entry(sl0, sl->key); + } + } + } + else { + slist_free(*sl0); + *sl0 = sl1; + sl1 = NULL; + } + + slist_free(sl1); + + return *sl0; +} + + slist_t *slist_getentry(slist_t *sl, char *key) { if(key) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.7/util.h new/linuxrc-3.5.8/util.h --- old/linuxrc-3.5.7/util.h 2010-12-03 15:11:52.000000000 +0100 +++ new/linuxrc-3.5.8/util.h 2011-01-19 14:49:30.000000000 +0100 @@ -38,7 +38,7 @@ int util_chk_driver_update(char *dir, char *loc); extern void util_do_driver_updates (void); extern int show_driver_updates(void); -extern void util_status_info (void); +extern void util_status_info (int log_it); extern int util_mount_main (int argc, char **argv); extern int util_umount_main (int argc, char **argv); extern int util_cat_main (int argc, char **argv); @@ -76,9 +76,11 @@ slist_t *slist_new(void); slist_t *slist_free(slist_t *sl); +slist_t *slist_free_entry(slist_t **sl0, char *str); slist_t *slist_append(slist_t **sl0, slist_t *sl); slist_t *slist_append_str(slist_t **sl0, char *str); slist_t *slist_add(slist_t **sl0, slist_t *sl); +slist_t *slist_assign_values(slist_t **sl0, char *str); slist_t *slist_getentry(slist_t *sl, char *key); slist_t *slist_reverse(slist_t *sl0); slist_t *slist_sort(slist_t *sl0, int (*cmp_func)(const void *, const void *)); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit skelcd-control-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 24 Jan '11

24 Jan '11

Hello community, here is the log from the commit of package skelcd-control-openSUSE for openSUSE:Factory checked in at Mon Jan 24 22:17:09 CET 2011. -------- --- skelcd-control-openSUSE/skelcd-control-openSUSE.changes 2011-01-17 15:42:52.000000000 +0100 +++ skelcd-control-openSUSE/skelcd-control-openSUSE.changes 2011-01-24 09:59:32.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Jan 24 09:58:48 CET 2011 - jsrain(a)suse.cz + +- adaptations for unattended migration (fate#310481) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-control-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.0VdwO5/_old 2011-01-24 22:12:09.000000000 +0100 +++ /var/tmp/diff_new_pack.0VdwO5/_new 2011-01-24 22:12:09.000000000 +0100 @@ -26,7 +26,7 @@ License: YaST Group: Metapackages AutoReqProv: off -Version: 2011.1.17 +Version: 2011.1.24 Release: 1 Summary: SuSE Linux Professional Control file BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ control.xml ++++++ --- /var/tmp/diff_new_pack.0VdwO5/_old 2011-01-24 22:12:09.000000000 +0100 +++ /var/tmp/diff_new_pack.0VdwO5/_new 2011-01-24 22:12:09.000000000 +0100 @@ -545,7 +545,7 @@ <proposal> <label>Installation Settings</label> - <mode>update</mode> + <mode>update,autoupgrade</mode> <stage>initial</stage> <name>initial</name> <unique_id>update_initial</unique_id> @@ -1399,6 +1399,94 @@ <workflow> <defaults> <archs>all</archs> + </defaults> + <label>Preparation</label> + <mode>autoupgrade</mode> + <stage>initial</stage> + <modules config:type="list"> + <module> + <label>System Analysis</label> + <name>system_analysis</name> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </module> + <module> + <label>System for Update</label> + <name>update_partition_auto</name> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </module> + <module> + <label>AutoYaST Settings</label> + <name>autoinit</name> + <archs>all</archs> + <retranslate config:type="boolean">true</retranslate> + </module> + <module> + <label>AutoYaST Settings</label> + <name>autosetup_upgrade</name> + </module> + <module> + <heading>yes</heading> + <label>Update</label> + </module> + <module> + <label>AutoYaST Settings</label> + <name>initial_update_proposal</name> + <execute>inst_proposal</execute> + <proposal>initial</proposal> + <enable_back>no</enable_back> + <enable_next>yes</enable_next> + </module> + <module> + <label>Perform Update</label> + <name>bl_preupdate</name> + <execute>bootloader_preupdate</execute> + </module> + <module> + <label>Perform Update</label> + <name>prepareprogress</name> + </module> + + <module> + <label>Perform Update</label> + <name>do_resize</name> + <update config:type="boolean">false</update> + <archs>i386,x86_64,ia64</archs> + </module> + <module> + <label>Perform Update</label> + <name>prepdisk</name> + </module> + <module> + <label>Perform Update</label> + <name>kickoff</name> + </module> + <module> + <label>Perform Update</label> + <name>store_upgrade_software</name> + </module> + <module> + <label>Perform Update</label> + <name>rpmcopy</name> + </module> + <module> +  + <label>Perform Update</label> + <name>reiplauto</name> + <archs>s390</archs> + </module> + <module> + <label>Perform Update</label> + <name>finish</name> + </module> + </modules> + </workflow> + + + <workflow> + <defaults> + <archs>all</archs> <enable_back>no</enable_back> <enable_next>no</enable_next> </defaults> @@ -1431,5 +1519,38 @@ </modules> </workflow> + <workflow> + <defaults> + <archs>all</archs> + <enable_back>no</enable_back> + <enable_next>no</enable_next> + </defaults> + <stage>continue</stage> + <mode>autoupgrade</mode> + <modules config:type="list"> + <module> + <label>Perform Update</label> + <name>autopost</name> + </module> + <module> + <label>Perform Update</label> + <name>rpmcopy_secondstage</name> + </module> + <module> + <heading>yes</heading> + <label>Configuration</label> + </module> + <module> + <label>System Configuration</label> + <name>autoconfigure</name> + </module> + <module> + <label>Clean Up</label> + <name>suseconfig</name> + </module> + </modules> + </workflow> + + </workflows> </productDefines> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kiwi for openSUSE:Factory
by root＠hilbert.suse.de 24 Jan '11

24 Jan '11

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Mon Jan 24 22:11:51 CET 2011. -------- --- kiwi/kiwi.changes 2011-01-07 16:27:19.000000000 +0100 +++ kiwi/kiwi.changes 2011-01-23 21:34:38.000000000 +0100 @@ -1,0 +2,156 @@ +Sun Jan 23 21:28:05 CET 2011 - ms(a)suse.de + +- check the return code for the image container mount call + +------------------------------------------------------------------- +Fri Jan 21 15:46:31 CET 2011 - ms(a)suse.de + +- v4.71 released + +------------------------------------------------------------------- +Fri Jan 21 15:42:15 CET 2011 - ms(a)suse.de + +- fixed partition selection in OEMFindPartitions(). Don't + take any other than 0x83 partition types into account + +------------------------------------------------------------------- +Fri Jan 21 14:54:15 CET 2011 - ms(a)suse.de + +- change the layout of the install ISO / USB stick. The raw + disk image on the install media was compressed using gzip. The + downside is that it's not possible to loop mount the compressed + file. But for partition based installations this is required. + Therefore the raw disk image is now packed into a squashfs + filesystem (bnc #665888) + +------------------------------------------------------------------- +Fri Jan 21 09:31:11 CET 2011 - ms(a)suse.de + +- fixed typos in kiwi_oemunattended and kiwi_oemswap evaluation + which caused wrong content in the oemconfig file + +------------------------------------------------------------------- +Thu Jan 20 17:05:02 CET 2011 - ms(a)suse.de + +- added support for gparted in partition based oem installation + If the partition table does not provide the correct layout + we start a X session with some descriptive message window + and the gparted tool to be able to change the partition + table + +------------------------------------------------------------------- +Thu Jan 20 11:15:23 CET 2011 - ms(a)suse.de + +- added check for $imageDiskDevice and the existence of + $imageBootDevice to the setupBootPartition() function in + order to prevent unused mount actions for /boot + +------------------------------------------------------------------- +Thu Jan 20 09:34:34 CET 2011 - ms(a)suse.de + +- fixed skip check for firstboot and autoyast descriptions + +------------------------------------------------------------------- +Wed Jan 19 14:47:45 CET 2011 - ms(a)suse.de + +- added check which disallows white space in the value for + the displayname attribute + +------------------------------------------------------------------- +Wed Jan 19 10:15:19 CET 2011 - ms(a)suse.de + +- fixed use of undefined value in KIWIXML.pm validation + +------------------------------------------------------------------- +Tue Jan 18 11:42:23 CET 2011 - ms(a)suse.de + +- added support for raid 1 (mirroring) for pxe images + +------------------------------------------------------------------- +Tue Jan 18 10:04:47 CET 2011 - ms(a)suse.de + +- fixed insertion of repo alias and priority commandline options + into the correct section of the XML description. + +------------------------------------------------------------------- +Tue Jan 18 09:39:11 CET 2011 - ms(a)suse.de + +- dont't overwrite firstboot.xml or autoconf.xml if they + exist as overlay files in the overlay root tree + +------------------------------------------------------------------- +Mon Jan 17 11:45:40 CET 2011 - ms(a)suse.de + +- create private __expandFS() function and eliminate some code + duplication by this new function + +------------------------------------------------------------------- +Mon Jan 17 11:28:16 CET 2011 - ms(a)suse.de + +- added check for the PatternType attribute which may only be + used for image and bootstrap packages. Check that this is + set appropriately. + +------------------------------------------------------------------- +Sat Jan 15 21:14:46 CET 2011 - ms(a)suse.de + +- fixed typo in use of oem-shutdown element + +------------------------------------------------------------------- +Fri Jan 14 15:24:10 CET 2011 - ms(a)suse.de + +- fixed evalutation of patternType attribute + +------------------------------------------------------------------- +Thu Jan 13 16:41:55 CET 2011 - ms(a)suse.de + +- make sure fixupFDiskSectors() only fixes the first partition + start sector and doesn't touch the others (bnc #664236) + +------------------------------------------------------------------- +Thu Jan 13 15:58:05 CET 2011 - ms(a)suse.de + +- make sure fixupFDiskSectors() is called on a non busy table (bnc #664236) + +------------------------------------------------------------------- +Thu Jan 13 15:23:21 CET 2011 - ms(a)suse.de + +- fixed fdisk setup in alignment mode. fdisk is not able + to suggest the correct next sector if called with the + option "-u". Therefore only one partition is created in + that mode and the rest is created in fdisk cylinder + based mode (bnc #664236) + +------------------------------------------------------------------- +Thu Jan 13 09:57:05 CET 2011 - ms(a)suse.de + +- added new module KIWILocator which perform operations to + locate objects needed by Kiwi in the filesystem. Along with + the new module other code parts which did that before has + been replaced + +------------------------------------------------------------------- +Thu Jan 13 08:35:39 CET 2011 - ms(a)suse.de + +- added support for satsolver bindings provided with the + perl-satsolver package + +------------------------------------------------------------------- +Mon Jan 10 12:42:08 CET 2011 - ms(a)suse.de + +- fixed syslinux/isolinux configuration for disk based + images. Several problems like missing branding files, + write checks in not existing directories and file checks + in wrong directories were found + +------------------------------------------------------------------- +Mon Jan 10 12:08:44 CET 2011 - ms(a)suse.de + +- fixed syslinux/isolinux config for non graphics boot setup + +------------------------------------------------------------------- +Mon Jan 10 10:35:00 CET 2011 - ms(a)suse.de + +- minor clean up, remove match for yes + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.5FmrLn/_old 2011-01-24 22:10:44.000000000 +0100 +++ /var/tmp/diff_new_pack.5FmrLn/_new 2011-01-24 22:10:44.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kiwi (Version 4.70) +# spec file for package kiwi # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,6 @@ # needsrootforbuild Url: http://kiwi.berlios.de -%define sattools_version %(rpm -q --qf %{VERSION}-%{RELEASE} satsolver-tools) Name: kiwi BuildRequires: perl-Config-IniFiles perl-XML-LibXML perl-libwww-perl @@ -36,14 +35,17 @@ BuildRequires: freetype2-devel libpng-devel qt qt-devel %endif %if %{suse_version} > 1030 -BuildRequires: libexpat-devel libsatsolver-devel rpm-devel +BuildRequires: libexpat-devel rpm-devel +%endif +%if %{suse_version} > 1030 && %{suse_version} <= 1130 +BuildRequires: libsatsolver-devel %endif %if %{suse_version} <= 1010 Requires: qt %endif %ifarch %ix86 x86_64 %if %{suse_version} > 1010 -Recommends: squashfs +Requires: squashfs %endif %endif Requires: perl = %{perl_version} @@ -53,6 +55,9 @@ %if %{suse_version} > 1030 Requires: satsolver-tools %endif +%if %{suse_version} > 1130 +Requires: perl-satsolver +%endif %ifarch %ix86 x86_64 Requires: master-boot-code %if %{suse_version} > 1110 @@ -60,7 +65,7 @@ %endif %endif Summary: OpenSuSE - KIWI Image System -Version: 4.70 +Version: 4.71 Release: 1 Group: System/Management License: GPLv2 ++++++ kiwi-docu.tar.bz2 ++++++ kiwi/kiwi-docu.tar.bz2 kiwi/kiwi-docu.tar.bz2 differ: char 11, line 1 ++++++ kiwi.tar.bz2 ++++++ ++++ 4274 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 24 Jan '11

24 Jan '11

Hello community, here is the log from the commit of package kdebase4-openSUSE for openSUSE:Factory checked in at Mon Jan 24 22:10:18 CET 2011. -------- --- KDE/kdebase4-openSUSE/kdebase4-openSUSE.changes 2011-01-17 10:36:43.000000000 +0100 +++ kdebase4-openSUSE/kdebase4-openSUSE.changes 2011-01-24 14:13:53.000000000 +0100 @@ -1,0 +2,11 @@ +Sun Jan 23 10:52:05 UTC 2011 - wstephenson(a)novell.com + +- Use final Celadon green version of the artwork + +------------------------------------------------------------------- +Thu Jan 20 10:13:46 UTC 2011 - wstephenson(a)novell.com + +- Disable Nepomuk on Live CDs too, too much IO for slow media +- Add synaptiksrc to enable tapping by default again + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.zqPdMS/_old 2011-01-24 22:09:23.000000000 +0100 +++ /var/tmp/diff_new_pack.zqPdMS/_new 2011-01-24 22:09:23.000000000 +0100 @@ -26,7 +26,7 @@ PreReq: %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 11.4 -Release: 7 +Release: 8 # git clone git://git.opensuse.org/projects/desktop/kdebase4-openSUSE.git Source0: kdebase4-openSUSE-%{version}.tar.bz2 Source2: devel-splash.tar.bz2 @@ -269,6 +269,6 @@ %files -n kdelibs4-branding-openSUSE %defattr(-,root,root) %doc branding/COPYING -%_kde4_appsdir/kdeui/about/body-background.jpg +%_kde4_appsdir/kdeui/about/body-background.png %changelog ++++++ kdebase4-openSUSE-11.4.tar.bz2 ++++++ Files old/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdeui/about/body-background.jpg and new/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdeui/about/body-background.jpg differ Files old/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdeui/about/body-background.png and new/kdebase4-openSUSE/branding/root/usr/share/kde4/apps/kdeui/about/body-background.png differ Files old/kdebase4-openSUSE/branding/root/usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg and new/kdebase4-openSUSE/branding/root/usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg differ Files old/kdebase4-openSUSE/branding/root/usr/share/wallpapers/openSUSEdefault/contents/images/1920x1200.jpg and new/kdebase4-openSUSE/branding/root/usr/share/wallpapers/openSUSEdefault/contents/images/1920x1200.jpg differ Files old/kdebase4-openSUSE/branding/root/usr/share/wallpapers/openSUSEdefault/contents/screenshot.jpg and new/kdebase4-openSUSE/branding/root/usr/share/wallpapers/openSUSEdefault/contents/screenshot.jpg differ Files old/kdebase4-openSUSE/branding/root/usr/share/wallpapers/openSUSEdefault/contents/screenshot.png and new/kdebase4-openSUSE/branding/root/usr/share/wallpapers/openSUSEdefault/contents/screenshot.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/branding/root/usr/share/wallpapers/openSUSEdefault/metadata.desktop new/kdebase4-openSUSE/branding/root/usr/share/wallpapers/openSUSEdefault/metadata.desktop --- old/kdebase4-openSUSE/branding/root/usr/share/wallpapers/openSUSEdefault/metadata.desktop 2011-01-17 10:34:32.000000000 +0100 +++ new/kdebase4-openSUSE/branding/root/usr/share/wallpapers/openSUSEdefault/metadata.desktop 2011-01-23 11:54:41.000000000 +0100 @@ -1,7 +1,7 @@ [Desktop Entry] -Name=openSUSE 11.3 +Name=Stripes: openSUSE (Celadon) -X-KDE-PluginInfo-Name=openSUSEdefault -X-KDE-PluginInfo-Author=Jakub Steiner -X-KDE-PluginInfo-Email=jimmac(a)gmail.com -X-KDE-PluginInfo-License=LGPLv3 +X-KDE-PluginInfo-Name=Stripes-openSUSE-celadon +X-KDE-PluginInfo-Author=Ivan Čukić +X-KDE-PluginInfo-Email=ivan.cukic(a)kde.org +X-KDE-PluginInfo-License=GPLv3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/config-files/etc/kde4/share/config/synaptiksrc new/kdebase4-openSUSE/config-files/etc/kde4/share/config/synaptiksrc --- old/kdebase4-openSUSE/config-files/etc/kde4/share/config/synaptiksrc 2011-01-17 10:34:32.000000000 +0100 +++ new/kdebase4-openSUSE/config-files/etc/kde4/share/config/synaptiksrc 2011-01-23 11:54:41.000000000 +0100 @@ -2,8 +2,9 @@ IdleTime=0.8 SwitchOffOnKeyboardActivity=true -[General] -TouchpadStateAtStartup=OnState +[Scrolling] +CoastingSpeed=15 +HorizontalScrollingDistance=1 [Tapping] OneFingerButton=LeftMouseButton diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/config-files/usr/share/kde4/config/SuSE/default/nepomukserverrc.live new/kdebase4-openSUSE/config-files/usr/share/kde4/config/SuSE/default/nepomukserverrc.live --- old/kdebase4-openSUSE/config-files/usr/share/kde4/config/SuSE/default/nepomukserverrc.live 2011-01-17 10:34:32.000000000 +0100 +++ new/kdebase4-openSUSE/config-files/usr/share/kde4/config/SuSE/default/nepomukserverrc.live 2011-01-23 11:54:41.000000000 +0100 @@ -1,9 +1,9 @@ [Basic Settings] Configured repositories=main -Start Nepomuk=true +Start Nepomuk=false [Service-nepomukstrigiservice] -autostart=true +autostart=false [main Settings] Storage Dir[$e]=$HOME/.kde4/share/apps/nepomuk/repository/main/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/config-files/usr/share/kde4/env/startkde.suse.sh new/kdebase4-openSUSE/config-files/usr/share/kde4/env/startkde.suse.sh --- old/kdebase4-openSUSE/config-files/usr/share/kde4/env/startkde.suse.sh 2011-01-17 10:34:32.000000000 +0100 +++ new/kdebase4-openSUSE/config-files/usr/share/kde4/env/startkde.suse.sh 2011-01-23 11:54:41.000000000 +0100 @@ -130,7 +130,7 @@ fi # by default restrict strigi to index xdg-user-dir folders - if [ !-e $HOME/.kde4/share/config/nepomukstrigirc -a -x $(which xdg-user-dir) ]; then + if [ ! -e $HOME/.kde4/share/config/nepomukstrigirc -a -x $(which xdg-user-dir) ]; then for i in DESKTOP DOWNLOAD TEMPLATES PUBLICSHARE DOCUMENTS MUSIC PICTURES VIDEOS; do strigi_paths="${strigi_paths},$(xdg-user-dir $i)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/po/ru/SUSEgreeter.po new/kdebase4-openSUSE/po/ru/SUSEgreeter.po --- old/kdebase4-openSUSE/po/ru/SUSEgreeter.po 2010-06-25 10:36:08.000000000 +0200 +++ new/kdebase4-openSUSE/po/ru/SUSEgreeter.po 2011-01-20 11:08:03.000000000 +0100 @@ -60,7 +60,7 @@ #. i18n: file: greet.xml:11 #: rc.cpp:10 msgid "The openSUSE community are helpful people. Various ways exist to contact other openSUSE members, ask questions, discuss openSUSE and Linux. The official <a href=\"http://forums.opensuse.org/\">openSUSE Forums</a> are very accessible. Other ways including online chat are described on our <a href=\"http://help.opensuse.org/\">Online Help</a> site." -msgstr "Сообщество openSUSE — это люди, всегда готовые помочь. Есть много способов связаться с членами сообщества, задать вопросы, обсудить openSUSE и Linux. На <a href=\"http://forums.opensuse.org/\">официальном форуме openSUSE</a> есть <a href=\"http://forums.opensuse.org/language-specific-forums/p-russian/\">русскоязычный раздел</a>. Чат, списки рассылки и другие способы общения описаны на <a href=\"http://help.opensuse.org/\">справочном портале</a>." +msgstr "Сообщество openSUSE — это люди, всегда готовые помочь. Есть много способов связаться с членами сообщества, задать вопросы, обсудить openSUSE и Linux. На <a href=\"http://forums.opensuse.org/\">официальном форуме openSUSE</a> есть <a href=\"http://forums.opensuse.org/p-russian/\">русскоязычный раздел</a>. Чат, списки рассылки и другие способы общения описаны на <a href=\"http://help.opensuse.org/\">справочном портале</a>." #. i18n: file: greet.xml:14 #: rc.cpp:12 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/sysinfo/kio_sysinfo/src/ksysinfopart.desktop new/kdebase4-openSUSE/sysinfo/kio_sysinfo/src/ksysinfopart.desktop --- old/kdebase4-openSUSE/sysinfo/kio_sysinfo/src/ksysinfopart.desktop 2010-10-03 12:13:58.000000000 +0200 +++ new/kdebase4-openSUSE/sysinfo/kio_sysinfo/src/ksysinfopart.desktop 2011-01-20 07:28:22.000000000 +0100 @@ -1,7 +1,7 @@ [Desktop Entry] Type=Service Comment=Sysinfo Viewer -Comment[da]=Fremviser til sysinf +Comment[da]=Fremviser til sysinfo Comment[de]=Betrachter für System-Informationen Comment[el]=Προβολέας Sysinfo Comment[en_GB]=Sysinfo Viewer ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit installation-images for openSUSE:Factory
by root＠hilbert.suse.de 24 Jan '11

24 Jan '11

Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at Mon Jan 24 22:09:04 CET 2011. -------- --- installation-images/installation-images.changes 2011-01-14 12:19:38.000000000 +0100 +++ installation-images/installation-images.changes 2011-01-20 15:16:44.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Jan 20 15:16:31 CET 2011 - snwint(a)suse.de + +- added AutoUpgrade option to linuxrc + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- installation-images-12.73.tar.bz2 needed_space_in_mb New: ---- installation-images-12.74.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.mSabtd/_old 2011-01-24 22:08:44.000000000 +0100 +++ /var/tmp/diff_new_pack.mSabtd/_new 2011-01-24 22:08:44.000000000 +0100 @@ -106,9 +106,9 @@ Obsoletes: y2image AutoReqProv: off Summary: Installation Image Files -Version: 12.73 +Version: 12.74 Release: 1 -Source: installation-images-12.73.tar.bz2 +Source: installation-images-12.74.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio ++++++ installation-images-12.73.tar.bz2 -> installation-images-12.74.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.73/VERSION new/installation-images-12.74/VERSION --- old/installation-images-12.73/VERSION 2011-01-14 12:19:11.000000000 +0100 +++ new/installation-images-12.74/VERSION 2011-01-20 15:16:26.000000000 +0100 @@ -1 +1 @@ -12.73 +12.74 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.73/changelog new/installation-images-12.74/changelog --- old/installation-images-12.73/changelog 2011-01-14 12:19:14.000000000 +0100 +++ new/installation-images-12.74/changelog 2011-01-20 15:16:30.000000000 +0100 @@ -1,4 +1,7 @@ -2011-01-14: HEAD +2011-01-20: HEAD + - added AutoUpgrade option to linuxrc + +2011-01-14: 12.73 - we have libmount now 2011-01-13: 12.72 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.73/data/initrd/SLED.file_list new/installation-images-12.74/data/initrd/SLED.file_list --- old/installation-images-12.73/data/initrd/SLED.file_list 2011-01-12 15:39:13.000000000 +0100 +++ new/installation-images-12.74/data/initrd/SLED.file_list 2011-01-20 13:56:09.000000000 +0100 @@ -52,3 +52,5 @@ e echo "KexecReboot: 0" >>linuxrc.config +e echo "PTOptions: AutoUpgrade" >>linuxrc.config + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.73/data/initrd/SLES.file_list new/installation-images-12.74/data/initrd/SLES.file_list --- old/installation-images-12.73/data/initrd/SLES.file_list 2011-01-12 15:39:13.000000000 +0100 +++ new/installation-images-12.74/data/initrd/SLES.file_list 2011-01-20 13:56:01.000000000 +0100 @@ -52,3 +52,5 @@ e echo "KexecReboot: 0" >>linuxrc.config +e echo "PTOptions: AutoUpgrade" >>linuxrc.config + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.73/data/initrd/Zen.file_list new/installation-images-12.74/data/initrd/Zen.file_list --- old/installation-images-12.73/data/initrd/Zen.file_list 2011-01-12 15:39:13.000000000 +0100 +++ new/installation-images-12.74/data/initrd/Zen.file_list 2011-01-20 13:56:23.000000000 +0100 @@ -69,3 +69,5 @@ e echo "Insecure: 1" >>linuxrc.config +e echo "PTOptions: AutoUpgrade" >>linuxrc.config + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.73/data/initrd/openSUSE.file_list new/installation-images-12.74/data/initrd/openSUSE.file_list --- old/installation-images-12.73/data/initrd/openSUSE.file_list 2011-01-12 15:39:13.000000000 +0100 +++ new/installation-images-12.74/data/initrd/openSUSE.file_list 2011-01-20 13:50:30.000000000 +0100 @@ -52,3 +52,5 @@ e echo "KexecReboot: 1" >>linuxrc.config +e echo "PTOptions: AutoUpgrade" >>linuxrc.config + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-driver-video for openSUSE:Factory
by root＠hilbert.suse.de 24 Jan '11

24 Jan '11

Hello community, here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory checked in at Mon Jan 24 16:30:37 CET 2011. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2011-01-08 22:28:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2011-01-22 11:51:42.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Jan 22 10:40:42 UTC 2011 - sndirsch(a)novell.com + +- xf86-video-ati (2011-01-21, fadee04) + * latest git version of radeon driver, which includes Evergreen + support + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xf86-video-ati-6.13.2.tar.bz2 New: ---- xf86-video-ati-6.13.99-20110121-fadee04.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.FM2Rk0/_old 2011-01-24 16:30:33.000000000 +0100 +++ /var/tmp/diff_new_pack.FM2Rk0/_new 2011-01-24 16:30:33.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package xorg-x11-driver-video (Version 7.6) +# spec file for package xorg-x11-driver-video # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.6 -Release: 3 +Release: 4 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -67,7 +67,7 @@ Source42: xf86-video-voodoo-1.2.4.tar.bz2 Source44: HALlib-4.1.tar.gz Source45: xf86-video-intel-2.14.0.tar.bz2 -Source46: xf86-video-ati-6.13.2.tar.bz2 +Source46: xf86-video-ati-6.13.99-20110121-fadee04.tar.bz2 Source51: xf86-video-geode-2.11.10.tar.bz2 Source54: xf86-video-mach64-6.8.2.tar.bz2 Source55: xf86-video-r128-6.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- 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-client for openSUSE:Factory
by root＠hilbert.suse.de 24 Jan '11

24 Jan '11

Hello community, here is the log from the commit of package yast2-ldap-client for openSUSE:Factory checked in at Mon Jan 24 16:30:19 CET 2011. -------- --- yast2-ldap-client/yast2-ldap-client.changes 2011-01-13 11:40:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-ldap-client/yast2-ldap-client.changes 2011-01-24 15:14:18.000000000 +0100 @@ -1,0 +2,36 @@ +Mon Jan 24 15:12:08 CET 2011 - jsuchome(a)suse.cz + +- look for 'sss' in nsswitch.conf, not for 'sssd' (bnc#666184) +- 2.20.11 + +------------------------------------------------------------------- +Fri Jan 21 17:01:21 CET 2011 - jsuchome(a)suse.cz + +- explicitely ask for kerberos+sssd enablement +- 2.20.10 + +------------------------------------------------------------------- +Fri Jan 21 14:40:48 CET 2011 - jsuchome(a)suse.cz + +- if sssd is active, ask for basic Kerberos settings (fate#308902) +- 2.20.9 + +------------------------------------------------------------------- +Fri Jan 21 12:27:22 CET 2011 - jsuchome(a)suse.cz + +- agent for sssd.conf moved to yast2-pam to be accessible for + kerberos-client + +------------------------------------------------------------------- +Thu Jan 20 16:41:00 CET 2011 - jsuchome(a)suse.cz + +- write default_realm as realm +- 2.20.8 + +------------------------------------------------------------------- +Thu Jan 20 16:18:04 CET 2011 - jsuchome(a)suse.cz + +- remove pam_krb5 when sssd is configured (fate#308902) +- 2.20.7 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-ldap-client-2.20.6.tar.bz2 New: ---- yast2-ldap-client-2.20.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ldap-client.spec ++++++ --- /var/tmp/diff_new_pack.F5jKae/_old 2011-01-24 16:30:09.000000000 +0100 +++ /var/tmp/diff_new_pack.F5jKae/_new 2011-01-24 16:30:09.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ldap-client (Version 2.20.6) +# spec file for package yast2-ldap-client # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-ldap-client -Version: 2.20.6 +Version: 2.20.11 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ldap-client-2.20.6.tar.bz2 +Source0: yast2-ldap-client-2.20.11.tar.bz2 Prefix: /usr @@ -41,8 +41,9 @@ # removed lowercasing of LDAP object names Requires: yast2-ldap >= 2.17.1 -# new API of Pam.ycp -Requires: yast2-pam >= 2.14.0 +# etc_sssd_conf.scr +Requires: yast2-pam >= 2.20.0 + Provides: yast2-config-ldap_client Obsoletes: yast2-config-ldap_client Provides: yast2-trans-ldap_client @@ -57,7 +58,7 @@ OpenLDAP server will be used for user authentication. %prep -%setup -n yast2-ldap-client-2.20.6 +%setup -n yast2-ldap-client-2.20.11 %build %{prefix}/bin/y2tool y2autoconf @@ -101,4 +102,5 @@ %doc %{prefix}/share/doc/packages/yast2-ldap-client /var/adm/fillup-templates/sysconfig.ldap + %changelog ++++++ yast2-ldap-client-2.20.6.tar.bz2 -> yast2-ldap-client-2.20.11.tar.bz2 ++++++ ++++ 2123 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/yast2-ldap-client-2.20.6/VERSION new/yast2-ldap-client-2.20.11/VERSION --- old/yast2-ldap-client-2.20.6/VERSION 2011-01-13 11:38:24.000000000 +0100 +++ new/yast2-ldap-client-2.20.11/VERSION 2011-01-24 15:12:43.000000000 +0100 @@ -1 +1 @@ -2.20.6 +2.20.11 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/yast2-ldap-client-2.20.6/agents/Makefile.am new/yast2-ldap-client-2.20.11/agents/Makefile.am --- old/yast2-ldap-client-2.20.6/agents/Makefile.am 2010-12-07 16:45:15.000000000 +0100 +++ new/yast2-ldap-client-2.20.11/agents/Makefile.am 2011-01-21 16:23:43.000000000 +0100 @@ -1,12 +1,11 @@ # # Makefile.am for y2c_ldap_client/agents # -# $Id: Makefile.am 62970 2010-12-07 15:45:14Z jsuchome $ +# $Id: Makefile.am 63255 2011-01-21 15:23:42Z jsuchome $ # scrconf_DATA = ldap_conf.scr \ - cfg_ldap.scr \ - etc_sssd_conf.scr + cfg_ldap.scr fillup_DATA = sysconfig.ldap 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/yast2-ldap-client-2.20.6/agents/etc_sssd_conf.scr new/yast2-ldap-client-2.20.11/agents/etc_sssd_conf.scr --- old/yast2-ldap-client-2.20.6/agents/etc_sssd_conf.scr 2011-01-06 14:06:15.000000000 +0100 +++ new/yast2-ldap-client-2.20.11/agents/etc_sssd_conf.scr 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -# - -.etc.sssd_conf - -`ag_ini( - `IniAgent("/etc/sssd/sssd.conf", $[ - "options" : [ "ignore_case_regexps", "line_can_continue"], - "comments": [ - "^[ \t]*$", // empty line - "^[ \t]*[;#].*" - ], - "sections" : [ - $[ - "begin" : [ "^[ \t]*\\[[ \t]*(.*[^ \t])[ \t]*\\][ \t]*", "[%s]" ], - ] - ], - "params" : [ - $[ - "match" : [ "^[ \t]*([a-z0-9:_ ]*[a-z])[ \t]*=[ \t]*(.*[^ \t])[ \t]*$" , "%s = %s"], - ] - ] - ] - ) -) - 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/yast2-ldap-client-2.20.6/configure.in new/yast2-ldap-client-2.20.11/configure.in --- old/yast2-ldap-client-2.20.6/configure.in 2010-11-24 15:57:58.000000000 +0100 +++ new/yast2-ldap-client-2.20.11/configure.in 2011-01-21 14:41:38.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ldap-client, 2.20.0, http://bugs.opensuse.org/, yast2-ldap-client) +AC_INIT(yast2-ldap-client, 2.20.9, http://bugs.opensuse.org/, yast2-ldap-client) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.20.0" +VERSION="2.20.9" RPMNAME="yast2-ldap-client" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" 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/yast2-ldap-client-2.20.6/src/Ldap.ycp new/yast2-ldap-client-2.20.11/src/Ldap.ycp --- old/yast2-ldap-client-2.20.6/src/Ldap.ycp 2011-01-13 11:36:42.000000000 +0100 +++ new/yast2-ldap-client-2.20.11/src/Ldap.ycp 2011-01-24 15:13:49.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Thorsten Kukuk <kukuk(a)suse.de> * Anas Nashif <nashif(a)suse.de> * - * $Id: Ldap.ycp 63166 2011-01-12 12:19:05Z jsuchome $ + * $Id: Ldap.ycp 63259 2011-01-24 14:13:48Z jsuchome $ */ { @@ -300,12 +300,24 @@ // packages needed for sssd configuration global list<string> sssd_packages = [ "sssd" ]; + // packages needed for sssd + kerberos configuration + global list<string> kerberos_packages = [ "kerberos-client" ]; + // if sssd is used instead of pam_ldap/nss_ldap (fate#308902) global boolean sssd = true; // enable/disable offline authentication ('cache_credentials' key) global boolean sssd_cache_credentials = false; + // if kerberos should be set up for sssd + global boolean sssd_with_krb = false; + + // Kerberos default realm (for sssd) + global string krb5_realm = ""; + + // adress of KDC (key distribution centre) server for default realm + global string krb5_kdcip = ""; + //---------------------------------------------------------------- /** @@ -380,8 +392,12 @@ global define map AutoPackages() ``{ if (start) + { required_packages = (list<string>) union (required_packages, sssd ? sssd_packages : pam_nss_packages); + if (sssd_with_krb) + required_packages = (list<string>) union (required_packages, kerberos_packages); + } return ($["install": required_packages, "remove": []]); } @@ -415,6 +431,8 @@ tls_checkpeer = settings ["tls_checkpeer"]:"yes"; mkhomedir = settings ["mkhomedir"]:mkhomedir; sssd = settings ["sssd"]:sssd; + krb5_realm = settings ["krb5_realm"]:krb5_realm; + krb5_kdcip = settings ["krb5_kdcip"]:krb5_kdcip; if (_start_autofs) required_packages = (list<string>) union (required_packages, ["autofs"]); @@ -457,7 +475,7 @@ "create_ldap" : create_ldap, "login_enabled" : login_enabled, "mkhomedir" : mkhomedir, - "sssd" : sssd + "sssd" : sssd, ]; if (tls_checkpeer != "yes") e["tls_checkpeer"] = tls_checkpeer; @@ -473,6 +491,10 @@ e["nss_base_group"] = nss_base_group; if (_autofs_allowed) e["start_autofs"] = _start_autofs; + if (krb5_realm != "") + e["krb5_realm"] = krb5_realm; + if (krb5_kdcip != "") + e["krb5_kdcip"] = krb5_kdcip; return e; } @@ -543,6 +565,26 @@ /* ------------- read/write functions ------------------------------- */ /** + * For sssd, some kerberos values are needed + */ + global boolean ReadKrb5Conf () + { + + list<string> realm = (list<string>) SCR::Read (.etc.krb5_conf.v.libdefaults.default_realm); + if (realm == nil) + realm = []; + krb5_realm = realm[0]:""; + + list<string> kdcs = (list<string>) SCR::Read (add (add (.etc.krb5_conf.v, krb5_realm), "kdc")); + if (kdcs == nil) + kdcs = []; + krb5_kdcip = mergestring (kdcs, " "); + + return true; + } + + + /** * Read single entry from /etc/ldap.conf file * @param entry entry name * @param defvalue default value if entry is not present @@ -702,7 +744,7 @@ else { // ... or as 'sssd' - start = contains (nsswitch["passwd"]:[], "sssd"); + start = contains (nsswitch["passwd"]:[], "sss"); } // nothing is configured, but some packages are installed @@ -844,6 +886,25 @@ Autologin::Read (); + if (Pam::Enabled ("krb5")) + { + ReadKrb5Conf (); + } + if (FileUtils::Exists ("/etc/sssd/sssd.conf")) + { + // read realm and kdc from sssd.conf if available + path domain = add (.etc.sssd_conf.v, "domain/default"); + string realm = (string) SCR::Read (add (domain, "krb5_realm")); + if (realm != nil) + krb5_realm = realm; + string kdc = (string) SCR::Read (add (domain, "krb5_kdcip")); + if (kdc != nil) + krb5_kdcip = kdc; + } + if (krb5_realm != "" && krb5_kdcip != "") + { + sssd_with_krb = true; + } // Now check if previous configuration of LDAP server didn't proposed // some better values: @@ -2047,31 +2108,13 @@ } // In a mixed Kerberos/LDAP setup the following changes are needed in the [domain/default] section: - if (Pam::Enabled("krb5")) + if (sssd_with_krb) { SCR::Write (add (domain, "auth_provider"), "krb5"); SCR::Write (add (domain, "chpass_provider"), "krb5"); - /* - FIXME how to read krb settings: - a) use agent directly (moved out from yast2-kerberos-client) - b) use Read + Export of Kerberos.ycp - - * Set "krb5_kdcip" to the hostname of the kerberos kdc - * Set "krb5_realm" to kerberos realm - */ - if (Package::Installed ("yast2-kerberos-client")) - { - WFM::CallFunction ("kerberos-client_auto", ["Read"]); - any e = WFM::CallFunction ("kerberos-client_auto",["Export"]); - if (is (e,map) && e != $[]) - { - map kerberos = (map) e; -y2internal ("kerberos export map: %1", kerberos); - SCR::Write (add (domain, "krb5_realm"), kerberos["kerberos_client","default_domain"]:nil); - SCR::Write (add (domain, "krb5_kdcip"), kerberos["kerberos_client","kdc_server"]:nil); - } - } + SCR::Write (add (domain, "krb5_realm"), krb5_realm); + SCR::Write (add (domain, "krb5_kdcip"), krb5_kdcip); } else { @@ -2581,6 +2624,11 @@ union (nsswitch["passwd"]:[], ["sss"])); Nsswitch::WriteDb ("group", (list<string>) union (nsswitch["group"]:[], ["sss"])); + if (Pam::Enabled("krb5")) + { + y2milestone ("configuring 'sss', so 'krb5' will be removed"); + Pam::Remove ("krb5"); + } } else { @@ -2846,6 +2894,8 @@ block<boolean> abort = ``{ return false; }; list<string> needed_packages = sssd ? sssd_packages : pam_nss_packages; + if (sssd_with_krb) + needed_packages = (list<string>) union (needed_packages, kerberos_packages); if (_start_autofs && !Package::Installed("autofs")) { 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/yast2-ldap-client-2.20.6/src/LdapPopup.ycp new/yast2-ldap-client-2.20.11/src/LdapPopup.ycp --- old/yast2-ldap-client-2.20.6/src/LdapPopup.ycp 2011-01-13 11:36:57.000000000 +0100 +++ new/yast2-ldap-client-2.20.11/src/LdapPopup.ycp 2011-01-13 11:52:00.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Additional user interface functions: special edit popups * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: LdapPopup.ycp 51747 2008-10-01 13:35:55Z jsuchome $ + * $Id: LdapPopup.ycp 63176 2011-01-13 10:51:59Z jsuchome $ * * Popups for editing the values of LDAP configuration tables. */ 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/yast2-ldap-client-2.20.6/src/ui.ycp new/yast2-ldap-client-2.20.11/src/ui.ycp --- old/yast2-ldap-client-2.20.6/src/ui.ycp 2011-01-13 11:34:05.000000000 +0100 +++ new/yast2-ldap-client-2.20.11/src/ui.ycp 2011-01-21 17:02:06.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Thorsten Kukuk <kukuk(a)suse.de> * Anas Nashif <nashif(a)suse.de> * - * $Id: ui.ycp 63173 2011-01-12 15:57:26Z jsuchome $ + * $Id: ui.ycp 63257 2011-01-21 16:02:05Z jsuchome $ * * All user interface functions. */ @@ -516,6 +516,8 @@ } list<string> needed_packages = Ldap::sssd ? Ldap::sssd_packages : Ldap::pam_nss_packages; + if (Ldap::sssd_with_krb) + needed_packages = (list<string>) union (needed_packages, Ldap::kerberos_packages); if (start && !Package::InstalledAll (needed_packages)) { @@ -715,6 +717,9 @@ string tls_cacertdir = Ldap::tls_cacertdir; string tls_cacertfile = Ldap::tls_cacertfile; boolean sssd = Ldap::sssd; + string krb5_realm = Ldap::krb5_realm; + string krb5_kdcip = Ldap::krb5_kdcip; + boolean sssd_with_krb = Ldap::sssd_with_krb; list<term>member_attributes = [ `item (`id("member"), "member", member_attribute == "member"), @@ -833,12 +838,8 @@ ); } - define void set_client_term () { - - term cont = `Top (`HBox(`HSpacing (5), `VBox( - `VSpacing(0.4), - `Left (`CheckBox (`id (`sssd), `opt (`notify), _("Use S&ystem Security Services Daemon (SSSD)"), sssd)), - `VSpacing(0.4), + term get_frame_nss () { + return // frame label `Frame (_("Naming Contexts"), `HBox( `HSpacing (1), `VBox( @@ -876,7 +877,31 @@ `VSpacing(0.4) ), `HSpacing (1) - )), + )); + } + + term get_frame_krb () { + return + // frame label + `Frame (_("Basic Kerberos Settings"), `HBox (`HSpacing (1), `VBox ( + // checkbox label + `Left (`CheckBox (`id (`sssd_with_krb), `opt (`notify), _("&Use Kerberos"), sssd_with_krb)), + `VSpacing(0.4), + // textentry label + `TextEntry (`id (`krb5_realm), _("Default Real&m"), krb5_realm), + // textentry label + `TextEntry (`id (`krb5_kdcip), _("&KDC Server Address"), krb5_kdcip), + `VSpacing (0.4) + ), `HSpacing (1))); + } + + define void set_client_term () { + + term cont = `Top (`HBox(`HSpacing (5), `VBox( + `VSpacing(0.4), + `Left (`CheckBox (`id (`sssd), `opt (`notify), _("Use S&ystem Security Services Daemon (SSSD)"), sssd)), + `VSpacing(0.4), + `ReplacePoint (`id (`rp_frame), `VBox (sssd ? get_frame_krb () : get_frame_nss ())), `VSpacing (0.4), `ComboBox (`id (`pam_password), `opt(`notify,`hstretch,`editable), // combobox label @@ -915,10 +940,11 @@ UI::ReplaceWidget (`tabContents, cont); if (has_tabs) UI::ChangeWidget (`id (`tabs), `CurrentItem, `client); - - foreach (symbol ui, [ `nss_base_passwd, `nss_base_group, `nss_base_shadow, `br_passwd, `br_shadow, `br_group ], { - UI::ChangeWidget (`id (ui), `Enabled, UI::QueryWidget (`id (`sssd), `Value) == false); - }); + if (sssd) + { + UI::ChangeWidget (`id (`krb5_realm), `Enabled, sssd_with_krb); + UI::ChangeWidget (`id (`krb5_kdcip), `Enabled, sssd_with_krb); + } } define void set_admin_term () { @@ -1014,12 +1040,23 @@ if (current == `client) { member_attribute =(string)UI::QueryWidget(`id(`group_style),`Value); - nss_base_passwd = (string) - UI::QueryWidget(`id(`nss_base_passwd),`Value); - nss_base_shadow = (string) - UI::QueryWidget(`id(`nss_base_shadow),`Value); - nss_base_group = (string) - UI::QueryWidget(`id(`nss_base_group),`Value); + + if (sssd) + { + krb5_realm = (string) + UI::QueryWidget (`id (`krb5_realm), `Value); + krb5_kdcip = (string) + UI::QueryWidget (`id (`krb5_kdcip), `Value); + } + else + { + nss_base_passwd = (string) + UI::QueryWidget(`id(`nss_base_passwd),`Value); + nss_base_shadow = (string) + UI::QueryWidget(`id(`nss_base_shadow),`Value); + nss_base_group = (string) + UI::QueryWidget(`id(`nss_base_group),`Value); + } pam_password = (string) UI::QueryWidget(`id(`pam_password), `Value); tls_cacertfile = (string) UI::QueryWidget(`id(`tls_cacertfile), `Value); @@ -1079,9 +1116,13 @@ if (result == `sssd) { sssd = (boolean) UI::QueryWidget (`id (`sssd), `Value); - foreach (symbol ui, [ `nss_base_passwd, `nss_base_group, `nss_base_shadow, `br_passwd, `br_shadow, `br_group ], { - UI::ChangeWidget (`id (ui), `Enabled, !sssd); - }); + UI::ReplaceWidget (`id (`rp_frame), sssd ? get_frame_krb () : get_frame_nss ()); + } + if (result == `sssd_with_krb) + { + sssd_with_krb = (boolean) UI::QueryWidget (`id (`sssd_with_krb), `Value); + UI::ChangeWidget (`id (`krb5_realm), `Enabled, sssd_with_krb); + UI::ChangeWidget (`id (`krb5_kdcip), `Enabled, sssd_with_krb); } if (result == `br_tls_cacertdir) { @@ -1257,6 +1298,8 @@ Ldap::ppolicies[dn] = pp; } }); + if (krb5_realm == "" || krb5_kdcip == "" || !sssd) + sssd_with_krb = false; if (Ldap::GetMainConfigDN() != base_config_dn || Ldap::bind_dn != bind_dn || @@ -1270,7 +1313,9 @@ Ldap::ldap_v2 != ldap_v2 || Ldap::tls_cacertdir != tls_cacertdir || Ldap::tls_cacertfile != tls_cacertfile || - Ldap::sssd != sssd + Ldap::sssd != sssd || + Ldap::krb5_realm != krb5_realm || + Ldap::krb5_kdcip != krb5_kdcip ) { Ldap::bind_dn = bind_dn; @@ -1286,6 +1331,9 @@ Ldap::tls_cacertdir = tls_cacertdir; Ldap::tls_cacertfile = tls_cacertfile; Ldap::sssd = sssd; + Ldap::krb5_realm = krb5_realm; + Ldap::krb5_kdcip = krb5_kdcip; + Ldap::sssd_with_krb = sssd_with_krb; Ldap::modified = true; } break; 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/yast2-ldap-client-2.20.6/testsuite/tests/Export.out new/yast2-ldap-client-2.20.11/testsuite/tests/Export.out --- old/yast2-ldap-client-2.20.6/testsuite/tests/Export.out 2011-01-12 13:01:52.000000000 +0100 +++ new/yast2-ldap-client-2.20.11/testsuite/tests/Export.out 2011-01-21 14:19:25.000000000 +0100 @@ -17,6 +17,8 @@ Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_map_attribute" 0 Execute .passwd.init $["base_directory":"/etc"] true Read .passwd.passwd.pluslines ["+"] +Read .etc.krb5_conf.v.libdefaults.default_realm ["SUSE.CZ"] +Read .etc.krb5_conf.v."SUSE.CZ"."kdc" ["kdc.suse.cz"] Return true Dump ============================================ -Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":false, "ldap_v2":false, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "sssd":false, "start_autofs":false, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] +Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "krb5_kdcip":"kdc.suse.cz", "krb5_realm":"SUSE.CZ", "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":false, "ldap_v2":false, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "sssd":false, "start_autofs":false, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] 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/yast2-ldap-client-2.20.6/testsuite/tests/Export.ycp new/yast2-ldap-client-2.20.11/testsuite/tests/Export.ycp --- old/yast2-ldap-client-2.20.6/testsuite/tests/Export.ycp 2011-01-12 13:19:06.000000000 +0100 +++ new/yast2-ldap-client-2.20.11/testsuite/tests/Export.ycp 2011-01-21 16:23:43.000000000 +0100 @@ -2,7 +2,7 @@ * Read.ycp * Test of Ldap:Read function * Author: Jiri Suchomel <jsuchome(a)suse.cz> - * $Id: Export.ycp 63166 2011-01-12 12:19:05Z jsuchome $ + * $Id: Export.ycp 63255 2011-01-21 15:23:42Z jsuchome $ */ { @@ -36,6 +36,16 @@ ] ] ], + "krb5_conf" : $[ + "v" : $[ + "libdefaults": $[ + "default_realm": ["SUSE.CZ"], + ], + "SUSE.CZ": $[ + "kdc": ["kdc.suse.cz"], + ], + ], + ], // /etc/security/pam_* "security": $[ "section": $[ 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/yast2-ldap-client-2.20.6/testsuite/tests/LDAPInit.ycp new/yast2-ldap-client-2.20.11/testsuite/tests/LDAPInit.ycp --- old/yast2-ldap-client-2.20.6/testsuite/tests/LDAPInit.ycp 2011-01-13 11:39:40.000000000 +0100 +++ new/yast2-ldap-client-2.20.11/testsuite/tests/LDAPInit.ycp 2011-01-13 11:52:00.000000000 +0100 @@ -2,7 +2,7 @@ * LDAPInit.ycp * Test of Ldap:LDAPInit, LDAPError, GetFirstServer, GetFirstPort functions * Author: Jiri Suchomel <jsuchome(a)suse.cz> - * $Id: LDAPInit.ycp 51164 2008-09-15 15:12:00Z jsrain $ + * $Id: LDAPInit.ycp 63176 2011-01-13 10:51:59Z jsuchome $ */ { 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/yast2-ldap-client-2.20.6/testsuite/tests/Read.ycp new/yast2-ldap-client-2.20.11/testsuite/tests/Read.ycp --- old/yast2-ldap-client-2.20.6/testsuite/tests/Read.ycp 2011-01-12 13:19:06.000000000 +0100 +++ new/yast2-ldap-client-2.20.11/testsuite/tests/Read.ycp 2011-01-21 16:23:43.000000000 +0100 @@ -2,7 +2,7 @@ * Read.ycp * Test of Ldap:Read function * Author: Jiri Suchomel <jsuchome(a)suse.cz> - * $Id: Read.ycp 63166 2011-01-12 12:19:05Z jsuchome $ + * $Id: Read.ycp 63255 2011-01-21 15:23:42Z jsuchome $ */ { @@ -36,6 +36,16 @@ ] ] ], + "krb5_conf" : $[ + "v" : $[ + "libdefaults": $[ + "default_realm": ["SUSE.CZ"], + ], + "SUSE.CZ": $[ + "kdc": ["kdc.suse.cz"], + ], + ], + ], // /etc/security/pam_* "security": $[ "section": $[ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0