From 040d07710192d1bd0d9c2da163b41b0a736c8038 Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Thu, 10 Jan 2019 20:53:38 +0100
Subject: [PATCH] Update to 0.12.2-1

- Update to upstream 0.12.2 release
---
 .gitignore  | 11 +++++++++++
 ocserv.spec | 14 +++++++-------
 sources     |  4 ++--
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5aa3c3c..aab5bdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -148,3 +148,14 @@
 /gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg
 /ocserv-0.12.1.tar.xz.sig
 /ocserv-0.12.1.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.12.2.tar.xz.sig
+/ocserv-0.12.2.tar.xz
diff --git a/ocserv.spec b/ocserv.spec
index d780d14..663142c 100644
--- a/ocserv.spec
+++ b/ocserv.spec
@@ -1,6 +1,6 @@
 # This spec file has been automatically updated
-Version:	0.12.1
-Release: 3%{?dist}
+Version:	0.12.2
+Release: 1%{?dist}
 %global _hardened_build 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 7
@@ -41,8 +41,7 @@ Source11:	ocserv.init
 # Taken from upstream:
 # http://git.infradead.org/ocserv.git/commitdiff/7d70006a2dbddf783213f1856374bacc74217e09
 
-BuildRequires:  gcc
-
+BuildRequires:	gcc
 %if 0%{?rhel} && 0%{?rhel} <= 6
 BuildRequires:	gnutls30-devel
 %else
@@ -230,6 +229,7 @@ install -D -m 0755 %{SOURCE11} %{buildroot}/%{_initrddir}/%{name}
 %make_install
 
 %files
+%defattr(-,root,root,-)
 
 %dir %{_localstatedir}/lib/ocserv
 %dir %{_sysconfdir}/ocserv
@@ -240,12 +240,9 @@ install -D -m 0755 %{SOURCE11} %{buildroot}/%{_initrddir}/%{name}
 %doc AUTHORS ChangeLog NEWS COPYING LICENSE README.md TODO PACKAGE-LICENSING
 %doc src/ccan/licenses/CC0 src/ccan/licenses/LGPL-2.1 src/ccan/licenses/BSD-MIT
 
-## Temporarily disable when rubygem is not present; there is a bug in 0.12.0 dist
-%if 0%{?fedora} || 0%{?rhel} > 7
 %{_mandir}/man8/ocserv.8*
 %{_mandir}/man8/occtl.8*
 %{_mandir}/man8/ocpasswd.8*
-%endif
 
 %{_bindir}/ocpasswd
 %{_bindir}/occtl
@@ -261,6 +258,9 @@ install -D -m 0755 %{SOURCE11} %{buildroot}/%{_initrddir}/%{name}
 %endif
 
 %changelog
+* Thu Jan 10 2019 Nikos Mavrogiannopoulos <nmav@gnutls.org> - 0.12.2-1
+- Update to upstream 0.12.2 release
+
 * Tue Jul 24 2018 Nikos Mavrogiannopoulos <nmav@gnutls.org> - 0.12.1-3
 - Added gcc as build-dependency
 
diff --git a/sources b/sources
index e483c81..4b8f0de 100644
--- a/sources
+++ b/sources
@@ -7,5 +7,5 @@ SHA512 (ocserv-pamd.conf) = 3a75f19d89ddd164f3faa9c3579c7f675fc58413a194f43ec28e
 SHA512 (ocserv.service) = 2b258b2e9d211c9626e9e5c67b6c2573b713e0f490917ed1c84c2bb2708f874026ddb55dceb9585e491f86de5d3c8cd400bba864d12966ae96609cc4ce6413d2
 SHA512 (ocserv.conf) = 5b68a3547c6c69bf7c2b322692d6382162a587c47edad97690223c36f30ed98d3869d1ce063c630740d91888a4d70aadd657ddc6052c10e6e26800fca2e9d0c0
 SHA512 (gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg) = 3b1989dc6a64d1140f83a2af0773da2adb03c50d97b6da7357cf09525050651aafa21131f1e3180baa540a8af922119a256f5ff5bcd6602996a806e8e1816bad
-SHA512 (ocserv-0.12.1.tar.xz.sig) = 0dd3123ffc525faa724de7a10f0a2202fc31ea667428e41c3ca68a3fffc29979d9bff16abde3adece8e921881704efc952d077e9bc161be4d69a124218ae5616
-SHA512 (ocserv-0.12.1.tar.xz) = 3fc5e6c6a3b4390cb0ffa78fac4f8e70aa689227c6f5b62180b95f35cf2de0c41075a157412de40866ce1af12ad8feabd87b2b986c8ca09ebee70514da9ec13f
+SHA512 (ocserv-0.12.2.tar.xz.sig) = 135eda011200679e7ae29fc66a09f940a88c056561c8491538089070327554c295533ad238a1b866f90a702b5465969817148495c96fa5b3ef8d1a10bf14ce6d
+SHA512 (ocserv-0.12.2.tar.xz) = 3ce6cf68ad9349d6d090f35c14712ce3ddb8f2fe6b33285e050e99ac4457ca1127b55d3cea739a4364072534c69cb094912b4631a14b87362bd31ccc1a550b3a