Date: Mon, 18 Apr 2016 15:17:09 +0000 (UTC) From: "Carlos J. Puga Medina" <cpm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413584 - in head/net/ocserv: . files Message-ID: <201604181517.u3IFH9KQ003728@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cpm Date: Mon Apr 18 15:17:09 2016 New Revision: 413584 URL: https://svnweb.freebsd.org/changeset/ports/413584 Log: - Update to 0.11.1 release - Convert LICENSE= "GPLxx# or later" to "GPLxx+" - Add dependency on libev - Regenerate patches - Add MAKE_JOBS_UNSAFE; port attempts to modify man page before generation sed: ocpasswd.8: No such file or directory Changelog: http://lists.infradead.org/pipermail/openconnect-devel/2016-March/003551.html Approved by: junovitch (mentor) Differential Revision: D5890 Modified: head/net/ocserv/Makefile head/net/ocserv/distinfo head/net/ocserv/files/patch-doc_Makefile.am head/net/ocserv/files/patch-src_main.c Modified: head/net/ocserv/Makefile ============================================================================== --- head/net/ocserv/Makefile Mon Apr 18 14:29:49 2016 (r413583) +++ head/net/ocserv/Makefile Mon Apr 18 15:17:09 2016 (r413584) @@ -2,15 +2,14 @@ # $FreeBSD$ PORTNAME= ocserv -PORTVERSION= 0.10.12 -PORTREVISION= 1 +PORTVERSION= 0.11.1 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 +LICENSE= GPLv2+ BUILD_DEPENDS= autogen:devel/autogen \ gsed:textproc/gsed \ @@ -20,7 +19,8 @@ LIB_DEPENDS= liblz4.so:archivers/liblz4 libtalloc.so:devel/talloc \ libprotobuf-c.so:devel/protobuf-c \ libgnutls.so:security/gnutls \ - libtasn1.so:security/libtasn1 + libtasn1.so:security/libtasn1 \ + libev.so:devel/libev USES= autoreconf cpe gettext gmake gperf libtool ncurses \ pathfix pkgconfig readline tar:xz @@ -41,6 +41,8 @@ GROUPS= _ocserv USE_RC_SUBR= ocserv +MAKE_JOBS_UNSAFE= yes + OPTIONS_DEFINE= DOCS EXAMPLES GSSAPI PORTDOCS= AUTHORS ChangeLog INSTALL NEWS README TODO Modified: head/net/ocserv/distinfo ============================================================================== --- head/net/ocserv/distinfo Mon Apr 18 14:29:49 2016 (r413583) +++ head/net/ocserv/distinfo Mon Apr 18 15:17:09 2016 (r413584) @@ -1,2 +1,2 @@ -SHA256 (ocserv-0.10.12.tar.xz) = b71b900842d978143ebf5a25933638b99707d8f6b48013e3127f282d31bb93f6 -SIZE (ocserv-0.10.12.tar.xz) = 731028 +SHA256 (ocserv-0.11.1.tar.xz) = 2e083903277ab5f2e5869d2eb3721f0313522edf2ad2c4b844869826d690a5c6 +SIZE (ocserv-0.11.1.tar.xz) = 739800 Modified: head/net/ocserv/files/patch-doc_Makefile.am ============================================================================== --- head/net/ocserv/files/patch-doc_Makefile.am Mon Apr 18 14:29:49 2016 (r413583) +++ head/net/ocserv/files/patch-doc_Makefile.am Mon Apr 18 15:17:09 2016 (r413584) @@ -1,4 +1,4 @@ ---- doc/Makefile.am.orig 2015-08-18 19:48:03 UTC +--- doc/Makefile.am.orig 2016-04-07 22:36:30 UTC +++ doc/Makefile.am @@ -5,18 +5,27 @@ EXTRA_DIST = design.dia sample.config sc @@ -16,27 +16,27 @@ + rm -f ../src/ocserv-args.def.tmp + sed -I -e 's/^\.NOP //' $@ --occtl.8: ../src/occtl-args.def +-occtl.8: ../src/occtl/args.def - -$(SED) 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp && \ - @AUTOGEN@ -L../src -DMAN_SECTION=8 -Tagman-cmd.tpl "$<".tmp && \ - rm -f "$<".tmp +occtl.8: + -gsed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' \ -+ ../src/occtl-args.def > ../src/occtl-args.def.tmp && \ ++ ../src/occtl/args.def > ../src/occtl/args.def.tmp && \ + @AUTOGEN@ -L../src -DMAN_SECTION=8 -Tagman-cmd.tpl \ -+ ../src/occtl-args.def.tmp && \ -+ rm -f ../src/occtl-args.def.tmp ++ ../src/occtl/args.def.tmp && \ ++ rm -f ../src/occtl/args.def.tmp + sed -I -e 's/^\.NOP //' $@ --ocpasswd.8: ../src/ocpasswd-args.def +-ocpasswd.8: ../src/ocpasswd/args.def - -$(SED) 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp && \ - @AUTOGEN@ -L../src -DMAN_SECTION=8 -Tagman-cmd.tpl "$<".tmp && \ - rm -f "$<".tmp +ocpasswd.8: + -gsed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' \ -+ ../src/ocpasswd-args.def > ../src/ocpasswd-args.def.tmp && \ ++ ../src/ocpasswd/args.def > ../src/ocpasswd/args.def.tmp && \ + @AUTOGEN@ -L../src -DMAN_SECTION=8 -Tagman-cmd.tpl \ -+ ../src/ocpasswd-args.def.tmp && \ -+ rm -f ../src/ocpasswd-args.def.tmp ++ ../src/ocpasswd/args.def.tmp && \ ++ rm -f ../src/ocpasswd/args.def.tmp + sed -I -e 's/^\.NOP //' $@ Modified: head/net/ocserv/files/patch-src_main.c ============================================================================== --- head/net/ocserv/files/patch-src_main.c Mon Apr 18 14:29:49 2016 (r413583) +++ head/net/ocserv/files/patch-src_main.c Mon Apr 18 15:17:09 2016 (r413584) @@ -1,6 +1,15 @@ ---- src/main.c.orig 2015-08-31 19:19:45 UTC +--- src/main.c.orig 2016-03-06 11:14:35 UTC +++ src/main.c -@@ -135,8 +135,9 @@ int y; +@@ -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; @@ -12,3 +21,52 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604181517.u3IFH9KQ003728>