Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

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

 libs/raptor/BUILD     |    1 -
 libs/raptor/CONFIGURE |   13 -------------
 libs/raptor/DEPENDS   |   13 +++++--------
 libs/raptor/DETAILS   |    3 ++-
 libs/raptor/HISTORY   |    6 ++++++
 5 files changed, 13 insertions(+), 23 deletions(-)

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

    raptor: => 2.0.7  - SECURITY: fixes CVE-2012-0037

diff --git a/libs/raptor/BUILD b/libs/raptor/BUILD
index 0e3dcb0..f3c59e6 100755
--- a/libs/raptor/BUILD
+++ b/libs/raptor/BUILD
@@ -1,5 +1,4 @@
 OPTS="--with-xml-names=${RAPTOR_XMLVERSION}  \
-      --with-xml-parser=${RAPTOR_PARSER}     \
       --with-www=${RAPTOR_WWWLIB}            \
       ${OPTS}"                               &&
 
diff --git a/libs/raptor/CONFIGURE b/libs/raptor/CONFIGURE
index 08673ae..9992eb7 100755
--- a/libs/raptor/CONFIGURE
+++ b/libs/raptor/CONFIGURE
@@ -27,17 +27,4 @@ else
   config_query_list  RAPTOR_WWWLIB                            \
                      "Which WWW library do you want to use?"  \
                      xml  curl  libwww  none
-fi  &&
-
-#
-# RSS Tag Soup requires libxml2
-#
-if  echo  $RAPTOR_LIST  |  grep  -q  "rss-tag-soup"  ||
-    [  "$RAPTOR_PARSELIST"  ==  "y"  ];  then
-  persistent_add  RAPTOR_PARSER  &&
-  RAPTOR_PARSER="libxml"
-else
-  config_query_list  RAPTOR_PARSER                           \
-                     "Which XML parser do you want to use?"  \
-                     libxml  expat
 fi
diff --git a/libs/raptor/DEPENDS b/libs/raptor/DEPENDS
index 7cb1a8d..257c88f 100755
--- a/libs/raptor/DEPENDS
+++ b/libs/raptor/DEPENDS
@@ -1,13 +1,10 @@
-if    [  "$RAPTOR_WWWLIB"  ==  "xml"  ];  then
-  depends  libxml2
-elif  [  "$RAPTOR_WWWLIB"  ==  "curl"  ];  then
+depends  libxml2 &&
+depends  libxslt &&
+
+if  [  "$RAPTOR_WWWLIB"  ==  "curl"  ];  then
   depends  curl
 elif  [  "$RAPTOR_WWWLIB"  ==  "libwww"  ];  then
   depends  w3c-libwww
 fi  &&
 
-if    [  "$RAPTOR_PARSER"  ==  "libxml"  ];  then
-  depends  libxml2
-elif  [  "$RAPTOR_PARSER"  ==  "expat"  ];  then
-  depends  expat
-fi
+optional_depends icu '-with-icu-config=/usr/bin/icu-config' '' 'Unicode 
support'
diff --git a/libs/raptor/DETAILS b/libs/raptor/DETAILS
index 4af2b8d..2c47c2e 100755
--- a/libs/raptor/DETAILS
+++ b/libs/raptor/DETAILS
@@ -1,6 +1,7 @@
            SPELL=raptor
           SPELLX=raptor2
-         VERSION=2.0.6
+         VERSION=2.0.7
+  SECURITY_PATCH=1
           SOURCE=$SPELLX-$VERSION.tar.gz
          SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/libs/raptor/HISTORY b/libs/raptor/HISTORY
index 2d22f41..dedbf5a 100644
--- a/libs/raptor/HISTORY
+++ b/libs/raptor/HISTORY
@@ -1,3 +1,9 @@
+2012-03-31 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 2.0.7
+         SECURITY_PATCH=1   - fixes CVE-2012-0037
+       * DEPENDS: add optional icu, remove expat, add libxslt
+       * BUILD, CONFIGURE: remove expat support
+
 2011-12-02 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.0.6