SOURCES: kdelibs-branch.diff - update (sec fix)
arekm
arekm at pld-linux.org
Sun Apr 27 22:00:39 CEST 2008
Author: arekm Date: Sun Apr 27 20:00:39 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- update (sec fix)
---- Files affected:
SOURCES:
kdelibs-branch.diff (1.77 -> 1.78)
---- Diffs:
================================================================
Index: SOURCES/kdelibs-branch.diff
diff -u SOURCES/kdelibs-branch.diff:1.77 SOURCES/kdelibs-branch.diff:1.78
--- SOURCES/kdelibs-branch.diff:1.77 Sat Apr 5 00:26:43 2008
+++ SOURCES/kdelibs-branch.diff Sun Apr 27 22:00:33 2008
@@ -1,7 +1,7 @@
Index: kate/part/katesupercursor.cpp
===================================================================
---- kate/part/katesupercursor.cpp (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ kate/part/katesupercursor.cpp (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- kate/part/katesupercursor.cpp (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ kate/part/katesupercursor.cpp (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -186,7 +186,7 @@
{
if (newLine)
@@ -11,10 +11,36 @@
{
if(m_line == int(line))
m_col -= col;
+Index: kate/data/debiancontrol.xml
+===================================================================
+--- kate/data/debiancontrol.xml (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ kate/data/debiancontrol.xml (.../branches/KDE/3.5/kdelibs) (wersja 801801)
+@@ -3,7 +3,7 @@
+ <language name="Debian Control" version="0.82" kateversion="2.4" section="Other" extensions="" mimetype="">
+ <highlighting>
+ <contexts>
+- <context attribute="Normal Text" lineEndContext="#stay">
++ <context attribute="Normal Text" lineEndContext="#stay" name="INIT">
+ <StringDetect attribute="Keyword" context="DependencyField" String="Depends:"/>
+ <StringDetect attribute="Keyword" context="DependencyField" String="Recommends:"/>
+ <StringDetect attribute="Keyword" context="DependencyField" String="Suggests:"/>
+Index: kate/data/debianchangelog.xml
+===================================================================
+--- kate/data/debianchangelog.xml (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ kate/data/debianchangelog.xml (.../branches/KDE/3.5/kdelibs) (wersja 801801)
+@@ -23,7 +23,7 @@
+ </list>
+
+ <contexts>
+- <context attribute="Normal Text" lineEndContext="#stay">
++ <context attribute="Normal Text" lineEndContext="#stay" name="INIT">
+ <RegExpr attribute="Keyword" context="Head" String="[^ ]*" column="0"/>
+ <RegExpr attribute="Email" context="#stay" String="<.*@.*>"/>
+ <RegExpr attribute="Keyword" context="#stay" String=" \-\-" column="0"/>
Index: kate/data/haskell.xml
===================================================================
---- kate/data/haskell.xml (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ kate/data/haskell.xml (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- kate/data/haskell.xml (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ kate/data/haskell.xml (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
@@ -34,8 +60,8 @@
<item> infixr </item>
Index: mimetypes/audio/x-oggflac.desktop
===================================================================
---- mimetypes/audio/x-oggflac.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/audio/x-oggflac.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/audio/x-oggflac.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/audio/x-oggflac.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -8,7 +8,7 @@
Comment[af]=Ogg FLAC Klank
Comment[ar]=ملف Ogg FLAC صوتي
@@ -47,8 +73,8 @@
Comment[bs]=Ogg FLAC audio
Index: mimetypes/audio/vnd.rn-realaudio.desktop
===================================================================
---- mimetypes/audio/vnd.rn-realaudio.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/audio/vnd.rn-realaudio.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/audio/vnd.rn-realaudio.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/audio/vnd.rn-realaudio.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -10,7 +10,7 @@
Comment[ar]=ملف Real Audio
Comment[az]=RealAudio Faylı
@@ -60,8 +86,8 @@
Comment[bs]=RealAudio datoteka
Index: mimetypes/audio/x-vorbis.desktop
===================================================================
---- mimetypes/audio/x-vorbis.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/audio/x-vorbis.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/audio/x-vorbis.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/audio/x-vorbis.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -8,7 +8,7 @@
Comment[af]=Ogg Vorbis Klank
Comment[ar]=ملف Ogg Vorbis صوتي
@@ -73,8 +99,8 @@
Comment[bs]=Ogg Vorbis audio
Index: mimetypes/audio/x-flac.desktop
===================================================================
---- mimetypes/audio/x-flac.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/audio/x-flac.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/audio/x-flac.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/audio/x-flac.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -5,7 +5,7 @@
Comment[af]=FLAC Klank
Comment[ar]=ملف FLAC صوتي
@@ -86,8 +112,8 @@
Comment[bs]=FLAC audio
Index: mimetypes/audio/x-aiff.desktop
===================================================================
---- mimetypes/audio/x-aiff.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/audio/x-aiff.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/audio/x-aiff.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/audio/x-aiff.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -5,7 +5,7 @@
Comment[af]=Aiff/Amiga Klank
Comment[ar]=صوت AIFF/Amiga
@@ -99,8 +125,8 @@
Comment[bs]=AIFF/Amiga audio
Index: mimetypes/audio/mpegurl.desktop
===================================================================
---- mimetypes/audio/mpegurl.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/audio/mpegurl.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/audio/mpegurl.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/audio/mpegurl.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -10,7 +10,7 @@
Comment[ar]=صوت انسيابي من MPEG الطبقة 3
Comment[az]=Axıcı MPEG Layer 3 Audio
@@ -112,8 +138,8 @@
Comment[bs]=Streaming MPEG Layer 3 audio
Index: mimetypes/audio/x-musepack.desktop
===================================================================
---- mimetypes/audio/x-musepack.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/audio/x-musepack.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/audio/x-musepack.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/audio/x-musepack.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -7,7 +7,7 @@
Comment=Musepack Audio
Comment[af]=Musepack Klank
@@ -125,8 +151,8 @@
Comment[bs]=Musepack audio
Index: mimetypes/audio/x-mpegurl.desktop
===================================================================
---- mimetypes/audio/x-mpegurl.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/audio/x-mpegurl.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/audio/x-mpegurl.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/audio/x-mpegurl.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -8,7 +8,7 @@
Comment[ar]=صوت انسيابي من MPEG الطبقة 3
Comment[az]=Axıcı MPEG Layer 3 Audio
@@ -138,8 +164,8 @@
Comment[bs]=Streaming MPEG Layer 3 audio
Index: mimetypes/audio/basic.desktop
===================================================================
---- mimetypes/audio/basic.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/audio/basic.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/audio/basic.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/audio/basic.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -5,7 +5,7 @@
Comment[af]=Ulaw (Sun) Audio
Comment[ar]=صوت ULAW (صن)
@@ -149,10 +175,21 @@
Comment[bn]=ULAW (সান) অডিও
Comment[br]=Klevet ULAW (Sun)
Comment[bs]=ULAW (Sun) audio
+Index: mimetypes/audio/x-pn-realaudio-plugin.desktop
+===================================================================
+--- mimetypes/audio/x-pn-realaudio-plugin.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/audio/x-pn-realaudio-plugin.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
+@@ -48,5 +48,6 @@
+ Comment[th]=แฟ้มปลั๊กอิน RealAudio
+ Comment[tr]=RealAudio Eklenti Dosyası
+ Comment[uk]=Файл втулку RealAudio
++Comment[uz]=RealAudio плагин файли
+ Comment[zh_CN]=RealAudio 插件文件
+ Comment[zh_TW]=RealAudio 外掛程式檔案
Index: mimetypes/audio/prs.sid.desktop
===================================================================
---- mimetypes/audio/prs.sid.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/audio/prs.sid.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/audio/prs.sid.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/audio/prs.sid.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -7,7 +7,7 @@
Comment=C64 SID Music
Comment[af]=C64 SID Musiek
@@ -164,8 +201,8 @@
Comment[bs]=C64 SID muzika
Index: mimetypes/audio/x-mod.desktop
===================================================================
---- mimetypes/audio/x-mod.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/audio/x-mod.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/audio/x-mod.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/audio/x-mod.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -7,7 +7,7 @@
Comment=Amiga Soundtracker Audio
Comment[ar]=صوت Amiga Soundtracker
@@ -177,8 +214,8 @@
Comment[bs]=Amiga Soundtracker audio
Index: mimetypes/audio/aac.desktop
===================================================================
---- mimetypes/audio/aac.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/audio/aac.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/audio/aac.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/audio/aac.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -9,7 +9,7 @@
Comment[ar]=ملف AAC صوتي
Comment[az]=AAC Səsi
@@ -190,8 +227,8 @@
Comment[bs]=AAC zvuk
Index: mimetypes/audio/x-pn-realaudio.desktop
===================================================================
---- mimetypes/audio/x-pn-realaudio.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/audio/x-pn-realaudio.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/audio/x-pn-realaudio.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/audio/x-pn-realaudio.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -8,7 +8,7 @@
Comment[ar]=ملف Real Audio
Comment[az]=RealAudio Faylı
@@ -203,8 +240,8 @@
Comment[bs]=RealAudio datoteka
Index: mimetypes/audio/x-matroska.desktop
===================================================================
---- mimetypes/audio/x-matroska.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/audio/x-matroska.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/audio/x-matroska.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/audio/x-matroska.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -8,7 +8,7 @@
Comment[af]=Matroska Klank
Comment[ar]=ملف ماتروسكا صوتي
@@ -216,8 +253,8 @@
Comment[bs]=Matroska audio
Index: mimetypes/audio/x-midi.desktop
===================================================================
---- mimetypes/audio/x-midi.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/audio/x-midi.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/audio/x-midi.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/audio/x-midi.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -8,7 +8,7 @@
Comment[af]=MIDI Klank
Comment[ar]=صوت MIDI
@@ -229,8 +266,8 @@
Comment[bs]=MIDI audio
Index: mimetypes/audio/mpeg.desktop
===================================================================
---- mimetypes/audio/mpeg.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/audio/mpeg.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/audio/mpeg.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/audio/mpeg.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -9,7 +9,7 @@
Comment=MPEG Audio
Comment[af]=MPEG Klank
@@ -242,8 +279,8 @@
Comment[bs]=MPEG audio
Index: mimetypes/audio/x-adpcm.desktop
===================================================================
---- mimetypes/audio/x-adpcm.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/audio/x-adpcm.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/audio/x-adpcm.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/audio/x-adpcm.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -5,7 +5,7 @@
Comment[af]=PCM Klank
Comment[ar]=صوت PCM
@@ -255,8 +292,8 @@
Comment[bs]=PCM audio
Index: mimetypes/audio/x-speex.desktop
===================================================================
---- mimetypes/audio/x-speex.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/audio/x-speex.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/audio/x-speex.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/audio/x-speex.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -8,7 +8,7 @@
Comment[af]=Speex Klank
Comment[ar]=ملف Speex صوتي
@@ -268,8 +305,8 @@
Comment[bs]=Speex audio
Index: mimetypes/audio/mp4.desktop
===================================================================
---- mimetypes/audio/mp4.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/audio/mp4.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/audio/mp4.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/audio/mp4.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -8,7 +8,7 @@
Comment[af]=MPEG-4 Klank
Comment[ar]=صوت MPEG-4
@@ -281,8 +318,8 @@
Comment[bs]=MPEG-4 audio
Index: mimetypes/audio/x-wav.desktop
===================================================================
---- mimetypes/audio/x-wav.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/audio/x-wav.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/audio/x-wav.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/audio/x-wav.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -8,7 +8,7 @@
Comment[af]=Wav Audio
Comment[ar]=صوت WAV
@@ -294,8 +331,8 @@
Comment[bs]=WAV audio
Index: mimetypes/audio/x-mp2.desktop
===================================================================
---- mimetypes/audio/x-mp2.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/audio/x-mp2.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/audio/x-mp2.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/audio/x-mp2.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -8,7 +8,7 @@
Comment=MPEG Layer 2 Audio
Comment[af]=MPEG Vlak 2 Klank
@@ -307,8 +344,8 @@
Comment[bs]=MPEG Layer 2 audio
Index: mimetypes/audio/vorbis.desktop
===================================================================
---- mimetypes/audio/vorbis.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/audio/vorbis.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/audio/vorbis.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/audio/vorbis.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -8,7 +8,7 @@
Comment[af]=Ogg Vorbis Klank
Comment[ar]=ملف Ogg Vorbis صوتي
@@ -320,8 +357,8 @@
Comment[bs]=Ogg Vorbis audio
Index: mimetypes/audio/x-mp3.desktop
===================================================================
---- mimetypes/audio/x-mp3.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/audio/x-mp3.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/audio/x-mp3.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/audio/x-mp3.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -9,7 +9,7 @@
Comment[af]=MPEG Vlak 3 Klank
Comment[ar]=صوت MPEG الطبقة 3
@@ -333,8 +370,8 @@
Comment[bs]=MPEG Layer 3 audio
Index: mimetypes/audio/x-ms-wma.desktop
===================================================================
---- mimetypes/audio/x-ms-wma.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/audio/x-ms-wma.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/audio/x-ms-wma.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/audio/x-ms-wma.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -7,7 +7,7 @@
Comment=Windows Media Audio
Comment[af]=Windows Media Klank
@@ -346,8 +383,8 @@
Comment[bs]=Windows Media audio
Index: mimetypes/text/vnd.abc.desktop
===================================================================
---- mimetypes/text/vnd.abc.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/text/vnd.abc.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/text/vnd.abc.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/text/vnd.abc.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -3,7 +3,7 @@
Comment=ABC Music File
Comment[af]=ABC Musiek Lêer
@@ -359,8 +396,8 @@
Comment[bs]=ABC muzička datoteka
Index: mimetypes/video/x-ogm.desktop
===================================================================
---- mimetypes/video/x-ogm.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/video/x-ogm.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/video/x-ogm.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/video/x-ogm.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -8,7 +8,7 @@
Comment=Ogg/Ogm Video
Comment[ar]=ملف مرئي Ogg/Ogm
@@ -372,8 +409,8 @@
Comment[bs]=Ogg/Ogm video
Index: mimetypes/video/x-theora.desktop
===================================================================
---- mimetypes/video/x-theora.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/video/x-theora.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/video/x-theora.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/video/x-theora.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -7,7 +7,7 @@
Comment=Theora Video
Comment[ar]=ملف فيديو Theora
@@ -385,8 +422,8 @@
Comment[bs]=Theora video
Index: mimetypes/video/mpeg.desktop
===================================================================
---- mimetypes/video/mpeg.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/video/mpeg.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/video/mpeg.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/video/mpeg.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -9,7 +9,7 @@
Comment[ar]=ملف مرئي MPEG
Comment[az]=MPEG Video Faylı
@@ -398,8 +435,8 @@
Comment[ca]=Vídeo MPEG
Index: mimetypes/video/quicktime.desktop
===================================================================
---- mimetypes/video/quicktime.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/video/quicktime.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/video/quicktime.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/video/quicktime.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -7,7 +7,7 @@
Comment=Quicktime Video
Comment[ar]=ملف مرئي Quicktime
@@ -411,8 +448,8 @@
Comment[ca]=Vídeo Quicktime
Index: mimetypes/video/x-ms-wmv.desktop
===================================================================
---- mimetypes/video/x-ms-wmv.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/video/x-ms-wmv.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/video/x-ms-wmv.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/video/x-ms-wmv.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -5,7 +5,7 @@
Comment[ar]=ملف مرئي Windows Media
Comment[az]=Windows Mediya Video Faylı
@@ -424,8 +461,8 @@
Comment[bs]=Windows Media video
Index: mimetypes/video/x-msvideo.desktop
===================================================================
---- mimetypes/video/x-msvideo.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/video/x-msvideo.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/video/x-msvideo.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/video/x-msvideo.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -8,7 +8,7 @@
Comment[af]=Microsoft Avi Video
Comment[ar]=مرئي Microsoft AVI
@@ -437,8 +474,8 @@
Comment[bs]=Microsoft AVI video
Index: mimetypes/video/vnd.rn-realvideo.desktop
===================================================================
---- mimetypes/video/vnd.rn-realvideo.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/video/vnd.rn-realvideo.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/video/vnd.rn-realvideo.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/video/vnd.rn-realvideo.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -9,7 +9,7 @@
Comment[ar]=ملف RealVideo
Comment[az]=RealVideo Faylı
@@ -450,8 +487,8 @@
Comment[bs]=RealVideo datoteka
Index: mimetypes/video/avi.desktop
===================================================================
---- mimetypes/video/avi.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/video/avi.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/video/avi.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/video/avi.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -9,7 +9,7 @@
Comment[af]=Microsoft Avi Video
Comment[ar]=مرئي Microsoft AVI
@@ -463,8 +500,8 @@
Comment[bs]=Microsoft AVI video
Index: mimetypes/video/mp4.desktop
===================================================================
---- mimetypes/video/mp4.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/video/mp4.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/video/mp4.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/video/mp4.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -7,7 +7,7 @@
Comment=MPEG-4 Video
Comment[ar]=ملف مرئي MPEG-4
@@ -476,8 +513,8 @@
Comment[bs]=MPEG-4 video
Index: mimetypes/video/x-flic.desktop
===================================================================
---- mimetypes/video/x-flic.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/video/x-flic.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/video/x-flic.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/video/x-flic.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -9,7 +9,7 @@
Comment[ar]=ملف FLIC لأوتوديسك
Comment[az]=Autodesk FLIC Faylı
@@ -489,8 +526,8 @@
Comment[bs]=Autodesk FLIC datoteke
Index: mimetypes/video/x-matroska.desktop
===================================================================
---- mimetypes/video/x-matroska.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
-+++ mimetypes/video/x-matroska.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+--- mimetypes/video/x-matroska.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ mimetypes/video/x-matroska.desktop (.../branches/KDE/3.5/kdelibs) (wersja 801801)
@@ -7,7 +7,7 @@
Comment=Matroska Video
Comment[ar]=مرئي Matroska
@@ -500,10 +537,210 @@
Comment[bn]=মাত্রোস্কা ভিডিও
Comment[br]=Video Matroska
Comment[bs]=Matroska video
+Index: kinit/start_kdeinit.c
+===================================================================
+--- kinit/start_kdeinit.c (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ kinit/start_kdeinit.c (.../branches/KDE/3.5/kdelibs) (wersja 801801)
+@@ -37,9 +37,10 @@
+ not have this protection, kdeinit will after forking send the new
+ PID using the pipe and wait for a signal. This parent will reset the protection
+ and SIGUSR1 the process to continue.
++ returns 1 if pid is valid
+ */
+
+-static void set_protection( pid_t pid, int enable )
++static int set_protection( pid_t pid, int enable )
+ {
+ char buf[ 1024 ];
+ int procfile;
+@@ -49,7 +50,7 @@
+ belongs to this user. */
+ struct stat st;
+ if( lstat( buf, &st ) < 0 || st.st_uid != getuid())
+- return;
++ return 0;
+ }
+ procfile = open( buf, O_WRONLY );
+ if( procfile >= 0 ) {
+@@ -59,6 +60,7 @@
+ write( procfile, "0", sizeof( "0" ));
+ close( procfile );
+ }
++ return 1;
+ }
+
+ int main(int argc, char **argv)
+@@ -67,14 +69,14 @@
+ int new_argc;
+ const char** new_argv;
+ char helper_num[ 1024 ];
+- int i;
++ unsigned i;
+ char** orig_environ = NULL;
+ char header[ 7 ];
+ if( pipe( pipes ) < 0 ) {
+ perror( "pipe()" );
+ return 1;
+ }
+- if( argc > 1000 )
++ if( argc < 0 || argc > 1000 )
+ abort(); /* paranoid */
+ set_protection( getpid(), 1 );
+ switch( fork()) {
+@@ -82,29 +84,30 @@
+ perror( "fork()" );
+ return 1;
+ default: /* parent, drop privileges and exec */
+-#if defined (HAVE_SETEUID) && !defined (HAVE_SETEUID_FAKE)
+- seteuid(getuid());
+-#else
+- setreuid(-1, getuid());
+-#endif
+- if (geteuid() != getuid()) {
++ if (setgid(getgid())) {
++ perror("setgid()");
++ return 1;
++ }
++ if (setuid(getuid()) || geteuid() != getuid()) {
+ perror("setuid()");
+ return 1;
+ }
+ close( pipes[ 0 ] );
+ /* read original environment passed by start_kdeinit_wrapper */
+ if( read( 0, header, 7 ) == 7 && strncmp( header, "environ", 7 ) == 0 ) {
+- int count;
+- if( read( 0, &count, sizeof( int )) == sizeof( int )) {
++ unsigned count;
++ if( read( 0, &count, sizeof( unsigned )) == sizeof( unsigned )
++ && count && count < (1<<16)) {
+ char** env = malloc(( count + 1 ) * sizeof( char* ));
+ int ok = 1;
+ for( i = 0;
+ i < count && ok;
+ ++i ) {
+- int len;
+- if( read( 0, &len, sizeof( int )) == sizeof( int )) {
++ unsigned len;
++ if( read( 0, &len, sizeof( unsigned )) == sizeof( unsigned )
++ && len && len < (1<<12)) {
+ env[ i ] = malloc( len + 1 );
+- if( read( 0, env[ i ], len ) == len ) {
++ if( (unsigned) read( 0, env[ i ], len ) == len ) {
+ env[ i ][ len ] = '\0';
+ } else {
+ ok = 0;
+@@ -128,7 +131,7 @@
+ sprintf( helper_num, "%d", pipes[ 1 ] );
+ new_argv[ 2 ] = helper_num;
+ for( i = 1;
+- i <= argc;
++ i <= (unsigned) argc;
+ ++i )
+ new_argv[ i + 2 ] = argv[ i ];
+ if( orig_environ )
+@@ -145,10 +148,10 @@
+ if( ret < 0 && errno == EINTR )
+ continue;
+ if( ret <= 0 ) /* pipe closed or error, exit */
+- return 0;
++ _exit(0);
+ if( pid != 0 ) {
+- set_protection( pid, 0 );
+- kill( pid, SIGUSR1 );
++ if (set_protection( pid, 0 ))
++ kill( pid, SIGUSR1 );
+ }
+ }
+ }
+Index: kwallet/backend/kwalletbackend.cc
+===================================================================
+--- kwallet/backend/kwalletbackend.cc (.../tags/KDE/3.5.9/kdelibs) (wersja 801801)
++++ kwallet/backend/kwalletbackend.cc (.../branches/KDE/3.5/kdelibs) (wersja 801801)
+@@ -54,8 +54,13 @@
+ #define KWMAGIC "KWALLET\n\r\0\r\n"
+ #define KWMAGIC_LEN 12
+
++static void initKWalletDir()
++{
++ KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
++}
++
+ Backend::Backend(const QString& name, bool isPath) : _name(name), _ref(0) {
+- KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kdelibs-branch.diff?r1=1.77&r2=1.78&f=u
More information about the pld-cvs-commit
mailing list