Slackware 13.37slackware-13.37

Mon Apr 25 13:37:00 UTC 2011
Slackware 13.37 x86_64 stable is released!

Thanks to everyone who pitched in on this release: the Slackware team,
the folks producing upstream code, and linuxquestions.org for providing
a great forum for collaboration and testing.

The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD.  Please consider supporting the Slackware
project by picking up a copy from store.slackware.com.  We're taking
pre-orders now, and offer a discount if you sign up for a subscription.

As always, thanks to the Slackware community for testing, suggestions,
and feedback.  :-)

Have fun!

4 files changed, 12 insertions, 50 deletions

diff --git a/source/kde/kdebase-workspace/kcmshell_root_privilege.patch b/source/kde/kdebase-workspace/kcmshell_root_privilege.patch
deleted file mode 100644
index f81a98ed9..000000000
--- a/source/kde/kdebase-workspace/kcmshell_root_privilege.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- kdebase-workspace-4.3.85/systemsettings/core/ModuleView.cpp~	2009-12-11 00:14:03.000000000 +0100
-+++ kdebase-workspace-4.3.85/systemsettings/core/ModuleView.cpp	2009-12-22 15:47:35.000000000 +0100
-@@ -40,6 +40,7 @@
- #include <KCModuleProxy>
- #include <KStandardGuiItem>
- #include <KDialogButtonBox>
-+#include <KStandardDirs>
- #include <kauthaction.h>
- 
- #include "MenuItem.h"
-@@ -129,6 +130,32 @@
-         return;
-     }
- 
-+    if ( menuItem->service()->property( "X-KDE-RootOnly", QVariant::Bool ).toBool() ) {
-+        QString kdesu = KStandardDirs::findExe( "kdesu" );
-+        QString cmd = menuItem->service()->exec().trimmed();
-+
-+        /* Prepare the process to run the kcmshell */
-+        if ( cmd.left(5) == "kdesu" )
-+        {
-+            cmd = cmd.remove(0,5).trimmed();
-+
-+            /* Remove all kdesu switches */
-+            while ( cmd.length() > 1 && cmd[ 0 ] == '-' )
-+                cmd = cmd.remove( 0, cmd.indexOf( ' ' ) ).trimmed();
-+        }
-+
-+        if ( cmd.left(9) == "kcmshell4" )
-+            cmd = cmd.remove(0,9).trimmed();
-+
-+        QStringList args;
-+        args << "-i" << QString( menuItem->service()->icon() ) << "-c" << QString( "%1 %2 --lang %3" ).arg( KStandardDirs::locate("exe", "kcmshell4") ).arg( cmd ).arg( KGlobal::locale()->language() );
-+
-+        kDebug() << "Starting root module: " << args;
-+        QProcess::startDetached( kdesu, args );
-+
-+        return;
-+    }
-+
-     QList<KCModuleInfo*> modules;
-     if ( menuItem->children().empty() ) {
-         modules << &menuItem->item();
diff --git a/source/kde/kdebase-workspace/kdebase-workspace.SlackBuild b/source/kde/kdebase-workspace/kdebase-workspace.SlackBuild
index 1dd46d610..91b27dd36 100755
--- a/source/kde/kdebase-workspace/kdebase-workspace.SlackBuild
+++ b/source/kde/kdebase-workspace/kdebase-workspace.SlackBuild
@@ -53,8 +53,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-cat $CWD/kcmshell_root_privilege.patch | patch -p1 --verbose || exit 1
-
 # Increase the timeout to accomodate slow-to-initialize video chipset drivers:
 zcat $CWD/kdebase-workspace.kdm.server.timeout.diff.gz | patch -p1 --verbose || exit 1
 
@@ -92,6 +90,9 @@ $PKG/usr/bin/genkdmconf --no-old --no-old-scripts --no-backup --in $PKG/usr/shar
 # this?  Even the kdmrc file says this is supposed to be the default.
 sed -i 's/AllowRootLogin=false/AllowRootLogin=true/' \
   $PKG/usr/share/config/kdm/kdmrc 
+# We are also not ready to create a separate 'kdm' non-root user:
+sed -i 's/GreeterUID=kdm/#&/' \
+  $PKG/usr/share/config/kdm/kdmrc 
 mv $PKG/usr/share/config/kdm/kdmrc $PKG/usr/share/config/kdm/kdmrc.new
 
 cp -a $PKG/usr/share/config/kdm/Xsession $PKG/usr/share/config/kdm/Xsession.orig
diff --git a/source/kde/kdebase-workspace/kdebase-workspace.kdm.server.timeout.diff b/source/kde/kdebase-workspace/kdebase-workspace.kdm.server.timeout.diff
index 56deff547..4dd98484d 100644
--- a/source/kde/kdebase-workspace/kdebase-workspace.kdm.server.timeout.diff
+++ b/source/kde/kdebase-workspace/kdebase-workspace.kdm.server.timeout.diff
@@ -1,10 +1,10 @@
---- ./kdm/config.def.orig	2010-02-26 12:32:20.000000000 -0600
-+++ ./kdm/config.def	2010-05-03 22:11:48.000000000 -0500
-@@ -1332,9 +1332,9 @@
+--- ./kdm/config.def.orig	2010-09-30 16:20:21.000000000 -0500
++++ ./kdm/config.def	2010-12-01 19:13:02.356002453 -0600
+@@ -1343,9 +1343,9 @@
  
  Key: ServerTimeout
  Type: int
--Default: 15
+-Default: 30
 +Default: 45
  User: core
 -Instance: #:*/
diff --git a/source/kde/kdebase-workspace/xinit/xinitrc.kde b/source/kde/kdebase-workspace/xinit/xinitrc.kde
index 5e11a9ac7..a33eb06cf 100755
--- a/source/kde/kdebase-workspace/xinit/xinitrc.kde
+++ b/source/kde/kdebase-workspace/xinit/xinitrc.kde
@@ -25,4 +25,8 @@ if [ -f $usermodmap ]; then
 fi
 
 # Start the window manager:
-ck-launch-session startkde
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+    ck-launch-session startkde
+else
+    startkde
+fi