Index: head/net/ocserv/Makefile =================================================================== --- head/net/ocserv/Makefile (revision 399186) +++ head/net/ocserv/Makefile (revision 399187) @@ -1,73 +1,73 @@ # Created by: Carlos J Puga Medina # $FreeBSD$ PORTNAME= ocserv -PORTVERSION= 0.10.8 +PORTVERSION= 0.10.9 CATEGORIES= net security MASTER_SITES= ftp://ftp.infradead.org/pub/ocserv/ MAINTAINER= cpm@fbsd.es COMMENT= Server implementing the AnyConnect SSL VPN protocol LICENSE= GPLv2 BUILD_DEPENDS= autogen:${PORTSDIR}/devel/autogen \ gsed:${PORTSDIR}/textproc/gsed \ bash:${PORTSDIR}/shells/bash LIB_DEPENDS= liblz4.so:${PORTSDIR}/archivers/liblz4 \ libiconv.so:${PORTSDIR}/converters/libiconv \ libtalloc.so:${PORTSDIR}/devel/talloc \ libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c \ libgnutls.so:${PORTSDIR}/security/gnutls \ libtasn1.so:${PORTSDIR}/security/libtasn1 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 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:${PORTSDIR}/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 399186) +++ head/net/ocserv/distinfo (revision 399187) @@ -1,2 +1,2 @@ -SHA256 (ocserv-0.10.8.tar.xz) = af989f27585d3567221ffc40babbb383bcd0ca6879e52bbcdee6ac3a90608454 -SIZE (ocserv-0.10.8.tar.xz) = 714404 +SHA256 (ocserv-0.10.9.tar.xz) = 96d0ea22e811a70e46561ffe29c4e6b1cc014ee24d353c0367ca72edcedf533c +SIZE (ocserv-0.10.9.tar.xz) = 718004 Index: head/net/ocserv/files/patch-src_ocserv-args.def =================================================================== --- head/net/ocserv/files/patch-src_ocserv-args.def (revision 399186) +++ head/net/ocserv/files/patch-src_ocserv-args.def (revision 399187) @@ -1,56 +1,56 @@ ---- src/ocserv-args.def.orig 2015-08-31 19:19:45 UTC +--- src/ocserv-args.def.orig 2015-10-13 09:47:33 UTC +++ src/ocserv-args.def @@ -68,7 +68,7 @@ doc-section = { ds-format = 'texi'; ds-text = <<-_EOT_ @subheading ocserv's configuration file format -By default, if no other file is specified, ocserv looks for its configuration file at @file{/etc/ocserv/ocserv.conf}. +By default, if no other file is specified, ocserv looks for its configuration file at @file{/usr/local/etc/ocserv/conf}. An example configuration file follows. @example @@ -87,7 +87,7 @@ An example configuration file follows. # This enabled PAM authentication of the user. The gid-min option is used # by auto-select-group option, in order to select the minimum valid group ID. # --# plain[passwd=/etc/ocserv/ocpasswd] -+# plain[passwd=/usr/local/etc/ocserv/ocpasswd] +-# plain[passwd=/etc/ocserv/ocpasswd,otp=/etc/ocserv/users.otp] ++# plain[passwd=/usr/local/etc/ocserv/ocpasswd,otp=/usr/local/etc/ocserv/users.otp] # The plain option requires specifying a password file which contains # entries of the following format. # "username:groupname1,groupname2:encoded-password" -@@ -119,7 +119,7 @@ An example configuration file follows. +@@ -121,7 +121,7 @@ An example configuration file follows. #auth = "certificate" #auth = "pam" #auth = "pam[gid-min=1000]" -#auth = "plain[passwd=/etc/ocserv/ocpasswd]" +#auth = "plain[passwd=/usr/local/etc/ocserv/ocpasswd]" #auth = "radius[config=/etc/radiusclient/radiusclient.conf,groupconfig=true]" # Specify alternative authentication methods that are sufficient -@@ -429,7 +429,7 @@ rekey-method = ssl +@@ -437,7 +437,7 @@ rekey-method = ssl use-occtl = true # PID file. It can be overriden in the command line. -pid-file = /var/run/ocserv.pid +pid-file = /var/run/ocserv/pid # Set the protocol-defined priority (SO_PRIORITY) for packets to # be sent. That is a number from 0 to 6 with 0 being the lowest -@@ -553,13 +553,13 @@ no-route = 192.168.5.0/255.255.255.0 +@@ -564,13 +564,13 @@ no-route = 192.168.5.0/255.255.255.0 # Also explicit addresses, are only allowed when they are odd. In that # case the next even address will be used as the remote address (in PtP). -#config-per-user = /etc/ocserv/config-per-user/ -#config-per-group = /etc/ocserv/config-per-group/ +#config-per-user = /usr/local/etc/ocserv/config-per-user/ +#config-per-group = /usr/local/etc/ocserv/config-per-group/ # When config-per-xxx is specified and there is no group or user that # matches, then utilize the following configuration. -#default-user-config = /etc/ocserv/defaults/user.conf -#default-group-config = /etc/ocserv/defaults/group.conf +#default-user-config = /usr/local/etc/ocserv/defaults/user.conf +#default-group-config = /usr/local/etc/ocserv/defaults/group.conf # The system command to use to setup a route. %{R} will be replaced with the # route/mask and %{D} with the (tun) device.