Ticket #31786: heimdal-1.5.2.diff

Portfile

@@ -4 +4 @@
 PortSystem 1.0
 
 name            heimdal
-version         1.3.3
-revision        1
+version         1.5.2
 categories      net security
 license         BSD MIT Permissive
 maintainers     landonf openmaintainer
@@ -24 +23 @@
 
 homepage        http://www.h5l.org/
 master_sites    ${homepage}dist/src/
-checksums   md5 963c09f1b14c41660be70b55fae9f163 \
-            sha1 a385d959e3edd144aee79e9df585e44347342049 \
-            rmd160 ce97ac415e7c27912ba148b81c46e756dc54ba3e
 
+checksums   rmd160  1ab2f835309a916dfbba667d3d0d38a57c312fde \
+            sha256  22603f282f31173533b939d289f3374258aa1ccccbe51ee088d7568d321279ec
+
 depends_lib port:readline port:gettext
 
-patchfiles  patch-lib-sqlite-sqlite3.c.diff
+patchfiles  patch-kcm-segfault.diff
+patch.pre_args -p1
 
 # Use a separate prefix to avoid conflicts with the port kerberos5
 # (and openssl, if that variant is selected)
@@ -84 +84 @@
     configure.args-append  --with-sqlite3=${prefix}
 }
 
+variant debug {
+    configure.cflags-append -g -O0
+}
+default_variants +debug
+
 post-patch {
         # Tiger does not have the CommonCrypto support needed for -openssl
         if {${os.platform} == "darwin" && ${os.major} < 9} {
@@ -95 +100 @@
 
 test.run        yes
 test.target     check
+test.env-append LC_CTYPE=C
 
 livecheck.type  regex
 livecheck.url   ${master_sites}

files/patch-kcm-segfault.diff

@@ +1 @@
+From 2daeea4febe322ba134fff2c12c6ba54bd993d6f Mon Sep 17 00:00:00 2001
+From: Love Hornquist Astrand <lha@h5l.org>
+Date: Thu, 22 Sep 2011 16:36:52 +0200
+Subject: [PATCH] handle error code from size_too_large more correct
+
+---
+ lib/krb5/store.c |   18 ++++++++++++------
+ 1 file changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/lib/krb5/store.c b/lib/krb5/store.c
+index 3aeb8d6..1f6622e 100644
+--- a/lib/krb5/store.c
++++ b/lib/krb5/store.c
+@@ -792,12 +792,15 @@
+     ssize_t ret;
+ 
+     while((ret = sp->fetch(sp, &c, 1)) == 1){
++       krb5_error_code eret;
+        char *tmp;
+ 
+        len++;
+-       ret = size_too_large(sp, len);
+-       if (ret)
+-           break;
++       eret = size_too_large(sp, len);
++       if (eret) {
++           free(s);
++           return eret;
++       }
+        tmp = realloc (s, len);
+        if (tmp == NULL) {
+            free (s);
+@@ -852,6 +855,7 @@
+     ssize_t ret;
+ 
+     while((ret = sp->fetch(sp, &c, 1)) == 1){
++       krb5_error_code eret;
+        char *tmp;
+ 
+        if (c == '\r') {
+@@ -864,9 +868,11 @@
+        }
+ 
+        len++;
+-       ret = size_too_large(sp, len);
+-       if (ret)
+-           break;
++       eret = size_too_large(sp, len);
++       if (eret) {
++           free(s);
++           return eret;
++       }
+        tmp = realloc (s, len);
+        if (tmp == NULL) {
+            free (s);
+-- 
+1.7.10
+