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


(asau)
diff -r1.4 -r1.5 pkgsrc/net/samba30/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/net/samba30/Makefile.patches
diff -r1.2 -r1.3 pkgsrc/net/samba30/distinfo
cvs diff -r1.4 -r1.5 pkgsrc/net/samba30/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/net/samba30/Attic/Makefile 2012/03/13 13:23:18 1.4
+++ pkgsrc/net/samba30/Attic/Makefile 2012/04/11 10:03:37 1.5
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.4 2012/03/13 13:23:18 taca Exp $ 1# $NetBSD: Makefile,v 1.5 2012/04/11 10:03:37 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= 9 6PKGREVISION= 10
7CATEGORIES= net 7CATEGORIES= net
8MASTER_SITES= ${SAMBA_MIRRORS:=old-versions/} 8MASTER_SITES= ${SAMBA_MIRRORS:=old-versions/}
9 9
10.include "Makefile.patches" 10.include "Makefile.patches"
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://www.samba.org/ 13HOMEPAGE= http://www.samba.org/
14COMMENT= SMB/CIFS protocol server suite 14COMMENT= SMB/CIFS protocol server suite
15LICENSE= gnu-gpl-v2 15LICENSE= gnu-gpl-v2
16 16
17VERSION= 3.0.37 17VERSION= 3.0.37
18CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* \ 18CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* \
19 winbind-[0-9]* 19 winbind-[0-9]*
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/samba30/Attic/Makefile.patches (expand / switch to unified diff)

--- pkgsrc/net/samba30/Attic/Makefile.patches 2011/12/15 22:23:23 1.1.1.1
+++ pkgsrc/net/samba30/Attic/Makefile.patches 2012/04/11 10:03:37 1.2
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile.patches,v 1.1.1.1 2011/12/15 22:23:23 asau Exp $ 1# $NetBSD: Makefile.patches,v 1.2 2012/04/11 10:03:37 asau Exp $
2# 2#
3# This Makefile fragment describes the recommended patches for the 3# This Makefile fragment describes the recommended patches for the
4# currently packaged version of Samba. All recommended patches for 4# currently packaged version of Samba. All recommended patches for
5# particular release of Samba are also integrated into the next release 5# particular release of Samba are also integrated into the next release
6# of Samba, so upon updating to the latest release of Samba, the 6# of Samba, so upon updating to the latest release of Samba, the
7# PATCHFILES variable should be empty. 7# PATCHFILES variable should be empty.
8# 8#
9# The PATCHFILES are listed in chronological order according to the time 9# The PATCHFILES are listed in chronological order according to the time
10# they are added to ${PATCH_SITES}. 10# they are added to ${PATCH_SITES}.
11# 11#
12#PATCH_SITES= http://www.samba.org/samba/patches/patches-${VERSION}/ 12#PATCH_SITES= http://www.samba.org/samba/patches/patches-${VERSION}/
13#PATCHFILES= 13#PATCHFILES=
14#PATCH_DIST_STRIP= -p2 14PATCH_DIST_STRIP= -p2
15#PATCH_SITES= http://www.samba.org/samba/ftp/patches/security/ 15PATCH_SITES= http://www.samba.org/samba/ftp/patches/security/
16#PATCHFILES= 16PATCHFILES= samba-3.0.37-CVE-2012-1182.patch
cvs diff -r1.2 -r1.3 pkgsrc/net/samba30/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/net/samba30/Attic/distinfo 2012/03/13 13:23:18 1.2
+++ pkgsrc/net/samba30/Attic/distinfo 2012/04/11 10:03:37 1.3
@@ -1,15 +1,18 @@ @@ -1,15 +1,18 @@
1$NetBSD: distinfo,v 1.2 2012/03/13 13:23:18 taca Exp $ 1$NetBSD: distinfo,v 1.3 2012/04/11 10:03:37 asau Exp $
2 2
 3SHA1 (samba-3.0.37-CVE-2012-1182.patch) = 0d90e57897fa6c2fefdd88dd8a6daa0c87302110
 4RMD160 (samba-3.0.37-CVE-2012-1182.patch) = 417e58c300df8b6771bd93674fee1b96c9f3a933
 5Size (samba-3.0.37-CVE-2012-1182.patch) = 3223 bytes
3SHA1 (samba-3.0.37.tar.gz) = 5ec6bc6558b3c799f747eb49fbba019d5edf0cbd 6SHA1 (samba-3.0.37.tar.gz) = 5ec6bc6558b3c799f747eb49fbba019d5edf0cbd
4RMD160 (samba-3.0.37.tar.gz) = 06b76ae22729e10c83d6af42d03b03ad69e49103 7RMD160 (samba-3.0.37.tar.gz) = 06b76ae22729e10c83d6af42d03b03ad69e49103
5Size (samba-3.0.37.tar.gz) = 23416703 bytes 8Size (samba-3.0.37.tar.gz) = 23416703 bytes
6SHA1 (patch-aa) = c3a1fd7cf6f8db8ea4001c697b19df555b496b29 9SHA1 (patch-aa) = c3a1fd7cf6f8db8ea4001c697b19df555b496b29
7SHA1 (patch-ac) = 47529dfe904768e6a3076131978c89fe2d1e3619 10SHA1 (patch-ac) = 47529dfe904768e6a3076131978c89fe2d1e3619
8SHA1 (patch-ae) = 28fc3d1ad158f8025f1f9ba8e170d93c31fa45ba 11SHA1 (patch-ae) = 28fc3d1ad158f8025f1f9ba8e170d93c31fa45ba
9SHA1 (patch-af) = 9f14842b7d0b5e66bf1d52bcacefe5e1aa392b7c 12SHA1 (patch-af) = 9f14842b7d0b5e66bf1d52bcacefe5e1aa392b7c
10SHA1 (patch-ag) = c73e717e053b6618b2a334602fefabe5a5f98a98 13SHA1 (patch-ag) = c73e717e053b6618b2a334602fefabe5a5f98a98
11SHA1 (patch-ak) = 0c69720954282022c7982d36eaee94a03db7b689 14SHA1 (patch-ak) = 0c69720954282022c7982d36eaee94a03db7b689
12SHA1 (patch-at) = de18d1fa7f1d4a2e9e3c0b28173584c7d42ed710 15SHA1 (patch-at) = de18d1fa7f1d4a2e9e3c0b28173584c7d42ed710
13SHA1 (patch-au) = e8a86ff28c2e22e1a9c3b80b90bcaea573b856ca 16SHA1 (patch-au) = e8a86ff28c2e22e1a9c3b80b90bcaea573b856ca
14SHA1 (patch-av) = c29ba19e96c24ef95a9a043f8678d77c00d73506 17SHA1 (patch-av) = c29ba19e96c24ef95a9a043f8678d77c00d73506
15SHA1 (patch-aw) = 5b6c1bf65d23564eaabf1bafda41a29d1f687538 18SHA1 (patch-aw) = 5b6c1bf65d23564eaabf1bafda41a29d1f687538