Fri Nov 28 11:46:32 2008 UTC ()
Pullup ticket #2601 - requested by taca
samba: security patch

Revisions pulled up:
- net/samba/Makefile			1.186
- net/samba/Makefile.patches		1.9
- net/samba/distinfo			1.65
---
Module Name:	pkgsrc
Committed By:	taca
Date:		Fri Nov 28 03:17:58 UTC 2008

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

Log Message:
Add samba-3.0.32-CVE-2008-4314.patch.

	http://www.samba.org/samba/security/CVE-2008-4314.html

Bump PKGREVISION.


(tron)
diff -r1.184.4.1 -r1.184.4.2 pkgsrc/net/samba/Makefile
diff -r1.8 -r1.8.10.1 pkgsrc/net/samba/Makefile.patches
diff -r1.64 -r1.64.4.1 pkgsrc/net/samba/distinfo

cvs diff -r1.184.4.1 -r1.184.4.2 pkgsrc/net/samba/Makefile (expand / switch to unified diff)

--- pkgsrc/net/samba/Makefile 2008/10/11 19:08:11 1.184.4.1
+++ pkgsrc/net/samba/Makefile 2008/11/28 11:46:32 1.184.4.2
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.184.4.1 2008/10/11 19:08:11 tron Exp $ 1# $NetBSD: Makefile,v 1.184.4.2 2008/11/28 11:46:32 tron Exp $
2 2
3.include "Makefile.mirrors" 3.include "Makefile.mirrors"
4 4
5DISTNAME= samba-${VERSION} 5DISTNAME= samba-${VERSION}
6PKGREVISION= 1 6PKGREVISION= 2
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= jlam@pkgsrc.org 12MAINTAINER= jlam@pkgsrc.org
13HOMEPAGE= http://www.samba.org/ 13HOMEPAGE= http://www.samba.org/
14COMMENT= SMB/CIFS protocol server suite 14COMMENT= SMB/CIFS protocol server suite
15 15
16VERSION= 3.0.32 16VERSION= 3.0.32
17CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* \ 17CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* \
18 winbind-[0-9]* 18 winbind-[0-9]*
19MAKE_JOBS_SAFE= NO 19MAKE_JOBS_SAFE= NO

cvs diff -r1.8 -r1.8.10.1 pkgsrc/net/samba/Attic/Makefile.patches (expand / switch to unified diff)

--- pkgsrc/net/samba/Attic/Makefile.patches 2008/04/03 20:19:42 1.8
+++ pkgsrc/net/samba/Attic/Makefile.patches 2008/11/28 11:46:32 1.8.10.1
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1# $NetBSD: Makefile.patches,v 1.8 2008/04/03 20:19:42 jlam Exp $ 1# $NetBSD: Makefile.patches,v 1.8.10.1 2008/11/28 11:46:32 tron 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=
14PATCH_DIST_STRIP= -p2 14PATCH_DIST_STRIP= -p2
 15PATCH_SITES= http://www.samba.org/samba/ftp/patches/security/
 16PATCHFILES= samba-3.0.32-CVE-2008-4314.patch

cvs diff -r1.64 -r1.64.4.1 pkgsrc/net/samba/distinfo (expand / switch to unified diff)

--- pkgsrc/net/samba/distinfo 2008/08/30 12:18:38 1.64
+++ pkgsrc/net/samba/distinfo 2008/11/28 11:46:32 1.64.4.1
@@ -1,15 +1,18 @@ @@ -1,15 +1,18 @@
1$NetBSD: distinfo,v 1.64 2008/08/30 12:18:38 tron Exp $ 1$NetBSD: distinfo,v 1.64.4.1 2008/11/28 11:46:32 tron Exp $
2 2
 3SHA1 (samba-3.0.32-CVE-2008-4314.patch) = 23354d8773e791fc9198da49048eff2a6966e6b9
 4RMD160 (samba-3.0.32-CVE-2008-4314.patch) = 7507f46b58c96668a2e4e2c4aefa3244c18fad7d
 5Size (samba-3.0.32-CVE-2008-4314.patch) = 1846 bytes
3SHA1 (samba-3.0.32.tar.gz) = bcbcff2c00a7cec07886de184d8761fd8b424810 6SHA1 (samba-3.0.32.tar.gz) = bcbcff2c00a7cec07886de184d8761fd8b424810
4RMD160 (samba-3.0.32.tar.gz) = 91bea73b9a799b8cb67d5fadd288d9403f175492 7RMD160 (samba-3.0.32.tar.gz) = 91bea73b9a799b8cb67d5fadd288d9403f175492
5Size (samba-3.0.32.tar.gz) = 21679285 bytes 8Size (samba-3.0.32.tar.gz) = 21679285 bytes
6SHA1 (patch-aa) = b323c778c0c4f01cd102d019a996914d0d7eb106 9SHA1 (patch-aa) = b323c778c0c4f01cd102d019a996914d0d7eb106
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) = 8664f61528e589beba02094e74e2485b3a865eb9 15SHA1 (patch-at) = 8664f61528e589beba02094e74e2485b3a865eb9
13SHA1 (patch-au) = f1b86b6f3a161b485bf5507fa1da69352b5a5e93 16SHA1 (patch-au) = f1b86b6f3a161b485bf5507fa1da69352b5a5e93
14SHA1 (patch-av) = c29ba19e96c24ef95a9a043f8678d77c00d73506 17SHA1 (patch-av) = c29ba19e96c24ef95a9a043f8678d77c00d73506
15SHA1 (patch-aw) = 5b6c1bf65d23564eaabf1bafda41a29d1f687538 18SHA1 (patch-aw) = 5b6c1bf65d23564eaabf1bafda41a29d1f687538