From 18b1f95fe44cdf8a992a98b0f2b0399c24b4283b Mon Sep 17 00:00:00 2001
From: Jon Ciesla <limburgher@gmail.com>
Date: Dec 02 2014 20:34:29 +0000
Subject: Merge branch 'f21' into f20


Conflicts:
	openvpn.spec
	sources

---

diff --git a/.gitignore b/.gitignore
index dcbf788..d8e1fed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,7 @@ openvpn-2.1.2.tar.gz.asc
 /openvpn-2.3.3.tar.gz.asc
 /openvpn-2.3.4.tar.gz
 /openvpn-2.3.4.tar.gz.asc
+/openvpn-2.3.5.tar.gz
+/openvpn-2.3.5.tar.gz.asc
+/openvpn-2.3.6.tar.gz
+/openvpn-2.3.6.tar.gz.asc
diff --git a/openvpn.spec b/openvpn.spec
index 3ca3eb5..44457e0 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -4,8 +4,8 @@
 %define plugins down-root auth-pam
 
 Name:              openvpn
-Version:           2.3.2
-Release:           6%{?prerelease:.%{prerelease}}%{?dist}
+Version:           2.3.6
+Release:           1%{?prerelease:.%{prerelease}}%{?dist}
 Summary:           A full-featured SSL VPN solution
 URL:               http://openvpn.net/
 #Source0:           http://openvpn.net/beta/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz
@@ -28,6 +28,7 @@ Source5:           %{name}-tmpfile.conf
 #Patch3:            openvpn-2.1.1-initinfo.patch
 License:           GPLv2
 Group:             Applications/Internet
+BuildRequires:     systemd-devel
 BuildRequires:     lzo-devel
 BuildRequires:     openssl-devel
 BuildRequires:     pam-devel
@@ -87,7 +88,8 @@ find contrib sample -type f -perm /100 \
     --enable-plugin-auth-pam \
     --enable-pkcs11 \
     --enable-x509-alt-username \
-    --enable-systemd
+    --enable-systemd \
+    --docdir=%{_pkgdocdir}
 %{__make}
 
 ## Build plugins
@@ -148,6 +150,10 @@ cp %{SOURCE2} %{SOURCE3} sample/sample-config-files/
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' | xargs rm -f
 
+# Package installs into %%{_pkgdocdir} directly
+# Add further files
+cp -a AUTHORS PORTS INSTALL contrib sample $RPM_BUILD_ROOT%{_pkgdocdir}
+
 # tmpfiles.d
 mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d
 install -m 0644 %{SOURCE5} %{buildroot}%{_prefix}/lib/tmpfiles.d/%{name}.conf
@@ -189,9 +195,11 @@ fi
 
 
 %files
-%doc AUTHORS COPYING COPYRIGHT.GPL INSTALL PORTS README
-# Add NEWS when it isn't zero-length.
-%doc src/plugins/*/README.*
+%{_pkgdocdir}
+%exclude %{_pkgdocdir}/README.IPv6
+%exclude %{_pkgdocdir}/README.polarssl
+%exclude %{_pkgdocdir}/management-notes.txt
+
 %doc contrib sample
 %{_mandir}/man8/%{name}.8*
 %{_sbindir}/%{name}
@@ -202,10 +210,18 @@ fi
 %attr(0710,root,openvpn) %dir %{_localstatedir}/run/%{name}/
 %{_prefix}/lib/tmpfiles.d/%{name}.conf
 %config %dir %{_sysconfdir}/%{name}/
-%exclude %{_datadir}/doc/%{name}/
 
 %changelog
-* Tue Aug 26 2014 Jan Vcelak <jvcelak@fedoraproject.org> 2.3.2-6
+* Mon Dec 01 2014 Jon Ciesla <limburgher@gmail.com> 2.3.6-1
+- 2.3.6, CVE-2014-8104.
+
+* Fri Nov 21 2014 Ralf Corsépius <corsepiu@fedoraproject.org> - 2.3.5-2
+- Rework package doc handling (RHBZ #1165004).
+
+* Tue Oct 28 2014 Jon Ciesla <limburgher@gmail.com> 2.3.5-1
+- 2.3.5.
+
+* Tue Aug 26 2014 Jan Vcelak <jvcelak@fedoraproject.org> 2.3.4-4
 - Enable systemd support.
 
 * Sun Jan 19 2014 Ville Skyttä <ville.skytta@iki.fi> - 2.3.2-5
diff --git a/sources b/sources
index c3a015a..39ad56b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-06e5f93dbf13f2c19647ca15ffc23ac1  openvpn-2.3.2.tar.gz
-7203a3f37b9a4351411429c96a3b089b  openvpn-2.3.2.tar.gz.asc
+6ca03fe0fd093e0d01601abee808835c  openvpn-2.3.6.tar.gz
+38859fe574229111ed484781e0ea8dce  openvpn-2.3.6.tar.gz.asc
+