[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (9f8173db078737c3c86b9017bf05ea091aedf1a5)

Treeve Jelbert scm at mail.sourcemage.org
Mon Oct 23 05:50:54 EDT 2006


GIT changes to master grimoire by Treeve Jelbert <treeve at scarlet.be>:

 http/privoxy/DETAILS          |    8 ++++----
 http/privoxy/HISTORY          |    5 +++++
 http/privoxy/PRE_BUILD        |    4 ++--
 x11-toolkits/qt-x11/BUILD     |   15 ---------------
 x11-toolkits/qt-x11/DETAILS   |    7 ++++---
 x11-toolkits/qt-x11/HISTORY   |   10 ++++++++++
 x11-toolkits/qt-x11/PRE_BUILD |   29 +++++++++++++++++++++++++++++
 7 files changed, 54 insertions(+), 24 deletions(-)

New commits:
commit 9f8173db078737c3c86b9017bf05ea091aedf1a5
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    qt-x11-3.3.7

commit e43ca528345ad6bdc1734f787bfe758454a0b49f
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    privoxy - update action file

diff --git a/http/privoxy/DETAILS b/http/privoxy/DETAILS
index 8897d43..18dfe25 100755
--- a/http/privoxy/DETAILS
+++ b/http/privoxy/DETAILS
@@ -3,15 +3,15 @@
          VERSION=3.0.5
           SOURCE=$SPELL-$VERSION-beta-src.tar.gz
      SOURCE_HASH=sha512:543ebaab4508472e10b7b73f6f16dc91fada480049f4b2a24c0f60da2d436b6715e2391ad53245a059fbeac7ff489859bbb8775351c8ac92ddd9da0e7a15e6bb
-#         SOURCE2=default.action-1.9
-#    SOURCE2_HASH=sha512:a4f71acb521414e4c472d77ac5f7a5e87551bcf1eff4877a1273762847d0b10f9cc69a005a861a0faf157c74cc809e6dea77e638aec39b2dd30ef6ea2302fdc1
+         SOURCE2=default.action-2.0
+    SOURCE2_HASH=sha512:6bb755d08d0908d3982b6b16c614acf2b12874c72027073f9ce3d4cf8358990ff7acc96141d3917db5211be866722c85b892b69c8acd3287a4520e1b4bb4dd6d
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION-BETA
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SF_PROJECT/$SOURCE
-#  SOURCE2_URL[0]=$SOURCEFORGE_URL/$SF_PROJECT/$SOURCE2
+  SOURCE2_URL[0]=$SOURCEFORGE_URL/$SF_PROJECT/$SOURCE2
         WEB_SITE=http://www.privoxy.org/
      GATHER_DOCS=off
          ENTERED=20030403
-#      PATCHLEVEL=1
+      PATCHLEVEL=1
         KEYWORDS="web http"
            SHORT='Privoxy is a web proxy with advanced filtering capabilities for protecting privacy'
 cat << EOF
diff --git a/http/privoxy/HISTORY b/http/privoxy/HISTORY
index 76c9e1e..452cbaf 100644
--- a/http/privoxy/HISTORY
+++ b/http/privoxy/HISTORY
@@ -1,3 +1,8 @@
+2006-10-23 Treeve Jelbert <treeve at pi.be>
+	* DETAILS: PATCHLEVEL=1
+	  download updated default.action file
+	* PRE_BUILD: update actions file
+
 2006-09-30 Treeve Jelbert <treeve at pi.be>
 	* DETAILS: version 3.0.5
 	  don't get action file, latest version now include
diff --git a/http/privoxy/PRE_BUILD b/http/privoxy/PRE_BUILD
index e86ab65..fd34e75 100755
--- a/http/privoxy/PRE_BUILD
+++ b/http/privoxy/PRE_BUILD
@@ -1,8 +1,8 @@
 default_pre_build     &&
 cd $SOURCE_DIRECTORY  &&
 # add updated actions file
-#verify_file 2         &&
-#cp $SOURCE_CACHE/$SOURCE2 ./default.action &&
+verify_file 2         &&
+cp $SOURCE_CACHE/$SOURCE2 ./default.action &&
 # apply smgl patch
 patch -p1 <$SPELL_DIRECTORY/mk.patch &&
 autoheader &&
diff --git a/x11-toolkits/qt-x11/BUILD b/x11-toolkits/qt-x11/BUILD
index de40c62..7f83565 100755
--- a/x11-toolkits/qt-x11/BUILD
+++ b/x11-toolkits/qt-x11/BUILD
@@ -1,23 +1,8 @@
-# speed up up build process by removing unnecessary examples
-rm -r examples
-rm -r extensions/nsplugin/examples
-#rm -r extensions/xt/examples
-rm -r tools/designer/examples
-#rm -r tools/designer/tutorials
-#rm -r tools/linguist/tutorial
-#rm -r tools
-rm -r tutorial
-
-# add better optimisation flags
-sedit "s#-O2#$CFLAGS#" mkspecs/linux-g++/qmake.conf &&
-sedit "s#-O2#$CFLAGS#" mkspecs/linux-cxx/qmake.conf &&
-
 export QTDIR=$SOURCE_DIRECTORY  &&
 export LD_LIBRARY_PATH=$SOURCE_DIRECTORY/lib:$LD_LIBRARY_PATH &&
 
 #  if  spell_ok  postgresql;  then
 #    cd  $SOURCE_DIRECTORY  &&
-#   tar  -zxpf  /var/spool/sorcery/postgresql-`installed_version postgresql`.tar.gz  &&
 #    cd  postgresql-`installed_version postgresql`  &&
 #    ./configure  &&
 #    cd  $SOURCE_DIRECTORY
diff --git a/x11-toolkits/qt-x11/DETAILS b/x11-toolkits/qt-x11/DETAILS
index 4dbeec0..7f50572 100755
--- a/x11-toolkits/qt-x11/DETAILS
+++ b/x11-toolkits/qt-x11/DETAILS
@@ -1,15 +1,16 @@
            SPELL=qt-x11
-         VERSION=3.3.6
+         VERSION=3.3.7
           SOURCE=$SPELL-free-$VERSION.tar.bz2
-     SOURCE_HASH=sha512:11b15c71547c6ca0a1f87b5faddc66c393a685148e4ffe6acd1fd4e5f691f998fe350458f620c7508a03c74d23c0cb67b593abe31f3719db8fd421519716dcda
+     SOURCE_HASH=sha512:51e2b9752859b89b5accdf945fd49c1df559a046f062c8a961315a63d09751a4533109d8e5a841d8620172e7f34e662d57df9a16f8713bbffca37229efb8ccf5
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-free-$VERSION
-   SOURCE_URL[0]=ftp://ftp.trolltech.com/qt/source/$SOURCE
+   SOURCE_URL[0]=ftp://ftp.trolltech.com/pub/qt/source/$SOURCE
    SOURCE_URL[1]=ftp://ftp.silug.org/pub/qt/source/$SOURCE
    SOURCE_URL[2]=ftp://ftp.planetmirror.com.au/pub/trolltech/qt/source/$SOURCE
       LICENSE[0]=GPL
         WEB_SITE=http://www.trolltech.com/qt/x11.html
         KEYWORDS="qt x11 libs"
          ENTERED=20020410
+  SECURITY_PATCH=1
             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 1cbb753..963798c 100644
--- a/x11-toolkits/qt-x11/HISTORY
+++ b/x11-toolkits/qt-x11/HISTORY
@@ -1,3 +1,13 @@
+2006-10-22 Treeve Jelbert <treeve at pi.be>
+	* DETAILS: Updated to 3.3.7
+	  SECURITY_PATCH
+	   Fixed a potential security issue which could arise when transforming
+	   images from untrusted sources.
+	  update SOURCE_URL[0]
+	* PRE_BUILD: add
+	  fix use of firebird
+	* BUILD: move some code to PRE_BUILD
+
 2006-10-06 Juuso Alasuutari <iuso at sourcemage.org>
 	* qt.sh: Removed bashism.
 
diff --git a/x11-toolkits/qt-x11/PRE_BUILD b/x11-toolkits/qt-x11/PRE_BUILD
new file mode 100755
index 0000000..00b7869
--- /dev/null
+++ b/x11-toolkits/qt-x11/PRE_BUILD
@@ -0,0 +1,29 @@
+default_pre_build     &&
+cd $SOURCE_DIRECTORY  &&
+# fix detecction of firebird
+sedit "s/-lgds//" configure  &&
+sedit "/gds/D;/\t}/D" plugins/src/sqldrivers/ibase/ibase.pro &&
+
+# speed up up build process by removing unnecessary examples
+rm -r examples
+rm -r extensions/nsplugin/examples
+#rm -r extensions/xt/examples
+rm -r tools/designer/examples
+#rm -r tools/designer/tutorials
+#rm -r tools/linguist/tutorial
+#rm -r tools
+rm -r tutorial
+
+# add better optimisation flags
+sedit "s#-O2#$CFLAGS#" mkspecs/linux-g++/qmake.conf &&
+sedit "s#-O2#$CFLAGS#" mkspecs/linux-cxx/qmake.conf
+
+
+
+#  if  spell_ok  postgresql;  then
+#    cd  $SOURCE_DIRECTORY  &&
+#   tar  -zxpf  /var/spool/sorcery/postgresql-`installed_version postgresql`.tar.gz  &&
+#    cd  postgresql-`installed_version postgresql`  &&
+#    ./configure  &&
+#    cd  $SOURCE_DIRECTORY
+#  fi



More information about the SM-Commit mailing list