rpms/kdebase3/devel kdebase-3.5.9-redhat-startkde.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kdebase3.spec, 1.39, 1.40 sources, 1.3, 1.4 kdebase-3.5.8-creategtkrc-gtk212.patch, 1.1, NONE kdebase-3.5.8-flash.patch, 1.3, NONE kdebase-3.5.8-gdm-socket.patch, 1.1, NONE kdebase-3.5.8-kded-crash-logout.patch, 1.1, NONE kdebase-3.5.8-klipper-firefox.patch, 1.1, NONE kdebase-3.5.8-redhat-startkde.patch, 1.1, NONE post-3.5.8-kdebase-kdm.diff, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Thu Feb 14 21:35:56 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/kdebase3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14864
Modified Files:
.cvsignore kdebase3.spec sources
Added Files:
kdebase-3.5.9-redhat-startkde.patch
Removed Files:
kdebase-3.5.8-creategtkrc-gtk212.patch
kdebase-3.5.8-flash.patch kdebase-3.5.8-gdm-socket.patch
kdebase-3.5.8-kded-crash-logout.patch
kdebase-3.5.8-klipper-firefox.patch
kdebase-3.5.8-redhat-startkde.patch
post-3.5.8-kdebase-kdm.diff
Log Message:
* Thu Feb 14 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.9-1
- kde-3.5.9
kdebase-3.5.9-redhat-startkde.patch:
--- NEW FILE kdebase-3.5.9-redhat-startkde.patch ---
--- kdebase-3.5.7/startkde.redhat 2006-10-02 13:13:29.000000000 +0200
+++ kdebase-3.5.7/startkde 2006-10-10 17:35:53.000000000 +0200
@@ -1,7 +1,54 @@
#!/bin/sh
#
# DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.9 )
-#
+# 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=`LANG=C df /tmp | xargs | cut -d" " -f11`
+homedir_mount=`LANG=C df "$HOME" | xargs | cut -d" " -f8`
+
+if [ "$homedir_mount" = "AFS" -a -x "`which fs 2>/dev/null`" ] ; then
+ # check for AFS
+ space_home=`LANG=C fs df "$HOME" | xargs | cut -d" " -f10`
+else
+ # check regular mounts
+ space_home=`LANG=C 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.
@@ -14,12 +61,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
@@ -61,7 +108,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]
@@ -157,8 +204,8 @@
EOF
fi
-# Source scripts found in <localprefix>/env/*.sh and <prefixes>/env/*.sh
-# (where <localprefix> is $KDEHOME or ~/.kde, and <prefixes> is where KDE is installed)
+# Source scripts found in <localprefix>/env/*.sh and /etc/kde/env/*.sh
+# (where <localprefix> is $KDEHOME or ~/.kde)
#
# This is where you can define environment variables that will be available to
# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent`
@@ -170,9 +217,10 @@
# better use the Autostart folder.
exepath=`kde-config --path exe | tr : '\n'`
+envpath=/etc/kde/env/
-for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/env/,p'`; do
- for file in "$prefix"*.sh; do
+for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/env/,p'` $envpath ; do
+ for file in "$prefix"*.sh ; do
test -r "$file" && . "$file"
done
done
@@ -378,7 +426,8 @@
echo 'startkde: Running shutdown scripts...' 1>&2
# Run scripts found in $KDEDIRS/shutdown
-for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'`; do
+shutdownpath=/etc/kde/shutdown/
+for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'` $shutdownpath; do
for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
test -x "$prefix$file" && "$prefix$file"
done
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 1 Dec 2007 06:52:52 -0000 1.2
+++ .cvsignore 14 Feb 2008 21:35:10 -0000 1.3
@@ -1,2 +1 @@
-kde-redhat-config-3.5-fc7-1.tar.bz2
-kdebase-3.5.8.tar.bz2
+kdebase-3.5.9.tar.bz2
Index: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- kdebase3.spec 9 Feb 2008 07:24:21 -0000 1.39
+++ kdebase3.spec 14 Feb 2008 21:35:10 -0000 1.40
@@ -14,8 +14,8 @@
%define _with_samba --with-samba
-Version: 3.5.8
-Release: 37%{?dist}
+Version: 3.5.9
+Release: 1%{?dist}
%if 0%{?fedora} > 8
Name: kdebase3
@@ -84,26 +84,14 @@
Patch30: kdebase-3.5.7-kio_media_mounthelper.patch
Patch31: kdebase-3.5.7-konsolesu.patch
Patch32: kdebase-3.5.8-flash.patch
-Patch33: kdebase-3.5.8-klipper-firefox.patch
-Patch34: kdebase-3.5.8-kded-crash-logout.patch
# fix check for struct ucred to work with current glibc 2.7.90
Patch35: kdebase-3.5.8-glibc28-struct-ucred.patch
# upstream patches
# alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
Patch200: kdebase-3.5.7-kde#83974.patch
-# http://bugs.kde.org/show_bug.cgi?id=149045
-Patch201: kdebase-3.5.8-gdm-socket.patch
-# http://websvn.kde.org/?view=rev&revision=754981
-# Fix createGtkrc to set tooltip colors also for GTK+ 2.12+.
-Patch202: kdebase-3.5.8-creategtkrc-gtk212.patch
-# http://websvn.kde.org/?view=rev&revision=727634
-# GCC 4.3 build fix (--enable-final macro redefinition) by Dirk Müller
-Patch203: kdebase-3.5.8-gcc43.patch
# security fixes
-# KDM local DoS vulnerability, CVE-2007-5963
-Patch1000: post-3.5.8-kdebase-kdm.diff
%if 0%{?libs}
Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -212,7 +200,6 @@
%endif
%endif
BuildRequires: OpenEXR-devel
-# for flash patch(es)
BuildRequires: gtk2-devel
@@ -310,20 +297,10 @@
#patch29 -p1 -b .konsole-bz#244906
%patch30 -p1 -b .bz#265801
%patch31 -p1 -b .konsolesu-kdesu
-%patch32 -p1 -b .flash
-%patch33 -p1 -b .klipper-firefox
-%patch34 -p0 -b .kded-crash-logout
%patch35 -p1 -b .ucred
## alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
#patch200 -p4 -b .kde#83974
-%if 0%{?fedora} > 7
-%patch201 -p1 -b .gdm-socket
-%endif
-%patch202 -p4 -b .gtk212
-%patch203 -p0 -b .gcc43
-
-%patch1000 -p0 -b .CVE-2007-5963
%if "%{name}" != "kdebase"
# hacks to omit stuff that doesn't support DO_NOT_COMPILE
@@ -819,6 +796,9 @@
%changelog
+* Thu Feb 14 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.9-1
+- kde-3.5.9
+
* Sat Feb 09 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.8-37
- sync from F8:
- kdm: local DoS vulnerability, CVE-2007-5963 (Than Ngo, 3.5.8-31.fc8)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 4 Dec 2007 18:26:56 -0000 1.3
+++ sources 14 Feb 2008 21:35:10 -0000 1.4
@@ -1 +1 @@
-9990c669229daaaa8fca4c5e354441fd kdebase-3.5.8.tar.bz2
+c8c35389a238aa1b73e68ef5298eadf8 kdebase-3.5.9.tar.bz2
--- kdebase-3.5.8-creategtkrc-gtk212.patch DELETED ---
--- kdebase-3.5.8-flash.patch DELETED ---
--- kdebase-3.5.8-gdm-socket.patch DELETED ---
--- kdebase-3.5.8-kded-crash-logout.patch DELETED ---
--- kdebase-3.5.8-klipper-firefox.patch DELETED ---
--- kdebase-3.5.8-redhat-startkde.patch DELETED ---
--- post-3.5.8-kdebase-kdm.diff DELETED ---
More information about the fedora-extras-commits
mailing list