August 2008 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-x11
by root＠Hilbert.suse.de 30 Aug '08

30 Aug '08

Hello community, here is the log from the commit of package yast2-x11 checked in at Sat Aug 30 02:59:41 CEST 2008. -------- --- yast2-x11/yast2-x11.changes 2008-05-16 22:04:58.000000000 +0200 +++ yast2-x11/yast2-x11.changes 2008-08-30 00:59:37.647783000 +0200 @@ -1,0 +2,23 @@ +Fri Aug 29 23:02:24 CEST 2008 - jdsn(a)suse.de + +- tablet configuration support during installation (fate#302888) +- make sure traversal has numeric value (bnc#388259) +- consistent dialogs for proposal changes +- cleanup in XMessages strings +- 2.17.1 + +------------------------------------------------------------------- +Thu Aug 22 19:45:39 CEST 2008 - jdsn(a)suse.de + +- using exact display parameters during installation (bnc#399411) +- removed 32bit color depth from autoyast (bnc#405797) + +------------------------------------------------------------------- +Tue Jun 24 19:00:47 CEST 2008 - jdsn(a)suse.de + +- proper type conversion in autoinstallation (bnc#307967) +- check for empty traversal parameter (bnc#388259) +- show popup message before probing display (bnc#327604) +- 2.17.0 + +------------------------------------------------------------------- Old: ---- yast2-x11-2.15.12.tar.bz2 New: ---- yast2-x11-2.17.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-x11.spec ++++++ --- /var/tmp/diff_new_pack.U15814/_old 2008-08-30 02:55:41.000000000 +0200 +++ /var/tmp/diff_new_pack.U15814/_new 2008-08-30 02:55:41.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-x11 (Version 2.15.12) +# spec file for package yast2-x11 (Version 2.17.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,12 +19,12 @@ Name: yast2-x11 -Version: 2.15.12 -Release: 10 +Version: 2.17.1 +Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-x11-2.15.12.tar.bz2 +Source0: yast2-x11-2.17.1.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer qt3-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-perl-bindings yast2-testsuite %ifnarch s390 s390x @@ -45,7 +52,7 @@ Marcus Schaefer %prep -%setup -n yast2-x11-2.15.12 +%setup -n yast2-x11-2.17.1 %build %{prefix}/bin/y2tool y2autoconf @@ -81,6 +88,20 @@ /usr/share/YaST2/schema/autoyast/rnc/*.rnc %doc %{prefix}/share/doc/packages/yast2-x11 %changelog +* Sat Aug 30 2008 jdsn(a)suse.de +- tablet configuration support during installation (fate#302888) +- make sure traversal has numeric value (bnc#388259) +- consistent dialogs for proposal changes +- cleanup in XMessages strings +- 2.17.1 +* Fri Aug 22 2008 jdsn(a)suse.de +- using exact display parameters during installation (bnc#399411) +- removed 32bit color depth from autoyast (bnc#405797) +* Tue Jun 24 2008 jdsn(a)suse.de +- proper type conversion in autoinstallation (bnc#307967) +- check for empty traversal parameter (bnc#388259) +- show popup message before probing display (bnc#327604) +- 2.17.0 * Fri May 16 2008 jsrain(a)suse.cz - added categories Settings and System into desktop file (bnc #382778) ++++++ yast2-x11-2.15.12.tar.bz2 -> yast2-x11-2.17.1.tar.bz2 ++++++ ++++ 5272 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-x11-2.15.12/configure.in new/yast2-x11-2.17.1/configure.in --- old/yast2-x11-2.15.12/configure.in 2008-05-19 20:12:21.000000000 +0200 +++ new/yast2-x11-2.17.1/configure.in 2008-08-30 01:01:15.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-x11 dnl -dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-x11, 2.15.12, http://bugs.opensuse.org/, yast2-x11) +AC_INIT(yast2-x11, 2.17.1, http://bugs.opensuse.org/, yast2-x11) 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.15.12" +VERSION="2.17.1" RPMNAME="yast2-x11" MAINTAINER="J. Daniel Schmidt <jdsn(a)suse.de>" 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-x11-2.15.12/src/autoyast/dialog/autoDialog.ycp new/yast2-x11-2.17.1/src/autoyast/dialog/autoDialog.ycp --- old/yast2-x11-2.15.12/src/autoyast/dialog/autoDialog.ycp 2008-05-08 23:53:55.000000000 +0200 +++ new/yast2-x11-2.17.1/src/autoyast/dialog/autoDialog.ycp 2008-08-30 01:00:49.000000000 +0200 @@ -3,7 +3,7 @@ * Summary: Handle X11 dialogs * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: autoDialog.ycp 47385 2008-05-08 21:53:55Z jdsn $ + * $Id: autoDialog.ycp 50498 2008-08-29 23:00:48Z jdsn $ */ { textdomain "x11"; @@ -12,6 +12,7 @@ import "AutoinstX11"; import "Wizard"; import "Popup"; + import "XMessages"; /** * Build main Dialog @@ -44,27 +45,17 @@ "2800x2100 (QSXGA+)", "3200x2400 (QUXGA)" ]; + + // made color depth list consistent and removed the 32bit special settings (bnc#405797) list<map> depths_list = [ - $[ - "desc" :_("8 Bit / 256 Colors"), - "depth" : 8 - ], - $[ - "desc" :_("15 Bit / 32 K Colors (PPC)"), - "depth" : 15 - ], - $[ - "desc" :_("16 Bit / 64 K Colors"), - "depth" : 16 - ], - $[ - "desc" :_("24 Bit / 16 M Colors"), - "depth" : 24 - ], - $[ - "desc" :_("32 Bit / 16 M Colors"), - "depth" : 32 - ] + $[ "desc" : XMessages::color8bit, + "depth" : 8 ], + $[ "desc" : XMessages::color15bit, + "depth" : 15 ], + $[ "desc" : XMessages::color16bit, + "depth" : 16 ], + $[ "desc" : XMessages::color24bit, + "depth" : 24 ] ]; @@ -75,7 +66,7 @@ foreach(map d, depths_list , ``{ color_depths=add(color_depths, - `item( `id(d["depth"]:16), d["desc"]:_("16 Bit / 64 K Colors") , + `item( `id(d["depth"]:16), d["desc"]:XMessages::color16bit, ( d["depth"]:16 == x11["color_depth"]:16))); }); list displaymanager = 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-x11-2.15.12/src/autoyast/modules/AutoinstX11.ycp new/yast2-x11-2.17.1/src/autoyast/modules/AutoinstX11.ycp --- old/yast2-x11-2.15.12/src/autoyast/modules/AutoinstX11.ycp 2008-05-08 23:53:55.000000000 +0200 +++ new/yast2-x11-2.17.1/src/autoyast/modules/AutoinstX11.ycp 2008-06-24 18:54:58.000000000 +0200 @@ -170,10 +170,10 @@ SCR::Write (.sysconfig.windowmanager.DEFAULT_WM, windowManager); SCR::Write (.sysconfig.windowmanager, nil); } - integer hstart = display["min_hsync"]:30; - integer hstop = display["max_hsync"]:60; - integer vstart = display["min_vsync"]:60; - integer vstop = display["max_vsync"]:75; + integer hstart = tointeger(display["min_hsync"]:30); + integer hstop = tointeger(display["max_hsync"]:60); + integer vstart = tointeger(display["min_vsync"]:60); + integer vstop = tointeger(display["max_vsync"]:75); y2milestone("X11-Auto: setup monitor <%1:%2>",current_vendor,current_model); XLib::setMonitorCDB ( [current_vendor,current_model] ); XLib::setHsyncRange (hstart,hstop); @@ -183,7 +183,8 @@ y2milestone("X11-Auto: setup resolution <%1>",resolution); XLib::setResolution ( resolution ); - integer colors = x11["color_depth"]:16; + // convert value to integer (bnc#307967) + integer colors = tointeger(x11["color_depth"]:16); y2milestone("X11-Auto: setup color depth <%1>",colors); XLib::setDefaultColorDepth ( tostring(colors) ); @@ -205,7 +206,7 @@ SCR::Write (.sysconfig.displaymanager.DISPLAYMANAGER_XGL_OPTS, x11["xgl_custom_options"]:"" ); } } - + } else { XLib::deactivate3D(); } 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-x11-2.15.12/src/dialog/x11Dialog.ycp new/yast2-x11-2.17.1/src/dialog/x11Dialog.ycp --- old/yast2-x11-2.15.12/src/dialog/x11Dialog.ycp 2008-02-12 16:52:28.000000000 +0100 +++ new/yast2-x11-2.17.1/src/dialog/x11Dialog.ycp 2008-08-29 23:27:30.000000000 +0200 @@ -48,188 +48,348 @@ //================================ // setupColors //-------------------------------- -define string setupColors ( string currentRes, string currentText ) ``{ - string space = " "; - string topic = XMessages::selectColorDepth + space; - UI::OpenDialog( - `VBox( - `HBox(`ComboBox(`id(`depth),`opt(`hstretch),topic, - [ - `item(`id(`bit8), "256 [ 8 bit ]" ), - `item(`id(`bit15), "32768 [ 15 bit ]" ), - `item(`id(`bit16), "65536 [ 16 bit ]" ), - `item(`id(`bit24), "16.7 Mio. [ 24 bit ]" ) - ] - )), - `Right (`HBox ( - `PushButton(`id(`ok),Label::OKButton()), - `PushButton(`id(`cancel),Label::CancelButton()) - )) - ) - ); - while (true) { - UI::ChangeWidget(`id(`depth), `Value, currentText); - any id = UI::UserInput(); - if (id == `cancel) { - UI::CloseDialog(); - if (currentText == "256 [ 8 bit ]") { - return "8"; - } - if (currentText == "32768 [ 15 bit ]") { - return "15"; - } - if (currentText == "65536 [ 16 bit ]") { - return "16"; - } - if (currentText == "16.7 Mio. [ 24 bit ]") { - return "24"; - } - return "undef"; - } - any col=UI::QueryWidget(`id(`depth), `Value); - string color = "8"; - if ( col == `bit8 ) color = "8"; - if ( col == `bit15 ) color = "15"; - if ( col == `bit16 ) color = "16"; - if ( col == `bit24 ) color = "24"; - if (! XLib::hasValidColorResolutionSetup (color,currentRes)) { - warnInvalidColorResolution(); - continue; - } - UI::CloseDialog(); - return (string)color; - } +define string setupColors ( string currentRes, string currentDepth ) +{ // rewritten due to consistency with setupDisplaySize + + string topic = XMessages::colorDepth; + UI::OpenDialog( `MarginBox( 0.5, 0.5, + `VBox( + `Heading(XMessages::displaySettings), + `HBox(`ComboBox(`id(`depth),`opt(`hstretch), topic, + [ + `item(`id("8"), XMessages::color8bit ), + `item(`id("15"), XMessages::color15bit ), + `item(`id("16"), XMessages::color16bit ), + `item(`id("24"), XMessages::color24bit ), + ] + )), + `VSpacing(0.5), + `HBox ( + `PushButton(`id(`ok),Label::OKButton()), + `PushButton(`id(`cancel),Label::CancelButton()) + ) + ) + )); + + string color = "8"; + if (contains(["8", "15", "16", "24"], currentDepth)) + { color = currentDepth; } + else + { currentDepth = "undef"; } + UI::ChangeWidget(`id(`depth), `Value, color); + + any ret = nil; + + repeat + { + ret = UI::UserInput(); + + color = (string) UI::QueryWidget(`id(`depth), `Value); + + if (! XLib::hasValidColorResolutionSetup (color,currentRes)) + { + warnInvalidColorResolution(); + ret = nil; + } + + } until ( ret == `ok || ret == `cancel); + + UI::CloseDialog(); + if (ret == `cancel) + { + UI::CloseDialog(); + return currentDepth; + } + + return color; + }; //================================ // setupResolutions //-------------------------------- -define string setupResolutions ( - list reslist, string currentText, string currentColor -) ``{ - string space = " "; - string topic = XMessages::selectResolution + space; - UI::OpenDialog( - `VBox( - `HBox(`Left ( `ComboBox(`id(`resitem),topic, reslist))), - `Right (`HBox ( - `PushButton(`id(`ok),Label::OKButton()), - `PushButton(`id(`cancel),Label::CancelButton()) - )) - ) - ); - while (true) { - UI::ChangeWidget(`id(`resitem), `Value, currentText); - any id = UI::UserInput(); - if (id == `cancel) { - UI::CloseDialog(); - return currentText; - } - any res=UI::QueryWidget(`id(`resitem), `Value); - if (! XLib::hasValidColorResolutionSetup (currentColor,(string)res)) { - warnInvalidColorResolution(); - continue; - } - UI::CloseDialog(); - return (string)res; - } +define string setupResolutions (list reslist, string currentText, string currentColor) +{ // rewritten to be consistent with + + string topic = XMessages::resolution; + UI::OpenDialog( `MarginBox( 0.5, 0.5, + `VBox( + `Heading(XMessages::displaySettings), + `VSpacing(0.5), + `ComboBox(`id(`resitem),topic, reslist), + `VSpacing(0.5), + `HBox ( + `PushButton(`id(`ok),Label::OKButton()), + `PushButton(`id(`cancel),Label::CancelButton()) + ) + ) + )); + + UI::ChangeWidget(`id(`resitem), `Value, currentText); + any ret = nil; + string res = ""; + + repeat + { + ret = UI::UserInput(); + + res = (string) UI::QueryWidget(`id(`resitem), `Value); + if (! XLib::hasValidColorResolutionSetup(currentColor, res)) + { + warnInvalidColorResolution(); + ret = nil; + } + } until (ret == `ok || ret == `cancel); + + UI::CloseDialog(); + if (ret == `cancel) { return currentText; } + return res; + }; //================================ // setupDisplaySize //-------------------------------- -define list<string> setupDisplaySize ( - string currentTraversal, string currentRatios -) ``{ - //string space = " "; - string topic1 = XMessages::selectDisplayTraversal; - string topic2 = XMessages::selectDisplayRatio; - list<string> traverlist = ["21","20","19","18.1","17","15.4","15","14.1","13.3","12.2"]; - list<string> ratioslist = ["4/3","5/4","16/10"]; - UI::OpenDialog( - `VBox( - `HBox( - `Left ( `ComboBox(`id(`traveritem),topic1, traverlist)), - `Right ( `ComboBox(`id(`ratiositem),topic2, ratioslist)) - ), - `Right (`HBox ( - `PushButton(`id(`ok),Label::OKButton()), - `PushButton(`id(`cancel),Label::CancelButton()) - )) - ) - ); - UI::ChangeWidget(`id(`traveritem), `Value, currentTraversal); - UI::ChangeWidget(`id(`ratiositem), `Value, currentRatios); - any id = UI::UserInput(); - list<string> result = []; - if (id == `cancel) { - UI::CloseDialog(); - result = add (result,currentTraversal); - result = add (result,currentRatios); - return result; - } - any traversal=UI::QueryWidget(`id(`traveritem), `Value); - any ratios=UI::QueryWidget(`id(`ratiositem), `Value); - result = add (result,(string)traversal); - result = add (result,(string)ratios); - UI::CloseDialog(); - return result; +define list<string> setupDisplaySize (string currentTraversal, string currentRatio) +{ + // function rewritten because of (bnc#331664) and (bnc#399411) + + string topic1 = XMessages::selectDisplayTraversal; + string topic2 = XMessages::selectDisplayRatio; + // offer some common display settings + list<string> traversallist = [ "32.0", "31.5", "30.0", "26.0", "24.0", "23.0", + "22.2", "21.3", "21.1", "20.0", "19.0", "18.1", + "17.0", "15.4", "15.0", "14.1", "13.3", "12.2", "10.0" ]; + list<string> ratiolist = [ "4/3", "5/4", "16/9", "16/10" ]; + + string traversal = currentTraversal; + string ratio = currentRatio; + string traversalCheck = ""; + string ratioCheck = ""; + + // merge calculated values into the predefined lists + traversallist = (list<string>) sort(union(traversallist, [traversal])); + ratiolist = (list<string>) sort(union(ratiolist, [ratio])); + + UI::OpenDialog(`MarginBox(0.5, 0.5, + `VBox( + `Heading(_("Display Settings")), + `VSpacing(0.5), + `HBox( + `HSpacing(`opt(`hstretch), 0.5), + `VBox( + `Left( `ComboBox(`id(`traversal), `opt(`notify, `editable), topic1, traversallist)), + `Left( `ComboBox(`id(`ratio), `opt(`notify, `editable), topic2, ratiolist)) + ), + `HSpacing(`opt(`hstretch), 0.5) + ), + `VSpacing(0.5), + `HBox ( + `PushButton(`id(`ok),Label::OKButton()), + `PushButton(`id(`cancel),Label::CancelButton()) + ) + ) + )); + + UI::ChangeWidget(`id(`traversal), `ValidChars, "1234567890."); + UI::ChangeWidget(`id(`ratio), `ValidChars, "1234567890/"); + + UI::ChangeWidget(`id(`traversal), `Value, traversal); + UI::ChangeWidget(`id(`ratio), `Value, ratio); + + + any ret = nil; + repeat + { + // wait for event from user + ret = UI::UserInput(); + + traversal = (string) UI::QueryWidget(`id(`traversal), `Value); + ratio = (string) UI::QueryWidget(`id(`ratio), `Value); + + traversalCheck = regexpsub(traversal, "([1-9]+[0-9]*)(\.[0-9]?)?", "\\1\\2"); + if (traversalCheck == nil) { traversal = ""; traversalCheck = ""; } + if (traversalCheck != traversal) + { + traversal = traversalCheck; + UI::ChangeWidget(`id(`traversal), `Value, traversal); + } + + // here for ratio just sanity check + ratioCheck = regexpsub(ratio, "([1-9]+[0-9]*)(\/([1-9]+[0-9]*)?)?", "\\1\\2"); + if (ratioCheck == nil) { ratio = ""; ratioCheck = ""; } + if (ratioCheck != ratio) + { + ratio = ratioCheck; + UI::ChangeWidget(`id(`ratio), `Value, ratio); + } + + if (ret == `ok) + { + string ratioOrig = ratio; + ratio = regexpsub(ratio, "([1-9]+[0-9]*)\/([1-9]+[0-9]*)", "\\1\/\\2"); + if (ratio != ratioOrig || ratioOrig == "" || ratio == nil) + { + Popup::Message(_("The value for the display ratio is invalid, please correct.")); + ret = nil; + } + + if (traversal == "" || traversal == nil) + { + Popup::Message(_("The value for the display traversal is invalid, please correct.")); + ret = nil; + } + } + + } until (ret == `ok || ret == `cancel); + + + list<string> result = [traversal, ratio]; + if (ret == `cancel) + { + result = [currentTraversal, currentRatio]; + } + + UI::CloseDialog(); + return result; }; //================================ // setupMonitor //-------------------------------- -define list setupMonitor ( - map<string,list> data, string currentVendor, string currentModel -) ``{ - any id = nil; - list<string> result = []; - list<string> vendorList = []; - foreach (string vendor, list models, data, ``{ - vendorList = vendorList + vendor; - }); - UI::OpenDialog( - `VBox( - `HSpacing(70), - `Left (`Label(XMessages::selectMonitor)), - `HBox ( - `VSpacing(20), - `SelectionBox(`id(`vendor),`opt(`notify,`immediate),"",vendorList), - `SelectionBox(`id(`model) ,`opt(`notify,`immediate),"", []) - ), - `Right( `HBox ( - `PushButton(`id(`ok),Label::OKButton()), - `PushButton(`id(`cancel),Label::CancelButton()) - )) - ) - ); - list modelList = sort (data[currentVendor]:[]); - UI::ChangeWidget(`id(`vendor), `CurrentItem, currentVendor); - UI::ChangeWidget(`id(`model) , `Items, modelList); - UI::ChangeWidget(`id(`model) , `CurrentItem, currentModel); - any vendor = (string)currentVendor; - any model = (string)currentModel; - repeat { - id = UI::UserInput(); - if (id == `vendor) { - vendor = UI::QueryWidget(`id(`vendor), `CurrentItem); - list modelList = sort (data[(string)vendor]:[]); - UI::ChangeWidget( `id( `model ), `Items, [] ); - UI::ChangeWidget( `id( `model ), `Items, modelList ); - } - if (id == `model) { - model = UI::QueryWidget(`id(`model), `CurrentItem); - } - if (id == `cancel) { - result[0] = (string)currentVendor; - result[1] = (string)currentModel; - UI::CloseDialog(); - return result; - } - } until ( id == `ok ); - UI::CloseDialog(); - result[0] = (string)vendor; - result[1] = (string)model; - return result; +define list setupMonitor ( map<string,list> data, string currentVendor, string currentModel ) +{ + any ret = nil; + list<string> result = []; + list<string> vendorList = []; + list modelList = []; + + vendorList = maplist( string Dvendor, list Dmodel, data, { return Dvendor; }); + + UI::OpenDialog(`MarginBox( 0.5, 0.5, + `VBox( + `Left (`Label(XMessages::selectMonitor)), + `MinSize( 75, 15, `HBox ( + `SelectionBox(`id(`vendor),`opt(`notify,`immediate), XMessages::Vendor,vendorList), + `SelectionBox(`id(`model) ,`opt(`notify,`immediate), XMessages::Model, []) + )), + `VSpacing(0.5), + `HBox ( + `PushButton(`id(`ok),Label::OKButton()), + `PushButton(`id(`cancel),Label::CancelButton()) + ) + ) + )); + + string vendor = currentVendor; + string model = currentModel; + + modelList = sort (data[vendor]:[]); + UI::ChangeWidget(`id(`vendor), `CurrentItem, nil); + UI::ChangeWidget(`id(`model), `CurrentItem, nil); + + if ( modelList != [] && modelList != nil) + { + UI::ChangeWidget(`id(`vendor), `CurrentItem, vendor); + UI::ChangeWidget(`id(`model) , `Items, modelList); + UI::ChangeWidget(`id(`model), `CurrentItem, nil); + + if (contains(modelList, model)) + UI::ChangeWidget(`id(`model) , `CurrentItem, model); + } + + repeat { + ret = UI::UserInput(); + if (ret == `vendor) { + vendor = (string) UI::QueryWidget(`id(`vendor), `CurrentItem); + list modelList = sort (data[vendor]:[]); + UI::ChangeWidget(`id(`model ), `Items, modelList ); + UI::ChangeWidget(`id(`model), `CurrentItem, nil); + } + if (ret == `model) { + model = (string) UI::QueryWidget(`id(`model), `CurrentItem); + } + if (ret == `cancel) { + UI::CloseDialog(); + return [currentVendor, currentModel]; + } + } until ( ret == `ok ); + + UI::CloseDialog(); + return [vendor, model]; + }; + + +//================================ +// setupTablet (fate#302888) +//-------------------------------- +define list<string> setupTablet ( map<string,list> data, string currentVendor, string currentModel ) +{ + any ret = nil; + list<string> result = []; + list<string> vendorList = []; + list modelList = []; + + vendorList = maplist( string Dvendor, list Dmodel, data, { return Dvendor; }); + + UI::OpenDialog(`MarginBox( 0.5, 0.5, + `VBox( + `Left (`Label(XMessages::selectTablet)), + `MinSize( 75, 15, `HBox ( + `SelectionBox(`id(`vendor),`opt(`notify,`immediate), XMessages::Vendor, vendorList), + `SelectionBox(`id(`model) ,`opt(`notify,`immediate), XMessages::Model, []) + )), + `VSpacing(0.5), + `HBox ( + `PushButton(`id(`ok),Label::OKButton()), + `PushButton(`id(`cancel),Label::CancelButton()) + ) + ) + )); + + string vendor = currentVendor; + string model = currentModel; + + modelList = sort (data[vendor]:[]); + UI::ChangeWidget(`id(`vendor), `CurrentItem, nil); + UI::ChangeWidget(`id(`model), `CurrentItem, nil); + + if ( modelList != [] && modelList != nil) + { + UI::ChangeWidget(`id(`vendor), `CurrentItem, vendor); + UI::ChangeWidget(`id(`model) , `Items, modelList); + UI::ChangeWidget(`id(`model), `CurrentItem, nil); + + if (contains(modelList, model)) + UI::ChangeWidget(`id(`model) , `CurrentItem, model); + } + + repeat + { + ret = UI::UserInput(); + if (ret == `vendor) + { + vendor = (string) UI::QueryWidget(`id(`vendor), `CurrentItem); + modelList = sort (data[vendor]:[]); + UI::ChangeWidget(`id(`model), `Items, modelList ); + UI::ChangeWidget(`id(`model), `CurrentItem, nil); + } + if (ret == `model) + { + model = (string) UI::QueryWidget(`id(`model), `CurrentItem); + } + if (ret == `cancel) + { + UI::CloseDialog(); + return [currentVendor, currentModel]; + } + } until ( ret == `ok ); + + UI::CloseDialog(); + return [vendor, model]; +} + + + } 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-x11-2.15.12/src/proposal/x11_proposal.ycp new/yast2-x11-2.17.1/src/proposal/x11_proposal.ycp --- old/yast2-x11-2.15.12/src/proposal/x11_proposal.ycp 2008-04-22 18:15:10.000000000 +0200 +++ new/yast2-x11-2.17.1/src/proposal/x11_proposal.ycp 2008-08-30 00:47:37.000000000 +0200 @@ -31,6 +31,7 @@ import "XMessages"; import "XLib"; import "Package"; +import "Popup"; include "x11/x11Dialog.ycp"; @@ -97,6 +98,7 @@ //-------------------------------------- if (! (boolean)XLib::isInitialized()) { y2milestone ("Loading library cache..."); + Popup::TimedMessage(XMessages::probeWarning, 15); XLib::loadApplication(); } //====================================== @@ -115,6 +117,9 @@ boolean extVGAactive= (boolean) XLib::isExternalVGAactive(); list monitorSize = (list) XLib::getDisplaySize(); string monitorInch = (string) monitorSize[0]:"undef"; + //string tabletPtr = (string) XLib::getTabletPointer(); + string tabletName = (string) XLib::getTabletModel(); + string tabletVendor= (string) XLib::getTabletVendor(); //====================================== // Prepare proposal @@ -215,6 +220,20 @@ //warnNoteBookPopup(); } } + //====================================== + // Tablet settings (fate#302888) + //-------------------------------------- + string tabletStatus = XMessages::unconfigured; + if ( tabletVendor != "undef" && + tabletName != "undef" ) + { + tabletStatus = sformat("%1 - %2", tabletVendor, tabletName); + } + proposal = proposal + + LI + + XMessages::Tablet + " " + tabletStatus + + " (<a href=\"sax-tablet\">" + XMessages::configure + "</a>)" + + IL; //====================================== // Test your configuration now //-------------------------------------- @@ -239,7 +258,8 @@ "sax-colors", "sax-3d", "sax-ext-vga", - "sax-test" + "sax-test", + "sax-tablet" ] ]; return ret; @@ -338,6 +358,15 @@ if (chosenID == "x11_conf") { infoPopup(); } + if (chosenID == "sax-tablet" ) { + y2milestone("X11: setup tablet..."); + string vendor = XLib::getTabletVendor(); + string model = XLib::getTabletModel(); + map<string,list> tcdb = XLib::getTabletCDB(); + list selectedTablet = setupTablet(tcdb, vendor, model); + y2milestone("X11: setup tablet <%1>", selectedTablet); + XLib::setTablet( (list<string>)selectedTablet ); + } } //=================================================== // Handle proposal description... 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-x11-2.15.12/src/XLib.pm new/yast2-x11-2.17.1/src/XLib.pm --- old/yast2-x11-2.15.12/src/XLib.pm 2007-09-01 09:11:54.000000000 +0200 +++ new/yast2-x11-2.17.1/src/XLib.pm 2008-08-29 21:01:41.000000000 +0200 @@ -35,6 +35,7 @@ my %section; my $config; my %cdb; +my %tabletCDB; #========================================== # GetFbColor @@ -258,50 +259,13 @@ my $traversal = $mDesktop->getDisplayTraversal(); my @ratio = @{$mDesktop->getDisplayRatio()}; if (defined $traversal) { - $traversal = sprintf ("%.1f",$traversal); - if ($traversal < 12.2) { - $traversal = 10.0; - } elsif (($traversal >= 12.2) && ($traversal < 13.3)) { - $traversal = 12.2; - } elsif (($traversal >= 13.3) && ($traversal < 14.1)) { - $traversal = 13.3; - } elsif (($traversal >= 14.1) && ($traversal < 14.5)) { - $traversal = 14.1; - } elsif (($traversal >= 14.5) && ($traversal < 15.4)) { - $traversal = 15; - } elsif (($traversal >= 15.4) && ($traversal < 16.5)) { - $traversal = 15.4; - } elsif (($traversal >= 16.5) && ($traversal < 18.0)) { - $traversal = 17; - } elsif (($traversal >= 18.0) && ($traversal < 18.3)) { - $traversal = 18; - } elsif (($traversal >= 18.3) && ($traversal < 18.5)) { - $traversal = 18.1; - } elsif (($traversal >= 18.5) && ($traversal < 19.5)) { - $traversal = 19; - } elsif (($traversal >= 19.5) && ($traversal < 20.5)) { - $traversal = 20; - } elsif (($traversal >= 20.5) && ($traversal < 21.3)) { - $traversal = 21.1; - } elsif (($traversal >= 21.3) && ($traversal < 21.5)) { - $traversal = 21.3; - } elsif (($traversal >= 21.5) && ($traversal < 22.2)) { - $traversal = 22.2; - } elsif (($traversal >= 22.2) && ($traversal < 23.5)) { - $traversal = 23; - } elsif (($traversal >= 23.5) && ($traversal < 24.5)) { - $traversal = 24; - } elsif (($traversal >= 24.5) && ($traversal < 30.5)) { - $traversal = 30; - } elsif (($traversal >= 30.5) && ($traversal < 31.8)) { - $traversal = 31.5; - } elsif (($traversal >= 31.8) && ($traversal < 32.5)) { - $traversal = 32; - } elsif (($traversal >= 32.5) && ($traversal < 40.5)) { - $traversal = 40; - } elsif ($traversal >= 40.5) { - $traversal = 46; - } + # if traversal is empty or not a numeric, set it to undef and do not operate on it (bnc#388259) + if ($traversal eq "" || $traversal !~ /^\d+\.?\d*$/) + { $traversal = "undef"; } + else + # just round the computed (real) traversal to a tenth + { $traversal = sprintf ("%.1f", $traversal); } + @result = ($traversal,@ratio); } return \@result; @@ -896,6 +860,95 @@ } #========================================== +# getTabletCDB +#------------------------------------------ +BEGIN{ $TYPEINFO{getTabletCDB} = ["function",["map","string",["list","string"]]]; } +sub getTabletCDB { + my $class = shift; + my $size = keys %tabletCDB; + if ($size > 0) { + return \%tabletCDB; + } + my $mTablet = new SaX::SaXManipulateTablets ( + $section{Pointers},$section{Layout} + ); + $mTablet->selectPointer (1); + my @vendorList = @{$mTablet->getTabletVendorList()}; + foreach my $vendor (@vendorList) { + my $modelList = $mTablet->getTabletModelList ($vendor); + $tabletCDB{$vendor} = $modelList; + } + return \%tabletCDB; +} +#========================================== +# getTabletVendor +#------------------------------------------ +BEGIN{ $TYPEINFO{getTabletVendor} = ["function", "string"]; } +sub getTabletVendor { + my $class = shift; + my $mTablet = new SaX::SaXManipulateTablets ( + $section{Pointers},$section{Layout} + ); + $mTablet->selectPointer(1); + my $vendor = $mTablet->getVendor(); + if ($vendor =~ /Unknown/i) { + return "undef"; + } + return $vendor; +} +#========================================== +# getTabletModel +#------------------------------------------ +BEGIN{ $TYPEINFO{getTabletModel} = ["function", "string"]; } +sub getTabletModel { + my $class = shift; + my $mTablet = new SaX::SaXManipulateTablets ( + $section{Pointers},$section{Layout} + ); + $mTablet->selectPointer(1); + my $model = $mTablet->getName(); + if ($model =~ /Unknown/i) { + return "undef"; + } + return $model; +} +#========================================== +# getTabletPointer +#------------------------------------------ +BEGIN{ $TYPEINFO{getTabletPointer} = ["function", "string"]; } +sub getTabletPointer { + my $class = shift; + my $mTablet = new SaX::SaXManipulateTablets ( + $section{Pointers},$section{Layout} + ); + # check if one of the first 5 pointer devices is a tablet + my $i; + for ( $i=0 ; $i <= 4 ; $i++ ) + { + $mTablet->selectPointer($i); + if ($mTablet->isTablet() ) + { + return "$i"; + } + } + return "undef"; +} +#========================================== +# setTablet +#------------------------------------------ +BEGIN{ $TYPEINFO{setTablet} = ["function","void",["list","string"]]; } +sub setTablet { + my $vendor = shift; + my $model = shift; + my $mTablet = new SaX::SaXManipulateTablets ( + $section{Pointers},$section{Layout} + ); + $mTablet->selectPointer(1); + $mTablet->setTablet($vendor, $model); +} + + +#========================================== # test code #------------------------------------------ if (0) { 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-x11-2.15.12/src/XMessages.ycp new/yast2-x11-2.17.1/src/XMessages.ycp --- old/yast2-x11-2.15.12/src/XMessages.ycp 2008-05-08 23:53:55.000000000 +0200 +++ new/yast2-x11-2.17.1/src/XMessages.ycp 2008-08-29 23:01:52.000000000 +0200 @@ -60,17 +60,20 @@ // 65536 colors - upper case string colors65k_uc = _("65536 Colors"); -// 16.7 m colors - lower case -string colors16m_lc = _("16.7 m colors"); -// 16.7 M colors - upper case -string colors16m_uc = _("16.7 M Colors"); -// 16.7 Mio. colors - business language -string colors16m_uc_business = _("16.7 Mio. Colors"); +// 16.7 M colors - lower case +string colors16M_lc = _("16.7 M colors"); +// 16.7 M Colors - upper case +string colors16M_uc = _("16.7 M Colors"); + +// 16.7 Mio. colors - lower case - business language +string colors16Mio_lc_business = _("16.7 Mio. colors"); +// 16.7 Mio. Colors - business language +string colors16Mio_uc_business = _("16.7 Mio. Colors"); global string colors256 = colors256_uc; global string colors32k = colors32k_uc; global string colors65k = colors65k_uc; -global string colors16m = colors16m_uc_business; +global string colors16m = colors16M_uc; //============================================= @@ -78,18 +81,27 @@ global string colors = _("Colors"); // string for a drop-down box -global string color8bit = _("256 [ 8 bit ]"); +global string color8bit = _("256 [8 bit]"); // string for a drop-down box -global string color15bit = _("32768 [ 15 bit ]"); +global string color15bit = _("32768 [15 bit]"); +// string for a drop-down box, PPC meaning: the PowerPC architecture +global string color15bitPPC = _("32768 [15 bit] (PPC)"); // string for a drop-down box -global string color16bit = _("65536 [ 16 bit ]"); -// string for a drop-down box - lower case -string color24bit_lc = _("16.7 m [ 24 bit ]"); -// string for a drop-down box - upper case -string color24bit_uc = _("16.7 M [ 24 bit ]"); +global string color16bit = _("65536 [16 bit]"); +// string for a drop-down box, meaning "16.7 million" (colors) +string color24bitM = _("16.7 M [24 bit]"); // string for a drop-down box - business language -string color24bit_uc_business = _("16.7 Mio. [ 24 bit ]"); -global string color24bit = color24bit_uc_business; +string color24bitMio = _("16.7 Mio. [24 bit]"); +// string for a drop-down box +string color24bitMillion = _("16.7 Million [24 bit]"); +global string color24bit = color24bitM; +// string for a drop-down box, meaning "16.7 million" (colors) +string color32bitM = _("16.7 M [32 bit]"); +// string for a drop-down box - business language +string color32bitMio = _("16.7 Mio. [32 bit]"); +// string for a drop-down box +string color32bitMillion = _("16.7 Million [32 bit]"); +global string color32bit = color32bitM; //============================================= // Xgl strings @@ -123,7 +135,8 @@ //============================================= // colorDepth //--------------------------------------------- -global string colorDepth = _("Colordepth: "); +global string colorDepthOld = _("Colordepth: "); +global string colorDepth = _("Color Depth: "); //============================================= // deactivated @@ -151,6 +164,11 @@ global string selectColorDepth = _("Select color depth:"); //============================================= +// resolution +//--------------------------------------------- +global string resolution = _("Resolution:"); + +//============================================= // selectResolution //--------------------------------------------- global string selectResolution = _("Select resolution:"); @@ -158,7 +176,19 @@ //============================================= // selectMonitor //--------------------------------------------- -global string selectMonitor = _("Select Monitor Vendor and Model:"); +global string selectMonitorOld = _("Select Monitor Vendor and Model:"); +global string selectMonitor = _("Select Monitor Vendor and Model"); + +// selectTablet +global string selectTablet = _("Select Tablet Vendor and Model"); + +// tablet +global string Tablet = _("Tablet:"); + +// vendor - meaning "monitor vendor" (like "hardware vendor") +global string Vendor = _("Vendor:"); +// model - meaning "monitor model" +global string Model = _("Model:"); //============================================= // selectLink @@ -178,9 +208,11 @@ //============================================= // selectDisplaySize //--------------------------------------------- -global string selectDisplayTraversal = _("Traversal") + " [ " + Inches + " ]:"; +global string selectDisplayTraversal = _("Traversal") + " [" + Inches + "]:"; global string selectDisplayRatio = _("Aspect Ratio:"); +global string displaySettings = _("Display Settings"); + //============================================= // proposal menu and title text //--------------------------------------------- @@ -197,6 +229,9 @@ //--------------------------------------------- global string unconfigured = _("Unconfigured"); +// configure - in lower case +global string configure = _("configure"); + //============================================= // warnNoteBook //--------------------------------------------- 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-x11-2.15.12/VERSION new/yast2-x11-2.17.1/VERSION --- old/yast2-x11-2.15.12/VERSION 2008-05-08 23:53:55.000000000 +0200 +++ new/yast2-x11-2.17.1/VERSION 2008-08-29 23:08:50.000000000 +0200 @@ -1 +1 @@ -2.15.12 +2.17.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 pam-modules
by root＠Hilbert.suse.de 30 Aug '08

30 Aug '08

Hello community, here is the log from the commit of package pam-modules checked in at Sat Aug 30 02:53:42 CEST 2008. -------- --- pam-modules/pam-modules.changes 2008-08-20 14:59:56.000000000 +0200 +++ pam-modules/pam-modules.changes 2008-08-28 17:19:23.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 28 17:19:02 CEST 2008 - kukuk(a)suse.de + +- pam_unix2: make session logging more verbose + +------------------------------------------------------------------- Old: ---- pam_unix2-2.5.1-passwd.dif pam_unix2-2.5.1.tar.bz2 New: ---- pam_unix2-2.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam-modules.spec ++++++ --- /var/tmp/diff_new_pack.oZD903/_old 2008-08-30 02:51:49.000000000 +0200 +++ /var/tmp/diff_new_pack.oZD903/_new 2008-08-30 02:51:49.000000000 +0200 @@ -29,9 +29,9 @@ Group: System/Libraries AutoReqProv: on Version: 11.0.42 -Release: 17 +Release: 20 Summary: Additional PAM Modules -Source0: pam_unix2-2.5.1.tar.bz2 +Source0: pam_unix2-2.6.tar.bz2 Source1: pam_pwcheck-3.11.1.tar.bz2 Source2: pam_homecheck-2.0.tar.bz2 Source5: pam_make-1.2.tar.bz2 @@ -39,7 +39,6 @@ Source41: unix2_chkpwd.8 Source50: dlopen.sh Patch1: pam-modules-10.3-pam_make-fix-open.dif -Patch2: pam_unix2-2.5.1-passwd.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: permissions @@ -56,7 +55,6 @@ %prep %setup -q -c %{name} -b1 -b2 -b5 %patch1 -%patch2 -p1 %build for i in * ; do @@ -127,6 +125,8 @@ %attr(644,root,root) %doc %{_mandir}/man8/unix2_chkpwd.8.gz %changelog +* Thu Aug 28 2008 kukuk(a)suse.de +- pam_unix2: make session logging more verbose * Wed Aug 20 2008 prusnak(a)suse.cz - enabled SELinux support [Fate#303662] * Mon Aug 11 2008 mc(a)suse.de ++++++ pam_unix2-2.5.1.tar.bz2 -> pam_unix2-2.6.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_unix2-2.5.1/ChangeLog new/pam_unix2-2.6/ChangeLog --- old/pam_unix2-2.5.1/ChangeLog 2008-04-11 10:58:32.000000000 +0200 +++ new/pam_unix2-2.6/ChangeLog 2008-08-28 17:10:56.000000000 +0200 @@ -1,3 +1,20 @@ +2008-08-28 Thorsten Kukuk <kukuk(a)suse.de> + + * releae version 2.6 + + * src/unix_sess.c: Log tty and hostname if available. + + * src/unix_passwd.c: Compare stored with entered password + if PAM_CHANGE_EXPIRED_AUTHTOK flag is set [bnc#414783]. + + * po/*.po: Update translations. + +2008-05-23 Thorsten Kukuk <kukuk(a)suse.de> + + * release version 2.5.1 + + * po/*.po: Update translations. + 2008-04-10 Thorsten Kukuk <kukuk(a)suse.de> * release 2.5.0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_unix2-2.5.1/configure new/pam_unix2-2.6/configure --- old/pam_unix2-2.5.1/configure 2008-05-23 15:50:32.000000000 +0200 +++ new/pam_unix2-2.6/configure 2008-08-28 17:01:36.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for pam_unix2 2.5.1. +# Generated by GNU Autoconf 2.61 for pam_unix2 2.6. # # Report bugs to <http://www.suse.de/feedback>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='pam_unix2' PACKAGE_TARNAME='pam_unix2' -PACKAGE_VERSION='2.5.1' -PACKAGE_STRING='pam_unix2 2.5.1' +PACKAGE_VERSION='2.6' +PACKAGE_STRING='pam_unix2 2.6' PACKAGE_BUGREPORT='http://www.suse.de/feedback' ac_unique_file="src/support.c" @@ -1232,7 +1232,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pam_unix2 2.5.1 to adapt to many kinds of systems. +\`configure' configures pam_unix2 2.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1302,7 +1302,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pam_unix2 2.5.1:";; + short | recursive ) echo "Configuration of pam_unix2 2.6:";; esac cat <<\_ACEOF @@ -1398,7 +1398,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pam_unix2 configure 2.5.1 +pam_unix2 configure 2.6 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1412,7 +1412,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pam_unix2 $as_me 2.5.1, which was +It was created by pam_unix2 $as_me 2.6, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2102,7 +2102,7 @@ # Define the identity of the package. PACKAGE='pam_unix2' - VERSION='2.5.1' + VERSION='2.6' cat >>confdefs.h <<_ACEOF @@ -8198,7 +8198,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pam_unix2 $as_me 2.5.1, which was +This file was extended by pam_unix2 $as_me 2.6, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8251,7 +8251,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -pam_unix2 config.status 2.5.1 +pam_unix2 config.status 2.6 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_unix2-2.5.1/configure.in new/pam_unix2-2.6/configure.in --- old/pam_unix2-2.5.1/configure.in 2008-05-23 15:50:25.000000000 +0200 +++ new/pam_unix2-2.6/configure.in 2008-08-28 17:00:31.000000000 +0200 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(pam_unix2, 2.5.1, http://www.suse.de/feedback, pam_unix2) +AC_INIT(pam_unix2, 2.6, http://www.suse.de/feedback, pam_unix2) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([src/support.c]) AM_CONFIG_HEADER(config.h) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_unix2-2.5.1/NEWS new/pam_unix2-2.6/NEWS --- old/pam_unix2-2.5.1/NEWS 2008-05-23 15:52:24.000000000 +0200 +++ new/pam_unix2-2.6/NEWS 2008-08-28 17:00:56.000000000 +0200 @@ -5,6 +5,9 @@ Please send bug reports, questions and suggestions to <kukuk(a)suse.de>. +Version 2.6 +* Enhance log message for starting/closing a session + Version 2.5.1 * Update translations Files old/pam_unix2-2.5.1/po/el.gmo and new/pam_unix2-2.6/po/el.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_unix2-2.5.1/po/el.po new/pam_unix2-2.6/po/el.po --- old/pam_unix2-2.5.1/po/el.po 2008-05-23 15:52:27.000000000 +0200 +++ new/pam_unix2-2.6/po/el.po 2008-08-28 17:10:14.000000000 +0200 @@ -1,4 +1,4 @@ -# translation of pam_unix2.el.po to Hellenic +# translation of pam_unix2.el.po to Ελληνικά # @TITLE@ # Copyright (C) 2006, SUSE Linux GmbH, Nuremberg # @@ -12,9 +12,9 @@ "Project-Id-Version: pam_unix2.el\n" "Report-Msgid-Bugs-To: kukuk(a)suse.de\n" "POT-Creation-Date: 2008-03-31 15:10+0200\n" -"PO-Revision-Date: 2008-03-31 11:20+0100\n" +"PO-Revision-Date: 2008-06-06 01:04+0100\n" "Last-Translator: Vasileios Giannakopoulos <billg(a)billg.gr>\n" -"Language-Team: Hellenic <billg(a)billg.gr>\n" +"Language-Team: Ελληνικά <billg(a)billg.gr>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" Files old/pam_unix2-2.5.1/po/ko.gmo and new/pam_unix2-2.6/po/ko.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_unix2-2.5.1/po/ko.po new/pam_unix2-2.6/po/ko.po --- old/pam_unix2-2.5.1/po/ko.po 2008-05-23 15:52:27.000000000 +0200 +++ new/pam_unix2-2.6/po/ko.po 2008-08-28 17:10:14.000000000 +0200 @@ -223,4 +223,4 @@ #: src/unix_passwd.c:1048 msgid "Error while changing the NIS password." -msgstr "NIS 열쇠글을 변경중 오류" +msgstr "NIS 열쇠글을 변경 중 오류" Files old/pam_unix2-2.5.1/po/ro.gmo and new/pam_unix2-2.6/po/ro.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_unix2-2.5.1/po/ro.po new/pam_unix2-2.6/po/ro.po --- old/pam_unix2-2.5.1/po/ro.po 2008-05-23 15:52:27.000000000 +0200 +++ new/pam_unix2-2.6/po/ro.po 2008-08-26 13:19:58.000000000 +0200 @@ -30,11 +30,11 @@ #: src/unix_acct.c:102 src/unix_acct.c:150 msgid "Your password has expired. Choose a new password." -msgstr "Parola dvs. a expirat. Alegeţi o nouă parolă." +msgstr "Parola dvs. a expirat. Alegeți o nouă parolă." #: src/unix_acct.c:129 msgid "Password change requested. Choose a new password." -msgstr "Este necesară schimbarea parolei. Alegeţi o nouă parolă." +msgstr "Este necesară schimbarea parolei. Alegeți o nouă parolă." #: src/unix_acct.c:288 #, c-format @@ -65,21 +65,21 @@ #: src/unix_passwd.c:85 msgid "Reenter New Password: " -msgstr "Reintroduceţi noua parolă: " +msgstr "Reintroduceți noua parolă: " #: src/unix_passwd.c:214 msgid "You can only change local passwords." -msgstr "Puteţi schimba numai parolele locale." +msgstr "Puteți schimba numai parolele locale." #: src/unix_passwd.c:284 #, c-format msgid "Less then %d weeks since the last change." -msgstr "Au trecut mai puţin de %d săptămâni de la ultima schimbare." +msgstr "Au trecut mai puțin de %d săptămâni de la ultima schimbare." #: src/unix_passwd.c:288 #, c-format msgid "Less then %d days since the last change." -msgstr "Au trecut mai puţin de %d zile de la ultima schimbare." +msgstr "Au trecut mai puțin de %d zile de la ultima schimbare." #: src/unix_passwd.c:340 src/unix_passwd.c:355 msgid "Password change aborted." @@ -120,11 +120,11 @@ #: src/unix_passwd.c:493 #, c-format msgid "Unable to obtain entropy from %s" -msgstr "Nu pot obţine entropia de la %s" +msgstr "Nu pot obține entropia de la %s" #: src/unix_passwd.c:508 msgid "Unable to generate a salt. Check your crypt settings." -msgstr "Nu pot genera salt. Verificaţi setările crypt." +msgstr "Nu pot genera salt. Verificați setările crypt." #: src/unix_passwd.c:634 msgid "Cannot create salt for standard crypt" @@ -152,11 +152,11 @@ #: src/unix_passwd.c:695 msgid "crypt_r() returns NULL pointer" -msgstr "crypt_r() returns NULL pointer" +msgstr "c_ryptr()întoarce un pointer NULL" #: src/unix_passwd.c:718 msgid "Cannot lock password file: already locked." -msgstr "Nu pot bloca fişierul de parolă: este deja blocat." +msgstr "Nu pot bloca fișierul de parolă: este deja blocat." #: src/unix_passwd.c:745 src/unix_passwd.c:806 src/unix_passwd.c:889 #: src/unix_passwd.c:950 @@ -172,7 +172,7 @@ #: src/unix_passwd.c:780 src/unix_passwd.c:924 #, c-format msgid "Cannot create temp file (%s): %m" -msgstr "Nu pot crea fişierul temporar (%s): %m" +msgstr "Nu pot crea fișierul temporar (%s): %m" #: src/unix_passwd.c:788 src/unix_passwd.c:932 #, c-format @@ -187,37 +187,37 @@ #: src/unix_passwd.c:836 #, c-format msgid "Error while writing new shadow file: %m" -msgstr "Eroare la scrierea noului fişier shadow: %m" +msgstr "Eroare la scrierea noului fișier shadow: %m" #: src/unix_passwd.c:846 #, c-format msgid "Error while closing old shadow file: %m" -msgstr "Eroare la închiderea vechiului fişier shadow: %m" +msgstr "Eroare la închiderea vechiului fișier shadow: %m" #: src/unix_passwd.c:854 #, c-format msgid "Error while closing temporary shadow file: %m" -msgstr "Eroare la închiderea fişierului shadow temporar: %m" +msgstr "Eroare la închiderea fișierului shadow temporar: %m" #: src/unix_passwd.c:861 src/unix_passwd.c:1001 #, c-format msgid "Cannot create backup file of %s: %m" -msgstr "Nu pot crea fişier de backup pentru %s: %m" +msgstr "Nu pot crea fișier de backup pentru %s: %m" #: src/unix_passwd.c:976 #, c-format msgid "Error while writing new password file: %m" -msgstr "Eroare la scrierea noului fişier password: %m" +msgstr "Eroare la scrierea noului fișier password: %m" #: src/unix_passwd.c:986 #, c-format msgid "Error while closing old password file: %m" -msgstr "Eroare la închiderea vechiului fişier password: %m" +msgstr "Eroare la închiderea vechiului fișier password: %m" #: src/unix_passwd.c:994 #, c-format msgid "Error while closing temporary password file: %m" -msgstr "Eroare la închiderea fişierului password temporar: %m" +msgstr "Eroare la închiderea fișierului password temporar: %m" #: src/unix_passwd.c:1033 #, c-format diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_unix2-2.5.1/src/unix_passwd.c new/pam_unix2-2.6/src/unix_passwd.c --- old/pam_unix2-2.5.1/src/unix_passwd.c 2008-04-11 11:37:03.000000000 +0200 +++ new/pam_unix2-2.6/src/unix_passwd.c 2008-08-28 16:33:06.000000000 +0200 @@ -254,7 +254,7 @@ if (flags & PAM_PRELIM_CHECK) { /* Check if the old password was correct. */ - if (getuid () && strcmp (data->oldpassword, + if ((getuid () || (flags & PAM_CHANGE_EXPIRED_AUTHTOK)) && strcmp (data->oldpassword, crypt_r (oldpass, data->oldpassword, &output)) != 0) { if (options.debug) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_unix2-2.5.1/src/unix_sess.c new/pam_unix2-2.6/src/unix_sess.c --- old/pam_unix2-2.5.1/src/unix_sess.c 2006-01-17 13:41:06.000000000 +0100 +++ new/pam_unix2-2.6/src/unix_sess.c 2008-08-28 16:55:30.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006 SUSE Linux Products GmbH Nuernberg,Germany. + * Copyright (c) 2006, 2008 SUSE Linux Products GmbH Nuernberg,Germany. * Copyright (c) 1999, 2000, 2002, 2003, 2004 SuSE GmbH Nuernberg, Germany. * Author: Thorsten Kukuk <kukuk(a)suse.de> * @@ -52,14 +52,15 @@ #include "public.h" -int -pam_sm_open_session (pam_handle_t *pamh, int flags, int argc, - const char **argv) +static int +pam_log_session (pam_handle_t *pamh, int flags, int argc, + const char **argv, const char *kind) { int retval; const char *name; - char *service; + char *service, *tty, *rhost; options_t options; + char *logmsg = NULL; memset (&options, 0, sizeof (options)); options.log_level = -1; /* Initialize to default "none". */ @@ -88,52 +89,57 @@ if (service == NULL) return PAM_CONV_ERR; - pam_syslog (pamh, options.log_level, - "session started for user %s, service %s\n", - name, service); - - return PAM_SUCCESS; -} - -int -pam_sm_close_session (pam_handle_t * pamh, int flags, - int argc, const char **argv) -{ - int retval; - const char *name; - char *service; - options_t options; + retval = pam_get_item(pamh, PAM_TTY, (void *) &tty); + if (retval !=PAM_SUCCESS) + return retval; - memset (&options, 0, sizeof (options)); - options.log_level = -1; /* Initialize to default "none". */ + retval = pam_get_item(pamh, PAM_RHOST, (void *) &rhost); + if (retval !=PAM_SUCCESS) + return retval; - if (get_options (pamh, &options, "session", argc, argv) < 0) + if (tty && !rhost) { - pam_syslog (pamh, LOG_ERR, "cannot get options"); - return PAM_SYSTEM_ERR; + if (asprintf (&logmsg, "session %s for user %s: service=%s, tty=%s", + kind, name, service, tty) == -1) + return PAM_SESSION_ERR; + } + else if (!tty && rhost) + { + if (asprintf (&logmsg, + "session %s for user %s: service=%s, rhost=%s", + kind, name, service, rhost) == -1) + return PAM_SESSION_ERR; + } + else if (tty && rhost) + { + if (asprintf (&logmsg, + "session %s for user %s: service=%s, tty=%s, rhost=%s", + kind, name, service, tty, rhost) == -1) + return PAM_SESSION_ERR; + } + else + { + if (asprintf (&logmsg, "session %s for user %s: service=%s", + kind, name, service) == -1) + return PAM_SESSION_ERR; } - /* get the user name */ - if ((retval = pam_get_user (pamh, &name, NULL)) != PAM_SUCCESS) - return retval; - - if (name == NULL || name[0] == '\0') - return PAM_SESSION_ERR; - - /* Move this after getting the user name, else PAM test suite - will not pass ... */ - if (options.log_level == -1) - return PAM_SUCCESS; + pam_syslog (pamh, options.log_level, logmsg); + free (logmsg); - retval = pam_get_item (pamh, PAM_SERVICE, (void *) &service); - if (retval != PAM_SUCCESS) - return retval; - if (service == NULL) - return PAM_CONV_ERR; + return PAM_SUCCESS; +} - pam_syslog (pamh, options.log_level, - "session finished for user %s, service %s\n", - name, service); +int +pam_sm_open_session (pam_handle_t *pamh, int flags, int argc, + const char **argv) +{ + return pam_log_session (pamh, flags, argc, argv, "started"); +} - return PAM_SUCCESS; +int +pam_sm_close_session (pam_handle_t * pamh, int flags, + int argc, const char **argv) +{ + return pam_log_session (pamh, flags, argc, argv, "finished"); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 heartbeat
by root＠Hilbert.suse.de 30 Aug '08

30 Aug '08

Hello community, here is the log from the commit of package heartbeat checked in at Sat Aug 30 02:50:19 CEST 2008. -------- --- heartbeat/heartbeat.changes 2008-07-18 15:50:10.000000000 +0200 +++ heartbeat/heartbeat.changes 2008-08-20 19:49:52.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Aug 20 19:48:00 CEST 2008 - abeekhof(a)suse.de + +- Merge with upstream (dev tree: 138224137a3f) +- Sanitize spec file +- Upstream removed dead code + +------------------------------------------------------------------- Old: ---- heartbeat-cmi-indication-temporary-fix.diff heartbeat.rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ heartbeat.spec ++++++ --- /var/tmp/diff_new_pack.M24611/_old 2008-08-30 02:47:42.000000000 +0200 +++ /var/tmp/diff_new_pack.M24611/_new 2008-08-30 02:47:42.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package heartbeat (Version 2.1.3) +# spec file for package heartbeat (Version 2.99.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -16,37 +23,37 @@ %define without_fatal_warnings 1 %define start_at_boot 0 %define stop_start_script 0 +%define SSLeay perl-Net-SSLeay %define gname haclient %define uname hacluster %define uid 90 %define nogroup nobody -%define SSLeay perl-Net-SSLeay +%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} +%define pkg_group System Environment/Daemons +%else +%define pkg_group Productivity/Clustering/HA +%endif Name: heartbeat Summary: The Heartbeat Subsystem for High-Availability Linux -Version: 2.1.3 -Release: 28 +Version: 2.99.0 +Release: 1 License: GPL v2 or later; LGPL v2.1 or later Url: http://linux-ha.org/ -%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} -Group: Productivity/Clustering/HA -%else Group: Productivity/Clustering/HA -%endif Source: heartbeat.tar.gz Source1: heartbeat.suse.in -Source2: heartbeat.rpmlintrc Patch1: heartbeat-doc-directory.diff -Patch2: heartbeat-cmi-indication-temporary-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-common = %{version}-%{release} Requires: %{name}-resources = %{version}-%{release} +Requires: /bin/ping perl-TimeDate +BuildRequires: curl-devel e2fsprogs-devel glib2-devel iputils libxml2-devel lynx AutoReqProv: on %if 0%{?fedora_version} Requires(post): /sbin/chkconfig Requires(preun):/sbin/chkconfig %endif -Requires: /bin/ping perl-TimeDate %if 0%{?suse_version} Requires: python-xml python-gtk BuildRequires: OpenIPMI-devel bison fdupes flex gdbm-devel libnet python-xml @@ -98,9 +105,8 @@ %endif %else # Hack to avoid needing to install a kernel on Mandriva just to build pacemaker -#Requires: iptables +Requires: iptables %endif -BuildRequires: curl-devel e2fsprogs-devel glib2-devel gnutls-devel iputils libxml2-devel lynx net-snmp-devel pam-devel python-devel swig #BuildRequires: python-gtk-devel tcpd-devel #!BuildIgnore: -iptables %if %build_cmpi @@ -168,20 +174,16 @@ Sun Jiang Dong <hasjd(a)cn.ibm.com> (See doc/AUTHORS) -%package core +%package common License: GPL v2 or later; LGPL v2.1 or later Summary: Common heartbeat components -%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} -Group: Productivity/Clustering/HA -%else Group: Productivity/Clustering/HA -%endif # We need these when upgading from the old package structure -Obsoletes: %{name} < %{version}-%{release} -Obsoletes: %{name}-pils < %{version}-%{release} -Obsoletes: %{name}-stonith < %{version}-%{release} -#Provides: %{name}-pils = %{version}-%{release} -#Provides: %{name}-stonith = %{version}-%{release} +Obsoletes: %{name} < 2.99 +Obsoletes: %{name}-pils < 2.99 +Obsoletes: %{name}-stonith < 2.99 +Provides: %{name}-pils = 2.1.4 +Provides: %{name}-stonith = 2.1.4 Provides: heartbeat:%{_libdir}/libapphb.so.* Provides: heartbeat:%{_libdir}/liblrm.so.* Provides: heartbeat:%{_libdir}/libplumb.so.* @@ -190,7 +192,7 @@ Provides: heartbeat:%{_sbindir}/ha_logger Provides: heartbeat:%{_sbindir}/ocf-tester -%description core +%description common Clustering components provided by the Heartbeat project that are generally useful regardless of which cluster stack is being used. @@ -211,18 +213,18 @@ Sun Jiang Dong <hasjd(a)cn.ibm.com> (See doc/AUTHORS) -%package core-devel +%package common-devel License: GPL v2 or later; LGPL v2.1 or later -Summary: Developmental files for common heartbeat components -%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} -Group: Productivity/Clustering/HA -%else +Summary: Common heartbeat components Group: Productivity/Clustering/HA -%endif -%description core-devel -Header files and shared libraries needed for developing programs based -on the common clustering components provided by the Heartbeat project. +%description common-devel +Clustering components provided by the Heartbeat project that are +generally useful regardless of which cluster stack is being used. + +Include a local (non-cluster-aware) resource manager, a basic +(non-cluster-aware) STONITH framework and some useful libraries for +asyncronous, non-blocking IPC and using gmainloop(). @@ -240,11 +242,7 @@ %package ldirectord License: GPL v2 or later Summary: A Monitoring Daemon for Maintaining High Availability Resources -%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} Group: Productivity/Clustering/HA -%else -Group: Productivity/Clustering/HA -%endif Requires: %{SSLeay} perl-libwww-perl ipvsadm Obsoletes: heartbeat-ldirectd %if 0%{?fedora_version} @@ -274,11 +272,7 @@ %package cmpi License: GPL v2 or later; LGPL v2.1 or later Summary: Heartbeat CIM Provider -%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} -Group: Productivity/Clustering/HA -%else Group: Productivity/Clustering/HA -%endif %description cmpi This package provides the CIM provider for managing heartbeat via @@ -302,11 +296,7 @@ %package devel License: GPL v2 or later; LGPL v2.1 or later Summary: The Heartbeat Subsystem for High-Availability Linux -%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} Group: Productivity/Clustering/HA -%else -Group: Productivity/Clustering/HA -%endif Requires: %{name} = %{version}-%{release} %description devel @@ -348,7 +338,6 @@ ########################################################### %setup -n heartbeat %patch1 -p0 -%patch2 -p0 %if 0%{?suse_version} cp $RPM_SOURCE_DIR/heartbeat.suse.in ./heartbeat/init.d/heartbeat.in %endif @@ -401,9 +390,6 @@ --disable-crm export MAKE="make %{?jobs:-j%jobs}" make %{?jobs:-j%jobs} -# make -# No longer needed, we supply our own. -rm rc.config.heartbeat ########################################################### %install @@ -441,7 +427,7 @@ rm -rf $RPM_BUILD_DIR/heartbeat-%{version} ########################################################### -%pre +%pre common %if 0%{?fedora_version} /usr/sbin/fedora-groupadd %{uid} -r %{gname} &>/dev/null || : /usr/sbin/fedora-useradd %{uid} -r -s /sbin/nologin -d %{_var}/lib/heartbeat/cores/%{uname} -M \ @@ -467,10 +453,10 @@ # ########################################################### -%post core +%post common /sbin/ldconfig -%postun core +%postun common /sbin/ldconfig %post @@ -523,16 +509,15 @@ %defattr(-,root,root) %{_libdir}/heartbeat/mach_down %{_libdir}/heartbeat/mlock -%{_libdir}/heartbeat/recoverymgrd %{_libdir}/heartbeat/req_resource %{_libdir}/heartbeat/plugins/HBauth %{_libdir}/heartbeat/plugins/HBcomm %{_libdir}/heartbeat/plugins/HBcompress %{_libdir}/heartbeat/plugins/quorum -%{_libdir}/heartbeat/plugins/quorumd +#%{_libdir}/heartbeat/plugins/quorumd %{_libdir}/heartbeat/plugins/test %{_libdir}/heartbeat/plugins/tiebreaker -%{_libdir}/heartbeat/quorumd +#%{_libdir}/heartbeat/quorumd %{_libdir}/heartbeat/ha_* %{_libdir}/heartbeat/hb_* %{_libdir}/heartbeat/heartbeat @@ -552,7 +537,6 @@ %{_datadir}/heartbeat/req_resource %{_libdir}/heartbeat/dopd %{_libdir}/heartbeat/drbd-peer-outdater -%exclude %{_sbindir}/ciblint # Exclude pointless compatability symlinks #%exclude %{_libdir}/heartbeat/SNMPAgentSanityCheck %exclude %{_libdir}/heartbeat/TestHeartbeatComm @@ -585,8 +569,6 @@ %{_libdir}/libclm.so.* %{_libdir}/libhbclient.so.* %{_libdir}/libccmclient.so.* -%{_libdir}/librecoverymgr.so.* -%{_libdir}/heartbeat/plugins/AppHBNotification /sbin/rcheartbeat %{_libdir}/heartbeat/apphbd %{_bindir}/cl_respawn @@ -607,7 +589,7 @@ %{_datadir}/doc/packages/heartbeat/ha.cf ########################################################### -%files core +%files common %defattr(-,root,root) %doc doc/README %doc doc/COPYING @@ -615,6 +597,7 @@ %dir %{_libdir}/heartbeat/plugins %dir %{_datadir}/heartbeat %dir %{_datadir}/doc/packages/heartbeat +%{_sysconfdir}/ha.d/shellfuncs %{_sbindir}/stonith %{_sbindir}/meatclient %{_sbindir}/ha_logger @@ -654,7 +637,7 @@ %dir %attr (0700, nobody, %{nogroup}) %{_var}/lib/heartbeat/cores/nobody %dir %attr (0700, %{uname}, %{gname}) %{_var}/lib/heartbeat/cores/%{uname} -%files core-devel +%files common-devel %defattr(-,root,root) %dir %{_includedir}/heartbeat %{_includedir}/pils @@ -676,9 +659,7 @@ #%{_datadir}/heartbeat/logtest %{_libdir}/heartbeat/logtest %{_datadir}/heartbeat/lrmtest -%{_datadir}/heartbeat/ra-api-1.dtd %exclude %{_libdir}/heartbeat/lrmtest -%exclude %{_libdir}/heartbeat/ra-api-1.dtd %files devel %defattr(-,root,root) @@ -688,12 +669,10 @@ %{_includedir}/heartbeat/HBauth.h %{_includedir}/heartbeat/HBcomm.h %{_includedir}/heartbeat/hb_api.h -%{_includedir}/heartbeat/recoverymgr.h %{_libdir}/libccmclient*.so %{_libdir}/libclm*.so %{_libdir}/libhbclient*.so -%{_libdir}/librecoverymgr*.so -%{_libdir}/heartbeat/quorumdtest +#%{_libdir}/heartbeat/quorumdtest %{_libdir}/heartbeat/clmtest %{_libdir}/heartbeat/api_test %{_libdir}/heartbeat/ipctest @@ -710,9 +689,10 @@ %files resources %defattr(-,root,root) %dir /usr/lib/ocf -#%dir /usr/lib/ocf/resource.d -%exclude %{_sysconfdir}/ha.d/resource.d/ldirectord -/usr/lib/ocf/resource.d +%dir /usr/lib/ocf/resource.d +/usr/lib/ocf/resource.d/heartbeat +%exclude %{_libdir}/heartbeat/ra-api-1.dtd +%{_datadir}/heartbeat/ra-api-1.dtd ########################################################### # Files for ldirectord @@ -732,6 +712,10 @@ %config(noreplace) %{_sysconfdir}/logrotate.d/ldirectord %changelog +* Wed Aug 20 2008 abeekhof(a)suse.de +- Merge with upstream (dev tree: 138224137a3f) +- Sanitize spec file +- Upstream removed dead code * Fri Jul 18 2008 abeekhof(a)suse.de - Merge with upstream (dev tree: 95b9cf7578f4) - Stonithd has been moved into Pacemaker ++++++ heartbeat.tar.gz ++++++ ++++ 52993 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 pacemaker
by root＠Hilbert.suse.de 30 Aug '08

30 Aug '08

Hello community, here is the log from the commit of package pacemaker checked in at Sat Aug 30 02:45:59 CEST 2008. -------- --- pacemaker/pacemaker.changes 2008-07-25 16:50:16.000000000 +0200 +++ pacemaker/pacemaker.changes 2008-08-20 17:12:30.000000000 +0200 @@ -1,0 +2,22 @@ +Wed Aug 20 17:05:00 CEST 2008 - abeekhof(a)suse.de + + - Update source tarball to revision: f567855328b7 (0.7.1) + + Added features needed to support libdlm and ocfs2-tools + + High: admin: Fix use-after-free in crm_mon + + High: cib: Use single quotes so that the xpath queries for nvpairs will succeed + + High: crmd: Always connect to stonithd when the TE starts and ensure we notice if it dies + + High: crmd: Make sure async-failures cause the failcount to be incrimented + + High: PE: Bug LF:1941 - Handle failed clone instance probes when clone-max < #nodes + + High: PE: Prevent use-of-NULL - order->rsc_rh will not always be non-NULL + + High: PE: Unpack colocation sets correctly + + High: Tools: crm_mon - Prevent use-of-NULL for orphaned resources + + Medium: Core: Get more details regarding parser errors + + Medium: Core: Switch to the libxml2 parser - its significantly faster + + Medium: PE: Allow groups to be involved in optional ordering constraints + + Medium: PE: Allow sets of operations to be reused by multiple resources + + Medium: PE: Bug LF:1941 - Mark extra clone instances as orphans and don't show inactive ones + + Medium: PE: Determin the correct migration-threshold during resource expansion + + Medium: PE: Implement no-quorum-policy=suicide (FATE #303619) + + Lots of bug fixes + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pacemaker.spec ++++++ --- /var/tmp/diff_new_pack.W17291/_old 2008-08-30 02:44:11.000000000 +0200 +++ /var/tmp/diff_new_pack.W17291/_new 2008-08-30 02:44:11.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package pacemaker (Version 0.6.3) +# spec file for package pacemaker (Version 0.7.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -18,27 +25,22 @@ %define without_fatal_warnings 1 %define with_ais_support 1 %define with_heartbeat_support 1 -%define with_snmp_support 0 -%define gname haclient -%define uname hacluster +%if 0%{?fedora_version} +%define pkg_group System Environment/Daemons +%else +%define pkg_group Productivity/Clustering/HA +%endif Name: pacemaker Summary: The Pacemaker scalable High-Availability cluster resource manager -Version: 0.6.3 -Release: 25 +Version: 0.7.1 +Release: 1 License: GPL v2 or later; LGPL v2.1 or later Url: http://www.clusterlabs.org -%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} Group: Productivity/Clustering/HA -%else -Group: Productivity/Clustering/HA -%endif Source: pacemaker.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on -%if %with_snmp_support == 1 -BuildRequires: net-snmp-devel -%endif %if %with_ais_support BuildRequires: openais-devel %endif @@ -57,7 +59,7 @@ Conflicts: pacemaker Conflicts: pacemaker-ais %endif -BuildRequires: e2fsprogs-devel glib2-devel gnutls-devel heartbeat-core heartbeat-core-devel libxml2-devel libxslt-devel pam-devel python-devel swig +BuildRequires: e2fsprogs-devel glib2-devel gnutls-devel heartbeat-common heartbeat-common-devel libxml2-devel libxslt-devel ncurses-devel pam-devel python-devel swig %if 0%{?suse_version} %if 0%{?suse_version} > 1000 %if %with_ais_support @@ -84,7 +86,7 @@ BuildRequires: gcc-c++ kernel %endif %if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} -BuildRequires: lm_sensors-devel openssl-devel which +BuildRequires: openssl-devel which %endif %if 0%{?mandriva_version} BuildRequires: libbzip2-devel openssl-devel @@ -110,11 +112,7 @@ %package devel License: GPL v2 or later; LGPL v2.1 or later Summary: The Pacemaker scalable High-Availability cluster resource manager -%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} -Group: Productivity/Clustering/HA -%else Group: Productivity/Clustering/HA -%endif Requires: %{name} = %{version}-%{release} %description devel @@ -168,14 +166,8 @@ --localstatedir=%{_var} --infodir=%{_infodir} \ --mandir=%{_mandir} --libdir=%{_libdir} \ --libexecdir=%{_libexecdir} \ - --with-group-name=%{gname} --with-ccmuser-name=%{uname} \ --with-hapkgversion=%{version} \ --enable-glib-malloc \ -%if %with_snmp_support == 1 - --enable-snmp-subagent \ -%else - --disable-snmp-subagent \ -%endif --with-ais-prefix=%{_prefix} \ %if %with_ais_support == 0 --without-ais-support \ @@ -254,7 +246,7 @@ %{_sbindir}/crm_failcount %{_sbindir}/crm_master %{_sbindir}/crm_mon -%{_sbindir}/crm_sh +%exclude %{_sbindir}/crm_sh %{_sbindir}/crm_resource %{_sbindir}/crm_standby %{_sbindir}/crm_uuid @@ -264,19 +256,18 @@ %{_sbindir}/ccm_tool %{_sbindir}/attrd_updater %{_sbindir}/ptest -%{_sbindir}/cib_shadow +%{_sbindir}/crm_shadow %{_sbindir}/cibpipe %doc %{_mandir}/man8/cibadmin.8* %doc %{_mandir}/man8/crm_resource.8* %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/heartbeat/crm %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/heartbeat/pengine %dir %attr (750, %{uname}, %{gname}) %{_var}/run/heartbeat/crm +%dir /usr/lib/ocf/resource.d/pacemaker +/usr/lib/ocf/resource.d/pacemaker %if %with_ais_support %{_libexecdir}/lcrso/pacemaker.lcrso %endif -%if %with_snmp_support == 1 -/usr/share/snmp/mibs/LINUX-HA-MIB.mib -%endif %files devel %defattr(-,root,root) @@ -286,6 +277,25 @@ %{_libdir}/*.so %changelog +* Wed Aug 20 2008 abeekhof(a)suse.de +- Update source tarball to revision: f567855328b7 (0.7.1) + + Added features needed to support libdlm and ocfs2-tools + + High: admin: Fix use-after-free in crm_mon + + High: cib: Use single quotes so that the xpath queries for nvpairs will succeed + + High: crmd: Always connect to stonithd when the TE starts and ensure we notice if it dies + + High: crmd: Make sure async-failures cause the failcount to be incrimented + + High: PE: Bug LF:1941 - Handle failed clone instance probes when clone-max < #nodes + + High: PE: Prevent use-of-NULL - order->rsc_rh will not always be non-NULL + + High: PE: Unpack colocation sets correctly + + High: Tools: crm_mon - Prevent use-of-NULL for orphaned resources + + Medium: Core: Get more details regarding parser errors + + Medium: Core: Switch to the libxml2 parser - its significantly faster + + Medium: PE: Allow groups to be involved in optional ordering constraints + + Medium: PE: Allow sets of operations to be reused by multiple resources + + Medium: PE: Bug LF:1941 - Mark extra clone instances as orphans and don't show inactive ones + + Medium: PE: Determin the correct migration-threshold during resource expansion + + Medium: PE: Implement no-quorum-policy=suicide (FATE #303619) + + Lots of bug fixes * Mon Jul 21 2008 abeekhof(a)suse.de - Update source tarball to revision: 7a31d0c33e22 (0.7.0) + High: Performance enhancements ++++++ pacemaker.tar.gz ++++++ ++++ 94174 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 liferea
by root＠Hilbert.suse.de 30 Aug '08

30 Aug '08

Hello community, here is the log from the commit of package liferea checked in at Sat Aug 30 02:37:05 CEST 2008. -------- --- GNOME/liferea/liferea.changes 2008-08-04 17:24:50.000000000 +0200 +++ liferea/liferea.changes 2008-08-29 19:34:43.841311000 +0200 @@ -1,0 +2,13 @@ +Fri Aug 29 19:31:42 CEST 2008 - cthiel(a)suse.de + +- update to version 1.4.18 + * Fixes SF #1800030: Fix date format problem in non UTF-8 locale for date + strings representing dates older one week. + * Fixes a bug that causes the single item removal to have no effect at + all. This also can cause reappearing of old items and wrong unread + counts. + * Fixes the 100% CPU usage of the previous versions that was cost by + exorbitant merging costs due to the cache dropping not working anymore + due to the item removal issue mentioned above. + +------------------------------------------------------------------- Old: ---- liferea-1.4.17.tar.bz2 New: ---- liferea-1.4.18.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ liferea.spec ++++++ --- /var/tmp/diff_new_pack.N27669/_old 2008-08-30 02:35:30.000000000 +0200 +++ /var/tmp/diff_new_pack.N27669/_new 2008-08-30 02:35:30.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package liferea (Version 1.4.17) +# spec file for package liferea (Version 1.4.18) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,7 +24,7 @@ # FIXME: for libgtkhtml-devel: checking for 64bit platform... yes -> disabling GtkHTML2 License: GPL v2 or later Group: Productivity/Other -Version: 1.4.17 +Version: 1.4.18 Release: 1 Summary: Linux Feed Reader Source: %{name}-%{version}.tar.bz2 @@ -120,6 +120,16 @@ %files lang -f %{name}.lang %changelog +* Fri Aug 29 2008 cthiel(a)suse.de +- update to version 1.4.18 + * Fixes SF #1800030: Fix date format problem in non UTF-8 locale for date + strings representing dates older one week. + * Fixes a bug that causes the single item removal to have no effect at + all. This also can cause reappearing of old items and wrong unread + counts. + * Fixes the 100%% CPU usage of the previous versions that was cost by + exorbitant merging costs due to the cache dropping not working anymore + due to the item removal issue mentioned above. * Mon Aug 04 2008 cthiel(a)suse.de - update to version 1.4.17 * Changes LUA module loading to use the default module loading function ++++++ liferea-1.4.17.tar.bz2 -> liferea-1.4.18.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/liferea-1.4.17/ChangeLog new/liferea-1.4.18/ChangeLog --- old/liferea-1.4.17/ChangeLog 2008-07-22 18:39:32.000000000 +0200 +++ new/liferea-1.4.18/ChangeLog 2008-07-27 19:32:04.000000000 +0200 @@ -1,3 +1,19 @@ +2008-07-27 Lars Lindner <lars.lindner(a)gmail.com> + + Version 1.4.18 (Stable) + + * Fixes SF #1800030: Fix date format problem in non + UTF-8 locale for date strings representing dates + older one week. (patch by Micky Hatya) + * Fixes a bug that causes the single item removal + to have no effect at all. This also can cause + reappearing of old items and wrong unread counts. + * Fixes the 100% CPU usage of the previous versions + that was cost by exorbitant merging costs due to + the cache dropping not working anymore due to the + item removal issue mentioned above. + + 2008-07-22 Lars Lindner <lars.lindner(a)gmail.com> Version 1.4.17 (Stable) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/liferea-1.4.17/configure new/liferea-1.4.18/configure --- old/liferea-1.4.17/configure 2008-07-22 18:42:06.000000000 +0200 +++ new/liferea-1.4.18/configure 2008-07-27 19:32:51.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for liferea 1.4.17. +# Generated by GNU Autoconf 2.61 for liferea 1.4.18. # # Report bugs to <liferea-devel(a)lists.sourceforge.net>. # @@ -728,8 +728,8 @@ # Identity of this package. PACKAGE_NAME='liferea' PACKAGE_TARNAME='liferea' -PACKAGE_VERSION='1.4.17' -PACKAGE_STRING='liferea 1.4.17' +PACKAGE_VERSION='1.4.18' +PACKAGE_STRING='liferea 1.4.18' PACKAGE_BUGREPORT='liferea-devel(a)lists.sourceforge.net' ac_unique_file="src/feedlist.c" @@ -1519,7 +1519,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures liferea 1.4.17 to adapt to many kinds of systems. +\`configure' configures liferea 1.4.18 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1594,7 +1594,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of liferea 1.4.17:";; + short | recursive ) echo "Configuration of liferea 1.4.18:";; esac cat <<\_ACEOF @@ -1752,7 +1752,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -liferea configure 1.4.17 +liferea configure 1.4.18 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1766,7 +1766,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by liferea $as_me 1.4.17, which was +It was created by liferea $as_me 1.4.18, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2583,7 +2583,7 @@ # Define the identity of the package. PACKAGE=liferea - VERSION=1.4.17 + VERSION=1.4.18 cat >>confdefs.h <<_ACEOF @@ -28959,7 +28959,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by liferea $as_me 1.4.17, which was +This file was extended by liferea $as_me 1.4.18, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -29012,7 +29012,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -liferea config.status 1.4.17 +liferea config.status 1.4.18 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/liferea-1.4.17/configure.ac new/liferea-1.4.18/configure.ac --- old/liferea-1.4.17/configure.ac 2008-07-22 18:41:09.000000000 +0200 +++ new/liferea-1.4.18/configure.ac 2008-07-27 19:30:49.000000000 +0200 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([liferea],[1.4.17],[liferea-devel(a)lists.sourceforge.net]) +AC_INIT([liferea],[1.4.18],[liferea-devel(a)lists.sourceforge.net]) AC_CANONICAL_TARGET([]) AC_CONFIG_SRCDIR([src/feedlist.c]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/liferea-1.4.17/liferea.glade new/liferea-1.4.18/liferea.glade --- old/liferea-1.4.17/liferea.glade 2008-07-08 23:24:39.000000000 +0200 +++ new/liferea-1.4.18/liferea.glade 2008-07-27 21:25:36.000000000 +0200 @@ -2179,7 +2179,12 @@ Daniel Nylander <po(a)danielnylander.se> Ihar Hrachyshka <booxter(a)users.sf.net> Emanuele Grande <caccolangrifata(a)gmail.com> -Martin Picek <picek.martin(a)gnome-cesko.cz></property> +Antonio Lima <amrlima(a)gmail.com> +Bruno Miguel <brunoalexandremiguel(a)gmail.com> +Martin Picek <picek.martin(a)gnome-cesko.cz> +Justin Forest <vhex(a)users.sf.net> +Mate Ory <orymate(a)gmail.com> + </property> </widget> </child> </widget> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/liferea-1.4.17/liferea.spec new/liferea-1.4.18/liferea.spec --- old/liferea-1.4.17/liferea.spec 2008-07-22 18:46:10.000000000 +0200 +++ new/liferea-1.4.18/liferea.spec 2008-07-27 20:07:55.000000000 +0200 @@ -1,6 +1,6 @@ Summary: Liferea (Linux RSS News Aggregator) Name: liferea -Version: 1.4.17 +Version: 1.4.18 Release: 1 Group: Applications/Internet License: GPL diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/liferea-1.4.17/src/common.c new/liferea-1.4.18/src/common.c --- old/liferea-1.4.17/src/common.c 2008-01-13 02:07:10.000000000 +0100 +++ new/liferea-1.4.18/src/common.c 2008-07-22 19:21:16.000000000 +0200 @@ -1,7 +1,7 @@ /** * @file common.c common routines for Liferea * - * Copyright (C) 2003-2007 Lars Lindner <lars.lindner(a)gmail.com> + * Copyright (C) 2003-2008 Lars Lindner <lars.lindner(a)gmail.com> * Copyright (C) 2004-2006 Nathan J. Conrad <t98502(a)users.sourceforge.net> * Copyright (C) 2004 Karl Soderstrom <ks(a)xanadunet.net> * @@ -179,10 +179,10 @@ if (!done) { if (then.tm_year == now.tm_year) { /* translation hint: date format for dates older than a week but from this year, reorder format codes as necessary */ - e_strftime_fix_am_pm (buf, TIMESTRLEN, _("%b %d %l:%M %p"), &then); + e_utf8_strftime_fix_am_pm (buf, TIMESTRLEN, _("%b %d %l:%M %p"), &then); } else { /* translation hint: date format for dates from the last years, reorder format codes as necessary */ - e_strftime_fix_am_pm (buf, TIMESTRLEN, _("%b %d %Y"), &then); + e_utf8_strftime_fix_am_pm (buf, TIMESTRLEN, _("%b %d %Y"), &then); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/liferea-1.4.17/src/common.h new/liferea-1.4.18/src/common.h --- old/liferea-1.4.17/src/common.h 2007-07-23 19:56:54.000000000 +0200 +++ new/liferea-1.4.18/src/common.h 2008-07-22 19:13:55.000000000 +0200 @@ -75,9 +75,9 @@ * Returns a formatted date string for the given timestamp. * * @param t the timestamp - * @param date_format a strptime format string (encoded in user locale!) + * @param date_format a strptime format string (encoded in UTF-8) * - * @returns a new formatted date string (encoded in user locale!) + * @returns a new formatted date string (encoded in UTF-8) */ gchar * common_format_date(time_t date, const gchar *date_format); @@ -88,7 +88,7 @@ * * @param t the timestamp * - * @returns a new formatted date string (encoded in user locale!) + * @returns a new formatted date string (encoded in UTF-8) */ gchar * common_format_nice_date(time_t date); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/liferea-1.4.17/src/db.c new/liferea-1.4.18/src/db.c --- old/liferea-1.4.17/src/db.c 2008-07-22 09:46:37.000000000 +0200 +++ new/liferea-1.4.18/src/db.c 2008-07-23 11:03:13.000000000 +0200 @@ -560,7 +560,7 @@ "WHERE node_id = ?"); db_new_statement ("itemsetRemoveStmt", - "DELETE FROM itemsets WHERE parent_item_id = ?"); + "DELETE FROM itemsets WHERE item_id = ? OR parent_item_id = ?"); db_new_statement ("itemsetRemoveAllStmt", "DELETE FROM itemsets WHERE parent_node_id = ?"); @@ -975,6 +975,7 @@ stmt = db_get_statement ("itemsetRemoveStmt"); sqlite3_bind_int (stmt, 1, id); + sqlite3_bind_int (stmt, 2, id); res = sqlite3_step (stmt); if (SQLITE_DONE != res) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/liferea-1.4.17/src/main.c new/liferea-1.4.18/src/main.c --- old/liferea-1.4.17/src/main.c 2008-07-17 21:59:59.000000000 +0200 +++ new/liferea-1.4.18/src/main.c 2008-07-22 19:01:06.000000000 +0200 @@ -273,9 +273,9 @@ session_init(BIN_DIR G_DIR_SEPARATOR_S "liferea", opt_session_arg); session_set_cmd(NULL, mainwindowState); #endif -/* signal(SIGTERM, signal_handler); + signal(SIGTERM, signal_handler); signal(SIGINT, signal_handler); - signal(SIGHUP, signal_handler);*/ + signal(SIGHUP, signal_handler); #ifndef G_OS_WIN32 signal(SIGBUS, fatal_signal_handler); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 eog
by root＠Hilbert.suse.de 30 Aug '08

30 Aug '08

Hello community, here is the log from the commit of package eog checked in at Sat Aug 30 02:31:52 CEST 2008. -------- --- GNOME/eog/eog.changes 2008-06-20 20:24:06.000000000 +0200 +++ eog/eog.changes 2008-08-26 15:10:15.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Aug 26 20:30:30 CEST 2008 - mboman(a)novell.com + +- Update to versino 2.23.90: + + Build system improvements + + Bug fixes: bgo#547302, bgo#547566, bgo#548079, bgo#548202 + + Translation updates. + +------------------------------------------------------------------- Old: ---- eog-2.23.4.1.tar.bz2 New: ---- eog-2.23.90.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eog.spec ++++++ --- /var/tmp/diff_new_pack.g14289/_old 2008-08-30 02:30:15.000000000 +0200 +++ /var/tmp/diff_new_pack.g14289/_new 2008-08-30 02:30:15.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package eog (Version 2.23.4.1) +# spec file for package eog (Version 2.23.90) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -21,7 +28,7 @@ Provides: eog2 = 2.20.0 Obsoletes: eog2 <= 2.20.0 Requires: gnome-icon-theme -Version: 2.23.4.1 +Version: 2.23.90 Release: 1 Summary: Eye of GNOME for the GNOME 2.x Desktop Source: %{name}-%{version}.tar.bz2 @@ -103,6 +110,11 @@ %{_libdir}/pkgconfig/eog.pc %changelog +* Tue Aug 26 2008 mboman(a)novell.com +- Update to versino 2.23.90: + + Build system improvements + + Bug fixes: bgo#547302, bgo#547566, bgo#548079, bgo#548202 + + Translation updates. * Fri Jun 20 2008 maw(a)suse.de - Update to versino 2.23.4.1: + Bugs fixed: bgo#526483, bgo#537488, and bgo#537758 ++++++ eog-2.23.4.1.tar.bz2 -> eog-2.23.90.tar.bz2 ++++++ ++++ 103620 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 OpenOffice_org
by root＠Hilbert.suse.de 30 Aug '08

30 Aug '08

Hello community, here is the log from the commit of package OpenOffice_org checked in at Sat Aug 30 02:27:58 CEST 2008. -------- --- arch/i386/OpenOffice_org/OpenOffice_org.changes 2008-08-27 14:05:30.000000000 +0200 +++ OpenOffice_org/OpenOffice_org.changes 2008-08-29 16:31:21.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 29 16:30:49 CEST 2008 - pmladek(a)suse.cz + +- added libexpat-devel to BuildRequires +- fixed build with mono 2.0 + +------------------------------------------------------------------- --- arch/i386/OpenOffice_org/OpenOffice_org-icon-themes.changes 2008-08-26 22:18:29.000000000 +0200 +++ OpenOffice_org/OpenOffice_org-icon-themes.changes 2008-08-29 18:15:09.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 29 18:12:59 CEST 2008 - pmladek(a)suse.cz + +- added build dependency on exact version of + OpenOffice_org-icon-themes-prebuilt to avoid inconsistent state [bnc#421559] + +------------------------------------------------------------------- --- arch/i386/OpenOffice_org/OpenOffice_org-l10n-group1.changes 2008-08-26 22:18:19.000000000 +0200 +++ OpenOffice_org/OpenOffice_org-l10n-group1.changes 2008-08-29 16:31:38.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 29 16:30:49 CEST 2008 - pmladek(a)suse.cz + +- added libexpat-devel to BuildRequires +- fixed build with mono 2.0 + +------------------------------------------------------------------- OpenOffice_org-l10n-group2.changes: same change Old: ---- minmem New: ---- ooo-build-3.0.0.2-mono-2.0.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-icon-themes.spec ++++++ --- /var/tmp/diff_new_pack.U32055/_old 2008-08-30 02:24:24.000000000 +0200 +++ /var/tmp/diff_new_pack.U32055/_new 2008-08-30 02:24:24.000000000 +0200 @@ -19,14 +19,14 @@ Name: OpenOffice_org-icon-themes -BuildRequires: OpenOffice_org-icon-themes-prebuilt +Version: 3.0.0.2 +Release: 5 +BuildRequires: OpenOffice_org-icon-themes-prebuilt = %version %define ooo_build_version 3.0.0.2 %define ooo_basis_dir basis3.0 %define ooo_home ooo3 License: LGPL v2.1 only; LGPL v3 only Group: Productivity/Office/Suite -Version: 3.0.0.2 -Release: 1 AutoReqProv: on Provides: OpenOffice_org:%_libdir/%ooo_home/share/config/images.zip Summary: Icon Themes for OpenOffice.org @@ -61,6 +61,9 @@ %_datadir/%ooo_home %changelog +* Fri Aug 29 2008 pmladek(a)suse.cz +- added build dependency on exact version of + OpenOffice_org-icon-themes-prebuilt to avoid inconsistent state [bnc#421559] * Wed Aug 27 2008 pmladek(a)suse.cz - updated to version 3.0.0.2 * Thu Aug 21 2008 pmladek(a)suse.cz ++++++ OpenOffice_org-l10n-group1.spec ++++++ --- /var/tmp/diff_new_pack.U32055/_old 2008-08-30 02:24:24.000000000 +0200 +++ /var/tmp/diff_new_pack.U32055/_new 2008-08-30 02:24:24.000000000 +0200 @@ -42,6 +42,10 @@ %if %suse_version > 1000 && %suse_version <= 1010 BuildRequires: gecko-sdk mozilla-xulrunner %endif +# libexpat-devel is explicitely needed since openSUSE-11.1 +%if %suse_version > 1100 +BuildRequires: libexpat-devel +%endif # poppler is needed to build the PDF import extension # the needed version 0.8.0 has been avaiable only since openSUSE-11.0 %if %suse_version >= 1100 @@ -92,7 +96,7 @@ License: LGPL v3 only Group: Productivity/Office/Suite Version: 3.0.0.2 -Release: 1 +Release: 2 # source sripts for architectures %ifarch ppc %define ooo_source_script %ooo_build_dir/%ooo_build_tag/LinuxPPCEnv.Set.sh @@ -186,6 +190,7 @@ Patch1: ooo-build-helpcontent-en-us-only.diff Patch2: ooo-build-help-in-usr-share.diff Patch3: ooo-build-3.0.0.2-java-1.4.diff +Patch4: ooo-build-3.0.0.2-mono-2.0.diff # # patches against the upstream sources, must be -p0 # Patch1000: bug-123456-fix-foo.diff # example @@ -439,6 +444,7 @@ %patch1 %patch2 %patch3 +%patch4 install -m 644 %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{S:7} %{S:8} %{S:9} %{S:10} %{S:11} %{S:12} %{S:13} %{S:14} %{S:15} %{S:16} %{S:17} %{S:18} src/ install -m 644 %{S:50} %{S:51} %{S:52} %{S:53} %{S:54} %{S:55} %{S:56} %{S:58} %{S:59} %{S:60} %{S:61} %{S:62} %{S:63} %{S:64} %{S:65} %{S:66} src/ # extra localizations sources @@ -724,6 +730,9 @@ #################################################### %changelog +* Fri Aug 29 2008 pmladek(a)suse.cz +- added libexpat-devel to BuildRequires +- fixed build with mono 2.0 * Wed Aug 27 2008 pmladek(a)suse.cz - updated ooo-build to version 3.0.0.2 * Thu Aug 21 2008 pmladek(a)suse.cz OpenOffice_org-l10n-group2.spec: same change ++++++ OpenOffice_org.spec ++++++ --- /var/tmp/diff_new_pack.U32055/_old 2008-08-30 02:24:24.000000000 +0200 +++ /var/tmp/diff_new_pack.U32055/_new 2008-08-30 02:24:24.000000000 +0200 @@ -30,6 +30,10 @@ %if %suse_version > 1000 && %suse_version <= 1010 BuildRequires: gecko-sdk mozilla-xulrunner %endif +# libexpat-devel is explicitely needed since openSUSE-11.1 +%if %suse_version > 1100 +BuildRequires: libexpat-devel +%endif # poppler is needed to build the PDF import extension # the needed version 0.8.0 has been avaiable only since openSUSE-11.0 %if %suse_version >= 1100 @@ -113,7 +117,7 @@ License: Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; LGPL v3 only; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT Group: Productivity/Office/Suite Version: 3.0.0.2 -Release: 1 +Release: 3 AutoReqProv: on PreReq: coreutils /usr/bin/update-mime-database PreReq: %{?suseconfig_fonts_prereq:%suseconfig_fonts_prereq} @@ -300,6 +304,7 @@ Patch1: ooo-build-helpcontent-en-us-only.diff Patch2: ooo-build-help-in-usr-share.diff Patch3: ooo-build-3.0.0.2-java-1.4.diff +Patch4: ooo-build-3.0.0.2-mono-2.0.diff # # patches against the upstream sources, must be -p0 # Patch1000: bug-123456-fix-foo.diff # example @@ -775,6 +780,7 @@ %patch1 %patch2 %patch3 +%patch4 install -m 644 %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{S:7} %{S:8} %{S:9} %{S:10} %{S:11} %{S:12} %{S:13} %{S:14} %{S:15} %{S:16} %{S:17} %{S:18} src/ install -m 644 %{S:50} %{S:51} %{S:52} %{S:53} %{S:54} %{S:55} %{S:56} %{S:58} %{S:59} %{S:60} %{S:61} %{S:62} %{S:63} %{S:64} %{S:65} %{S:66} src/ # extra localizations sources @@ -1254,6 +1260,9 @@ %{_prefix}/bin/dmake %changelog +* Fri Aug 29 2008 pmladek(a)suse.cz +- added libexpat-devel to BuildRequires +- fixed build with mono 2.0 * Wed Aug 27 2008 pmladek(a)suse.cz - fixed build with java 1.4 target for 10.2 and 10.3 * Wed Aug 27 2008 pmladek(a)suse.cz ++++++ ooo-build-3.0.0.2-mono-2.0.diff ++++++ Index: patches/mono/cli_ure-source-bootstrap-managed_bootstrap-cs.diff =================================================================== --- patches/mono/cli_ure-source-bootstrap-managed_bootstrap-cs.diff (revision 13728) +++ patches/mono/cli_ure-source-bootstrap-managed_bootstrap-cs.diff (working copy) @@ -118,7 +118,7 @@ + + static object ExtractObject(IntPtr managed) + { -+ GCHandle handle = GCHandle.op_Explicit(managed); ++ GCHandle handle = (GCHandle)managed; + object ret = handle.Target; + handle.Free(); + return ret; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 ypbind
by root＠Hilbert.suse.de 30 Aug '08

30 Aug '08

Hello community, here is the log from the commit of package ypbind checked in at Sat Aug 30 02:23:12 CEST 2008. -------- --- ypbind/ypbind.changes 2008-08-14 17:35:11.000000000 +0200 +++ ypbind/ypbind.changes 2008-08-28 16:20:07.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Aug 28 16:19:43 CEST 2008 - kukuk(a)suse.de + +- Update to 1.22: + - Merge Patches + - Only write binding file if it has really changed + +------------------------------------------------------------------- Old: ---- ypbind-mt-1.21.diff ypbind-mt-1.21.tar.bz2 New: ---- ypbind-mt-1.22.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ypbind.spec ++++++ --- /var/tmp/diff_new_pack.n22887/_old 2008-08-30 02:21:57.000000000 +0200 +++ /var/tmp/diff_new_pack.n22887/_new 2008-08-30 02:21:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package ypbind (Version 1.21) +# spec file for package ypbind (Version 1.22) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -29,13 +29,13 @@ AutoReqProv: on PreReq: %insserv_prereq %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 1.21 -Release: 33 +Version: 1.22 +Release: 1 Url: http://www.linux-nis.org/nis/ypbind-mt Summary: NIS client daemon Source: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{version}.tar.bz2 Source1: SuSEfirewall.ypbind -Patch: ypbind-mt-%{version}.diff +#Patch: ypbind-mt-%{version}.diff %description This package provides the ypbind daemon. The ypbind daemon binds NIS @@ -53,7 +53,7 @@ %prep %setup -q -n ypbind-mt-%{version} -%patch +#%patch %build export CFLAGS=$RPM_OPT_FLAGS @@ -115,6 +115,10 @@ %dir /var/yp/binding %changelog +* Thu Aug 28 2008 kukuk(a)suse.de +- Update to 1.22: + - Merge Patches + - Only write binding file if it has really changed * Thu Aug 14 2008 kukuk(a)suse.de - Adjust init script to new policy * Thu Apr 17 2008 schwab(a)suse.de ++++++ ypbind-mt-1.21.tar.bz2 -> ypbind-mt-1.22.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ypbind-mt-1.21/aclocal.m4 new/ypbind-mt-1.22/aclocal.m4 --- old/ypbind-mt-1.21/aclocal.m4 2008-04-15 12:51:56.000000000 +0200 +++ new/ypbind-mt-1.22/aclocal.m4 2008-08-28 14:25:53.000000000 +0200 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,10 +11,13 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_if(m4_PACKAGE_VERSION, [2.61],, -[m4_fatal([this file was generated for autoconf 2.61. -You have another version of autoconf. If you want to use that, -you should regenerate the build system entirely.], [63])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(AC_AUTOCONF_VERSION, [2.61],, +[m4_warning([this file was generated for autoconf 2.61. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # @@ -84,16 +87,14 @@ # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], -[if test -n "$PKG_CONFIG"; then - if test -n "$$1"; then - pkg_cv_[]$1="$$1" - else - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - fi -else - pkg_failed=untried +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + else + pkg_failed=untried fi[]dnl ])# _PKG_CONFIG @@ -137,9 +138,9 @@ if test $pkg_failed = yes; then _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -164,7 +165,7 @@ _PKG_TEXT -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])], +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], [$4]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS @@ -174,7 +175,7 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -189,7 +190,7 @@ [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10], [], +m4_if([$1], [1.10.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -205,8 +206,10 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10])dnl -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) +[AM_AUTOMAKE_VERSION([1.10.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -478,7 +481,7 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -566,13 +569,13 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 +# serial 13 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -677,16 +680,17 @@ # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. +_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $1 | $1:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -958,7 +962,7 @@ # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- -# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ypbind-mt-1.21/ChangeLog new/ypbind-mt-1.22/ChangeLog --- old/ypbind-mt-1.21/ChangeLog 2008-04-15 13:22:39.000000000 +0200 +++ new/ypbind-mt-1.22/ChangeLog 2008-08-28 14:25:17.000000000 +0200 @@ -1,3 +1,15 @@ +2008-08-28 Thorsten Kukuk <kukuk(a)suse.de> + + * release version 1.22 + + * src/serv_list.c: Only write binding file if there were + really changes. Based on patch from + Eric Sandeen <sandeen(a)redhat.com>. + +2008-08-27 Thorsten Kukuk <kukuk(a)suse.de> + + * etc/ypbind.init: Adjust init script to new openSUSE policy + 2008-04-15 Thorsten Kukuk <kukuk(a)suse.de> * release version 1.21 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ypbind-mt-1.21/configure new/ypbind-mt-1.22/configure --- old/ypbind-mt-1.21/configure 2008-04-15 12:51:58.000000000 +0200 +++ new/ypbind-mt-1.22/configure 2008-08-28 14:26:06.000000000 +0200 @@ -2119,7 +2119,7 @@ # Define the identity of the package. PACKAGE=ypbind-mt - VERSION=1.21 + VERSION=1.22 cat >>confdefs.h <<_ACEOF @@ -4987,11 +4987,10 @@ { echo "$as_me:$LINENO: checking for DBUS" >&5 echo $ECHO_N "checking for DBUS... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$DBUS_CFLAGS"; then - pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$DBUS_CFLAGS"; then + pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= 0.60\"") >&5 ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= 0.60") 2>&5 ac_status=$? @@ -5001,15 +5000,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$DBUS_LIBS"; then - pkg_cv_DBUS_LIBS="$DBUS_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$DBUS_LIBS"; then + pkg_cv_DBUS_LIBS="$DBUS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= 0.60\"") >&5 ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= 0.60") 2>&5 ac_status=$? @@ -5019,9 +5016,8 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -5034,9 +5030,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 >= 0.60"` + DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= 0.60" 2>&1` else - DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= 0.60"` + DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= 0.60" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DBUS_PKG_ERRORS" >&5 @@ -5073,7 +5069,7 @@ and DBUS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. +To get pkg-config, see <http://pkg-config.freedesktop.org/>. See \`config.log' for more details." >&5 echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -5083,7 +5079,7 @@ and DBUS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. +To get pkg-config, see <http://pkg-config.freedesktop.org/>. See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else @@ -5100,11 +5096,10 @@ { echo "$as_me:$LINENO: checking for GLIB" >&5 echo $ECHO_N "checking for GLIB... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GLIB_CFLAGS"; then - pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$GLIB_CFLAGS"; then + pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.6\"") >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.6") 2>&5 ac_status=$? @@ -5114,15 +5109,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$GLIB_LIBS"; then - pkg_cv_GLIB_LIBS="$GLIB_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$GLIB_LIBS"; then + pkg_cv_GLIB_LIBS="$GLIB_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.6\"") >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.6") 2>&5 ac_status=$? @@ -5132,9 +5125,8 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -5147,9 +5139,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.6"` + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.6" 2>&1` else - GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.6"` + GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.6" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GLIB_PKG_ERRORS" >&5 @@ -5186,7 +5178,7 @@ and GLIB_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. +To get pkg-config, see <http://pkg-config.freedesktop.org/>. See \`config.log' for more details." >&5 echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -5196,7 +5188,7 @@ and GLIB_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. +To get pkg-config, see <http://pkg-config.freedesktop.org/>. See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else @@ -9314,21 +9306,22 @@ fi rm -f "$tmp/out12" # Compute $ac_file's index in $config_headers. +_am_arg=$ac_file _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $ac_file | $ac_file:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || -$as_expr X$ac_file : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ - X$ac_file : 'X$//$[^/]' \| \ - X$ac_file : 'X$//$$' \| \ - X$ac_file : 'X$/$' \| . 2>/dev/null || -echo X$ac_file | +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +$as_expr X"$_am_arg" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ + X"$_am_arg" : 'X$//$[^/]' \| \ + X"$_am_arg" : 'X$//$$' \| \ + X"$_am_arg" : 'X$/$' \| . 2>/dev/null || +echo X"$_am_arg" | sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -9365,7 +9358,7 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ X"$mf" : 'X$//$[^/]' \| \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ypbind-mt-1.21/configure.in new/ypbind-mt-1.22/configure.in --- old/ypbind-mt-1.21/configure.in 2008-04-15 12:51:17.000000000 +0200 +++ new/ypbind-mt-1.22/configure.in 2008-08-28 14:25:45.000000000 +0200 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(src/ypbind-mt.c) -AM_INIT_AUTOMAKE(ypbind-mt, 1.21) +AM_INIT_AUTOMAKE(ypbind-mt, 1.22) AM_CONFIG_HEADER(config.h) AC_PREFIX_DEFAULT(/usr) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ypbind-mt-1.21/etc/ypbind.init new/ypbind-mt-1.22/etc/ypbind.init --- old/ypbind-mt-1.21/etc/ypbind.init 2008-04-15 13:14:41.000000000 +0200 +++ new/ypbind-mt-1.22/etc/ypbind.init 2008-08-27 17:34:49.000000000 +0200 @@ -12,8 +12,9 @@ ### BEGIN INIT INFO # Provides: ypbind # Required-Start: $remote_fs $portmap +# Required-Stop: $remote_fs $portmap # Should-Start: ypserv slpd -# Required-Stop: $portmap +# Should-Stop: $null # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: Start ypbind (necessary for a NIS client) @@ -88,7 +89,7 @@ ## Check if portmap or rpcbind is running, else abort with error portmap_found=0 for prog in /sbin/rpcbind /sbin/portmap ; do - checkproc $prog + test -x $prog && checkproc $prog if [ $? -eq 0 ]; then portmap_found=1 fi @@ -106,7 +107,7 @@ test "$YPBIND_LOCAL_ONLY" = "yes" && OPTIONS="-local-only $OPTIONS" test "$YPBIND_BROADCAST" = "yes" && OPTIONS="-broadcast $OPTIONS" test "$YPBIND_BROKEN_SERVER" = "yes" && OPTIONS="-broken-server $OPTIONS" - test "X$YPBIND_PING_INTERVAL" -ne "X" && OPTIONS="-ping-interval $YPBIND_PING_INTERVAL $OPTIONS" + test "X$YPBIND_PING_INTERVAL" != "X" && OPTIONS="-ping-interval $YPBIND_PING_INTERVAL $OPTIONS" test "$YPBIND_DBUS" = "no" && OPTIONS="-no-dbus $OPTIONS" startproc $YPBIND_BIN $YPBIND_OPTIONS $OPTIONS diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ypbind-mt-1.21/lib/Makefile.in new/ypbind-mt-1.22/lib/Makefile.in --- old/ypbind-mt-1.21/lib/Makefile.in 2008-04-15 12:51:57.000000000 +0200 +++ new/ypbind-mt-1.22/lib/Makefile.in 2008-08-28 14:33:48.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -61,7 +61,7 @@ libcompat_a_DEPENDENCIES = @LIBOBJS@ am_libcompat_a_OBJECTS = dns_hosts.$(OBJEXT) libcompat_a_OBJECTS = $(am_libcompat_a_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -213,9 +213,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits lib/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnits lib/Makefile + $(AUTOMAKE) --gnu lib/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -269,8 +269,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -282,8 +282,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -293,13 +293,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ypbind-mt-1.21/Makefile.in new/ypbind-mt-1.22/Makefile.in --- old/ypbind-mt-1.21/Makefile.in 2008-04-15 13:02:48.000000000 +0200 +++ new/ypbind-mt-1.22/Makefile.in 2008-08-28 14:33:48.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -342,8 +342,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -368,8 +368,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -379,13 +379,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -461,6 +460,10 @@ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -488,6 +491,8 @@ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -639,7 +644,7 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-shar dist-tarZ dist-zip distcheck distclean \ + dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \ distclean-generic distclean-hdr distclean-tags distcleancheck \ distdir distuninstallcheck dvi dvi-am html html-am info \ info-am install install-am install-data install-data-am \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ypbind-mt-1.21/man/Makefile.am new/ypbind-mt-1.22/man/Makefile.am --- old/ypbind-mt-1.21/man/Makefile.am 2006-09-21 16:22:30.000000000 +0200 +++ new/ypbind-mt-1.22/man/Makefile.am 2008-08-28 14:33:40.000000000 +0200 @@ -12,11 +12,11 @@ XMLS = ypbind.8.xml yp.conf.5.xml if ENABLE_REGENERATE_MAN -%.5: %.5.xml +yp.conf.5: yp.conf.5.xml $(XMLLINT) --nonet --xinclude --postvalid --noout $< $(XSLTPROC) -o $(srcdir)/$@ --path $(srcdir) --xinclude --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< -%.8: %.8.xml +ypbind.8: ypbind.8.xml $(XMLLINT) --nonet --xinclude --postvalid --noout $< $(XSLTPROC) -o $(srcdir)/$@ --path $(srcdir) --xinclude --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ypbind-mt-1.21/man/Makefile.in new/ypbind-mt-1.22/man/Makefile.in --- old/ypbind-mt-1.21/man/Makefile.in 2008-04-15 12:51:57.000000000 +0200 +++ new/ypbind-mt-1.22/man/Makefile.in 2008-08-28 14:33:48.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -196,9 +196,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits man/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnits man/Makefile + $(AUTOMAKE) --gnu man/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -442,11 +442,11 @@ uninstall-man5 uninstall-man8 -@ENABLE_REGENERATE_MAN_TRUE@%.5: %.5.xml +@ENABLE_REGENERATE_MAN_TRUE@yp.conf.5: yp.conf.5.xml @ENABLE_REGENERATE_MAN_TRUE@ $(XMLLINT) --nonet --xinclude --postvalid --noout $< @ENABLE_REGENERATE_MAN_TRUE@ $(XSLTPROC) -o $(srcdir)/$@ --path $(srcdir) --xinclude --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< -@ENABLE_REGENERATE_MAN_TRUE@%.8: %.8.xml +@ENABLE_REGENERATE_MAN_TRUE@ypbind.8: ypbind.8.xml @ENABLE_REGENERATE_MAN_TRUE@ $(XMLLINT) --nonet --xinclude --postvalid --noout $< @ENABLE_REGENERATE_MAN_TRUE@ $(XSLTPROC) -o $(srcdir)/$@ --path $(srcdir) --xinclude --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ypbind-mt-1.21/man/ypbind.8 new/ypbind-mt-1.22/man/ypbind.8 --- old/ypbind-mt-1.21/man/ypbind.8 2008-04-15 13:02:18.000000000 +0200 +++ new/ypbind-mt-1.22/man/ypbind.8 2008-08-28 14:40:14.000000000 +0200 @@ -1,11 +1,11 @@ .\" Title: ypbind .\" Author: -.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/> -.\" Date: 04/15/2008 +.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/> +.\" Date: 08/28/2008 .\" Manual: ypbind-mt .\" Source: ypbind-mt .\" -.TH "YPBIND" "8" "04/15/2008" "ypbind-mt" "ypbind\-mt" +.TH "YPBIND" "8" "08/28/2008" "ypbind-mt" "ypbind\-mt" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ypbind-mt-1.21/man/yp.conf.5 new/ypbind-mt-1.22/man/yp.conf.5 --- old/ypbind-mt-1.21/man/yp.conf.5 2006-10-04 17:26:35.000000000 +0200 +++ new/ypbind-mt-1.22/man/yp.conf.5 2008-08-28 14:40:16.000000000 +0200 @@ -1,52 +1,62 @@ .\" Title: yp.conf .\" Author: -.\" Generator: DocBook XSL Stylesheets vsnapshot_2006\-08\-24_0226 <http://docbook.sf.net/> -.\" Date: 10/04/2006 -.\" Manual: ypbind\-mt -.\" Source: ypbind\-mt +.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/> +.\" Date: 08/28/2008 +.\" Manual: ypbind-mt +.\" Source: ypbind-mt .\" -.TH "YP.CONF" "5" "10/04/2006" "ypbind\-mt" "ypbind\-mt" +.TH "YP\.CONF" "5" "08/28/2008" "ypbind-mt" "ypbind\-mt" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" -yp.conf \- NIS binding configuration file +yp.conf - NIS binding configuration file .SH "DESCRIPTION" .PP The file -\fI/etc/yp.conf\fR +\fI/etc/yp\.conf\fR is read from \fBypbind\fR(8) -at startup or when receiving signal SIGHUP. The entries are used for the initial binding. Valid entries are -.TP 3n +at startup or when receiving signal SIGHUP\. The entries are used for the initial binding\. Valid entries are +.PP \fBdomain\fR \fInisdomain\fR \fBserver\fR \fIhostname\fR +.RS 4 Use server \fIhostname\fR for the domain -\fInisdomain\fR. You could have more then one entry of this type for a single domain. -.TP 3n +\fInisdomain\fR\. You could have more then one entry of this type for a single domain\. +.RE +.PP \fBdomain\fR \fInisdomain\fR \fBbroadcast\fR +.RS 4 Use broadcast on the local net for domain -\fInisdomain\fR. -.TP 3n +\fInisdomain\fR\. +.RE +.PP \fBdomain\fR \fInisdomain\fR \fBslp\fR +.RS 4 Query the local running SLP server for hosts running ypserv and distributing -\fInisdomain\fR. This option is only available, if +\fInisdomain\fR\. This option is only available, if \fBypbind\fR -was compiled with SLP support. -.TP 3n +was compiled with SLP support\. +.RE +.PP \fBypserver\fR \fIhostname\fR +.RS 4 Use server \fIhostname\fR -for the local domain. -.TP 3n +for the local domain\. +.RE +.PP \fBbroadcast\fR -If no other server is given or all of them are not reachable, try a broadcast call for the default domain to find a server. +.RS 4 +If no other server is given or all of them are not reachable, try a broadcast call for the default domain to find a server\. +.RE .PP If for a specific domain the broadcast option and fixed server are given, \fBypbind\-mt\fR -tries at first the given servers before falling back to broadcasting for a running server. +tries at first the given servers before falling back to broadcasting for a running server\. .SH "SEE ALSO" .PP @@ -55,4 +65,4 @@ .PP \fBypbind\-mt\fR -was written by Thorsten Kukuk <kukuk(a)thkukuk.de>. +was written by Thorsten Kukuk <kukuk(a)thkukuk\.de>\. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ypbind-mt-1.21/NEWS new/ypbind-mt-1.22/NEWS --- old/ypbind-mt-1.21/NEWS 2008-04-15 13:12:40.000000000 +0200 +++ new/ypbind-mt-1.22/NEWS 2008-08-28 14:40:01.000000000 +0200 @@ -4,6 +4,9 @@ Please send bug reports, questions and suggestions to <kukuk(a)thkukuk.de>. +Version 1.22 +* Only write binding files if they really changed + Version 1.21 * Add -verbose option * Fix typo in option handling Files old/ypbind-mt-1.21/po/de.gmo and new/ypbind-mt-1.22/po/de.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ypbind-mt-1.21/po/de.po new/ypbind-mt-1.22/po/de.po --- old/ypbind-mt-1.21/po/de.po 2008-04-15 13:22:45.000000000 +0200 +++ new/ypbind-mt-1.22/po/de.po 2008-08-28 14:40:05.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: ypbind-mt\n" "Report-Msgid-Bugs-To: kukuk(a)linux-nis.org\n" -"POT-Creation-Date: 2008-04-15 13:22+0200\n" +"POT-Creation-Date: 2008-08-28 14:40+0200\n" "PO-Revision-Date: 2004-02-13 16:22+01:00\n" "Last-Translator: Thorsten Kukuk <kukuk(a)suse.de>\n" "Language-Team: No Language-Team\n" @@ -14,121 +14,121 @@ "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: src/serv_list.c:399 +#: src/serv_list.c:426 msgid "Not enough memory !" msgstr "Nicht genug Arbeitsspeicher !" -#: src/serv_list.c:424 +#: src/serv_list.c:452 msgid "internal error: add_server called with NULL domain." msgstr "" "Interner Fehler: add_server wurde mit NULL pointer f�r domain aufgerufen." -#: src/serv_list.c:439 +#: src/serv_list.c:467 #, c-format msgid "add_server() domain: %s, broadcast" msgstr "add_server() Domain: %s, Broadcast" -#: src/serv_list.c:463 +#: src/serv_list.c:491 #, c-format msgid "add_server() domain: %s, host: %s, NO SLOT FREE!" msgstr "add_server() Domain: %s, Rechner: %s, Kein Slot mehr frei!" -#: src/serv_list.c:470 +#: src/serv_list.c:498 #, c-format msgid "add_server() domain: %s, host: %s, slot: %d" msgstr "add_server() Domain: %s, Rechner: %s, Slot: %d" -#: src/serv_list.c:500 src/serv_list.c:502 +#: src/serv_list.c:528 src/serv_list.c:530 msgid "Unknown host:" msgstr "Unbekannter Rechner:" -#: src/serv_list.c:506 src/serv_list.c:508 +#: src/serv_list.c:534 src/serv_list.c:536 msgid "Host name lookup failure" msgstr "Fehler beim Aufl�sen des Rechnernamens" -#: src/serv_list.c:513 src/serv_list.c:516 +#: src/serv_list.c:541 src/serv_list.c:544 msgid "No address associated with name:" msgstr "Keine Addresse vorhanden f�r Rechner:" -#: src/serv_list.c:520 src/serv_list.c:522 +#: src/serv_list.c:548 src/serv_list.c:550 msgid "Unknown server error" msgstr "Unbekanter Server Fehler" -#: src/serv_list.c:526 src/serv_list.c:528 +#: src/serv_list.c:554 src/serv_list.c:556 msgid "gethostbyname: Unknown error" msgstr "gethostbyname: Unbekannter Fehler" -#: src/serv_list.c:600 src/serv_list.c:912 +#: src/serv_list.c:628 src/serv_list.c:940 #, c-format msgid "Answer for domain '%s' from server '%s'" msgstr "Antwort f�r Domain \"%s\" vom Server \"%s\"" -#: src/serv_list.c:604 +#: src/serv_list.c:632 #, c-format msgid "Answer for domain '%s' from unknown server '%s'" msgstr "Antwort f�r Domain \"%s\" von unbekantem Server \"%s\"" -#: src/serv_list.c:611 src/serv_list.c:816 +#: src/serv_list.c:639 src/serv_list.c:844 #, c-format msgid "Answer for domain '%s' from '%s' on illegal port %d." msgstr "Antwort f�r Domain \"%s\" vom Server \"%s\" vom illegalen Port %d." -#: src/serv_list.c:656 +#: src/serv_list.c:684 #, c-format msgid "do_broadcast() for domain '%s' is called" msgstr "" -#: src/serv_list.c:691 +#: src/serv_list.c:719 #, c-format msgid "leave do_broadcast() for domain '%s'" msgstr "" -#: src/serv_list.c:804 src/serv_list.c:957 +#: src/serv_list.c:832 src/serv_list.c:985 #, c-format msgid "ping host '%s', domain '%s'" msgstr "Ping Host \"%s\", Domain \"%s\"" -#: src/serv_list.c:829 +#: src/serv_list.c:857 #, c-format msgid "host '%s' doesn't answer." msgstr "Server \"%s\" antwortet nicht." -#: src/serv_list.c:900 +#: src/serv_list.c:928 #, fuzzy, c-format msgid "Server '%s' for domain '%s' answered ping but failed to bind" msgstr "Server \"%s\" f�r Domain \"%s\" antwortet nicht." -#: src/serv_list.c:976 +#: src/serv_list.c:1004 #, c-format msgid "clnt_create for server '%s' (domain '%s') failed" msgstr "clnt_create f�r server \"%s\" (domain \"%s\") schlug fehl" -#: src/serv_list.c:997 +#: src/serv_list.c:1025 #, c-format msgid "domain '%s' not served by '%s'" msgstr "Domain \"%s\" wird nicht von \"%s\" unterst�tzt" -#: src/serv_list.c:1101 +#: src/serv_list.c:1129 #, fuzzy msgid "Pinging all active servers." msgstr "Sende ein Ping zu allen aktiven Servern." -#: src/serv_list.c:1103 +#: src/serv_list.c:1131 #, fuzzy msgid "Checking for new fastest server." msgstr "Suche erneut den schnellsten Server." -#: src/serv_list.c:1115 +#: src/serv_list.c:1143 #, c-format msgid "Requested domain %s, found %s, ignored." msgstr "" -#: src/serv_list.c:1166 +#: src/serv_list.c:1194 #, c-format msgid "Server for domain '%s' doesn't answer." msgstr "Server f�r Domain \"%s\" antwortet nicht." -#: src/serv_list.c:1172 src/serv_list.c:1177 +#: src/serv_list.c:1200 src/serv_list.c:1205 #, c-format msgid "Server '%s' for domain '%s' doesn't answer." msgstr "Server \"%s\" f�r Domain \"%s\" antwortet nicht." Files old/ypbind-mt-1.21/po/sv.gmo and new/ypbind-mt-1.22/po/sv.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ypbind-mt-1.21/po/sv.po new/ypbind-mt-1.22/po/sv.po --- old/ypbind-mt-1.21/po/sv.po 2008-04-15 13:22:45.000000000 +0200 +++ new/ypbind-mt-1.22/po/sv.po 2008-08-28 14:40:05.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ypbind-mt 1.20-2\n" "Report-Msgid-Bugs-To: kukuk(a)linux-nis.org\n" -"POT-Creation-Date: 2008-04-15 13:22+0200\n" +"POT-Creation-Date: 2008-08-28 14:40+0200\n" "PO-Revision-Date: 2006-11-12 16:48+0100\n" "Last-Translator: Daniel Nylander <po(a)danielnylander.se>\n" "Language-Team: Swedish <tp-sv(a)listor.tp-sv.se>\n" @@ -15,119 +15,119 @@ "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: src/serv_list.c:399 +#: src/serv_list.c:426 msgid "Not enough memory !" msgstr "Inte tillr�ckligt med minne!" -#: src/serv_list.c:424 +#: src/serv_list.c:452 msgid "internal error: add_server called with NULL domain." msgstr "internt fel: add_server anropades med NULL dom�n." -#: src/serv_list.c:439 +#: src/serv_list.c:467 #, c-format msgid "add_server() domain: %s, broadcast" msgstr "add_server() dom�n: %s, broadcast" -#: src/serv_list.c:463 +#: src/serv_list.c:491 #, c-format msgid "add_server() domain: %s, host: %s, NO SLOT FREE!" msgstr "add_server() dom�n: %s, v�rd: %s, INGEN LEDIG PLATS!" -#: src/serv_list.c:470 +#: src/serv_list.c:498 #, c-format msgid "add_server() domain: %s, host: %s, slot: %d" msgstr "add_server() dom�n: %s, v�rd: %s, plats: %d" -#: src/serv_list.c:500 src/serv_list.c:502 +#: src/serv_list.c:528 src/serv_list.c:530 msgid "Unknown host:" msgstr "Ok�nd v�rd:" -#: src/serv_list.c:506 src/serv_list.c:508 +#: src/serv_list.c:534 src/serv_list.c:536 msgid "Host name lookup failure" msgstr "Uppslag av v�rdnamn misslyckades" -#: src/serv_list.c:513 src/serv_list.c:516 +#: src/serv_list.c:541 src/serv_list.c:544 msgid "No address associated with name:" msgstr "Ingen adress associerad med namnet:" -#: src/serv_list.c:520 src/serv_list.c:522 +#: src/serv_list.c:548 src/serv_list.c:550 msgid "Unknown server error" msgstr "Ok�nt serverfel" -#: src/serv_list.c:526 src/serv_list.c:528 +#: src/serv_list.c:554 src/serv_list.c:556 msgid "gethostbyname: Unknown error" msgstr "gethostbyname: Ok�nt fel" -#: src/serv_list.c:600 src/serv_list.c:912 +#: src/serv_list.c:628 src/serv_list.c:940 #, c-format msgid "Answer for domain '%s' from server '%s'" msgstr "Svar f�r dom�nen \"%s\" fr�n servern \"%s\"" -#: src/serv_list.c:604 +#: src/serv_list.c:632 #, c-format msgid "Answer for domain '%s' from unknown server '%s'" msgstr "Svar f�r dom�nen \"%s\" fr�n ok�nd server \"%s\"" -#: src/serv_list.c:611 src/serv_list.c:816 +#: src/serv_list.c:639 src/serv_list.c:844 #, c-format msgid "Answer for domain '%s' from '%s' on illegal port %d." msgstr "Svar f�r dom�nen \"%s\" fr�n \"%s\" p� ogiltiga porten %d." -#: src/serv_list.c:656 +#: src/serv_list.c:684 #, c-format msgid "do_broadcast() for domain '%s' is called" msgstr "do_broadcast() f�r dom�nen \"%s\" anropas" -#: src/serv_list.c:691 +#: src/serv_list.c:719 #, c-format msgid "leave do_broadcast() for domain '%s'" msgstr "l�mna do_broadcast() f�r dom�nen \"%s\"" -#: src/serv_list.c:804 src/serv_list.c:957 +#: src/serv_list.c:832 src/serv_list.c:985 #, c-format msgid "ping host '%s', domain '%s'" msgstr "pinga v�rden \"%s\", dom�n \"%s\"" -#: src/serv_list.c:829 +#: src/serv_list.c:857 #, c-format msgid "host '%s' doesn't answer." msgstr "v�rden \"%s\" svarar inte." -#: src/serv_list.c:900 +#: src/serv_list.c:928 #, c-format msgid "Server '%s' for domain '%s' answered ping but failed to bind" msgstr "" "Servern \"%s\" f�r dom�nen \"%s\" svarade p� ping men misslyckades att binda" -#: src/serv_list.c:976 +#: src/serv_list.c:1004 #, c-format msgid "clnt_create for server '%s' (domain '%s') failed" msgstr "clnt_create f�r servern \"%s\" (dom�n \"%s\") misslyckades" -#: src/serv_list.c:997 +#: src/serv_list.c:1025 #, c-format msgid "domain '%s' not served by '%s'" msgstr "dom�nen \"%s\" hanteras inte av \"%s\"" -#: src/serv_list.c:1101 +#: src/serv_list.c:1129 msgid "Pinging all active servers." msgstr "Pingar alla aktiva servrar." -#: src/serv_list.c:1103 +#: src/serv_list.c:1131 msgid "Checking for new fastest server." msgstr "Letar efter den snabbaste servern." -#: src/serv_list.c:1115 +#: src/serv_list.c:1143 #, c-format msgid "Requested domain %s, found %s, ignored." msgstr "Beg�rd dom�n %s, hittade %s, ignoreras." -#: src/serv_list.c:1166 +#: src/serv_list.c:1194 #, c-format msgid "Server for domain '%s' doesn't answer." msgstr "Servern f�r dom�nen \"%s\" svarar inte." -#: src/serv_list.c:1172 src/serv_list.c:1177 +#: src/serv_list.c:1200 src/serv_list.c:1205 #, c-format msgid "Server '%s' for domain '%s' doesn't answer." msgstr "Servern \"%s\" f�r dom�nen \"%s\" svarar inte." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ypbind-mt-1.21/po/ypbind-mt.pot new/ypbind-mt-1.22/po/ypbind-mt.pot --- old/ypbind-mt-1.21/po/ypbind-mt.pot 2008-04-15 13:22:45.000000000 +0200 +++ new/ypbind-mt-1.22/po/ypbind-mt.pot 2008-08-28 14:40:04.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: kukuk(a)linux-nis.org\n" -"POT-Creation-Date: 2008-04-15 13:22+0200\n" +"POT-Creation-Date: 2008-08-28 14:40+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -16,118 +16,118 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/serv_list.c:399 +#: src/serv_list.c:426 msgid "Not enough memory !" msgstr "" -#: src/serv_list.c:424 +#: src/serv_list.c:452 msgid "internal error: add_server called with NULL domain." msgstr "" -#: src/serv_list.c:439 +#: src/serv_list.c:467 #, c-format msgid "add_server() domain: %s, broadcast" msgstr "" -#: src/serv_list.c:463 +#: src/serv_list.c:491 #, c-format msgid "add_server() domain: %s, host: %s, NO SLOT FREE!" msgstr "" -#: src/serv_list.c:470 +#: src/serv_list.c:498 #, c-format msgid "add_server() domain: %s, host: %s, slot: %d" msgstr "" -#: src/serv_list.c:500 src/serv_list.c:502 +#: src/serv_list.c:528 src/serv_list.c:530 msgid "Unknown host:" msgstr "" -#: src/serv_list.c:506 src/serv_list.c:508 +#: src/serv_list.c:534 src/serv_list.c:536 msgid "Host name lookup failure" msgstr "" -#: src/serv_list.c:513 src/serv_list.c:516 +#: src/serv_list.c:541 src/serv_list.c:544 msgid "No address associated with name:" msgstr "" -#: src/serv_list.c:520 src/serv_list.c:522 +#: src/serv_list.c:548 src/serv_list.c:550 msgid "Unknown server error" msgstr "" -#: src/serv_list.c:526 src/serv_list.c:528 +#: src/serv_list.c:554 src/serv_list.c:556 msgid "gethostbyname: Unknown error" msgstr "" -#: src/serv_list.c:600 src/serv_list.c:912 +#: src/serv_list.c:628 src/serv_list.c:940 #, c-format msgid "Answer for domain '%s' from server '%s'" msgstr "" -#: src/serv_list.c:604 +#: src/serv_list.c:632 #, c-format msgid "Answer for domain '%s' from unknown server '%s'" msgstr "" -#: src/serv_list.c:611 src/serv_list.c:816 +#: src/serv_list.c:639 src/serv_list.c:844 #, c-format msgid "Answer for domain '%s' from '%s' on illegal port %d." msgstr "" -#: src/serv_list.c:656 +#: src/serv_list.c:684 #, c-format msgid "do_broadcast() for domain '%s' is called" msgstr "" -#: src/serv_list.c:691 +#: src/serv_list.c:719 #, c-format msgid "leave do_broadcast() for domain '%s'" msgstr "" -#: src/serv_list.c:804 src/serv_list.c:957 +#: src/serv_list.c:832 src/serv_list.c:985 #, c-format msgid "ping host '%s', domain '%s'" msgstr "" -#: src/serv_list.c:829 +#: src/serv_list.c:857 #, c-format msgid "host '%s' doesn't answer." msgstr "" -#: src/serv_list.c:900 +#: src/serv_list.c:928 #, c-format msgid "Server '%s' for domain '%s' answered ping but failed to bind" msgstr "" -#: src/serv_list.c:976 +#: src/serv_list.c:1004 #, c-format msgid "clnt_create for server '%s' (domain '%s') failed" msgstr "" -#: src/serv_list.c:997 +#: src/serv_list.c:1025 #, c-format msgid "domain '%s' not served by '%s'" msgstr "" -#: src/serv_list.c:1101 +#: src/serv_list.c:1129 msgid "Pinging all active servers." msgstr "" -#: src/serv_list.c:1103 +#: src/serv_list.c:1131 msgid "Checking for new fastest server." msgstr "" -#: src/serv_list.c:1115 +#: src/serv_list.c:1143 #, c-format msgid "Requested domain %s, found %s, ignored." msgstr "" -#: src/serv_list.c:1166 +#: src/serv_list.c:1194 #, c-format msgid "Server for domain '%s' doesn't answer." msgstr "" -#: src/serv_list.c:1172 src/serv_list.c:1177 +#: src/serv_list.c:1200 src/serv_list.c:1205 #, c-format msgid "Server '%s' for domain '%s' doesn't answer." msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ypbind-mt-1.21/src/Makefile.in new/ypbind-mt-1.22/src/Makefile.in --- old/ypbind-mt-1.21/src/Makefile.in 2008-04-15 12:51:58.000000000 +0200 +++ new/ypbind-mt-1.22/src/Makefile.in 2008-08-28 14:33:48.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -65,7 +65,7 @@ ypbind_dbus_nm.$(OBJEXT) ypbind_OBJECTS = $(am_ypbind_OBJECTS) ypbind_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -221,9 +221,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits src/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnits src/Makefile + $(AUTOMAKE) --gnu src/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -264,22 +264,6 @@ clean-sbinPROGRAMS: -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS) - -installcheck-sbinPROGRAMS: $(sbin_PROGRAMS) - bad=0; pid=$$$$; list="$(sbin_PROGRAMS)"; for p in $$list; do \ - case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ - *" $$p "* | *" $(srcdir)/$$p "*) continue;; \ - esac; \ - f=`echo "$$p" | \ - sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - for opt in --help --version; do \ - if "$(DESTDIR)$(sbindir)/$$f" $$opt >c$${pid}_.out \ - 2>c$${pid}_.err </dev/null \ - && test -n "`cat c$${pid}_.out`" \ - && test -z "`cat c$${pid}_.err`"; then :; \ - else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ - done; \ - done; rm -f c$${pid}_.???; exit $$bad ypbind$(EXEEXT): $(ypbind_OBJECTS) $(ypbind_DEPENDENCIES) @rm -f ypbind$(EXEEXT) $(LINK) $(ypbind_OBJECTS) $(ypbind_LDADD) $(LIBS) @@ -319,8 +303,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -332,8 +316,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -343,13 +327,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -456,7 +439,7 @@ install-ps: install-ps-am -installcheck-am: installcheck-sbinPROGRAMS +installcheck-am: maintainer-clean: maintainer-clean-am -rm -rf ./$(DEPDIR) @@ -487,10 +470,10 @@ install-exec-am install-html install-html-am install-info \ install-info-am install-man install-pdf install-pdf-am \ install-ps install-ps-am install-sbinPROGRAMS install-strip \ - installcheck installcheck-am installcheck-sbinPROGRAMS \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ - ps ps-am tags uninstall uninstall-am uninstall-sbinPROGRAMS + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-sbinPROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ypbind-mt-1.21/src/serv_list.c new/ypbind-mt-1.22/src/serv_list.c --- old/ypbind-mt-1.21/src/serv_list.c 2008-04-15 13:23:25.000000000 +0200 +++ new/ypbind-mt-1.22/src/serv_list.c 2008-08-28 14:38:11.000000000 +0200 @@ -81,6 +81,7 @@ struct bound_server server[_MAXSERVER]; struct bound_server ypset; CLIENT *client_handle; + struct bound_server last; /* last written */ }; static inline char * bound_host(struct binding *bptr) @@ -133,26 +134,44 @@ sprintf (path1, "%s/%s.1", BINDINGDIR, entry->domain); sprintf (path2, "%s/%s.2", BINDINGDIR, entry->domain); - iov[0].iov_base = (caddr_t) &sport; - iov[0].iov_len = sizeof (sport); - iov[1].iov_base = (caddr_t) &ybres; - iov[1].iov_len = sizeof ybres; - memset(&ybres, 0, sizeof (ybres)); ybres.ypbind_status = YPBIND_SUCC_VAL; if (entry->active >= 0) { + if (entry->last.host && + !memcmp(&entry->server[entry->active].addr, &entry->last.addr, + sizeof(struct in_addr)) && + entry->server[entry->active].port == entry->last.port) + { + if (debug_flag) + log_msg (LOG_DEBUG, "Entry for %s unchanged, skipping writeout", + entry->domain); + return; + } + memcpy (&ybres.ypbind_resp_u.ypbind_bindinfo.ypbind_binding_addr, &entry->server[entry->active].addr, sizeof (struct in_addr)); memcpy (&ybres.ypbind_resp_u.ypbind_bindinfo.ypbind_binding_port, &entry->server[entry->active].port, sizeof (unsigned short int)); + entry->last= entry->server[entry->active]; } else if (entry->active == -2) /* ypset was used */ { + if (entry->last.host && + !memcmp(&entry->ypset.addr, &entry->last.addr, + sizeof(struct in_addr)) && + entry->ypset.port == entry->last.port) + { + if (debug_flag) + log_msg (LOG_DEBUG, "Entry for %s unchanged, skipping writeout", + entry->domain); + return; + } memcpy (&ybres.ypbind_resp_u.ypbind_bindinfo.ypbind_binding_addr, &entry->ypset.addr, sizeof (struct in_addr)); memcpy (&ybres.ypbind_resp_u.ypbind_bindinfo.ypbind_binding_port, &entry->ypset.port, sizeof (unsigned short int)); + entry->last= entry->ypset; } else { @@ -160,10 +179,16 @@ libc will query ypbind direct. */ unlink (path1); unlink (path2); + entry->last.host = NULL; log_msg (LOG_ERR, "INTERNAL ERROR: update_bindingfile called without valid data!"); return; } + iov[0].iov_base = (caddr_t) &sport; + iov[0].iov_len = sizeof (sport); + iov[1].iov_base = (caddr_t) &ybres; + iov[1].iov_len = sizeof ybres; + len = iov[0].iov_len + iov[1].iov_len; if ((fd = open(path1, O_CREAT | O_RDWR | O_TRUNC, FILE_MODE )) != -1) @@ -171,6 +196,7 @@ if (writev (fd, iov, 2) != len ) { log_msg (LOG_ERR, "writev (%s): %s", path1, strerror (errno)); + entry->last.host = NULL; unlink (path1); } close (fd); @@ -183,6 +209,7 @@ if (writev (fd, iov, 2) != len ) { log_msg (LOG_ERR, "writev (%s): %s", path2, strerror (errno)); + entry->last.host = NULL; unlink (path2); } close (fd); @@ -403,6 +430,7 @@ domainlist[max_domains - 1].ypset.host = NULL; domainlist[max_domains - 1].active = (-1); domainlist[max_domains - 1].use_broadcast = FALSE; + domainlist[max_domains - 1].last.host = NULL; memset (domainlist[max_domains - 1].server, 0, (_MAXSERVER * sizeof (struct bound_server))); *entry = &domainlist[max_domains - 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 yelp
by root＠Hilbert.suse.de 30 Aug '08

30 Aug '08

Hello community, here is the log from the commit of package yelp checked in at Sat Aug 30 02:21:47 CEST 2008. -------- --- GNOME/yelp/yelp.changes 2008-06-23 18:58:31.000000000 +0200 +++ yelp/yelp.changes 2008-08-26 03:07:53.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Aug 26 18:13:19 CEST 2008 - mboman(a)novell.com + +- Update to version 2.23.2: + + Fix string vulnerability [bgo#546364] + + Use "help-browser" icon instead of deprecated "gnome-help" + +------------------------------------------------------------------- Old: ---- yelp-2.23.1.tar.bz2 New: ---- yelp-2.23.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yelp.spec ++++++ --- /var/tmp/diff_new_pack.W17227/_old 2008-08-30 02:18:35.000000000 +0200 +++ /var/tmp/diff_new_pack.W17227/_new 2008-08-30 02:18:35.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yelp (Version 2.23.1) +# spec file for package yelp (Version 2.23.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -17,7 +24,7 @@ Requires: gnome-utils susehelp License: GPL v2 or later; LGPL v2.1 or later Group: System/GUI/GNOME -Version: 2.23.1 +Version: 2.23.2 Release: 1 Summary: The GNOME 2.x Desktop Help Browser Source: ftp://ftp.gnome.org/pub/GNOME/sources/yelp/2.12/%{name}-%{version}.tar.bz2 @@ -105,6 +112,10 @@ %files lang -f %{name}.lang %changelog +* Tue Aug 26 2008 mboman(a)novell.com +- Update to version 2.23.2: + + Fix string vulnerability [bgo#546364] + + Use "help-browser" icon instead of deprecated "gnome-help" * Mon Jun 23 2008 maw(a)suse.de - Update to version 2.23.1: + Support for Gecko 1.9, provided by mozilla-xulrunner190; ++++++ yelp-2.23.1.tar.bz2 -> yelp-2.23.2.tar.bz2 ++++++ ++++ 23924 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 yast2-users
by root＠Hilbert.suse.de 30 Aug '08

30 Aug '08

Hello community, here is the log from the commit of package yast2-users checked in at Sat Aug 30 02:18:26 CEST 2008. -------- --- yast2-users/yast2-users.changes 2008-08-22 10:57:29.000000000 +0200 +++ yast2-users/yast2-users.changes 2008-08-29 11:58:44.113790000 +0200 @@ -1,0 +2,7 @@ +Fri Aug 29 11:53:07 CEST 2008 - jsuchome(a)suse.cz + +- fixed capitalization of LDAP entries (bnc#420010) +- show if the "default policy" is active (bnc#421342, rhafer) +- 2.17.6 + +------------------------------------------------------------------- Old: ---- yast2-users-2.17.5.tar.bz2 New: ---- yast2-users-2.17.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-users.spec ++++++ --- /var/tmp/diff_new_pack.d13837/_old 2008-08-30 02:17:21.000000000 +0200 +++ /var/tmp/diff_new_pack.d13837/_new 2008-08-30 02:17:21.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-users (Version 2.17.5) +# spec file for package yast2-users (Version 2.17.6) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-users -Version: 2.17.5 +Version: 2.17.6 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-users-2.17.5.tar.bz2 +Source0: yast2-users-2.17.6.tar.bz2 Prefix: /usr BuildRequires: cracklib-devel doxygen gcc-c++ perl-Digest-SHA1 perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-ldap-client yast2-perl-bindings yast2-security yast2-testsuite Requires: yast2-perl-bindings yast2-country yast2-pam yast2-security cracklib perl-Digest-SHA1 perl-X500-DN perl-gettext @@ -52,7 +52,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-users-2.17.5 +%setup -n yast2-users-2.17.6 %build %{prefix}/bin/y2tool y2autoconf @@ -95,6 +95,10 @@ %{_libdir}/YaST2/plugin/libpy2ag_crack.la %doc %{prefix}/share/doc/packages/yast2-users %changelog +* Fri Aug 29 2008 jsuchome(a)suse.cz +- fixed capitalization of LDAP entries (bnc#420010) +- show if the "default policy" is active (bnc#421342, rhafer) +- 2.17.6 * Fri Aug 22 2008 jsuchome(a)suse.cz - fixed setting Kerberos during installation - 2.17.5 ++++++ yast2-users-2.17.5.tar.bz2 -> yast2-users-2.17.6.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.5/src/UsersLDAP.pm new/yast2-users-2.17.6/src/UsersLDAP.pm --- old/yast2-users-2.17.5/src/UsersLDAP.pm 2008-07-21 14:51:53.000000000 +0200 +++ new/yast2-users-2.17.6/src/UsersLDAP.pm 2008-08-25 15:13:06.000000000 +0200 @@ -338,7 +338,7 @@ if (ref ($base_map) eq "HASH" && !%$base_map) { my $dn = $user_base; - $user_base = Ldap->GetDomain(); + $user_base = Ldap->GetBaseDN (); if (!$use_gui || Stage->cont() || # popup question, %s is string argument Popup->YesNo (sprintf (__("No entry with DN '%s' @@ -356,7 +356,7 @@ } } if ($user_base eq "") { - $user_base = Ldap->GetDomain(); + $user_base = Ldap->GetBaseDN (); } if (defined $group_config{"suseDefaultBase"}[0]) { @@ -364,7 +364,7 @@ my $base_map = Ldap->GetLDAPEntry ($group_base); if (ref ($base_map) eq "HASH" && !%$base_map) { my $dn = $group_base; - $group_base = Ldap->GetDomain(); + $group_base = Ldap->GetBaseDN (); if (!$use_gui || Stage->cont() || # popup question, %s is string argument Popup->YesNo (sprintf (__("No entry with DN '%s' diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.5/src/UsersPluginLDAPPasswordPolicy.pm new/yast2-users-2.17.6/src/UsersPluginLDAPPasswordPolicy.pm --- old/yast2-users-2.17.5/src/UsersPluginLDAPPasswordPolicy.pm 2008-07-21 14:51:53.000000000 +0200 +++ new/yast2-users-2.17.6/src/UsersPluginLDAPPasswordPolicy.pm 2008-08-25 15:12:55.000000000 +0200 @@ -75,8 +75,8 @@ my ($config, $data) = @_; my @updated_oc; - if (defined $data->{'pwdPolicySubEntry'}) { - $data->{'pwdPolicySubEntry'} = ""; + if (defined $data->{'pwdPolicySubentry'}) { + $data->{'pwdPolicySubentry'} = ""; } return $data; } @@ -148,13 +148,13 @@ if (not defined $ppolicy_enabled) { $ppolicy_enabled = SCR->Execute (".ldap.ppolicy", { "hostname" => Ldap->GetFirstServer (Ldap->server ()), - "bind_dn" => Ldap->GetDomain () + "bind_dn" => Ldap->GetBaseDN () }); y2milestone ("Password Policy enabled globaly: $ppolicy_enabled"); } if (contains ($data->{'plugins'}, $name, 1) || # already checked, still no data - contains ((keys %$data), "pwdPolicySubEntry", 1)) # checking for data + contains ((keys %$data), "pwdPolicySubentry", 1)) # checking for data { y2milestone ("LDAPPasswordPolicy plugin present"); return 1; @@ -210,7 +210,7 @@ sub Check { my ($self, $config, $data) = @_; - my $pwdpolicysubentry = $data->{'pwdPolicySubEntry'}; + my $pwdpolicysubentry = $data->{'pwdPolicySubentry'}; if (defined $pwdpolicysubentry && $pwdpolicysubentry ne "") { # validate DN diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.5/src/users_plugin_ldap_passwordpolicy.ycp new/yast2-users-2.17.6/src/users_plugin_ldap_passwordpolicy.ycp --- old/yast2-users-2.17.5/src/users_plugin_ldap_passwordpolicy.ycp 2008-07-21 14:51:53.000000000 +0200 +++ new/yast2-users-2.17.6/src/users_plugin_ldap_passwordpolicy.ycp 2008-08-29 11:49:19.000000000 +0200 @@ -60,15 +60,21 @@ // helptext string help_text = _("Assign a password policy object to this user in DN of Password Policy object. Activate Reset Password to reset the password of modified user."); - boolean pwdreset = data["pwdreset"]:"FALSE" == "TRUE"; - string pwdpolicysubentry = data["pwdpolicysubentry"]:""; + boolean pwdreset = data["pwdReset"]:"FALSE" == "TRUE"; + string pwdpolicysubentry = data["pwdPolicySubentry"]:""; + boolean usedefault = (pwdpolicysubentry == ""); term contents = `HBox ( `HSpacing (3), `VBox ( + `Left ( + `CheckBox (`id (`usedefault), `opt (`notify), + // check box label + _("Use &Default Password Policy"), usedefault) + ), `HBox ( // text entry label - `TextEntry (`id ("pwdpolicysubentry"), + `TextEntry (`id ("pwdPolicySubentry"), _("DN of &Password Policy object"), pwdpolicysubentry), `VBox ( `Label (""), @@ -76,7 +82,7 @@ ) ), `Left ( - `CheckBox (`id ("pwdreset"), _("&Reset Password"), pwdreset) + `CheckBox (`id ("pwdReset"), _("&Reset Password"), pwdreset) ) ), `HSpacing (3) @@ -90,6 +96,11 @@ contents, help_text, Label::CancelButton(), Label::OKButton()); Wizard::HideAbortButton (); + if (usedefault) + { + UI::ChangeWidget (`id (`browse), `Enabled, false); + UI::ChangeWidget (`id ("pwdPolicySubentry"), `Enabled, false); + } ret = `next; repeat @@ -99,18 +110,29 @@ { string dn = LdapPopup::BrowseTree (""); if (dn != "") - UI::ChangeWidget (`id ("pwdpolicysubentry"), `Value, dn); + UI::ChangeWidget (`id ("pwdPolicySubentry"), `Value, dn); } + else if (ret == `usedefault) + { + usedefault = (boolean)UI::QueryWidget(`id (`usedefault),`Value); + UI::ChangeWidget (`id (`browse ), `Enabled, !usedefault); + UI::ChangeWidget(`id("pwdPolicySubentry"),`Enabled,!usedefault); + } else if (ret == `next) { - string new_pwdpolicysubentry = (string) - UI::QueryWidget (`id ("pwdpolicysubentry"), `Value); + string new_pwdpolicysubentry = ""; + if (!usedefault) + { + new_pwdpolicysubentry = (string) + UI::QueryWidget (`id ("pwdPolicySubentry"), `Value); + } + if (new_pwdpolicysubentry != pwdpolicysubentry) - tmp_data["pwdpolicysubentry"] = new_pwdpolicysubentry; + tmp_data["pwdPolicySubentry"] = new_pwdpolicysubentry; - boolean new_pwdreset = (boolean) UI::QueryWidget (`id ("pwdreset"), `Value); + boolean new_pwdreset = (boolean) UI::QueryWidget (`id ("pwdReset"), `Value); if (new_pwdreset != pwdreset) - tmp_data["pwdreset"] = new_pwdreset ? "TRUE" : "FALSE"; + tmp_data["pwdReset"] = new_pwdreset ? "TRUE" : "FALSE"; if (tmp_data == $[]) break; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.5/VERSION new/yast2-users-2.17.6/VERSION --- old/yast2-users-2.17.5/VERSION 2008-08-22 10:56:59.000000000 +0200 +++ new/yast2-users-2.17.6/VERSION 2008-08-29 11:54:04.000000000 +0200 @@ -1 +1 @@ -2.17.5 +2.17.6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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