Date: Thu, 28 Mar 2013 07:40:03 GMT From: Shane Ambler <FreeBSD@ShaneWare.Biz> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/177397: [patch] security/heimdal: fix conflict between heimdal and openssl Message-ID: <201303280740.r2S7e3tQ006373@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/177397; it has been noted by GNATS.
From: Shane Ambler <FreeBSD@ShaneWare.Biz>
To: bug-followup@FreeBSD.org
Cc:
Subject: Re: ports/177397: [patch] security/heimdal: fix conflict between
heimdal and openssl
Date: Thu, 28 Mar 2013 18:01:44 +1030
This is a multi-part message in MIME format.
--------------010609090803050600060302
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
While looking into this I found that heimdal v1.5.2 has been in head for
11 months and has had two small patches applied. This second patch
applies those changes to the port version.
The relevant svn.freebsd.org revisions are 247002 and 243034
--------------010609090803050600060302
Content-Type: text/plain; charset=UTF-8;
name="heimdal.patch2.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="heimdal.patch2.txt"
diff -Nru heimdal.orig/files/patch-kcm__cache.c heimdal/files/patch-kcm__cache.c
--- heimdal.orig/files/patch-kcm__cache.c 1970-01-01 09:30:00.000000000 +0930
+++ heimdal/files/patch-kcm__cache.c 2013-03-28 17:46:00.600923212 +1030
@@ -0,0 +1,11 @@
+--- kcm/cache.c.orig 2013-03-28 14:22:47.807924196 +1030
++++ kcm/cache.c 2013-03-28 14:23:09.600166386 +1030
+@@ -102,7 +102,7 @@
+ for (p = ccache_head; p != NULL; p = p->next) {
+ if ((p->flags & KCM_FLAGS_VALID) == 0)
+ continue;
+- if (memcmp(p->uuid, uuid, sizeof(uuid)) == 0) {
++ if (memcmp(p->uuid, uuid, sizeof(kcmuuid_t)) == 0) {
+ ret = 0;
+ break;
+ }
diff -Nru heimdal.orig/files/patch-lib__sl__slc-lex.l heimdal/files/patch-lib__sl__slc-lex.l
--- heimdal.orig/files/patch-lib__sl__slc-lex.l 1970-01-01 09:30:00.000000000 +0930
+++ heimdal/files/patch-lib__sl__slc-lex.l 2013-03-28 17:46:11.047923982 +1030
@@ -0,0 +1,11 @@
+--- lib/sl/slc-lex.l.orig 2013-03-28 14:22:37.561924559 +1030
++++ lib/sl/slc-lex.l 2013-03-28 14:23:21.647677881 +1030
+@@ -47,8 +47,6 @@
+ static void handle_comment(void);
+ static char * handle_string(void);
+
+-#define YY_NO_UNPUT
+-
+ #undef ECHO
+
+ %}
--------------010609090803050600060302--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303280740.r2S7e3tQ006373>