[pkgsrc/pkgsrc-2012Q1]: pkgsrc/net/samba33 Pullup ticket #3731 - requested by...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1f35eb5ae425
branches:  pkgsrc-2012Q1
changeset: 602023:1f35eb5ae425
user:      spz <spz%pkgsrc.org@localhost>
date:      Wed Apr 11 18:37:38 2012 +0000

description:
Pullup ticket #3731 - requested by jdf
net/samba33: security fix

Revisions pulled up:
- net/samba33/Makefile                                          1.21
- net/samba33/distinfo                                          1.10

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

   Modified Files:
           pkgsrc/net/samba33: Makefile 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.20 -r1.21 pkgsrc/net/samba33/Makefile
   cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/samba33/distinfo

diffstat:

 net/samba33/Makefile |  7 +++++--
 net/samba33/distinfo |  5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r 3bacd7aab63e -r 1f35eb5ae425 net/samba33/Makefile
--- a/net/samba33/Makefile      Wed Apr 11 18:26:36 2012 +0000
+++ b/net/samba33/Makefile      Wed Apr 11 18:37:38 2012 +0000
@@ -1,11 +1,14 @@
-# $NetBSD: Makefile,v 1.20 2012/03/13 13:22:24 taca Exp $
+# $NetBSD: Makefile,v 1.20.2.1 2012/04/11 18:37:38 spz Exp $
 
 .include "../../net/samba/Makefile.mirrors"
 
 DISTNAME=              samba-${VERSION}
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            net
 MASTER_SITES=          ${SAMBA_MIRRORS:=old-versions/}
+PATCH_SITES=           http://www.samba.org/samba/ftp/patches/security/
+PATCHFILES=            samba-3.3.16-CVE-2012-1182.patch
+PATCH_DIST_STRIP=       -p2
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.samba.org/
diff -r 3bacd7aab63e -r 1f35eb5ae425 net/samba33/distinfo
--- a/net/samba33/distinfo      Wed Apr 11 18:26:36 2012 +0000
+++ b/net/samba33/distinfo      Wed Apr 11 18:37:38 2012 +0000
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.9 2012/03/13 13:22:24 taca Exp $
+$NetBSD: distinfo,v 1.9.2.1 2012/04/11 18:37:38 spz Exp $
 
+SHA1 (samba-3.3.16-CVE-2012-1182.patch) = d3491c3f4a8a133b03b4d939b52047e22ee67706
+RMD160 (samba-3.3.16-CVE-2012-1182.patch) = db8425087d88c11a3490505e0603f1d0fb8d5d7f
+Size (samba-3.3.16-CVE-2012-1182.patch) = 1367588 bytes
 SHA1 (samba-3.3.16.tar.gz) = bfb06f2cd88ba6c2fb9d25cabf3b22bf1a402f08
 RMD160 (samba-3.3.16.tar.gz) = 30e181de0e5399503cad3e09f3dd172a0fc6a011
 Size (samba-3.3.16.tar.gz) = 25566685 bytes