svn commit: r434013 - in head/net/ocserv: . files
Carlos J. Puga Medina
cpm at FreeBSD.org
Mon Feb 13 18:38:24 UTC 2017
Author: cpm
Date: Mon Feb 13 18:38:22 2017
New Revision: 434013
URL: https://svnweb.freebsd.org/changeset/ports/434013
Log:
net/ocserv: update to 0.11.7
- Update PORTVERSION and distinfo checksum (0.11.7)
- Regenerate some patches to apply cleanly
- Remove MAKE_JOBS_UNSAFE=yes
Changelog: http://lists.infradead.org/pipermail/openconnect-devel/2017-February/004204.html
Modified:
head/net/ocserv/Makefile
head/net/ocserv/distinfo
head/net/ocserv/files/patch-configure.ac
head/net/ocserv/files/patch-doc_Makefile.am
head/net/ocserv/files/patch-src_ocserv-args.def
Modified: head/net/ocserv/Makefile
==============================================================================
--- head/net/ocserv/Makefile Mon Feb 13 18:05:34 2017 (r434012)
+++ head/net/ocserv/Makefile Mon Feb 13 18:38:22 2017 (r434013)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= ocserv
-PORTVERSION= 0.11.6
+PORTVERSION= 0.11.7
CATEGORIES= net security
MASTER_SITES= ftp://ftp.infradead.org/pub/ocserv/
@@ -41,8 +41,6 @@ GROUPS= _ocserv
USE_RC_SUBR= ocserv
-MAKE_JOBS_UNSAFE= yes
-
OPTIONS_DEFINE= DOCS EXAMPLES GSSAPI
PORTDOCS= AUTHORS ChangeLog NEWS README TODO
Modified: head/net/ocserv/distinfo
==============================================================================
--- head/net/ocserv/distinfo Mon Feb 13 18:05:34 2017 (r434012)
+++ head/net/ocserv/distinfo Mon Feb 13 18:38:22 2017 (r434013)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479252096
-SHA256 (ocserv-0.11.6.tar.xz) = 937c7ad401983a9183cec5976afd79ce1af5b2793dc71885d2a4ecdb043bd48c
-SIZE (ocserv-0.11.6.tar.xz) = 762492
+TIMESTAMP = 1486984430
+SHA256 (ocserv-0.11.7.tar.xz) = 93055ec3b889da680a79c4a51f0efc1b84255e8e2b9c642c5ed1a6f07425b259
+SIZE (ocserv-0.11.7.tar.xz) = 767276
Modified: head/net/ocserv/files/patch-configure.ac
==============================================================================
--- head/net/ocserv/files/patch-configure.ac Mon Feb 13 18:05:34 2017 (r434012)
+++ head/net/ocserv/files/patch-configure.ac Mon Feb 13 18:38:22 2017 (r434013)
@@ -1,4 +1,4 @@
---- configure.ac.orig 2016-08-04 06:12:29 UTC
+--- configure.ac.orig 2017-02-12 09:19:02 UTC
+++ configure.ac
@@ -19,7 +19,7 @@ if [ test "$GCC" = "yes" ];then
fi
@@ -9,7 +9,7 @@
AX_CODE_COVERAGE
-@@ -133,7 +133,7 @@ if test "$test_for_libnl" = yes;then
+@@ -140,7 +140,7 @@ if test "$test_for_libnl" = yes;then
fi
have_readline=no
@@ -18,18 +18,18 @@
#include <stdio.h>
#include <readline/readline.h>], [rl_replace_line(0,0);])
if test x$ac_cv_libreadline = xyes; then
-@@ -183,6 +183,7 @@ AC_ARG_WITH(pam,
+@@ -190,6 +190,7 @@ AC_ARG_WITH(pam,
pam_enabled=no
+oldlibs=$LIBS
if test "$test_for_pam" = yes;then
+ oldlibs=$LIBS
LIBS="$oldlibs -lpam"
- AC_MSG_CHECKING([for pam library])
-@@ -496,7 +497,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";the
- cp -f $i $nam
- fi
- done
+@@ -511,7 +512,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";the
+ src/ocpasswd-args.h:src/ocpasswd/ocpasswd-args.h.in
+ src/ocserv-args.c:src/ocserv-args.c.in
+ src/ocserv-args.h:src/ocserv-args.h.in])
- AC_SUBST([AUTOGEN], [:])
+ AC_SUBST([AUTOGEN], [autogen])
enable_local_libopts=yes
Modified: head/net/ocserv/files/patch-doc_Makefile.am
==============================================================================
--- head/net/ocserv/files/patch-doc_Makefile.am Mon Feb 13 18:05:34 2017 (r434012)
+++ head/net/ocserv/files/patch-doc_Makefile.am Mon Feb 13 18:38:22 2017 (r434013)
@@ -1,6 +1,6 @@
---- doc/Makefile.am.orig 2016-04-07 22:36:30 UTC
+--- doc/Makefile.am.orig 2017-02-13 16:37:17 UTC
+++ doc/Makefile.am
-@@ -5,18 +5,27 @@ EXTRA_DIST = design.dia sample.config sc
+@@ -5,18 +5,26 @@ EXTRA_DIST = design.dia sample.config sc
dist_man_MANS = ocserv.8 ocpasswd.8 occtl.8
@@ -8,6 +8,11 @@
- -$(SED) 's/@subheading \(.*\)/@*\n at var{\1}\n@*/' $< > "$<".tmp && \
- @AUTOGEN@ -L../src -DMAN_SECTION=8 -Tagman-cmd.tpl "$<".tmp && \
- rm -f "$<".tmp
+-
+-occtl.8: ../src/occtl/occtl-args.def
+- -$(SED) 's/@subheading \(.*\)/@*\n at var{\1}\n@*/' $< > "$<".tmp && \
+- @AUTOGEN@ -L../src -DMAN_SECTION=8 -Tagman-cmd.tpl "$<".tmp && \
+- rm -f "$<".tmp
+ocserv.8:
+ -gsed 's/@subheading \(.*\)/@*\n at var{\1}\n@*/' \
+ ../src/ocserv-args.def > ../src/ocserv-args.def.tmp && \
@@ -16,27 +21,22 @@
+ rm -f ../src/ocserv-args.def.tmp
+ sed -I -e 's/^\.NOP //' $@
--occtl.8: ../src/occtl/args.def
+-ocpasswd.8: ../src/ocpasswd/ocpasswd-args.def
- -$(SED) 's/@subheading \(.*\)/@*\n at var{\1}\n@*/' $< > "$<".tmp && \
- @AUTOGEN@ -L../src -DMAN_SECTION=8 -Tagman-cmd.tpl "$<".tmp && \
- rm -f "$<".tmp
+occtl.8:
+ -gsed 's/@subheading \(.*\)/@*\n at var{\1}\n@*/' \
-+ ../src/occtl/args.def > ../src/occtl/args.def.tmp && \
++ ../src/occtl/occtl-args.def > ../src/occtl/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/occtl-args.def.tmp && \
++ rm -f ../src/occtl/occtl-args.def.tmp
+ sed -I -e 's/^\.NOP //' $@
--ocpasswd.8: ../src/ocpasswd/args.def
-- -$(SED) 's/@subheading \(.*\)/@*\n at var{\1}\n@*/' $< > "$<".tmp && \
-- @AUTOGEN@ -L../src -DMAN_SECTION=8 -Tagman-cmd.tpl "$<".tmp && \
-- rm -f "$<".tmp
+ocpasswd.8:
+ -gsed 's/@subheading \(.*\)/@*\n at var{\1}\n@*/' \
-+ ../src/ocpasswd/args.def > ../src/ocpasswd/args.def.tmp && \
++ ../src/ocpasswd/ocpasswd-args.def > ../src/ocpasswd/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/ocpasswd-args.def.tmp && \
++ rm -f ../src/ocpasswd/ocpasswd-args.def.tmp
+ sed -I -e 's/^\.NOP //' $@
-
Modified: head/net/ocserv/files/patch-src_ocserv-args.def
==============================================================================
--- head/net/ocserv/files/patch-src_ocserv-args.def Mon Feb 13 18:05:34 2017 (r434012)
+++ head/net/ocserv/files/patch-src_ocserv-args.def Mon Feb 13 18:38:22 2017 (r434013)
@@ -1,6 +1,6 @@
---- src/ocserv-args.def.orig 2015-10-13 09:47:33 UTC
+--- src/ocserv-args.def.orig 2017-01-29 14:33:24 UTC
+++ src/ocserv-args.def
-@@ -68,7 +68,7 @@ doc-section = {
+@@ -75,7 +75,7 @@ doc-section = {
ds-format = 'texi';
ds-text = <<-_EOT_
@subheading ocserv's configuration file format
@@ -9,7 +9,7 @@
An example configuration file follows.
@example
-@@ -87,7 +87,7 @@ An example configuration file follows.
+@@ -98,7 +98,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.
#
@@ -18,7 +18,7 @@
# The plain option requires specifying a password file which contains
# entries of the following format.
# "username:groupname1,groupname2:encoded-password"
-@@ -121,7 +121,7 @@ An example configuration file follows.
+@@ -129,7 +129,7 @@ An example configuration file follows.
#auth = "certificate"
#auth = "pam"
#auth = "pam[gid-min=1000]"
@@ -27,16 +27,16 @@
#auth = "radius[config=/etc/radiusclient/radiusclient.conf,groupconfig=true]"
# Specify alternative authentication methods that are sufficient
-@@ -437,7 +437,7 @@ rekey-method = ssl
+@@ -493,7 +493,7 @@ rekey-method = ssl
use-occtl = true
- # PID file. It can be overriden in the command line.
+ # PID file. It can be overridden 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
-@@ -564,13 +564,13 @@ no-route = 192.168.5.0/255.255.255.0
+@@ -669,13 +669,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).
@@ -53,4 +53,4 @@
+#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.
+ # route/mask, %{RI} with the route in CIDR format, and %{D} with the (tun) device.
More information about the svn-ports-all
mailing list