Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.13 grimoire by Eric Sandall (101758809a0559a1d1efdf0d92bfe891030d2b3e)

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.13 grimoire by Eric Sandall (101758809a0559a1d1efdf0d92bfe891030d2b3e)
  • Date: Wed, 26 Sep 2007 12:10:59 -0500

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

VERSION | 2
disk/netatalk/BUILD | 2
disk/netatalk/CONFIGURE | 36 +++++-----
disk/netatalk/DETAILS | 14 +++-
disk/netatalk/HISTORY | 10 +++
disk/netatalk/PRE_BUILD | 4 +
disk/netatalk/netatalk-2.0.3-db43.patch | 32 +++++++++
disk/netatalk/netatalk-2.0.3-newerdb.patch | 28 ++++++++
graphics-libs/freetype2/DETAILS | 2
graphics-libs/freetype2/HISTORY | 3
http/lighttpd/DETAILS | 6 -
http/lighttpd/HISTORY | 3
kde-core/kdebase/DETAILS | 2
kde-core/kdebase/HISTORY | 8 ++
kde-core/kdebase/PRE_BUILD | 3
kde-core/kdebase/post-3.5.7-kdebase-kdm.diff | 63
+++++++++++++++++++
kde-core/kdebase/post-3.5.7-kdebase-konqueror-2.diff | 49 ++++++++++++++
kde-core/kdebase/post-3.5.7-kdebase-konqueror.diff | 49 --------------
kde-core/kdelibs/DETAILS | 2
kde-core/kdelibs/HISTORY | 7 ++
kde-core/kdelibs/PRE_BUILD | 3
kde-core/kdelibs/post-3.5.7-kdelibs-kdecore-2.diff | 34 ++++++++++
kde-core/kdelibs/post-3.5.7-kdelibs-kdecore.diff | 61
------------------
x11-toolkits/qt-x11/175791_3.diff | 11 +++
x11-toolkits/qt-x11/DETAILS | 2
x11-toolkits/qt-x11/HISTORY | 6 +
x11-toolkits/qt-x11/PRE_BUILD | 1
x11-toolkits/qt4/175791_4.diff | 11 +++
x11-toolkits/qt4/DETAILS | 4 -
x11-toolkits/qt4/HISTORY | 6 +
x11-toolkits/qt4/PRE_BUILD | 5 +
31 files changed, 321 insertions(+), 148 deletions(-)

New commits:
commit 101758809a0559a1d1efdf0d92bfe891030d2b3e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

VERSION: 0.13-4

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

kdebase - security fix

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

kdelibs - security fix

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

netatalk: Updated to version 2.0.3. Fixed compiles problems with
newer version of db. Bug #11524. Added patches from gentoo for
this problem. Cleaned up DETAILS and fixed bug that spell was
using variable OPTS in CONFIGURE.

commit 8cde2fe3ad51257a793de278fcac37a776a18932
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "reetype2-2.3.5"

This reverts commit 772a6e815bdf4b53f49e3930a4b30bbe8e1ed5c4.

Bug #14007 (xorg fails with newer freetype2)

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

lighttpd: Updated to version 1.4.18. SECURITY_PATCH++

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

fix bug #13987

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

fix bug #13987

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

ix bug #13987

diff --git a/VERSION b/VERSION
index 319143f..a10f97e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.13-3
+0.13-4
diff --git a/disk/netatalk/BUILD b/disk/netatalk/BUILD
index e6a05ed..43fb2fd 100755
--- a/disk/netatalk/BUILD
+++ b/disk/netatalk/BUILD
@@ -1,3 +1,3 @@
-OPTS="--enable-redhat --enable-fhs" &&
+OPTS="--enable-redhat --enable-fhs $NETATALK_OPTS" &&

default_build
diff --git a/disk/netatalk/CONFIGURE b/disk/netatalk/CONFIGURE
index a86c952..42dcf86 100755
--- a/disk/netatalk/CONFIGURE
+++ b/disk/netatalk/CONFIGURE
@@ -1,89 +1,89 @@
-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable admin group?" y \
"--enable-admin-group" \
"--disable-admin-group" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable timelord (time server)?" n \
"--enable-timelord" \
"--disable-timelord" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable valid shell check?" y \
"--enable-shell-check" \
"--disable-shell-check" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable filename mangling?" y \
"--with-mangling" \
"--without-mangling" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable Andrew FileSystem support?" n \
"--enable-afs" \
"--disable-afs" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable DDP?" y \
"--enable-ddp" \
"--disable-ddp" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable AFP 3.x calls?" y \
"--enable-afp3" \
"--disable-afp3" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS
\
"Enable the EXPERIMENTAL dropbox fix (INSECURE!)?" n \
"--enable-dropkludge" \
"--disable-dropkludge"
&&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable Apple2 boot server?" n \
"--enable-a2boot" \
"--disable-a2boot" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable debug code?" n \
"--enable-debug1" \
"--disable-debug1" &&

-config_query_option OPTS
\
+config_query_option NETATALK_OPTS
\
"Enable CNID with Concurrent DBD Data Store (cdb)?" y
\
"--with-cnid-cdb-backend"
\
"--without-cnid-cdb-backend"
&&

-config_query_option OPTS
\
+config_query_option NETATALK_OPTS
\
"Enable CNID with Database Daemon Data Store (dbd)?" y
\
"--with-cnid-dbd-backend"
\
"--without-cnid-dbd-backend"
&&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS
\
"Enable transaction support for dbd backend?" n \
"--with-cnid-dbd-txn" \
"--without-cnid-dbd-txn" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS
\
"Enable CNID with transactional BDB Data Store?" n \
"--with-cnid-db3-backend" \
"--without-cnid-db3-backend" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable LAST CNID scheme?" y \
"--with-cnid-last-backend" \
"--without-cnid-last-backend" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable HASH CNID scheme?" n \
"--with-cnid-hash-backend" \
"--without-cnid-hash-backend" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable DID CNID scheme?" n \
"--with-cnid-tdb-backend" \
"--without-cnid-tdb-backend" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable MTAB CNID scheme?" n \
"--with-mtab-backend" \
"--without-mtab-backend"
diff --git a/disk/netatalk/DETAILS b/disk/netatalk/DETAILS
index 3fd83c0..3c1a4c3 100755
--- a/disk/netatalk/DETAILS
+++ b/disk/netatalk/DETAILS
@@ -1,14 +1,20 @@
SPELL=netatalk
- VERSION=2.0.2
+ VERSION=2.0.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- MD5[0]=9c51a84c3a8d2f97ad5191e3251aa685
+
SOURCE_HASH=sha512:28067912c440663213ddfbb71406daa0ecb7bd9d4e06f66978d259afd0eec2b3f01c7784432a3a991b9e39f784fef150bbf82dc4e63b9256cd582426954a35b4
WEB_SITE=http://netatalk.sourceforge.net/
ENTERED=20020321
- UPDATED=20030822
LICENSE[0]=GPL
SHORT="Seamless file and print services to AppleShare clients"
cat << EOF
-Netatalk is a freely-available, kernel level implementation of the AppleTalk
Protocol Suite, originally for BSD-derived systems. A *NIX/*BSD system
running netatalk is capable of serving many macintosh clients simultaneously
as an AppleTalk router, AppleShare file server, *NIX/*BSD print server, and
for accessing AppleTalk printers via Printer Access Protocol (PAP). Included
are a number of minor printing and debugging utilities. Since full support
requires AppleTalk to be compiled into your kernel, this release only sets up
Apple filesharing over tcp/ip.
+Netatalk is a freely-available, kernel level implementation of the AppleTalk
+Protocol Suite, originally for BSD-derived systems. A *NIX/*BSD system
+running netatalk is capable of serving many macintosh clients simultaneously
+as an AppleTalk router, AppleShare file server, *NIX/*BSD print server,
+and for accessing AppleTalk printers via Printer Access Protocol (PAP).
+Included are a number of minor printing and debugging utilities. Since
+full support requires AppleTalk to be compiled into your kernel, this
+release only sets up Apple filesharing over tcp/ip.
EOF
diff --git a/disk/netatalk/HISTORY b/disk/netatalk/HISTORY
index 425273c..69f6fbf 100644
--- a/disk/netatalk/HISTORY
+++ b/disk/netatalk/HISTORY
@@ -1,3 +1,13 @@
+2007-09-01 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 2.0.3. Removed UPDATED
+ * CONFIGURE: Changed variable from OPTS to NETATALK_OPTS
+ * BUILD: Added NETATALK_OPTS to OPTS
+ * PREB_BUILD: Added to patch for newer db versions. Fixed Bug #11524
+ * netatalk-2.0.3-db43.patch: Added gentoo patch from
+
http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/netatalk/files
+ * netatalk-2.0.3-newerdb.patch: Added gentoo patch from
+
http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/netatalk/files
+
2006-06-25 George Sherwood <george AT beernabeer.com>
* DEPENDS: Changed to CUPS from cups

diff --git a/disk/netatalk/PRE_BUILD b/disk/netatalk/PRE_BUILD
new file mode 100755
index 0000000..d42601d
--- /dev/null
+++ b/disk/netatalk/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/netatalk-2.0.3-db43.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/netatalk-2.0.3-newerdb.patch
diff --git a/disk/netatalk/netatalk-2.0.3-db43.patch
b/disk/netatalk/netatalk-2.0.3-db43.patch
new file mode 100644
index 0000000..93d3e4b
--- /dev/null
+++ b/disk/netatalk/netatalk-2.0.3-db43.patch
@@ -0,0 +1,32 @@
+Index: netatalk-2.0.3/bin/cnid/cnid_index.c
+===================================================================
+--- netatalk-2.0.3.orig/bin/cnid/cnid_index.c
++++ netatalk-2.0.3/bin/cnid/cnid_index.c
+@@ -274,7 +274,11 @@ static int dbif_count(const int dbi, u_i
+ DB_BTREE_STAT *sp;
+ DB *db = db_table[dbi].db;
+
++#if DB_VERSION_MAJOR > 4 || ( DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >=
3 )
++ ret = db->stat(db, db_txn, &sp, 0);
++#else
+ ret = db->stat(db, &sp, 0);
++#endif
+
+ if (ret) {
+ LOG(log_error, logtype_cnid, "error getting stat infotmation on
database: %s", db_strerror(errno));
+Index: netatalk-2.0.3/etc/cnid_dbd/dbif.c
+===================================================================
+--- netatalk-2.0.3.orig/etc/cnid_dbd/dbif.c
++++ netatalk-2.0.3/etc/cnid_dbd/dbif.c
+@@ -514,7 +514,11 @@ int dbif_count(const int dbi, u_int32_t
+ DB_BTREE_STAT *sp;
+ DB *db = db_table[dbi].db;
+
++#if DB_VERSION_MAJOR > 4 || ( DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >=
3 )
++ ret = db->stat(db, db_txn, &sp, 0);
++#else
+ ret = db->stat(db, &sp, 0);
++#endif
+
+ if (ret) {
+ LOG(log_error, logtype_cnid, "error getting stat infotmation on
database: %s", db_strerror(errno));
diff --git a/disk/netatalk/netatalk-2.0.3-newerdb.patch
b/disk/netatalk/netatalk-2.0.3-newerdb.patch
new file mode 100644
index 0000000..f64c8cf
--- /dev/null
+++ b/disk/netatalk/netatalk-2.0.3-newerdb.patch
@@ -0,0 +1,28 @@
+Index: netatalk-2.0.3/macros/db3-check.m4
+===================================================================
+--- netatalk-2.0.3.orig/macros/db3-check.m4
++++ netatalk-2.0.3/macros/db3-check.m4
+@@ -115,6 +115,14 @@ int main(void) {
+ AC_DEFUN([NETATALK_BERKELEY_LINK],
+ [
+ atalk_cv_lib_db=no
++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_4,[-ldb-4.4])
++NETATALK_BDB_LINK_TRY(atalk_cv_db_db44,[-ldb44])
++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_44,[-ldb-44])
++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_4,[-ldb-4-4])
++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_3,[-ldb-4.3])
++NETATALK_BDB_LINK_TRY(atalk_cv_db_db43,[-ldb43])
++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_43,[-ldb-43])
++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_3,[-ldb-4-3])
+ NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.2])
+ NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb42])
+ NETATALK_BDB_LINK_TRY(atalk_cv_db_db_42,[-ldb-42])
+@@ -134,7 +142,7 @@ AC_DEFUN([AC_PATH_BDB],
+ trybdbdir=""
+ dobdbsearch=yes
+ bdb_search_dirs="/usr/local/include /usr/include"
+- search_subdirs="/db4.2 /db42 /db4.1 /db41 /db4 /"
++ search_subdirs="/db4.4 /db44 /db4.3 /db43 /db4.2 /db42 /db4.1 /db41
/db4 /"
+
+ dnl required BDB version
+ DB_MAJOR_REQ=4
diff --git a/graphics-libs/freetype2/DETAILS b/graphics-libs/freetype2/DETAILS
index 41c6288..4b1b7fe 100755
--- a/graphics-libs/freetype2/DETAILS
+++ b/graphics-libs/freetype2/DETAILS
@@ -1,5 +1,5 @@
SPELL=freetype2
- VERSION=2.3.5
+ VERSION=2.3.4
SECURITY_PATCH=1
SOURCE=freetype-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
diff --git a/graphics-libs/freetype2/HISTORY b/graphics-libs/freetype2/HISTORY
index 006bfb0..967f1fb 100644
--- a/graphics-libs/freetype2/HISTORY
+++ b/graphics-libs/freetype2/HISTORY
@@ -1,6 +1,3 @@
-2007-07-03 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 2.3.5
-
2007-04-10 Elisamuel Resto <ryuji AT mages.ath.cx>
* DETAILS: version 2.3.4

diff --git a/http/lighttpd/DETAILS b/http/lighttpd/DETAILS
index 993675a..5d6f1cc 100755
--- a/http/lighttpd/DETAILS
+++ b/http/lighttpd/DETAILS
@@ -1,6 +1,6 @@
SPELL=lighttpd
- VERSION=1.4.16
-
SOURCE_HASH=sha512:9c60ee964c6c794031b28e916ec548bf5484e7bb0d44c60d78e4bc6cf6523619566810e8b097a1a9ec9bb01f09c157034bf005eb7cc46581d8daf3e18675b580
+ VERSION=1.4.18
+
SOURCE_HASH=sha512:7cdb72a66909646c2b98b701bf17fadcf2eed0369bf8a28a6073cbccaa52d4a1141bcc5a5a6f07e6e03ac87ee21b3367cdc0a21a0328dd7b755c9a923ec94697
SOURCE="$SPELL-$VERSION.tar.gz"
SOURCE_URL[0]="http://www.lighttpd.net/download/$SOURCE";
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION%%-*}
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION%%-*}
FRESHMEAT_URL="http://freshmeat.net/projects/$SPELL/";
LICENSE[0]='BSD'
ENTERED=20050722
- SECURITY_PATCH=2
+ SECURITY_PATCH=3
KEYWORDS="http"
SHORT='A light httpd'
cat << EOF
diff --git a/http/lighttpd/HISTORY b/http/lighttpd/HISTORY
index 7590237..e4133ea 100644
--- a/http/lighttpd/HISTORY
+++ b/http/lighttpd/HISTORY
@@ -1,3 +1,6 @@
+2007-09-10 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated Version to 1.4.18. SECURITY_PATCH++
+
2007-07-25 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 1.4.16
SECURITY_PATCH++
diff --git a/kde-core/kdebase/DETAILS b/kde-core/kdebase/DETAILS
index dc439fc..ac7e9d1 100755
--- a/kde-core/kdebase/DETAILS
+++ b/kde-core/kdebase/DETAILS
@@ -13,7 +13,7 @@ if [[ $SMGL_THEME == "y" ]]; then
fi
WEB_SITE=http://www.kde.org
ENTERED=20010912
- 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/kdebase/HISTORY b/kde-core/kdebase/HISTORY
index 4c4e521..ef7edf9 100644
--- a/kde-core/kdebase/HISTORY
+++ b/kde-core/kdebase/HISTORY
@@ -1,3 +1,11 @@
+2007-09-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: SECURTIY_PATCH++
+ CVE-2007-4224 CVE-2007-4225 CVE-2007-3820 CVE-2007-4569
+ * post-3.5.7-kdebase-konqueror-2.diff: added
+ * post-3.5.7-kdebase-konqueror.diff: removed
+ * post-3.5.7-kdebase-kdm.diff: added
+ * PRE_BUILD: apply security patch
+
2007-08-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: SECURTIY_PATCH++
* post-3.5.7-kdebase-konqueror.diff: added
diff --git a/kde-core/kdebase/PRE_BUILD b/kde-core/kdebase/PRE_BUILD
index 10c9438..3557726 100755
--- a/kde-core/kdebase/PRE_BUILD
+++ b/kde-core/kdebase/PRE_BUILD
@@ -1,6 +1,7 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/post-3.5.7-kdebase-konqueror.diff &&
+patch -p0 < $SPELL_DIRECTORY/post-3.5.7-kdebase-konqueror-2.diff &&
+patch -p0 < $SPELL_DIRECTORY/post-3.5.7-kdebase-kdm.diff &&
# splashscreen patch
if [[ $SMGL_THEME == "y" ]]; then
unpack_file 2
diff --git a/kde-core/kdebase/post-3.5.7-kdebase-kdm.diff
b/kde-core/kdebase/post-3.5.7-kdebase-kdm.diff
new file mode 100644
index 0000000..40b6abb
--- /dev/null
+++ b/kde-core/kdebase/post-3.5.7-kdebase-kdm.diff
@@ -0,0 +1,63 @@
+--- kdm/backend/session.c
++++ kdm/bakcend/session.c
+@@ -121,8 +121,9 @@
+ static void
+ DoAutoLogon( void )
+ {
+- StrDup( &curuser, td->autoUser );
+- StrDup( &curpass, td->autoPass );
++ ReStr( &curuser, td->autoUser );
++ ReStr( &curpass, td->autoPass );
++ ReStr( &curtype, "classic" );
+ cursource = PWSRC_AUTOLOGIN;
+ }
+
+@@ -141,7 +142,9 @@
+ td->hstent->npass = 0;
+ newdmrc = td->hstent->nargs;
+ td->hstent->nargs = 0;
++ ReStr( &curtype, "classic" );
+ cursource = (td->hstent->rLogin == 1) ? PWSRC_RELOGIN :
PWSRC_MANUAL;
++ return 1;
+ } else if (*td->autoUser && !td->autoDelay && (tdiff > 0 ||
td->autoAgain))
+ {
+ unsigned int lmask;
+@@ -153,11 +156,9 @@
+ if (lmask & ShiftMask)
+ return 0;
+ DoAutoLogon();
+- } else {
+- cursource = PWSRC_MANUAL;
+- return 0;
++ return 1;
+ }
+- return 1;
++ return 0;
+ }
+
+
+@@ -369,6 +370,7 @@
+ if (curtype) free( curtype );
+ curtype = GRecvStr();
+ Debug( " type %\"s\n", curtype );
++ cursource = PWSRC_MANUAL;
+ if (Verify( conv_interact, rootok )) {
+ Debug( " -> return success\n" );
+ GSendInt( V_OK );
+@@ -378,7 +380,6 @@
+ case G_AutoLogin:
+ Debug( "G_AutoLogin\n" );
+ DoAutoLogon();
+- StrDup( &curtype, "classic" );
+ if (Verify( conv_auto, FALSE )) {
+ Debug( " -> return success\n" );
+ GSendInt( V_OK );
+@@ -565,7 +566,7 @@
+ tdiff = td->autoAgain ?
+ 1 : time( 0 ) - td->hstent->lastExit - td->openDelay;
+ if (AutoLogon( tdiff )) {
+- if (!StrDup( &curtype, "classic" ) || !Verify( conv_auto,
FALSE ))
++ if (!Verify( conv_auto, FALSE ))
+ goto gcont;
+ if (greeter)
+ GSendInt( V_OK );
diff --git a/kde-core/kdebase/post-3.5.7-kdebase-konqueror-2.diff
b/kde-core/kdebase/post-3.5.7-kdebase-konqueror-2.diff
new file mode 100644
index 0000000..0d6e44e
--- /dev/null
+++ b/kde-core/kdebase/post-3.5.7-kdebase-konqueror-2.diff
@@ -0,0 +1,49 @@
+--- konqueror/konq_combo.cc
++++ konqueror/konq_combo.cc
+@@ -158,6 +158,9 @@ void KonqCombo::setURL( const QString& u
+ kapp->dcopClient()->send( "konqueror*", "KonquerorIface",
+ "addToCombo(QString,QCString)", data);
+ }
++ // important security consideration: always display the beginning
++ // of the url rather than its end to prevent spoofing attempts.
++ lineEdit()->setCursorPosition( 0 );
+ }
+
+ void KonqCombo::setTemporary( const QString& text )
+--- konqueror/konq_mainwindow.cc
++++ konqueror/konq_mainwindow.cc
+@@ -611,12 +611,11 @@ void KonqMainWindow::openURL( KonqView *
+ }
+ else // no known serviceType, use KonqRun
+ {
+- if ( ( view && view == m_currentView ) ||
+- ( !view && !req.newTab ) ) // startup with argument
++ if ( ( !view || view->url().isEmpty() ) && !req.newTab ) // startup
with argument
+ {
+ // Show it for now in the location bar, but we'll need to store
it in the view
+ // later on (can't do it yet since either view == 0 or
updateHistoryEntry will be called).
+- kdDebug(1202) << "setLocationBarURL : url = " << url << endl;
++ kdDebug(1202) << "setLocationBarURL (startup) : url = " << url <<
endl;
+ setLocationBarURL( url );
+ }
+
+@@ -819,8 +818,6 @@ bool KonqMainWindow::openView( QString s
+ if ( childView )
+ {
+ enableAllActions( true );
+-
+- m_pViewManager->setActivePart( childView->part() );
+ m_currentView = childView;
+ }
+ }
+--- konqueror/konq_viewmgr.cc
++++ konqueror/konq_viewmgr.cc
+@@ -1395,6 +1395,8 @@ void KonqViewManager::slotActivePartChan
+
+ void KonqViewManager::emitActivePartChanged()
+ {
++ // prevent unnecessary multiple calls to slotPartActivated:
++ m_activePartChangedTimer->stop();
+ m_pMainWindow->slotPartActivated( activePart() );
+ }
+
diff --git a/kde-core/kdebase/post-3.5.7-kdebase-konqueror.diff
b/kde-core/kdebase/post-3.5.7-kdebase-konqueror.diff
deleted file mode 100644
index 0d6e44e..0000000
--- a/kde-core/kdebase/post-3.5.7-kdebase-konqueror.diff
+++ /dev/null
@@ -1,49 +0,0 @@
---- konqueror/konq_combo.cc
-+++ konqueror/konq_combo.cc
-@@ -158,6 +158,9 @@ void KonqCombo::setURL( const QString& u
- kapp->dcopClient()->send( "konqueror*", "KonquerorIface",
- "addToCombo(QString,QCString)", data);
- }
-+ // important security consideration: always display the beginning
-+ // of the url rather than its end to prevent spoofing attempts.
-+ lineEdit()->setCursorPosition( 0 );
- }
-
- void KonqCombo::setTemporary( const QString& text )
---- konqueror/konq_mainwindow.cc
-+++ konqueror/konq_mainwindow.cc
-@@ -611,12 +611,11 @@ void KonqMainWindow::openURL( KonqView *
- }
- else // no known serviceType, use KonqRun
- {
-- if ( ( view && view == m_currentView ) ||
-- ( !view && !req.newTab ) ) // startup with argument
-+ if ( ( !view || view->url().isEmpty() ) && !req.newTab ) // startup
with argument
- {
- // Show it for now in the location bar, but we'll need to store
it in the view
- // later on (can't do it yet since either view == 0 or
updateHistoryEntry will be called).
-- kdDebug(1202) << "setLocationBarURL : url = " << url << endl;
-+ kdDebug(1202) << "setLocationBarURL (startup) : url = " << url <<
endl;
- setLocationBarURL( url );
- }
-
-@@ -819,8 +818,6 @@ bool KonqMainWindow::openView( QString s
- if ( childView )
- {
- enableAllActions( true );
--
-- m_pViewManager->setActivePart( childView->part() );
- m_currentView = childView;
- }
- }
---- konqueror/konq_viewmgr.cc
-+++ konqueror/konq_viewmgr.cc
-@@ -1395,6 +1395,8 @@ void KonqViewManager::slotActivePartChan
-
- void KonqViewManager::emitActivePartChanged()
- {
-+ // prevent unnecessary multiple calls to slotPartActivated:
-+ m_activePartChangedTimer->stop();
- m_pMainWindow->slotPartActivated( activePart() );
- }
-
diff --git a/kde-core/kdelibs/DETAILS b/kde-core/kdelibs/DETAILS
index c067ee7..d77e631 100755
--- a/kde-core/kdelibs/DETAILS
+++ b/kde-core/kdelibs/DETAILS
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KDE_URL/stable/${VERSION//.0/}/src/$SOURCE
WEB_SITE=http://www.kde.org
ENTERED=20020912
- SECURITY_PATCH=4
+ SECURITY_PATCH=5
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 8d37f74..1bb1490 100644
--- a/kde-core/kdelibs/HISTORY
+++ b/kde-core/kdelibs/HISTORY
@@ -1,3 +1,10 @@
+2007-09-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++
+ * post-3.5.7-kdelibs-kdecore-2.diff: added
+ post-3.5.7-kdelibs-kdecore.diff: removed
+ * PRE_BUILD: apply patches
+ security fix CVE-2007-4224 CVE-2007-4225 CVE-2007-3820
+
2007-08-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: SECURITY_PATCH++
* post-3.5.7-kdelibs-kdecore.diff: added
diff --git a/kde-core/kdelibs/PRE_BUILD b/kde-core/kdelibs/PRE_BUILD
index 0c1ab77..969f941 100755
--- a/kde-core/kdelibs/PRE_BUILD
+++ b/kde-core/kdelibs/PRE_BUILD
@@ -1,4 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/post-3.5.7-kdelibs-kdecore.diff &&
+#patch -p0 < $SPELL_DIRECTORY/post-3.5.7-kdelibs-kdecore.diff &&
+patch -p0 < $SPELL_DIRECTORY/post-3.5.7-kdelibs-kdecore-2.diff &&
patch -p1 < $SPELL_DIRECTORY/cups.diff
diff --git a/kde-core/kdelibs/post-3.5.7-kdelibs-kdecore-2.diff
b/kde-core/kdelibs/post-3.5.7-kdelibs-kdecore-2.diff
new file mode 100644
index 0000000..50a9ed1
--- /dev/null
+++ b/kde-core/kdelibs/post-3.5.7-kdelibs-kdecore-2.diff
@@ -0,0 +1,34 @@
+--- kdecore/kurl.cpp
++++ kdecore/kurl.cpp
+@@ -30,6 +30,7 @@
+ #include <kglobal.h>
+ #include <kidna.h>
+ #include <kprotocolinfo.h>
++#include <kstringhandler.h>
+ #endif
+
+ #include <stdio.h>
+@@ -183,7 +184,7 @@ static QString lazy_encode( const QStrin
+ (character == '?') || // Start of query delimiter
+ ((character == '@') && encodeAt) || // Username delimiter
+ (character == '#') || // Start of reference delimiter
+- ((character == 32) && (i+1 == old_length))) // A trailing space
++ ((character == 32) && (i+1 == old_length || segment[i+1] == ' ')))
// A trailing space
+ {
+ new_segment[ new_length++ ] = '%';
+
+@@ -1540,7 +1541,13 @@ QString KURL::prettyURL( int _trailing )
+ u += "//";
+ if ( hasUser() )
+ {
+- u += lazy_encode(m_strUser);
++ QString s = m_strUser;
++#ifndef KDE_QT_ONLY
++ // shorten the username, its unlikely to be valid without password
anyway
++ if (!hasPass())
++ s = KStringHandler::csqueeze(s, 16);
++#endif
++ u += encode(s, 0, 0);
+ // Don't show password!
+ u += "@";
+ }
diff --git a/kde-core/kdelibs/post-3.5.7-kdelibs-kdecore.diff
b/kde-core/kdelibs/post-3.5.7-kdelibs-kdecore.diff
deleted file mode 100644
index eb7e89e..0000000
--- a/kde-core/kdelibs/post-3.5.7-kdelibs-kdecore.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-------------------------------------------------------------------------
-r700053 | mueller | 2007-08-14 18:37:30 +0200 (Tue, 14 Aug 2007) | 2 lines
-
-be more robust against addressbar spoofing (CVE-2007-4225)
-
-------------------------------------------------------------------------
---- kdecore/tests/kurltest.cpp
-+++ kdecore/tests/kurltest.cpp
-@@ -288,6 +288,16 @@ int main(int argc, char *argv[])
- check("KURL::prettyURL()", url15582.prettyURL(),
"http://alain.knaff.linux.lu/bug-reports/kde/percentage%in%url.html";);
- check("KURL::url()", url15582.url(),
"http://alain.knaff.linux.lu/bug-reports/kde/percentage%25in%25url.html";);
-
-+ KURL whitespaceInUser("http://www.google.com%20%20%20%20%20 AT foobar.com/";);
-+ check("KURL::prettyURL()", whitespaceInUser.prettyURL(),
"http://www.google.com%20%20%20%20%20 AT foobar.com/";);
-+
-+ KURL whitespaceInPath("http://www.google.com/foo%20bar/";);
-+ check("KURL::prettyURL()", whitespaceInPath.prettyURL(),
"http://www.google.com/foo bar/");
-+
-+ KURL
whitespaceInPath2("http://www.google.com/foo%20%20%20%20%20%20%20bar/";);
-+ check("KURL::prettyURL()", whitespaceInPath2.prettyURL(),
-+ "http://www.google.com/foo%20%20%20%20%20%20 bar/");
-+
- KURL carsten;
-
carsten.setPath("/home/gis/src/kde/kdelibs/kfile/.#kfiledetailview.cpp.1.18");
- check("KURL::path()", carsten.path(),
"/home/gis/src/kde/kdelibs/kfile/.#kfiledetailview.cpp.1.18");
-@@ -594,6 +604,15 @@ int main(int argc, char *argv[])
- check("http: URL with empty path string path", waba1.path(),
- "");
-
-+ waba1 = "http://www.meinestadt.de&url_plain=http";;
-+ check("http: URL with empty path string", waba1.host(),
-+ "www.meinestadt.de&url_plain=http");
-+ check("http: URL with empty path string", waba1.htmlURL(),
-+ "http://www.meinestadt.de&amp;url_plain=http";);
-+
-+ check("http: URL with empty path string", waba1.path(),
-+ "");
-+
- waba1 = "http://a:389#b=c";;
- check( "http: URL with port, ref, and empty path; url", waba1.url(),
"http://a:389#b=c"; );
- check( "http: URL with port, ref, and empty path; host", waba1.host(),
"a" );
---- kdecore/kurl.cpp
-+++ kdecore/kurl.cpp
-@@ -183,7 +183,7 @@ static QString lazy_encode( const QStrin
- (character == '?') || // Start of query delimiter
- ((character == '@') && encodeAt) || // Username delimiter
- (character == '#') || // Start of reference delimiter
-- ((character == 32) && (i+1 == old_length))) // A trailing space
-+ ((character == 32) && (i+1 == old_length || segment[i+1] == ' ')))
// A trailing space
- {
- new_segment[ new_length++ ] = '%';
-
-@@ -1540,7 +1540,7 @@ QString KURL::prettyURL( int _trailing )
- u += "//";
- if ( hasUser() )
- {
-- u += lazy_encode(m_strUser);
-+ u += encode(m_strUser, 0, 0);
- // Don't show password!
- u += "@";
- }
diff --git a/x11-toolkits/qt-x11/175791_3.diff
b/x11-toolkits/qt-x11/175791_3.diff
new file mode 100644
index 0000000..06ae9e5
--- /dev/null
+++ b/x11-toolkits/qt-x11/175791_3.diff
@@ -0,0 +1,11 @@
+--- src/codecs/qutfcodec.cpp
++++ src/codecs/qutfcodec.cpp
+@@ -165,7 +165,7 @@ public:
+ QString toUnicode(const char* chars, int len)
+ {
+ QString result;
+- result.setLength( len ); // worst case
++ result.setLength( len + 1 ); // worst case
+ QChar *qch = (QChar *)result.unicode();
+ uchar ch;
+ int error = -1;
diff --git a/x11-toolkits/qt-x11/DETAILS b/x11-toolkits/qt-x11/DETAILS
index 565e387..4ae31ae 100755
--- a/x11-toolkits/qt-x11/DETAILS
+++ b/x11-toolkits/qt-x11/DETAILS
@@ -10,7 +10,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-free-$VERSION
WEB_SITE=http://www.trolltech.com/qt/x11.html
KEYWORDS="qt x11 libs"
ENTERED=20020410
- SECURITY_PATCH=3
+ SECURITY_PATCH=4
DOCS="FAQ README README-QT.TXT"
SHORT="Qt simplifies writing and maintaining GUI applications"
cat << EOF
diff --git a/x11-toolkits/qt-x11/HISTORY b/x11-toolkits/qt-x11/HISTORY
index 6c05737..3647de2 100644
--- a/x11-toolkits/qt-x11/HISTORY
+++ b/x11-toolkits/qt-x11/HISTORY
@@ -1,3 +1,9 @@
+2007-09-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++
+ * PRE_BUILD: apply patch
+ * 175791_3.diff: added
+ fixes bug #13987
+
2007-08-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: SECURITY_PATCH++
* PRE_BUILD:apply patch
diff --git a/x11-toolkits/qt-x11/PRE_BUILD b/x11-toolkits/qt-x11/PRE_BUILD
index 6ccb4a4..efd567d 100755
--- a/x11-toolkits/qt-x11/PRE_BUILD
+++ b/x11-toolkits/qt-x11/PRE_BUILD
@@ -3,6 +3,7 @@ cd $SOURCE_DIRECTORY &&
# apply patches
patch -p0 < $SPELL_DIRECTORY/Qt-3.3.8-UTF-8-fix.diff &&
patch -p4 < $SPELL_DIRECTORY/170529.diff &&
+patch -p0 < $SPELL_DIRECTORY/175791_3.diff &&
# fix detecction of firebird
sedit "s/-lgds//" configure &&
sedit "/gds/D;/\t}/D" plugins/src/sqldrivers/ibase/ibase.pro &&
diff --git a/x11-toolkits/qt4/175791_4.diff b/x11-toolkits/qt4/175791_4.diff
new file mode 100644
index 0000000..645daa6
--- /dev/null
+++ b/x11-toolkits/qt4/175791_4.diff
@@ -0,0 +1,11 @@
+--- src/corelib/codecs/qutfcodec.cpp
++++ src/corelib/codecs/qutfcodec.cpp
+@@ -140,7 +140,7 @@ void QUtf8Codec::convertToUnicode(QString *target, const
char *chars, int len, C
+
+ int originalLength = target->length();
+ QString &result = *target;
+- result.resize(originalLength + len); // worst case
++ result.resize(originalLength + len + 1); // worst case
+ QChar *qch = result.data() + originalLength;
+ uchar ch;
+ int invalid = 0;
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index 6b18a86..6bcbbe4 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -12,14 +12,14 @@ case $QT_VER in

SOURCE_HASH=sha512:0c2f08a95b164d5f01ed19a915333f90eef50d9a7958392d63b33b7de9c8f32d8fec19c53952d3848f4ee989717314172ab5aeb9f9c02a681ae5e4ccb1e4bc07
SOURCE=$SPELLX-$VERSION.tar.gz
URI=qt/source/$SOURCE
- SECURITY_PATCH=1
+ SECURITY_PATCH=2
;;
*) #stable
VERSION=4.3.0

SOURCE_HASH=sha512:0c2f08a95b164d5f01ed19a915333f90eef50d9a7958392d63b33b7de9c8f32d8fec19c53952d3848f4ee989717314172ab5aeb9f9c02a681ae5e4ccb1e4bc07
SOURCE=$SPELLX-$VERSION.tar.gz
URI=qt/source/$SOURCE
- SECURITY_PATCH=1
+ SECURITY_PATCH=2
esac
SOURCE_URL[0]=ftp://ftp.trolltech.com/$URI
SOURCE_URL[1]=ftp://ftp.silug.org/pub/$URI
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index f92fe42..f2450a6 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,9 @@
+2007-09-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++
+ * PRE_BUILD: apply patch
+ * 175791_4.diff: added
+ fix bug #13987
+
2007-07-12 Treeve Jelbert <treeve AT sourcemage.org>
* PROVIDES: readded, various spells can cope with qt4/qt3

diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index 6ee57a9..fcc3f38 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -1,6 +1,11 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

+# apply patches
+if [[ $QT_VER != snapshot ]]; then
+ patch -p0 < $SPELL_DIRECTORY/175791_4.diff
+fi &&
+
# add better optimisation flags
# -O2 gives segmentation fault in moc when building tools
sed -i "s|-O2|${CFLAGS/-O3/-O2}|" mkspecs/common/g++.conf \



  • [SM-Commit] GIT changes to stable-0.13 grimoire by Eric Sandall (101758809a0559a1d1efdf0d92bfe891030d2b3e), Eric Sandall, 09/26/2007

Archive powered by MHonArc 2.6.24.

Top of Page