From c81fcf8b460845f5be359e7008a4afdf65b99e66 Mon Sep 17 00:00:00 2001
From: timur <timur@FreeBSD.org>
Date: Thu, 25 Jun 2009 23:51:22 +0000
Subject: Security update to the latest version 3.0.35.

Security:	CVE-2009-1888
---
 net/samba3/Makefile | 12 +++---------
 net/samba3/distinfo |  6 +++---
 2 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'net')

diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index d3dfd26b72c..31d8a6e41cf 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		samba
-PORTVERSION?=		3.0.34
+PORTVERSION?=		3.0.35
 PORTEPOCH?=		1
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
@@ -16,7 +16,7 @@ DISTNAME=		${PORTNAME}-${PORTVERSION:S/.p/pre/:S/.r/rc/}
 MAINTAINER?=		timur@FreeBSD.org
 COMMENT?=		A free SMB and CIFS client and server for UNIX
 
-CONFLICTS?=		ja-samba-2.* ja-samba-3.* samba-2.* sharity-light-1.* tdb-1.*
+CONFLICTS?=		ja-samba-2.* ja-samba-3.* samba-2.* samba-3.[2-9]* sharity-light-1.* tdb-1.*
 
 USE_ICONV=		yes
 GNU_CONFIGURE=		yes
@@ -103,11 +103,6 @@ CONFIGURE_ARGS+=	--with-pam --with-readline --with-sendfile-support \
 			--without-libaddns --with-included-iniparser \
 			--enable-largefile
 
-# Sanity checks
-.if exists(${LOCALBASE}/include/tdb.h)
-IGNORE=			doesn't compile when tdb is installed. Uninstall databases/tdb port
-.endif
-
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
@@ -120,7 +115,7 @@ SAMBA_WANT_LDAP=	yes
 .endif
 
 .if !defined(WITHOUT_CUPS)
-LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
+LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-client
 CONFIGURE_ARGS+=	--enable-cups
 SUB_LIST+=		CUPSD=""
 .else
@@ -132,7 +127,6 @@ SUB_LIST+=		CUPSD="@comment "
 LIB_DEPENDS+=		dmalloc.1:${PORTSDIR}/devel/dmalloc
 CPPFLAGS+=		-g
 LDFLAGS+=		-g
-#CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=	--enable-debug --enable-socket-wrapper \
 			--enable-developer --enable-krb5developer \
 			--enable-dmalloc --with-profiling-data
diff --git a/net/samba3/distinfo b/net/samba3/distinfo
index ea5cb7c51e3..aa956ffd0bf 100644
--- a/net/samba3/distinfo
+++ b/net/samba3/distinfo
@@ -1,3 +1,3 @@
-MD5 (samba-3.0.34.tar.gz) = 62404f39bb3dd0a37d6396c57e04c907
-SHA256 (samba-3.0.34.tar.gz) = 530793de9f4114f4b391d932e2833baf25a00498317471cd75a068f3378c299e
-SIZE (samba-3.0.34.tar.gz) = 24835363
+MD5 (samba-3.0.35.tar.gz) = 2f46d24fe52e51fd7925a173e74fc13c
+SHA256 (samba-3.0.35.tar.gz) = 87b81c0cea653305e796013148d3c0c68d7f38cbd7ed3b5255ddace14fd37748
+SIZE (samba-3.0.35.tar.gz) = 24839204
-- 
cgit