summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Chatzimichos <tampakrap@gentoo.org>2010-04-09 03:39:20 +0000
committerTheo Chatzimichos <tampakrap@gentoo.org>2010-04-09 03:39:20 +0000
commitc87fd96c94f8adb69c1f2a8f24e46f6abd8c6050 (patch)
tree31631205578f0c768d4c006260a6012d7eb71938 /kde-base
parentSecurity Bump (diff)
downloadhistorical-c87fd96c94f8adb69c1f2a8f24e46f6abd8c6050.tar.gz
historical-c87fd96c94f8adb69c1f2a8f24e46f6abd8c6050.tar.bz2
historical-c87fd96c94f8adb69c1f2a8f24e46f6abd8c6050.zip
Set ServerTimeout=30 in kdmrc, bug 257445
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdm/ChangeLog5
-rw-r--r--kde-base/kdm/Manifest4
-rw-r--r--kde-base/kdm/kdm-4.4.2.ebuild8
3 files changed, 11 insertions, 6 deletions
diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index eb751f80e0d5..173d47f1a5cb 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for kde-base/kdm
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.207 2010/03/31 22:34:55 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.208 2010/04/09 03:39:20 tampakrap Exp $
+
+ 09 Apr 2010; Theo Chatzimichos <tampakrap@gentoo.org> kdm-4.4.2.ebuild:
+ Set ServerTimeout=30 in kdmrc, bug 257445
31 Mar 2010; Dror Levin <spatz@gentoo.org> -kdm-4.3.4.ebuild,
-kdm-4.4.0.ebuild:
diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index 17e4beb8e885..a06d1845569e 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -8,6 +8,6 @@ DIST kdebase-workspace-4.4.2.tar.bz2 77039701 RMD160 0558ff2102cb380127667a94b69
EBUILD kdm-4.3.3.ebuild 2608 RMD160 5292a738f45ac8272e816101b76fe753591e5261 SHA1 08b70fbdfd6c0eb709a7b6b96e7123055c4c9193 SHA256 ac59b18170f8c9d6f8128669bd0ef50b84aea76676c800a89439af7cf4cbeb41
EBUILD kdm-4.3.5.ebuild 2626 RMD160 b57edfcf5dfcf6ac75130f5f815e5cf2f2c4bc4f SHA1 2c00ef71e83a9977deaf77fea2f25558f3d2b906 SHA256 5ee39257d2355d558ca5cbb24548acdfd37f7c7025a5e3d3f564eb497adec0c8
EBUILD kdm-4.4.1.ebuild 2582 RMD160 446a741e4fec62a84c1721f13f57b65e78f830f9 SHA1 c7d6551dfa1c57b75556199af583d056c10a34e8 SHA256 646b5587385f401f4ae96223a0b87e37eb255c90e2fe98fa9b5e68373ee362a6
-EBUILD kdm-4.4.2.ebuild 2578 RMD160 8688d844b3e016db4b8e3f1dea885abeb8ae904e SHA1 84a00176911837407153b076cd2e95724f961ac0 SHA256 eba80a7a8d78467b8d83d41eeebe23dabe497bc80c5e055e4161d4e6e129f68c
-MISC ChangeLog 27284 RMD160 3dd0868d812762b2405c7bc11b7cd68d6ac06339 SHA1 6e2c48ebde1f8f29c71b0c0403687bc6288eb0e8 SHA256 ff97166df9e3afffaef405952962e69d007f61828e281d57f22ac562f7b7266f
+EBUILD kdm-4.4.2.ebuild 2657 RMD160 72fdc543baf6714e847324ee7c964ef4f858b617 SHA1 d15e1ad0398f6cdd1b7e248fc2982d6cc7e6bcd6 SHA256 f97f84ab8a69ecc5b6f07fd275b4c0ddd5137d7d7239dc3182a2caeadc0bea6c
+MISC ChangeLog 27407 RMD160 faeff141c6837777ceb8455bedde626364ff0e4a SHA1 7f7fd3e66e985c91c42d5fdbe001ae4db1b1a2af SHA256 a9b506a3833ba6e063561537ffda85dcfe8774aaaacb204ea6b455ee091f5ec4
MISC metadata.xml 253 RMD160 dbe3d0cc1778dad287767c5dee6b46b42ccf20ec SHA1 b4723a2baaec997efee2cdc543248a2aad8f1a7e SHA256 955ffc185b3b01315be94542ea43ae1180d5f61ea539a317c45c5746b463eeba
diff --git a/kde-base/kdm/kdm-4.4.2.ebuild b/kde-base/kdm/kdm-4.4.2.ebuild
index c6a011a7ce30..956c49db383b 100644
--- a/kde-base/kdm/kdm-4.4.2.ebuild
+++ b/kde-base/kdm/kdm-4.4.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.4.2.ebuild,v 1.1 2010/03/30 20:56:29 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.4.2.ebuild,v 1.2 2010/04/09 03:39:20 tampakrap Exp $
EAPI="3"
@@ -63,9 +63,11 @@ src_install() {
kde4-meta_src_install
# Customize the kdmrc configuration
- sed -i -e "s:^.*SessionsDirs=.*$:#&\nSessionsDirs=${EPREFIX}/usr/share/xsessions:" \
+ sed -i \
+ -e "s:^.*SessionsDirs=.*$:#&\nSessionsDirs=${EPREFIX}/usr/share/xsessions:" \
+ -e "s:#ServerTimeout=15:ServerTimeout=30:" \
"${ED}"/${PREFIX}/share/config/kdm/kdmrc \
- || die "Failed to set SessionsDirs correctly."
+ || die "Failed to set ServerTimeout and SessionsDir correctly in kdmrc."
# Don't install empty dir
rmdir "${ED}${KDEDIR}"/share/config/kdm/sessions