Hello community, here is the log from the commit of package kdebase3 checked in at Tue Oct 24 11:37:30 CEST 2006. -------- --- KDE/kdebase3/kdebase3.changes 2006-10-23 18:17:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2006-10-24 10:10:40.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Oct 24 10:09:57 CEST 2006 - coolo@suse.de + +- update kdm config patch + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.ZcX52O/_old 2006-10-24 11:37:15.000000000 +0200 +++ /var/tmp/diff_new_pack.ZcX52O/_new 2006-10-24 11:37:15.000000000 +0200 @@ -51,7 +51,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.5 -Release: 21 +Release: 22 %define kde_version 3.5.5 Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh @@ -364,7 +364,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 150 +Release: 151 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -1472,6 +1472,8 @@ %endif %changelog -n kdebase3 +* Tue Oct 24 2006 - coolo@suse.de +- update kdm config patch * Mon Oct 23 2006 - dmueller@suse.de - add patch for kdm config update problem (#211874) - add patch for WM configuration in session (FATE 301137) ++++++ kdm-sysconfig-values.diff ++++++ --- /var/tmp/diff_new_pack.ZcX52O/_old 2006-10-24 11:37:17.000000000 +0200 +++ /var/tmp/diff_new_pack.ZcX52O/_new 2006-10-24 11:37:17.000000000 +0200 @@ -80,9 +80,10 @@ -Default: *KDMCONF "/Xaccess" +Default: *"/etc/X11/xdm/Xaccess" User: config(Xaccess) - Instance: #"" +-Instance: #"" -Update: mk_xaccess -Merge: xdm:accessFile ++Instance: # +Update: reset_sec_0_1 Comment: &XDMCP; access control file in the usual XDM-Xaccess format. @@ -652,7 +653,7 @@ +static void +reset_sec_0_1( Entry *ce, Section *cs ATTR_UNUSED ) +{ -+ if (oldsusever == 0) ++ if (oldsusever == 0 || !ce->written ) + { + ce->active = 0; + } @@ -671,9 +672,12 @@ RSection *rootsect, *cs; REntry *ce; int i, j; -@@ -2293,6 +2305,10 @@ +@@ -2291,8 +2303,12 @@ + } + #ifdef XDMCP - applydefs( kdmdefs_all, as(kdmdefs_all), path ); +- applydefs( kdmdefs_all, as(kdmdefs_all), path ); ++ // applydefs( kdmdefs_all, as(kdmdefs_all), path ); #endif + susever = getfqval( "General", "SUSEConfigVersion", "" ); + if (sscanf( susever, "%u", &oldsusever ) != 1) @@ -694,35 +698,3 @@ +appsdir = $(kde_datadir)/kdm +apps_SCRIPTS = read_sysconfig.sh + ---- kdm/config.def 2006-10-23 17:54:19.000000000 +0200 -+++ kdm.new/config.def 2006-10-23 17:52:35.000000000 +0200 -@@ -1119,7 +1119,7 @@ - Type: string - # differs from xdm - Default: *"/etc/X11/xdm/Xaccess" --User: config(Xaccess) -+User: core - Instance: #"" - Update: reset_sec_0_1 - Comment: -diff -ru kdm/kfrontend/genkdmconf.c kdm.new/kfrontend/genkdmconf.c ---- kdm/kfrontend/genkdmconf.c 2006-10-23 17:54:19.000000000 +0200 -+++ kdm.new/kfrontend/genkdmconf.c 2006-10-23 17:53:10.000000000 +0200 -@@ -1368,7 +1368,7 @@ - static void - reset_sec_0_1( Entry *ce, Section *cs ATTR_UNUSED ) - { -- if (oldsusever == 0) -+ if (oldsusever == 0 || !ce->written ) - { - ce->active = 0; - } -@@ -2303,7 +2305,7 @@ - } - - #ifdef XDMCP -- applydefs( kdmdefs_all, as(kdmdefs_all), path ); -+ // applydefs( kdmdefs_all, as(kdmdefs_all), path ); - #endif - susever = getfqval( "General", "SUSEConfigVersion", "" ); - if (sscanf( susever, "%u", &oldsusever ) != 1) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org