[23271] trunk/dports/kde/kdegraphics3
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 28 01:29:14 PDT 2007
Revision: 23271
http://trac.macosforge.org/projects/macports/changeset/23271
Author: takanori at macports.org
Date: 2007-03-28 01:29:14 -0700 (Wed, 28 Mar 2007)
Log Message:
-----------
Version 3.5.6
Modified Paths:
--------------
trunk/dports/kde/kdegraphics3/Portfile
trunk/dports/kde/kdegraphics3/files/kdegraphics3.patch
Modified: trunk/dports/kde/kdegraphics3/Portfile
===================================================================
--- trunk/dports/kde/kdegraphics3/Portfile 2007-03-28 08:28:55 UTC (rev 23270)
+++ trunk/dports/kde/kdegraphics3/Portfile 2007-03-28 08:29:14 UTC (rev 23271)
@@ -1,11 +1,10 @@
# $Id$
-#Synced with Fink, Version 3.5.5-1022
+#Synced with Fink, Version 3.5.6-1022
PortSystem 1.0
name kdegraphics3
-version 3.5.5
-revision 2
+version 3.5.6
set kdeadmin kde-admindir-429
categories kde
maintainers nomaintainer at macports.org
@@ -14,19 +13,18 @@
long_description ${description}
platforms darwin
homepage http://www.kde.org/
-master_sites kde:stable/${version}/src/:kde355 \
+master_sites kde:stable/${version}/src/:kde356 \
http://ranger.users.finkproject.org/distfiles/:admin \
http://ranger.befunk.com/fink/:admin \
http://astrange.ithinksw.net/~astrange/ranger-fink/:admin \
http://www.southofheaven.net/befunk/:admin \
kde:security_patches/:security
-# opendarwin::kde355
+# opendarwin::kde356
# opendarwin::admin
use_bzip2 yes
distname kdegraphics-${version}
-distfiles ${distname}.tar.bz2:kde355 \
- ${kdeadmin}.tar.bz2:admin \
- post-3.5.5-kdegraphics-CVE-2007-0104.diff:security
+distfiles ${distname}.tar.bz2:kde356 \
+ ${kdeadmin}.tar.bz2:admin
depends_build port:autoconf \
port:unsermake
depends_lib port:fribidi \
@@ -40,11 +38,9 @@
# port:libwww
# port:poppler-qt3
+checksums ${distname}.tar.bz2 md5 79a1ffb7ae89bede1410411a30be3210 \
+ ${kdeadmin}.tar.bz2 md5 73186bf0bdabf96c9f7d559de56d3772
-checksums ${distname}.tar.bz2 md5 cdbe15afc01c5da7af9557e803bbb7e6 \
- ${kdeadmin}.tar.bz2 md5 73186bf0bdabf96c9f7d559de56d3772 \
- post-3.5.5-kdegraphics-CVE-2007-0104.diff md5 a690ce46117257609c2b43485ea4d0d7
-
extract.only ${distname}.tar.bz2
post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
@@ -55,7 +51,6 @@
system "sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
}
system "perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,${prefix}/share/doc/qt3/html,g;' admin/*"
- system "patch -p0 < ${distpath}/post-3.5.5-kdegraphics-CVE-2007-0104.diff"
}
post-patch {
reinplace "s|/lib/freetype219||g" ${worksrcpath}/environment-helper.sh
Modified: trunk/dports/kde/kdegraphics3/files/kdegraphics3.patch
===================================================================
--- trunk/dports/kde/kdegraphics3/files/kdegraphics3.patch 2007-03-28 08:28:55 UTC (rev 23270)
+++ trunk/dports/kde/kdegraphics3/files/kdegraphics3.patch 2007-03-28 08:29:14 UTC (rev 23271)
@@ -620,137 +620,3 @@
break;
default:
break;
---- kdeg/kfile-plugins/jpeg/exif.h
-+++ kdeg/kfile-plugins/jpeg/exif.h
-@@ -72,7 +72,8 @@
- int Get32s(void * Long);
- unsigned Get32u(void * Long);
- double ConvertAnyFormat(void * ValuePtr, int Format);
-- void ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned ExifLength);
-+ void ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned ExifLength,
-+ unsigned NestingLevel);
- void process_COM (const uchar * Data, int length);
- void process_SOFn (const uchar * Data, int marker);
- int Get16m(const void * Short);
---- kdeg/kfile-plugins/jpeg/exif.cpp
-+++ kdeg/kfile-plugins/jpeg/exif.cpp
-@@ -446,7 +446,7 @@
- //--------------------------------------------------------------------------
- // Process one of the nested EXIF directories.
- //--------------------------------------------------------------------------
--void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned ExifLength)
-+void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned ExifLength, unsigned NestingLevel)
- {
- int de;
- int a;
-@@ -454,6 +454,9 @@
- unsigned ThumbnailOffset = 0;
- unsigned ThumbnailSize = 0;
-
-+ if ( NestingLevel > 4)
-+ throw FatalError("Maximum directory nesting exceeded (corrupt exif header)");
-+
- NumDirEntries = Get16u(DirStart);
- #define DIR_ENTRY_ADDR(Start, Entry) (Start+2+12*(Entry))
-
-@@ -476,7 +479,7 @@
- for (de=0;de<NumDirEntries;de++){
- int Tag, Format, Components;
- unsigned char * ValuePtr;
-- int ByteCount;
-+ unsigned ByteCount;
- char * DirEntry;
- DirEntry = (char *)DIR_ENTRY_ADDR(DirStart, de);
-
-@@ -489,6 +492,11 @@
- throw FatalError("Illegal format code in EXIF dir");
- }
-
-+ if ((unsigned)Components > 0x10000) {
-+ throw FatalError("Illegal number of components for tag");
-+ continue;
-+ }
-+
- ByteCount = Components * BytesPerFormat[Format];
-
- if (ByteCount > 4){
-@@ -517,11 +525,11 @@
- switch(Tag){
-
- case TAG_MAKE:
-- ExifData::CameraMake = QString((char*)ValuePtr);
-+ ExifData::CameraMake = QString::fromLatin1((const char*)ValuePtr, 31);
- break;
-
- case TAG_MODEL:
-- ExifData::CameraModel = QString((char*)ValuePtr);
-+ ExifData::CameraModel = QString::fromLatin1((const char*)ValuePtr, 39);
- break;
-
- case TAG_ORIENTATION:
-@@ -529,7 +537,7 @@
- break;
-
- case TAG_DATETIME_ORIGINAL:
-- DateTime = QString((char*)ValuePtr);
-+ DateTime = QString::fromLatin1((const char*)ValuePtr, 19);
- break;
-
- case TAG_USERCOMMENT:
-@@ -550,14 +558,12 @@
- int c;
- c = (ValuePtr)[a];
- if (c != '\0' && c != ' '){
-- //strncpy(ImageInfo.Comments, (const char*)(a+ValuePtr), 199);
-- UserComment.sprintf("%s", (const char*)(a+ValuePtr));
-+ UserComment = QString::fromLatin1((const char*)(a+ValuePtr), 199);
- break;
- }
- }
- }else{
-- //strncpy(ImageInfo.Comments, (const char*)ValuePtr, 199);
-- UserComment.sprintf("%s", (const char*)ValuePtr);
-+ UserComment = QString::fromLatin1((const char*)ValuePtr, 199);
- }
- break;
-
-@@ -676,10 +682,10 @@
- if (Tag == TAG_EXIF_OFFSET || Tag == TAG_INTEROP_OFFSET){
- unsigned char * SubdirStart;
- SubdirStart = OffsetBase + Get32u(ValuePtr);
-- if (SubdirStart < OffsetBase || SubdirStart > OffsetBase+ExifLength){
-+ if (SubdirStart <= OffsetBase || SubdirStart >= OffsetBase+ExifLength){
- throw FatalError("Illegal subdirectory link");
- }
-- ProcessExifDir(SubdirStart, OffsetBase, ExifLength);
-+ ProcessExifDir(SubdirStart, OffsetBase, ExifLength, NestingLevel+1);
- continue;
- }
- }
-@@ -709,7 +715,7 @@
- }
- }else{
- if (SubdirStart <= OffsetBase+ExifLength){
-- ProcessExifDir(SubdirStart, OffsetBase, ExifLength);
-+ ProcessExifDir(SubdirStart, OffsetBase, ExifLength, NestingLevel+1);
- }
- }
- }
-@@ -719,7 +725,7 @@
- }
-
- if (ThumbnailSize && ThumbnailOffset){
-- if (ThumbnailSize + ThumbnailOffset <= ExifLength){
-+ if (ThumbnailSize + ThumbnailOffset < ExifLength){
- // The thumbnail pointer appears to be valid. Store it.
- Thumbnail.loadFromData(OffsetBase + ThumbnailOffset, ThumbnailSize, "JPEG");
- }
-@@ -810,7 +816,7 @@
- LastExifRefd = CharBuf;
-
- // First directory starts 16 bytes in. Offsets start at 8 bytes in.
-- ProcessExifDir(CharBuf+16, CharBuf+8, length-6);
-+ ProcessExifDir(CharBuf+16, CharBuf+8, length-6, 0);
-
- // This is how far the interesting (non thumbnail) part of the exif went.
- ExifSettingsLength = LastExifRefd - CharBuf;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070328/43f9d8ca/attachment.html
More information about the macports-changes
mailing list