svn commit: r398749 - in head/security: cyrus-sasl2-gssapi cyrus-sasl2-gssapi/files cyrus-sasl2/files

[Dag-Erling Smørgrav]

Author: des
Date: Wed Oct  7 07:19:26 2015
New Revision: 398749
URL: https://svnweb.freebsd.org/changeset/ports/398749

Log:
  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@

Added:
  head/security/cyrus-sasl2/files/patch-plugins_gssapi.c
     - copied, changed from r398707, head/security/cyrus-sasl2-gssapi/files/patch-plugins_gssapi.c
Deleted:
  head/security/cyrus-sasl2-gssapi/files/
Modified:
  head/security/cyrus-sasl2-gssapi/Makefile

Modified: head/security/cyrus-sasl2-gssapi/Makefile
==============================================================================
--- head/security/cyrus-sasl2-gssapi/Makefile	Wed Oct  7 06:05:11 2015	(r398748)
+++ head/security/cyrus-sasl2-gssapi/Makefile	Wed Oct  7 07:19:26 2015	(r398749)
@@ -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/

Copied and modified: head/security/cyrus-sasl2/files/patch-plugins_gssapi.c (from r398707, head/security/cyrus-sasl2-gssapi/files/patch-plugins_gssapi.c)
==============================================================================
--- head/security/cyrus-sasl2-gssapi/files/patch-plugins_gssapi.c	Tue Oct  6 17:20:23 2015	(r398707, copy source)
+++ head/security/cyrus-sasl2/files/patch-plugins_gssapi.c	Wed Oct  7 07:19:26 2015	(r398749)
@@ -1,8 +1,6 @@
-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,
+--- plugins/gssapi.c.orig
++++ plugins/gssapi.c
+@@ -1490,8 +1490,10 @@
      *clientout = NULL;
      *clientoutlen = 0;