diff options
author | Caleb Tennis <caleb@gentoo.org> | 2004-08-06 15:23:26 +0000 |
---|---|---|
committer | Caleb Tennis <caleb@gentoo.org> | 2004-08-06 15:23:26 +0000 |
commit | 1f97896cc9fd10c2f98d18edd75575adfb4a497b (patch) | |
tree | 112d2b1f9be09a7ef0c4aa50ee1d1a96bd5ac8ee /kde-base | |
parent | Stable on hppa. (diff) | |
download | historical-1f97896cc9fd10c2f98d18edd75575adfb4a497b.tar.gz historical-1f97896cc9fd10c2f98d18edd75575adfb4a497b.tar.bz2 historical-1f97896cc9fd10c2f98d18edd75575adfb4a497b.zip |
Incorporate a security fix in 3.2.3-r1
Diffstat (limited to 'kde-base')
-rw-r--r-- | kde-base/kdebase/ChangeLog | 10 | ||||
-rw-r--r-- | kde-base/kdebase/Manifest | 9 | ||||
-rw-r--r-- | kde-base/kdebase/files/3.2.3-r1/Xsetup | 36 | ||||
-rw-r--r-- | kde-base/kdebase/files/3.2.3-r1/backgroundrc | 18 | ||||
-rw-r--r-- | kde-base/kdebase/files/3.2.3-r1/kdmrc | 417 | ||||
-rw-r--r-- | kde-base/kdebase/files/3.2.3-r1/startkde-3.2.3-r1-gentoo.diff | 67 | ||||
-rw-r--r-- | kde-base/kdebase/files/digest-kdebase-3.2.3-r1 | 1 | ||||
-rw-r--r-- | kde-base/kdebase/files/post-3.2.3-kdebase-htmlframes.patch | 138 | ||||
-rw-r--r-- | kde-base/kdebase/kdebase-3.2.3-r1.ebuild | 117 |
9 files changed, 811 insertions, 2 deletions
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index e5eb3f337e8e..89b2ed92e591 100644 --- a/kde-base/kdebase/ChangeLog +++ b/kde-base/kdebase/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for kde-base/kdebase # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.138 2004/08/06 15:11:47 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.139 2004/08/06 15:23:25 caleb Exp $ + +*kdebase-3.2.3-r1 (06 Aug 2004) + + 06 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdebase-3.2.3-r1.ebuild, + files/post-3.2.3-kdebase-htmlframes.patch, files/3.2.3-r1/Xsetup, + files/3.2.3-r1/backgroundrc, files/3.2.3-r1/kdmrc, + files/3.2.3-r1/startkde-3.2.3-r1-gentoo.diff: + Incorporate a security fix *kdebase-3.3.0_rc1 (06 Aug 2004) diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest index 2bd0580e3252..615ccdc9c54c 100644 --- a/kde-base/kdebase/Manifest +++ b/kde-base/kdebase/Manifest @@ -1,9 +1,10 @@ MD5 065218d3912f2995ec58f157df8f17a3 kdebase-3.2.3.ebuild 3281 +MD5 0097b8e7e066d42e714a7b29c62dd5b6 kdebase-3.2.3-r1.ebuild 3343 MD5 212bf2c2a704a5229147c98aa5fa49eb kdebase-3.2.0.ebuild 3344 MD5 1346582446d8d61097aaed2115b05adf kdebase-3.2.2.ebuild 3346 MD5 c44314da3c82d4f3938785328b571479 kdebase-3.3.0_rc1.ebuild 3144 MD5 3a42711432882f7dfe32aeec2f454ed7 kdebase-3.2.1.ebuild 3653 -MD5 0f851d0942f1fab31096a5ddaaa200e8 ChangeLog 24741 +MD5 8a35ece703b0251ecf440dbc5bc852c9 ChangeLog 25045 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161 MD5 b3184422a2ab9890a87e73e4e0d7cc91 kdebase-3.3.0_beta2.ebuild 3201 MD5 b48e5f8d54a613ad906d06a21e8349a2 kdebase-3.1.5.ebuild 3623 @@ -12,6 +13,7 @@ MD5 9b4df4afee8c5f857c91799f415a4ab2 files/kdebase-3.1.5-amd64-accessviol.patch MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405 MD5 160f44a51f4308c9c21052fd21c7d04d files/kdebase-3.2.0-kcontrol.patch 699 MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/kscreensaver.pam 79 +MD5 daa284d6a1f62c5c73deb8aeda9df57d files/digest-kdebase-3.2.3-r1 68 MD5 7688a76a855ccc4b726fee9726de1e40 files/digest-kdebase-3.3.0_rc1 72 MD5 17b088965016d9c796e570741837a2b3 files/detectwidget.cpp.diff 422 MD5 2b5419b0b173138e22fe03f4157d5660 files/kde-np.pam 379 @@ -22,6 +24,7 @@ MD5 7b4a3c4a318e02c24c0ebacb4264bcdd files/digest-kdebase-3.2.1 68 MD5 7a15aed698aee6f910a32b6fb7a1e8dd files/digest-kdebase-3.2.2 68 MD5 daa284d6a1f62c5c73deb8aeda9df57d files/digest-kdebase-3.2.3 68 MD5 2eb15d4b93c483b634ea34475d91e79b files/kdebase-3.2.2-genkdmconf.c.diff 1082 +MD5 a60fd1628607d4abdeb930662d126171 files/post-3.2.3-kdebase-htmlframes.patch 6728 MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.3.0_rc1/kdmrc 18202 MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.0_rc1/backgroundrc 342 MD5 3403677f5c4e44815c5a97c507d4f117 files/3.3.0_rc1/Xsetup 758 @@ -53,3 +56,7 @@ MD5 fd94a04c116a96b4fdee387b7921699e files/3.3.0_beta2/startkde-3.3.0_beta2-gent MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.3.0_beta2/kdmrc 18202 MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.0_beta2/backgroundrc 342 MD5 3403677f5c4e44815c5a97c507d4f117 files/3.3.0_beta2/Xsetup 758 +MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.3-r1/startkde-3.2.3-r1-gentoo.diff 1923 +MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.3-r1/kdmrc 18202 +MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.3-r1/backgroundrc 342 +MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.3-r1/Xsetup 758 diff --git a/kde-base/kdebase/files/3.2.3-r1/Xsetup b/kde-base/kdebase/files/3.2.3-r1/Xsetup new file mode 100644 index 000000000000..427ed61d709b --- /dev/null +++ b/kde-base/kdebase/files/3.2.3-r1/Xsetup @@ -0,0 +1,36 @@ +#! /bin/sh +# Xsetup - run as root before the login dialog appears + +#xconsole -geometry 480x130-0-0 -notify -verbose -fn fixed -exitOnFail -file /dev/xconsole & + +SESSIONDIR="_PREFIX_/share/config/kdm/sessions" + +session_to_desktop_entry() +{ +SESSION=$1 +SESSIONFILE="/etc/X11/Sessions/${SESSION}" + +if [ ! -d ${SESSIONDIR} ]; then + echo "cannot create ${SESSION}.desktop:" + echo "directory ${SESSIONDIR} does not exist." + return; +fi + +if [ ! -e ${SESSIONDIR}/${SESSION}.desktop ]; then + +cat > "${SESSIONDIR}/${SESSION}.desktop" <<EOF +[Desktop Entry] +Type=XSession +Exec=${SESSIONFILE} +TryExec=${SESSIONFILE} +Name=${SESSION} +EOF + +fi +} + +echo "Creating menu entries for kdm in ${SESSIONDIR}..." + +for i in `ls /etc/X11/Sessions/`; do + session_to_desktop_entry $i +done diff --git a/kde-base/kdebase/files/3.2.3-r1/backgroundrc b/kde-base/kdebase/files/3.2.3-r1/backgroundrc new file mode 100644 index 000000000000..d00db3a27bff --- /dev/null +++ b/kde-base/kdebase/files/3.2.3-r1/backgroundrc @@ -0,0 +1,18 @@ +[Desktop0] +BackgroundMode=VerticalGradient +BlendBalance=100 +BlendMode=NoBlending +ChangeInterval=60 +Color1=14,120,131 +Color2=67,174,192 +CurrentWallpaper=0 +LastChange=0 +MinOptimizationDepth=1 +MultiWallpaperMode=NoMulti +Pattern=fish +Program= +ReverseBlending=false +UseSHM=false +Wallpaper=default_blue.jpg +WallpaperList= +WallpaperMode=NoWallpaper diff --git a/kde-base/kdebase/files/3.2.3-r1/kdmrc b/kde-base/kdebase/files/3.2.3-r1/kdmrc new file mode 100644 index 000000000000..ba853ca21534 --- /dev/null +++ b/kde-base/kdebase/files/3.2.3-r1/kdmrc @@ -0,0 +1,417 @@ +# KDM master configuration file +# +# Definition: the greeter is the login dialog, i.e., the part of KDM +# which the user sees. +# +# You can configure every X-display individually. +# Every display has a display name, which consists of a host name +# (which is empty for local displays specified in the Xservers file), +# a colon and a display number. Additionally, a display belongs to a +# display class (which can be ignored in most cases; the control center +# does not support this feature at all). +# Sections with display-specific settings have the formal syntax +# "[X-" host [":" number [ "_" class ]] "-" sub-section "]" +# You can use the "*" wildcard for host, number and class. You may omit +# trailing components; they are assumed to be "*" then. +# The host part may be a domain specification like ".inf.tu-dresden.de". +# From which section a setting is actually taken is determined by these +# rules: +# - an exact match takes precedence over a partial match (for the host part), +# which in turn takes precedence over a wildcard +# - precedence decreases from left to right for equally exact matches +# Example: display name "myhost:0", class "dpy". +# [X-myhost:0_dpy] precedes +# [X-myhost:0_*] (same as [X-myhost:0]) precedes +# [X-myhost:*_dpy] precedes +# [X-myhost:*_*] (same as [X-myhost]) precedes +# [X-*:0_dpy] precedes +# [X-*:0_*] (same as [X-*:0]) precedes +# [X-*:*_*] (same as [X-*]) +# These sections do NOT match this display: +# [X-hishost], [X-myhost:0_dec], [X-*:1], [X-:*] +# If a setting is not found in any matching section, the default is used. +# +# Every comment applies to the following section or key. Note, that all +# comments will be lost if you change this file with the kcontrol frontend. +# The defaults refer to KDM's built-in values, not anything set in this file. +# + +[General] +# This option exists solely for the purpose of a clean automatic upgrade. +# Don't even think about changing it! +ConfigVersion=2.1 +# If the value starts with a slash (/), it specifies the file, where X-servers +# to be used by KDM are listed; the file is in the usual XDM-Xservers format. +# Otherwise it's interpreted like one line of the Xservers file, i.e., it +# specifies exactly one X-server. +# Default is ":0 local@tty1 /usr/X11R6/bin/X vt7" +# XXX i'm planning to absorb this file into kdmrc, but i'm not sure how to +# do this best. +Xservers=_PREFIX_/share/config/kdm/Xservers +# Where KDM should store its PID. Default is "" (don't store) +PidFile=/var/run/kdm.pid +# Whether KDM should lock the pid file to prevent having multiple KDM +# instances running at once. Leave it "true", unless you're brave. +#LockPidFile=false +# Where to store authorization files. Default is /var/run/xauth +#AuthDir=/tmp +# Whether KDM should automatically re-read configuration files, if it +# finds them having changed. Just keep it "true". +#AutoRescan=false +# Additional environment variables KDM should pass on to kdm_config, kdm_greet, +# Xsetup, Xstartup, Xsession, and Xreset. LD_LIBRARY_PATH is a good candidate; +# otherwise it shouldn't be necessary very often. +#ExportList=SOME_VAR,ANOTHER_IMPORTANT_VAR +# Where the command FiFos should be created. Make it empty to disable +# the FiFos. Default is /var/run/xdmctl +#FifoDir=/tmp +# To which group the command FiFos should belong. +# Default is -1 (effectively root) +#FifoGroup=xdmctl +# The directory kdm should store persistent working data in. +# Default is /var/lib/kdm +#DataDir=/var/lib/kdm +# The directory kdm should store users' .dmrc files in. This is only needed +# if the home directories are not readable before actually logging in (like +# with AFS). Default is "" +#DmrcDir=/nfs-shared/var/dmrcs + +[Xdmcp] +# Whether KDM should listen to XDMCP requests. Default is true. +Enable=false +# The UDP port KDM should listen on for XDMCP requests. Don't change the 177. +#Port=177 +# File with the private keys of X-terminals. Required for XDM authentication. +# Default is "" +#KeyFile=_PREFIX_/share/config/kdm/kdmkeys +# XDMCP access control file in the usual XDM-Xaccess format. +# Default is _PREFIX_/share/config/kdm/Xaccess +# XXX i'm planning to absorb this file into kdmrc, but i'm not sure how to +# do this best. +#Xaccess= +# Number of seconds to wait for display to respond after the user has +# selected a host from the chooser. Default is 15. +#ChoiceTimeout=10 +# Strip domain name from remote display names if it is equal to the local +# domain. Default is true +#RemoveDomainname=false +# Use the numeric IP address of the incoming connection instead of the +# host name. Use this on multihomed hosts. Default is false +#SourceAddress=true +# The program which is invoked to dynamically generate replies to XDMCP +# BroadcastQuery requests. +# By default no program is invoked and "Willing to manage" is sent. +Willing=_PREFIX_/share/config/kdm/Xwilling + +[Shutdown] +# The command to run to halt the system. Default is /sbin/halt +#HaltCmd= +# The command to run to reboot the system. Default is /sbin/reboot +#RebootCmd= +# Whether one can shut down the system via the global command FiFo. +# Default is false +#AllowFifo=true +# Whether one can abort still running sessions when shutting down the system +# via the global command FiFo. Default is true +#AllowFifoNow=false +# Offer LiLo boot options in shutdown dialog. Default is false +#UseLilo=true +# The location of the LiLo binary. Default is /sbin/lilo +#LiloCmd= +# The location of the LiLo map file. Default is /boot/map +#LiloMap= + +# Rough estimations about how many seconds KDM will spend at most on +# - opening a connection to the X-server (OpenTime): +# OpenRepeat * (OpenTimeout + OpenDelay) +# - starting a local X-server (ServerTime): ServerAttempts * ServerTimeout +# - starting a display: +# - local display: StartAttempts * (ServerTime + OpenTime) +# - remote/foreign display: StartAttempts * OpenTime + +# Core config for all displays +[X-*-Core] +# How long to wait before retrying to start the display after various +# errors. Default is 15 +#OpenDelay= +# How long to wait before timing out XOpenDisplay. Default is 120 +#OpenTimeout= +# How often to try the XOpenDisplay. Default is 5 +#OpenRepeat= +# Try at most that many times to start a display. If this fails, the display +# is disabled. Default is 4 +#StartAttempts= +# The StartAttempt counter is reset after that many seconds. Default is 30 +#StartInterval= +# Ping remote display every that many minutes. Default is 5 +#PingInterval= +# Wait for a Pong that many minutes. Default is 5 +#PingTimeout= +# Restart instead of resetting the local X-server after session exit. +# Use it if the server leaks memory, etc. Default is false +#TerminateServer=true +# The signal needed to reset the local X-server. Default is 1 (SIGHUP) +#ResetSignal= +# The signal needed to terminate the local X-server. Default is 15 (SIGTERM) +#TermSignal= +# Need to reset the X-server to make it read initial Xauth file. +# Default is false +#ResetForAuth=true +# Create X-authorizations for local displays. Default is true +#Authorize=false +# Which X-authorization mechanisms should be used. +# Default is MIT-MAGIC-COOKIE-1 +#AuthNames= +# The name of this X-server's Xauth file. Default is "", which means, that +# a random name in the AuthDir directory will be used. +#AuthFile= +# Specify a file with X-resources for the greeter, chooser and background. +# The KDE frontend doesn't care for this, so you don't need it unless you +# use an alternative chooser or another background generator than kdmdesktop. +# Default is "" +#Resources= +# The xrdb program to use to read the above specified recources. +# Default is /usr/X11R6/bin/xrdb +#Xrdb= +# A program to run before the greeter is shown. You should start kdmdesktop +# there. Also, xconsole can be started by this script. +# Default is "" +Setup=_PREFIX_/share/config/kdm/Xsetup +# A program to run before a user session starts. You should invoke sessreg +# there and optionally change the ownership of the console, etc. +# Default is "" +Startup=_PREFIX_/share/config/kdm/Xstartup +# A program to run after a user session exits. You should invoke sessreg +# there and optionally change the ownership of the console, etc. +# Default is "" +Reset=_PREFIX_/share/config/kdm/Xreset +# The program which is run as the user which logs in. It is supposed to +# interpret the session argument (see SessionsDirs) and start an appropriate +# session according to it. +# Default is /usr/X11R6/bin/xterm -ls -T +Session=_PREFIX_/share/config/kdm/Xsession +# The program to run if Session fails. +# Default is /usr/X11R6/bin/xterm +#FailsafeClient= +# The PATH for the Session program. Default is +# /bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin +#UserPath=_PREFIX_/bin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin +# The PATH for Setup, Startup and Reset, etc. Default is +# /sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin +#SystemPath=_PREFIX_:/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin +# The default system shell. Default is /bin/sh +#SystemShell=/bin/bash +# Where to put the user's X-server authorization file if ~/.Xauthority +# cannot be created. Default is /tmp +#UserAuthDir= +# If "true", KDM will automatically restart a session after an X-server +# crash (or if it is killed by Alt-Ctrl-BackSpace). Note, that enabling +# this opens a security hole: a secured display lock can be circumvented +# (unless you use KDE's built-in screen lock). Default is false +#AutoReLogin=true +# Allow root logins? Default is true +AllowRootLogin=false +# Allow to log in, when user has set an empty password? Default is true +AllowNullPasswd=false +# Who is allowed to shut down the system. This applies both to the +# greeter and to the command FiFo. Default is All +# "None" - no "Shutdown..." button is shown at all +# "Root" - the root password must be entered to shut down +# "All" - everybody can shut down the machine (Default) +AllowShutdown=Root +# Who is allowed to abort all still running sessions when shutting down. +# Same options as for AllowShutdown. Default is All +#AllowSdForceNow=Root +# The default choice for the shutdown condition/timing. +# "Schedule" - shutdown after all sessions exit (possibly at once) (Default) +# "TryNow" - shutdown, if no sessions are open, otherwise do nothing +# "ForceNow" - shutdown unconditionally +#DefaultSdMode=ForceNow +# If this is false the user must select the shutdown condition/timing already +# in the shutdown dialog. If this is true he won't be bothered with the options, +# but will be asked what to do if sessions are actually open. Default is true +# NOTE: the interaction is currently not implemented. If this is set to true, +# a normal forced shutdown will happen (without caring for the AllowSdForceNow +# option!), i.e., KDM will behave exactly as before KDE 3.0. +#InteractiveSd=false +# The directories containing session type definitions in .desktop format. +# Default is _PREFIX_/share/apps/kdm/sessions +SessionsDirs=_PREFIX_/share/config/kdm/sessions + +# Greeter config for all displays +[X-*-Greeter] +# Widget style of the greeter. "" means the built-in default which currently +# is "Keramik". Default is "" +#GUIStyle=Windows +# Widget color scheme of the greeter. "" means the built-in default which +# currently is quite greyish. Default is "" +#ColorScheme=Pumpkin +# What should be shown righthand of the input lines: +# "Logo" - the image specified by LogoPixmap (Default) +# "Clock" - a neat analog clock +# "None" - nothing +#LogoArea=None +# The image to show when LogoArea=Logo. Default is kdelogo.png +#LogoPixmap= +# Normally, the greeter is centered on the screen. Use this, if you want +# it to appear elsewhere on the screen. Default is false +#GreeterPosFixed=true +#GreeterPosX=200 +#GreeterPosY=100 +# The headline in the greeter. +# The following character pairs are replaced: +# - %d -> current display +# - %h -> host name, possibly with domain name +# - %n -> node name, most probably the host name without domain name +# - %s -> the operating system +# - %r -> the operating system's version +# - %m -> the machine (hardware) type +# - %% -> a single % +# Default is "Welcome to %s at %n" +#GreetString=K Desktop Environment (%n) +# The font for the headline. Default is charter,20,bold +#GreetFont=charter,20,5,0,50,0 +# The normal font used in the greeter. Default is helvetica,10 +#StdFont=helvetica,10,5,0,50,0 +# The font used for the "Login Failed" message. Default is helvetica,10,bold +#FailFont=helvetica,10,5,0,75,0 +# Whether the fonts shown in the greeter should be antialiased. Default is false +AntiAliasing=true +# What to do with the Num Lock modifier for the time the greeter is running: +# "On" -> - turn on +# "Off" -> - turn off +# "Keep" -> - don't change the state (Default) +#NumLock=Off +# Language to use in the greeter. Default is en_US +#Language=de_DE +# Specify, which user names (along with pictures) should be shown in the +# greeter. +# "NotHidden" - all users except those listed in HiddenUsers (Default) +# "Selected" - only the users listed in SelectedUsers +# "None" - no user list will be shown at all +#ShowUsers=None +# For ShowUsers=Selected. Default is "" +#SelectedUsers=root,johndoe +# For ShowUsers=NotHidden. Default is "" +#HiddenUsers=root +# Special case of HiddenUsers: users with a UID less than this number +# (except root) will not be shown as well. Default is 0 +MinShowUID=1000 +# Complement to MinShowUID: users with a UID greater than this number will +# not be shown as well. Default is 65535 +MaxShowUID=65000 +# If false, the users are listed in the order they appear in /etc/passwd. +# If true, they are sorted alphabetically. Default is true +#SortUsers=false +# Specify, where the users' pictures should be taken from. +# "AdminOnly" - from <FaceDir>/$USER.face[.icon] (Default) +# "UserOnly" - from the user's $HOME/.face[.icon] +# "PreferAdmin" - prefer <FaceDir>, fallback on $HOME +# "PreferUser" - ... and the other way round +#FaceSource=PreferUser +# The directory containing the user images if FaceSource is not UserOnly. +# Default is _PREFIX_/share/apps/kdm/faces +#FaceDir=/usr/share/faces +# Specify, if/which user should be preselected for log in. +# Note, that enabling this feature can be considered a security hole, +# as it presents a valid login name to a potential attacker, so he "only" +# needs to guess the password. +# "None" - don't preselect any user (Default) +# "Previous" - the user which successfully logged in last time +# "Default" - the user specified in the DefaultUser field +#PreselectUser=Previous +# The user to preselect if PreselectUser=Default +#DefaultUser=ethel +# If this is true, the password input line is focused automatically if +# a user is preselected. Default is false +#FocusPasswd=true +# The password input fields cloak the typed in text. Specify, how to do it: +# "NoEcho" - nothing is shown at all, the cursor doesn't move +# "OneStar" - "*" is shown for every typed letter (Default) +# "ThreeStars" - "***" is shown for every typed letter +#EchoMode=NoEcho +# If true, krootimage will be automatically started by KDM. Otherwise, the +# Setup script should be used to setup the background. Default is true +#UseBackground=false +# The configuration file to be used by krootimage. +# Default is _PREFIX_/share/config/kdm/backgroundrc +#BackgroundCfg= +# Hold the X-server grabbed the whole time the greeter is visible. This +# may be more secure, but it will disable any background and other +# X-clients started from the Setup script. Default is false +#GrabServer=true +# How many seconds to wait for grab to succeed. Default is 3 +#GrabTimeout= +# Use this number as a random seed when forging saved session types, etc. of +# unknown users. This is used to avoid telling an attacker about existing users +# by reverse conclusion. This value should be random but constant across the +# login domain. Default is 0 +ForgingSeed=_RANDOM_ +# Specify greeter plugins that can be used to obtain authentication data. +# This can be a plugin's base name (expands to $kde_modulesdir/kgreet_$base) +# or a full pathname. Default is classic +#PluginsLogin=sign +# Same as PluginsLogin, but for the shutdown dialog. +#PluginsShutdown=modern + +# Core config for local displays +[X-:*-Core] +# How often to try to run the X-server. Running includes executing it and +# waiting for it to come up. Default is 1 +#ServerAttempts= +# How long to wait for a local X-server to come up. Default is 15 +#ServerTimeout= +# See above +AllowShutdown=All +# See above +AllowRootLogin=true +# See above +AllowNullPasswd=true +# Enable password-less logins on this display. USE WITH EXTREME CARE! +# Default is false +#NoPassEnable=true +# The users that don't need to provide a password to log in. NEVER list root! +# Default is "" +#NoPassUsers=fred,ethel + +# Greeter config for local displays +[X-:*-Greeter] +# Warn, if local X-authorization cannot be created. Default is true +# XXX this is a dummy currently +#AuthComplain=false +# The screen the greeter should be displayed on in multi-headed setups. +# The numbering starts with 0 and corresponds to the listing order in the +# active ServerLayout section of XF86Config. -1 means to use the upper-left +# screen, -2 means to use the upper-right screen. Default is 0 +#GreeterScreen=-1 +# Specify whether the greeter of local displays should start up in host chooser +# (remote) or login (local) mode and whether it is allowed to switch to the +# other mode. +# "LocalOnly" - only local login possible (Default) +# "RemoteOnly" - only choice of remote host possible +# "DefaultLocal" - start up in local mode, but allow switch to remote mode +# "DefaultRemote" - ... and the other way round +#LoginMode=DefaultLocal +# A list of hosts to be automatically added to the remote login menu. The +# special name "*" means broadcast. Default is "*" +#ChooserHosts=*,ugly,sky,dino,kiste.local,login.crap.com + +# Core config for 1st local display +[X-:0-Core] +# Enable automatic login on this display. USE WITH EXTREME CARE! +# Default is false +#AutoLoginEnable=true +# The user to log in automatically. NEVER specify root! Default is "" +#AutoLoginUser=fred +# The password for the user to log in automatically. This is NOT required +# unless the user is to be logged into a NIS or Kerberos domain. If you use +# it, you should "chmod 600 kdmrc" for obvious reasons. Default is "" +#AutoLoginPass=secret! + +# Greeter config for 1st local display +[X-:0-Greeter] +# See above +#PreselectUser=Default +# See above +#DefaultUser=johndoe + diff --git a/kde-base/kdebase/files/3.2.3-r1/startkde-3.2.3-r1-gentoo.diff b/kde-base/kdebase/files/3.2.3-r1/startkde-3.2.3-r1-gentoo.diff new file mode 100644 index 000000000000..2f1c520b2deb --- /dev/null +++ b/kde-base/kdebase/files/3.2.3-r1/startkde-3.2.3-r1-gentoo.diff @@ -0,0 +1,67 @@ +--- startkde 2003-03-12 18:20:54.000000000 +0100 ++++ startkde 2003-03-12 18:26:10.000000000 +0100 +@@ -1,12 +1,34 @@ +-#!/bin/sh ++#!/bin/sh --login + # +-# DEFAULT KDE STARTUP SCRIPT ( KDE-3.2 ) ++# GENTOO CUSTOMIZED KDE STARTUP SCRIPT ( KDE-3.2 ) + # + + # 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 + ++# Gentoo part: ++export PATH="_KDEDIR_/bin:${PATH}" ++export KDEDIR="_KDEDIR_" ++# Use env.d's KDEDIRS. They should only include locations like /usr though, not ++# actual KDE installations ++ ++# handle ~/.kde* dirs - separate ones for separate KDEs ++cd ~ ++[ -d .kde ] && /bin/mv .kde .kde.backup ++if [ ! -e .kde3.2 ]; then ++ if [ -e .kde3.1 ]; then ++ /bin/cp -r .kde3.1 .kde3.2 ++ else ++ /bin/mkdir .kde3.2 ++ fi ++fi ++/bin/ln -sf .kde3.2 .kde ++ ++#export KDEHOME="${HOME}/.kde3.2" ++ ++# Gentoo part ends ++ + # we have to unset this for Darwin since it will screw up KDE's dynamic-loading + unset DYLD_FORCE_FLAT_NAMESPACE + +@@ -112,12 +134,12 @@ + # especially necessary on slow machines, where starting KDE takes one or two + # minutes until anything appears on the screen. + # +-# Set the background to plain grey. ++# Set the background to cyan (Gentoo version change). + # 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. + +-test "$XDM_MANAGED" || bkg="-solid #C0C0C0" ++test "$XDM_MANAGED" || bkg="-solid #5477A0" + xsetroot -cursor_name left_ptr $bkg + + # The user's personal KDE directory is usually ~/.kde, but this setting +@@ -163,7 +186,11 @@ + fi + + # the splashscreen and progress indicator +-ksplash --nodcop ++if [ -n "$KSPLASH" ]; then ++ $KSPLASH ++else ++ ksplash --nodcop ++fi + + # We set LD_BIND_NOW to increase the efficiency of kdeinit. + # kdeinit unsets this variable before loading applications. diff --git a/kde-base/kdebase/files/digest-kdebase-3.2.3-r1 b/kde-base/kdebase/files/digest-kdebase-3.2.3-r1 new file mode 100644 index 000000000000..dbb0c552ab33 --- /dev/null +++ b/kde-base/kdebase/files/digest-kdebase-3.2.3-r1 @@ -0,0 +1 @@ +MD5 fd05a338d155610856b06988d8dff117 kdebase-3.2.3.tar.bz2 17330422 diff --git a/kde-base/kdebase/files/post-3.2.3-kdebase-htmlframes.patch b/kde-base/kdebase/files/post-3.2.3-kdebase-htmlframes.patch new file mode 100644 index 000000000000..87a3a7688f32 --- /dev/null +++ b/kde-base/kdebase/files/post-3.2.3-kdebase-htmlframes.patch @@ -0,0 +1,138 @@ +Index: konqueror/konq_mainwindow.cc +=================================================================== +RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v +retrieving revision 1.1274.2.24 +diff -u -p -r1.1274.2.24 konq_mainwindow.cc +--- konqueror/konq_mainwindow.cc 7 Jun 2004 23:10:55 -0000 1.1274.2.24 ++++ konqueror/konq_mainwindow.cc 3 Aug 2004 14:54:23 -0000 +@@ -862,6 +862,7 @@ void KonqMainWindow::slotOpenURLRequest( + { + kdDebug(1202) << "KonqMainWindow::slotOpenURLRequest frameName=" << args.frameName << endl; + ++ KParts::ReadOnlyPart *callingPart = static_cast<KParts::ReadOnlyPart *>( sender()->parent() ); + QString frameName = args.frameName; + + if ( !frameName.isEmpty() ) +@@ -882,11 +883,11 @@ void KonqMainWindow::slotOpenURLRequest( + frameName.lower() != _parent ) + { + KParts::BrowserHostExtension *hostExtension = 0; +- KonqView *view = childView( frameName, &hostExtension, 0 ); ++ KonqView *view = childView( callingPart, frameName, &hostExtension, 0 ); + if ( !view ) + { + KonqMainWindow *mainWindow = 0; +- view = findChildView( frameName, &mainWindow, &hostExtension, 0 ); ++ view = findChildView( callingPart, frameName, &mainWindow, &hostExtension, 0 ); + + if ( !view || !mainWindow ) + { +@@ -909,8 +910,7 @@ void KonqMainWindow::slotOpenURLRequest( + } + } + +- KParts::ReadOnlyPart *part = static_cast<KParts::ReadOnlyPart *>( sender()->parent() ); +- KonqView *view = childView( part ); ++ KonqView *view = childView( callingPart ); + openURL( view, url, args ); + } + +@@ -1045,7 +1045,7 @@ void KonqMainWindow::slotCreateNewWindow + if ( !args.frameName.isEmpty() && args.frameName.lower() != "_blank" ) + { + KParts::BrowserHostExtension *hostExtension = 0; +- if ( findChildView( args.frameName, &mainWindow, &hostExtension, &part ) ) ++ if ( findChildView( 0, args.frameName, &mainWindow, &hostExtension, &part ) ) + { + // Found a view. If url isn't empty, we should open it - but this never happens currently + // findChildView put the resulting part in 'part', so we can just return now +@@ -2097,9 +2097,9 @@ KonqView * KonqMainWindow::childView( KP + return 0L; + } + +-KonqView * KonqMainWindow::childView( const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) ++KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) + { +- //kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl; ++ kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl; + + MapViews::ConstIterator it = m_mapViews.begin(); + MapViews::ConstIterator end = m_mapViews.end(); +@@ -2107,11 +2107,11 @@ KonqView * KonqMainWindow::childView( co + { + KonqView* view = it.data(); + QString viewName = view->viewName(); +- //kdDebug() << " - viewName=" << viewName << " " +- // << "frame names:" << view->frameNames().join( "," ) << endl; ++ kdDebug() << " - viewName=" << viewName << " " ++ << "frame names:" << view->frameNames().join( "," ) << endl; + if ( !viewName.isEmpty() && viewName == name ) + { +- //kdDebug() << "found existing view by name: " << view << endl; ++ kdDebug() << "found existing view by name: " << view << endl; + if ( hostExtension ) + *hostExtension = 0; + if ( part ) +@@ -2120,8 +2120,13 @@ KonqView * KonqMainWindow::childView( co + } + + // First look for a hostextension containing this frame name +- // (KonqView looks for it recursively) +- KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name ); ++ KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() ); ++ if ( ext ) ++ { ++ ext = ext->findFrameParent(callingPart, name); ++ } ++ ++// KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name ); + + if ( ext ) + { +@@ -2131,7 +2136,7 @@ KonqView * KonqMainWindow::childView( co + { + if ( frameIt.current()->name() == name ) + { +- //kdDebug() << "found a frame of name " << name << " : " << frameIt.current() << endl; ++ kdDebug() << "found a frame of name " << name << " : " << frameIt.current() << endl; + if ( hostExtension ) + *hostExtension = ext; + if ( part ) +@@ -2146,7 +2151,7 @@ KonqView * KonqMainWindow::childView( co + } + + // static +-KonqView * KonqMainWindow::findChildView( const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) ++KonqView * KonqMainWindow::findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) + { + if ( !s_lstViews ) + return 0; +@@ -2154,7 +2159,7 @@ KonqView * KonqMainWindow::findChildView + QPtrListIterator<KonqMainWindow> it( *s_lstViews ); + for (; it.current(); ++it ) + { +- KonqView *res = it.current()->childView( name, hostExtension, part ); ++ KonqView *res = it.current()->childView( callingPart, name, hostExtension, part ); + if ( res ) + { + if ( mainWindow ) +Index: konqueror/konq_mainwindow.h +=================================================================== +RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.h,v +retrieving revision 1.423.2.4 +diff -u -p -r1.423.2.4 konq_mainwindow.h +--- konqueror/konq_mainwindow.h 7 Jun 2004 23:10:56 -0000 1.423.2.4 ++++ konqueror/konq_mainwindow.h 3 Aug 2004 14:54:23 -0000 +@@ -145,10 +145,10 @@ public: + void insertChildView( KonqView *childView ); + void removeChildView( KonqView *childView ); + KonqView *childView( KParts::ReadOnlyPart *view ); +- KonqView *childView( const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); ++ KonqView *childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); + + // dcop idl bug! it can't handle KonqMainWindow *&mainWindow +- static KonqView *findChildView( const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); ++ static KonqView *findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); + + // Total number of views + int viewCount() const { return m_mapViews.count(); } diff --git a/kde-base/kdebase/kdebase-3.2.3-r1.ebuild b/kde-base/kdebase/kdebase-3.2.3-r1.ebuild new file mode 100644 index 000000000000..af5994bad6fb --- /dev/null +++ b/kde-base/kdebase/kdebase-3.2.3-r1.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.2.3-r1.ebuild,v 1.1 2004/08/06 15:23:25 caleb Exp $ + +inherit kde-dist eutils + +DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..." + +KEYWORDS="x86 ~ppc ~sparc ~mips ~alpha hppa amd64 ~ia64" +IUSE="ldap pam motif encode cups ssl opengl samba java" + +DEPEND="media-sound/cdparanoia + ldap? ( net-nds/openldap ) + pam? ( sys-libs/pam ) + motif? ( x11-libs/openmotif ) + encode? ( media-sound/lame ) + cups? ( net-print/cups ) + ssl? ( dev-libs/openssl ) + opengl? ( virtual/opengl ) + samba? ( net-fs/samba ) + java? ( || ( virtual/jdk virtual/jre ) ) + >=media-libs/freetype-2" +RDEPEND="${DEPEND} + sys-apps/eject" + +src_unpack() { + kde_src_unpack + epatch ${FILESDIR}/post-3.2.3-kdebase-htmlframes.patch +} + +src_compile() { + myconf="$myconf --with-dpms --with-cdparanoia" + myconf="$myconf `use_with ldap` `use_with motif`" + myconf="$myconf `use_with encode lame` `use_with cups`" + myconf="$myconf `use_with opengl gl` `use_with ssl`" + + use pam \ + && myconf="$myconf --with-pam=yes" \ + || myconf="$myconf --with-pam=no --with-shadow" + + if use java ; then + if has_version virtual/jdk ; then + myconf="$myconf --with-java=$(java-config --jdk-home)" + else + myconf="$myconf --with-java=$(java-config --jre-home)" + fi + else + myconf="$myconf --without-java" + fi + + kde_src_compile myconf configure + kde_remove_flag kdm/kfrontend -fomit-frame-pointer + kde_src_compile make +} + +src_install() { + kde_src_install + cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup" install + + insinto /etc/pam.d + newins ${FILESDIR}/kde.pam kde + # kde-np is new requirement for 3.2 autologins - #33690 + newins ${FILESDIR}/kde-np.pam kde-np + + # startkde script + cd ${D}/${KDEDIR}/bin + epatch ${FILESDIR}/${PVR}/startkde-${PVR}-gentoo.diff + mv startkde startkde.orig + sed -e "s:_KDEDIR_:${KDEDIR}:" startkde.orig > startkde + rm startkde.orig + chmod a+x startkde + + # kcontrol modules + cd ${D}/${KDEDIR}/etc/xdg/menus + ln -s default_kde-settings.menu kde-settings.menu + ln -s default_kde-information.menu kde-information.menu + ln -s default_kde-screensavers.menu kde-screensavers.menu + + # x11 session script + cd ${T} + echo "#!/bin/sh +${KDEDIR}/bin/startkde" > kde-${PV} + chmod a+x kde-${PV} + exeinto /etc/X11/Sessions + doexe kde-${PV} + + cd ${D}/${KDEDIR}/share/config/kdm || die + dodir ${KDEDIR}/share/config/kdm/sessions + sed -e "s:_PREFIX_:${PREFIX}:g" \ + -e "s:_RANDOM_:${RANDOM}${RANDOM}:g" \ + ${FILESDIR}/${PVR}/kdmrc > kdmrc + sed -e "s:_PREFIX_:${PREFIX}:g" ${FILESDIR}/${PVR}/Xsetup > Xsetup + + cp ${FILESDIR}/${PVR}/backgroundrc . + + #backup splashscreen images, so they can be put back when unmerging + #mosfet or so. + if [ ! -d ${KDEDIR}/share/apps/ksplash.default ] + then + cd ${D}/${KDEDIR}/share/apps + cp -rf ksplash/ ksplash.default + fi + + # Show gnome icons when choosing new icon for desktop shortcut + dodir /usr/share/pixmaps + mv ${D}/${KDEDIR}/share/apps/kdesktop/pics/* ${D}/usr/share/pixmaps/ + rm -rf ${D}/${KDEDIR}/share/apps/kdesktop/pics/ + cd ${D}/${KDEDIR}/share/apps/kdesktop/ + ln -sf /usr/share/pixmaps/ pics + + rmdir ${D}/${KDEDIR}/share/templates/.source/emptydir + +} + +pkg_postinst() { + mkdir -p ${KDEDIR}/share/templates/.source/emptydir +} |