5 files changed, 8 insertions, 87 deletions

diff --git a/comms/conserver-com/Makefile b/comms/conserver-com/Makefile
index ae83176bf30d..3226b7259446 100644
--- a/comms/conserver-com/Makefile
+++ b/comms/conserver-com/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	conserver
-PORTVERSION=	8.1.18
-PORTREVISION=	2
+PORTVERSION=	8.2.1
 CATEGORIES=	comms
 MASTER_SITES=	http://www.conserver.com/ \
 		ftp://ftp.conserver.com/conserver/
diff --git a/comms/conserver-com/distinfo b/comms/conserver-com/distinfo
index 2bb1c46db8e3..692245c963fc 100644
--- a/comms/conserver-com/distinfo
+++ b/comms/conserver-com/distinfo
@@ -1,2 +1,2 @@
-SHA256 (conserver-8.1.18.tar.gz) = 3c73cebf732419c41c7c860032e41d83c1f152fe3115a30dc9851820b7864e14
-SIZE (conserver-8.1.18.tar.gz) = 323247
+SHA256 (conserver-8.2.1.tar.gz) = 251ae01997e8f3ee75106a5b84ec6f2a8eb5ff2f8092438eba34384a615153d0
+SIZE (conserver-8.2.1.tar.gz) = 335241
diff --git a/comms/conserver-com/files/patch-configure b/comms/conserver-com/files/patch-configure
deleted file mode 100644
index b6ace457fc85..000000000000
--- a/comms/conserver-com/files/patch-configure
+++ /dev/null
@@ -1,34 +0,0 @@
---- ./configure.orig	2009-09-26 05:18:38.000000000 -0400
-+++ ./configure	2013-02-15 18:55:19.000000000 -0500
-@@ -7287,6 +7287,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
-+#include <stdio.h>
- #include <gssapi/gssapi.h>
- _ACEOF
- rm -f conftest.$ac_objext
-@@ -7328,6 +7329,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <stdio.h>
- #include <gssapi/gssapi.h>
- _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
-@@ -7405,6 +7407,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <stdio.h>
- #include <gssapi/gssapi.h>
- 
- int
-@@ -7513,6 +7516,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <stdio.h>
- #include <gssapi/gssapi.h>
- 
- int
diff --git a/comms/conserver-com/files/patch-conserver__group.c b/comms/conserver-com/files/patch-conserver__group.c
deleted file mode 100644
index 0ae15d6109f9..000000000000
--- a/comms/conserver-com/files/patch-conserver__group.c
+++ /dev/null
@@ -1,44 +0,0 @@
---- ./conserver/group.c.orig	2009-09-26 05:58:05.000000000 -0400
-+++ ./conserver/group.c	2013-02-15 18:34:20.000000000 -0500
-@@ -72,6 +72,7 @@
- #include <master.h>
- #include <main.h>
- #include <version.h>
-+#include <stdio.h>
- 
- #if HAVE_PAM
- #include <security/pam_appl.h>
-@@ -1930,7 +1931,7 @@
- 	    FileWrite(pCL->fd, FLAGFALSE, sendtok.value, sendtok.length);
- 	    FileSetQuoteIAC(pCL->fd, FLAGTRUE);
- 	    pCL->iState = S_NORMAL;
--	    gss_release_buffer(NULL, &sendtok);
-+	    gss_release_buffer(&stmin, &sendtok);
- 	    BuildString((char *)0, pCL->username);
- 	    BuildString((char *)0, pCL->acid);
- 	    stmaj = gss_display_name(&stmin, user, &dbuf, NULL);
-@@ -1940,7 +1941,7 @@
- 	    BuildStringChar('@', pCL->acid);
- 	    BuildString(pCL->peername->string, pCL->acid);
- 	    gss_release_name(&stmin, &user);
--	    gss_release_buffer(NULL, &dbuf);
-+	    gss_release_buffer(&stmin, &dbuf);
- 	    ret = 1;
- 	    break;
- 	case GSS_S_CREDENTIALS_EXPIRED:
-@@ -3940,12 +3941,10 @@
- 					      "failed]\r\n", -1);
- 				    continue;
- 				}
--				if (TAB3 == (TABDLY & sbuf.c_oflag)) {
--				    sbuf.c_oflag &= ~TABDLY;
--				    sbuf.c_oflag |= TAB0;
-+				if (sbuf.c_oflag & OXTABS) {
-+				    sbuf.c_oflag &= ~OXTABS;
- 				} else {
--				    sbuf.c_oflag &= ~TABDLY;
--				    sbuf.c_oflag |= TAB3;
-+				    sbuf.c_oflag |= OXTABS;
- 				}
- 				if (-1 ==
- 				    tcsetattr(FileFDNum
diff --git a/comms/conserver-com/files/patch-cutil.c b/comms/conserver-com/files/patch-cutil.c
index e8dcd8459622..1cc0309bcee8 100644
--- a/comms/conserver-com/files/patch-cutil.c
+++ b/comms/conserver-com/files/patch-cutil.c
@@ -1,11 +1,11 @@
---- conserver/cutil.c.orig	2010-11-02 12:42:57.000000000 +0900
-+++ conserver/cutil.c	2010-11-20 20:32:52.490682415 +0900
-@@ -2283,7 +2283,7 @@
+--- ./conserver/cutil.c.orig	2015-06-03 02:19:31.000000000 +0900
++++ ./conserver/cutil.c	2015-06-13 18:00:11.685862531 +0900
+@@ -1939,7 +1939,7 @@
  	if ((ifc.ifc_len - r) < sizeof(*ifr))
  	    break;
- #ifdef HAVE_SA_LEN
+ #  ifdef HAVE_SA_LEN
 -	if (sa->sa_len > sizeof(ifr->ifr_ifru))
 +	if (sa->sa_len > sizeof(ifr->ifr_addr))
  	    r += sizeof(ifr->ifr_name) + sa->sa_len;
  	else
- #endif
+ #  endif