1 |
dilfridge 14/05/01 22:07:19 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: kdm-4.11.9-r1.ebuild |
5 |
Removed: kdm-4.11.9.ebuild |
6 |
Log: |
7 |
Fix crash for non-kde logins, bug 509158 |
8 |
|
9 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!) |
10 |
|
11 |
Revision Changes Path |
12 |
1.395 kde-base/kdm/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdm/ChangeLog?rev=1.395&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdm/ChangeLog?rev=1.395&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdm/ChangeLog?r1=1.394&r2=1.395 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v |
21 |
retrieving revision 1.394 |
22 |
retrieving revision 1.395 |
23 |
diff -u -r1.394 -r1.395 |
24 |
--- ChangeLog 29 Apr 2014 19:30:06 -0000 1.394 |
25 |
+++ ChangeLog 1 May 2014 22:07:19 -0000 1.395 |
26 |
@@ -1,6 +1,13 @@ |
27 |
# ChangeLog for kde-base/kdm |
28 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.394 2014/04/29 19:30:06 johu Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.395 2014/05/01 22:07:19 dilfridge Exp $ |
31 |
+ |
32 |
+*kdm-4.11.9-r1 (01 May 2014) |
33 |
+ |
34 |
+ 01 May 2014; Andreas K. Huettel <dilfridge@g.o> |
35 |
+ +files/kdm-4.11.9-desktopnamescrash.patch, +kdm-4.11.9-r1.ebuild, |
36 |
+ -kdm-4.11.9.ebuild: |
37 |
+ Fix crash for non-kde logins, bug 509158 |
38 |
|
39 |
29 Apr 2014; Johannes Huber <johu@g.o> -kdm-4.11.8.ebuild: |
40 |
Remove KDE Workspace 4.11.8 |
41 |
|
42 |
|
43 |
|
44 |
1.1 kde-base/kdm/kdm-4.11.9-r1.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdm/kdm-4.11.9-r1.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdm/kdm-4.11.9-r1.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: kdm-4.11.9-r1.ebuild |
50 |
=================================================================== |
51 |
# Copyright 1999-2014 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.11.9-r1.ebuild,v 1.1 2014/05/01 22:07:19 dilfridge Exp $ |
54 |
|
55 |
EAPI=5 |
56 |
|
57 |
KDE_HANDBOOK="optional" |
58 |
KMNAME="kde-workspace" |
59 |
inherit systemd kde4-meta flag-o-matic user |
60 |
|
61 |
DESCRIPTION="KDE login manager, similar to xdm and gdm" |
62 |
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
63 |
IUSE="debug +consolekit kerberos pam systemd" |
64 |
|
65 |
REQUIRED_USE="consolekit? ( !systemd ) systemd? ( !consolekit )" |
66 |
|
67 |
DEPEND=" |
68 |
$(add_kdebase_dep libkworkspace) |
69 |
media-libs/qimageblitz |
70 |
x11-libs/libX11 |
71 |
x11-libs/libXau |
72 |
x11-libs/libXdmcp |
73 |
x11-libs/libXtst |
74 |
consolekit? ( |
75 |
>=sys-apps/dbus-1.0.2 |
76 |
sys-auth/consolekit |
77 |
) |
78 |
kerberos? ( virtual/krb5 ) |
79 |
pam? ( |
80 |
$(add_kdebase_dep kcheckpass) |
81 |
virtual/pam |
82 |
) |
83 |
systemd? ( sys-apps/systemd ) |
84 |
" |
85 |
RDEPEND="${DEPEND} |
86 |
$(add_kdebase_dep kdepasswd) |
87 |
>=x11-apps/xinit-1.0.5-r2 |
88 |
x11-apps/xmessage |
89 |
" |
90 |
|
91 |
KMEXTRA=" |
92 |
libs/kdm/ |
93 |
" |
94 |
|
95 |
PATCHES=( |
96 |
"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch" |
97 |
"${FILESDIR}/${PN}-4.11.9-desktopnamescrash.patch" |
98 |
) |
99 |
|
100 |
pkg_setup() { |
101 |
kde4-meta_pkg_setup |
102 |
|
103 |
# Create kdm:kdm user |
104 |
KDM_HOME=/var/lib/kdm |
105 |
enewgroup kdm |
106 |
enewuser kdm -1 -1 "${KDM_HOME}" kdm |
107 |
} |
108 |
|
109 |
src_configure() { |
110 |
mycmakeargs=( |
111 |
$(cmake-utils_use kerberos KDE4_KRB5AUTH) |
112 |
$(cmake-utils_use_with pam) |
113 |
$(cmake-utils_use_with consolekit CkConnector) |
114 |
) |
115 |
|
116 |
kde4-meta_src_configure |
117 |
} |
118 |
|
119 |
src_install() { |
120 |
export GENKDMCONF_FLAGS="--no-old --no-backup" |
121 |
|
122 |
kde4-meta_src_install |
123 |
|
124 |
# an equivalent file is already installed by kde-base/startkde, bug 377151 |
125 |
rm "${ED}/usr/share/apps/kdm/sessions/kde-plasma.desktop" || die |
126 |
|
127 |
# Customize the kdmrc configuration: |
128 |
# - SessionDirs set to /usr/share/xsessions |
129 |
# - increase server timeout to 30s |
130 |
# - TerminateServer=true to workaround X server regen bug, bug 278473 |
131 |
# - DataDir set to /var/lib/kdm |
132 |
# - FaceDir set to /var/lib/kdm/faces |
133 |
sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions,${EPREFIX}/usr/share/xsessions|" \ |
134 |
-e "/#ServerTimeout=/s/^.*$/ServerTimeout=30/" \ |
135 |
-e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \ |
136 |
-e "s|^.*DataDir=.*$|#&\nDataDir=${EPREFIX}${KDM_HOME}|" \ |
137 |
-e "s|^.*FaceDir=.*$|#&\nFaceDir=${EPREFIX}${KDM_HOME}/faces|" \ |
138 |
-i "${ED}"/usr/share/config/kdm/kdmrc \ |
139 |
|| die "Failed to set ServerTimeout and SessionsDirs correctly in kdmrc." |
140 |
|
141 |
# Don't install empty dir |
142 |
rmdir "${ED}"/usr/share/config/kdm/sessions |
143 |
|
144 |
# Set up permissions to kdm work directory |
145 |
keepdir "${KDM_HOME}" |
146 |
fowners root:kdm "${KDM_HOME}" |
147 |
fperms 1770 "${KDM_HOME}" |
148 |
|
149 |
# install logrotate file |
150 |
insinto /etc/logrotate.d |
151 |
newins "${FILESDIR}"/kdm-logrotate kdm |
152 |
|
153 |
systemd_dounit "${FILESDIR}"/kdm.service |
154 |
} |
155 |
|
156 |
pkg_postinst() { |
157 |
kde4-meta_pkg_postinst |
158 |
|
159 |
local file src dest dir old_dirs=( |
160 |
/var/lib/kdm-live |
161 |
/var/lib/kdm-4.6 |
162 |
/var/lib/kdm-4.5 |
163 |
/var/lib/kdm-4.4 |
164 |
/usr/share/apps/kdm |
165 |
/usr/kde/4.4/share/apps/kdm |
166 |
/usr/kde/4.3/share/apps/kdm |
167 |
/usr/kde/4.2/share/apps/kdm |
168 |
) |
169 |
|
170 |
mkdir -p "${EROOT}${KDM_HOME}/faces" |
171 |
# Set the default kdm face icon if it's not already set by the system admin |
172 |
# because this is user-overrideable in that way, it's not in src_install |
173 |
for file in faces/.default.face.icon:default1.png faces/root.face.icon:root1.png kdmsts: ; do |
174 |
src=${file#*:} |
175 |
dest=${file%:*} |
176 |
if [[ ! -e ${EROOT}${KDM_HOME}/$dest ]]; then |
177 |
for dir in "${old_dirs[@]}"; do |
178 |
if [[ -e ${EROOT}${dir}/${dest} ]]; then |
179 |
cp "${EROOT}${dir}/${dest}" "${EROOT}${KDM_HOME}/${dest}" |
180 |
break 2 |
181 |
fi |
182 |
done |
183 |
if [[ -n ${src} ]]; then |
184 |
cp "${EROOT}/usr/share/apps/kdm/pics/users/${src}" \ |
185 |
"${EROOT}${KDM_HOME}/${dest}" |
186 |
fi |
187 |
fi |
188 |
done |
189 |
for dir in "${old_dirs[@]}"; do |
190 |
if [[ ${dir} != /usr/* && -d ${EROOT}${dir} ]]; then |
191 |
echo |
192 |
elog "The directory ${EROOT%/}${dir} still exists from an older installation of KDE." |
193 |
elog "You may wish to copy relevant settings into ${EROOT%/}${KDM_HOME}." |
194 |
echo |
195 |
elog "After doing so, you may delete the directory." |
196 |
echo |
197 |
fi |
198 |
done |
199 |
|
200 |
# Make sure permissions are correct -- old installations may have |
201 |
# gotten this wrong |
202 |
use prefix || chown root:kdm "${EROOT}${KDM_HOME}" |
203 |
chmod 1770 "${EROOT}${KDM_HOME}" |
204 |
|
205 |
if use consolekit; then |
206 |
echo |
207 |
elog "You have compiled 'kdm' with consolekit support. If you want to use kdm," |
208 |
elog "make sure consolekit daemon is running and started at login time" |
209 |
elog |
210 |
elog "rc-update add consolekit default && /etc/init.d/consolekit start" |
211 |
echo |
212 |
fi |
213 |
} |