From dm@home8.dinoex.sub.de  Tue Mar 13 22:14:10 2012
Return-Path: <dm@home8.dinoex.sub.de>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3C7D1106566C
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 13 Mar 2012 22:14:10 +0000 (UTC)
	(envelope-from dm@home8.dinoex.sub.de)
Received: from uucp.dinoex.sub.de (uucp.dinoex.sub.de [194.45.71.2])
	by mx1.freebsd.org (Postfix) with ESMTP id CDE008FC19
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 13 Mar 2012 22:14:09 +0000 (UTC)
Received: from home8.dinoex.sub.de (home8.dinoex.sub.de [194.45.71.48])
	by uucp.dinoex.sub.de (8.14.4/8.14.4) with ESMTP id q2DLhKqe054213
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 13 Mar 2012 22:43:37 +0100 (CET)
	(envelope-from dm@home8.dinoex.sub.de)
Received: (from dm@localhost)
	by home8.dinoex.sub.de (8.14.5/8.14.5/Submit) id q2DLhHZJ053182;
	Tue, 13 Mar 2012 22:43:17 +0100 (CET)
	(envelope-from dm)
Message-Id: <201203132143.q2DLhHZJ053182@home8.dinoex.sub.de>
Date: Tue, 13 Mar 2012 22:43:17 +0100 (CET)
From: dirk.meyer@dinoex.sub.org
Reply-To: dirk.meyer@dinoex.sub.org
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] security/openssl update to 1.0.0h
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         166064
>Category:       ports
>Synopsis:       [PATCH] security/openssl update to 1.0.0h
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    dinoex
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 13 22:20:01 UTC 2012
>Closed-Date:    Thu Mar 15 07:33:12 CET 2012
>Last-Modified:  Thu Mar 15 07:33:12 CET 2012
>Originator:     Dirk Meyer
>Release:        FreeBSD 8.2-RELEASE
>Organization:
privat
>Environment:

	openssl from ports

>Description:

	port has a vulnerability:
Security: http://www.openssl.org/news/secadv_20120312.txt
Security: CVE-2012-0884

>How-To-Repeat:
>Fix:

	Security update to 1.0.0h


Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/security/openssl/Makefile,v
retrieving revision 1.183
diff -u -r1.183 Makefile
--- Makefile	22 Feb 2012 05:15:12 -0000	1.183
+++ Makefile	13 Mar 2012 20:35:44 -0000
@@ -7,8 +7,8 @@
 
 PORTNAME=	openssl
 PORTVERSION=	1.0.0
-DISTVERSIONSUFFIX=	g
-PORTREVISION=	9
+DISTVERSIONSUFFIX=	h
+PORTREVISION=	10
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.openssl.org/%SUBDIR%/ \
 		ftp://ftp.openssl.org/%SUBDIR%/ \
@@ -16,8 +16,6 @@
 MASTER_SITE_SUBDIR=	source
 DIST_SUBDIR=	${DISTNAME}
 
-PATCH_SITES=	http://sctp.fh-muenster.de/dtls/
-
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	SSL and crypto library
 
@@ -33,10 +31,7 @@
 		ZLIB	"Build with zlib compression" on \
 		MD2	"Build with MD2 hash (obsolete)" on \
 		RC5	"Build with RC5 chipher (patented)" off \
-		RFC3779	"Build with RFC3779 support" off \
-	DTLS_RENEGOTIATION	"Build with DTLS Abbr. renegotiations" off \
-	DTLS_HEARTBEAT		"Build with DTLS Heartbeat Extension" off \
-	SCTP			"Build with SCTP support" off \
+		RFC3779	"Build with RFC3779 support" off
 
 MAKE_JOBS_UNSAFE=	yes
 NOPRECIOUSMAKEVARS=	Too many _MLINKS for fetch
@@ -1105,24 +1100,6 @@
 EXTRACONFIGURE+=	no-rfc3779
 .endif
 
-.if defined(WITH_SCTP)
-EXTRACONFIGURE+=	sctp
-.if defined(WITH_DTLS_HEARTBEAT)
-BROKEN=		Patches do not merge, please change options
-.endif
-.endif
-
-# order of PATCHFILES is important
-.if defined(WITH_DTLS_RENEGOTIATION) || make(makesum) || defined(FETCH_ALL)
-PATCHFILES+=	abbreviated-renegotiation.patch
-.endif
-.if defined(WITH_DTLS_HEARTBEAT) || make(makesum) || defined(FETCH_ALL)
-PATCHFILES+=	dtls-heartbeats.patch
-.endif
-.if defined(WITH_SCTP) || make(makesum) || defined(FETCH_ALL)
-PATCHFILES+=	dtls-sctp-24.patch
-.endif
-
 .if ${OPENSSL_SHLIBVER_BASE} > ${OPENSSL_SHLIBVER}
 pre-everything::
 	@${ECHO_CMD} "#"
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/security/openssl/distinfo,v
retrieving revision 1.69
diff -u -r1.69 distinfo
--- distinfo	19 Jan 2012 19:25:16 -0000	1.69
+++ distinfo	13 Mar 2012 20:35:44 -0000
@@ -1,8 +1,2 @@
-SHA256 (openssl-1.0.0g/openssl-1.0.0g.tar.gz) = 905106a1505e7d9f7c36ee81408d3aa3d41aac291a9603d0c290c9530c92fc2c
-SIZE (openssl-1.0.0g/openssl-1.0.0g.tar.gz) = 4046513
-SHA256 (openssl-1.0.0g/abbreviated-renegotiation.patch) = f060c344d2eb639d6a7859b00195d6661e29018b4b877e8fc9cc791fd4025272
-SIZE (openssl-1.0.0g/abbreviated-renegotiation.patch) = 7977
-SHA256 (openssl-1.0.0g/dtls-heartbeats.patch) = b580ba6419e5732ed09fb9b4a9b2c083b1a002b848b2c71d6357ca7c9c36670e
-SIZE (openssl-1.0.0g/dtls-heartbeats.patch) = 14132
-SHA256 (openssl-1.0.0g/dtls-sctp-24.patch) = 8335423c6f4767b899d923091244ec90cab4aabbd6e557358d04d0daf023001a
-SIZE (openssl-1.0.0g/dtls-sctp-24.patch) = 57229
+SHA256 (openssl-1.0.0h/openssl-1.0.0h.tar.gz) = 7e3dfc21aa57ed33ea673170053d1921322803b8a6a624a4f0d2e4c308bd418d
+SIZE (openssl-1.0.0h/openssl-1.0.0h.tar.gz) = 4048067
>Release-Note:
>Audit-Trail:
Class-Changed-From-To: maintainer-update->change-request 
Class-Changed-By: edwin 
Class-Changed-When: Tue Mar 13 22:20:11 UTC 2012 
Class-Changed-Why:  
Fix category (submitter is not maintainer) (via the GNATS Auto Assign 
Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166064 
Responsible-Changed-From-To: freebsd-ports-bugs->dinoex 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Mar 13 22:20:14 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166064 
Responsible-Changed-From-To: dinoex->portmgr 
Responsible-Changed-By: dinoex 
Responsible-Changed-When: Wed Mar 14 05:46:19 CET 2012 
Responsible-Changed-Why:  
We are in ports freeze, need approval from portmgr  

http://www.freebsd.org/cgi/query-pr.cgi?pr=166064 
Responsible-Changed-From-To: portmgr->dinoex 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Wed Mar 14 09:13:15 UTC 2012 
Responsible-Changed-Why:  
Approved 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/166064: commit references a PR
Date: Thu, 15 Mar 2012 06:15:47 +0000 (UTC)

 dinoex      2012-03-15 06:15:33 UTC
 
   FreeBSD ports repository
 
   Modified files:
     security/openssl     Makefile distinfo 
   Log:
   - drop DTLS bugfixes, now included upstream
   
   - drop SCTP, will be in 1.0.1
   
   - Security update to 1.0.0h
   Security: http://www.openssl.org/news/secadv_20120312.txt
   Security: CVE-2012-0884
   
   PR:             166064
   Approved by:    portmgr (miwi)
   Feature safe:   yes
   
   Revision  Changes    Path
   1.184     +3 -26     ports/security/openssl/Makefile
   1.70      +2 -8      ports/security/openssl/distinfo
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: dinoex 
State-Changed-When: Thu Mar 15 07:32:50 CET 2012 
State-Changed-Why:  
committed, thanks. 

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