View | Details | Raw Unified | Return to bug 202936
Collapse All | Expand All

(-)/usr/ports/net/ocserv/Makefile (-9 / +7 lines)
Lines 2-8 Link Here
2
# $FreeBSD: head/net/ocserv/Makefile 394422 2015-08-16 21:48:15Z pi $
2
# $FreeBSD: head/net/ocserv/Makefile 394422 2015-08-16 21:48:15Z pi $
3
3
4
PORTNAME=	ocserv
4
PORTNAME=	ocserv
5
PORTVERSION=	0.10.7
5
PORTVERSION=	0.10.8
6
CATEGORIES=	net security
6
CATEGORIES=	net security
7
MASTER_SITES=	ftp://ftp.infradead.org/pub/ocserv/
7
MASTER_SITES=	ftp://ftp.infradead.org/pub/ocserv/
8
8
Lines 18-24 Link Here
18
		libiconv.so:${PORTSDIR}/converters/libiconv \
18
		libiconv.so:${PORTSDIR}/converters/libiconv \
19
		libtalloc.so:${PORTSDIR}/devel/talloc \
19
		libtalloc.so:${PORTSDIR}/devel/talloc \
20
		libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c \
20
		libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c \
21
		libgnutls.so:${PORTSDIR}/security/gnutls
21
		libgnutls.so:${PORTSDIR}/security/gnutls \
22
		libtasn1.so:${PORTSDIR}/security/libtasn1
22
23
23
USES=	autoreconf cpe gmake gperf libtool ncurses pathfix pkgconfig readline tar:xz
24
USES=	autoreconf cpe gmake gperf libtool ncurses pathfix pkgconfig readline tar:xz
24
CPE_VENDOR=	infradead
25
CPE_VENDOR=	infradead
Lines 43-56 Link Here
43
PORTDOCS=	AUTHORS ChangeLog INSTALL NEWS README TODO
44
PORTDOCS=	AUTHORS ChangeLog INSTALL NEWS README TODO
44
PORTEXAMPLES=	profile.xml sample.config sample.passwd
45
PORTEXAMPLES=	profile.xml sample.config sample.passwd
45
46
46
.include <bsd.port.options.mk>
47
GSSAPI_USES=		gssapi:mit
48
GSSAPI_LIB_DEPENDS=	libkrb5support.so:${PORTSDIR}/security/krb5
49
GSSAPI_CONFIGURE_OFF=	--without-gssapi
47
50
48
.if ${PORT_OPTIONS:MGSSAPI}
51
.include <bsd.port.options.mk>
49
USES+=	gssapi:mit
50
LIB_DEPENDS+=	libkrb5support.so:${PORTSDIR}/security/krb5
51
.else
52
CONFIGURE_ARGS+=	--without-gssapi
53
.endif
54
52
55
post-patch:
53
post-patch:
56
	${RM} ${WRKSRC}/doc/occtl.8
54
	${RM} ${WRKSRC}/doc/occtl.8
(-)/usr/ports/net/ocserv/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (ocserv-0.10.7.tar.xz) = 222212baae53e7f74273245e1459d4132cda41ad255a21f1e42ab4cd240f431d
1
SHA256 (ocserv-0.10.8.tar.xz) = af989f27585d3567221ffc40babbb383bcd0ca6879e52bbcdee6ac3a90608454
2
SIZE (ocserv-0.10.7.tar.xz) = 712232
2
SIZE (ocserv-0.10.8.tar.xz) = 714404
(-)/usr/ports/net/ocserv/files/patch-configure.ac (-16 / +9 lines)
Lines 1-22 Link Here
1
--- configure.ac.orig	2015-08-06 16:43:09 UTC
1
--- configure.ac.orig	2015-09-04 19:27:22 UTC
2
+++ configure.ac
2
+++ configure.ac
3
@@ -16,11 +16,11 @@ AM_PROG_CC_C_O
3
@@ -19,7 +19,7 @@ if [ test "$GCC" = "yes" ];then
4
 if [ test "$GCC" = "yes" ];then
5
 	CFLAGS="$CFLAGS -Wall"
6
 fi
4
 fi
7
-AC_PATH_PROG(CTAGS, ctags, /bin/true)
5
 AC_PATH_PROG(CTAGS, ctags, [:])
8
-AC_PATH_PROG(CSCOPE, cscope, /bin/true)
6
 AC_PATH_PROG(CSCOPE, cscope, [:])
9
-AC_CHECK_PROG([AUTOGEN], [autogen], [autogen], [/bin/true])
7
-AC_CHECK_PROG([AUTOGEN], [autogen], [autogen], [:])
10
+AC_PATH_PROG(CTAGS, ctags, /usr/bin/true)
11
+AC_PATH_PROG(CSCOPE, cscope, /usr/bin/true)
12
+AC_CHECK_PROG([AUTOGEN], [autogen], [autogen], [autogen])
8
+AC_CHECK_PROG([AUTOGEN], [autogen], [autogen], [autogen])
13
 
9
 
14
-if test x"$AUTOGEN" = "x/bin/true"; then
10
 if test x"$AUTOGEN" = "x:"; then
15
+if test x"$AUTOGEN" = "x:"; then
16
 	AC_MSG_WARN([[
11
 	AC_MSG_WARN([[
17
 ***
12
@@ -125,7 +125,7 @@ if test "$test_for_libnl" = yes;then
18
 *** autogen not found. Will not link against libopts.
19
@@ -124,7 +124,7 @@ if test "$test_for_libnl" = yes;then
20
 fi
13
 fi
21
 
14
 
22
 have_readline=no
15
 have_readline=no
Lines 25-35 Link Here
25
 #include <stdio.h>
18
 #include <stdio.h>
26
 #include <readline/readline.h>], [rl_replace_line(0,0);])
19
 #include <readline/readline.h>], [rl_replace_line(0,0);])
27
   if test x$ac_cv_libreadline = xyes; then
20
   if test x$ac_cv_libreadline = xyes; then
28
@@ -441,7 +441,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";the
21
@@ -442,7 +442,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";the
29
 			cp -f $i $nam
22
 			cp -f $i $nam
30
 		fi
23
 		fi
31
 	done
24
 	done
32
-	AC_SUBST([AUTOGEN], [/bin/true])
25
-	AC_SUBST([AUTOGEN], [:])
33
+	AC_SUBST([AUTOGEN], [autogen])
26
+	AC_SUBST([AUTOGEN], [autogen])
34
 	enable_local_libopts=yes
27
 	enable_local_libopts=yes
35
 else
28
 else
(-)/usr/ports/net/ocserv/files/patch-doc_Makefile.am (-4 / +4 lines)
Lines 1-11 Link Here
1
--- doc/Makefile.am.orig	2015-05-26 16:33:38 UTC
1
--- doc/Makefile.am.orig	2015-08-18 19:48:03 UTC
2
+++ doc/Makefile.am
2
+++ doc/Makefile.am
3
@@ -5,18 +5,27 @@ EXTRA_DIST = design.dia sample.config sc
3
@@ -5,18 +5,27 @@ EXTRA_DIST = design.dia sample.config sc
4
 
4
 
5
 dist_man_MANS = ocserv.8 ocpasswd.8 occtl.8
5
 dist_man_MANS = ocserv.8 ocpasswd.8 occtl.8
6
 
6
 
7
-ocserv.8: ../src/ocserv-args.def
7
-ocserv.8: ../src/ocserv-args.def
8
-	-sed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp && \
8
-	-$(SED) 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp && \
9
-	@AUTOGEN@ -L../src -DMAN_SECTION=8 -Tagman-cmd.tpl "$<".tmp && \
9
-	@AUTOGEN@ -L../src -DMAN_SECTION=8 -Tagman-cmd.tpl "$<".tmp && \
10
-	rm -f "$<".tmp
10
-	rm -f "$<".tmp
11
+ocserv.8:
11
+ocserv.8:
Lines 17-23 Link Here
17
+	sed -I -e 's/^\.NOP //' $@
17
+	sed -I -e 's/^\.NOP //' $@
18
 
18
 
19
-occtl.8: ../src/occtl-args.def
19
-occtl.8: ../src/occtl-args.def
20
-	-sed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp && \
20
-	-$(SED) 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp && \
21
-	@AUTOGEN@ -L../src -DMAN_SECTION=8 -Tagman-cmd.tpl "$<".tmp && \
21
-	@AUTOGEN@ -L../src -DMAN_SECTION=8 -Tagman-cmd.tpl "$<".tmp && \
22
-	rm -f "$<".tmp
22
-	rm -f "$<".tmp
23
+occtl.8:
23
+occtl.8:
Lines 29-35 Link Here
29
+	sed -I -e 's/^\.NOP //' $@
29
+	sed -I -e 's/^\.NOP //' $@
30
 
30
 
31
-ocpasswd.8: ../src/ocpasswd-args.def
31
-ocpasswd.8: ../src/ocpasswd-args.def
32
-	-sed 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp && \
32
-	-$(SED) 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp && \
33
-	@AUTOGEN@ -L../src -DMAN_SECTION=8 -Tagman-cmd.tpl "$<".tmp && \
33
-	@AUTOGEN@ -L../src -DMAN_SECTION=8 -Tagman-cmd.tpl "$<".tmp && \
34
-	rm -f "$<".tmp
34
-	rm -f "$<".tmp
35
+ocpasswd.8:
35
+ocpasswd.8:
(-)/usr/ports/net/ocserv/files/patch-src_config.c (-5 / +5 lines)
Lines 1-6 Link Here
1
--- src/config.c.orig	2015-07-18 10:35:29 UTC
1
--- src/config.c.orig	2015-09-04 19:27:22 UTC
2
+++ src/config.c
2
+++ src/config.c
3
@@ -52,8 +52,7 @@
3
@@ -51,8 +51,7 @@
4
 #include <tlslib.h>
4
 #include <tlslib.h>
5
 #include "common-config.h"
5
 #include "common-config.h"
6
 
6
 
Lines 9-16 Link Here
9
+#define DEFAULT_CFG_FILE "/usr/local/etc/ocserv/conf"
9
+#define DEFAULT_CFG_FILE "/usr/local/etc/ocserv/conf"
10
 
10
 
11
 static char pid_file[_POSIX_PATH_MAX] = "";
11
 static char pid_file[_POSIX_PATH_MAX] = "";
12
 static const char* cfg_file = DEFAULT_CFG_FILE;
12
 static char cfg_file[_POSIX_PATH_MAX] = DEFAULT_CFG_FILE;
13
@@ -414,7 +413,7 @@ static void figure_auth_funcs(struct per
13
@@ -416,7 +415,7 @@ static void figure_auth_funcs(struct per
14
 			}
14
 			}
15
 			talloc_free(auth[j]);
15
 			talloc_free(auth[j]);
16
 		}
16
 		}
Lines 19-25 Link Here
19
 	} else {
19
 	} else {
20
 		unsigned x = config->auth_methods;
20
 		unsigned x = config->auth_methods;
21
 		/* Append authentication methods (alternative options) */
21
 		/* Append authentication methods (alternative options) */
22
@@ -583,9 +582,6 @@ size_t urlfw_size = 0;
22
@@ -586,9 +585,6 @@ size_t urlfw_size = 0;
23
 #endif
23
 #endif
24
 
24
 
25
 	pov = configFileLoad(file);
25
 	pov = configFileLoad(file);
(-)/usr/ports/net/ocserv/files/patch-src_main-ctl-unix.c (-12 / +14 lines)
Lines 1-24 Link Here
1
--- src/main-ctl-unix.c.orig	2015-05-26 16:33:38 UTC
1
--- src/main-ctl-unix.c.orig	2015-08-28 19:13:38 UTC
2
+++ src/main-ctl-unix.c
2
+++ src/main-ctl-unix.c
3
@@ -110,10 +110,15 @@ int ctl_handler_init(main_server_st * s)
3
@@ -110,12 +110,15 @@ int ctl_handler_init(main_server_st * s)
4
 	struct sockaddr_un sa;
4
 	struct sockaddr_un sa;
5
 	int sd, e;
5
 	int sd, e;
6
 
6
 
7
-	if (s->config->use_occtl == 0 || s->perm_config->occtl_socket_file == NULL)
7
-	if (s->config->use_occtl == 0 || s->perm_config->occtl_socket_file == NULL) {
8
+	mslog(s, NULL, LOG_INFO, "using control unix socket: %s", s->perm_config->occtl_socket_file);
8
-		mslog(s, NULL, LOG_INFO, "not using control unix socket");
9
-		return 0;
10
+       mslog(s, NULL, LOG_INFO, "using control unix socket: %s", s->perm_config->occtl_socket_file);
9
+
11
+
10
+	if (s->config->use_occtl == 0 ||
12
+       if (s->config->use_occtl == 0 ||
11
+		s->perm_config->occtl_socket_file == NULL) {
13
+               s->perm_config->occtl_socket_file == NULL) {
12
+		mslog(s, NULL, LOG_INFO, "not using control unix socket");
14
+               mslog(s, NULL, LOG_INFO, "not using control unix socket");
13
 		return 0;
15
+	       return 0;
14
+	}
16
 	}
15
 
17
 
16
-	mslog(s, NULL, LOG_DEBUG, "initializing control unix socket: %s", s->perm_config->occtl_socket_file);
18
-	mslog(s, NULL, LOG_DEBUG, "initializing control unix socket: %s", s->perm_config->occtl_socket_file);
17
+	mslog(s, NULL, LOG_INFO, "initializing control unix socket: %s", s->perm_config->occtl_socket_file);
19
+	mslog(s, NULL, LOG_INFO, "initializing control unix socket: %s", s->perm_config->occtl_socket_file);
18
 	memset(&sa, 0, sizeof(sa));
20
 	memset(&sa, 0, sizeof(sa));
19
 	sa.sun_family = AF_UNIX;
21
 	sa.sun_family = AF_UNIX;
20
 	strlcpy(sa.sun_path, s->perm_config->occtl_socket_file, sizeof(sa.sun_path));
22
 	strlcpy(sa.sun_path, s->perm_config->occtl_socket_file, sizeof(sa.sun_path));
21
@@ -122,7 +127,7 @@ int ctl_handler_init(main_server_st * s)
23
@@ -124,7 +127,7 @@ int ctl_handler_init(main_server_st * s)
22
 	sd = socket(AF_UNIX, SOCK_STREAM, 0);
24
 	sd = socket(AF_UNIX, SOCK_STREAM, 0);
23
 	if (sd == -1) {
25
 	if (sd == -1) {
24
 		e = errno;
26
 		e = errno;
Lines 27-33 Link Here
27
 		      s->perm_config->occtl_socket_file, strerror(e));
29
 		      s->perm_config->occtl_socket_file, strerror(e));
28
 		return -1;
30
 		return -1;
29
 	}
31
 	}
30
@@ -131,7 +136,7 @@ int ctl_handler_init(main_server_st * s)
32
@@ -133,7 +136,7 @@ int ctl_handler_init(main_server_st * s)
31
 	ret = bind(sd, (struct sockaddr *)&sa, SUN_LEN(&sa));
33
 	ret = bind(sd, (struct sockaddr *)&sa, SUN_LEN(&sa));
32
 	if (ret == -1) {
34
 	if (ret == -1) {
33
 		e = errno;
35
 		e = errno;
Lines 36-42 Link Here
36
 		      s->perm_config->occtl_socket_file, strerror(e));
38
 		      s->perm_config->occtl_socket_file, strerror(e));
37
 		return -1;
39
 		return -1;
38
 	}
40
 	}
39
@@ -139,14 +144,14 @@ int ctl_handler_init(main_server_st * s)
41
@@ -141,14 +144,14 @@ int ctl_handler_init(main_server_st * s)
40
 	ret = chown(s->perm_config->occtl_socket_file, s->perm_config->uid, s->perm_config->gid);
42
 	ret = chown(s->perm_config->occtl_socket_file, s->perm_config->uid, s->perm_config->gid);
41
 	if (ret == -1) {
43
 	if (ret == -1) {
42
 		e = errno;
44
 		e = errno;
(-)/usr/ports/net/ocserv/files/patch-src_main.c (-11 / +11 lines)
Lines 1-14 Link Here
1
--- src/main.c.orig	2015-07-01 18:41:01 UTC
1
--- src/main.c.orig	2015-08-31 19:19:45 UTC
2
+++ src/main.c
2
+++ src/main.c
3
@@ -131,8 +131,9 @@ int y;
3
@@ -135,8 +135,9 @@ int y;
4
 		perror("setsockopt(IP_PKTINFO) failed");
5
 #elif defined(IP_RECVDSTADDR) /* *BSD */
4
 #elif defined(IP_RECVDSTADDR) /* *BSD */
6
 	y = 1;
5
 	if (family == AF_INET) {
7
-	if (setsockopt(fd, IPPROTO_IP, IP_RECVDSTADDR,
6
 		y = 1;
8
-		       (const void *)&y, sizeof(y)) < 0)
7
-		if (setsockopt(fd, IPPROTO_IP, IP_RECVDSTADDR,
9
+	if (family == AF_INET &&
8
-			       (const void *)&y, sizeof(y)) < 0)
10
+	    setsockopt(fd, IPPROTO_IP, IP_RECVDSTADDR,
9
+        if (family == AF_INET &&
11
+		(const void *)&y, sizeof(y)) < 0)
10
+            setsockopt(fd, IPPROTO_IP, IP_RECVDSTADDR,
12
 		perror("setsockopt(IP_RECVDSTADDR) failed");
11
+                (const void *)&y, sizeof(y)) < 0)
12
 			perror("setsockopt(IP_RECVDSTADDR) failed");
13
 	}
13
 #endif
14
 #endif
14
 #if defined(IPV6_RECVPKTINFO)
(-)/usr/ports/net/ocserv/files/patch-src_ocserv-args.def (-4 / +4 lines)
Lines 1-4 Link Here
1
--- src/ocserv-args.def.orig	2015-07-15 17:17:22 UTC
1
--- src/ocserv-args.def.orig	2015-08-31 19:19:45 UTC
2
+++ src/ocserv-args.def
2
+++ src/ocserv-args.def
3
@@ -68,7 +68,7 @@ doc-section = {
3
@@ -68,7 +68,7 @@ doc-section = {
4
   ds-format = 'texi';
4
   ds-format = 'texi';
Lines 23-33 Link Here
23
 #auth = "pam"
23
 #auth = "pam"
24
 #auth = "pam[gid-min=1000]"
24
 #auth = "pam[gid-min=1000]"
25
-#auth = "plain[passwd=/etc/ocserv/ocpasswd]"
25
-#auth = "plain[passwd=/etc/ocserv/ocpasswd]"
26
+#auth = "plain[passwd=/usr/local/etc/ocserv/passwd]"
26
+#auth = "plain[passwd=/usr/local/etc/ocserv/ocpasswd]"
27
 #auth = "radius[config=/etc/radiusclient/radiusclient.conf,groupconfig=true]"
27
 #auth = "radius[config=/etc/radiusclient/radiusclient.conf,groupconfig=true]"
28
 
28
 
29
 # Specify alternative authentication methods that are sufficient
29
 # Specify alternative authentication methods that are sufficient
30
@@ -431,7 +431,7 @@ rekey-method = ssl
30
@@ -429,7 +429,7 @@ rekey-method = ssl
31
 use-occtl = true
31
 use-occtl = true
32
 
32
 
33
 # PID file. It can be overriden in the command line.
33
 # PID file. It can be overriden in the command line.
Lines 36-42 Link Here
36
 
36
 
37
 # Set the protocol-defined priority (SO_PRIORITY) for packets to
37
 # Set the protocol-defined priority (SO_PRIORITY) for packets to
38
 # be sent. That is a number from 0 to 6 with 0 being the lowest
38
 # be sent. That is a number from 0 to 6 with 0 being the lowest
39
@@ -555,13 +555,13 @@ no-route = 192.168.5.0/255.255.255.0
39
@@ -553,13 +553,13 @@ no-route = 192.168.5.0/255.255.255.0
40
 # Also explicit addresses, are only allowed when they are odd. In that
40
 # Also explicit addresses, are only allowed when they are odd. In that
41
 # case the next even address will be used as the remote address (in PtP).
41
 # case the next even address will be used as the remote address (in PtP).
42
 
42
 

Return to bug 202936