1 |
philantrop 07/09/12 23:21:22 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: kdebase-3.5.7-r4.ebuild |
5 |
Log: |
6 |
Added two security patches for konqueror. Fixes bug 185603. Added an upstream patch to correct a potential kdm login issue. |
7 |
(Portage version: 2.1.3.9) |
8 |
|
9 |
Revision Changes Path |
10 |
1.387 kde-base/kdebase/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase/ChangeLog?rev=1.387&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase/ChangeLog?rev=1.387&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase/ChangeLog?r1=1.386&r2=1.387 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v |
19 |
retrieving revision 1.386 |
20 |
retrieving revision 1.387 |
21 |
diff -u -r1.386 -r1.387 |
22 |
--- ChangeLog 15 Aug 2007 04:49:46 -0000 1.386 |
23 |
+++ ChangeLog 12 Sep 2007 23:21:21 -0000 1.387 |
24 |
@@ -1,6 +1,14 @@ |
25 |
# ChangeLog for kde-base/kdebase |
26 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.386 2007/08/15 04:49:46 jer Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.387 2007/09/12 23:21:21 philantrop Exp $ |
29 |
+ |
30 |
+*kdebase-3.5.7-r4 (12 Sep 2007) |
31 |
+ |
32 |
+ 12 Sep 2007; Wulf C. Krueger <philantrop@g.o> |
33 |
+ +files/konqueror-3.5.7-185603-spoofing.diff, +files/kdm-3.5.7-login.diff, |
34 |
+ +kdebase-3.5.7-r4.ebuild: |
35 |
+ Added two security patches for konqueror. Fixes bug 185603. Added an |
36 |
+ upstream patch to correct a potential login issue. |
37 |
|
38 |
15 Aug 2007; Jeroen Roovers <jer@g.o> kdebase-3.5.7-r3.ebuild: |
39 |
Stable for HPPA (bug #176297). |
40 |
|
41 |
|
42 |
|
43 |
1.1 kde-base/kdebase/kdebase-3.5.7-r4.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase/kdebase-3.5.7-r4.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase/kdebase-3.5.7-r4.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: kdebase-3.5.7-r4.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2007 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.7-r4.ebuild,v 1.1 2007/09/12 23:21:21 philantrop Exp $ |
53 |
|
54 |
inherit kde-dist eutils flag-o-matic |
55 |
|
56 |
SRC_URI="${SRC_URI} |
57 |
mirror://gentoo/kdebase-3.5-patchset-06.tar.bz2" |
58 |
|
59 |
DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..." |
60 |
|
61 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
62 |
IUSE="branding cups java ldap ieee1394 hal lm_sensors logitech-mouse openexr opengl |
63 |
pam samba xcomposite xscreensaver xinerama kdehiddenvisibility" |
64 |
|
65 |
# hal: enables hal backend for 'media:' ioslave |
66 |
|
67 |
DEPEND=">=media-libs/freetype-2 |
68 |
media-libs/fontconfig |
69 |
dev-libs/openssl |
70 |
pam? ( kde-base/kdebase-pam ) |
71 |
>=dev-libs/cyrus-sasl-2 |
72 |
ldap? ( >=net-nds/openldap-2 ) |
73 |
cups? ( net-print/cups ) |
74 |
opengl? ( virtual/opengl ) |
75 |
openexr? ( >=media-libs/openexr-1.2.2-r2 ) |
76 |
samba? ( >=net-fs/samba-3.0.4 ) |
77 |
lm_sensors? ( sys-apps/lm_sensors ) |
78 |
logitech-mouse? ( >=dev-libs/libusb-0.1.10a ) |
79 |
ieee1394? ( sys-libs/libraw1394 ) |
80 |
hal? ( dev-libs/dbus-qt3-old =sys-apps/hal-0.5* ) |
81 |
xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage ) |
82 |
x11-libs/libX11 |
83 |
x11-libs/libXau |
84 |
x11-libs/libXfixes |
85 |
x11-libs/libXrender |
86 |
x11-libs/libXtst |
87 |
x11-libs/libXext |
88 |
xscreensaver? ( x11-libs/libXScrnSaver ) |
89 |
xinerama? ( x11-libs/libXinerama )" |
90 |
|
91 |
RDEPEND="${DEPEND} |
92 |
sys-apps/usbutils |
93 |
sys-devel/gdb |
94 |
java? ( >=virtual/jre-1.4 ) |
95 |
kernel_linux? ( || ( >=sys-apps/eject-2.1.5 sys-block/unieject ) ) |
96 |
virtual/ssh |
97 |
www-misc/htdig |
98 |
x11-apps/mkfontdir |
99 |
x11-apps/setxkbmap |
100 |
x11-apps/xinit |
101 |
|| ( x11-misc/xkeyboard-config x11-misc/xkbdata ) |
102 |
x11-apps/xmessage |
103 |
x11-apps/xprop |
104 |
x11-apps/xrandr |
105 |
x11-apps/xsetroot |
106 |
x11-apps/xset" |
107 |
|
108 |
DEPEND="${DEPEND} |
109 |
xcomposite? ( x11-proto/compositeproto x11-proto/damageproto ) |
110 |
xscreensaver? ( x11-proto/scrnsaverproto ) |
111 |
xinerama? ( x11-proto/xineramaproto ) |
112 |
x11-apps/bdftopcf |
113 |
x11-apps/xhost" |
114 |
|
115 |
need-kde 3.5.7 |
116 |
|
117 |
PATCHES="${FILESDIR}/konqueror-3.5.7-185603-spoofing.diff |
118 |
${FILESDIR}/kdm-3.5.7-login.diff" |
119 |
|
120 |
pkg_setup() { |
121 |
kde_pkg_setup |
122 |
if use hal && has_version '<sys-apps/dbus-0.90' && ! built_with_use sys-apps/dbus qt3; then |
123 |
eerror "To enable HAL support in this package is required to have" |
124 |
eerror "sys-apps/dbus compiled with Qt 3 support." |
125 |
eerror "Please reemerge sys-apps/dbus with USE=\"qt3\"." |
126 |
die "Please reemerge sys-apps/dbus with USE=\"qt3\"." |
127 |
fi |
128 |
} |
129 |
|
130 |
src_unpack() { |
131 |
kde_src_unpack |
132 |
|
133 |
# Avoid using imake (kde bug 114466). |
134 |
#epatch "${WORKDIR}/patches/kdebase-3.5.0_beta2-noimake.patch" |
135 |
# ...included in patch set |
136 |
rm -f "${S}/configure" |
137 |
|
138 |
# FIXME - disable broken tests |
139 |
sed -i -e "s:TESTS =.*:TESTS =:" ${S}/kioslave/smtp/Makefile.am || die "sed failed" |
140 |
sed -i -e "s:TESTS =.*:TESTS =:" ${S}/kioslave/trash/Makefile.am || die "sed failed" |
141 |
sed -i -e "s:SUBDIRS = viewer test:SUBDIRS = viewer:" ${S}/nsplugins/Makefile.am || die "sed failed" |
142 |
|
143 |
if ! [[ $(xhost >> /dev/null 2>/dev/null) ]] ; then |
144 |
einfo "User ${USER} has no X access, disabling some tests." |
145 |
for ioslave in media remote home system ; do |
146 |
sed -e "s:check\: test${ioslave}::" -e "s:./test${ioslave}::" \ |
147 |
-i kioslave/${ioslave}/Makefile.am || die "sed failed" |
148 |
done |
149 |
fi |
150 |
} |
151 |
|
152 |
src_compile() { |
153 |
local myconf="--with-dpms --enable-dnssd --with-sssl |
154 |
--with-usbids=/usr/share/misc/usb.ids |
155 |
$(use_with ieee1394 libraw1394) |
156 |
$(use_with hal) |
157 |
$(use_with ldap) |
158 |
$(use_with lm_sensors sensors) |
159 |
$(use_with logitech-mouse libusb) |
160 |
$(use_with openexr) |
161 |
$(use_with opengl gl) |
162 |
$(use_with pam) |
163 |
$(use_with samba) |
164 |
$(use_with xcomposite composite) |
165 |
$(use_with xinerama) |
166 |
$(use_with xscreensaver)" |
167 |
|
168 |
if ! use pam && use elibc_glibc; then |
169 |
myconf="${myconf} --with-shadow" |
170 |
fi |
171 |
|
172 |
# the java test is problematic (see kde bug 100729) and |
173 |
# useless. All that's needed for java applets to work is |
174 |
# to have the 'java' executable in PATH. |
175 |
myconf="${myconf} --without-java" |
176 |
|
177 |
export BINDNOW_FLAGS="$(bindnow-flags)" |
178 |
|
179 |
kde_src_compile |
180 |
} |
181 |
|
182 |
src_install() { |
183 |
kde_src_install |
184 |
cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install |
185 |
|
186 |
# startup and shutdown scripts |
187 |
insinto ${KDEDIR}/env |
188 |
doins "${WORKDIR}/patches/agent-startup.sh" |
189 |
|
190 |
exeinto ${KDEDIR}/shutdown |
191 |
doexe "${WORKDIR}/patches/agent-shutdown.sh" |
192 |
|
193 |
# freedesktop environment variables |
194 |
cat <<EOF > "${T}/xdg.sh" |
195 |
export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg" |
196 |
EOF |
197 |
insinto "${KDEDIR}/env" |
198 |
doins "${T}/xdg.sh" |
199 |
|
200 |
# x11 session script |
201 |
cat <<EOF > "${T}/kde-${SLOT}" |
202 |
#!/bin/sh |
203 |
exec ${KDEDIR}/bin/startkde |
204 |
EOF |
205 |
exeinto /etc/X11/Sessions |
206 |
doexe "${T}/kde-${SLOT}" |
207 |
|
208 |
# freedesktop compliant session script |
209 |
sed -e "s:@KDE_BINDIR@:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \ |
210 |
"${S}/kdm/kfrontend/sessions/kde.desktop.in" > "${T}/kde-${SLOT}.desktop" |
211 |
insinto /usr/share/xsessions |
212 |
doins "${T}/kde-${SLOT}.desktop" |
213 |
|
214 |
# Customize the kdmrc configuration |
215 |
sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \ |
216 |
"${D}/${KDEDIR}/share/config/kdm/kdmrc" || die |
217 |
|
218 |
rmdir "${D}/${KDEDIR}/share/templates/.source/emptydir" |
219 |
|
220 |
if use branding ; then |
221 |
dodir ${PREFIX}/share/services/searchproviders |
222 |
insinto ${PREFIX}/share/services/searchproviders |
223 |
doins ${WORKDIR}/patches/*.desktop |
224 |
fi |
225 |
} |
226 |
|
227 |
pkg_preinst() { |
228 |
kde_pkg_preinst |
229 |
|
230 |
# We need to symlink here, as kfmclient freaks out completely, |
231 |
# if it does not find konqueror.desktop in the legacy path. |
232 |
dodir ${PREFIX}/share/applications/kde |
233 |
dosym ../../applnk/konqueror.desktop ${PREFIX}/share/applications/kde/konqueror.desktop |
234 |
} |
235 |
|
236 |
pkg_postinst() { |
237 |
kde_pkg_postinst |
238 |
|
239 |
# set the default kdm face icon if it's not already set by the system admin |
240 |
if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]; then |
241 |
mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces" |
242 |
cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \ |
243 |
"${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" |
244 |
fi |
245 |
if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]; then |
246 |
mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces" |
247 |
cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \ |
248 |
"${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" |
249 |
fi |
250 |
|
251 |
mkdir -p "${ROOT}${KDEDIR}/share/templates/.source/emptydir" |
252 |
|
253 |
echo |
254 |
elog "To enable gpg-agent and/or ssh-agent in KDE sessions," |
255 |
elog "edit ${KDEDIR}/env/agent-startup.sh and" |
256 |
elog "${KDEDIR}/shutdown/agent-shutdown.sh" |
257 |
echo |
258 |
if use branding ; then |
259 |
elog "We've added three Gentoo-related web shortcuts to Konqueror:" |
260 |
elog "- gb Gentoo Bugzilla searching" |
261 |
elog "- gf Gentoo Forums searching" |
262 |
elog "- gp Gentoo Package searching" |
263 |
echo |
264 |
elog "You'll have to activate them in 'Configure Konqueror...'." |
265 |
echo |
266 |
elog "If you can't open new konqueror windows and get something like" |
267 |
elog "'WARNING: Outdated database found' when starting konqueror in a console, run" |
268 |
elog "kbuildsycoca as the user you're running KDE under." |
269 |
elog "This is NOT a bug." |
270 |
echo |
271 |
fi |
272 |
} |
273 |
|
274 |
|
275 |
|
276 |
-- |
277 |
gentoo-commits@g.o mailing list |