updated to 0.10.7

.gitignore

@@ -26,3 +26,5 @@
 /ocserv-0.10.2.tar.xz.sig
 /ocserv-0.10.6.tar.xz
 /ocserv-0.10.6.tar.xz.sig
+/ocserv-0.10.7.tar.xz.sig
+/ocserv-0.10.7.tar.xz

ocserv-0.10.6-json.patch

@@ -1,29 +0,0 @@
-diff --git a/src/occtl-print.c b/src/occtl-print.c
-index 1441cd6..8ff297e 100644
---- a/src/occtl-print.c
-+++ b/src/occtl-print.c
-@@ -47,9 +47,9 @@ int print_list_entries(FILE* out, cmd_params_st *params, const char* name, char
- 			tmp = val[i];
- 			if (tmp != NULL) {
- 				if (i==0)
--					fprintf(out, "%s", tmp);
-+					fprintf(out, "\"%s\"", tmp);
- 				else
--					fprintf(out, ", %s", tmp);
-+					fprintf(out, ", \"%s\"", tmp);
- 			}
- 		}
- 		fprintf(out, "]%s\n", have_more?",":"");
-diff --git a/src/occtl-unix.c b/src/occtl-unix.c
-index 6df5a1e..d6b28f3 100644
---- a/src/occtl-unix.c
-+++ b/src/occtl-unix.c
-@@ -254,7 +254,7 @@ int handle_status_cmd(struct unix_ctx *ctx, const char *arg, cmd_params_st *para
- 	print_single_value_int(stdout, params, "TLS DB entries", rep->stored_tls_sessions, 1);
- 	print_separator(stdout, params);
- 	print_single_value_int(stdout, params, "Server PID", rep->pid, 1);
--	print_single_value_int(stdout, params, "Sec-mod PID", rep->sec_mod_pid, 1);
-+	print_single_value_int(stdout, params, "Sec-mod PID", rep->sec_mod_pid, 0);
- 	print_end_block(stdout, params, 0);
- 
- 	status_rep__free_unpacked(rep, &pa);

ocserv.spec

@@ -1,8 +1,8 @@
 %global _hardened_build 1
 
 Name:		ocserv
-Version:	0.10.6
+Version:	0.10.7
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	OpenConnect SSL VPN server
 
 # For a breakdown of the licensing, see PACKAGE-LICENSING 
@@ -17,7 +17,6 @@ Source4:	PACKAGE-LICENSING
 Source6:	ftp://ftp.infradead.org/pub/ocserv/%{name}-%{version}.tar.xz.sig
 Source7:	ocserv-genkey
 Source8:	ocserv-script
-Patch0: 	ocserv-0.10.6-json.patch
 
 # Taken from upstream:
 # http://git.infradead.org/ocserv.git/commitdiff/7d70006a2dbddf783213f1856374bacc74217e09
@@ -74,7 +73,6 @@ to provide the secure VPN service.
 
 %prep
 %setup -q
-%patch0 -p1 -b .json
 
 rm -f src/http-parser/http_parser.c src/http-parser/http_parser.h
 rm -rf src/protobuf/
@@ -159,6 +157,9 @@ rm -rf %{buildroot}
 %{_localstatedir}/lib/ocserv/profile.xml
 
 %changelog
+* Fri Aug  7 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.10.7-1
+- new upstream release (#1251305)
+
 * Thu Jul  9 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.10.6-2
 - corrected JSON output
 

sources

@@ -1,2 +1,2 @@
-b99c74b781a180348f3a3240940fc838  ocserv-0.10.6.tar.xz
+b828a7f3e7672f09f9908f30aa21b242  ocserv-0.10.7.tar.xz.sig
-1cc410cd9ccaa796f36180d10bdeb3a7  ocserv-0.10.6.tar.xz.sig
+328469feb7505c2289f2f07720dc7777  ocserv-0.10.7.tar.xz