Date: Mon, 26 Jul 2010 15:19:54 GMT From: Paul <tacid@tacid.kiev.ua> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/148967: [patch] [smallfix] sysutils/bacula-server files/patch-src-lib-crypto.c is cleared out Message-ID: <201007261519.o6QFJsBO002362@www.freebsd.org> Resent-Message-ID: <201007261520.o6QFK632032118@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Jul 26 15:20:06 UTC 2010
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201007261519.o6QFJsBO002362>