From a6425598dcc825a47ad8cd0e2f236ef93d78d3d5 Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Thu, 28 Aug 2014 11:14:20 +0200
Subject: [PATCH] updated to 0.8.4 and removed unused file

---
 .gitignore                |  2 ++
 ocserv.spec               | 10 +++++-----
 org.infradead.ocserv.conf | 14 --------------
 sources                   |  4 ++--
 4 files changed, 9 insertions(+), 21 deletions(-)
 delete mode 100644 org.infradead.ocserv.conf

diff --git a/.gitignore b/.gitignore
index 3d40924..c4b2660 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@
 /ocserv-0.8.1.tar.xz.sig
 /ocserv-0.8.2.tar.xz
 /ocserv-0.8.2.tar.xz.sig
+/ocserv-0.8.4.tar.xz
+/ocserv-0.8.4.tar.xz.sig
diff --git a/ocserv.spec b/ocserv.spec
index e4f34a4..50e23d4 100644
--- a/ocserv.spec
+++ b/ocserv.spec
@@ -1,6 +1,6 @@
 Name:		ocserv
-Version:	0.8.2
-Release:	4%{?dist}
+Version:	0.8.4
+Release:	1%{?dist}
 Summary:	OpenConnect SSL VPN server
 
 # For a breakdown of the licensing, see PACKAGE-LICENSING 
@@ -12,7 +12,6 @@ Source1:	ocserv.conf
 Source2:	ocserv.service
 Source3:	ocserv-pamd.conf
 Source4:	PACKAGE-LICENSING
-Source5:	org.infradead.ocserv.conf
 Source6:	ftp://ftp.infradead.org/pub/ocserv/%{name}-%{version}.tar.xz.sig
 Source7:	ocserv-genkey
 
@@ -106,8 +105,6 @@ 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/
-mkdir -p %{buildroot}/%{_sysconfdir}/dbus-1/system.d/
-install -p -m 644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/dbus-1/system.d/
 mkdir -p %{buildroot}/%{_unitdir}
 install -p -m 644 %{SOURCE2} %{buildroot}/%{_unitdir}
 mkdir -p %{buildroot}%{_localstatedir}/lib/ocserv/
@@ -142,6 +139,9 @@ rm -rf %{buildroot}
 %{_localstatedir}/lib/ocserv/profile.xml
 
 %changelog
+* Thu Aug 28 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.8.4-1
+- New upstream release
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/org.infradead.ocserv.conf b/org.infradead.ocserv.conf
deleted file mode 100644
index 8c69f93..0000000
--- a/org.infradead.ocserv.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-	<policy user="root">
-		<allow own="org.infradead.ocserv"/>
-		<allow send_destination="org.infradead.ocserv"/>
-	</policy>
-	<policy context="default">
-		<deny own="org.infradead.ocserv"/>
-		<deny send_destination="org.infradead.ocserv"/>
-	</policy>
-</busconfig>
-
diff --git a/sources b/sources
index e9ded37..a00d33a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-fd890e121445dfe8bb514da67c91c675  ocserv-0.8.2.tar.xz
-d7fb256c6b4c9837ffc16c9844ded77f  ocserv-0.8.2.tar.xz.sig
+3eb452fddebda887eaa5f6412dab634c  ocserv-0.8.4.tar.xz
+bd84f29bc6fb278c37275d1eca420145  ocserv-0.8.4.tar.xz.sig