Author: ranger
Date: Tue May 15 23:22:56 2007
New Revision: 786

URL: 
http://svn.finkproject.org/websvn/listing.php?sc=1&rev=786&repname=user%3a+ranger
Log:
more stuff

Added:
    trunk/experimental/10.3/main/finkinfo/kde/kde-i18n-kashubian.info
    trunk/experimental/10.3/main/finkinfo/kde/kde-i18n-thai.info
    trunk/experimental/10.4/main/finkinfo/kde/kde-i18n-kashubian.info
    trunk/experimental/10.4/main/finkinfo/kde/kde-i18n-thai.info
    trunk/experimental/common/main/finkinfo/kde/kde-i18n-kashubian.info
    trunk/experimental/common/main/finkinfo/kde/kde-i18n-thai.info
Modified:
    trunk/experimental/10.3/main/finkinfo/kde/kdelibs3-unified.info
    trunk/experimental/10.3/main/finkinfo/kde/kdelibs3-unified.patch
    trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-unified.info
    trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-unified.patch
    trunk/experimental/common/main/finkinfo/kde/kdelibs3-unified.info
    trunk/experimental/common/main/finkinfo/kde/kdelibs3-unified.patch

Added: trunk/experimental/10.3/main/finkinfo/kde/kde-i18n-kashubian.info
URL: 
http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/10.3/main/finkinfo/kde/kde-i18n-kashubian.info&rev=786&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.3/main/finkinfo/kde/kde-i18n-kashubian.info (added)
+++ trunk/experimental/10.3/main/finkinfo/kde/kde-i18n-kashubian.info Tue May 
15 23:22:56 2007
@@ -1,0 +1,41 @@
+Package: kde-i18n-kashubian
+Version: 3.5.7
+Revision: 11
+Description: KDE - languages for Kashubian
+License: GPL/LGPL
+Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
+
+Depends: <<
+       kdelibs3-unified (>= %v-11),
+       xfonts-intl
+<<
+BuildDepends: <<
+       fink (>= 0.26.0-1),
+       arts-dev,
+       kdebase3-unified-dev (>= %v-11),
+       kdelibs3-unified-dev (>= %v-11),
+       libxml2,
+       libxslt,
+       xfonts-intl
+<<
+Replaces: <<
+       koffice-i18n-kashubian,
+       khangman,
+       kturtle
+<<
+
+Source: mirror:kde:stable/%v/src/kde-i18n/kde-i18n-csb-%v.tar.bz2
+Source-MD5: ef5fbce181df8ac2ea0c0d773e10f6c4
+SourceDirectory: kde-i18n-csb-%v
+PatchScript: perl -pi -e 's,doc/HTML,doc/kde,g' configure
+
+CompileScript: (export HOME=/tmp; export KDEDIR=%p; sh configure %c; find . 
-name \*.bz2 -exec touch {} \;; make -j2)
+
+InstallScript: <<
+  make -j2 install DESTDIR=%d
+  mkdir -p %i/share/doc/kde-installed-packages
+  touch %i/share/doc/kde-installed-packages/kde-i18n-kashubian
+<<
+
+DescDetail: Language files for the K Desktop Environment: Kashubian
+

Added: trunk/experimental/10.3/main/finkinfo/kde/kde-i18n-thai.info
URL: 
http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/10.3/main/finkinfo/kde/kde-i18n-thai.info&rev=786&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.3/main/finkinfo/kde/kde-i18n-thai.info (added)
+++ trunk/experimental/10.3/main/finkinfo/kde/kde-i18n-thai.info Tue May 15 
23:22:56 2007
@@ -1,0 +1,41 @@
+Package: kde-i18n-thai
+Version: 3.5.7
+Revision: 11
+Description: KDE - languages for Thai
+License: GPL/LGPL
+Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
+
+Depends: <<
+       kdelibs3-unified (>= %v-11),
+       xfonts-intl
+<<
+BuildDepends: <<
+       fink (>= 0.26.0-1),
+       arts-dev,
+       kdebase3-unified-dev (>= %v-11),
+       kdelibs3-unified-dev (>= %v-11),
+       libxml2,
+       libxslt,
+       xfonts-intl
+<<
+Replaces: <<
+       koffice-i18n-thai,
+       khangman,
+       kturtle
+<<
+
+Source: mirror:kde:stable/%v/src/kde-i18n/kde-i18n-th-%v.tar.bz2
+Source-MD5: 11a49cc84cc87306dad4c61286ae0048
+SourceDirectory: kde-i18n-th-%v
+PatchScript: perl -pi -e 's,doc/HTML,doc/kde,g' configure
+
+CompileScript: (export HOME=/tmp; export KDEDIR=%p; sh configure %c; find . 
-name \*.bz2 -exec touch {} \;; make -j2)
+
+InstallScript: <<
+  make -j2 install DESTDIR=%d
+  mkdir -p %i/share/doc/kde-installed-packages
+  touch %i/share/doc/kde-installed-packages/kde-i18n-thai
+<<
+
+DescDetail: Language files for the K Desktop Environment: Thai
+

Modified: trunk/experimental/10.3/main/finkinfo/kde/kdelibs3-unified.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.3/main/finkinfo/kde/kdelibs3-unified.info&rev=786&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.3/main/finkinfo/kde/kdelibs3-unified.info (original)
+++ trunk/experimental/10.3/main/finkinfo/kde/kdelibs3-unified.info Tue May 15 
23:22:56 2007
@@ -221,7 +221,6 @@
                lib/libkabc_dir.*.dylib
                lib/libkabc_file.*.dylib
                lib/libkabc_ldapkio.*.dylib
-               lib/libkabc_net.*.dylib
                lib/libkatepartinterfaces.*.dylib
                lib/libkdecore.*.dylib
                lib/libkdefakes.*.dylib
@@ -263,7 +262,6 @@
                %p/lib/libkabc_dir.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
                %p/lib/libkabc_file.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
                %p/lib/libkabc_ldapkio.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
-               %p/lib/libkabc_net.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
                %p/lib/libkatepartinterfaces.0.dylib 1.0.0 %N-shlibs (>= 
3.4.0-1)
                %p/lib/libkdecore.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)
                %p/lib/libkdefakes.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)

Modified: trunk/experimental/10.3/main/finkinfo/kde/kdelibs3-unified.patch
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.3/main/finkinfo/kde/kdelibs3-unified.patch&rev=786&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.3/main/finkinfo/kde/kdelibs3-unified.patch (original)
+++ trunk/experimental/10.3/main/finkinfo/kde/kdelibs3-unified.patch Tue May 15 
23:22:56 2007
@@ -421,26 +421,6 @@
  libkspell_la_LIBADD = libkdeui.la
  libkspell_la_SOURCES = dummy.cpp
  
---- 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 @@
@@ -492,88 +472,3 @@
  
  kpac_dhcp_helper_SOURCES = kpac_dhcp_helper.c
  kpac_dhcp_helper_CFLAGS = $(KDE_USE_FPIE)
---- 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;
- }
- 
--
- /*
-  * 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
- 
-+  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);
- }
- 

Added: trunk/experimental/10.4/main/finkinfo/kde/kde-i18n-kashubian.info
URL: 
http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kde-i18n-kashubian.info&rev=786&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kde-i18n-kashubian.info (added)
+++ trunk/experimental/10.4/main/finkinfo/kde/kde-i18n-kashubian.info Tue May 
15 23:22:56 2007
@@ -1,0 +1,41 @@
+Package: kde-i18n-kashubian
+Version: 3.5.7
+Revision: 1021
+Description: KDE - languages for Kashubian
+License: GPL/LGPL
+Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
+
+Depends: <<
+       kdelibs3-unified (>= %v-1021),
+       xfonts-intl
+<<
+BuildDepends: <<
+       fink (>= 0.26.0-1),
+       arts-dev,
+       kdebase3-unified-dev (>= %v-1021),
+       kdelibs3-unified-dev (>= %v-1021),
+       libxml2,
+       libxslt,
+       xfonts-intl
+<<
+Replaces: <<
+       koffice-i18n-kashubian,
+       khangman,
+       kturtle
+<<
+
+Source: mirror:kde:stable/%v/src/kde-i18n/kde-i18n-csb-%v.tar.bz2
+Source-MD5: ef5fbce181df8ac2ea0c0d773e10f6c4
+SourceDirectory: kde-i18n-csb-%v
+PatchScript: perl -pi -e 's,doc/HTML,doc/kde,g' configure
+
+CompileScript: (export HOME=/tmp; export KDEDIR=%p; sh configure %c; find . 
-name \*.bz2 -exec touch {} \;; make -j2)
+
+InstallScript: <<
+  make -j2 install DESTDIR=%d
+  mkdir -p %i/share/doc/kde-installed-packages
+  touch %i/share/doc/kde-installed-packages/kde-i18n-kashubian
+<<
+
+DescDetail: Language files for the K Desktop Environment: Kashubian
+

Added: trunk/experimental/10.4/main/finkinfo/kde/kde-i18n-thai.info
URL: 
http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kde-i18n-thai.info&rev=786&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kde-i18n-thai.info (added)
+++ trunk/experimental/10.4/main/finkinfo/kde/kde-i18n-thai.info Tue May 15 
23:22:56 2007
@@ -1,0 +1,41 @@
+Package: kde-i18n-thai
+Version: 3.5.7
+Revision: 1021
+Description: KDE - languages for Thai
+License: GPL/LGPL
+Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
+
+Depends: <<
+       kdelibs3-unified (>= %v-1021),
+       xfonts-intl
+<<
+BuildDepends: <<
+       fink (>= 0.26.0-1),
+       arts-dev,
+       kdebase3-unified-dev (>= %v-1021),
+       kdelibs3-unified-dev (>= %v-1021),
+       libxml2,
+       libxslt,
+       xfonts-intl
+<<
+Replaces: <<
+       koffice-i18n-thai,
+       khangman,
+       kturtle
+<<
+
+Source: mirror:kde:stable/%v/src/kde-i18n/kde-i18n-th-%v.tar.bz2
+Source-MD5: 11a49cc84cc87306dad4c61286ae0048
+SourceDirectory: kde-i18n-th-%v
+PatchScript: perl -pi -e 's,doc/HTML,doc/kde,g' configure
+
+CompileScript: (export HOME=/tmp; export KDEDIR=%p; sh configure %c; find . 
-name \*.bz2 -exec touch {} \;; make -j2)
+
+InstallScript: <<
+  make -j2 install DESTDIR=%d
+  mkdir -p %i/share/doc/kde-installed-packages
+  touch %i/share/doc/kde-installed-packages/kde-i18n-thai
+<<
+
+DescDetail: Language files for the K Desktop Environment: Thai
+

Modified: trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-unified.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-unified.info&rev=786&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-unified.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-unified.info Tue May 15 
23:22:56 2007
@@ -221,7 +221,6 @@
                lib/libkabc_dir.*.dylib
                lib/libkabc_file.*.dylib
                lib/libkabc_ldapkio.*.dylib
-               lib/libkabc_net.*.dylib
                lib/libkatepartinterfaces.*.dylib
                lib/libkdecore.*.dylib
                lib/libkdefakes.*.dylib
@@ -263,7 +262,6 @@
                %p/lib/libkabc_dir.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
                %p/lib/libkabc_file.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
                %p/lib/libkabc_ldapkio.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
-               %p/lib/libkabc_net.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
                %p/lib/libkatepartinterfaces.0.dylib 1.0.0 %N-shlibs (>= 
3.4.0-1)
                %p/lib/libkdecore.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)
                %p/lib/libkdefakes.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)

Modified: trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-unified.patch
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-unified.patch&rev=786&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-unified.patch (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-unified.patch Tue May 15 
23:22:56 2007
@@ -421,26 +421,6 @@
  libkspell_la_LIBADD = libkdeui.la
  libkspell_la_SOURCES = dummy.cpp
  
---- 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 @@
@@ -492,88 +472,3 @@
  
  kpac_dhcp_helper_SOURCES = kpac_dhcp_helper.c
  kpac_dhcp_helper_CFLAGS = $(KDE_USE_FPIE)
---- 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;
- }
- 
--
- /*
-  * 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
- 
-+  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);
- }
- 

Added: trunk/experimental/common/main/finkinfo/kde/kde-i18n-kashubian.info
URL: 
http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/main/finkinfo/kde/kde-i18n-kashubian.info&rev=786&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kde-i18n-kashubian.info (added)
+++ trunk/experimental/common/main/finkinfo/kde/kde-i18n-kashubian.info Tue May 
15 23:22:56 2007
@@ -1,0 +1,21 @@
+Package: kde-i18n-kashubian
+Source: mirror:kde:stable/%v/src/kde-i18n/kde-i18n-csb-%v.tar.bz2
+
+SourceDirectory: kde-i18n-csb-%v
+Description: KDE - languages for Kashubian
+DescDetail: Language files for the K Desktop Environment: Kashubian
+Source-MD5: ef5fbce181df8ac2ea0c0d773e10f6c4
+Version: 3.5.7
+Revision: 1
+Replaces: koffice-i18n-kashubian, khangman, kturtle
+Depends: kdelibs3-unified (>= %v-1), xfonts-intl
+BuildDepends: fink (>= 0.17.1-1), arts-dev, kdebase3-unified-dev (>= %v-1), 
kdelibs3-unified-dev (>= %v-1), libxml2, libxslt, xfonts-intl
+Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
+PatchScript: perl -pi -e 's,doc/HTML,doc/kde,g' configure
+CompileScript: (export HOME=/tmp; export KDEDIR=%p; sh configure %c; find . 
-name \*.bz2 -exec touch {} \;; make -j2)
+InstallScript: <<
+  make -j2 install DESTDIR=%d
+  mkdir -p %i/share/doc/kde-installed-packages
+  touch %i/share/doc/kde-installed-packages/kde-i18n-kashubian
+<<
+License: GPL/LGPL

Added: trunk/experimental/common/main/finkinfo/kde/kde-i18n-thai.info
URL: 
http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/main/finkinfo/kde/kde-i18n-thai.info&rev=786&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kde-i18n-thai.info (added)
+++ trunk/experimental/common/main/finkinfo/kde/kde-i18n-thai.info Tue May 15 
23:22:56 2007
@@ -1,0 +1,21 @@
+Package: kde-i18n-thai
+Source: mirror:kde:stable/%v/src/kde-i18n/kde-i18n-th-%v.tar.bz2
+
+SourceDirectory: kde-i18n-th-%v
+Description: KDE - languages for Thai
+DescDetail: Language files for the K Desktop Environment: Thai
+Source-MD5: 11a49cc84cc87306dad4c61286ae0048
+Version: 3.5.7
+Revision: 1
+Replaces: koffice-i18n-thai, khangman, kturtle
+Depends: kdelibs3-unified (>= %v-1), xfonts-intl
+BuildDepends: fink (>= 0.17.1-1), arts-dev, kdebase3-unified-dev (>= %v-1), 
kdelibs3-unified-dev (>= %v-1), libxml2, libxslt, xfonts-intl
+Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
+PatchScript: perl -pi -e 's,doc/HTML,doc/kde,g' configure
+CompileScript: (export HOME=/tmp; export KDEDIR=%p; sh configure %c; find . 
-name \*.bz2 -exec touch {} \;; make -j2)
+InstallScript: <<
+  make -j2 install DESTDIR=%d
+  mkdir -p %i/share/doc/kde-installed-packages
+  touch %i/share/doc/kde-installed-packages/kde-i18n-thai
+<<
+License: GPL/LGPL

Modified: trunk/experimental/common/main/finkinfo/kde/kdelibs3-unified.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdelibs3-unified.info&rev=786&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdelibs3-unified.info (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdelibs3-unified.info Tue May 
15 23:22:56 2007
@@ -223,7 +223,6 @@
                lib/libkabc_dir.*.dylib
                lib/libkabc_file.*.dylib
                lib/libkabc_ldapkio.*.dylib
-               lib/libkabc_net.*.dylib
                lib/libkatepartinterfaces.*.dylib
                lib/libkdecore.*.dylib
                lib/libkdefakes.*.dylib
@@ -265,7 +264,6 @@
                %p/lib/libkabc_dir.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
                %p/lib/libkabc_file.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
                %p/lib/libkabc_ldapkio.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
-               %p/lib/libkabc_net.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
                %p/lib/libkatepartinterfaces.0.dylib 1.0.0 %N-shlibs (>= 
3.4.0-1)
                %p/lib/libkdecore.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)
                %p/lib/libkdefakes.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)

Modified: trunk/experimental/common/main/finkinfo/kde/kdelibs3-unified.patch
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdelibs3-unified.patch&rev=786&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdelibs3-unified.patch 
(original)
+++ trunk/experimental/common/main/finkinfo/kde/kdelibs3-unified.patch Tue May 
15 23:22:56 2007
@@ -434,27 +434,6 @@
  libkspell_la_LIBADD = libkdeui.la
  libkspell_la_SOURCES = dummy.cpp
  
-diff -uNr kdelibs-3.5.6/khtml/html/htmltokenizer.cpp 
kdelibs-3.5.6-new/khtml/html/htmltokenizer.cpp
---- 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;
 diff -uNr kdelibs-3.5.6/kimgio/Makefile.am kdelibs-3.5.6-new/kimgio/Makefile.am
 --- 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
@@ -510,89 +489,3 @@
  
  kpac_dhcp_helper_SOURCES = kpac_dhcp_helper.c
  kpac_dhcp_helper_CFLAGS = $(KDE_USE_FPIE)
-diff -uNr kdelibs-3.5.6/khtml/ecma/kjs_html.cpp 
kdelibs-3.5.6-new/khtml/ecma/kjs_html.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;
- }
- 
--
- /*
-  * 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
- 
-+  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);
- }
- 


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to