Index: head/net/ocserv/Makefile =================================================================== --- head/net/ocserv/Makefile (revision 414237) +++ head/net/ocserv/Makefile (revision 414238) @@ -1,76 +1,76 @@ # Created by: Carlos J Puga Medina # $FreeBSD$ PORTNAME= ocserv -PORTVERSION= 0.11.1 +PORTVERSION= 0.11.2 CATEGORIES= net security MASTER_SITES= ftp://ftp.infradead.org/pub/ocserv/ MAINTAINER= cpm@FreeBSD.org COMMENT= Server implementing the AnyConnect SSL VPN protocol LICENSE= GPLv2+ BUILD_DEPENDS= autogen:devel/autogen \ gsed:textproc/gsed \ bash:shells/bash LIB_DEPENDS= liblz4.so:archivers/liblz4 \ libiconv.so:converters/libiconv \ libtalloc.so:devel/talloc \ libprotobuf-c.so:devel/protobuf-c \ libgnutls.so:security/gnutls \ libtasn1.so:security/libtasn1 \ libev.so:devel/libev USES= autoreconf cpe gettext gmake gperf libtool ncurses \ pathfix pkgconfig readline tar:xz CPE_VENDOR= infradead CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lintl GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-nls \ --enable-local-libopts \ --without-http-parser \ --without-pcl-lib \ --without-radius USERS= _ocserv GROUPS= _ocserv USE_RC_SUBR= ocserv MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= DOCS EXAMPLES GSSAPI PORTDOCS= AUTHORS ChangeLog INSTALL NEWS README TODO PORTEXAMPLES= profile.xml sample.config sample.passwd GSSAPI_USES= gssapi:mit GSSAPI_LIB_DEPENDS= libkrb5support.so:security/krb5 GSSAPI_CONFIGURE_OFF= --without-gssapi post-patch: ${RM} ${WRKSRC}/doc/occtl.8 ${RM} ${WRKSRC}/doc/ocpasswd.8 ${RM} ${WRKSRC}/doc/ocserv.8 post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/occtl ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ocpasswd ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/ocserv ${MKDIR} ${STAGEDIR}${PREFIX}/etc/ocserv/ ${MKDIR} ${STAGEDIR}/var/run/ocserv/ ${CP} ${FILESDIR}/ocserv.conf ${STAGEDIR}${PREFIX}/etc/ocserv/conf.sample post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR} .include Index: head/net/ocserv/distinfo =================================================================== --- head/net/ocserv/distinfo (revision 414237) +++ head/net/ocserv/distinfo (revision 414238) @@ -1,2 +1,2 @@ -SHA256 (ocserv-0.11.1.tar.xz) = 2e083903277ab5f2e5869d2eb3721f0313522edf2ad2c4b844869826d690a5c6 -SIZE (ocserv-0.11.1.tar.xz) = 739800 +SHA256 (ocserv-0.11.2.tar.xz) = fd9d21ca8105bedd66fddbf727a8188184333509cc30e14fb80e2b4a6ef58170 +SIZE (ocserv-0.11.2.tar.xz) = 747240 Index: head/net/ocserv/files/patch-src_main.c =================================================================== --- head/net/ocserv/files/patch-src_main.c (revision 414237) +++ head/net/ocserv/files/patch-src_main.c (nonexistent) @@ -1,72 +0,0 @@ ---- src/main.c.orig 2016-03-06 11:14:35 UTC -+++ src/main.c -@@ -77,7 +77,7 @@ static void listen_watcher_cb (EV_P_ ev_ - - int syslog_open = 0; - sigset_t sig_default_set; --struct ev_loop *loop; -+struct ev_loop *loop = NULL; - - /* EV watchers */ - ev_io ctl_watcher; -@@ -147,8 +147,9 @@ int y; - #elif defined(IP_RECVDSTADDR) /* *BSD */ - if (family == AF_INET) { - y = 1; -- if (setsockopt(fd, IPPROTO_IP, IP_RECVDSTADDR, -- (const void *)&y, sizeof(y)) < 0) -+ if (family == AF_INET && -+ setsockopt(fd, IPPROTO_IP, IP_RECVDSTADDR, -+ (const void *)&y, sizeof(y)) < 0) - perror("setsockopt(IP_RECVDSTADDR) failed"); - } - #endif -@@ -661,13 +662,15 @@ void clear_lists(main_server_st *s) - ctl_handler_deinit(s); - main_ban_db_deinit(s); - -- /* clear libev state */ -- ev_io_stop (loop, &ctl_watcher); -- ev_io_stop (loop, &sec_mod_watcher); -- ev_child_stop (loop, &child_watcher); -- ev_timer_stop(loop, &maintainance_watcher); -- /* free memory by the event loop */ -- ev_loop_destroy (loop); -+ if (loop) { -+ /* clear libev state */ -+ ev_io_stop (loop, &ctl_watcher); -+ ev_io_stop (loop, &sec_mod_watcher); -+ ev_child_stop (loop, &child_watcher); -+ ev_timer_stop(loop, &maintainance_watcher); -+ /* free memory by the event loop */ -+ ev_loop_destroy (loop); -+ } - } - - /* A UDP fd will not be forwarded to worker process before this number of -@@ -1165,12 +1168,6 @@ int main(int argc, char** argv) - - memset(&creds, 0, sizeof(creds)); - -- loop = EV_DEFAULT; -- if (loop == NULL) { -- fprintf(stderr, "could not initialise libev\n"); -- exit(1); -- } -- - /* main pool */ - main_pool = talloc_init("main"); - if (main_pool == NULL) { -@@ -1253,6 +1250,12 @@ int main(int argc, char** argv) - exit(1); - } - -+ loop = EV_DEFAULT; -+ if (loop == NULL) { -+ fprintf(stderr, "could not ititialise libev\n"); -+ exit(1); -+ } -+ - mslog(s, NULL, LOG_INFO, "initialized %s", PACKAGE_STRING); - - /* chdir to our chroot directory, to allow opening the sec-mod Property changes on: head/net/ocserv/files/patch-src_main.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property