svn commit: r423487 - in head/net/ocserv: . files
Carlos J. Puga Medina
cpm at FreeBSD.org
Fri Oct 7 22:34:05 UTC 2016
Author: cpm
Date: Fri Oct 7 22:34:04 2016
New Revision: 423487
URL: https://svnweb.freebsd.org/changeset/ports/423487
Log:
- Update ocserv to 0.11.5 release
Changelog:
http://lists.infradead.org/pipermail/openconnect-devel/2016-September/003972.html
Reviewed by: pi, feld (mentor)
Approved by: feld (mentor)
Differential Revision: D8024
Modified:
head/net/ocserv/Makefile
head/net/ocserv/distinfo
head/net/ocserv/files/patch-src_config.c
Modified: head/net/ocserv/Makefile
==============================================================================
--- head/net/ocserv/Makefile Fri Oct 7 21:49:04 2016 (r423486)
+++ head/net/ocserv/Makefile Fri Oct 7 22:34:04 2016 (r423487)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= ocserv
-PORTVERSION= 0.11.4
-PORTREVISION= 1
+PORTVERSION= 0.11.5
CATEGORIES= net security
MASTER_SITES= ftp://ftp.infradead.org/pub/ocserv/
Modified: head/net/ocserv/distinfo
==============================================================================
--- head/net/ocserv/distinfo Fri Oct 7 21:49:04 2016 (r423486)
+++ head/net/ocserv/distinfo Fri Oct 7 22:34:04 2016 (r423487)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470657990
-SHA256 (ocserv-0.11.4.tar.xz) = f0c50cb92492808241086252f5b5d4f3bd99d63a09d544639074fbd0465f97b7
-SIZE (ocserv-0.11.4.tar.xz) = 755112
+TIMESTAMP = 1474711445
+SHA256 (ocserv-0.11.5.tar.xz) = 2a80e32e538044fba7745fd2a0cfaa27a398097fb8d4d684c1142118b69219cb
+SIZE (ocserv-0.11.5.tar.xz) = 758252
Modified: head/net/ocserv/files/patch-src_config.c
==============================================================================
--- head/net/ocserv/files/patch-src_config.c Fri Oct 7 21:49:04 2016 (r423486)
+++ head/net/ocserv/files/patch-src_config.c Fri Oct 7 22:34:04 2016 (r423487)
@@ -1,7 +1,7 @@
---- src/config.c.orig 2015-09-04 19:27:22 UTC
+--- src/config.c.orig 2016-09-22 13:51:31 UTC
+++ src/config.c
-@@ -51,8 +51,7 @@
- #include <tlslib.h>
+@@ -54,8 +54,7 @@
+ #include <occtl/ctl.h>
#include "common-config.h"
-#define OLD_DEFAULT_CFG_FILE "/etc/ocserv.conf"
@@ -10,16 +10,16 @@
static char pid_file[_POSIX_PATH_MAX] = "";
static char cfg_file[_POSIX_PATH_MAX] = DEFAULT_CFG_FILE;
-@@ -416,7 +415,7 @@ static void figure_auth_funcs(struct per
+@@ -436,7 +435,7 @@ static void figure_auth_funcs(struct per
}
talloc_free(auth[j]);
}
-- fprintf(stderr, "Setting '%s' as primary authentication method\n", config->auth[0].name);
-+ /* fprintf(stderr, "Setting '%s' as primary authentication method\n", config->auth[0].name); */
+- fprintf(stderr, NOTESTR"setting '%s' as primary authentication method\n", config->auth[0].name);
++ /* fprintf(stderr, NOTESTR"Setting '%s' as primary authentication method\n", config->auth[0].name); */
} else {
unsigned x = config->auth_methods;
/* Append authentication methods (alternative options) */
-@@ -586,9 +585,6 @@ size_t urlfw_size = 0;
+@@ -663,11 +662,8 @@ size_t urlfw_size = 0;
#endif
pov = configFileLoad(file);
@@ -27,5 +27,8 @@
- pov = configFileLoad(OLD_DEFAULT_CFG_FILE);
-
if (pov == NULL) {
- fprintf(stderr, "Error loading config file %s\n", file);
+- fprintf(stderr, ERRSTR"cannot load config file %s\n", file);
++ fprintf(stderr, ERRSTR"Cannot load config file %s\n", file);
exit(1);
+ }
+
More information about the svn-ports-head
mailing list