Merge branch 'master' into devel-kde47

11 files changed, 27 insertions, 9 deletions

diff --git a/audio-creation/mhwaveedit/DEPENDS b/audio-creation/mhwaveedit/DEPENDS
index 01b553679d..f1b93f1a37 100755
--- a/audio-creation/mhwaveedit/DEPENDS
+++ b/audio-creation/mhwaveedit/DEPENDS
@@ -54,4 +54,6 @@ optional_depends ladspa "" "" "for LADSPA plugins support" &&
 
 suggest_depends sox "" "" "for SoX effects support" &&
 
+suggest_depends vorbis-tools "" "" "for Ogg [en|de]coding support" &&
+
 suggest_depends lame "" "" "for MP3 [en|de]coding support"
diff --git a/audio-creation/mhwaveedit/HISTORY b/audio-creation/mhwaveedit/HISTORY
index 1bc81b9d39..cd4efd6a68 100644
--- a/audio-creation/mhwaveedit/HISTORY
+++ b/audio-creation/mhwaveedit/HISTORY
@@ -1,3 +1,6 @@
+2011-09-04 Vlad Glagolev <stealth@sourcemage.org>
+	* DEPENDS: added vorbis-tools suggest dep
+
 2011-06-12 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: PATCHLEVEL=1
 	* PRE_BUILD: added, to apply the patch
diff --git a/crypto/ca-certificates/DETAILS b/crypto/ca-certificates/DETAILS
index a7d3813a9f..db430b42c0 100755
--- a/crypto/ca-certificates/DETAILS
+++ b/crypto/ca-certificates/DETAILS
@@ -1,6 +1,7 @@
            SPELL=ca-certificates
-         VERSION=20110502
-     SOURCE_HASH=sha512:12b148987c292320e90b7124bf5d0194a3b7d8f1807b13b05461b18798e6a5346e205b065256d0bbdce7bf13d5db2b9c756b0f5a63a309d9164eff973179a363
+         VERSION=20110502+nmu1
+  SECURITY_PATCH=1
+     SOURCE_HASH=sha512:2ba33346689d21846632390ad55f2a6102a333cc32019a6e00d85c00970a6f744b4a4d548b68bf9b6369d0cfc2b06009db4b4be4ffafd3629bf05737fdc096d2
           SOURCE=${SPELL}_${VERSION}_all.deb
    SOURCE_URL[0]=http://ftp.de.debian.org/debian/pool/main/c/$SPELL/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
diff --git a/crypto/ca-certificates/HISTORY b/crypto/ca-certificates/HISTORY
index 0d9cd982f0..c90055defe 100644
--- a/crypto/ca-certificates/HISTORY
+++ b/crypto/ca-certificates/HISTORY
@@ -1,3 +1,7 @@
+2011-09-04 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 20110502+nmu1
+	  SECURITY_PATCH=1 ( blacklist DigiNotar Root CA)
+
 2011-07-23 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: updated spell to 20110502
 
diff --git a/devel/gdb/DETAILS b/devel/gdb/DETAILS
index e5b9a4269e..67c26d9a9e 100755
--- a/devel/gdb/DETAILS
+++ b/devel/gdb/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gdb
-         VERSION=7.3
+         VERSION=7.3.1
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/gdb/HISTORY b/devel/gdb/HISTORY
index 9a3573abbd..52c2be8680 100644
--- a/devel/gdb/HISTORY
+++ b/devel/gdb/HISTORY
@@ -1,3 +1,6 @@
+2011-09-05 Bor Kraljič <pyrobor@ver.si>
+	* DETAILS: updated spell to 7.3.1
+
 2011-07-31 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: updated spell to 7.3; quoting paths
 
diff --git a/devel/python3/DETAILS b/devel/python3/DETAILS
index 3596e7ff66..bdd80c80a8 100755
--- a/devel/python3/DETAILS
+++ b/devel/python3/DETAILS
@@ -1,5 +1,5 @@
            SPELL=python3
-         VERSION=3.2.1
+         VERSION=3.2.2
           SOURCE=Python-$VERSION.tar.bz2
          SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/Python-$VERSION"
diff --git a/devel/python3/HISTORY b/devel/python3/HISTORY
index cd22c69eaa..e84452f0a8 100644
--- a/devel/python3/HISTORY
+++ b/devel/python3/HISTORY
@@ -1,3 +1,6 @@
+2011-09-04 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 3.2.2
+
 2011-07-30 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* DEPENDS: changed dependency on g++ to dependency on gcc with
 	  sub-depends on CXX (scripted)
diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index 2b07f7b8b4..e20e0c76ad 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,13 +1,13 @@
            SPELL=seamonkey
-         VERSION=2.3.2
+         VERSION=2.3.3
           SOURCE=$SPELL-$VERSION.source.tar.bz2
-     SOURCE_HASH=sha512:8b4cb16c5410d76a88a50362bc28fa7d347afd9e157f0d5c963250dc8ba5b638110cda347af1ed0e4c3c87902ce7cb338f069541103cb24cb64c791a562d4fa4
+     SOURCE_HASH=sha512:3eada4ee4d3adbe81455b87a1c48391b3a6b234681ecc9df1f6e1d7ccbf9ac2a7e6394e2ecc42b6f3c1370668628c8bd1a3307240c20d28085d43711aaf77567
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
       SOURCE_URI=seamonkey/releases/$VERSION/source/$SOURCE
    SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI
    SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/mozilla.org/$SOURCE_URI
         WEB_SITE=http://www.seamonkey-project.org/
-  SECURITY_PATCH=34
+  SECURITY_PATCH=35
            TMPFS=off
          ENTERED=20010922
       LICENSE[0]=MPL
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index f90efdaa92..d6daaa5dba 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,7 @@
+2011-09-05 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 2.3.3, SECURITY_PATCH=35
+	* PRE_BUILD: sed removed, fixed upstream
+
 2011-08-31 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 2.3.2, SECURITY_PATCH=34, MFSA 2011-34
 	* PRE_BUILD: sed added to fix version.txt
diff --git a/http/seamonkey/PRE_BUILD b/http/seamonkey/PRE_BUILD
index 38ec28c79c..9fff8df468 100755
--- a/http/seamonkey/PRE_BUILD
+++ b/http/seamonkey/PRE_BUILD
@@ -3,8 +3,6 @@ cd             $SOURCE_DIRECTORY  &&
 unpack_file    ''                 &&
 cd             comm-release       &&
 
-sed -i "s:2.3.1:2.3.2:" suite/config/version.txt &&
-
 cp -v $SPELL_DIRECTORY/blfs-mozconfig .mozconfig &&
 
 if [[ "$SEAMONKEY_OFFICIAL" == "y" ]]; then