[pkgsrc/pkgsrc-2007Q1]: pkgsrc/net/samba Pullup ticket 2092 - requested by tron

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/70497eb4cb6e
branches:  pkgsrc-2007Q1
changeset: 527386:70497eb4cb6e
user:      salo <salo%pkgsrc.org@localhost>
date:      Sat May 19 18:17:41 2007 +0000

description:
Pullup ticket 2092 - requested by tron
security fixes for samba

Revisions pulled up:
- pkgsrc/net/samba/Makefile                             1.171
- pkgsrc/net/samba/Makefile.patches                     1.4
- pkgsrc/net/samba/distinfo                             1.54

   Module Name:         pkgsrc
   Committed By:        tron
   Date:                Sat May 19 17:55:13 UTC 2007

   Modified Files:
        pkgsrc/net/samba: Makefile Makefile.patches distinfo

   Log Message:
   Add security patches for CVE-2007-2444, CVE-2007-2446 and CVE-2007-2447
   from Samba website. Bump package revision because of these security fixes.

diffstat:

 net/samba/Makefile         |   4 ++--
 net/samba/Makefile.patches |  11 ++++++++++-
 net/samba/distinfo         |  11 ++++++++++-
 3 files changed, 22 insertions(+), 4 deletions(-)

diffs (62 lines):

diff -r 9288bf8b36ad -r 70497eb4cb6e net/samba/Makefile
--- a/net/samba/Makefile        Sat May 19 17:55:15 2007 +0000
+++ b/net/samba/Makefile        Sat May 19 18:17:41 2007 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.170 2007/03/17 15:43:15 taca Exp $
+# $NetBSD: Makefile,v 1.170.2.1 2007/05/19 18:17:41 salo Exp $
 
 .include "Makefile.mirrors"
 
 DISTNAME=              samba-${VERSION}
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            net
 MASTER_SITES=          ${SAMBA_MIRRORS:=old-versions/}
 
diff -r 9288bf8b36ad -r 70497eb4cb6e net/samba/Makefile.patches
--- a/net/samba/Makefile.patches        Sat May 19 17:55:15 2007 +0000
+++ b/net/samba/Makefile.patches        Sat May 19 18:17:41 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.patches,v 1.3 2007/03/17 15:43:15 taca Exp $
+# $NetBSD: Makefile.patches,v 1.3.2.1 2007/05/19 18:17:41 salo Exp $
 #
 # This Makefile fragment describes the recommended patches for the
 # currently packaged version of Samba.  All recommended patches for
@@ -18,3 +18,12 @@
                dfs_referral.diff \
                directory_delete.diff
 PATCH_DIST_STRIP= -p2
+
+.for CVE_PATCH in samba-3.0.24-CVE-2007-2444.patch \
+  samba-3.0.24-CVE-2007-2446.patch \
+  samba-3.0.24-CVE-2007-2447.patch
+PATCHFILES+=           ${CVE_PATCH}
+SITES.${CVE_PATCH}=    http://www.samba.org/samba/ftp/patches/security/
+.endfor
+
+PATCH_DIST_STRIP.samba-3.0.24-CVE-2007-2447.patch=     -p1
diff -r 9288bf8b36ad -r 70497eb4cb6e net/samba/distinfo
--- a/net/samba/distinfo        Sat May 19 17:55:15 2007 +0000
+++ b/net/samba/distinfo        Sat May 19 18:17:41 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.53 2007/03/17 15:43:15 taca Exp $
+$NetBSD: distinfo,v 1.53.2.1 2007/05/19 18:17:42 salo Exp $
 
 SHA1 (dfs_referral.diff) = 26d395028e2f7ae59d115a277864ef791bfc14b9
 RMD160 (dfs_referral.diff) = 4dcc1bf7eaf1452d9fb02884448dc88fb5ddeed3
@@ -6,6 +6,15 @@
 SHA1 (directory_delete.diff) = ace447241ee40e495bb2fd065996d624c0ca615c
 RMD160 (directory_delete.diff) = 0cc49ade7403b22937d858e1fe7e9357d49f6be3
 Size (directory_delete.diff) = 2218 bytes
+SHA1 (samba-3.0.24-CVE-2007-2444.patch) = 0f94ecb0233a31b42896a36a4855e21bc49cb450
+RMD160 (samba-3.0.24-CVE-2007-2444.patch) = 2bd5ed0106441097fe50bab91a34257584e16950
+Size (samba-3.0.24-CVE-2007-2444.patch) = 3026 bytes
+SHA1 (samba-3.0.24-CVE-2007-2446.patch) = 31b76c825f932df351e85d4df48b219ce83b13ac
+RMD160 (samba-3.0.24-CVE-2007-2446.patch) = d9cba3b72dac65de0add57d56d97c2d68d7ea9bb
+Size (samba-3.0.24-CVE-2007-2446.patch) = 8426 bytes
+SHA1 (samba-3.0.24-CVE-2007-2447.patch) = 15e4061e4883c195101078bbcf772be9c23d75e2
+RMD160 (samba-3.0.24-CVE-2007-2447.patch) = 96af89d98f71bda674e92e57c0afb867dbda9252
+Size (samba-3.0.24-CVE-2007-2447.patch) = 6234 bytes
 SHA1 (samba-3.0.24.tar.gz) = 216020b58abca191b8146f76f98a8bda3508fcd3
 RMD160 (samba-3.0.24.tar.gz) = f208dca645d07a195169e005a50fb4c4879254eb
 Size (samba-3.0.24.tar.gz) = 17708128 bytes