From cf4f0b2340a8cfbb3ee588b352845b9ab9883f59 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Fri, 11 Aug 2017 08:28:21 +0100
Subject: [PATCH] update to 1.9.7 (CVE-2017-9800, #1480402) add Documentation=
 to svnserve.service Resolves: rhbz#1480335 Resolves: rhbz#1480402

---
 sources          |  2 +-
 subversion.spec  | 12 ++++++++----
 svnserve.service |  1 +
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/sources b/sources
index 1a231e4..e976f49 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (subversion-1.9.6.tar.bz2) = bdca362ff45a7f028e2123efbc9bfd41a07e6ebdfcf62627ce24f413e0304b45011bbac1f142ceb1c031a07622c06786982f86cd9109065cae5e26fd689fc11e
+SHA512 (subversion-1.9.7.tar.bz2) = a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b
diff --git a/subversion.spec b/subversion.spec
index a53bd05..cfaf96a 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -24,13 +24,13 @@
 
 Summary: A Modern Concurrent Version Control System
 Name: subversion
-Version: 1.9.6
-Release: 4%{?dist}
+Version: 1.9.7
+Release: 1%{?dist}
 License: ASL 2.0
 Group: Development/Tools
-URL: http://subversion.apache.org/
+URL: https://subversion.apache.org/
 
-Source0: http://www.apache.org/dist/subversion/subversion-%{version}.tar.bz2
+Source0: https://www.apache.org/dist/subversion/subversion-%{version}.tar.bz2
 Source1: subversion.conf
 Source3: filter-requires.sh
 Source4: http://www.xsteve.at/prg/emacs/psvn.el
@@ -471,6 +471,10 @@ make check-javahl
 %endif
 
 %changelog
+* Fri Aug 11 2017 Joe Orton <jorton@redhat.com> - 1.9.7-1
+- update to 1.9.7 (CVE-2017-9800, #1480402)
+- add Documentation= to svnserve.service
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
diff --git a/svnserve.service b/svnserve.service
index afb275f..6fbbe1e 100644
--- a/svnserve.service
+++ b/svnserve.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Subversion protocol daemon
 After=syslog.target network.target
+Documentation=man:svnserve(8)
 
 [Service]
 Type=forking