samba security update to 3.0.24

Conflicts:

	net/samba/DETAILS
	net/samba/HISTORY

4 files changed, 25 insertions, 6 deletions

diff --git a/net/samba/DETAILS b/net/samba/DETAILS
index c794bac462..dfaa5f726f 100755
--- a/net/samba/DETAILS
+++ b/net/samba/DETAILS
@@ -1,5 +1,5 @@
            SPELL=samba
-         VERSION=3.0.23c
+         VERSION=3.0.24
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://us1.samba.org/samba/ftp/$SOURCE
@@ -7,21 +7,22 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[2]=ftp://www.mirror.ac.uk/sites/ftp.samba.org/pub/$SPELL/$SOURCE
    SOURCE_URL[3]=ftp://de.samba.org/samba.org/$SOURCE
    SOURCE_URL[4]=http://us1.samba.org/samba/ftp/old-versions/$SOURCE
-     SOURCE_HASH=sha512:58bca3248275df6c1251374e543e18cc3dedb3c0041fc7865824200816d2989890602ae071d8f7f593cc8fe2134747f95a5b38cf2818d03f3913ea32e56c2490
+#     SOURCE_HASH=sha512:c9235befbea78c5d3c703ef6060e139d28ecaa24ce7784c508f1601
+      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
 if [[ "$SAMBA_VSCAN" == "y" ]] ; then
    VSCAN_VERSION=0.3.6b
          SOURCE2=$SPELL-vscan-$VSCAN_VERSION.tar.bz2
   SOURCE2_URL[0]=$SOURCEFORGE_URL/openantivirus/$SOURCE2        
     SOURCE2_HASH=sha512:9e1fba0f59bf10450a6f6a17aa261ae321385fd539b9757d57bfe8fea29ceccdef01427bbf7327f906000ecae41b87ed85853151be52f9ceb2dce0afc519f063
 fi
-        WEB_SITE=http://www.samba.org/
-         ENTERED=20010922
+  SECURITY_PATCH=2
       PATCHLEVEL=1
-  SECURITY_PATCH=1
       LICENSE[0]=GPL
-            DOCS="Manifest Read-Manifest-Now Roadmap WHATSNEW.txt examples/"
+        WEB_SITE=http://www.samba.org/
         KEYWORDS="net"
+         ENTERED=20010922
            SHORT="File and print services to SMB/CIFS clients"
+            DOCS="Manifest Read-Manifest-Now Roadmap WHATSNEW.txt examples/"
 cat << EOF
 SMB server to provide Windows NT and LAN manager-style file and print
 services to SMB clients such as Windows. A NetBIOS nameserver which
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index 70d11bf996..bc14574d9c 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,21 @@
+2007-02-05 Eric Sandall <eric@sandall.us>
+	* DETAILS: Updated to 3.0.24 (Security update)
+	  o CVE-2007-0452 (Potential Denial of Service bug in smbd)
+	  o CVE-2007-0453 (Buffer overrun in NSS host lookup Winbind
+	    NSS library on Solaris)
+	  o CVE-2007-0454 (Format string bug in afsacl.so VFS plugin)
+	  Updated SECURITY_PATCH=2
+	* samba.gpg: Added Samba Distribution signing key
+	  Verified from http://us1.samba.org/samba/ftp/samba-pubkey_6568B7EA.asc
+	  and http://keyserver.noreply.org/pks/lookup?op=get&search=0x6F33915B6568B7EA
+	  and http://lists.samba.org/archive/samba/2006-May/120996.html (where
+	  Gerald points to http://samba.org/samba/download/ which points to
+	  http://us3.samba.org/samba/ftp/samba-pubkey.asc which is a copy of
+	  http://us1.samba.org/samba/ftp/samba-pubkey_6568B7EA.asc).
+	  Unfortunately, this signature is for the uncompressed .tar, not the
+	  compressed .tar.gz. :( Still, adding it here for (hopeful) future
+	  use.
+
 2006-09-03 George Sherwood <george@beernabeer.com>
 	* DETAILS: Updated to version 3.0.23c.
 
diff --git a/net/samba/samba-3.0.24.tar.gz.sig b/net/samba/samba-3.0.24.tar.gz.sig
new file mode 100644
index 0000000000..7f99757c4c
--- /dev/null
+++ b/net/samba/samba-3.0.24.tar.gz.sig
diff --git a/net/samba/samba.gpg b/net/samba/samba.gpg
new file mode 100644
index 0000000000..d3035953a5
--- /dev/null
+++ b/net/samba/samba.gpg