Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.36 grimoire by Eric Sandall (2a7cdad5cf50af3fb0d850d210c6894171bbc4f0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.36 grimoire by Eric Sandall (2a7cdad5cf50af3fb0d850d210c6894171bbc4f0)
  • Date: Fri, 9 Oct 2009 15:26:02 -0500

GIT changes to stable-0.36 grimoire by Eric Sandall <sandalle AT sourcemage.org>:

VERSION | 2
net/samba/DETAILS | 6 -
net/samba/HISTORY | 3
x11-toolkits/qt4/DETAILS | 2
x11-toolkits/qt4/HISTORY | 8 ++
x11-toolkits/qt4/PRE_BUILD | 3
x11-toolkits/qt4/nokia.diff | 11 +++
x11-toolkits/wxgtk/DETAILS | 1
x11-toolkits/wxgtk/HISTORY | 6 +
x11-toolkits/wxgtk/PRE_BUILD | 3
x11-toolkits/wxgtk/wxGTK-2.8.10.1-CVE-2009-2369.patch | 59
++++++++++++++++++
11 files changed, 99 insertions(+), 5 deletions(-)

New commits:
commit 2a7cdad5cf50af3fb0d850d210c6894171bbc4f0
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

VERSION: 0.36-1

commit b9377ce5f37523f2bd518dfd0af3897c5a064dd3
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

samba: Updated to version 3.4.2. SECURITY_PATCH++
(cherry-picked from 50ea724b2007c46ca9a8124a8b8b3ca3c1a573d2)

commit c0fd4af89788263a24cb838bd5ebbeb002d08e1a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

qt4 - fix cve-2009-2700

(Cherry-picked from 952dc738091c9ffc284757f5eda06be9805ff02c)

commit 76b9380c02addf7a5cdd002c60079b89181ab849
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Eric Sandall <sandalle AT sourcemage.org>

x11-toolkits/wxgtk: fixed security issue (CVE-2009-2369)

(Cherry-picked from 9a102e4e30da7c6ba8031f5bf26db3f9b043b1bf)

diff --git a/VERSION b/VERSION
index 8cd71de..122bf64 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.36-0
+0.36-1
diff --git a/net/samba/DETAILS b/net/samba/DETAILS
index 502a9b6..85ab43e 100755
--- a/net/samba/DETAILS
+++ b/net/samba/DETAILS
@@ -1,18 +1,18 @@
SPELL=samba
- VERSION=3.4.0
+ VERSION=3.4.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.samba.org/samba/ftp/$SOURCE
SOURCE_URL[1]=ftp://de3.samba.org/pub/$SPELL/$SOURCE
SOURCE_URL[2]=http://us1.samba.org/samba/ftp/old-versions/$SOURCE
-
SOURCE_HASH=sha512:711fc9e2e10e4b06f65fee0cc84f0c448cc44377ddf30c4c6db1f2b2022be6ce7ba82f8e749b1fb5ac90a08fe083e4c31ea670a150a567094c573378a2e943b3
+
SOURCE_HASH=sha512:a35dc272536179be2832ebb251ab9ff43eb82e48700f4ed67626845ccb05a93b0f8ab9f227218bff777c4f291e759b674ac8a948a3380c7fe97e118ce90f0553
if [[ "$SAMBA_VSCAN" == "y" ]] ; then
VSCAN_VERSION=0.3.6c-beta4
SOURCE2=$SPELL-vscan-$VSCAN_VERSION.tar.gz
SOURCE2_URL[0]=http://www.openantivirus.org/download/$SOURCE2

SOURCE2_HASH=sha512:6a4d6f9c033777a54af19f5e4d637ba0515cfb6ca3c815357d8ee4d735586f372d9b7e2b315a783be21ce524aa6f39e1536f91031f496acffbda225a6c8a996f
fi
- SECURITY_PATCH=11
+ SECURITY_PATCH=12
LICENSE[0]=GPL
WEB_SITE=http://www.samba.org/
KEYWORDS="net"
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index 544be7e..2f9e305 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,6 @@
+2009-10-02 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 3.4.2. SECURITY_PATCH++
+
2009-08-19 George Sherwood <gsherwood AT sourcemage.org>
* BUILD: Samba3 source is located now in source3
* DETAILS: Updated to version 3.4.0
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index e10b49d..81a5b3d 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -23,7 +23,7 @@ persistent_remove QT_VER

SOURCE_HASH=sha512:385f4a30959a67864f05e6192fbd05755a12319dfbf30507d8757b9cf515cb70eba063e0eb356c583bbd90538434c41ab08336daf10b3ce43016b85f1e462735
SOURCE=$SPELLX-$VERSION.tar.bz2
URI=qt/source/$SOURCE
- SECURITY_PATCH=2
+ SECURITY_PATCH=3
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
#esac
SOURCE_URL[0]=http://download.qtsoftware.com/$URI
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 164e56a..8281d7f 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,11 @@
+2009-09-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++
+ * PRE_BUILD: apply nokia patch
+ * nodia.diff: added, upstream security patch
+
<http://qt.nokia.com/about/news/qt-patches-released-addressing-potential-security-flaw>
+ cve-2009-2700
+ fixes bug #15388
+
2009-07-16 Treeve Jelbert <treeve AT sourcemage.org>
* POST_INSTALL: added, fix bad pkgconfig files
* DETAILS: PATCHLEVEL=1
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index 27d53a0..58941c6 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -1,6 +1,9 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

+# upstream patch
+patch -p0 < $SPELL_DIRECTORY/nokia.diff &&
+
# add better optimisation flags
sed -i "s|-O2||" mkspecs/common/g++.conf \
mkspecs/linux-cxx/qmake.conf &&
diff --git a/x11-toolkits/qt4/nokia.diff b/x11-toolkits/qt4/nokia.diff
new file mode 100644
index 0000000..5d365b3
--- /dev/null
+++ b/x11-toolkits/qt4/nokia.diff
@@ -0,0 +1,11 @@
+--- src/network/ssl/qsslcertificate.cpp 2009-09-05 11:24:45.000000000
+0200
++++ src/network/ssl/qsslcertificate.cpp.cp 2009-09-05 11:54:28.000000000
+0200
+@@ -377,7 +377,7 @@
+ }
+
+ const char *altNameStr = reinterpret_cast<const char
*>(q_ASN1_STRING_data(genName->d.ia5));
+- const QString altName = QLatin1String(QByteArray(altNameStr,
len));
++ const QString altName = QString::fromLatin1(altNameStr, len);
+ if (genName->type == GEN_DNS)
+ result.insert(QSsl::DnsEntry, altName);
+ else if (genName->type == GEN_EMAIL)
diff --git a/x11-toolkits/wxgtk/DETAILS b/x11-toolkits/wxgtk/DETAILS
index 5479a48..ddd6cf8 100755
--- a/x11-toolkits/wxgtk/DETAILS
+++ b/x11-toolkits/wxgtk/DETAILS
@@ -3,6 +3,7 @@
if [[ "$WX_DEV" == "y" ]];then
VERSION=2.8.10

SOURCE_HASH=sha512:3a007846beff1ccc736d267d66793967350d1eaccc1d4707d7a9133cd5215d53158247a5f1882479a30e156ebcd86affe74633da392b295ad890f3819ca6bea5
+ SECURITY_PATCH=1
else
VERSION=2.6.4

SOURCE_HASH=sha512:53b3a1a111288910b18e3743d8e389398bf7e60cddbf0ad609cd72fa4fbd5da2bb9b3b94427ba7ec9d695fb1cbca5fa79a1836a15c652aebf2ae605b1f93f4c5
diff --git a/x11-toolkits/wxgtk/HISTORY b/x11-toolkits/wxgtk/HISTORY
index acb1001..6d46db4 100644
--- a/x11-toolkits/wxgtk/HISTORY
+++ b/x11-toolkits/wxgtk/HISTORY
@@ -1,3 +1,9 @@
+2009-09-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, wxgtk-2.8.10-gsocket.patch: added patch to make
+ the spell compile with our version of glib
+ * PRE_BUILD, wxGTK-2.8.10.1-CVE-2009-2369.patch, DETAILS:
+ added patch that fixes CVE-2009-2369, set SECURITY_PATCH=1
+
2009-06-08 Treeve Jelbert <treeve AT sourcemage.org>
* PROVIDES: added
* CONFLICTS: add wxgtk-new
diff --git a/x11-toolkits/wxgtk/PRE_BUILD b/x11-toolkits/wxgtk/PRE_BUILD
index 3b1d034..91b0154 100755
--- a/x11-toolkits/wxgtk/PRE_BUILD
+++ b/x11-toolkits/wxgtk/PRE_BUILD
@@ -3,4 +3,7 @@ cd $SOURCE_DIRECTORY &&

if [[ $WX_DEV != y ]]; then
patch -p1 < $SPELL_DIRECTORY/debdiff.patch
+else
+ patch -p1 < ${SPELL_DIRECTORY}/wxGTK-2.8.10.1-CVE-2009-2369.patch &&
+ patch -p1 < ${SPELL_DIRECTORY}/wxgtk-2.8.10-gsocket.patch
fi
diff --git a/x11-toolkits/wxgtk/wxGTK-2.8.10.1-CVE-2009-2369.patch
b/x11-toolkits/wxgtk/wxGTK-2.8.10.1-CVE-2009-2369.patch
new file mode 100644
index 0000000..42392c8
--- /dev/null
+++ b/x11-toolkits/wxgtk/wxGTK-2.8.10.1-CVE-2009-2369.patch
@@ -0,0 +1,59 @@
+diff -Naurp wxPython-src-2.8.10.1-orig/src/common/imagpng.cpp
wxPython-src-2.8.10.1/src/common/imagpng.cpp
+--- wxPython-src-2.8.10.1-orig/src/common/imagpng.cpp 2008-05-11
22:26:45.000000000 -0600
++++ wxPython-src-2.8.10.1/src/common/imagpng.cpp 2009-07-18
19:54:13.128547627 -0600
+@@ -568,18 +568,16 @@ wxPNGHandler::LoadFile(wxImage *image,
+ if (!image->Ok())
+ goto error;
+
+- lines = (unsigned char **)malloc( (size_t)(height * sizeof(unsigned
char *)) );
++ // initialize all line pointers to NULL to ensure that they can be
safely
++ // free()d if an error occurs before all of them could be allocated
++ lines = (unsigned char **)calloc(height, sizeof(unsigned char *));
+ if ( !lines )
+ goto error;
+
+ for (i = 0; i < height; i++)
+ {
+ if ((lines[i] = (unsigned char *)malloc( (size_t)(width *
(sizeof(unsigned char) * 4)))) == NULL)
+- {
+- for ( unsigned int n = 0; n < i; n++ )
+- free( lines[n] );
+ goto error;
+- }
+ }
+
+ png_read_image( png_ptr, lines );
+diff -Naurp wxPython-src-2.8.10.1-orig/src/common/imagtiff.cpp
wxPython-src-2.8.10.1/src/common/imagtiff.cpp
+--- wxPython-src-2.8.10.1-orig/src/common/imagtiff.cpp 2007-09-21
14:27:05.000000000 -0600
++++ wxPython-src-2.8.10.1/src/common/imagtiff.cpp 2009-07-18
19:54:35.801832862 -0600
+@@ -261,7 +261,6 @@ bool wxTIFFHandler::LoadFile( wxImage *i
+ }
+
+ uint32 w, h;
+- uint32 npixels;
+ uint32 *raster;
+
+ TIFFGetField( tif, TIFFTAG_IMAGEWIDTH, &w );
+@@ -275,9 +274,20 @@ bool wxTIFFHandler::LoadFile( wxImage *i
+ (samplesInfo[0] == EXTRASAMPLE_ASSOCALPHA ||
+ samplesInfo[0] == EXTRASAMPLE_UNASSALPHA));
+
+- npixels = w * h;
++ // guard against integer overflow during multiplication which could
result
++ // in allocating a too small buffer and then overflowing it
++ const double bytesNeeded = (double)w * (double)h * sizeof(uint32);
++ if ( bytesNeeded >= 4294967295U /* UINT32_MAX */ )
++ {
++ if ( verbose )
++ wxLogError( _("TIFF: Image size is abnormally big.") );
++
++ TIFFClose(tif);
++
++ return false;
++ }
+
+- raster = (uint32*) _TIFFmalloc( npixels * sizeof(uint32) );
++ raster = (uint32*) _TIFFmalloc( bytesNeeded );
+
+ if (!raster)
+ {



  • [SM-Commit] GIT changes to stable-0.36 grimoire by Eric Sandall (2a7cdad5cf50af3fb0d850d210c6894171bbc4f0), Eric Sandall, 10/09/2009

Archive powered by MHonArc 2.6.24.

Top of Page