diff --git a/.gitignore b/.gitignore
index 2445ab2..cda2113 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/zookeeper-3.4.5.tar.gz
/zookeeper-3.4.6-601207e.tar.gz
+/zookeeper-3.4.9.tar.gz
diff --git a/missing-pom.template.patch b/missing-pom.template.patch
new file mode 100644
index 0000000..162e4b8
--- /dev/null
+++ b/missing-pom.template.patch
@@ -0,0 +1,47 @@
+diff --git a/src/pom.template b/src/pom.template
+new file mode 100644
+index 0000000..a02c0b3
+--- /dev/null
++++ b/src/pom.template
+@@ -0,0 +1,41 @@
++SKIP_LINE ***************************************************************
++SKIP_LINE * Licensed to the Apache Software Foundation (ASF) under one
++SKIP_LINE * or more contributor license agreements. See the NOTICE file
++SKIP_LINE * distributed with this work for additional information
++SKIP_LINE * regarding copyright ownership. The ASF licenses this file
++SKIP_LINE * to you under the Apache License, Version 2.0 (the
++SKIP_LINE * "License"); you may not use this file except in compliance
++SKIP_LINE * with the License. You may obtain a copy of the License at
++SKIP_LINE *
++SKIP_LINE * http://www.apache.org/licenses/LICENSE-2.0
++SKIP_LINE *
++SKIP_LINE * Unless required by applicable law or agreed to in writing,
++SKIP_LINE * software distributed under the License is distributed on an
++SKIP_LINE * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
++SKIP_LINE * KIND, either express or implied. See the License for the
++SKIP_LINE * specific language governing permissions and limitations
++SKIP_LINE * under the License.
++SKIP_LINE ***************************************************************
++
++${ivy.pom.license}
++${ivy.pom.header}
++
++
++ 4.0.0
++ ${ivy.pom.groupId}
++ ${ivy.pom.artifactId}
++ ${ivy.pom.packaging}
++ ${ivy.pom.version}
++ ${ivy.pom.name}
++ ${ivy.pom.description}
++ ${ivy.pom.url}
++
++
++
++ The Apache Software License, Version 2.0
++ http://www.apache.org/licenses/LICENSE-2.0.txt
++ repo
++
++
++
diff --git a/mt_adaptor.c.patch b/mt_adaptor.c.patch
index 6d7563f..c1f8ae4 100644
--- a/mt_adaptor.c.patch
+++ b/mt_adaptor.c.patch
@@ -1,8 +1,8 @@
-Index: src/c/src/mt_adaptor.c
-===================================================================
---- src/c/src/mt_adaptor.c (revision 1447974)
-+++ src/c/src/mt_adaptor.c (working copy)
-@@ -484,25 +484,9 @@
+diff --git a/src/c/src/mt_adaptor.c b/src/c/src/mt_adaptor.c
+index 7dc7878..1b18ac6 100644
+--- a/src/c/src/mt_adaptor.c
++++ b/src/c/src/mt_adaptor.c
+@@ -483,25 +483,9 @@ int32_t inc_ref_counter(zhandle_t* zh,int i)
int32_t fetch_and_add(volatile int32_t* operand, int incr)
{
#ifndef WIN32
diff --git a/sources b/sources
index 1ba06d7..dc39b1a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-623bfbaa0efbd2cc196fe06ea9f85566 zookeeper-3.4.6-601207e.tar.gz
+SHA512 (zookeeper-3.4.9.tar.gz) = 4f3e003c6ce5e3338f642f7deaa0fd2cfd1b30591d3ed4fe880492dded6c4bf01d30483e28f3a38b43bb6d2696ff4d819fc9577733224cec07e236437e88a657
diff --git a/zookeeper-3.4.5-disable-cygwin-detection.patch b/zookeeper-3.4.5-disable-cygwin-detection.patch
deleted file mode 100644
index f639907..0000000
--- a/zookeeper-3.4.5-disable-cygwin-detection.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- bin/zkServer.sh 2012-09-30 19:53:31.000000000 +0200
-+++ bin/zkServer.sh-gil 2013-04-27 11:27:59.972764863 +0200
-@@ -69,15 +69,6 @@
- ZOOCFG="$2"
- fi
-
--if $cygwin
--then
-- ZOOCFG=`cygpath -wp "$ZOOCFG"`
-- # cygwin has a "kill" in the shell itself, gets confused
-- KILL=/bin/kill
--else
-- KILL=kill
--fi
--
- echo "Using config: $ZOOCFG" >&2
-
- if [ -z $ZOOPIDFILE ]; then
-@@ -140,7 +131,7 @@
- then
- echo "no zookeeper to stop (could not find file $ZOOPIDFILE)"
- else
-- $KILL -9 $(cat "$ZOOPIDFILE")
-+ kill -9 $(cat "$ZOOPIDFILE")
- rm "$ZOOPIDFILE"
- echo STOPPED
- fi
diff --git a/zookeeper-3.4.5-zktreeutil-gcc.patch b/zookeeper-3.4.5-zktreeutil-gcc.patch
index 7cee0fb..5463c26 100644
--- a/zookeeper-3.4.5-zktreeutil-gcc.patch
+++ b/zookeeper-3.4.5-zktreeutil-gcc.patch
@@ -1,5 +1,5 @@
---- src/contrib/zktreeutil/src/ZkAdaptor.h 2012-09-30 19:53:32.000000000 +0200
-+++ src/contrib/zktreeutil/src/ZkAdaptor.h-gil 2013-04-04 03:37:46.731950855 +0200
+--- a/src/contrib/zktreeutil/src/ZkAdaptor.h 2012-09-30 19:53:32.000000000 +0200
++++ b/src/contrib/zktreeutil/src/ZkAdaptor.h 2013-04-04 03:37:46.731950855 +0200
@@ -21,6 +21,7 @@
#include
diff --git a/zookeeper-3.4.6-ivy-build.patch b/zookeeper-3.4.9-ivy-build.patch
similarity index 61%
rename from zookeeper-3.4.6-ivy-build.patch
rename to zookeeper-3.4.9-ivy-build.patch
index bc96443..f1e663b 100644
--- a/zookeeper-3.4.6-ivy-build.patch
+++ b/zookeeper-3.4.9-ivy-build.patch
@@ -1,5 +1,5 @@
diff --git a/build.xml b/build.xml
-index 442d52e..bc1f4a2 100644
+index 8562000..7975f13 100644
--- a/build.xml
+++ b/build.xml
@@ -257,7 +257,7 @@ xmlns:maven="antlib:org.apache.maven.artifact.ant">
@@ -25,7 +25,7 @@ index 442d52e..bc1f4a2 100644
diff --git a/ivy.xml b/ivy.xml
-index 561832a..93176d5 100644
+index 95b0e5a..0ea5c4d 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -46,10 +46,10 @@
@@ -37,18 +37,20 @@ index 561832a..93176d5 100644
+
+
--
+-
+
-@@ -58,12 +58,12 @@
+@@ -58,14 +58,14 @@
-
+
-
diff --git a/src/contrib/build-contrib.xml b/src/contrib/build-contrib.xml
-index 0e57d08..708f64f 100644
+index fab8a5f..80518a8 100644
--- a/src/contrib/build-contrib.xml
+++ b/src/contrib/build-contrib.xml
@@ -103,7 +103,7 @@
@@ -136,10 +138,10 @@ index 7f7ba4f..701dfea 100644
diff --git a/src/contrib/rest/build.xml b/src/contrib/rest/build.xml
deleted file mode 100644
-index 649dff7..0000000
+index fb628bc..0000000
--- a/src/contrib/rest/build.xml
+++ /dev/null
-@@ -1,167 +0,0 @@
+@@ -1,183 +0,0 @@
-
-
-
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ Tests failed!
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-diff --git a/src/contrib/rest/oldivy._xml b/src/contrib/rest/oldivy._xml
-new file mode 100644
-index 0000000..903d390
---- /dev/null
-+++ b/src/contrib/rest/oldivy._xml
-@@ -0,0 +1,48 @@
-+
-+
-+
-+
-+
-+
-+
-+ ZooKeeper REST
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
+diff --git a/src/contrib/loggraph/ivy.xml b/src/contrib/loggraph/ivy.xml
+index d6fa9d6..fdcc35f 100644
+--- a/src/contrib/loggraph/ivy.xml
++++ b/src/contrib/loggraph/ivy.xml
+@@ -35,7 +35,7 @@
+
+
+
+-
++
+
+
+
diff --git a/src/contrib/zooinspector/ivy.xml b/src/contrib/zooinspector/ivy.xml
-index 4e5107e..ac71a9b 100644
+index bc02946..cb4061f 100644
--- a/src/contrib/zooinspector/ivy.xml
+++ b/src/contrib/zooinspector/ivy.xml
-@@ -42,7 +42,7 @@
-
-
-+ rev="3.2.1" conf="releaseaudit->default"/>
-
-
--
-\ No newline at end of file
-+
+@@ -35,7 +35,7 @@
+
+
+
+-
++
+
+
diff --git a/zookeeper-3.4.6-server.patch b/zookeeper-3.4.9-server.patch
similarity index 85%
rename from zookeeper-3.4.6-server.patch
rename to zookeeper-3.4.9-server.patch
index d505ad3..c27977a 100644
--- a/zookeeper-3.4.6-server.patch
+++ b/zookeeper-3.4.9-server.patch
@@ -1,8 +1,8 @@
diff --git a/bin/zkServer.sh b/bin/zkServer.sh
-index 0490982..b4766e5 100755
+index 51dbe9f..bc9be90 100755
--- a/bin/zkServer.sh
+++ b/bin/zkServer.sh
-@@ -69,14 +69,7 @@ then
+@@ -92,14 +92,7 @@ then
ZOOCFG="$2"
fi
diff --git a/zookeeper.spec b/zookeeper.spec
index db6d2d5..8fcd163 100644
--- a/zookeeper.spec
+++ b/zookeeper.spec
@@ -1,25 +1,24 @@
-%global commit 601207e1151b2691112c431fc3b4130a85ac93b5
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global _hardened_build 1
%global skiptests 1
Name: zookeeper
-Version: 3.4.6
-Release: 17%{?dist}
+Version: 3.4.9
+Release: 1%{?dist}
Summary: A high-performance coordination service for distributed applications
License: ASL 2.0 and BSD
-URL: http://zookeeper.apache.org/
-Source0: https://github.com/apache/zookeeper/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
+URL: https://zookeeper.apache.org/
+Source0: https://www.apache.org/dist/%{name}/%{name}-%{version}.tar.gz
Source1: %{name}-ZooInspector-template.pom
Source2: %{name}.service
Source3: zkEnv.sh
Patch1: %{name}-3.4.5-zktreeutil-gcc.patch
-Patch2: %{name}-3.4.6-ivy-build.patch
-Patch3: %{name}-3.4.6-server.patch
-# patch accepted in 3.5.0
-Patch4: https://issues.apache.org/jira/secure/attachment/12570030/mt_adaptor.c.patch
+Patch2: %{name}-3.4.9-ivy-build.patch
+Patch3: %{name}-3.4.9-server.patch
+# ZOOKEEPER-1643; patch accepted in 3.5.0
+Patch4: mt_adaptor.c.patch
Patch5: 0001-cppunit-config-no-longer-exists-use-pkg-config.patch
+Patch6: missing-pom.template.patch
BuildRequires: autoconf
@@ -122,13 +121,7 @@ Requires: python2
The python-%{name} package contains Python bindings for %{name}.
%prep
-%setup -q -n %{name}-%{commit}
-
-%patch1 -p0
-%patch2 -p1
-%patch3 -p1
-%patch4 -p0 -F2
-%patch5 -p1
+%autosetup -p1
iconv -f iso8859-1 -t utf-8 src/c/ChangeLog > src/c/ChangeLog.conv && mv -f src/c/ChangeLog.conv src/c/ChangeLog
sed -i 's/\r//' src/c/ChangeLog
@@ -309,6 +302,9 @@ getent passwd zookeeper >/dev/null || \
%doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README
%changelog
+* Thu Dec 22 2016 Christopher Tubbs - 3.4.9-1
+- Update to 3.4.9; CVE-2016-5017 (bz#1377281)
+
* Tue Jul 19 2016 Fedora Release Engineering - 3.4.6-17
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages