Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire

14 files changed, 31 insertions, 12 deletions

diff --git a/archive/lzip/DETAILS b/archive/lzip/DETAILS
index d16eb62d8d..418a83b8a9 100755
--- a/archive/lzip/DETAILS
+++ b/archive/lzip/DETAILS
@@ -1,5 +1,5 @@
            SPELL=lzip
-         VERSION=1.10
+         VERSION=1.11
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/archive/lzip/HISTORY b/archive/lzip/HISTORY
index a627feeefb..af30ad775f 100644
--- a/archive/lzip/HISTORY
+++ b/archive/lzip/HISTORY
@@ -1,3 +1,6 @@
+2010-10-30 George Sherwood <gsherwood@sourcemage.org>
+	* DETAILS: Updated version to 1.11
+
 2010-08-07 George Sherwood <gsherwood@sourcemage.org>
 	* DETAILS: Updated to version 1.10. Fixed SOURCE_URL[0]
 	  Fixed SOURCE2_URL[0]
diff --git a/disk/gparted/DETAILS b/disk/gparted/DETAILS
index 3ed3e73865..738b0d2846 100755
--- a/disk/gparted/DETAILS
+++ b/disk/gparted/DETAILS
@@ -1,6 +1,6 @@
            SPELL=gparted
-         VERSION=0.6.4
-     SOURCE_HASH=sha512:c368630da952fb3ca23ccde049055a8d57e6278112a519a0d3d2a0ef2d49fd8ddbd93f188850a2b01686e6ed99200a59e5c53c53d6654fe7cf654e037c56f7c7
+         VERSION=0.7.0
+     SOURCE_HASH=sha512:acdbcb250e0cd0926f22396cb847d3048c111eced1e6cfaf378d8bdd3cf3883b6472f45cae588f8eb678f3b70647f400bed3a5bed46d789b84d71d04612cf6de
           SOURCE=${SPELL}-${VERSION}.tar.bz2
    SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/disk/gparted/HISTORY b/disk/gparted/HISTORY
index fcdbd81296..6927b219d8 100644
--- a/disk/gparted/HISTORY
+++ b/disk/gparted/HISTORY
@@ -1,3 +1,6 @@
+2010-10-30 George Sherwood <gsherwood@sourcemage.org>
+	* DETAILS: Updated to version 0.7.0
+
 2010-10-01 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 0.6.4
 
diff --git a/ftp/proftpd/DETAILS b/ftp/proftpd/DETAILS
index 86914cc116..1b5b9cf3ee 100755
--- a/ftp/proftpd/DETAILS
+++ b/ftp/proftpd/DETAILS
@@ -1,6 +1,7 @@
            SPELL=proftpd
-         VERSION=1.3.3b
-     SOURCE_HASH=sha512:b29b2af90a1fe55118710083c8c09b509a0fea90a746cf72302e5327e21e16a8a5a79400fc915d54dddf7e78ebe557d1d4786c129a9c20d27ebdd7680624b510
+         VERSION=1.3.3c
+  SECURITY_PATCH=1
+     SOURCE_HASH=sha512:a3f70faf39c2edeae75e56657d4d35633a3c2186bcd82867be1cda39e75377e4672b55af572f4ad2c7f829a27420bac7e9fb561f040129c9065880d27fe06eeb
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=ftp://ftp.proftpd.org/distrib/source/$SOURCE
diff --git a/ftp/proftpd/HISTORY b/ftp/proftpd/HISTORY
index 93daf47ab8..42305e3114 100644
--- a/ftp/proftpd/HISTORY
+++ b/ftp/proftpd/HISTORY
@@ -1,3 +1,6 @@
+2010-10-30 George Sherwood <gsherwood@sourcemage.org>
+	* DETAILS: Updated to version 1.3.3c. SECURITY_PATCH++
+
 2010-09-10 George Sherwood <gsherwood@sourcemage.org>
 	* DETAILS: Updated to version 1.3.3b
 
diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index ed862b35a4..cf01a32f50 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,5 +1,5 @@
            SPELL=imagemagick
-         VERSION=6.6.5-2
+         VERSION=6.6.5-4
   SECURITY_PATCH=1
           SOURCE=ImageMagick-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
    SOURCE_URL[2]=ftp://ftp.nluug.nl/pub/ImageMagick/$SOURCE
    SOURCE_URL[3]=http://image_magick.veidrodis.com/image_magick/$SOURCE
 #     SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
-     SOURCE_HASH=sha512:f567fbad99af3ea456e41b5ce92e3d429ee6e943343fd13df65d9f1984b1c82b5abccbad1715b346d9e9bf14592441806f5b0f9f8df25aad27aca42c9da4ef72
+     SOURCE_HASH=sha512:bfe0fbe8189a545d5ffd18380661eef61e1fff016cc55231d8ee9de339a6301605d8f09030b772b2e1386fc725242b284844fe2c953e2268355af11c17935655
           CCACHE="off"
         WEB_SITE=http://www.imagemagick.org/
          ENTERED=20010922
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index 902e9f5a9a..3bcb1a1497 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2010-10-30 George Sherwood <gsherwood@sourcemage.org>
+	* DETAILS: Updated to version 6.6.5-4
+
 2010-10-23 George Sherwood <gsherwood@sourcemage.org>
 	* DETAILS: Updated to version 6.6.5-2
 
diff --git a/net/ntop/DETAILS b/net/ntop/DETAILS
index c1bf1a77f4..102c26dec8 100755
--- a/net/ntop/DETAILS
+++ b/net/ntop/DETAILS
@@ -7,10 +7,9 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
   SOURCE2_URL[0]=http://www.maxmind.com/download/geoip/database/$SOURCE2
   SOURCE3_URL[0]=http://www.maxmind.com/download/geoip/database/asnum/$SOURCE3
-#     SOURCE_HASH=sha512:6aeb2b7194376a7f04a64800ec272785d7ce57429c3931506506c28a809f3febff8df3ba50f432f198efb0e83553dc99c0824fe63af6574b63054ce8eec34d2e
       SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
-     SOURCE2_GPG="gurus.gpg:$SOURCE2.sig:WORKS_FOR_ME"
-     SOURCE3_GPG="gurus.gpg:$SOURCE3.sig:WORKS_FOR_ME"
+  SOURCE2_IGNORE=unversioned
+  SOURCE3_IGNORE=unversioned
       LICENSE[0]=GPL
         WEB_SITE=http://www.ntop.org/
         KEYWORDS="net"
diff --git a/net/ntop/GeoIPASNum.dat.gz.sig b/net/ntop/GeoIPASNum.dat.gz.sig
deleted file mode 100644
index ec5484a671..0000000000
--- a/net/ntop/GeoIPASNum.dat.gz.sig
+++ /dev/null
diff --git a/net/ntop/GeoLiteCity.dat.gz.sig b/net/ntop/GeoLiteCity.dat.gz.sig
deleted file mode 100644
index f4635afd74..0000000000
--- a/net/ntop/GeoLiteCity.dat.gz.sig
+++ /dev/null
diff --git a/net/ntop/HISTORY b/net/ntop/HISTORY
index 6b735d891e..a812852bd7 100644
--- a/net/ntop/HISTORY
+++ b/net/ntop/HISTORY
@@ -1,3 +1,7 @@
+2010-10-30 Bor Kraljič <pyrobor@ver.si>
+	* DETAILS: added SOURCE_IGNORE for SOURCE2 and SOURCE3
+	* GeoLiteCity.dat.gz.sig, GeoIPASNum.dat.gz.sig: removed, no longer needed
+
 2010-04-06 Philippe "Puppet_Master" Caseiro  <puppetmaster@sourcemage.org>
 	* DEPENDS: updated mysql dependency to MYSQL provider
 
diff --git a/science/mathomatic/DETAILS b/science/mathomatic/DETAILS
index 035bb913e9..a18a1e2d82 100755
--- a/science/mathomatic/DETAILS
+++ b/science/mathomatic/DETAILS
@@ -1,9 +1,9 @@
            SPELL=mathomatic
-         VERSION=15.2.1
+         VERSION=15.3.2
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.panix.com/~gesslein/$SOURCE
-     SOURCE_HASH=sha512:5a5c0daafc80ac482de5700ab5574bf4d616796a239148dd52e17d680ed63fc462d7ce6a18f514a728532eaa1ee3cdbbd256a37ef2af7a56a419defa014c7546
+     SOURCE_HASH=sha512:dae7fcf661fa0968f2c494555aceacca46b8695815f83e1c86efcdb455b3fc3cddd6d750bf8837b64a64fe72a80cf92ff9b57a67794640af87563e5d730a18af
         WEB_SITE=http://mathomatic.orgserve.de/math/
          ENTERED=20041204
       LICENSE[0]=LGPL
diff --git a/science/mathomatic/HISTORY b/science/mathomatic/HISTORY
index fb67ecd08b..8143b367b3 100644
--- a/science/mathomatic/HISTORY
+++ b/science/mathomatic/HISTORY
@@ -1,3 +1,6 @@
+2010-10-30 Bor Kraljič <pyrobor@ver.si>
+	* DETAILS: updated spell to 15.3.2
+
 2010-09-09 Bor Kraljič <pyrobor@ver.si>
 	* DETAILS: updated spell to 15.2.1