diff options
| author | obache <obache@pkgsrc.org> | 2012-01-02 03:25:56 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2012-01-02 03:25:56 +0000 |
| commit | 480790ec88729b0e2b1c769a105acbf4e066a091 (patch) | |
| tree | b5bed3716834cc8233bf7dd28d7b68835506db1b | |
| parent | 5ffcdb6428624bf65faa01612078c383d7d7ddd1 (diff) | |
| download | pkgsrc-480790ec88729b0e2b1c769a105acbf4e066a091.tar.gz | |
Fixes a segfault in gssapi.c, taken from upstream Git repo.
PR#45765.
Bump PKGREVISION of cy2-gssapi plugin package.
| -rw-r--r-- | security/cy2-gssapi/Makefile | 3 | ||||
| -rw-r--r-- | security/cyrus-sasl/distinfo | 3 | ||||
| -rw-r--r-- | security/cyrus-sasl/patches/patch-plugins_gssapi.c | 25 |
3 files changed, 29 insertions, 2 deletions
diff --git a/security/cy2-gssapi/Makefile b/security/cy2-gssapi/Makefile index 57f9436931d..476ba195770 100644 --- a/security/cy2-gssapi/Makefile +++ b/security/cy2-gssapi/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.16 2011/09/17 11:32:03 obache Exp $ +# $NetBSD: Makefile,v 1.17 2012/01/02 03:25:57 obache Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-gssapi/} +PKGREVISION= 1 COMMENT= Cyrus SASL GSSAPI authentication plugin SASL_PLUGIN= yes diff --git a/security/cyrus-sasl/distinfo b/security/cyrus-sasl/distinfo index 6b14a85fbfa..4c7d1f20884 100644 --- a/security/cyrus-sasl/distinfo +++ b/security/cyrus-sasl/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.19 2011/09/17 11:32:02 obache Exp $ +$NetBSD: distinfo,v 1.20 2012/01/02 03:25:56 obache Exp $ SHA1 (cyrus-sasl-2.1.25.tar.gz) = b6c34426012d9b5d448d5646cbecd818a5eeacbf RMD160 (cyrus-sasl-2.1.25.tar.gz) = c9ed9093828f7f7bb1b35c8a690cadbcd44f3862 Size (cyrus-sasl-2.1.25.tar.gz) = 5209240 bytes +SHA1 (patch-plugins_gssapi.c) = 05c5dcad2b3cc793edbd128aff95146d9923a21c SHA1 (patch-saslauthd_md5global.h) = fc200c6aee12bf58877c7a755c121441ebaa1bde SHA1 (patch-saslauthd_saslcache.c) = 725db77c5d56f58331255957a65d385267ddcaed diff --git a/security/cyrus-sasl/patches/patch-plugins_gssapi.c b/security/cyrus-sasl/patches/patch-plugins_gssapi.c new file mode 100644 index 00000000000..8ea3bd14125 --- /dev/null +++ b/security/cyrus-sasl/patches/patch-plugins_gssapi.c @@ -0,0 +1,25 @@ +$NetBSD: patch-plugins_gssapi.c,v 1.1 2012/01/02 03:25:57 obache Exp $ + +* Fixes a segfault in gssapi.c + http://git.cyrusimap.org/cyrus-sasl/commit/?id=fa289f15ceb2b9c64bdcf057a75469808454190d + +--- plugins/gssapi.c.orig 2011-05-11 19:25:55.000000000 +0000 ++++ plugins/gssapi.c +@@ -370,7 +370,7 @@ sasl_gss_encode(void *context, const str + } + + if (output_token->value && output) { +- unsigned char * p = (unsigned char *) text->encode_buf; ++ unsigned char * p; + + ret = _plug_buf_alloc(text->utils, + &(text->encode_buf), +@@ -383,6 +383,8 @@ sasl_gss_encode(void *context, const str + GSS_UNLOCK_MUTEX(text->utils); + return ret; + } ++ ++ p = (unsigned char *) text->encode_buf; + + p[0] = (output_token->length>>24) & 0xFF; + p[1] = (output_token->length>>16) & 0xFF; |