Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (dcb041e6aa4a36a06692fd0fe452e3fb2c2a19e0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (dcb041e6aa4a36a06692fd0fe452e3fb2c2a19e0)
  • Date: Tue, 22 May 2007 12:28:06 -0500

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

kde-core/kdebase/DETAILS | 4 -
kde-core/kdebase/HISTORY | 3
kde-core/kdelibs/CVE-2007-1564-kdelibs-3.5.6.diff | 81
----------------------
kde-core/kdelibs/DETAILS | 4 -
kde-core/kdelibs/HISTORY | 3
kde-core/kdelibs/PRE_BUILD | 3
kde-core/kdelibs/post-3.5.6-kdelibs.diff | 20 -----
7 files changed, 11 insertions(+), 107 deletions(-)

New commits:
commit dcb041e6aa4a36a06692fd0fe452e3fb2c2a19e0
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

kdebase: 3.5.7

commit 1a9c22e79ce68f99276fc4ee58009991538ae081
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

kdelibs: 3.5.7

diff --git a/kde-core/kdebase/DETAILS b/kde-core/kdebase/DETAILS
index f198a71..0620370 100755
--- a/kde-core/kdebase/DETAILS
+++ b/kde-core/kdebase/DETAILS
@@ -1,8 +1,8 @@
source $SECTION_DIRECTORY/KDE_DETAILS

SPELL=kdebase
- VERSION=3.5.6
-
SOURCE_HASH=sha512:6baa5957683e9a8ebf3f184b1daed34147a361ba0ece8f45c3f6eaf343ec7f0c1171c8d77d253c27ec1d0d98d39327f8ae25f0ec46ef8bf2b6ebfd5ca335ab4c
+ VERSION=3.5.7
+
SOURCE_HASH=sha512:b7a01346b36b0bf6c4fcfe6104f738c60f188864d942286e9bf785f8e53ddd0e4643766d285cb499b6bf3cd61d3c0fd3c88f0e5e7c4498faeadadd6e1d1d957b
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KDE_URL/stable/${VERSION//.0/}/src/$SOURCE
diff --git a/kde-core/kdebase/HISTORY b/kde-core/kdebase/HISTORY
index 0286c4c..c91ef4c 100644
--- a/kde-core/kdebase/HISTORY
+++ b/kde-core/kdebase/HISTORY
@@ -1,3 +1,6 @@
+2007-05-22 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: updated spell to 3.5.7
+
2007-03-21 Juuso Alasuutari <iuso AT sourcemage.org>
* SUB_DEPENDS: Fixed buggy echo command.

diff --git a/kde-core/kdelibs/CVE-2007-1564-kdelibs-3.5.6.diff
b/kde-core/kdelibs/CVE-2007-1564-kdelibs-3.5.6.diff
deleted file mode 100644
index b026d67..0000000
--- a/kde-core/kdelibs/CVE-2007-1564-kdelibs-3.5.6.diff
+++ /dev/null
@@ -1,81 +0,0 @@
---- khtml/ecma/kjs_html.cpp
-+++ khtml/ecma/kjs_html.cpp
-@@ -1866,9 +1866,11 @@ Value KJS::HTMLElement::getValueProperty
- getDOMNode(exec,
frameElement.contentDocument()) : Undefined();
- case FrameContentWindow: {
- KHTMLPart* part =
static_cast<DOM::HTMLFrameElementImpl*>(frameElement.handle())->contentPart();
-- if (part)
-- return Value(Window::retrieveWindow(part));
-- else
-+ if (part) {
-+ Window *w = Window::retrieveWindow(part);
-+ if (w)
-+ return Value(w);
-+ }
- return Undefined();
- }
- case FrameFrameBorder: return String(frameElement.frameBorder());
-@@ -1899,9 +1901,11 @@ Value KJS::HTMLElement::getValueProperty
- getDOMNode(exec,
iFrame.contentDocument()) : Undefined();
- case IFrameContentWindow: {
- KHTMLPart* part =
static_cast<DOM::HTMLIFrameElementImpl*>(iFrame.handle())->contentPart();
-- if (part)
-- return Value(Window::retrieveWindow(part));
-- else
-+ if (part) {
-+ Window *w = Window::retrieveWindow(part);
-+ if (w)
-+ return Value(w);
-+ }
- return Undefined();
- }
- case IFrameFrameBorder: return String(iFrame.frameBorder());
---- kioslave/ftp/ftp.cc
-+++ 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);
- }
-
diff --git a/kde-core/kdelibs/DETAILS b/kde-core/kdelibs/DETAILS
index 859f47a..0cd5a79 100755
--- a/kde-core/kdelibs/DETAILS
+++ b/kde-core/kdelibs/DETAILS
@@ -1,8 +1,8 @@
source $SECTION_DIRECTORY/KDE_DETAILS

SPELL=kdelibs
- VERSION=3.5.6
-
SOURCE_HASH=sha512:c38215c9e67cab4db50d172ba2ad197e35e52d3927aee58ad363d8cce4bb116fbb1aef014553777a2c72d837c5b17732ccfc9adf0f0835a64a75e62c84599a9d
+ VERSION=3.5.7
+
SOURCE_HASH=sha512:860e3d9c041a9086077893590a556980c402ca6a08938b5ac48aeb29c8366576f6c3078e624263b4e097338f6a57255da4e1df1cb7b4e54a6cb330dd28a081af
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KDE_URL/stable/${VERSION//.0/}/src/$SOURCE
diff --git a/kde-core/kdelibs/HISTORY b/kde-core/kdelibs/HISTORY
index 19917db..1ba99a6 100644
--- a/kde-core/kdelibs/HISTORY
+++ b/kde-core/kdelibs/HISTORY
@@ -1,3 +1,6 @@
+2007-05-22 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: updated spell to 3.5.7
+
2007-04-04 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: No longer uses lesstif for Netscape plugins

diff --git a/kde-core/kdelibs/PRE_BUILD b/kde-core/kdelibs/PRE_BUILD
index cab47ec..539ca82 100755
--- a/kde-core/kdelibs/PRE_BUILD
+++ b/kde-core/kdelibs/PRE_BUILD
@@ -1,4 +1,3 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/CVE-2007-1564-kdelibs-3.5.6.diff &&
-patch -p0 < $SPELL_DIRECTORY/post-3.5.6-kdelibs.diff
+true
diff --git a/kde-core/kdelibs/post-3.5.6-kdelibs.diff
b/kde-core/kdelibs/post-3.5.6-kdelibs.diff
deleted file mode 100644
index 5b44a47..0000000
--- a/kde-core/kdelibs/post-3.5.6-kdelibs.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- khtml/html/htmltokenizer.cpp
-+++ khtml/html/htmltokenizer.cpp
-@@ -316,7 +316,7 @@ void HTMLTokenizer::parseSpecial(Tokeniz
- 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 @@ void HTMLTokenizer::parseComment(Tokeniz
-
- if (canClose || handleBrokenComments || scriptEnd ){
- ++src;
-- if ( !( script || xmp || textarea || style) ) {
-+ if ( !( title || script || xmp || textarea || style) ) {
- #ifdef COMMENTS_IN_DOM
- checkScriptBuffer();
- scriptCode[ scriptCodeSize ] = 0;



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (dcb041e6aa4a36a06692fd0fe452e3fb2c2a19e0), Jaka Kranjc, 05/22/2007

Archive powered by MHonArc 2.6.24.

Top of Page