[23264] trunk/dports/kde/kdelibs3
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 28 01:25:33 PDT 2007
Revision: 23264
http://trac.macosforge.org/projects/macports/changeset/23264
Author: takanori at macports.org
Date: 2007-03-28 01:25:33 -0700 (Wed, 28 Mar 2007)
Log Message:
-----------
Version 3.5.6
Modified Paths:
--------------
trunk/dports/kde/kdelibs3/Portfile
trunk/dports/kde/kdelibs3/files/CompileScript.sh
trunk/dports/kde/kdelibs3/files/InstallScript.sh
trunk/dports/kde/kdelibs3/files/kdelibs3-unified.patch
Removed Paths:
-------------
trunk/dports/kde/kdelibs3/files/patch-CVE-2006-4811
Modified: trunk/dports/kde/kdelibs3/Portfile
===================================================================
--- trunk/dports/kde/kdelibs3/Portfile 2007-03-28 08:24:06 UTC (rev 23263)
+++ trunk/dports/kde/kdelibs3/Portfile 2007-03-28 08:25:33 UTC (rev 23264)
@@ -1,11 +1,10 @@
# $Id$
-#Synced with Fink, Version 3.5.5-1021
+#Synced with Fink, Version 3.5.6-1022
PortSystem 1.0
name kdelibs3
-version 3.5.5
-revision 1
+version 3.5.6
set kdeadmin kde-admindir-429
categories kde
maintainers nomaintainer at macports.org
@@ -14,16 +13,16 @@
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
-# opendarwin::kde355
+# opendarwin::kde356
# opendarwin::admin
use_bzip2 yes
distname kdelibs-${version}
-distfiles ${distname}.tar.bz2:kde355 \
+distfiles ${distname}.tar.bz2:kde356 \
${kdeadmin}.tar.bz2:admin
depends_build port:autoconf \
port:unsermake
@@ -49,7 +48,7 @@
port:lua \
port:pcre \
port:tiff \
- port:OpenEXR \
+ port:openexr \
port:openssl \
port:perl5.8 \
port:pkgconfig \
@@ -61,13 +60,13 @@
# port:dbus-qt3
# port:hal
-checksums ${distname}.tar.bz2 md5 2cba792e3b0a766431b837c8ef924117 \
+checksums ${distname}.tar.bz2 md5 e4d137879a66e92b895b3de5413a61d8 \
${kdeadmin}.tar.bz2 md5 73186bf0bdabf96c9f7d559de56d3772
extract.only ${distname}.tar.bz2
post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
-patchfiles kdelibs3-unified.patch patch-CVE-2006-4811
+patchfiles kdelibs3-unified.patch
patch {
cd ${worksrcpath}
foreach file $patchfiles {
@@ -94,19 +93,20 @@
foreach f {kdeglobals konsolerc} {
# Monaco CY is not a standard font in Tiger.
reinplace "s|Monaco CY|Monaco|g" ${worksrcpath}/darwin/${f}
- reinplace "s|hintmedium|hintnone|g" ${worksrcpath}/darwin/${f}
}
+ system "echo \"\[FMSettings\]\nStandardFont=Sans,10,-1,5,50,0,0,0,0,0\" > ${worksrcpath}/darwin/kdesktoprc"
}
configure.args --enable-cups --with-ldap=framework --with-gssapi=framework --with-distribution='MacPorts/Mac OS X' --without-arts
-configure {
+pre-configure {
if {[file exists ${prefix}/bin/cups-config]} {
ui_msg "port:cups-headers may prevent building this port."
ui_msg "Please uninstall (or deactivate) cups-headers and restart the build."
exit 1
}
}
+configure {}
build { system "cd ${worksrcpath} && ./CompileScript.sh" }
destroot { system "cd ${worksrcpath} && ./InstallScript.sh" }
@@ -126,9 +126,15 @@
exit 1
}
-variant apidox {
+variant with_doxygen {
depends_lib-append port:doxygen
post-patch { foreach f {CompileScript.sh InstallScript.sh} { reinplace "s|#apidox#||g" ${worksrcpath}/${f} }}
}
+variant with_libthai {
+ depends_lib-append port:libdatrie \
+ port:libthai
+ configure.args-append --with-libthai=yes
+}
+
livecheck.check none
Modified: trunk/dports/kde/kdelibs3/files/CompileScript.sh
===================================================================
--- trunk/dports/kde/kdelibs3/files/CompileScript.sh 2007-03-28 08:24:06 UTC (rev 23263)
+++ trunk/dports/kde/kdelibs3/files/CompileScript.sh 2007-03-28 08:25:33 UTC (rev 23264)
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh -ev
export PREFIX="%p" USE_UNSERMAKE=1
. ./environment-helper.sh
@@ -9,6 +9,8 @@
;;
esac
+ #export CPPFLAGS="-I/usr/include/gssapi -I%p/lib/fam/include $CPPFLAGS"
+ #export LDFLAGS="-L%p/lib/fam/lib $LDFLAGS"
export CPPFLAGS="-I/usr/include/gssapi $CPPFLAGS"
./build-helper.sh cvs %N %v %r make -f admin/Makefile.common cvs
Modified: trunk/dports/kde/kdelibs3/files/InstallScript.sh
===================================================================
--- trunk/dports/kde/kdelibs3/files/InstallScript.sh 2007-03-28 08:24:06 UTC (rev 23263)
+++ trunk/dports/kde/kdelibs3/files/InstallScript.sh 2007-03-28 08:25:33 UTC (rev 23264)
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh -ev
export PREFIX="%p" USE_UNSERMAKE=1
. ./environment-helper.sh
Modified: trunk/dports/kde/kdelibs3/files/kdelibs3-unified.patch
===================================================================
--- trunk/dports/kde/kdelibs3/files/kdelibs3-unified.patch 2007-03-28 08:24:06 UTC (rev 23263)
+++ trunk/dports/kde/kdelibs3/files/kdelibs3-unified.patch 2007-03-28 08:25:33 UTC (rev 23264)
@@ -1,6 +1,6 @@
---- kdelibs-3.5.4/darwin/kcmartsrc 1969-12-31 16:00:00.000000000 -0800
-+++ kdelibs-3.5.4-new/darwin/kcmartsrc 2006-07-27 10:33:34.000000000 -0700
+--- kdelibs-3.5.6/darwin/kcmartsrc 1969-12-31 19:00:00.000000000 -0500
++++ kdelibs-3.5.6-new/darwin/kcmartsrc 2007-02-08 15:33:22.000000000 -0500
@@ -0,0 +1,9 @@
+[Arts]
+Arguments=\s-F 10 -S 4096 -a esd -d -b 16 -s 60 -m artsmessage -c drkonqi -l 3 -f
@@ -11,8 +11,8 @@
+StartRealtime=false
+StartServer=false
+SuspendTime=60
---- kdelibs-3.5.4/darwin/kdeglobals 1969-12-31 16:00:00.000000000 -0800
-+++ kdelibs-3.5.4-new/darwin/kdeglobals 2006-07-27 10:33:34.000000000 -0700
+--- kdelibs-3.5.6/darwin/kdeglobals 1969-12-31 19:00:00.000000000 -0500
++++ kdelibs-3.5.6-new/darwin/kdeglobals 2007-02-08 15:33:22.000000000 -0500
@@ -0,0 +1,129 @@
+[$Version]
+update_info=kaccel.upd:kde3.3/r1,kded.upd:kde3.0,klippershortcuts.upd:04112002,kwin.upd:kde3.2Xinerama,socks.upd:kde3.0/r1
@@ -143,16 +143,16 @@
+
+[WM]
+activeFont=Baghdad,12,-1,5,50,0,0,0,0,0
---- kdelibs-3.5.4/darwin/knotifyrc 1969-12-31 16:00:00.000000000 -0800
-+++ kdelibs-3.5.4-new/darwin/knotifyrc 2006-07-27 10:33:34.000000000 -0700
+--- kdelibs-3.5.6/darwin/knotifyrc 1969-12-31 19:00:00.000000000 -0500
++++ kdelibs-3.5.6-new/darwin/knotifyrc 2007-02-08 15:33:22.000000000 -0500
@@ -0,0 +1,5 @@
+[Misc]
+External player=@FINKPREFIX@/bin/mplayer
+LastConfiguredApp=knotify
+Use external player=false
+Volume=100
---- kdelibs-3.5.4/darwin/konsolerc 1969-12-31 16:00:00.000000000 -0800
-+++ kdelibs-3.5.4-new/darwin/konsolerc 2006-07-27 10:33:34.000000000 -0700
+--- kdelibs-3.5.6/darwin/konsolerc 1969-12-31 19:00:00.000000000 -0500
++++ kdelibs-3.5.6-new/darwin/konsolerc 2007-02-08 15:33:22.000000000 -0500
@@ -0,0 +1,19 @@
+[Desktop Entry]
+ActiveSession=0
@@ -173,8 +173,8 @@
+schema=Linux.schema
+scrollbar=2
+tabbar=2
---- kdelibs-3.5.4/kdecore/Makefile.am 2005-10-10 08:06:02.000000000 -0700
-+++ kdelibs-3.5.4-new/kdecore/Makefile.am 2006-07-27 10:33:34.000000000 -0700
+--- kdelibs-3.5.6/kdecore/Makefile.am 2006-10-01 13:33:38.000000000 -0400
++++ kdelibs-3.5.6-new/kdecore/Makefile.am 2007-02-08 15:33:22.000000000 -0500
@@ -24,7 +24,7 @@
if include_SVGICONS
@@ -193,8 +193,8 @@
libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck
libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \
$(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/standard_weak.nmcheck
---- kdelibs-3.5.4/kdecore/kglobalsettings.cpp 2005-10-10 08:06:03.000000000 -0700
-+++ kdelibs-3.5.4-new/kdecore/kglobalsettings.cpp 2006-07-27 10:33:34.000000000 -0700
+--- kdelibs-3.5.6/kdecore/kglobalsettings.cpp 2005-10-10 11:06:03.000000000 -0400
++++ kdelibs-3.5.6-new/kdecore/kglobalsettings.cpp 2007-02-08 15:33:22.000000000 -0500
@@ -491,7 +491,7 @@
s_desktopPath->append('/');
@@ -204,8 +204,8 @@
*s_trashPath = g.readPathEntry( "Trash" , *s_trashPath);
*s_trashPath = QDir::cleanDirPath( *s_trashPath );
if ( !s_trashPath->endsWith("/") )
---- kdelibs-3.5.4/kdecore/ksocks.cpp 2005-10-10 08:06:03.000000000 -0700
-+++ kdelibs-3.5.4-new/kdecore/ksocks.cpp 2006-07-27 10:33:34.000000000 -0700
+--- kdelibs-3.5.6/kdecore/ksocks.cpp 2005-10-10 11:06:03.000000000 -0400
++++ kdelibs-3.5.6-new/kdecore/ksocks.cpp 2007-02-08 15:33:22.000000000 -0500
@@ -480,7 +480,7 @@
ksocklen_t addrlen) {
if (_useSocks && F_connect)
@@ -276,9 +276,9 @@
}
---- kdelibs-3.5.4/kdecore/kstandarddirs.cpp 2005-10-10 08:06:02.000000000 -0700
-+++ kdelibs-3.5.4-new/kdecore/kstandarddirs.cpp 2006-07-27 10:33:34.000000000 -0700
-@@ -1020,7 +1020,7 @@
+--- kdelibs-3.5.6/kdecore/kstandarddirs.cpp 2007-01-15 06:34:17.000000000 -0500
++++ kdelibs-3.5.6-new/kdecore/kstandarddirs.cpp 2007-02-08 15:33:22.000000000 -0500
+@@ -1021,7 +1021,7 @@
if (!strcmp(type, "data"))
return "share/apps/";
if (!strcmp(type, "html"))
@@ -287,8 +287,8 @@
if (!strcmp(type, "icon"))
return "share/icons/";
if (!strcmp(type, "config"))
---- kdelibs-3.5.4/kdecore/network/ksocketdevice.cpp 2006-01-19 09:06:14.000000000 -0800
-+++ kdelibs-3.5.4-new/kdecore/network/ksocketdevice.cpp 2006-07-27 10:33:34.000000000 -0700
+--- kdelibs-3.5.6/kdecore/network/ksocketdevice.cpp 2007-01-15 06:34:17.000000000 -0500
++++ kdelibs-3.5.6-new/kdecore/network/ksocketdevice.cpp 2007-02-08 15:33:22.000000000 -0500
@@ -316,7 +316,7 @@
}
@@ -316,7 +316,7 @@
KSocketAddress localAddress;
localAddress.setLength(len = 32); // arbitrary value
if (kde_getsockname(m_sockfd, localAddress.address(), &len) == -1)
-@@ -567,7 +567,7 @@
+@@ -571,7 +571,7 @@
if (d->peer.family() != AF_UNSPEC)
return d->peer;
@@ -325,8 +325,8 @@
KSocketAddress peerAddress;
peerAddress.setLength(len = 32); // arbitrary value
if (kde_getpeername(m_sockfd, peerAddress.address(), &len) == -1)
---- kdelibs-3.5.4/kdecore/network/syssocket.h 2005-09-10 01:27:10.000000000 -0700
-+++ kdelibs-3.5.4-new/kdecore/network/syssocket.h 2006-07-27 10:33:34.000000000 -0700
+--- kdelibs-3.5.6/kdecore/network/syssocket.h 2005-09-10 04:27:10.000000000 -0400
++++ kdelibs-3.5.6-new/kdecore/network/syssocket.h 2007-02-08 15:33:22.000000000 -0500
@@ -53,7 +53,7 @@
}
@@ -366,8 +366,8 @@
{
return ::getsockname(fd, sa, len);
}
---- kdelibs-3.5.4/kded/Makefile.am 2005-10-10 08:06:29.000000000 -0700
-+++ kdelibs-3.5.4-new/kded/Makefile.am 2006-07-27 10:33:35.000000000 -0700
+--- kdelibs-3.5.6/kded/Makefile.am 2005-10-10 11:06:29.000000000 -0400
++++ kdelibs-3.5.6-new/kded/Makefile.am 2007-02-08 15:33:22.000000000 -0500
@@ -58,7 +58,10 @@
servicetype_DATA = kdedmodule.desktop
servicetypedir = $(kde_servicetypesdir)
@@ -380,8 +380,8 @@
update_DATA = kded.upd
updatedir = $(kde_datadir)/kconf_update
---- kdelibs-3.5.4/kded/kbuildsycoca.cpp 2005-11-08 14:39:36.000000000 -0800
-+++ kdelibs-3.5.4-new/kded/kbuildsycoca.cpp 2006-07-27 10:33:35.000000000 -0700
+--- kdelibs-3.5.6/kded/kbuildsycoca.cpp 2005-11-08 17:39:36.000000000 -0500
++++ kdelibs-3.5.6-new/kded/kbuildsycoca.cpp 2007-02-08 15:33:23.000000000 -0500
@@ -379,7 +379,11 @@
connect(g_vfolder, SIGNAL(newService(const QString &, KService **)),
this, SLOT(slotCreateEntry(const QString &, KService **)));
@@ -395,8 +395,8 @@
KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false);
entry->setLayoutInfo(kdeMenu->layoutList);
---- kdelibs-3.5.4/kdeprint/configure.in.in 2005-09-10 01:27:43.000000000 -0700
-+++ kdelibs-3.5.4-new/kdeprint/configure.in.in 2006-07-27 10:33:35.000000000 -0700
+--- kdelibs-3.5.6/kdeprint/configure.in.in 2005-09-10 04:27:43.000000000 -0400
++++ kdelibs-3.5.6-new/kdeprint/configure.in.in 2007-02-08 15:33:23.000000000 -0500
@@ -80,7 +80,7 @@
dnl check if CUPS is at least 1.1.20
@@ -406,8 +406,8 @@
if test "$ac_have_new_cups" = "yes"; then
AC_DEFINE(HAVE_CUPS_NO_PWD_CACHE, 1, CUPS doesn't have password caching)
fi
---- kdelibs-3.5.4/kdeui/Makefile.am 2005-10-10 08:06:38.000000000 -0700
-+++ kdelibs-3.5.4-new/kdeui/Makefile.am 2006-07-27 10:33:35.000000000 -0700
+--- kdelibs-3.5.6/kdeui/Makefile.am 2005-10-10 11:06:38.000000000 -0400
++++ kdelibs-3.5.6-new/kdeui/Makefile.am 2007-02-08 15:33:23.000000000 -0500
@@ -27,10 +27,10 @@
AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
@@ -421,8 +421,28 @@
libkspell_la_LIBADD = libkdeui.la
libkspell_la_SOURCES = dummy.cpp
---- kdelibs-3.5.4/kimgio/Makefile.am 2005-09-10 01:26:42.000000000 -0700
-+++ kdelibs-3.5.4-new/kimgio/Makefile.am 2006-07-27 10:33:35.000000000 -0700
+--- kdelibs-3.5.6/khtml/html/htmltokenizer.cpp 2007-01-15 06:34:00.000000000 -0500
++++ kdelibs-3.5.6-new/khtml/html/htmltokenizer.cpp 2007-02-08 15:36:15.000000000 -0500
+@@ -316,7 +316,7 @@
+ while ( !src.isEmpty() ) {
+ checkScriptBuffer();
+ unsigned char ch = src->latin1();
+- if ( !scriptCodeResync && !brokenComments && !textarea && !xmp && !title && ch == '-' && scriptCodeSize >= 3 && !src.escaped() && QConstString( scriptCode+scriptCodeSize-3, 3 ).string() == "<!-" ) {
++ if ( !scriptCodeResync && !brokenComments && !textarea && !xmp && ch == '-' && scriptCodeSize >= 3 && !src.escaped() && QConstString( scriptCode+scriptCodeSize-3, 3 ).string() == "<!-" ) {
+ comment = true;
+ scriptCode[ scriptCodeSize++ ] = ch;
+ ++src;
+@@ -495,7 +495,7 @@
+
+ if (canClose || handleBrokenComments || scriptEnd ){
+ ++src;
+- if ( !( script || xmp || textarea || style) ) {
++ if ( !( title || script || xmp || textarea || style) ) {
+ #ifdef COMMENTS_IN_DOM
+ checkScriptBuffer();
+ scriptCode[ scriptCodeSize ] = 0;
+--- kdelibs-3.5.6/kimgio/Makefile.am 2005-09-10 04:26:42.000000000 -0400
++++ kdelibs-3.5.6-new/kimgio/Makefile.am 2007-02-08 15:33:23.000000000 -0500
@@ -21,7 +21,7 @@
kimg_pcx.la kimg_tga.la kimg_rgb.la kimg_xcf.la kimg_dds.la $(KIMGIO_EXR_MODULES) \
kimg_psd.la kimg_hdr.la
@@ -432,8 +452,8 @@
kimg_tiff_la_SOURCES = tiffr.cpp
kimg_tiff_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
---- kdelibs-3.5.4/kinit/Makefile.am 2005-10-10 08:05:37.000000000 -0700
-+++ kdelibs-3.5.4-new/kinit/Makefile.am 2006-07-27 10:33:35.000000000 -0700
+--- kdelibs-3.5.6/kinit/Makefile.am 2007-01-15 06:33:56.000000000 -0500
++++ kdelibs-3.5.6-new/kinit/Makefile.am 2007-02-08 15:33:23.000000000 -0500
@@ -15,7 +15,7 @@
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
@@ -443,8 +463,8 @@
SUBDIRS = . tests
---- kdelibs-3.5.4/kio/kssl/kopenssl.cc 2006-07-22 01:16:39.000000000 -0700
-+++ kdelibs-3.5.4-new/kio/kssl/kopenssl.cc 2006-07-27 10:33:35.000000000 -0700
+--- kdelibs-3.5.6/kio/kssl/kopenssl.cc 2006-07-22 04:16:39.000000000 -0400
++++ kdelibs-3.5.6-new/kio/kssl/kopenssl.cc 2007-02-08 15:33:23.000000000 -0500
@@ -323,6 +323,7 @@
#elif defined(_AIX)
<< "libssl.a(libssl.so.0)"
@@ -461,8 +481,8 @@
<< "libcrypto.dylib"
<< "libcrypto.0.9.dylib"
#else
---- kdelibs-3.5.4/kio/misc/kpac/Makefile.am 2005-09-10 01:26:47.000000000 -0700
-+++ kdelibs-3.5.4-new/kio/misc/kpac/Makefile.am 2006-07-27 10:33:35.000000000 -0700
+--- kdelibs-3.5.6/kio/misc/kpac/Makefile.am 2005-09-10 04:26:47.000000000 -0400
++++ kdelibs-3.5.6-new/kio/misc/kpac/Makefile.am 2007-02-08 15:33:23.000000000 -0500
@@ -10,7 +10,7 @@
kded_proxyscout_la_SOURCES = proxyscout.skel proxyscout.cpp script.cpp \
downloader.cpp discovery.cpp
@@ -472,39 +492,88 @@
kpac_dhcp_helper_SOURCES = kpac_dhcp_helper.c
kpac_dhcp_helper_CFLAGS = $(KDE_USE_FPIE)
---- kdelibs-3.5.5/kinit/configure.in.in (.../tags/KDE/3.5.5/kdelibs/kinit) (revision 599303)
-+++ kdelibs-3.5.5-new/kinit/configure.in.in (.../branches/KDE/3.5/kdelibs/kinit) (revision 599303)
-@@ -49,10 +49,11 @@
- case $target_os in
- linux*)
- AC_MSG_RESULT(yes)
-- kdeinit_setuid=1
-+ KDEINIT_SETUID=1
- AC_DEFINE(KDEINIT_OOM_PROTECT,1,[Enable prevention against poor Linux OOM-killer])
- ;;
- *) AC_MSG_RESULT(no)
-+ KDEINIT_SETUID=0
- ;;
- esac
--AM_CONDITIONAL(KDEINIT_SETUID, test -n "$kdeinit_setuid" )
-+AC_SUBST(KDEINIT_SETUID)
---- kdelibs-3.5.5/kinit/Makefile.am (.../tags/KDE/3.5.5/kdelibs/kinit) (revision 599303)
-+++ kdelibs-3.5.5-new/kinit/Makefile.am (.../branches/KDE/3.5/kdelibs/kinit) (revision 599303)
-@@ -82,14 +82,9 @@
- dummy.cpp:
- echo > dummy.cpp
+--- kdelibs-3.5.6/khtml/ecma/kjs_html.cpp 2007-01-15 06:34:04.000000000 -0500
++++ kdelibs-3.5.6-new/khtml/ecma/kjs_html.cpp 2007-03-10 10:18:17.000000000 -0500
+@@ -1862,10 +1862,12 @@
+ getDOMNode(exec, frameElement.contentDocument()) : Undefined();
+ case FrameContentWindow: {
+ KHTMLPart* part = static_cast<DOM::HTMLFrameElementImpl*>(frameElement.handle())->contentPart();
+- if (part)
+- return Value(Window::retrieveWindow(part));
+- else
+- return Undefined();
++ if (part) {
++ Window *w = Window::retrieveWindow(part);
++ if (w)
++ return Value(w);
++ }
++ return Undefined();
+ }
+ case FrameFrameBorder: return String(frameElement.frameBorder());
+ case FrameLongDesc: return String(frameElement.longDesc());
+@@ -1895,10 +1897,12 @@
+ getDOMNode(exec, iFrame.contentDocument()) : Undefined();
+ case IFrameContentWindow: {
+ KHTMLPart* part = static_cast<DOM::HTMLIFrameElementImpl*>(iFrame.handle())->contentPart();
+- if (part)
+- return Value(Window::retrieveWindow(part));
+- else
+- return Undefined();
++ if (part) {
++ Window *w = Window::retrieveWindow(part);
++ if (w)
++ return Value(w);
++ }
++ return Undefined();
+ }
+ case IFrameFrameBorder: return String(iFrame.frameBorder());
+ case IFrameHeight: return String(iFrame.height());
+--- kdelibs/kioslave/ftp/ftp.cc
++++ kdelibs/kioslave/ftp/ftp.cc
+@@ -58,6 +58,7 @@
+ #include <kmimemagic.h>
+ #include <kmimetype.h>
+ #include <ksockaddr.h>
++#include <ksocketaddress.h>
+ #include <kio/ioslave_defaults.h>
+ #include <kio/slaveconfig.h>
+ #include <kremoteencoding.h>
+@@ -835,7 +836,6 @@ bool Ftp::ftpSendCmd( const QCString& cm
+ return true;
+ }
--if KDEINIT_SETUID
--# start_kdeinit needs to be installed setuid root on Linux
- install-exec-hook:
-- @(chown 0 $(DESTDIR)$(bindir)/start_kdeinit && chmod 4755 $(DESTDIR)$(bindir)/start_kdeinit) || echo "Please make start_kdeinit setuid root" >&2
-- @echo ""
-- @echo "start_kdeinit is by default installed on Linux with a set SETUID root bit!"
-- @echo "This is needed to prevent kdeinit from being killed by a bad heuristic in the OOM-killer when running out of memory."
-- @echo ""
--endif
-+ @if test \${KDEINIT_SETUID} != 0; then \
-+ (chown 0 $(DESTDIR)$(bindir)/start_kdeinit && chmod 4755 $(DESTDIR)$(bindir)/start_kdeinit) || echo "Please make start_kdeinit setuid root" ; \
-+ fi
+-
+ /*
+ * ftpOpenPASVDataConnection - set up data connection, using PASV mode
+ *
+@@ -853,6 +853,8 @@ int Ftp::ftpOpenPASVDataConnection()
+ if (sa != NULL && sa->family() != PF_INET)
+ return ERR_INTERNAL; // no PASV for non-PF_INET connections
- include $(top_srcdir)/admin/Doxyfile.am
++ const KInetSocketAddress *sin = static_cast<const KInetSocketAddress*>(sa);
++
+ if (m_extControl & pasvUnknown)
+ return ERR_INTERNAL; // already tried and got "unknown command"
+
+@@ -886,14 +888,17 @@ int Ftp::ftpOpenPASVDataConnection()
+ }
+
+ // Make hostname and port number ...
+- QString host;
+- host.sprintf("%d.%d.%d.%d", i[0], i[1], i[2], i[3]);
+ int port = i[4] << 8 | i[5];
+
++ // we ignore the host part on purpose for two reasons
++ // a) it might be wrong anyway
++ // b) it would make us being suceptible to a port scanning attack
++
+ // now connect the data socket ...
+ m_data = new FtpSocket("PASV");
+- m_data->setAddress(host, port);
+- kdDebug(7102) << "Connecting to " << host << " on port " << port << endl;
++ m_data->setAddress(sin->nodeName(), port);
++
++ kdDebug(7102) << "Connecting to " << sin->nodeName() << " on port " << port << endl;
+ return m_data->connectSocket(connectTimeout(), false);
+ }
+
Deleted: trunk/dports/kde/kdelibs3/files/patch-CVE-2006-4811
===================================================================
--- trunk/dports/kde/kdelibs3/files/patch-CVE-2006-4811 2007-03-28 08:24:06 UTC (rev 23263)
+++ trunk/dports/kde/kdelibs3/files/patch-CVE-2006-4811 2007-03-28 08:25:33 UTC (rev 23264)
@@ -1,12 +0,0 @@
---- kdelibs-3.5.1/khtml/rendering/render_image.cpp.orig 2006-01-20 02:06:53.000000000 +0900
-+++ kdelibs-3.5.1/khtml/rendering/render_image.cpp 2006-10-24 07:14:43.000000000 +0900
-@@ -294,7 +294,8 @@
- if ( (cWidth != intrinsicWidth() || cHeight != intrinsicHeight()) &&
- pix.width() > 0 && pix.height() > 0 && i->valid_rect().isValid())
- {
-- if (resizeCache.isNull() && cWidth && cHeight && intrinsicWidth() && intrinsicHeight())
-+ if (resizeCache.isNull() && cWidth > 0 && cHeight > 0 && intrinsicWidth() && intrinsicHeight()
-+ && cWidth < 4096 && cHeight < 4096)
- {
- QRect scaledrect(i->valid_rect());
- // kdDebug(6040) << "time elapsed: " << dt->elapsed() << endl;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070328/9ce97fe5/attachment.html
More information about the macports-changes
mailing list