From 26a4b6858742a06e7b03d0fc6872850e22643ab9 Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Tue, 26 Apr 2016 09:47:18 +0200
Subject: [PATCH] updated to 0.11.2 and added auto sig verification

---
 .gitignore  |  3 +++
 ocserv.spec | 39 ++++++++++++++++++++++-----------------
 sources     |  5 +++--
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index b0317c8..de309fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,6 @@
 /ocserv-0.11.0.tar.xz.sig
 /ocserv-0.11.1.tar.xz.sig
 /ocserv-0.11.1.tar.xz
+/gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg
+/ocserv-0.11.2.tar.xz
+/ocserv-0.11.2.tar.xz.sig
diff --git a/ocserv.spec b/ocserv.spec
index b4120ae..917af4e 100644
--- a/ocserv.spec
+++ b/ocserv.spec
@@ -1,7 +1,7 @@
 %global _hardened_build 1
 
 Name:		ocserv
-Version:	0.11.1
+Version:	0.11.2
 Release:	1%{?dist}
 Summary:	OpenConnect SSL VPN server
 
@@ -10,13 +10,14 @@ Summary:	OpenConnect SSL VPN server
 License:	GPLv2+ and BSD and MIT and CC0
 URL:		http://www.infradead.org/ocserv/
 Source0:	ftp://ftp.infradead.org/pub/ocserv/%{name}-%{version}.tar.xz
-Source1:	ocserv.conf
-Source2:	ocserv.service
-Source3:	ocserv-pamd.conf
-Source4:	PACKAGE-LICENSING
-Source6:	ftp://ftp.infradead.org/pub/ocserv/%{name}-%{version}.tar.xz.sig
-Source7:	ocserv-genkey
-Source8:	ocserv-script
+Source1:	ftp://ftp.infradead.org/pub/ocserv/%{name}-%{version}.tar.xz.sig
+Source2:	gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg
+Source3:	ocserv.conf
+Source4:	ocserv.service
+Source5:	ocserv-pamd.conf
+Source6:	PACKAGE-LICENSING
+Source8:	ocserv-genkey
+Source9:	ocserv-script
 
 # Taken from upstream:
 # http://git.infradead.org/ocserv.git/commitdiff/7d70006a2dbddf783213f1856374bacc74217e09
@@ -47,9 +48,8 @@ BuildRequires:	tcp_wrappers-devel
 BuildRequires:	automake, autoconf
 BuildRequires:	radcli-devel
 BuildRequires:	lz4-devel
-
-# we don't build with dbus support
-#BuildRequires:	dbus-devel
+BuildRequires:	uid_wrapper
+BuildRequires:	socket_wrapper
 
 Requires:		gnutls-utils
 Requires:		iproute
@@ -74,6 +74,7 @@ uses the standard IETF security protocols such as TLS 1.2, and Datagram TLS
 to provide the secure VPN service. 
 
 %prep
+gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 %setup -q
 
 rm -f src/http-parser/http_parser.c src/http-parser/http_parser.h
@@ -118,19 +119,19 @@ make check %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-cp -a %{SOURCE4} PACKAGE-LICENSING
+cp -a %{SOURCE6} PACKAGE-LICENSING
 mkdir -p %{buildroot}/%{_sysconfdir}/pam.d/
 mkdir -p %{buildroot}/%{_sysconfdir}/ocserv/
-install -p -m 644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/pam.d/ocserv
-install -p -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/ocserv/
+install -p -m 644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/pam.d/ocserv
+install -p -m 644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/ocserv/
 mkdir -p %{buildroot}/%{_unitdir}
-install -p -m 644 %{SOURCE2} %{buildroot}/%{_unitdir}
+install -p -m 644 %{SOURCE4} %{buildroot}/%{_unitdir}
 mkdir -p %{buildroot}%{_localstatedir}/lib/ocserv/
 install -p -m 644 doc/profile.xml %{buildroot}%{_localstatedir}/lib/ocserv/
 mkdir -p %{buildroot}/%{_sbindir}
-install -p -m 755 %{SOURCE7} %{buildroot}/%{_sbindir}
+install -p -m 755 %{SOURCE8} %{buildroot}/%{_sbindir}
 mkdir -p %{buildroot}/%{_bindir}
-install -p -m 755 %{SOURCE8} %{buildroot}/%{_bindir}
+install -p -m 755 %{SOURCE9} %{buildroot}/%{_bindir}
 %make_install
 
 %clean
@@ -160,6 +161,10 @@ rm -rf %{buildroot}
 %{_localstatedir}/lib/ocserv/profile.xml
 
 %changelog
+* Mon Mar 21 2016 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.11.2-1
+- New upstream release
+- Added automatic verification of signature during build
+
 * Mon Mar 21 2016 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.11.1-1
 - new upstream release
 
diff --git a/sources b/sources
index 3e9f901..bff4cce 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-12ef887f9796735083207e255c94f40c  ocserv-0.11.1.tar.xz.sig
-a581b8669f5d16639773ef81f25a1317  ocserv-0.11.1.tar.xz
+310168e221d6e810022b270e32bf9662  gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg
+6731f4d9a85ff0476ae37fa7a4d57ee2  ocserv-0.11.2.tar.xz
+4e8b8291fee4b3da8c6f43b08819dd1f  ocserv-0.11.2.tar.xz.sig