Date: Fri, 25 Feb 2022 17:47:29 GMT From: Neel Chauhan <nc@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 5ab014cb1b0b - main - comms/conserver-com: Update to 8.2.6 Message-ID: <202202251747.21PHlTxJ052476@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=5ab014cb1b0bd89694a6feea062f3f48250b3b1e commit 5ab014cb1b0bd89694a6feea062f3f48250b3b1e Author: Neel Chauhan <nc@FreeBSD.org> AuthorDate: 2022-02-25 17:47:17 +0000 Commit: Neel Chauhan <nc@FreeBSD.org> CommitDate: 2022-02-25 17:47:17 +0000 comms/conserver-com: Update to 8.2.6 --- comms/conserver-com/Makefile | 2 +- comms/conserver-com/distinfo | 6 ++--- .../conserver-com/files/patch-conserver__consent.c | 13 ---------- comms/conserver-com/files/patch-conserver__group.c | 28 ---------------------- comms/conserver-com/files/patch-cutil.c | 11 --------- 5 files changed, 4 insertions(+), 56 deletions(-) diff --git a/comms/conserver-com/Makefile b/comms/conserver-com/Makefile index 0e0002cfbe31..0bb58bf00ed0 100644 --- a/comms/conserver-com/Makefile +++ b/comms/conserver-com/Makefile @@ -1,6 +1,6 @@ PORTNAME= conserver DISTVERSIONPREFIX= v -DISTVERSION= 8.2.4 +DISTVERSION= 8.2.6 CATEGORIES= comms PKGNAMESUFFIX= -com diff --git a/comms/conserver-com/distinfo b/comms/conserver-com/distinfo index a74a8340eba0..707a1e8de740 100644 --- a/comms/conserver-com/distinfo +++ b/comms/conserver-com/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1575403382 -SHA256 (conserver-conserver-v8.2.4_GH0.tar.gz) = 8d8b263d9531ebb827257bd67baf9200cac4fb7ffbe033122686e39ca42cddd6 -SIZE (conserver-conserver-v8.2.4_GH0.tar.gz) = 261682 +TIMESTAMP = 1645811070 +SHA256 (conserver-conserver-v8.2.6_GH0.tar.gz) = 1c8b86f123d2d8e3ce568b782087b43dfac9cf6ffd5a9bdfcfdc6718d749a923 +SIZE (conserver-conserver-v8.2.6_GH0.tar.gz) = 288423 diff --git a/comms/conserver-com/files/patch-conserver__consent.c b/comms/conserver-com/files/patch-conserver__consent.c deleted file mode 100644 index 493f486f3391..000000000000 --- a/comms/conserver-com/files/patch-conserver__consent.c +++ /dev/null @@ -1,13 +0,0 @@ ---- conserver/consent.c.dist 2015-08-12 13:38:39.837321000 -0700 -+++ conserver/consent.c 2015-08-12 13:38:01.860668000 -0700 -@@ -687,6 +687,10 @@ - case INSSLSHUTDOWN: - return "SSL_shutdown"; - #endif -+#if HAVE_GSSAPI -+ case INGSSACCEPT: -+ return "GSSAPI_accept"; -+#endif - case ISFLUSHING: - return "flushing"; - } 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 6221166eb162..000000000000 --- a/comms/conserver-com/files/patch-conserver__group.c +++ /dev/null @@ -1,28 +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: diff --git a/comms/conserver-com/files/patch-cutil.c b/comms/conserver-com/files/patch-cutil.c deleted file mode 100644 index 1cc0309bcee8..000000000000 --- a/comms/conserver-com/files/patch-cutil.c +++ /dev/null @@ -1,11 +0,0 @@ ---- ./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 -- 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202202251747.21PHlTxJ052476>