[pkgsrc/pkgsrc-2012Q1]: pkgsrc/net/samba30 Pullup ticket #3730 - requested by...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3bacd7aab63e
branches:  pkgsrc-2012Q1
changeset: 602022:3bacd7aab63e
user:      spz <spz%pkgsrc.org@localhost>
date:      Wed Apr 11 18:26:36 2012 +0000

description:
Pullup ticket #3730 - requested by jdf
net/samba30: security fix

Revisions pulled up:
- net/samba30/Makefile                                          1.5
- net/samba30/Makefile.patches                                  1.2
- net/samba30/distinfo                                          1.3

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   asau
   Date:           Wed Apr 11 10:03:37 UTC 2012

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

   Log Message:
   Apply official patch to address CVE-2012-1182 ("root" credential remote code
   execution).


   To generate a diff of this commit:
   cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/samba30/Makefile
   cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/net/samba30/Makefile.patches
   cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/samba30/distinfo

diffstat:

 net/samba30/Makefile         |  4 ++--
 net/samba30/Makefile.patches |  8 ++++----
 net/samba30/distinfo         |  5 ++++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diffs (47 lines):

diff -r 48bf086d8b77 -r 3bacd7aab63e net/samba30/Makefile
--- a/net/samba30/Makefile      Wed Apr 11 11:26:54 2012 +0000
+++ b/net/samba30/Makefile      Wed Apr 11 18:26:36 2012 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2012/03/13 13:23:18 taca Exp $
+# $NetBSD: Makefile,v 1.4.2.1 2012/04/11 18:26:36 spz Exp $
 
 .include "../../net/samba/Makefile.mirrors"
 
 DISTNAME=              samba-${VERSION}
-PKGREVISION=           9
+PKGREVISION=           10
 CATEGORIES=            net
 MASTER_SITES=          ${SAMBA_MIRRORS:=old-versions/}
 
diff -r 48bf086d8b77 -r 3bacd7aab63e net/samba30/Makefile.patches
--- a/net/samba30/Makefile.patches      Wed Apr 11 11:26:54 2012 +0000
+++ b/net/samba30/Makefile.patches      Wed Apr 11 18:26:36 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.patches,v 1.1.1.1 2011/12/15 22:23:23 asau Exp $
+# $NetBSD: Makefile.patches,v 1.1.1.1.4.1 2012/04/11 18:26:36 spz Exp $
 #
 # This Makefile fragment describes the recommended patches for the
 # currently packaged version of Samba.  All recommended patches for
@@ -11,6 +11,6 @@
 #
 #PATCH_SITES=  http://www.samba.org/samba/patches/patches-${VERSION}/
 #PATCHFILES=
-#PATCH_DIST_STRIP= -p2
-#PATCH_SITES=  http://www.samba.org/samba/ftp/patches/security/
-#PATCHFILES=
+PATCH_DIST_STRIP= -p2
+PATCH_SITES=   http://www.samba.org/samba/ftp/patches/security/
+PATCHFILES=    samba-3.0.37-CVE-2012-1182.patch
diff -r 48bf086d8b77 -r 3bacd7aab63e net/samba30/distinfo
--- a/net/samba30/distinfo      Wed Apr 11 11:26:54 2012 +0000
+++ b/net/samba30/distinfo      Wed Apr 11 18:26:36 2012 +0000
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.2 2012/03/13 13:23:18 taca Exp $
+$NetBSD: distinfo,v 1.2.2.1 2012/04/11 18:26:36 spz Exp $
 
+SHA1 (samba-3.0.37-CVE-2012-1182.patch) = 0d90e57897fa6c2fefdd88dd8a6daa0c87302110
+RMD160 (samba-3.0.37-CVE-2012-1182.patch) = 417e58c300df8b6771bd93674fee1b96c9f3a933
+Size (samba-3.0.37-CVE-2012-1182.patch) = 3223 bytes
 SHA1 (samba-3.0.37.tar.gz) = 5ec6bc6558b3c799f747eb49fbba019d5edf0cbd
 RMD160 (samba-3.0.37.tar.gz) = 06b76ae22729e10c83d6af42d03b03ad69e49103
 Size (samba-3.0.37.tar.gz) = 23416703 bytes