Wed Apr 11 10:10:58 2012 UTC ()
Apply official patch to address CVE-2012-1182 ("root" credential remote code execution).


(asau)
diff -r1.20 -r1.21 pkgsrc/net/samba33/Makefile
diff -r1.9 -r1.10 pkgsrc/net/samba33/distinfo
cvs diff -r1.20 -r1.21 pkgsrc/net/samba33/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/net/samba33/Attic/Makefile 2012/03/13 13:22:24 1.20
+++ pkgsrc/net/samba33/Attic/Makefile 2012/04/11 10:10:58 1.21
@@ -1,21 +1,24 @@ @@ -1,21 +1,24 @@
1# $NetBSD: Makefile,v 1.20 2012/03/13 13:22:24 taca Exp $ 1# $NetBSD: Makefile,v 1.21 2012/04/11 10:10:58 asau Exp $
2 2
3.include "../../net/samba/Makefile.mirrors" 3.include "../../net/samba/Makefile.mirrors"
4 4
5DISTNAME= samba-${VERSION} 5DISTNAME= samba-${VERSION}
6PKGREVISION= 3 6PKGREVISION= 4
7CATEGORIES= net 7CATEGORIES= net
8MASTER_SITES= ${SAMBA_MIRRORS:=old-versions/} 8MASTER_SITES= ${SAMBA_MIRRORS:=old-versions/}
 9PATCH_SITES= http://www.samba.org/samba/ftp/patches/security/
 10PATCHFILES= samba-3.3.16-CVE-2012-1182.patch
 11PATCH_DIST_STRIP= -p2
9 12
10MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.samba.org/ 14HOMEPAGE= http://www.samba.org/
12COMMENT= SMB/CIFS protocol server suite 15COMMENT= SMB/CIFS protocol server suite
13LICENSE= gnu-gpl-v3 16LICENSE= gnu-gpl-v3
14 17
15VERSION= 3.3.16 18VERSION= 3.3.16
16CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* \ 19CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* \
17 winbind-[0-9]* 20 winbind-[0-9]*
18MAKE_JOBS_SAFE= NO 21MAKE_JOBS_SAFE= NO
19 22
20PKG_DESTDIR_SUPPORT= user-destdir 23PKG_DESTDIR_SUPPORT= user-destdir
21 24
cvs diff -r1.9 -r1.10 pkgsrc/net/samba33/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/net/samba33/Attic/distinfo 2012/03/13 13:22:24 1.9
+++ pkgsrc/net/samba33/Attic/distinfo 2012/04/11 10:10:58 1.10
@@ -1,15 +1,18 @@ @@ -1,15 +1,18 @@
1$NetBSD: distinfo,v 1.9 2012/03/13 13:22:24 taca Exp $ 1$NetBSD: distinfo,v 1.10 2012/04/11 10:10:58 asau Exp $
2 2
 3SHA1 (samba-3.3.16-CVE-2012-1182.patch) = d3491c3f4a8a133b03b4d939b52047e22ee67706
 4RMD160 (samba-3.3.16-CVE-2012-1182.patch) = db8425087d88c11a3490505e0603f1d0fb8d5d7f
 5Size (samba-3.3.16-CVE-2012-1182.patch) = 1367588 bytes
3SHA1 (samba-3.3.16.tar.gz) = bfb06f2cd88ba6c2fb9d25cabf3b22bf1a402f08 6SHA1 (samba-3.3.16.tar.gz) = bfb06f2cd88ba6c2fb9d25cabf3b22bf1a402f08
4RMD160 (samba-3.3.16.tar.gz) = 30e181de0e5399503cad3e09f3dd172a0fc6a011 7RMD160 (samba-3.3.16.tar.gz) = 30e181de0e5399503cad3e09f3dd172a0fc6a011
5Size (samba-3.3.16.tar.gz) = 25566685 bytes 8Size (samba-3.3.16.tar.gz) = 25566685 bytes
6SHA1 (patch-aa) = 35b1e645bd3d023cd8b6ecde383dac290509ca07 9SHA1 (patch-aa) = 35b1e645bd3d023cd8b6ecde383dac290509ca07
7SHA1 (patch-ab) = 0372ff2e3caca866dacd6ed25ae1d02e34a5b567 10SHA1 (patch-ab) = 0372ff2e3caca866dacd6ed25ae1d02e34a5b567
8SHA1 (patch-ac) = dfddc9fa7f76126e523c7859ac66ce9dd432d732 11SHA1 (patch-ac) = dfddc9fa7f76126e523c7859ac66ce9dd432d732
9SHA1 (patch-ad) = 447aaf4ea4cc98f0ccd5a3a22e1ffec0e69a3971 12SHA1 (patch-ad) = 447aaf4ea4cc98f0ccd5a3a22e1ffec0e69a3971
10SHA1 (patch-ae) = 6698c698dc64c0f3df159157d182eae6aaa70958 13SHA1 (patch-ae) = 6698c698dc64c0f3df159157d182eae6aaa70958
11SHA1 (patch-af) = 2c668c3bcc2fd90be65ef226acd1fec03dff9a91 14SHA1 (patch-af) = 2c668c3bcc2fd90be65ef226acd1fec03dff9a91
12SHA1 (patch-ag) = ef8421c3d17deeb0a4621ed50a57b51c755fdd1f 15SHA1 (patch-ag) = ef8421c3d17deeb0a4621ed50a57b51c755fdd1f
13SHA1 (patch-ah) = d8603bf8ed0e93070dd9d86cb229d8494fde937b 16SHA1 (patch-ah) = d8603bf8ed0e93070dd9d86cb229d8494fde937b
14SHA1 (patch-ai) = 07619c24084bfa380302a5c215ba5283d7be94a8 17SHA1 (patch-ai) = 07619c24084bfa380302a5c215ba5283d7be94a8
15SHA1 (patch-aj) = 8b3014935317efcfe63017e1e76aad0791cf48a7 18SHA1 (patch-aj) = 8b3014935317efcfe63017e1e76aad0791cf48a7