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

11 files changed, 28 insertions, 10 deletions

diff --git a/collab/webmin/DETAILS b/collab/webmin/DETAILS
index 30fb81a137..744cc68a53 100755
--- a/collab/webmin/DETAILS
+++ b/collab/webmin/DETAILS
@@ -1,9 +1,9 @@
            SPELL=webmin
-         VERSION=1.340
+         VERSION=1.350
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/webadmin/$SOURCE
-     SOURCE_HASH=sha512:39e4b819b9f88f7c9109072d01d8896aaac9b206d4636b94a491ff9a24a1763e67d3fad30d8ca2deac850c64636e83a787b8f3983f1915e155785fc15db305ba
+     SOURCE_HASH=sha512:64e8a7fb1c3ae17a54b5a9d92c74a999a36c6ec8e05ee4d349388c479584abe59d561487ba314e1a1d8c2d62caf69366f53d3ff05a1a77895169fc98c8ec0d66
         WEB_SITE=http://www.webmin.com/
          ENTERED=20020415
          ARCHIVE="off"
diff --git a/collab/webmin/HISTORY b/collab/webmin/HISTORY
index a5b5851db7..5793781f84 100644
--- a/collab/webmin/HISTORY
+++ b/collab/webmin/HISTORY
@@ -1,3 +1,6 @@
+2007-06-01 George Sherwood <george@beernabeer.com>
+	* DETAILS: updated spell to 1.350
+
 2007-04-22 George Sherwood <george@beernabeer.com>
 	* DETAILS: updated spell to 1.340
 
diff --git a/libs/ncurses/dickey.gpg b/dickey.gpg
index 27578dddbe..27578dddbe 100644
--- a/libs/ncurses/dickey.gpg
+++ b/dickey.gpg
diff --git a/libs/libidn/DETAILS b/libs/libidn/DETAILS
index f7e9ae07ce..9192b6746b 100755
--- a/libs/libidn/DETAILS
+++ b/libs/libidn/DETAILS
@@ -1,6 +1,6 @@
            SPELL=libidn
-         VERSION=0.6.11
-     SOURCE_HASH='sha512:b7dd72ec5366cb5cc1cc538f79c26dfc7ddf8a7e4aa40f2e43adf9307e2fd44f04f2602cbe329907199c51888252a521485f626fbf3e5a516ca2847ecbd69862'
+         VERSION=0.6.14
+     SOURCE_HASH='sha512:783d4213cbb2e9ac3c8d01e300116e6dd05db36577a1c9d138d8b8af6fa76dc15d1eeb69f26f64c7b3e6798d6d8c70663054ac2b229cd451afe6df522d6573b1'
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://josefsson.org/libidn/releases/$SOURCE
diff --git a/libs/libidn/HISTORY b/libs/libidn/HISTORY
index 61b68267b7..da1f67e0b8 100644
--- a/libs/libidn/HISTORY
+++ b/libs/libidn/HISTORY
@@ -1,3 +1,6 @@
+2007-06-01 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 0.6.14
+
 2007-03-14 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 0.6.11
 
diff --git a/utils/dialog/DETAILS b/utils/dialog/DETAILS
index 9849f6a0a1..7c67ed4fab 100755
--- a/utils/dialog/DETAILS
+++ b/utils/dialog/DETAILS
@@ -1,10 +1,11 @@
            SPELL=dialog
-         VERSION=1.1-20070227
-     SOURCE_HASH=sha512:38503d1ce402f582715c71ad1a184e70dc611fe70c9d6259688bc66c60805cd560e8e455f3555bb14545ce9d27bd512cc6a2dd9db1f18707b57be9a866a5378c
+         VERSION=1.1-20070528
           SOURCE=$SPELL-$VERSION.tgz
+         SOURCE2=${SOURCE}.asc
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=ftp://invisible-island.net/$SPELL/$SOURCE
-#      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+  SOURCE2_URL[0]=ftp://invisible-island.net/$SPELL/$SOURCE2
+      SOURCE_GPG=dickey.gpg:$SOURCE2:UPSTREAM_KEY
         WEB_SITE=http://invisible-island.net/dialog
          ENTERED=20010922
       LICENSE[0]=GPL
diff --git a/utils/dialog/HISTORY b/utils/dialog/HISTORY
index c43027b54a..6e5e0bb2df 100644
--- a/utils/dialog/HISTORY
+++ b/utils/dialog/HISTORY
@@ -1,3 +1,7 @@
+2007-06-01 Remko van der Vossen <wich@stack.nl>
+	* DETAILS: Version bumped to 1.1-20070528
+	  Converted to upstream GPG source checking
+
 2007-0228 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 1.1-20070227
 
diff --git a/utils/findutils/DETAILS b/utils/findutils/DETAILS
index 98ada2858c..95c236ebbb 100755
--- a/utils/findutils/DETAILS
+++ b/utils/findutils/DETAILS
@@ -1,5 +1,6 @@
            SPELL=findutils
-         VERSION=4.2.30
+         VERSION=4.2.31
+  SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/utils/findutils/HISTORY b/utils/findutils/HISTORY
index 6da5e4ba5e..b34c5a672a 100644
--- a/utils/findutils/HISTORY
+++ b/utils/findutils/HISTORY
@@ -1,3 +1,6 @@
+2007-06-01 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 4.2.31, SECURITY_PATCH=1, CVE-2007-2452
+
 2007-02-28 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 4.2.30
 
diff --git a/utils/multitail/DETAILS b/utils/multitail/DETAILS
index 0e07cdd858..14135b68fe 100755
--- a/utils/multitail/DETAILS
+++ b/utils/multitail/DETAILS
@@ -1,9 +1,9 @@
            SPELL=multitail
-         VERSION=5.0.3
+         VERSION=5.0.4
           SOURCE=${SPELL}-${VERSION}.tgz
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
    SOURCE_URL[0]=http://www.vanheusden.com/${SPELL}/${SOURCE}
-     SOURCE_HASH=sha512:b8eaa0576af8782e4e806ec4159e14bd6eb8be89761d476e337f19060496374fd7c2ca7472f7de0220d0723050fadd0d53670677750d1efd193fd659b5e84e8b
+     SOURCE_HASH=sha512:cb9578fc6185627ba980132a304e219b2b2b1496570bdc25628a9e35278348d34e65982a8e9053f0c981e31a4e139255c44362326f5ae1f6ce7fdf2e82765451
         WEB_SITE=http://www.vanheusden.com/multitail/
          ENTERED=20060105
       LICENSE[0]=GPL
diff --git a/utils/multitail/HISTORY b/utils/multitail/HISTORY
index 118d58d2f6..5f604da127 100644
--- a/utils/multitail/HISTORY
+++ b/utils/multitail/HISTORY
@@ -1,3 +1,6 @@
+2007-06-01 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 5.0.4
+
 2007-05-10 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 5.0.3