[SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (cf343774a2f54b929def5ea3c249ef47a120c92d)

Vlad Glagolev scm at sourcemage.org
Thu Sep 1 10:38:49 EDT 2011


GIT changes to devel-xorg-modular grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 ftp/filezilla/DETAILS        |    4 ++--
 ftp/filezilla/HISTORY        |    3 +++
 graphics-libs/libpng/DETAILS |   12 +++++++-----
 graphics-libs/libpng/HISTORY |    7 +++++++
 http/firefox/DETAILS         |   16 +++++++++-------
 http/firefox/HISTORY         |    3 +++
 net/samba/BUILD              |    6 ------
 net/samba/CONFIGURE          |    3 ---
 net/samba/DETAILS            |    4 ++--
 net/samba/HISTORY            |    4 ++++
 x11-toolkits/qt4/DETAILS     |    4 ++--
 x11-toolkits/qt4/HISTORY     |    3 +++
 12 files changed, 42 insertions(+), 27 deletions(-)

New commits:
commit 4ddca3426c32c8c4d3c1f8108384367fd0f80839
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    qt4 4.7.4

commit 441a9ee5f97ba9cc85a620f129b31eff7ce8275a
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    samba 3.6.0
    
    configure: WARNING: unrecognized options: --with-cifsmount

commit 874ec0bd2da8c4f43ef133117edd358c4694df00
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    libpng: => 1.2.46

commit af92d33661744d4c17f8dffa37ae8b62de5549f9
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    filezilla 3.5.1

commit 03b7ba63946820e238c516eb4151ea92df6819a1
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    firefox 6.0.1, SECURITY_PATCH=40, MFSA 2011-34

diff --git a/ftp/filezilla/DETAILS b/ftp/filezilla/DETAILS
index 87c087b..1b34c38 100755
--- a/ftp/filezilla/DETAILS
+++ b/ftp/filezilla/DETAILS
@@ -1,8 +1,8 @@
            SPELL=filezilla
-         VERSION=3.5.0
+         VERSION=3.5.1
           SOURCE="FileZilla_${VERSION}_src.tar.bz2"
    SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
-     SOURCE_HASH=sha512:fff0720756cf87f493819db492dbff78d00e93f7c1c1e1ee613bdfdf88ace5fe00a1c5a4c44ea20641d94ae46514f32c65255c9485f270f6c2f94ea9e164028c
+     SOURCE_HASH=sha512:d7d6a54989e0677747f69b66c7258d795a6e60fce951eca4b160d60751d28096c351896a850efd81228162e7d708ca6f0bb649ee6e71e5cec15d7e14daa2b5dd
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://filezilla-project.org/"
       LICENSE[0]=GPL
diff --git a/ftp/filezilla/HISTORY b/ftp/filezilla/HISTORY
index c4ca69c..fd91d50 100644
--- a/ftp/filezilla/HISTORY
+++ b/ftp/filezilla/HISTORY
@@ -1,3 +1,6 @@
+2011-09-01 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 3.5.1
+
 2011-05-24 Julien "_kaze_" ROZO <julien at rozo.org>
 	* DETAILS: updated version to 3.5.0
 
diff --git a/graphics-libs/libpng/DETAILS b/graphics-libs/libpng/DETAILS
index 54dc3d4..936beee 100755
--- a/graphics-libs/libpng/DETAILS
+++ b/graphics-libs/libpng/DETAILS
@@ -1,17 +1,19 @@
            SPELL=libpng
-         VERSION=1.2.44
+         VERSION=1.2.46
+     SOURCE_HASH=sha512:57ddc72f3f13987864f80c79617a064e87bcc699c5ea8146b986ff8529067bdc458be647092ad1f7bb68a6dbd14e08fd8906d20ba875c38d556e7f80ff99a885
           SOURCE=$SPELL-$VERSION.tar.bz2
-         SOURCE2=$SPELL-$VERSION-apng.patch.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
    SOURCE_URL[1]=ftp://ftp.simplesystems.org/pub/libpng/png/src/$SOURCE
+if [[ $ANI_PNG == y ]]; then
+         SOURCE2=$SPELL-$VERSION-apng.patch.gz
   SOURCE2_URL[0]=$SOURCEFORGE_URL/$SPELL-apng/$SOURCE2
-     SOURCE_HASH=sha512:0c459a437df51fe577fccd6d4af8ef80d44c17d85237296f6f8dcaadfbb2a3c3a7390be4ccf3d68371fbcac61a172f985d9fb66082d902617b86c54ecc74908c
-    SOURCE2_HASH=sha512:5236e7b723443f28fa0f94927ade2b45b5e5ad6814ae59cfbcb04bb249651e06895d12e87f4c22069505512b26f513361fa1ad6dd2103f2e305e2a07bab4ee6a
+    SOURCE2_HASH=sha512:67dedea610de196282e50e902db9106e820996bb575659ca413e9a886b3996995257c69cea93396864eaa23decf6f5bee6fa44b295e01aeaf135bbddf368b0b2
+fi
       LICENSE[0]=ZLIB
         WEB_SITE=http://www.libpng.org/pub/png/libpng.html
          ENTERED=20010922
-  SECURITY_PATCH=5
+  SECURITY_PATCH=6
         KEYWORDS="graphics libs"
            SHORT="library that supports the PNG graphics format"
 cat << EOF
diff --git a/graphics-libs/libpng/HISTORY b/graphics-libs/libpng/HISTORY
index 088b663..d91c653 100644
--- a/graphics-libs/libpng/HISTORY
+++ b/graphics-libs/libpng/HISTORY
@@ -1,3 +1,10 @@
+2011-09-01 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.2.46
+	  SECURITY_PATCH=6
+	  multiple security fixes
+	  CVE-2011-2690, CVE-2011-2691, CVE-2011-2692, CVE-2004-042
+	  see <http://www.libpng.org/pub/png/src/libpng-1.2.46-README.txt>
+
 2010-06-28 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.2.44, SECURITY_PATCH=5
 
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index ef81c7b..4a9d5ab 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,22 +1,24 @@
            SPELL=firefox
 if [[ $FIREFOX_CVS == y ]]; then
-         VERSION=6.0
+         VERSION=6.0.1
           SOURCE=$SPELL-$VERSION.source.tar.bz2
-         SOURCE2=$SOURCE.asc
-      SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
+     SOURCE_HASH=sha512:48c351795c97de1c66b31123e31b919bf7f69d92d40abc86e0576919406bca0aee7a4a94873ae254c9cec28330231e449763cad7775401a6a28d050e3c2c51f2
+#         SOURCE2=$SOURCE.asc
+#      SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
    SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE
   SOURCE2_URL[0]=$SOURCE_URL.asc
 else
-         VERSION=6.0
+         VERSION=6.0.1
           SOURCE=$SPELL-$VERSION.source.tar.bz2
-         SOURCE2=$SOURCE.asc
-      SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
+     SOURCE_HASH=sha512:48c351795c97de1c66b31123e31b919bf7f69d92d40abc86e0576919406bca0aee7a4a94873ae254c9cec28330231e449763cad7775401a6a28d050e3c2c51f2
+#         SOURCE2=$SOURCE.asc
+#      SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
    SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE
    SOURCE_URL[1]=ftp://ftp.access.ch/mirror/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
    SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
    SOURCE_URL[3]=ftp://ftp.sai.msu.su/pub/unix/WWW/browsers/$SOURCE
   SOURCE2_URL[0]=$SOURCE_URL.asc
-  SECURITY_PATCH=39
+  SECURITY_PATCH=40
 fi
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 30ab414..f926932 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2011-09-01 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 6.0.1, SECURITY_PATCH=40, MFSA 2011-34
+
 2011-08-16 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: TMPFS=off for all
 
diff --git a/net/samba/BUILD b/net/samba/BUILD
index 24d8bd7..667bf34 100755
--- a/net/samba/BUILD
+++ b/net/samba/BUILD
@@ -6,12 +6,6 @@ OPTS="--with-swatdir=/usr/share/swat  \
       $SAMBA_QUOTA                    \
       $OPTS"                          &&
 
-if  [[  "$SAMBA_CIFS"  ==  "y"  ]];  then
-  OPTS="--with-cifsmount $OPTS"
-else
-  OPTS="--without-cifsmount $OPTS"
-fi &&
-
 cd  $SOURCE_DIRECTORY/source3  &&
 default_build  &&
 
diff --git a/net/samba/CONFIGURE b/net/samba/CONFIGURE
index 759b31a..9397bb1 100755
--- a/net/samba/CONFIGURE
+++ b/net/samba/CONFIGURE
@@ -7,9 +7,6 @@ else
     "Enable Active Directory Support ?\n(Requires openldap and krb5)"  n
 fi  &&
 
-config_query  SAMBA_CIFS                                                \
-  "Build CIFS support (for Windows 2003)?"                           y  &&
-
 #config_query  SAMBA_SUID                                                \
 #  "Do you want to install mount tools suid root?"                    n  &&
 
diff --git a/net/samba/DETAILS b/net/samba/DETAILS
index 3f23fdc..4dbeb7e 100755
--- a/net/samba/DETAILS
+++ b/net/samba/DETAILS
@@ -1,11 +1,11 @@
            SPELL=samba
-         VERSION=3.5.11
+         VERSION=3.6.0
           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:6fe6042f5c730a44bfbe2194ef32f2e2fbada4996f81b1f3ac513773bcaebd9cf2ba250e8cbae8314006f819f05db2fa18258ce6d80aeb4672df7e525d0a7132
+     SOURCE_HASH=sha512:43fb9e3fb5be2d1478041cd1d1e3f362462d093ee258ebeef881accc7d48a733a54c0ac588815475a85e8f4cd44561e315f57b51e44f74fe3932b31d861fa7b1
 if [[ "$SAMBA_VSCAN" == "y" ]] ; then
    VSCAN_VERSION=0.3.6c-beta4
          SOURCE2=$SPELL-vscan-$VSCAN_VERSION.tar.gz
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index 4e0f1a2..6bb6f0a 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,7 @@
+2011-09-01 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 3.6.0
+	* CONFIGURE, BUILD: removed cifs option
+
 2011-08-19 Bor Kraljič <pyrobor at ver.si>
 	* BUILD: removed unrecognized options (issue #30)
 
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index 8452722..2ada024 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -2,8 +2,8 @@ persistent_remove QT_VER
            SPELL=qt4
            TMPFS=off
          SPELLX=qt-everywhere-opensource-src
-         VERSION=4.7.3
-     SOURCE_HASH=sha512:b6dd5f53a01da66c8069fefcef3b21aafa7131c0745370924e4476d08db17a8186165b497d4c34c319a00e6a19d308e5d37fae7494c0693e272666cf80c4903c
+         VERSION=4.7.4
+     SOURCE_HASH=sha512:3d5dd21d20e5638e70192121a9780cdf3e35e7f404f790fb58a1920b2e24dd60d9dade1b4877782dc7ebc27d5bb10c5cc7706e24d8724c66e3575698ca3cfdad
           SOURCE=$SPELLX-$VERSION.tar.gz
              URI=qt/source/$SOURCE
   SECURITY_PATCH=4
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index fc1c004..e427ebd 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,6 @@
+2011-09-01 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 4.7.4
+
 2011-07-30 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DEPENDS: changed dependency on g++ to dependency on gcc with
 	  sub-depends on CXX (scripted)


More information about the SM-Commit mailing list