From e193d435ca9b0393762db2df2162138f4c28eeea Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Mon, 5 Mar 2018 16:56:38 +0100
Subject: [PATCH] Update to 0.11.11-1

- Update to upstream 0.11.11 release
---
 .gitignore                                    |  11 +++++++++++
 ...42418905D8206AA754CCDC29EE58B996865171.gpg | Bin 56226 -> 58697 bytes
 ocserv.spec                                   |  11 +++++++++--
 sources                                       |   6 +++---
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index ed5bff9..325d272 100644
--- a/.gitignore
+++ b/.gitignore
@@ -104,3 +104,14 @@
 /gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg
 /ocserv-0.11.10.tar.xz.sig
 /ocserv-0.11.10.tar.xz
+/ocserv.init
+/gpgkey-56EE7FA9E8173B19FE86268D763712747F343FA7.gpg
+/ocserv-script
+/ocserv-genkey
+/PACKAGE-LICENSING
+/ocserv-pamd.conf
+/ocserv.service
+/ocserv.conf
+/gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg
+/ocserv-0.11.11.tar.xz.sig
+/ocserv-0.11.11.tar.xz
diff --git a/gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg b/gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg
index 1f9a40cc96ea43f54ea9dc0f1873971a85535c2f..b1ee43c60379c783e5f3457c480d6a7ecc2447c5 100644
GIT binary patch
delta 2201
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
NHP}L{11QR2{{nR^3U&Yh

delta 14
WcmX?kih0p?<_*toY~FZ#4-)`B(Fk4u

diff --git a/ocserv.spec b/ocserv.spec
index e40f34b..eac0ae1 100644
--- a/ocserv.spec
+++ b/ocserv.spec
@@ -1,6 +1,6 @@
 # This spec file has been automatically updated
-Version:	0.11.10
-Release: 3%{?dist}
+Version:	0.11.11
+Release: 1%{?dist}
 %global _hardened_build 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 7
@@ -66,7 +66,9 @@ BuildRequires:	pcllib-devel
 BuildRequires:	libtalloc-devel
 BuildRequires:	libev-devel
 BuildRequires:	http-parser-devel
+%if %{use_libwrap}
 BuildRequires:	tcp_wrappers-devel
+%endif
 BuildRequires:	automake, autoconf
 BuildRequires:	radcli-devel
 BuildRequires:	lz4-devel
@@ -81,6 +83,7 @@ BuildRequires:	autogen
 BuildRequires:	liboath-devel
 BuildRequires:	uid_wrapper
 BuildRequires:	socket_wrapper
+BuildRequires:	gnupg2
 
 %if 0%{?rhel} && 0%{?rhel} >= 7
 %ifarch x86_64 %{ix86}
@@ -137,6 +140,7 @@ sed -i 's/run-as-group = nogroup/run-as-group = nobody/g' tests/data/*.config
 # GPLv3 in headers is a gnulib bug: 
 # http://lists.gnu.org/archive/html/bug-gnulib/2013-11/msg00062.html
 sed -i 's/either version 3 of the License/either version 2 of the License/g' build-aux/snippet/*
+sed -i 's/exit 1/exit 77/g' tests/ocpasswd-test
 
 %if 0%{?rhel} && 0%{?rhel} <= 6
 echo "int main() { return 77; }" > tests/valid-hostname.c
@@ -258,6 +262,9 @@ install -D -m 0755 %{SOURCE11} %{buildroot}/%{_initrddir}/%{name}
 %endif
 
 %changelog
+* Mon Mar 05 2018 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.11.11-1
+- Update to upstream 0.11.11 release
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index 43899fc..2f7f48b 100644
--- a/sources
+++ b/sources
@@ -6,6 +6,6 @@ SHA512 (PACKAGE-LICENSING) = eea2a2a4765c90d874c79bb72d754c8b26b58d5e5b3c3cee10c
 SHA512 (ocserv-pamd.conf) = 3a75f19d89ddd164f3faa9c3579c7f675fc58413a194f43ec28eee7ebced6fee3f4ca305fe9b0ddf76ae39cd669e8d3d63b58afbbf19b84e4ca646ae7f42d61a
 SHA512 (ocserv.service) = 264f3389d88aec1f7d2e4683a4dfc0aa67af2325154de822eecf5fb43f8c221aab0d9f0c6a8eedb893e6d69ed4d94c9397b01e5d0d12e88330017a3bfa5f3644
 SHA512 (ocserv.conf) = 0a48d394dba183528c1e92df2a8b844a4d7d419244b1c08883f79c8b48843986e786ea4d48478ed4e8d57fd56626bf962dbcf6c76b5839ba5ab5fac8b089c44c
-SHA512 (gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg) = 7eccc70fb763cf8a6525228230c1f537224809cf553efb3ad6bc88ad96f01122c30a5cd9d8328fa3a97b242d59e00bc9966589a24b1e65dd4a27eb71393f097c
-SHA512 (ocserv-0.11.10.tar.xz.sig) = d88f3e42595df6c3a13dc64cbcdcca2126f22be7143856b00b0c7620358f9d0e5c524019c11ff10549e74ef5eebb0613c25afd9f7244c6ab14fb70b8059188b8
-SHA512 (ocserv-0.11.10.tar.xz) = 40fe152adf4438ed390406ec46049ff3769208e1d48b40bc0f015d507902a6e81012a52dd4ddd867f56a6d50de1dfb8fa497dc3bb6ece3e666ca14df1d76c561
+SHA512 (gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg) = 3b1989dc6a64d1140f83a2af0773da2adb03c50d97b6da7357cf09525050651aafa21131f1e3180baa540a8af922119a256f5ff5bcd6602996a806e8e1816bad
+SHA512 (ocserv-0.11.11.tar.xz.sig) = 7a1521f94d48d7aafb66e6c544eb2e1c5a08d02441acc5f57876faaa984ad203f0395da37e602ad5539f54aa0ce1ff5da7389254028f6b811a9e01d6f86b1e84
+SHA512 (ocserv-0.11.11.tar.xz) = 1750e4ddd221913f82379ed34cf63f2ce858d73cfda0bcf60670a32bf2e8574a39f267c77abab78d2cf9a563a816d975e1a07b85c5e2412bd6d009850c8c262d