Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

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

 dev/null                                    |binary
 telephony/libtelepathy/DETAILS              |   13 +-
 telephony/libtelepathy/HISTORY              |    4 
 telephony/telepathy-glib/telepathy.gpg      |    0 
 telephony/telepathy.gpg                     |binary
 x11-toolkits/qt-x11/DETAILS                 |    2 
 x11-toolkits/qt-x11/HISTORY                 |    6 +
 x11-toolkits/qt-x11/PRE_BUILD               |    3 
 x11-toolkits/qt-x11/Qt-3.3.8-UTF-8-fix.diff |  106 ++++++++++++++++++++++
 x11-toolkits/qt4/DETAILS                    |    2 
 x11-toolkits/qt4/HISTORY                    |    6 +
 x11-toolkits/qt4/PRE_BUILD                  |    6 +
 x11-toolkits/qt4/Qt-4.2.3-UTF-8-fix.diff    |  133 
++++++++++++++++++++++++++++
 13 files changed, 275 insertions(+), 6 deletions(-)

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

    qt4 - fix bug #13762

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

    qt-x11 - fix bug #13762

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

    libtelepathy-0.0.54

diff --git a/telephony/libtelepathy/DETAILS b/telephony/libtelepathy/DETAILS
index c8a646a..ae6af89 100755
--- a/telephony/libtelepathy/DETAILS
+++ b/telephony/libtelepathy/DETAILS
@@ -1,14 +1,17 @@
            SPELL=libtelepathy
-         VERSION=0.0.53
-     
SOURCE_HASH=sha512:2b69931955b7c9d0aed0f4b5303cf69846b2f3d4968ac7bd7aefb939dcd6552a07c5ca3def44223cdb2fac1de2bbc223def2480ddc0bc4f153ea2097668abf74
+         VERSION=0.0.54
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+         SOURCE2=$SOURCE.asc
         WEB_SITE=http://telepathy.freedesktop.org
-   SOURCE_URL[0]=$WEB_SITE/releases/libtelepathy/$SOURCE
+   SOURCE_URL[0]=$WEB_SITE/releases/$SPELL/$SOURCE
+  SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+      SOURCE_GPG=telepathy.gpg:$SOURCE.asc:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
       LICENSE[0]=LGPL
          ENTERED=20070424
-        KEYWORDS=""
-           SHORT=""
+        KEYWORDS="irc im voip"
+           SHORT=unified framework for real time conversations,""
 cat << EOF
 The Telepathy project aims to provide a unified framework for all forms of 
real 
 time conversations, including instant messaging, IRC, voice calls and video 
calls. It 
diff --git a/telephony/libtelepathy/HISTORY b/telephony/libtelepathy/HISTORY
index 8bf69e7..1cce1d2 100644
--- a/telephony/libtelepathy/HISTORY
+++ b/telephony/libtelepathy/HISTORY
@@ -1,3 +1,7 @@
+2007-05-05 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 0.0.54
+         use updstream key
+
 2007-04-24 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.0.53
          spell created
diff --git a/telephony/telepathy-glib/telepathy.gpg 
b/telephony/telepathy-glib/telepathy.gpg
deleted file mode 100644
index cee2853..0000000
Binary files a/telephony/telepathy-glib/telepathy.gpg and /dev/null differ
diff --git a/telephony/telepathy.gpg b/telephony/telepathy.gpg
new file mode 100644
index 0000000..cee2853
Binary files /dev/null and b/telephony/telepathy.gpg differ
diff --git a/x11-toolkits/qt-x11/DETAILS b/x11-toolkits/qt-x11/DETAILS
index 46fe283..bf0b814 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=1
+  SECURITY_PATCH=2
             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 f94363b..463e901 100644
--- a/x11-toolkits/qt-x11/HISTORY
+++ b/x11-toolkits/qt-x11/HISTORY
@@ -1,3 +1,9 @@
+2007-05-05 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: SECURITY_PATCH++
+       * PRE_BUILD:apply patch
+       * Qt-3.3.8-UTF-8-fix.diff: added
+         fixes bug #13762
+
 2007-02-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: Updated to 3.3.8
 
diff --git a/x11-toolkits/qt-x11/PRE_BUILD b/x11-toolkits/qt-x11/PRE_BUILD
index 00b7869..d6a04ec 100755
--- a/x11-toolkits/qt-x11/PRE_BUILD
+++ b/x11-toolkits/qt-x11/PRE_BUILD
@@ -1,5 +1,8 @@
 default_pre_build     &&
 cd $SOURCE_DIRECTORY  &&
+# apply patches
+patch -p0 < $SPELL_DIRECTORY/Qt-3.3.8-UTF-8-fix.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/qt-x11/Qt-3.3.8-UTF-8-fix.diff 
b/x11-toolkits/qt-x11/Qt-3.3.8-UTF-8-fix.diff
new file mode 100644
index 0000000..3cb3753
--- /dev/null
+++ b/x11-toolkits/qt-x11/Qt-3.3.8-UTF-8-fix.diff
@@ -0,0 +1,106 @@
+--- src/codecs/qutfcodec.cpp   Fri Mar 30 06:08:57 2007
++++ src/codecs/qutfcodec.cpp   Fri Mar 30 06:08:57 2007
+@@ -154,6 +154,7 @@
+ 
+ class QUtf8Decoder : public QTextDecoder {
+     uint uc;
++    uint min_uc;
+     int need;
+     bool headerDone;
+ public:
+@@ -167,8 +168,9 @@
+       result.setLength( len ); // worst case
+       QChar *qch = (QChar *)result.unicode();
+       uchar ch;
++        int error = -1;
+       for (int i=0; i<len; i++) {
+-          ch = *chars++;
++          ch = chars[i];
+           if (need) {
+               if ( (ch&0xc0) == 0x80 ) {
+                   uc = (uc << 6) | (ch & 0x3f);
+@@ -182,6 +184,8 @@
+                           *qch++ = QChar(high);
+                           *qch++ = QChar(low);
+                           headerDone = TRUE;
++                      } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 
0xdfff) || (uc >= 0xfffe)) {
++                            *qch++ = QChar::replacement;
+                       } else {
+                           if (headerDone || QChar(uc) != 
QChar::byteOrderMark)
+                               *qch++ = uc;
+@@ -190,6 +194,7 @@
+                   }
+               } else {
+                   // error
++                    i = error;
+                   *qch++ = QChar::replacement;
+                   need = 0;
+               }
+@@ -200,13 +205,22 @@
+               } else if ((ch & 0xe0) == 0xc0) {
+                   uc = ch & 0x1f;
+                   need = 1;
++                    error = i;
++                  min_uc = 0x80;
+               } else if ((ch & 0xf0) == 0xe0) {
+                   uc = ch & 0x0f;
+                   need = 2;
++                    error = i;
++                  min_uc = 0x800;
+               } else if ((ch&0xf8) == 0xf0) {
+                   uc = ch & 0x07;
+                   need = 3;
+-              }
++                    error = i;
++                    min_uc = 0x10000;
++                } else {
++                    // error
++                    *qch++ = QChar::replacement;
++                }
+           }
+       }
+       result.truncate( qch - result.unicode() );
+
+--- src/tools/qstring.cpp      Fri Mar 30 06:08:57 2007
++++ src/tools/qstring.cpp      Fri Mar 30 06:08:57 2007
+@@ -5805,6 +5805,7 @@
+     result.setLength( len ); // worst case
+     QChar *qch = (QChar *)result.unicode();
+     uint uc = 0;
++    uint min_uc = 0;
+     int need = 0;
+     int error = -1;
+     uchar ch;
+@@ -5822,7 +5823,13 @@
+                       unsigned short low = uc%0x400 + 0xdc00;
+                       *qch++ = QChar(high);
+                       *qch++ = QChar(low);
+-                  } else {
++                  } else if (uc < min_uc || (uc >= 0xd800 && uc <= 0xdfff) 
|| (uc >= 0xfffe)) {
++                      // overlong seqence, UTF16 surrogate or BOM
++                        i = error;
++                        qch = addOne(qch, result);
++                        *qch++ = QChar(0xdbff);
++                        *qch++ = QChar(0xde00+((uchar)utf8[i]));
++                    } else {
+                       *qch++ = uc;
+                   }
+               }
+@@ -5844,14 +5851,17 @@
+               uc = ch & 0x1f;
+               need = 1;
+               error = i;
++              min_uc = 0x80;
+           } else if ((ch & 0xf0) == 0xe0) {
+               uc = ch & 0x0f;
+               need = 2;
+               error = i;
++              min_uc = 0x800;
+           } else if ((ch&0xf8) == 0xf0) {
+               uc = ch & 0x07;
+               need = 3;
+               error = i;
++              min_uc = 0x10000;
+           } else {
+               // Error
+                 qch = addOne(qch, result);
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index 8de1c1d..0eec8bb 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -12,12 +12,14 @@ case $QT_VER in
      
SOURCE_HASH=sha512:6bab62574c319589b44d7416248d4531d137ee610615289c65f7877284bb4bb6958bdd3304b42930ff04d617c5a6389da1524a9374cfee9bba1547d7cd9f0d3f
           SOURCE=$SPELLX-$VERSION.tar.gz
              URI=qt/source/$SOURCE
+  SECURITY_PATCH=1
      ;;
   *) #stable
          VERSION=4.2.3
      
SOURCE_HASH=sha512:e04568ac6c42d0d6d131ccbad89768248c5095b05e68cc1362fd1a3580197e37c416802c8fbf5411e6870e5bdd9e92ff133bcb2b4e42fd5cdf848404d50c733c
           SOURCE=$SPELLX-$VERSION.tar.gz
              URI=qt/source/$SOURCE
+  SECURITY_PATCH=1
 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 a77a81e..006658e 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,9 @@
+2007-05-05 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: SECURITY_PATCH++
+       * Qt-4.2.3-UTF-8-fix.diff: added
+       * PRE_BUILD: apply patch
+         fixes bug #13762
+
 2007-05-04 Treeve Jelbert <treeve AT sourcemage.org>
        * CONFLICTS: add 'y' option, for automatic dispel
 
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index 4b818f2..bcd1246 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -1,5 +1,11 @@
 default_pre_build          &&
 cd $SOURCE_DIRECTORY      &&
+
+# apply patches
+if [ $QT_VER != snapshot ];then
+patch -po < $SPELL_DIRECTORY/Qt-4.2.3-UTF-8-fix.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      \
diff --git a/x11-toolkits/qt4/Qt-4.2.3-UTF-8-fix.diff 
b/x11-toolkits/qt4/Qt-4.2.3-UTF-8-fix.diff
new file mode 100644
index 0000000..098f4d6
--- /dev/null
+++ b/x11-toolkits/qt4/Qt-4.2.3-UTF-8-fix.diff
@@ -0,0 +1,133 @@
+--- src/corelib/codecs/qutfcodec.cpp   Fri Mar 30 06:06:30 2007
++++ src/corelib/codecs/qutfcodec.cpp   Fri Mar 30 06:06:30 2007
+@@ -117,15 +117,19 @@
+     bool headerdone = false;
+     QChar replacement = QChar::ReplacementCharacter;
+     int need = 0;
++    int error = -1;
+     uint uc = 0;
++    uint min_uc = 0;
+     if (state) {
+         if (state->flags & IgnoreHeader)
+             headerdone = true;
+         if (state->flags & ConvertInvalidToNull)
+             replacement = QChar::Null;
+         need = state->remainingChars;
+-        if (need)
++        if (need) {
+             uc = state->state_data[0];
++            min_uc = state->state_data[1];
++        }
+     }
+     if (!headerdone && len > 3
+         && (uchar)chars[0] == 0xef && (uchar)chars[1] == 0xbb && 
(uchar)chars[2] == 0xbf) {
+@@ -142,7 +146,7 @@
+     int invalid = 0;
+ 
+     for (int i=0; i<len; i++) {
+-        ch = *chars++;
++        ch = chars[i];
+         if (need) {
+             if ((ch&0xc0) == 0x80) {
+                 uc = (uc << 6) | (ch & 0x3f);
+@@ -153,14 +157,27 @@
+                         uc -= 0x10000;
+                         unsigned short high = uc/0x400 + 0xd800;
+                         unsigned short low = uc%0x400 + 0xdc00;
++
++                        // resize if necessary
++                        long where = qch - result.unicode();
++                        if (where + 2 >= result.size()) {
++                            result.resize(where + 2);
++                            qch = result.data() + where;
++                        }
++
+                         *qch++ = QChar(high);
+                         *qch++ = QChar(low);
++                    } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 
0xdfff) || (uc >= 0xfffe)) {
++                        // error
++                        *qch++ = QChar::ReplacementCharacter;
++                        ++invalid;
+                     } else {
+                         *qch++ = uc;
+                     }
+                 }
+             } else {
+                 // error
++                i = error;
+                 *qch++ = QChar::ReplacementCharacter;
+                 ++invalid;
+                 need = 0;
+@@ -171,12 +188,22 @@
+             } else if ((ch & 0xe0) == 0xc0) {
+                 uc = ch & 0x1f;
+                 need = 1;
++                error = i;
++                min_uc = 0x80;
+             } else if ((ch & 0xf0) == 0xe0) {
+                 uc = ch & 0x0f;
+                 need = 2;
++                error = i;
++                min_uc = 0x800;
+             } else if ((ch&0xf8) == 0xf0) {
+                 uc = ch & 0x07;
+                 need = 3;
++                error = i;
++                min_uc = 0x10000;
++            } else {
++                // error
++                *qch++ = QChar::ReplacementCharacter;
++                ++invalid;
+             }
+         }
+     }
+@@ -187,6 +214,7 @@
+         if (headerdone)
+             state->flags |= IgnoreHeader;
+         state->state_data[0] = need ? uc : 0;
++        state->state_data[1] = need ? min_uc : 0;
+     }
+     return result;
+ }
+
+--- src/corelib/tools/qstring.cpp      Fri Mar 30 06:06:30 2007
++++ src/corelib/tools/qstring.cpp      Fri Mar 30 06:06:30 2007
+@@ -3342,6 +3342,7 @@
+     result.resize(size); // worst case
+     ushort *qch = result.d->data;
+     uint uc = 0;
++    uint min_uc = 0;
+     int need = 0;
+     int error = -1;
+     uchar ch;
+@@ -3359,6 +3360,12 @@
+                         ushort low = uc%0x400 + 0xdc00;
+                         *qch++ = high;
+                         *qch++ = low;
++                    } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 
0xdfff) || (uc >= 0xfffe)) {
++                      // overlong seqence, UTF16 surrogate or BOM
++                        i = error;
++                        qch = addOne(qch, result);
++                        *qch++ = 0xdbff;
++                        *qch++ = 0xde00 + ((uchar)str[i]);
+                     } else {
+                         *qch++ = uc;
+                     }
+@@ -3381,14 +3388,17 @@
+                 uc = ch & 0x1f;
+                 need = 1;
+                 error = i;
++                min_uc = 0x80;
+             } else if ((ch & 0xf0) == 0xe0) {
+                 uc = ch & 0x0f;
+                 need = 2;
+                 error = i;
++                min_uc = 0x800;
+             } else if ((ch&0xf8) == 0xf0) {
+                 uc = ch & 0x07;
+                 need = 3;
+                 error = i;
++                min_uc = 0x10000;
+             } else {
+                 // Error
+                 qch = addOne(qch, result);