Fri Jan 27 23:25:21 UTC 2006

Author: than

Update of /cvs/dist/rpms/kdebase/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv26774

Modified Files:
	kdebase.spec sources 
Added Files:
	kdebase-3.4.2-kdesktop-konsole.patch 
	kdebase-3.5.1-redhat.patch 
Removed Files:
	admin-visibility.patch kdebase-3.1.1-usb.patch 
	kdebase-3.2.0-selinux.patch kdebase-3.2.2-nedit.patch 
	kdebase-3.3.1-man.patch kdebase-3.3.92-fstab.patch 
	kdebase-3.3.92-servicebutton-saveas.patch 
	kdebase-3.4.0-config.patch kdebase-3.4.0-fonts.patch 
	kdebase-3.4.0-kdesktop-konsole.patch 
	kdebase-3.4.0-monospace.patch 
	kdebase-3.4.0rc1-konsole-keymap.patch 
	kdebase-3.4.1-redhat.patch 
Log Message:
3.5.1


kdebase-3.4.2-kdesktop-konsole.patch:
 krootwm.cc |   19 +++++++++++++++++++
 krootwm.h  |    1 +
 2 files changed, 20 insertions(+)

--- NEW FILE kdebase-3.4.2-kdesktop-konsole.patch ---
--- kdebase-3.4.2/kdesktop/krootwm.h.kdestop-konsole	2005-05-23 14:14:38.000000000 +0200
+++ kdebase-3.4.2/kdesktop/krootwm.h	2005-07-26 22:22:46.000000000 +0200
@@ -117,6 +117,7 @@
   void slotSessionActivated( int );
   void slotNewSession();
   void slotLockNNewSession();
+  void slotOpenTerminal();
 
 private:
   KDesktop* m_pDesktop;
--- kdebase-3.4.2/kdesktop/krootwm.cc.kdestop-konsole	2005-07-20 12:03:58.000000000 +0200
+++ kdebase-3.4.2/kdesktop/krootwm.cc	2005-09-05 14:41:33.000000000 +0200
@@ -50,6 +50,7 @@
 #include <kuser.h>
 #include <qfile.h>
 
+#include <kprocess.h>
 #include "krootwm.h"
 #include "kdiconview.h"
 #include "desktop.h"
@@ -79,6 +80,9 @@
   customMenu2 = 0;
 
 
+  new KAction(i18n("Konsole..." ), "openterm", 0, this, SLOT( slotOpenTerminal() ),
+               m_actionCollection, "open_terminal" );
+
   // Creates the new menu
   menuBar = 0; // no menubar yet
   menuNew = 0;
@@ -131,6 +135,7 @@
   {
      new KAction(i18n("Run Command..."), "run", 0, m_pDesktop, SLOT( slotExecuteCommand() ), m_actionCollection, "exec" );
   }
+
   if (!KGlobal::config()->isImmutable())
   {
      new KAction(i18n("Configure Desktop..."), "configure", 0, this, SLOT( slotConfigureDesktop() ),
@@ -366,6 +371,13 @@
     desktopMenu->disconnect( this );
     bool needSeparator = false;
 
+    action = m_actionCollection->action("open_terminal");
+    if (action)
+    {
+       action->plug( desktopMenu );
+       needSeparator = true;
+    }
+
     if (menuNew)
     {
        menuNew->plug( desktopMenu );
@@ -693,6 +705,13 @@
   return args;
 }
 
+void KRootWm::slotOpenTerminal()
+{
+  KProcess proc;
+  proc << locate("exe", "konsole");
+  proc.start(KProcess::DontCare);
+}
+
 void KRootWm::slotConfigureDesktop() {
   QStringList args = configModules();
   args.prepend(i18n("Desktop"));

kdebase-3.5.1-redhat.patch:
 kde.pamd |   14 ++++++++------
 startkde |   54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 59 insertions(+), 9 deletions(-)

--- NEW FILE kdebase-3.5.1-redhat.patch ---
--- kdebase-3.5.0/startkde.redhat	2005-09-10 15:03:40.000000000 +0200
+++ kdebase-3.5.0/startkde	2005-09-29 16:16:19.000000000 +0200
@@ -1,8 +1,56 @@
 #!/bin/sh
 #
 #  DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.1 )
+#  Modified for Red Hat Linux
 #
 
+unset BLOCK_SIZE # breaks parsing of df output
+shopt -u -o noclobber # allow overwriting of files with '>'
+
+# set up user environment if not present
+# check for space on /tmp and "$HOME" and for write access
+#  error exit, if not
+space_tmp=`df /tmp | xargs | cut -d" " -f11`
+homedir_mount=`df "$HOME" | xargs | cut -d" " -f8`
+
+if [ "$homedir_mount" = "AFS" -a -x "`which fs 2>/dev/null`" ] ; then
+    # check for AFS
+    space_home=`fs df "$HOME" | xargs | cut -d" " -f10`
+else
+    # check regular mounts
+    space_home=`df "$HOME" | xargs | cut -d" " -f11`
+fi
+
+if [ $space_tmp -lt 50 ]; then
+    echo $"Not enough free disk space on /tmp"
+    exit 1
+fi
+
+if [ $space_home -lt 25 ]; then
+    echo $"Not enough free disk space on "$HOME""
+    exit 1
+fi
+testfile_tmp=`mktemp /tmp/KDE.startkde.XXXXXX`
+testfile_home=`mktemp "$HOME"/KDE.startkde.XXXXXX`
+
+if ! echo TEST_TEXT >$testfile_tmp 2>/dev/null ; then
+    echo $"You don't have write permissions for /tmp"
+    exit 1
+fi
+rm -f $testfile_tmp
+
+if ! echo TEST_TEXT >$testfile_home 2>/dev/null ; then
+     echo $"You don't have write permissions for "$HOME""
+     exit 1
+fi
+rm -f $testfile_home
+
+[ -d "$HOME"/.kde/share/config ] || mkdir -p "$HOME"/.kde/share/config
+
+if [ ! -e "$HOME"/.kde/share/config/emaildefaults ]; then
+  /usr/bin/mailsettings >"$HOME"/.kde/share/config/emaildefaults
+fi
+
 # When the X server dies we get a HUP signal from xinit. We must ignore it
 # because we still need to do some cleanup.
 trap 'echo GOT SIGHUP' HUP
@@ -14,12 +62,12 @@
 	exit 1
 fi
 
-# Set the background to plain grey.
+# Set the background to the Red Hat default blue
 # The standard X background is nasty, causing moire effects and exploding
 # people's heads. We use colours from the standard KDE palette for those with
 # palettised displays.
 if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then
-  xsetroot -solid "#000000"
+  xsetroot -solid "#5477A0"
 fi
 
 # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
@@ -64,7 +112,7 @@
 cat >$kdehome/share/config/startupconfigkeys <<EOF
 kcminputrc Mouse cursorTheme ''
 kcminputrc Mouse cursorSize ''
-kpersonalizerrc General FirstLogin true
+kpersonalizerrc General FirstLogin false
 ksplashrc KSplash Theme Default
 kcmrandrrc Display ApplyOnStartup false
 kcmrandrrc [Screen0]
--- kdebase-3.5.0/kde.pamd.redhat	1998-06-26 21:58:10.000000000 +0200
+++ kdebase-3.5.0/kde.pamd	2004-02-05 23:23:19.000000000 +0100
@@ -1,7 +1,9 @@
 #%PAM-1.0
-auth       required	/lib/security/pam_pwdb.so shadow nullok
-auth       required	/lib/security/pam_nologin.so
-account    required	/lib/security/pam_pwdb.so
-password   required	/lib/security/pam_cracklib.so
-password   required	/lib/security/pam_pwdb.so shadow nullok use_authtok
-session    required	/lib/security/pam_pwdb.so
+auth       required	pam_stack.so service=system-auth
+auth       required	pam_nologin.so
+auth       sufficient	pam_timestamp.so
+account    required	pam_stack.so service=system-auth
+password   required	pam_stack.so service=system-auth
+session    required	pam_stack.so service=system-auth
+session    optional	pam_timestamp.so
+session    optional	pam_console.so


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-4/kdebase.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- kdebase.spec	13 Jun 2005 16:34:12 -0000	1.113
+++ kdebase.spec	27 Jan 2006 23:25:17 -0000	1.114
@@ -2,7 +2,6 @@
 
 %define debug 0
 %define final 0
-%define pie 0
 
 %define redhatify 1
 %define include_kappfinder 0
@@ -11,16 +10,18 @@
 %define gdmsession KDE
 
 %define qt_version 3.3.4
-%define arts_version 1.4.1
-%define kde_version 3.4.1
+%define arts_version 1.5.1
+%define kde_version 3.5.1
 
 %define make_cvs 1
 %define arts 1
 
+%define disable_gcc_check_and_hidden_visibility 1
+
 Summary: K Desktop Environment - core files
 Name: kdebase
-Version: 3.4.1
-Release: 0.fc4.1
+Version: 3.5.1
+Release: 0.1.fc4
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -31,39 +32,26 @@
 Source1: konsole.desktop
 Source2: KDE.session.gnome
 Source3: kde.desktop
-Source4: kde-redhat-config-3.2.0-0.9.tar.bz2
+Source4: kde-redhat-config-3.4.2-fc4-0.2.tar.bz2
 Source5: kde-np
 Source7: mailsettings.cc
 
-Patch0: kdebase-3.4.1-redhat.patch
+Patch0: kdebase-3.5.1-redhat.patch
 Patch3: kdebase-3.3.92-vroot.patch
 Patch4: kdebase-3.0-shortcuts.patch
-Patch5: kdebase-3.4.0-fonts.patch
-Patch13: kdebase-3.4.0-config.patch
-Patch33: kdebase-3.4.0-monospace.patch
 Patch40: kdebase-3.2.0-keymap.patch
 Patch48: kdebase-3.0.4-kdesukonsole.patch
 Patch56: kde-libtool.patch
 Patch57: kdebase-3.1-startpage.patch
-Patch65: kdebase-3.1.1-usb.patch
 Patch71: kdebase-3.1.3-konsole-double-esc.patch
 Patch74: kdebase-3.3.92-kpersonalizer.patch
-Patch75: kdebase-3.2.0-selinux.patch
-Patch77: kdebase-3.2.2-nedit.patch 
 Patch80: kdebase-3.2.92-logo.patch 
 Patch81: kdebase-3.2.2-konsole-setInputMethodEnabled-20040525.diff
 Patch83: kdebase-3.3.0-altf2.patch
-Patch85: kdebase-3.3.92-fstab.patch
-Patch87: kdebase-3.3.1-man.patch
-Patch89: kdebase-3.3.92-servicebutton-saveas.patch
-Patch90: kdebase-3.4.0rc1-konsole-keymap.patch
-Patch91: kdebase-3.4.0-kdesktop-konsole.patch
+Patch91: kdebase-3.4.2-kdesktop-konsole.patch
 Patch92: kdebase-3.4.0-xdg.patch
 Patch93: kdebase-3.4.1-pam.patch
 
-# gcc 4 workaround
-patch200: admin-visibility.patch
-
 Requires: kdelibs >= 6:%{version}
 Requires: libxml2 >= 2.6.5
 Requires: /etc/X11/xdm/Xaccess
@@ -129,39 +117,25 @@
 %patch0 -p1 -b .redhat
 %patch3 -p1 -b .vroot
 %patch4 -p1 -b .shortcuts
-%patch5 -p1 -b .fonts
-%patch13 -p1 -b .config
-%patch33 -p1 -b .fontkonsole
 %patch40 -p1 -b .keymap
 %patch48 -p1 -b .kdesukonsole
 %patch56 -p1 -b .libtool
 %patch57 -p1
-%patch65 -p1 -b .usb
 %patch71 -p1 -b .konsole
 %patch74 -p1 -b .kper
-%patch75 -p1 -b .selinux
-%patch77 -p1 -b .nedit
 %patch80 -p1 -b .logo
 %patch81 -p1 -b .im
 %patch83 -p1 -b .altf2
-%patch85 -p1 -b .kioslave
-%patch87 -p1 -b .man
-%patch89 -p1 -b .saveas
-%patch90 -p1 -b .konsole
 %patch91 -p1 -b .kdestop-konsole
 %patch92 -p1 -b .xdg
 %patch93 -p1 -b .loginuid
 
-# gcc 4 workaround
-%patch200 -p1 -b .gcc4
-
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
    perl -pi -e "s,kdeprintfax,," kdeprint/Makefile.am
 %endif
 
 %if %redhatify
-   cp %{SOURCE1} konsole
    # set Konqueror version
    perl -pi -e "s,^#define.*KONQUEROR_VERSION.*,#define KONQUEROR_VERSION \"%{version}-%{release} Red Hat\"," konqueror/version.h
 %endif
@@ -175,20 +149,13 @@
 export CFLAGS="$FLAGS"
 export KDEDIR=%{_prefix}
 
-%if 0
-if pkg-config openssl ; then
-   CFLAGS="$CFLAGS `pkg-config --cflags openssl`"
-   CXXFLAGS="$CXXFLAGS `pkg-config --cflags openssl`"
-   CPPFLAGS="$CPPFLAGS `pkg-config --cflags-only-I openssl`"
-   LDFLAGS="$LDFLAGS `pkg-config --libs-only-L openssl`"
-fi
-%endif
-
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
 
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
    --with-qt-libraries=$QTDIR/lib \
    --with-extra-libs=%{_libdir} \
    --with-xdmdir=%{_sysconfdir}/X11/xdm \
@@ -210,6 +177,7 @@
 %endif
 %if %{debug} == 0
    --disable-debug \
+   --disable-warnings \
 %else
    --enable-debug \
 %endif
@@ -436,6 +404,24 @@
 %{_includedir}/kde/ksplash/*
 
 %changelog
+* Fri Jan 27 2006 Than Ngo <than at redhat.com> 6:3.5.1-0.1.fc4
+- 3.5.1
+
+* Wed Dec 07 2005 Than Ngo <than at redhat.com> 6:3.5.0-0.1.fc4
+- 3.5
+
+* Thu Sep 01 2005 Than Ngo <than at redhat.com> 6:3.4.2-0.fc4.3
+- apply patch to fix local root vulnerability in kcheckpass #166997
+- apply upstream patch to fix kinfocenter opengl DRI/GLX crash
+- apply patch to fix konqueror fails to enter directories
+  that begin with [ (#169067)
+
+* Wed Aug 17 2005 Than Ngo <than at redhat.com> 6:3.4.2-0.fc4.2
+- enable switching users #166112
+
+* Tue Jul 26 2005 Than Ngo <than at redhat.com> 3.4.2-0.fc4.1
+- update to 3.4.2
+
 * Mon Jun 13 2005 Than Ngo <than at redhat.com> 3.4.1-0.fc4.1
 - 3.4.1
 - update pam configuration for the new audit system #159333 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-4/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	13 Jun 2005 16:36:34 -0000	1.57
+++ sources	27 Jan 2006 23:25:17 -0000	1.58
@@ -1,2 +0,0 @@
-776b3f900740f021b4df3871e596aa6f  kde-redhat-config-3.2.0-0.9.tar.bz2
-8fbe0b943721b79f2549064b580acdde  kdebase-3.4.1.tar.bz2


--- admin-visibility.patch DELETED ---


--- kdebase-3.1.1-usb.patch DELETED ---


--- kdebase-3.2.0-selinux.patch DELETED ---


--- kdebase-3.2.2-nedit.patch DELETED ---


--- kdebase-3.3.1-man.patch DELETED ---


--- kdebase-3.3.92-fstab.patch DELETED ---


--- kdebase-3.3.92-servicebutton-saveas.patch DELETED ---


--- kdebase-3.4.0-config.patch DELETED ---


--- kdebase-3.4.0-fonts.patch DELETED ---


--- kdebase-3.4.0-kdesktop-konsole.patch DELETED ---


--- kdebase-3.4.0-monospace.patch DELETED ---


--- kdebase-3.4.0rc1-konsole-keymap.patch DELETED ---


--- kdebase-3.4.1-redhat.patch DELETED ---


