From yasu@home.utahime.org  Fri Nov 23 00:07:55 2007
Return-Path: <yasu@home.utahime.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E477416A46C
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 23 Nov 2007 00:07:54 +0000 (UTC)
	(envelope-from yasu@home.utahime.org)
Received: from utahime.as.wakwak.ne.jp (utahime.as.wakwak.ne.jp [61.205.238.40])
	by mx1.freebsd.org (Postfix) with ESMTP id 918F913C478
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 23 Nov 2007 00:07:54 +0000 (UTC)
	(envelope-from yasu@home.utahime.org)
Received: from eastasia.home.utahime.org (eastasia.home.utahime.org [192.168.174.1])
	by utahime.as.wakwak.ne.jp (Postfix) with ESMTP id E0A1017020;
	Fri, 23 Nov 2007 09:07:50 +0900 (JST)
Received: from eastasia.home.utahime.org (localhost.home.utahime.org [127.0.0.1])
	by localhost-backdoor.home.utahime.org (Postfix) with ESMTP id A82EE48;
	Fri, 23 Nov 2007 09:07:50 +0900 (JST)
Received: by eastasia.home.utahime.org (Postfix, from userid 1000)
	id 7838330; Fri, 23 Nov 2007 09:07:50 +0900 (JST)
Message-Id: <20071123000750.7838330@eastasia.home.utahime.org>
Date: Fri, 23 Nov 2007 09:07:50 +0900 (JST)
From: KIMURA Yasuhiro <yasu@utahime.org>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [PATCH,SECURITY FIX] japanese/samba3: chase security fix of net/samba3 and unbreak
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         118208
>Category:       ports
>Synopsis:       [PATCH,SECURITY FIX] japanese/samba3: chase security fix of net/samba3 and unbreak
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    kuriyama
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 23 00:10:01 UTC 2007
>Closed-Date:    Wed Dec 26 17:33:53 UTC 2007
>Last-Modified:  Wed Dec 26 17:33:53 UTC 2007
>Originator:     KIMURA Yasuhiro
>Release:        FreeBSD 6.2-RELEASE-p8 i386
>Organization:
>Environment:
System: FreeBSD xxxx 6.2-RELEASE-p8 FreeBSD 6.2-RELEASE-p8 #0: Thu Oct 4 12:23:50 JST 2007 xxxx i386


	
>Description:
	- Chase security fix of net/samba3.
	- Fix breakage after the update of net/samba3.

	Please keep in mind attached patch includes not only changeset
	of japanese/samba3 but also that of net/samba3. So the approval
	by the maintainer of net/samba3 is also necessary.

	
>How-To-Repeat:
	
>Fix:

	

--- patch-ja-samba begins here ---
Index: net/samba3/Makefile
===================================================================
RCS file: /usr1/freebsd/cvsroot/ports/net/samba3/Makefile,v
retrieving revision 1.165
diff -u -r1.165 Makefile
--- net/samba3/Makefile	21 Nov 2007 13:01:16 -0000	1.165
+++ net/samba3/Makefile	22 Nov 2007 23:50:04 -0000
@@ -7,12 +7,13 @@
 
 PORTNAME=		samba
 PORTVERSION?=		3.0.26a
-PORTREVISION=		2
+PORTREVISION?=		2
 PORTEPOCH?=		1
 CATEGORIES?=		net
-MASTER_SITES=		${MASTER_SITE_SAMBA}
+MASTER_SITES+=		${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	. old-versions rc pre
-DISTNAME=		${PORTNAME}-${PORTVERSION:S/.p/pre/:S/.r/rc/}
+DISTFILES+=		${PORTNAME}-${PORTVERSION:S/.p/pre/:S/.r/rc/}${EXTRACT_SUFX}
+EXTRACT_ONLY=		${PORTNAME}-${PORTVERSION:S/.p/pre/:S/.r/rc/}${EXTRACT_SUFX}
 
 MAINTAINER?=		timur@FreeBSD.org
 COMMENT?=		A free SMB and CIFS client and server for UNIX
Index: japanese/samba3/Makefile
===================================================================
RCS file: /usr1/freebsd/cvsroot/ports/japanese/samba3/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- japanese/samba3/Makefile	12 Oct 2007 11:50:12 -0000	1.22
+++ japanese/samba3/Makefile	22 Nov 2007 23:24:01 -0000
@@ -6,14 +6,13 @@
 #
 
 PORTVERSION=		3.0.26a
-PORTREVISION=		0
+PORTREVISION=		2
 PORTEPOCH=		1
 CATEGORIES=		japanese net
 PKGNAMEPREFIX=		ja-
 
-PATCH_SITES=		http://dist.bsdlab.org/
-PATCHFILES=		samba-${PORTVERSION}-i18n-20071010.bz2
-PATCH_DIST_STRIP=	-p0
+MASTER_SITES=		http://dist.bsdlab.org/:ja
+DISTFILES=		${DISTNAME_JA}.bz2:ja
 
 MAINTAINER=		kuriyama@FreeBSD.org
 COMMENT=		Japanese Samba
@@ -26,6 +25,12 @@
 MD5_FILE=		${.CURDIR}/distinfo
 DESCR=			${.CURDIR}/pkg-descr
 
+DISTNAME_JA=		samba-${PORTVERSION}-i18n-20071010
+EXTRA_PATCHES=		${WRKDIR}/${DISTNAME_JA}
+
+post-extract:
+	@${BZIP2_CMD} -dc ${DISTDIR}/${DISTNAME_JA}.bz2 > ${WRKDIR}/${DISTNAME_JA}
+
 # Maintainer's note:
 #   Don't forget to test with WITH_ADS, WITH_CUPS, WITH_QUOTAS,
 #   WITH_MSDFS, WITH_PAM_SMBPASS for such users.
Index: japanese/samba3/distinfo
===================================================================
RCS file: /usr1/freebsd/cvsroot/ports/japanese/samba3/distinfo,v
retrieving revision 1.20
diff -u -r1.20 distinfo
--- japanese/samba3/distinfo	12 Oct 2007 11:50:12 -0000	1.20
+++ japanese/samba3/distinfo	22 Nov 2007 23:29:15 -0000
@@ -4,3 +4,9 @@
 MD5 (samba-3.0.26a-i18n-20071010.bz2) = 4b586caa5896971efcbf43bb77542fb0
 SHA256 (samba-3.0.26a-i18n-20071010.bz2) = 378b9df0fbbb3e3855277b4a50ca94562d59c7556c41cb692f6f513a39ffe4d9
 SIZE (samba-3.0.26a-i18n-20071010.bz2) = 21813
+MD5 (samba-3.0.26a-CVE-2007-4572.patch) = 545990971f3f3757ee0f175170b7bcb6
+SHA256 (samba-3.0.26a-CVE-2007-4572.patch) = d960cf7d26788e87983ee7acb8af8c45d22a034c028cce619582f6a115108491
+SIZE (samba-3.0.26a-CVE-2007-4572.patch) = 8203
+MD5 (samba-3.0.26a-CVE-2007-5398.patch) = 79934d4dcc779a467697e7cf86046631
+SHA256 (samba-3.0.26a-CVE-2007-5398.patch) = 37a0181aa647de7feb888d675ea726e135bbe53bc3099076eaf0682fc1b11b05
+SIZE (samba-3.0.26a-CVE-2007-5398.patch) = 1232
--- patch-ja-samba ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->kuriyama 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Nov 23 04:26:46 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=118208 

From: Mark Linimon <linimon@FreeBSD.org>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/118208: [PATCH,SECURITY FIX] japanese/samba3: chase security fix of net/samba3 and unbreak
Date: Thu, 29 Nov 2007 19:18:55 -0600

 On Thursday 29 November 2007, kuriyama wrote:
 > Hmm, I think this port is buildable now (committed in Nov 23th). 
 > This PR is not closed because non-security suggestions are included,
 > but I'm not sure this part of PR is good or not.
 
 

From: KIMURA Yasuhiro <yasu@utahime.org>
To: kuriyama@FreeBSD.org
Cc: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Subject: Re: ports/118208: [PATCH,SECURITY FIX] japanese/samba3: chase
 security fix of net/samba3 and unbreak
Date: Wed, 26 Dec 2007 23:48:25 +0900 (JST)

 Hello.
 
 Now japanese/samba3 is updated to 3.0.28, this PR is obsolete.
 So would you please close it?
 
 Regards.
State-Changed-From-To: open->closed 
State-Changed-By: linimon 
State-Changed-When: Wed Dec 26 17:33:40 UTC 2007 
State-Changed-Why:  
This has already been committed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=118208 
>Unformatted:
