From b43a2bc820a4034bb5ce76207d6b0f7476cbb868 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Wed, 7 Oct 2015 07:19:26 +0000 Subject: [PATCH] r398691 placed the patch in the wrong directory, where it had no effect. Move it to the master port and bump the subport again. Reviewed by: ume@ --- security/cyrus-sasl2-gssapi/Makefile | 2 +- .../files/patch-plugins_gssapi.c | 15 --------------- security/cyrus-sasl2/files/patch-plugins_gssapi.c | 13 +++++++++++++ 3 files changed, 14 insertions(+), 16 deletions(-) delete mode 100644 security/cyrus-sasl2-gssapi/files/patch-plugins_gssapi.c create mode 100644 security/cyrus-sasl2/files/patch-plugins_gssapi.c diff --git a/security/cyrus-sasl2-gssapi/Makefile b/security/cyrus-sasl2-gssapi/Makefile index 9f666fb1fcbd..c10ba042fa34 100644 --- a/security/cyrus-sasl2-gssapi/Makefile +++ b/security/cyrus-sasl2-gssapi/Makefile @@ -2,7 +2,7 @@ PORTNAME= gssapi PORTVERSION= 2.1.26 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= security ipv6 MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-sasl/ \ http://cyrusimap.org/releases/ diff --git a/security/cyrus-sasl2-gssapi/files/patch-plugins_gssapi.c b/security/cyrus-sasl2-gssapi/files/patch-plugins_gssapi.c deleted file mode 100644 index 4c6c1ac81f21..000000000000 --- a/security/cyrus-sasl2-gssapi/files/patch-plugins_gssapi.c +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/plugins/gssapi.c b/plugins/gssapi.c -index 2fd1b3b..0992912 100644 ---- a/plugins/gssapi.c -+++ b/plugins/gssapi.c -@@ -1490,8 +1490,10 @@ static int gssapi_client_mech_step(void *conn_context, - *clientout = NULL; - *clientoutlen = 0; - -+#if 0 - params->utils->log(NULL, SASL_LOG_DEBUG, - "GSSAPI client step %d", text->state); -+#endif - - switch (text->state) { - diff --git a/security/cyrus-sasl2/files/patch-plugins_gssapi.c b/security/cyrus-sasl2/files/patch-plugins_gssapi.c new file mode 100644 index 000000000000..62998ce8d985 --- /dev/null +++ b/security/cyrus-sasl2/files/patch-plugins_gssapi.c @@ -0,0 +1,13 @@ +--- plugins/gssapi.c.orig ++++ plugins/gssapi.c +@@ -1490,8 +1490,10 @@ + *clientout = NULL; + *clientoutlen = 0; + ++#if 0 + params->utils->log(NULL, SASL_LOG_DEBUG, + "GSSAPI client step %d", text->state); ++#endif + + switch (text->state) { +