Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (4436876a40f21ddfbf7df9540d277d84fbd1db0c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (4436876a40f21ddfbf7df9540d277d84fbd1db0c)
  • Date: Mon, 2 Apr 2007 11:30:15 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

disk/ntfs-3g/DETAILS | 4 -
disk/ntfs-3g/HISTORY | 3
kde-core/kdelibs/CVE-2007-1564-kdelibs-3.5.6.diff | 81
++++++++++++++++++++++
kde-core/kdelibs/DETAILS | 2
kde-core/kdelibs/HISTORY | 8 ++
kde-core/kdelibs/PRE_BUILD | 1
kde4/kdegames4/CONFIGURE | 1
kde4/kdegames4/DEPENDS | 1
kde4/kdegames4/DETAILS | 16 ++++
kde4/kdegames4/HISTORY | 7 +
10 files changed, 121 insertions(+), 3 deletions(-)

New commits:
commit b58278b3d8ce334c05ebc729396316f39392e79b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kdelibs - fix bug#13672

commit 7c98eb21d1e16d437161d88253b3401b02060377
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kdegames4 3.80.3

commit ae5019a2b38e947fe48385da7872a275c08016c2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

ntfs-3g-1.328

diff --git a/disk/ntfs-3g/DETAILS b/disk/ntfs-3g/DETAILS
index 5b342fa..86ede94 100755
--- a/disk/ntfs-3g/DETAILS
+++ b/disk/ntfs-3g/DETAILS
@@ -1,6 +1,6 @@
SPELL=ntfs-3g
- VERSION=1.0
-
SOURCE_HASH=sha512:83e89bbcf5b77881be6bdb703a6fecf3828f6584d00af30504e055013fc111dbb234a7fef8d5b4a6c2509c043c923e7afc2a44e7bc73e4694c9b84aa080243bd
+ VERSION=1.328
+
SOURCE_HASH=sha512:2cb71c2f1478c65e170edde7f0750a249eb1fb1e5e9a449b858dda1156e615bf8fddc57e9a63e57d33faaa5450607df49cb0cfe7d6903e24cea642848a67a532
SOURCE=$SPELL-$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.ntfs-3g.org/
diff --git a/disk/ntfs-3g/HISTORY b/disk/ntfs-3g/HISTORY
index 69bccc3..b5c6132 100644
--- a/disk/ntfs-3g/HISTORY
+++ b/disk/ntfs-3g/HISTORY
@@ -1,3 +1,6 @@
+2007-04-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.328
+
2007-02-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0

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
new file mode 100644
index 0000000..b026d67
--- /dev/null
+++ b/kde-core/kdelibs/CVE-2007-1564-kdelibs-3.5.6.diff
@@ -0,0 +1,81 @@
+--- 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 2fc3b83..859f47a 100755
--- a/kde-core/kdelibs/DETAILS
+++ b/kde-core/kdelibs/DETAILS
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=$KDE_URL/stable/${VERSION//.0/}/src/$SOURCE
WEB_SITE=http://www.kde.org
ENTERED=20020912
- SECURITY_PATCH=2
+ SECURITY_PATCH=3
LICENSE[0]=GPL
KEYWORDS="kde"
SHORT="Base applications that form the core of KDE."
diff --git a/kde-core/kdelibs/HISTORY b/kde-core/kdelibs/HISTORY
index d41930d..d699cfb 100644
--- a/kde-core/kdelibs/HISTORY
+++ b/kde-core/kdelibs/HISTORY
@@ -1,3 +1,11 @@
+2007-04-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++
+ * CVE-2007-1564-kdelibs-3.5.6.diff: added
+ * PRE_BUILD: apply patch
+ security fix CVE-2007-1564
+ URL: http://www.kde.org/info/security/advisory-20070326-1.txt
+ fixes bug #13672
+
2007-03-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: SECURITY_PATCH
* PRE_BUILD, post-3.5.6-kdelibs.diff:add
diff --git a/kde-core/kdelibs/PRE_BUILD b/kde-core/kdelibs/PRE_BUILD
index 13e4826..cab47ec 100755
--- a/kde-core/kdelibs/PRE_BUILD
+++ b/kde-core/kdelibs/PRE_BUILD
@@ -1,3 +1,4 @@
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
diff --git a/kde4/kdegames4/CONFIGURE b/kde4/kdegames4/CONFIGURE
new file mode 100755
index 0000000..3e2e1ef
--- /dev/null
+++ b/kde4/kdegames4/CONFIGURE
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/KDE_CONFIGURE
diff --git a/kde4/kdegames4/DEPENDS b/kde4/kdegames4/DEPENDS
new file mode 100755
index 0000000..a76a6e4
--- /dev/null
+++ b/kde4/kdegames4/DEPENDS
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/KDE_DEPENDS
diff --git a/kde4/kdegames4/DETAILS b/kde4/kdegames4/DETAILS
new file mode 100755
index 0000000..5360dfb
--- /dev/null
+++ b/kde4/kdegames4/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=kdegames4
+ SPELLX=${SPELL//4}
+ VERSION=3.80.3
+
SOURCE_HASH=sha512:c96adfe215bd272a80f5869a5ff497666e81cbd24c5a196627dfd257b42c82c095dac9ad8e3e60ca1d37b4901521ee14a924bcbf4565b56161a4b2d08d13f4bd
+ SOURCE=$SPELLX-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+ SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0/}/src/$SOURCE
+ WEB_SITE=http://www.kde.org
+ ENTERED=20020912
+# SECURITY_PATCH=1
+ LICENSE[0]=GPL
+ KEYWORDS="kde"
+ SHORT="games for KDE"
+cat << EOF
+games for KDE
+EOF
diff --git a/kde4/kdegames4/HISTORY b/kde4/kdegames4/HISTORY
new file mode 100644
index 0000000..3e38604
--- /dev/null
+++ b/kde4/kdegames4/HISTORY
@@ -0,0 +1,7 @@
+2007-03-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.80.3
+
+2007-02-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.80.2
+ kde4 spell cloned from kde3 spell
+



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (4436876a40f21ddfbf7df9540d277d84fbd1db0c), Treeve Jelbert, 04/02/2007

Archive powered by MHonArc 2.6.24.

Top of Page