From nobody@FreeBSD.org  Mon Jul 26 15:19:55 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 248491065677
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 26 Jul 2010 15:19:55 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 166B78FC15
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 26 Jul 2010 15:19:55 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o6QFJsJl002364
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 26 Jul 2010 15:19:54 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o6QFJsBO002362;
	Mon, 26 Jul 2010 15:19:54 GMT
	(envelope-from nobody)
Message-Id: <201007261519.o6QFJsBO002362@www.freebsd.org>
Date: Mon, 26 Jul 2010 15:19:54 GMT
From: Paul <tacid@tacid.kiev.ua>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] [smallfix] sysutils/bacula-server files/patch-src-lib-crypto.c is cleared out
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: dan@langille.org

>Number:         148967
>Category:       ports
>Synopsis:       [patch] [smallfix] sysutils/bacula-server files/patch-src-lib-crypto.c is cleared out
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ohauer
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 26 15:20:06 UTC 2010
>Closed-Date:    Tue Sep 07 16:33:39 UTC 2010
>Last-Modified:  Tue Sep 07 16:33:39 UTC 2010
>Originator:     Paul
>Release:        8.1-RELEASE
>Organization:
>Environment:
FreeBSD hostname 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Mon Jul 19 02:55:53 UTC 2010     root@almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  i386

>Description:
As was mentioned by Angelo Turetta <aturetta@commit.it> in ports/146766 the patch commited contains a mistake. In files/patch-src-lib-crypto.c there is a part:

@@ -316,7 +316,11 @@
*/
static ASN1_OCTET_STRING *openssl_cert_keyid(X509 *cert) {
X509_EXTENSION *ext;
+#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
const X509V3_EXT_METHOD *method;
+#else
+ const X509V3_EXT_METHOD *method;
+#endif
ASN1_OCTET_STRING *keyid;
int i;

but it does nothing. I've made tests compiling bacula with openssl 0.9.7, 0.9.8 and 1.0.0 - OK without patching this part. So I've removed this part from the patch
>How-To-Repeat:

>Fix:
patch over files/patch-src-lib-crypto.c

Patch attached with submission follows:

--- files/patch-src-lib-crypto.c.orig	2010-07-26 18:10:06.000000000 +0300
+++ files/patch-src-lib-crypto.c	2010-07-26 15:56:56.000000000 +0300
@@ -1,17 +1,5 @@
 --- src/lib/crypto.c.orig	2010-05-20 20:15:22.000000000 +0300
 +++ src/lib/crypto.c	2010-05-20 20:16:39.000000000 +0300
-@@ -316,7 +316,11 @@
-  */
- static ASN1_OCTET_STRING *openssl_cert_keyid(X509 *cert) {
-    X509_EXTENSION *ext;
-+#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
-    const X509V3_EXT_METHOD *method;
-+#else
-+   const X509V3_EXT_METHOD *method;
-+#endif
-    ASN1_OCTET_STRING *keyid;
-    int i;
- #if (OPENSSL_VERSION_NUMBER >= 0x0090800FL)
 @@ -980,6 +984,10 @@
     free (sig);
  }


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon Jul 26 15:20:22 UTC 2010 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: dan@langille.org
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/148967: [patch] [smallfix] sysutils/bacula-server files/patch-src-lib-crypto.c is cleared out
Date: Mon, 26 Jul 2010 15:20:20 UT

 Maintainer of sysutils/bacula-server,
 
 Please note that PR ports/148967 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/148967
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Dan Langille <dan@langille.org>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/148967: [patch] [smallfix] sysutils/bacula-server files/patch-src-lib-crypto.c
 is cleared out
Date: Mon, 26 Jul 2010 23:02:19 -0400

 Approved.
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Tue Jul 27 04:34:11 UTC 2010 
State-Changed-Why:  
Maintainer approved. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=148967 
Responsible-Changed-From-To: freebsd-ports-bugs->ohauer 
Responsible-Changed-By: ohauer 
Responsible-Changed-When: Tue Aug 17 23:24:02 UTC 2010 
Responsible-Changed-Why:  
I'll take it 

http://www.freebsd.org/cgi/query-pr.cgi?pr=148967 
State-Changed-From-To: open->closed 
State-Changed-By: ohauer 
State-Changed-When: Tue Sep 7 16:30:33 UTC 2010 
State-Changed-Why:  
- Fix is no longer needed since bacula-5.0.3 

PR 148967 is obsolated with PR 150263 

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