From a13678e2eab657775cde28706066cf573bc72cc0 Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Wed, 26 Nov 2014 17:10:29 +0100
Subject: [PATCH] new upstream release

Resolves: #1167692
---
 .gitignore  |  2 ++
 ocserv.conf | 12 +++++++++---
 ocserv.spec |  5 ++++-
 sources     |  4 ++--
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 665d3e8..5d57c42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@
 /ocserv-0.8.4.tar.xz.sig
 /ocserv-0.8.7.tar.xz.sig
 /ocserv-0.8.7.tar.xz
+/ocserv-0.8.8.tar.xz.sig
+/ocserv-0.8.8.tar.xz
diff --git a/ocserv.conf b/ocserv.conf
index b554b1d..6871a25 100644
--- a/ocserv.conf
+++ b/ocserv.conf
@@ -1,10 +1,16 @@
-# User authentication method. Could be set multiple times and in that case
-# all should succeed.
-# Options: certificate, pam. 
+# User authentication method. Could be set multiple times and in 
+# that case all should succeed. To enable multiple methods use
+# multiple auth directives. Available options: certificate, certificate[optional],
+# plain, pam. 
 #auth = "certificate"
 #auth = "plain[./sample.passwd]"
 auth = "pam"
 
+# This indicates that a user may present a certificate. When that option
+# is set, individual users or user groups can be forced to present a valid
+# certificate by using "require-cert=true".
+#auth = "certificate[optional]"
+
 # The gid-min option is used by auto-select-group option, in order to
 # select the minimum group ID.
 #auth = "pam[gid-min=1000]"
diff --git a/ocserv.spec b/ocserv.spec
index 3ce7760..e2aa87d 100644
--- a/ocserv.spec
+++ b/ocserv.spec
@@ -1,5 +1,5 @@
 Name:		ocserv
-Version:	0.8.7
+Version:	0.8.8
 Release:	1%{?dist}
 Summary:	OpenConnect SSL VPN server
 
@@ -142,6 +142,9 @@ rm -rf %{buildroot}
 %{_localstatedir}/lib/ocserv/profile.xml
 
 %changelog
+* Wed Nov 26 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.8.8-1
+- New upstream release
+
 * Mon Oct 27 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.8.7-1
 - New upstream release
 
diff --git a/sources b/sources
index dee4776..63a85e1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-b807339aed1d713a096d2533ae6da232  ocserv-0.8.7.tar.xz.sig
-79c00132c3366bb60546f256068211eb  ocserv-0.8.7.tar.xz
+de7faa9e1658dfea0f409fcc83fcb7ff  ocserv-0.8.8.tar.xz.sig
+d9b12a3fa976dfda3e4c0238173744e6  ocserv-0.8.8.tar.xz