From a8baeb60cbf6932aa2598cc5846233d31178a48a Mon Sep 17 00:00:00 2001 From: gil Date: Mon, 22 Jul 2013 17:56:10 +0200 Subject: [PATCH 01/73] removed not needed %%defattr (only required for rpm < 4.4) --- zookeeper.spec | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/zookeeper.spec b/zookeeper.spec index d38cdfd..9742ae0 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -1,9 +1,9 @@ %global _hardened_build 1 Name: zookeeper Version: 3.4.5 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A high-performance coordination service for distributed applications -Group: Development/Libraries +#Group: Development/Libraries License: ASL 2.0 and BSD URL: http://zookeeper.apache.org/ Source0: http://www.apache.org/dist/%{name}/stable/%{name}-%{version}.tar.gz @@ -67,14 +67,14 @@ naming, providing distributed synchronization, and providing group services. %package lib Summary: Zookeeper C client library -Group: System Environment/Libraries +#Group: System Environment/Libraries %description lib ZooKeeper C client library for communicating with ZooKeeper Server. %package lib-devel Summary: Development files for the %{name} library -Group: Development/Libraries +#Group: Development/Libraries Requires: %{name}-lib%{?_isa} = %{version}-%{release} %description lib-devel @@ -82,14 +82,14 @@ Development files for the ZooKeeper C client library. %package lib-doc Summary: Documentation for the %{name} library -Group: Documentation +#Group: Documentation BuildArch: noarch %description lib-doc Documentation for the ZooKeeper C client library. %package java -Group: Development/Libraries +#Group: Development/Libraries Summary: Zookeeper Java client library # Requires: felix-framework # Requires: felix-osgi-compendium @@ -110,7 +110,7 @@ BuildArch: noarch This package provides a Java client interface to Zookeeper server. %package javadoc -Group: Documentation +#Group: Documentation Summary: Javadoc for %{name} BuildArch: noarch @@ -118,7 +118,7 @@ BuildArch: noarch This package contains javadoc for %{name}. %package -n python-ZooKeeper -Group: Development/Libraries +#Group: Development/Libraries Summary: ZooKeeper python binding library Requires: %{name}-lib%{?_isa} = %{version}-%{release} Provides: zkpython%{?_isa} = %{version}-%{release} @@ -127,7 +127,7 @@ Provides: zkpython%{?_isa} = %{version}-%{release} ZooKeeper python binding library %package server -Group: System Environment/Daemons +#Group: System Environment/Daemons Summary: ZooKeeper server Requires: %{name}-java = %{version}-%{release} Requires(post): systemd @@ -313,7 +313,6 @@ getent passwd zookeeper >/dev/null || \ %systemd_postun_with_restart zookeeper.service %files -%defattr(-,root,root,-) %{_bindir}/cli_mt %{_bindir}/cli_st %{_bindir}/load_gen @@ -321,23 +320,20 @@ getent passwd zookeeper >/dev/null || \ %doc src/c/ChangeLog src/c/LICENSE src/c/NOTICE.txt src/c/README src/contrib/zktreeutil/README.txt %files lib -%defattr(-,root,root,-) %{_libdir}/lib*.so.* %doc src/c/LICENSE src/c/NOTICE.txt %files lib-devel -%defattr(-,root,root,-) %dir %{_includedir}/%{name} %{_includedir}/%{name}/*.h %{_libdir}/*.so %doc src/c/LICENSE src/c/NOTICE.txt %files lib-doc -%defattr(-,root,root,-) %doc src/c/LICENSE src/c/NOTICE.txt src/c/docs/html/* %files java -%defattr(-,root,root,-) +%dir %{_javadir}/%{name} %{_javadir}/%{name}/%{name}.jar %{_javadir}/%{name}/%{name}-test.jar %{_javadir}/%{name}/%{name}-ZooInspector.jar @@ -348,18 +344,15 @@ getent passwd zookeeper >/dev/null || \ %doc CHANGES.txt LICENSE.txt NOTICE.txt README.txt %files javadoc -%defattr(-,root,root,-) %{_javadocdir}/%{name} %doc LICENSE.txt NOTICE.txt %files -n python-ZooKeeper -%defattr(-,root,root,-) %{python_sitearch}/ZooKeeper-?.?-py%{python_version}.egg-info %{python_sitearch}/zookeeper.so %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %files server -%defattr(-,root,root,-) %dir %{_sysconfdir}/zookeeper %ghost %config(noreplace) %{_sysconfdir}/zookeeper/zoo.cfg %{_sysconfdir}/zookeeper/zoo_sample.cfg @@ -373,6 +366,11 @@ getent passwd zookeeper >/dev/null || \ %{_unitdir}/zookeeper.service %changelog +* Mon Jul 22 2013 gil cattaneo 3.4.5-9 +- removed not needed %%defattr (only required for rpm < 4.4) +- removed not needed Group fields (new package guideline) +- fix directory ownership in java sub package + * Tue Jun 15 2013 Timothy St. Clair - 3.4.5-8 - cleanup file ownership properties. From 7a8d2ee517976bb20f5e7a2d7cb086d04c5cbd3d Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Mon, 22 Jul 2013 11:02:38 -0500 Subject: [PATCH 02/73] revert old sematic and update permissions --- zookeeper.spec | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/zookeeper.spec b/zookeeper.spec index d38cdfd..6a0e737 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -1,7 +1,7 @@ %global _hardened_build 1 Name: zookeeper Version: 3.4.5 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A high-performance coordination service for distributed applications Group: Development/Libraries License: ASL 2.0 and BSD @@ -312,8 +312,7 @@ getent passwd zookeeper >/dev/null || \ %postun server %systemd_postun_with_restart zookeeper.service -%files -%defattr(-,root,root,-) +%files %{_bindir}/cli_mt %{_bindir}/cli_st %{_bindir}/load_gen @@ -321,23 +320,19 @@ getent passwd zookeeper >/dev/null || \ %doc src/c/ChangeLog src/c/LICENSE src/c/NOTICE.txt src/c/README src/contrib/zktreeutil/README.txt %files lib -%defattr(-,root,root,-) %{_libdir}/lib*.so.* %doc src/c/LICENSE src/c/NOTICE.txt %files lib-devel -%defattr(-,root,root,-) %dir %{_includedir}/%{name} %{_includedir}/%{name}/*.h %{_libdir}/*.so %doc src/c/LICENSE src/c/NOTICE.txt %files lib-doc -%defattr(-,root,root,-) %doc src/c/LICENSE src/c/NOTICE.txt src/c/docs/html/* %files java -%defattr(-,root,root,-) %{_javadir}/%{name}/%{name}.jar %{_javadir}/%{name}/%{name}-test.jar %{_javadir}/%{name}/%{name}-ZooInspector.jar @@ -348,32 +343,32 @@ getent passwd zookeeper >/dev/null || \ %doc CHANGES.txt LICENSE.txt NOTICE.txt README.txt %files javadoc -%defattr(-,root,root,-) %{_javadocdir}/%{name} %doc LICENSE.txt NOTICE.txt %files -n python-ZooKeeper -%defattr(-,root,root,-) %{python_sitearch}/ZooKeeper-?.?-py%{python_version}.egg-info %{python_sitearch}/zookeeper.so %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %files server -%defattr(-,root,root,-) -%dir %{_sysconfdir}/zookeeper -%ghost %config(noreplace) %{_sysconfdir}/zookeeper/zoo.cfg -%{_sysconfdir}/zookeeper/zoo_sample.cfg -%config(noreplace) %{_sysconfdir}/zookeeper/log4j.properties +%attr(0755,root,root) %dir %{_sysconfdir}/zookeeper +%attr(0644,root,root) %ghost %config(noreplace) %{_sysconfdir}/zookeeper/zoo.cfg +%attr(0644,root,root) %{_sysconfdir}/zookeeper/zoo_sample.cfg +%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/zookeeper/log4j.properties %attr(0750,zookeeper,zookeeper) %dir %{_localstatedir}/log/zookeeper -%attr(0750,zookeeper,zookeeper) %dir %{_sharedstatedir}/zookeeper +%attr(0755,root,root) %dir %{_sharedstatedir}/zookeeper %attr(0750,zookeeper,zookeeper) %dir %{_sharedstatedir}/zookeeper/data %attr(0640,zookeeper,zookeeper) %ghost %{_sharedstatedir}/zookeeper/data/myid %attr(0750,zookeeper,zookeeper) %dir %{_sharedstatedir}/zookeeper/log %{_unitdir}/zookeeper.service %changelog -* Tue Jun 15 2013 Timothy St. Clair - 3.4.5-8 +* Mon Jun 22 2013 Timothy St. Clair - 3.4.5-9 +- revert old sematics %defattr and update permissions + +* Mon Jun 22 2013 Timothy St. Clair - 3.4.5-8 - cleanup file ownership properties. * Tue Jun 15 2013 Jeffrey C. Ollie - 3.4.5-7 From f16f8e2dc36c88e89a099c9fade8f6f908ace6b5 Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Mon, 22 Jul 2013 11:10:02 -0500 Subject: [PATCH 03/73] Set file permissions on -server package to be in line with system defaults --- zookeeper.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/zookeeper.spec b/zookeeper.spec index 9742ae0..0a2e798 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -1,7 +1,7 @@ %global _hardened_build 1 Name: zookeeper Version: 3.4.5 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A high-performance coordination service for distributed applications #Group: Development/Libraries License: ASL 2.0 and BSD @@ -353,19 +353,22 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %files server -%dir %{_sysconfdir}/zookeeper -%ghost %config(noreplace) %{_sysconfdir}/zookeeper/zoo.cfg -%{_sysconfdir}/zookeeper/zoo_sample.cfg -%config(noreplace) %{_sysconfdir}/zookeeper/log4j.properties +%attr(0755,root,root) %dir %{_sysconfdir}/zookeeper +%attr(0644,root,root) %ghost %config(noreplace) %{_sysconfdir}/zookeeper/zoo.cfg +%attr(0644,root,root) %{_sysconfdir}/zookeeper/zoo_sample.cfg +%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/zookeeper/log4j.properties %attr(0750,zookeeper,zookeeper) %dir %{_localstatedir}/log/zookeeper -%attr(0750,zookeeper,zookeeper) %dir %{_sharedstatedir}/zookeeper +%attr(0755,root,root) %dir %{_sharedstatedir}/zookeeper %attr(0750,zookeeper,zookeeper) %dir %{_sharedstatedir}/zookeeper/data %attr(0640,zookeeper,zookeeper) %ghost %{_sharedstatedir}/zookeeper/data/myid %attr(0750,zookeeper,zookeeper) %dir %{_sharedstatedir}/zookeeper/log %{_unitdir}/zookeeper.service %changelog +* Mon Jun 22 2013 Timothy St. Clair - 3.4.5-10 +- update permissions to be in line with default policies + * Mon Jul 22 2013 gil cattaneo 3.4.5-9 - removed not needed %%defattr (only required for rpm < 4.4) - removed not needed Group fields (new package guideline) From e850618c0e788ad5faeaf1f091826d2528f54a0d Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Mon, 22 Jul 2013 11:17:17 -0500 Subject: [PATCH 04/73] Update directory for java packaging --- zookeeper.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/zookeeper.spec b/zookeeper.spec index 6a0e737..089bb39 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -333,6 +333,7 @@ getent passwd zookeeper >/dev/null || \ %doc src/c/LICENSE src/c/NOTICE.txt src/c/docs/html/* %files java +%dir %{_javadir}/%{name} %{_javadir}/%{name}/%{name}.jar %{_javadir}/%{name}/%{name}-test.jar %{_javadir}/%{name}/%{name}-ZooInspector.jar From 44ec557dc271df1acfa05dddaae87f45b69d1e27 Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Mon, 22 Jul 2013 11:20:20 -0500 Subject: [PATCH 05/73] Remove macro from spec --- zookeeper.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index 089bb39..0ed3b80 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -367,7 +367,7 @@ getent passwd zookeeper >/dev/null || \ %changelog * Mon Jun 22 2013 Timothy St. Clair - 3.4.5-9 -- revert old sematics %defattr and update permissions +- revert old sematics defattr and update permissions * Mon Jun 22 2013 Timothy St. Clair - 3.4.5-8 - cleanup file ownership properties. From 680f89ec68f1fb200a49428f6dd71c546e4fb643 Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Mon, 22 Jul 2013 11:23:28 -0500 Subject: [PATCH 06/73] rpmlint cleaning --- zookeeper.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zookeeper.spec b/zookeeper.spec index 0a2e798..20a852c 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -366,7 +366,7 @@ getent passwd zookeeper >/dev/null || \ %{_unitdir}/zookeeper.service %changelog -* Mon Jun 22 2013 Timothy St. Clair - 3.4.5-10 +* Mon Jul 22 2013 Timothy St. Clair - 3.4.5-10 - update permissions to be in line with default policies * Mon Jul 22 2013 gil cattaneo 3.4.5-9 @@ -374,7 +374,7 @@ getent passwd zookeeper >/dev/null || \ - removed not needed Group fields (new package guideline) - fix directory ownership in java sub package -* Tue Jun 15 2013 Timothy St. Clair - 3.4.5-8 +* Mon Jul 22 2013 Timothy St. Clair - 3.4.5-8 - cleanup file ownership properties. * Tue Jun 15 2013 Jeffrey C. Ollie - 3.4.5-7 From 1a8f6bf02b1238f0025c514980575db402470565 Mon Sep 17 00:00:00 2001 From: gil Date: Tue, 30 Jul 2013 03:16:59 +0200 Subject: [PATCH 07/73] rebuild for boost 1.54.0 --- zookeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index 20a852c..05ce3ac 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -1,7 +1,7 @@ %global _hardened_build 1 Name: zookeeper Version: 3.4.5 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A high-performance coordination service for distributed applications #Group: Development/Libraries License: ASL 2.0 and BSD @@ -366,6 +366,9 @@ getent passwd zookeeper >/dev/null || \ %{_unitdir}/zookeeper.service %changelog +* Tue Jul 30 2013 gil cattaneo 3.4.5-11 +- Rebuild for boost 1.54.0 + * Mon Jul 22 2013 Timothy St. Clair - 3.4.5-10 - update permissions to be in line with default policies From abf296de9228c60fb471c2b30f0419a359619884 Mon Sep 17 00:00:00 2001 From: gil Date: Tue, 30 Jul 2013 03:35:06 +0200 Subject: [PATCH 08/73] fix changelog entries --- zookeeper.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zookeeper.spec b/zookeeper.spec index 05ce3ac..4216685 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -367,7 +367,7 @@ getent passwd zookeeper >/dev/null || \ %changelog * Tue Jul 30 2013 gil cattaneo 3.4.5-11 -- Rebuild for boost 1.54.0 +- fix changelog entries * Mon Jul 22 2013 Timothy St. Clair - 3.4.5-10 - update permissions to be in line with default policies @@ -380,7 +380,7 @@ getent passwd zookeeper >/dev/null || \ * Mon Jul 22 2013 Timothy St. Clair - 3.4.5-8 - cleanup file ownership properties. -* Tue Jun 15 2013 Jeffrey C. Ollie - 3.4.5-7 +* Sat Jun 15 2013 Jeffrey C. Ollie - 3.4.5-7 - add server subpackage * Fri Jun 14 2013 Dan Horák - 3.4.5-6 From 0c2f9b8aa43b4f1ec37204897d7bf7e4f42f754d Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 30 Jul 2013 15:00:51 +0200 Subject: [PATCH 09/73] Rebuild for boost 1.54.0 --- zookeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index 4216685..be67a14 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -1,7 +1,7 @@ %global _hardened_build 1 Name: zookeeper Version: 3.4.5 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A high-performance coordination service for distributed applications #Group: Development/Libraries License: ASL 2.0 and BSD @@ -366,6 +366,9 @@ getent passwd zookeeper >/dev/null || \ %{_unitdir}/zookeeper.service %changelog +* Tue Jul 30 2013 Petr Machata - 3.4.5-12 +- Rebuild for boost 1.54.0 + * Tue Jul 30 2013 gil cattaneo 3.4.5-11 - fix changelog entries From f9e1ace94b75c46a9dbeca9ff72813150e122f8e Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Thu, 15 Aug 2013 14:40:39 -0500 Subject: [PATCH 10/73] Fixed the atomic patch which actually caused recursive crashing on zookeeper_close. Patch taken from upstream as can be seen in spec. --- mt_adaptor.c.patch | 32 ++++++++++++++++++++++++++++++++ zookeeper.spec | 6 ++++-- 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 mt_adaptor.c.patch diff --git a/mt_adaptor.c.patch b/mt_adaptor.c.patch new file mode 100644 index 0000000..4b230d2 --- /dev/null +++ b/mt_adaptor.c.patch @@ -0,0 +1,32 @@ +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 @@ + int32_t fetch_and_add(volatile int32_t* operand, int incr) + { + #ifndef WIN32 +- int32_t result; +- asm __volatile__( +- "lock xaddl %0,%1\n" +- : "=r"(result), "=m"(*(int *)operand) +- : "0"(incr) +- : "memory"); +- return result; ++ return __sync_fetch_and_add(operand, incr); + #else +- volatile int32_t result; +- _asm +- { +- mov eax, operand; //eax = v; +- mov ebx, incr; // ebx = i; +- mov ecx, 0x0; // ecx = 0; +- lock xadd dword ptr [eax], ecx; +- lock xadd dword ptr [eax], ebx; +- mov result, ecx; // result = ebx; +- } +- return result; ++ return InterlockedExchangeAdd(operand, incr); + #endif + } + diff --git a/zookeeper.spec b/zookeeper.spec index be67a14..ee79368 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -20,9 +20,10 @@ Patch2: %{name}-3.4.5-zktreeutil-gcc.patch Patch3: %{name}-3.4.5-disable-cygwin-detection.patch Patch4: %{name}-3.4.5-build-contrib.patch Patch5: %{name}-3.4.5-add-PIE-and-RELRO.patch -Patch6: %{name}-3.4.5-atomic.patch +#Patch6: %{name}-3.4.5-atomic.patch # remove date/time from console output since journald will keep track of date/time Patch7: %{name}-3.4.5-log4j.patch +Patch8: https://issues.apache.org/jira/secure/attachment/12570030/mt_adaptor.c.patch BuildRequires: autoconf BuildRequires: automake @@ -162,8 +163,9 @@ find -name "*.dll" -delete %patch3 -p0 %patch4 -p1 %patch5 -p1 -%patch6 -p1 +#%patch6 -p1 %patch7 -p1 +%patch8 -p0 sed -i "s|pom|jar|" dist-maven/%{name}-%{version}.pom sed -i "s|checkstyle|com.puppycrawl.tools|" dist-maven/%{name}-%{version}.pom From a7f6eeea801d6074871c18cdebdac1bebb14b8fb Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Wed, 18 Sep 2013 15:01:20 -0500 Subject: [PATCH 11/73] Update build rev to -13 and rebuild with upstream fix --- zookeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index ee79368..e9073ae 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -1,7 +1,7 @@ %global _hardened_build 1 Name: zookeeper Version: 3.4.5 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A high-performance coordination service for distributed applications #Group: Development/Libraries License: ASL 2.0 and BSD @@ -368,6 +368,9 @@ getent passwd zookeeper >/dev/null || \ %{_unitdir}/zookeeper.service %changelog +* Wed Sep 18 2013 Timothy St. Clair - 3.4.5-13 +- Fixed the atomic patch which actually caused recursive crashing on zookeeper_close + * Tue Jul 30 2013 Petr Machata - 3.4.5-12 - Rebuild for boost 1.54.0 From 5ce074d46e367b16edaa579b0083b9229ea2ddcb Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Fri, 25 Oct 2013 09:24:19 -0500 Subject: [PATCH 12/73] Update to jline1 --- zookeeper.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index e9073ae..0a2d901 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -44,7 +44,7 @@ BuildRequires: ant BuildRequires: ant-junit BuildRequires: apache-ivy BuildRequires: checkstyle -BuildRequires: jline +BuildRequires: jline1 BuildRequires: jtoaster BuildRequires: junit BuildRequires: log4j From fd7e1f3b4d403f22c8d76ee1b156060dcc985c43 Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Fri, 25 Oct 2013 09:46:46 -0500 Subject: [PATCH 13/73] Update spec for jline1 dependency changes --- zookeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index 0a2d901..2245f7c 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -1,7 +1,7 @@ %global _hardened_build 1 Name: zookeeper Version: 3.4.5 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A high-performance coordination service for distributed applications #Group: Development/Libraries License: ASL 2.0 and BSD @@ -368,6 +368,9 @@ getent passwd zookeeper >/dev/null || \ %{_unitdir}/zookeeper.service %changelog +* Thu Oct 25 2013 Timothy St. Clair - 3.4.5-14 +- Update dependencies to jline1 + * Wed Sep 18 2013 Timothy St. Clair - 3.4.5-13 - Fixed the atomic patch which actually caused recursive crashing on zookeeper_close From b0860093be8b19599315e5836a4f1e736ac7e79e Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Fri, 25 Oct 2013 09:48:35 -0500 Subject: [PATCH 14/73] Fix date --- zookeeper.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index 2245f7c..24f9d01 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -368,7 +368,7 @@ getent passwd zookeeper >/dev/null || \ %{_unitdir}/zookeeper.service %changelog -* Thu Oct 25 2013 Timothy St. Clair - 3.4.5-14 +* Fri Oct 25 2013 Timothy St. Clair - 3.4.5-14 - Update dependencies to jline1 * Wed Sep 18 2013 Timothy St. Clair - 3.4.5-13 From 671bd1786baf1b22ea8f681a6a4aa9b76a59d8f6 Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Mon, 27 Jan 2014 14:15:30 -0600 Subject: [PATCH 15/73] Update to build f21-rawhide against jline 2.10 and netty3 --- zookeeper-3.4.4-build.patch | 4 ++-- zookeeper.spec | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/zookeeper-3.4.4-build.patch b/zookeeper-3.4.4-build.patch index 609c76e..65002fe 100644 --- a/zookeeper-3.4.4-build.patch +++ b/zookeeper-3.4.4-build.patch @@ -406,10 +406,10 @@ diff -Nru zookeeper-3.4.4/ivy.xml zookeeper-3.4.4-gil/ivy.xml - - + -+ ++ - -+ ++ diff --git a/zookeeper.spec b/zookeeper.spec index 24f9d01..e956388 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -1,7 +1,8 @@ %global _hardened_build 1 + Name: zookeeper Version: 3.4.5 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A high-performance coordination service for distributed applications #Group: Development/Libraries License: ASL 2.0 and BSD @@ -44,12 +45,12 @@ BuildRequires: ant BuildRequires: ant-junit BuildRequires: apache-ivy BuildRequires: checkstyle -BuildRequires: jline1 +BuildRequires: jline BuildRequires: jtoaster BuildRequires: junit BuildRequires: log4j BuildRequires: mockito -BuildRequires: netty +BuildRequires: netty3 BuildRequires: slf4j BuildRequires: xerces-j2 BuildRequires: xml-commons-apis @@ -100,7 +101,7 @@ Requires: jtoaster Requires: junit Requires: log4j Requires: mockito -Requires: netty +Requires: netty3 Requires: slf4j Requires: java @@ -167,6 +168,10 @@ find -name "*.dll" -delete %patch7 -p1 %patch8 -p0 +sed -i "s|0.9.94|2.10|" dist-maven/%{name}-%{version}.pom +sed -i "s|3.2.2.Final|3.6.6.Final|" dist-maven/%{name}-%{version}.pom +sed -i "s|org.jboss.netty|io.netty|" dist-maven/%{name}-%{version}.pom + sed -i "s|pom|jar|" dist-maven/%{name}-%{version}.pom sed -i "s|checkstyle|com.puppycrawl.tools|" dist-maven/%{name}-%{version}.pom sed -i "s|mockito-all|mockito-core|" dist-maven/%{name}-%{version}.pom @@ -368,6 +373,9 @@ getent passwd zookeeper >/dev/null || \ %{_unitdir}/zookeeper.service %changelog +* Fri Jan 24 2014 Timothy St. Clair - 3.4.5-15 +- Update dependencies to jline and netty3 + * Fri Oct 25 2013 Timothy St. Clair - 3.4.5-14 - Update dependencies to jline1 From 8e2027eb98d9c24ac291b8614b82cd1d9b236e13 Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Mon, 27 Jan 2014 14:52:30 -0600 Subject: [PATCH 16/73] Fix for netty3 change --- zookeeper-3.4.4-build.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zookeeper-3.4.4-build.patch b/zookeeper-3.4.4-build.patch index 65002fe..efc6e2f 100644 --- a/zookeeper-3.4.4-build.patch +++ b/zookeeper-3.4.4-build.patch @@ -409,8 +409,9 @@ diff -Nru zookeeper-3.4.4/ivy.xml zookeeper-3.4.4-gil/ivy.xml + - +- + - ++ - From 01a44854caf1b0c8f162d127c33e6935bd2b46f0 Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Mon, 27 Jan 2014 15:06:02 -0600 Subject: [PATCH 17/73] Remove ivy resolver for netty and jline --- zookeeper-3.4.4-build.patch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/zookeeper-3.4.4-build.patch b/zookeeper-3.4.4-build.patch index efc6e2f..b6e2380 100644 --- a/zookeeper-3.4.4-build.patch +++ b/zookeeper-3.4.4-build.patch @@ -410,9 +410,10 @@ diff -Nru zookeeper-3.4.4/ivy.xml zookeeper-3.4.4-gil/ivy.xml - - -+ +- ++ - + From a504250284f2d95409394c1a30200b2e4887566c Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Mon, 27 Jan 2014 15:40:13 -0600 Subject: [PATCH 18/73] Update to push back to jline 1. --- zookeeper.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zookeeper.spec b/zookeeper.spec index e956388..ad4a5d3 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -45,7 +45,7 @@ BuildRequires: ant BuildRequires: ant-junit BuildRequires: apache-ivy BuildRequires: checkstyle -BuildRequires: jline +BuildRequires: jline1 BuildRequires: jtoaster BuildRequires: junit BuildRequires: log4j @@ -96,7 +96,7 @@ Summary: Zookeeper Java client library # Requires: felix-framework # Requires: felix-osgi-compendium Requires: checkstyle -Requires: jline +Requires: jline1 Requires: jtoaster Requires: junit Requires: log4j @@ -168,7 +168,7 @@ find -name "*.dll" -delete %patch7 -p1 %patch8 -p0 -sed -i "s|0.9.94|2.10|" dist-maven/%{name}-%{version}.pom +sed -i "s|0.9.94|1.0|" dist-maven/%{name}-%{version}.pom sed -i "s|3.2.2.Final|3.6.6.Final|" dist-maven/%{name}-%{version}.pom sed -i "s|org.jboss.netty|io.netty|" dist-maven/%{name}-%{version}.pom @@ -374,7 +374,7 @@ getent passwd zookeeper >/dev/null || \ %changelog * Fri Jan 24 2014 Timothy St. Clair - 3.4.5-15 -- Update dependencies to jline and netty3 +- Update jline and netty3 for f21 builds * Fri Oct 25 2013 Timothy St. Clair - 3.4.5-14 - Update dependencies to jline1 From 3d94c04254cf6e55bf9c5d2cbe0ac73a18bd5477 Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Fri, 31 Jan 2014 11:16:28 -0600 Subject: [PATCH 19/73] Fixes to solve pom resolution of the tests.jar. Thanks to rsquared and mizdebsk. --- zookeeper-test-template.pom | 48 ------------------------------------- zookeeper.spec | 18 +++++++------- 2 files changed, 9 insertions(+), 57 deletions(-) delete mode 100644 zookeeper-test-template.pom diff --git a/zookeeper-test-template.pom b/zookeeper-test-template.pom deleted file mode 100644 index 2c957f4..0000000 --- a/zookeeper-test-template.pom +++ /dev/null @@ -1,48 +0,0 @@ - - 4.0.0 - org.apache.zookeeper - zookeeper-test - @version@ - - - org.apache.zookeeper - zookeeper - @version@ - - - org.slf4j - slf4j-api - any - - - org.slf4j - slf4j-log4j12 - any - - - log4j - log4j - any - - - org.jboss.netty - netty - any - - - junit - junit - any - - - org.mockito - mockito-core - any - - - com.puppycrawl.tools - checkstyle - any - - - \ No newline at end of file diff --git a/zookeeper.spec b/zookeeper.spec index ad4a5d3..6cb7573 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -2,13 +2,13 @@ Name: zookeeper Version: 3.4.5 -Release: 15%{?dist} +Release: 16%{?dist} Summary: A high-performance coordination service for distributed applications #Group: Development/Libraries License: ASL 2.0 and BSD URL: http://zookeeper.apache.org/ Source0: http://www.apache.org/dist/%{name}/stable/%{name}-%{version}.tar.gz -Source1: %{name}-test-template.pom +#Source1: %{name}-test-template.pom Source2: %{name}-ZooInspector-template.pom Source3: %{name}.service # remove non free clover references @@ -176,9 +176,8 @@ sed -i "s|pom|jar|" dist-maven/%{n sed -i "s|checkstyle|com.puppycrawl.tools|" dist-maven/%{name}-%{version}.pom sed -i "s|mockito-all|mockito-core|" dist-maven/%{name}-%{version}.pom -cp -p %{SOURCE1} dist-maven/%{name}-%{version}-test.pom cp -p %{SOURCE2} dist-maven/%{name}-%{version}-ZooInspector.pom -sed -i "s|@version@|%{version}|" dist-maven/%{name}-%{version}-test.pom dist-maven/%{name}-%{version}-ZooInspector.pom +sed -i "s|@version@|%{version}|" dist-maven/%{name}-%{version}-ZooInspector.pom 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 @@ -252,14 +251,13 @@ ant -Dversion=%{version} -DlastRevision=-1 test-core-java mkdir -p %{buildroot}%{_javadir}/%{name} install -pm 644 build/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar -install -pm 644 build/%{name}-%{version}-test.jar %{buildroot}%{_javadir}/%{name}/%{name}-test.jar +install -pm 644 build/%{name}-%{version}-test.jar %{buildroot}%{_javadir}/%{name}/%{name}-tests.jar install -pm 644 build/contrib/ZooInspector/%{name}-ZooInspector-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-ZooInspector.jar mkdir -p %{buildroot}%{_mavenpomdir} install -pm 644 dist-maven/%{name}-%{version}.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom %add_maven_depmap JPP.%{name}-%{name}.pom %{name}/%{name}.jar -install -pm 644 dist-maven/%{name}-%{version}-test.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-test.pom -%add_maven_depmap JPP.%{name}-%{name}-test.pom %{name}/%{name}-test.jar +%add_maven_depmap org.apache.zookeeper:zookeeper::tests:%{version} %{name}/%{name}-tests.jar install -pm 644 dist-maven/%{name}-%{version}-ZooInspector.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-ZooInspector.pom %add_maven_depmap JPP.%{name}-%{name}-ZooInspector.pom %{name}/%{name}-ZooInspector.jar @@ -342,10 +340,9 @@ getent passwd zookeeper >/dev/null || \ %files java %dir %{_javadir}/%{name} %{_javadir}/%{name}/%{name}.jar -%{_javadir}/%{name}/%{name}-test.jar +%{_javadir}/%{name}/%{name}-tests.jar %{_javadir}/%{name}/%{name}-ZooInspector.jar %{_mavenpomdir}/JPP.%{name}-%{name}.pom -%{_mavenpomdir}/JPP.%{name}-%{name}-test.pom %{_mavenpomdir}/JPP.%{name}-%{name}-ZooInspector.pom %{_mavendepmapfragdir}/%{name} %doc CHANGES.txt LICENSE.txt NOTICE.txt README.txt @@ -373,6 +370,9 @@ getent passwd zookeeper >/dev/null || \ %{_unitdir}/zookeeper.service %changelog +* Fri Jan 31 2014 Timothy St. Clair - 3.4.5-16 +- Update of tests.jar due to netty3 compat packaging conflicts + * Fri Jan 24 2014 Timothy St. Clair - 3.4.5-15 - Update jline and netty3 for f21 builds From 7accb41632625bffb57ba500445aaea7c00c9af0 Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Mon, 24 Feb 2014 10:16:24 -0600 Subject: [PATCH 20/73] Update to closeout BZ1068609 --- zookeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index 6cb7573..f0681a0 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -2,7 +2,7 @@ Name: zookeeper Version: 3.4.5 -Release: 16%{?dist} +Release: 17%{?dist} Summary: A high-performance coordination service for distributed applications #Group: Development/Libraries License: ASL 2.0 and BSD @@ -370,6 +370,9 @@ getent passwd zookeeper >/dev/null || \ %{_unitdir}/zookeeper.service %changelog +* Mon Feb 24 2014 Timothy St. Clair - 3.4.5-17 +- Update due to cascading dependencies around java-headless + * Fri Jan 31 2014 Timothy St. Clair - 3.4.5-16 - Update of tests.jar due to netty3 compat packaging conflicts From e16f7ab880775ee1031847ce3fb6a842649aa604 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Fri, 23 May 2014 05:03:19 +0200 Subject: [PATCH 21/73] Rebuild for boost 1.55.0 --- zookeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index f0681a0..49adab0 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -2,7 +2,7 @@ Name: zookeeper Version: 3.4.5 -Release: 17%{?dist} +Release: 18%{?dist} Summary: A high-performance coordination service for distributed applications #Group: Development/Libraries License: ASL 2.0 and BSD @@ -370,6 +370,9 @@ getent passwd zookeeper >/dev/null || \ %{_unitdir}/zookeeper.service %changelog +* Fri May 23 2014 Petr Machata - 3.4.5-18 +- Rebuild for boost 1.55.0 + * Mon Feb 24 2014 Timothy St. Clair - 3.4.5-17 - Update due to cascading dependencies around java-headless From ef6470f1c495486d9816b2616fe351475cfc41cb Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Wed, 4 Jun 2014 20:16:35 -0500 Subject: [PATCH 22/73] WIP --- sources | 2 +- zookeeper-3.4.5-atomic.patch | 32 ----------- zookeeper.service | 8 +-- zookeeper.spec | 100 ++++++++++++++++++----------------- 4 files changed, 58 insertions(+), 84 deletions(-) delete mode 100644 zookeeper-3.4.5-atomic.patch diff --git a/sources b/sources index 0f42bf6..928a696 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f64fef86c0bf2e5e0484d19425b22dcb zookeeper-3.4.5.tar.gz +971c379ba65714fd25dc5fe8f14e9ad1 zookeeper-3.4.6.tar.gz diff --git a/zookeeper-3.4.5-atomic.patch b/zookeeper-3.4.5-atomic.patch deleted file mode 100644 index 570a0ff..0000000 --- a/zookeeper-3.4.5-atomic.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -up zookeeper-3.4.5/src/c/src/mt_adaptor.c.atomic zookeeper-3.4.5/src/c/src/mt_adaptor.c ---- zookeeper-3.4.5/src/c/src/mt_adaptor.c.atomic 2013-06-14 09:58:27.000000000 +0200 -+++ zookeeper-3.4.5/src/c/src/mt_adaptor.c 2013-06-14 10:00:09.000000000 +0200 -@@ -482,27 +482,7 @@ int32_t inc_ref_counter(zhandle_t* zh,in - - int32_t fetch_and_add(volatile int32_t* operand, int incr) - { --#ifndef WIN32 -- int32_t result; -- asm __volatile__( -- "lock xaddl %0,%1\n" -- : "=r"(result), "=m"(*(int *)operand) -- : "0"(incr) -- : "memory"); -- return result; --#else -- volatile int32_t result; -- _asm -- { -- mov eax, operand; //eax = v; -- mov ebx, incr; // ebx = i; -- mov ecx, 0x0; // ecx = 0; -- lock xadd dword ptr [eax], ecx; -- lock xadd dword ptr [eax], ebx; -- mov result, ecx; // result = ebx; -- } -- return result; --#endif -+ return __atomic_add_fetch(operand, incr, __ATOMIC_SEQ_CST); - } - - // make sure the static xid is initialized before any threads started diff --git a/zookeeper.service b/zookeeper.service index e5ae08e..5cdb4b2 100644 --- a/zookeeper.service +++ b/zookeeper.service @@ -10,10 +10,12 @@ Type=simple User=zookeeper SyslogIdentifier=zookeeper WorkingDirectory=/var/lib/zookeeper -UMask=0027 -Environment="CP=/etc/zookeeper:/usr/share/java/slf4j/slf4j-log4j12.jar:/usr/share/java/slf4j/slf4j-api.jar:/usr/share/java/netty.jar:/usr/share/java/log4j.jar:/usr/share/java/jline.jar:/usr/share/java/zookeeper/zookeeper.jar" -Environment="IPv6=-Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true" + +#UMask=0027 +#Environment="CP=/etc/zookeeper:/usr/share/java/slf4j/slf4j-log4j12.jar:/usr/share/java/slf4j/slf4j-api.jar:/usr/share/java/netty.jar:/usr/share/java/log4j.jar:/usr/share/java/jline.jar:/usr/share/java/zookeeper/zookeeper.jar" +#Environment="IPv6=-Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true" #Environment="JMX=-Dcom.sun.management.jmxremote" + ExecStart=/usr/lib/jvm/jre-1.7.0/bin/java -cp $CP $JMX $IPv6 org.apache.zookeeper.server.quorum.QuorumPeerMain /etc/zookeeper/zoo.cfg [Install] diff --git a/zookeeper.spec b/zookeeper.spec index f0681a0..dba2d52 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -1,8 +1,8 @@ %global _hardened_build 1 Name: zookeeper -Version: 3.4.5 -Release: 17%{?dist} +Version: 3.4.6 +Release: 1%{?dist} Summary: A high-performance coordination service for distributed applications #Group: Development/Libraries License: ASL 2.0 and BSD @@ -14,17 +14,16 @@ Source3: %{name}.service # remove non free clover references # configure ivy to use system libraries # disable rat-lib and jdiff support -Patch0: %{name}-3.4.4-build.patch +# Patch0: %{name}-3.4.4-build.patch # https://issues.apache.org/jira/browse/ZOOKEEPER-1557 -Patch1: https://issues.apache.org/jira/secure/attachment/12548109/ZOOKEEPER-1557.patch +# Patch1: https://issues.apache.org/jira/secure/attachment/12548109/ZOOKEEPER-1557.patch Patch2: %{name}-3.4.5-zktreeutil-gcc.patch -Patch3: %{name}-3.4.5-disable-cygwin-detection.patch +#Patch3: %{name}-3.4.5-disable-cygwin-detection.patch Patch4: %{name}-3.4.5-build-contrib.patch Patch5: %{name}-3.4.5-add-PIE-and-RELRO.patch -#Patch6: %{name}-3.4.5-atomic.patch # remove date/time from console output since journald will keep track of date/time -Patch7: %{name}-3.4.5-log4j.patch -Patch8: https://issues.apache.org/jira/secure/attachment/12570030/mt_adaptor.c.patch +Patch6: %{name}-3.4.5-log4j.patch + BuildRequires: autoconf BuildRequires: automake @@ -44,11 +43,13 @@ BuildRequires: python-devel BuildRequires: ant BuildRequires: ant-junit BuildRequires: apache-ivy +BuildRequires: ivy-local BuildRequires: checkstyle BuildRequires: jline1 BuildRequires: jtoaster BuildRequires: junit -BuildRequires: log4j +BuildRequires: log4j12 + BuildRequires: mockito BuildRequires: netty3 BuildRequires: slf4j @@ -149,8 +150,9 @@ find -name "*.cmd" -delete find -name "*.so*" -delete find -name "*.dll" -delete -%patch0 -p1 -%patch1 -p0 +#%patch0 -p1 +#%patch1 -p0 + %pom_remove_dep org.vafer:jdeb dist-maven/%{name}-%{version}.pom # jdiff task deps %pom_remove_dep jdiff:jdiff dist-maven/%{name}-%{version}.pom @@ -161,12 +163,10 @@ find -name "*.dll" -delete %pom_remove_dep commons-lang:commons-lang dist-maven/%{name}-%{version}.pom %patch2 -p0 -%patch3 -p0 +#%patch3 -p0 %patch4 -p1 %patch5 -p1 -#%patch6 -p1 -%patch7 -p1 -%patch8 -p0 +%patch6 -p1 sed -i "s|0.9.94|1.0|" dist-maven/%{name}-%{version}.pom sed -i "s|3.2.2.Final|3.6.6.Final|" dist-maven/%{name}-%{version}.pom @@ -190,45 +190,49 @@ sed -i 's@^dataDir=.*$@dataDir=%{_sharedstatedir}/zookeeper/data\ndataLogDir=%{_ %build +# TODO: Specify the output build directory. + +%ant -Divy.mode=local package-native + # ensure that source and target are 1.5 -%ant -Dtarget.jdk=1.5 \ - -Djavadoc.link.java=%{_javadocdir}/java \ - -Dant.build.javac.source=1.5 \ - -Dant.build.javac.target=1.5 \ - build-generated jar test-jar javadoc javadoc-dev +#%ant -Dtarget.jdk=1.5 \ +# -Djavadoc.link.java=%{_javadocdir}/java \ +# -Dant.build.javac.source=1.5 \ +# -Dant.build.javac.target=1.5 \ +# build-generated jar test-jar javadoc javadoc-dev +# +#( +#cd src/contrib +#%ant -Dversion=%{version} \ +# -Dcontribfilesetincludes="zooinspector/build.xml" \ +# -Dant.build.javac.source=1.5 \ +# -Dant.build.javac.target=1.5 \ +# -Dtarget.jdk=1.5 \ +# -DlastRevision=-1 \ +# -Divy.jar.exists=true \ +# -Divy.initialized=true \ +# -Ddest.dir=../../build/zookeeper +#) -( -cd src/contrib -%ant -Dversion=%{version} \ - -Dcontribfilesetincludes="zooinspector/build.xml" \ - -Dant.build.javac.source=1.5 \ - -Dant.build.javac.target=1.5 \ - -Dtarget.jdk=1.5 \ - -DlastRevision=-1 \ - -Divy.jar.exists=true \ - -Divy.initialized=true \ - -Ddest.dir=../../build/zookeeper -) - -pushd src/c -rm -rf autom4te.cache -autoreconf -fis - -%configure --disable-static --disable-rpath --with-syncapi +#pushd src/c +#rm -rf autom4te.cache +#autoreconf -fis +# +#%configure --disable-static --disable-rpath --with-syncapi # Remove rpath -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +#sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +#sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %{__make} %{?_smp_mflags} -make doxygen-doc -popd +#make doxygen-doc +#popd # Compile zktreeutil -pushd src/contrib/zktreeutil -rm -rf autom4te.cache -autoreconf -if -%configure -%{__make} %{?_smp_mflags} -popd +#pushd src/contrib/zktreeutil +#rm -rf autom4te.cache +#autoreconf -if +#%configure +#%{__make} %{?_smp_mflags} +#popd %if 0 %check From f5104b660f0f5820ed8606f039be15c282c97d61 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 13:17:37 -0500 Subject: [PATCH 23/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- zookeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index 49adab0..0fc0d21 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -2,7 +2,7 @@ Name: zookeeper Version: 3.4.5 -Release: 18%{?dist} +Release: 19%{?dist} Summary: A high-performance coordination service for distributed applications #Group: Development/Libraries License: ASL 2.0 and BSD @@ -370,6 +370,9 @@ getent passwd zookeeper >/dev/null || \ %{_unitdir}/zookeeper.service %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 3.4.5-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri May 23 2014 Petr Machata - 3.4.5-18 - Rebuild for boost 1.55.0 From a39c778ea175a371e3491ad01ae85d6e1201f0b7 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 11:47:57 +0000 Subject: [PATCH 24/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- zookeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index 0fc0d21..6315622 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -2,7 +2,7 @@ Name: zookeeper Version: 3.4.5 -Release: 19%{?dist} +Release: 20%{?dist} Summary: A high-performance coordination service for distributed applications #Group: Development/Libraries License: ASL 2.0 and BSD @@ -370,6 +370,9 @@ getent passwd zookeeper >/dev/null || \ %{_unitdir}/zookeeper.service %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 3.4.5-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 3.4.5-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From c804f9a5aaec889bfbdd8afd4d1e1c04662de58c Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Tue, 7 Oct 2014 13:40:35 -0500 Subject: [PATCH 25/73] Local WIP update --- sources | 2 +- zookeeper.spec | 207 ++++++++++++++++++------------------------------- 2 files changed, 77 insertions(+), 132 deletions(-) diff --git a/sources b/sources index 928a696..1ba06d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -971c379ba65714fd25dc5fe8f14e9ad1 zookeeper-3.4.6.tar.gz +623bfbaa0efbd2cc196fe06ea9f85566 zookeeper-3.4.6-601207e.tar.gz diff --git a/zookeeper.spec b/zookeeper.spec index 3cc9635..70cafaf 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -1,3 +1,5 @@ +%global commit 601207e1151b2691112c431fc3b4130a85ac93b5 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) %global _hardened_build 1 Name: zookeeper @@ -7,23 +9,16 @@ Summary: A high-performance coordination service for distributed applicati #Group: Development/Libraries License: ASL 2.0 and BSD URL: http://zookeeper.apache.org/ -Source0: http://www.apache.org/dist/%{name}/stable/%{name}-%{version}.tar.gz -#Source1: %{name}-test-template.pom -Source2: %{name}-ZooInspector-template.pom -Source3: %{name}.service -# remove non free clover references -# configure ivy to use system libraries -# disable rat-lib and jdiff support -# Patch0: %{name}-3.4.4-build.patch -# https://issues.apache.org/jira/browse/ZOOKEEPER-1557 -# Patch1: https://issues.apache.org/jira/secure/attachment/12548109/ZOOKEEPER-1557.patch -Patch2: %{name}-3.4.5-zktreeutil-gcc.patch -#Patch3: %{name}-3.4.5-disable-cygwin-detection.patch -Patch4: %{name}-3.4.5-build-contrib.patch -Patch5: %{name}-3.4.5-add-PIE-and-RELRO.patch -# remove date/time from console output since journald will keep track of date/time -Patch6: %{name}-3.4.5-log4j.patch +Source0: https://github.com/apache/zookeeper/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz +Source1: %{name}-ZooInspector-template.pom +Source2: %{name}.service +Patch1: %{name}-3.4.5-zktreeutil-gcc.patch +Patch2: %{name}-3.4.6-ivy-build.patch + +#Patch2: %{name}-3.4.5-log4j.patch +#Patch2: %{name}-3.4.5-build-contrib.patch +#Patch5: %{name}-3.4.5-add-PIE-and-RELRO.patch BuildRequires: autoconf BuildRequires: automake @@ -48,7 +43,9 @@ BuildRequires: checkstyle BuildRequires: jline1 BuildRequires: jtoaster BuildRequires: junit -BuildRequires: log4j12 +#BuildRequires: log4j12 +BuildRequires: log4j +BuildRequires: json_simple BuildRequires: mockito BuildRequires: netty3 @@ -56,12 +53,6 @@ BuildRequires: slf4j BuildRequires: xerces-j2 BuildRequires: xml-commons-apis -# BuildRequires: rat-lib -# BuildRequires: apache-rat-tasks -# BuildRequires: apache-commons-collections -# BuildRequires: apache-commons-lang -# BuildRequires: jdiff - BuildRequires: systemd %description @@ -94,8 +85,7 @@ Documentation for the ZooKeeper C client library. %package java #Group: Development/Libraries Summary: Zookeeper Java client library -# Requires: felix-framework -# Requires: felix-osgi-compendium + Requires: checkstyle Requires: jline1 Requires: jtoaster @@ -143,143 +133,98 @@ BuildArch: noarch ZooKeeper server %prep -%setup -q -find -name "*.jar" -delete -find -name "*.class" -delete -find -name "*.cmd" -delete -find -name "*.so*" -delete -find -name "*.dll" -delete +%setup -q -n %{name}-%{commit} -#%patch0 -p1 -#%patch1 -p0 +%patch1 -p0 +%patch2 -p1 +#%patch3 -p1 +#%patch4 -p1 -%pom_remove_dep org.vafer:jdeb dist-maven/%{name}-%{version}.pom -# jdiff task deps -%pom_remove_dep jdiff:jdiff dist-maven/%{name}-%{version}.pom -%pom_remove_dep xerces:xerces dist-maven/%{name}-%{version}.pom -# rat-lib task deps -%pom_remove_dep org.apache.rat:apache-rat-tasks dist-maven/%{name}-%{version}.pom -%pom_remove_dep commons-collections:commons-collections dist-maven/%{name}-%{version}.pom -%pom_remove_dep commons-lang:commons-lang dist-maven/%{name}-%{version}.pom +# -%patch2 -p0 -#%patch3 -p0 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 - -sed -i "s|0.9.94|1.0|" dist-maven/%{name}-%{version}.pom -sed -i "s|3.2.2.Final|3.6.6.Final|" dist-maven/%{name}-%{version}.pom -sed -i "s|org.jboss.netty|io.netty|" dist-maven/%{name}-%{version}.pom - -sed -i "s|pom|jar|" dist-maven/%{name}-%{version}.pom -sed -i "s|checkstyle|com.puppycrawl.tools|" dist-maven/%{name}-%{version}.pom -sed -i "s|mockito-all|mockito-core|" dist-maven/%{name}-%{version}.pom - -cp -p %{SOURCE2} dist-maven/%{name}-%{version}-ZooInspector.pom -sed -i "s|@version@|%{version}|" dist-maven/%{name}-%{version}-ZooInspector.pom +#cp -p %{SOURCE1} dist-maven/%{name}-%{version}-ZooInspector.pom +#sed -i "s|@version@|%{version}|" dist-maven/%{name}-%{version}-ZooInspector.pom 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 -# fix build problem on f18 sed -i 's|||' build.xml sed -i 's|||' build.xml sed -i 's@^dataDir=.*$@dataDir=%{_sharedstatedir}/zookeeper/data\ndataLogDir=%{_sharedstatedir}/zookeeper/log@' conf/zoo_sample.cfg %build +%ant -Divy.mode=local \ +-Dtarget.jdk=1.5 \ +-Djavadoc.link.java=%{_javadocdir}/java \ +-Dant.build.javac.source=1.5 \ +-Dant.build.javac.target=1.5 \ +-Ddist.dir=%{buildroot} \ +package-native -# TODO: Specify the output build directory. - -%ant -Divy.mode=local package-native - -# ensure that source and target are 1.5 -#%ant -Dtarget.jdk=1.5 \ -# -Djavadoc.link.java=%{_javadocdir}/java \ -# -Dant.build.javac.source=1.5 \ -# -Dant.build.javac.target=1.5 \ -# build-generated jar test-jar javadoc javadoc-dev -# -#( -#cd src/contrib -#%ant -Dversion=%{version} \ -# -Dcontribfilesetincludes="zooinspector/build.xml" \ -# -Dant.build.javac.source=1.5 \ -# -Dant.build.javac.target=1.5 \ -# -Dtarget.jdk=1.5 \ -# -DlastRevision=-1 \ -# -Divy.jar.exists=true \ -# -Divy.initialized=true \ -# -Ddest.dir=../../build/zookeeper -#) - -#pushd src/c -#rm -rf autom4te.cache -#autoreconf -fis -# -#%configure --disable-static --disable-rpath --with-syncapi -# Remove rpath -#sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -#sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +#Compile zktreeutil +# TODO - determine why it's not part of the default build +pushd src/contrib/zktreeutil +rm -rf autom4te.cache +autoreconf -if +%configure %{__make} %{?_smp_mflags} -#make doxygen-doc -#popd - -# Compile zktreeutil -#pushd src/contrib/zktreeutil -#rm -rf autom4te.cache -#autoreconf -if -#%configure -#%{__make} %{?_smp_mflags} -#popd - -%if 0 -%check -# Execute multi-threaded test suite -mkdir -p build/lib -for jar in jline log4j xerces-j2 xml-commons-apis; do \ -ln -sf %{_javadir}/$jar.jar build/lib/$jar.jar; \ -done -pushd src/c -%{__make} %{?_smp_mflags} zktest-mt -./zktest-mt popd -%ifarch i386 -# Run core Java test suite against zookeeper -ant -Dversion=%{version} -DlastRevision=-1 test-core-java -%endif -%endif + +%check +%ant -Divy.mode=local \ +test %install - mkdir -p %{buildroot}%{_javadir}/%{name} install -pm 644 build/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar install -pm 644 build/%{name}-%{version}-test.jar %{buildroot}%{_javadir}/%{name}/%{name}-tests.jar -install -pm 644 build/contrib/ZooInspector/%{name}-ZooInspector-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-ZooInspector.jar +install -pm 644 build/contrib/ZooInspector/%{name}-%{version}-ZooInspector.jar %{buildroot}%{_javadir}/%{name}/%{name}-ZooInspector.jar mkdir -p %{buildroot}%{_mavenpomdir} -install -pm 644 dist-maven/%{name}-%{version}.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom +install -pm 644 build/%{name}-%{version}/dist-maven/%{name}.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom + +#################################################### +# we will need to do our pom cleanup here. +#%pom_remove_dep org.vafer:jdeb dist-maven/%{name}-%{version}.pom +# jdiff task deps +#%pom_remove_dep jdiff:jdiff dist-maven/%{name}-%{version}.pom +#%pom_remove_dep xerces:xerces dist-maven/%{name}-%{version}.pom +# rat-lib task deps +#%pom_remove_dep org.apache.rat:apache-rat-tasks dist-maven/%{name}-%{version}.pom +#%pom_remove_dep commons-collections:commons-collections dist-maven/%{name}-%{version}.pom +#%pom_remove_dep commons-lang:commons-lang dist-maven/%{name}-%{version}.pom + +#sed -i "s|0.9.94|1.0|" dist-maven/%{name}-%{version}.pom +#sed -i "s|3.2.2.Final|3.6.6.Final|" dist-maven/%{name}-%{version}.pom +#sed -i "s|org.jboss.netty|io.netty|" dist-maven/%{name}-%{version}.pom + +#sed -i "s|pom|jar|" dist-maven/%{name}-%{version}.pom +#sed -i "s|checkstyle|com.puppycrawl.tools|" dist-maven/%{name}-%{version}.pom +#sed -i "s|mockito-all|mockito-core|" dist-maven/%{name}-%{version}.pom +#################################################### + %add_maven_depmap JPP.%{name}-%{name}.pom %{name}/%{name}.jar %add_maven_depmap org.apache.zookeeper:zookeeper::tests:%{version} %{name}/%{name}-tests.jar -install -pm 644 dist-maven/%{name}-%{version}-ZooInspector.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-ZooInspector.pom + +install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-ZooInspector.pom +sed -i "s|@version@|%{version}|" %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-ZooInspector.pom %add_maven_depmap JPP.%{name}-%{name}-ZooInspector.pom %{name}/%{name}-ZooInspector.jar -mkdir -p %{buildroot}%{_javadocdir}/%{name}/dev +mkdir -p %{buildroot}%{_javadocdir}/%{name} cp -pr build/docs/api/* %{buildroot}%{_javadocdir}/%{name}/ -cp -pr build/docs/dev-api/* %{buildroot}%{_javadocdir}/%{name}/dev/ -pushd src/c -%{__make} install DESTDIR=%{buildroot} +#pushd build/c +#%{__make} install DESTDIR=%{buildroot} # cleanup -rm -f docs/html/*.map -popd +#rm -f docs/html/*.map +#popd -pushd src/contrib/zktreeutil -%{__make} install DESTDIR=%{buildroot} -popd +#pushd src/contrib/zktreeutil +#%{__make} install DESTDIR=%{buildroot} +#popd -pushd src/contrib/zkpython +pushd build/contrib/zkpython %{__python} src/python/setup.py build --build-base=$PWD/build \ install --root=%{buildroot} ;\ chmod 0755 %{buildroot}%{python_sitearch}/zookeeper.so @@ -293,7 +238,7 @@ mkdir -p %{buildroot}%{_localstatedir}/log/zookeeper mkdir -p %{buildroot}%{_sharedstatedir}/zookeeper mkdir -p %{buildroot}%{_sharedstatedir}/zookeeper/data mkdir -p %{buildroot}%{_sharedstatedir}/zookeeper/log -install -p -m 0644 %{SOURCE3} %{buildroot}%{_unitdir} +install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir} install -p -m 0640 conf/log4j.properties %{buildroot}%{_sysconfdir}/zookeeper install -p -m 0640 conf/zoo_sample.cfg %{buildroot}%{_sysconfdir}/zookeeper touch %{buildroot}%{_sysconfdir}/zookeeper/zoo.cfg From da2547bc7d4ba5a9eef0e72746c78807010138d4 Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Wed, 15 Oct 2014 08:30:46 -0500 Subject: [PATCH 26/73] WIP update to 3.4.6 --- ZOOKEEPER-1557.patch | 152 ---------- mt_adaptor.c.patch | 32 -- zkEnv.sh | 91 ++++++ zookeeper-3.4.4-build.patch | 449 ---------------------------- zookeeper-3.4.5-build-contrib.patch | 133 -------- zookeeper-3.4.5-log4j.patch | 26 -- zookeeper-3.4.6-ivy-build.patch | 52 ++++ zookeeper.service | 11 +- zookeeper.spec | 250 ++++++---------- 9 files changed, 245 insertions(+), 951 deletions(-) delete mode 100644 ZOOKEEPER-1557.patch delete mode 100644 mt_adaptor.c.patch create mode 100755 zkEnv.sh delete mode 100644 zookeeper-3.4.4-build.patch delete mode 100644 zookeeper-3.4.5-build-contrib.patch delete mode 100644 zookeeper-3.4.5-log4j.patch create mode 100644 zookeeper-3.4.6-ivy-build.patch diff --git a/ZOOKEEPER-1557.patch b/ZOOKEEPER-1557.patch deleted file mode 100644 index e273685..0000000 --- a/ZOOKEEPER-1557.patch +++ /dev/null @@ -1,152 +0,0 @@ -diff --git src/java/test/org/apache/zookeeper/test/SaslAuthFailNotifyTest.java src/java/test/org/apache/zookeeper/test/SaslAuthFailNotifyTest.java -new file mode 100644 -index 0000000..2b00d86 ---- /dev/null -+++ src/java/test/org/apache/zookeeper/test/SaslAuthFailNotifyTest.java -@@ -0,0 +1,98 @@ -+/** -+ * Licensed to the Apache Software Foundation (ASF) under one -+ * or more contributor license agreements. See the NOTICE file -+ * distributed with this work for additional information -+ * regarding copyright ownership. The ASF licenses this file -+ * to you under the Apache License, Version 2.0 (the -+ * "License"); you may not use this file except in compliance -+ * with the License. You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+package org.apache.zookeeper.test; -+ -+import java.io.File; -+import java.io.FileWriter; -+import java.io.IOException; -+import java.util.concurrent.atomic.AtomicInteger; -+ -+import org.apache.zookeeper.CreateMode; -+import org.apache.zookeeper.TestableZooKeeper; -+import org.apache.zookeeper.WatchedEvent; -+import org.apache.zookeeper.ZooKeeper; -+import org.apache.zookeeper.Watcher.Event.KeeperState; -+import org.apache.zookeeper.ZooDefs.Ids; -+import org.junit.Test; -+import org.junit.Assert; -+ -+public class SaslAuthFailNotifyTest extends ClientBase { -+ static { -+ System.setProperty("zookeeper.authProvider.1","org.apache.zookeeper.server.auth.SASLAuthenticationProvider"); -+ System.setProperty("zookeeper.allowSaslFailedClients","true"); -+ -+ try { -+ File tmpDir = createTmpDir(); -+ File saslConfFile = new File(tmpDir, "jaas.conf"); -+ FileWriter fwriter = new FileWriter(saslConfFile); -+ -+ fwriter.write("" + -+ "Server {\n" + -+ " org.apache.zookeeper.server.auth.DigestLoginModule required\n" + -+ " user_super=\"test\";\n" + -+ "};\n" + -+ "Client {\n" + -+ " org.apache.zookeeper.server.auth.DigestLoginModule required\n" + -+ " username=\"super\"\n" + -+ " password=\"test1\";\n" + // NOTE: wrong password ('test' != 'test1') : this is to test SASL authentication failure. -+ "};" + "\n"); -+ fwriter.close(); -+ System.setProperty("java.security.auth.login.config",saslConfFile.getAbsolutePath()); -+ } -+ catch (IOException e) { -+ // could not create tmp directory to hold JAAS conf file. -+ } -+ } -+ -+ private AtomicInteger authFailed = new AtomicInteger(0); -+ -+ @Override -+ protected TestableZooKeeper createClient(String hp) -+ throws IOException, InterruptedException -+ { -+ MyWatcher watcher = new MyWatcher(); -+ return createClient(watcher, hp); -+ } -+ -+ private class MyWatcher extends CountdownWatcher { -+ @Override -+ public synchronized void process(WatchedEvent event) { -+ if (event.getState() == KeeperState.AuthFailed) { -+ synchronized(authFailed) { -+ authFailed.incrementAndGet(); -+ authFailed.notify(); -+ } -+ } -+ else { -+ super.process(event); -+ } -+ } -+ } -+ -+ @Test -+ public void testBadSaslAuthNotifiesWatch() throws Exception { -+ ZooKeeper zk = createClient(); -+ // wait for authFailed event from client's EventThread. -+ synchronized(authFailed) { -+ authFailed.wait(); -+ } -+ Assert.assertEquals(authFailed.get(),1); -+ zk.close(); -+ } -+} -diff --git src/java/test/org/apache/zookeeper/test/SaslAuthFailTest.java src/java/test/org/apache/zookeeper/test/SaslAuthFailTest.java -index 1589b1f..33a505e 100644 ---- src/java/test/org/apache/zookeeper/test/SaslAuthFailTest.java -+++ src/java/test/org/apache/zookeeper/test/SaslAuthFailTest.java -@@ -59,43 +59,6 @@ public class SaslAuthFailTest extends ClientBase { - // could not create tmp directory to hold JAAS conf file. - } - } -- -- private AtomicInteger authFailed = new AtomicInteger(0); -- -- @Override -- protected TestableZooKeeper createClient(String hp) -- throws IOException, InterruptedException -- { -- MyWatcher watcher = new MyWatcher(); -- return createClient(watcher, hp); -- } -- -- private class MyWatcher extends CountdownWatcher { -- @Override -- public synchronized void process(WatchedEvent event) { -- if (event.getState() == KeeperState.AuthFailed) { -- synchronized(authFailed) { -- authFailed.incrementAndGet(); -- authFailed.notify(); -- } -- } -- else { -- super.process(event); -- } -- } -- } -- -- @Test -- public void testBadSaslAuthNotifiesWatch() throws Exception { -- ZooKeeper zk = createClient(); -- // wait for authFailed event from client's EventThread. -- synchronized(authFailed) { -- authFailed.wait(); -- } -- Assert.assertEquals(authFailed.get(),1); -- zk.close(); -- } -- - - @Test - public void testAuthFail() throws Exception { diff --git a/mt_adaptor.c.patch b/mt_adaptor.c.patch deleted file mode 100644 index 4b230d2..0000000 --- a/mt_adaptor.c.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 @@ - int32_t fetch_and_add(volatile int32_t* operand, int incr) - { - #ifndef WIN32 -- int32_t result; -- asm __volatile__( -- "lock xaddl %0,%1\n" -- : "=r"(result), "=m"(*(int *)operand) -- : "0"(incr) -- : "memory"); -- return result; -+ return __sync_fetch_and_add(operand, incr); - #else -- volatile int32_t result; -- _asm -- { -- mov eax, operand; //eax = v; -- mov ebx, incr; // ebx = i; -- mov ecx, 0x0; // ecx = 0; -- lock xadd dword ptr [eax], ecx; -- lock xadd dword ptr [eax], ebx; -- mov result, ecx; // result = ebx; -- } -- return result; -+ return InterlockedExchangeAdd(operand, incr); - #endif - } - diff --git a/zkEnv.sh b/zkEnv.sh new file mode 100755 index 0000000..122a948 --- /dev/null +++ b/zkEnv.sh @@ -0,0 +1,91 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# This script should be sourced into other zookeeper +# scripts to setup the env variables + +# We use ZOOCFGDIR if defined, +# otherwise we use /etc/zookeeper +# or the conf directory that is +# a sibling of this script's directory + +ZOOBINDIR="${ZOOBINDIR:-/usr/bin}" +ZOOKEEPER_PREFIX="${ZOOBINDIR}/.." +ZOOCFGDIR="/etc/zookeeper" + +if [ -f "${ZOOCFGDIR}/zookeeper-env.sh" ]; then + . "${ZOOCFGDIR}/zookeeper-env.sh" +fi + +if [ "x$ZOOCFG" = "x" ] +then + ZOOCFG="zoo.cfg" +fi + +ZOOCFG="$ZOOCFGDIR/$ZOOCFG" + +if [ -f "$ZOOCFGDIR/java.env" ] +then + . "$ZOOCFGDIR/java.env" +fi + +if [ "x${ZOO_LOG_DIR}" = "x" ] +then + ZOO_LOG_DIR="." +fi + +if [ "x${ZOO_LOG4J_PROP}" = "x" ] +then + ZOO_LOG4J_PROP="INFO,CONSOLE" +fi + +if [ "$JAVA_HOME" != "" ]; then + JAVA="$JAVA_HOME/bin/java" +else + JAVA=java +fi + +## TSTCLAIR: TODO +# + +#add the zoocfg dir to classpath +CLASSPATH="$ZOOCFGDIR:$CLASSPATH" + +for i in "$ZOOBINDIR"/../src/java/lib/*.jar +do + CLASSPATH="$i:$CLASSPATH" +done + +#make it work in the binary package +#(use array for LIBPATH to account for spaces within wildcard expansion) +if [ -e "${ZOOKEEPER_PREFIX}"/share/zookeeper/zookeeper-*.jar ]; then + LIBPATH=("${ZOOKEEPER_PREFIX}"/share/zookeeper/*.jar) +else + #release tarball format + for i in "$ZOOBINDIR"/../zookeeper-*.jar + do + CLASSPATH="$i:$CLASSPATH" + done + LIBPATH=("${ZOOBINDIR}"/../lib/*.jar) +fi + +for i in "${LIBPATH[@]}" +do + CLASSPATH="$i:$CLASSPATH" +done + +#echo "CLASSPATH=$CLASSPATH" diff --git a/zookeeper-3.4.4-build.patch b/zookeeper-3.4.4-build.patch deleted file mode 100644 index b6e2380..0000000 --- a/zookeeper-3.4.4-build.patch +++ /dev/null @@ -1,449 +0,0 @@ -diff -Nru zookeeper-3.4.4/build.xml zookeeper-3.4.4-gil/build.xml ---- zookeeper-3.4.4/build.xml 2012-09-17 10:34:37.000000000 +0200 -+++ zookeeper-3.4.4-gil/build.xml 2012-10-12 17:51:43.676211458 +0200 -@@ -36,7 +36,7 @@ - - - -- -+ - - - -@@ -89,46 +89,28 @@ - - - -- -- -- -- -- - - - - - -- -- -+ value="file:/usr/share/java/" /> -+ -+ - - - - - -- -- - - - -- -- -- -- -- -- - - - - - - -- -- - - - -@@ -198,7 +180,6 @@ - - - -- - - - -@@ -225,7 +206,7 @@ - - - -- -+ - - - -@@ -312,8 +293,8 @@ - - -- -+ - - - -@@ -329,32 +310,20 @@ - - - -+ pattern="${ivy.lib}/[artifact].[ext]"/> - - - - -+ pattern="${ivy.test.lib}/[artifact].[ext]"/> - - - - -- -- -- -- -- -- -- -- -- -- -+ pattern="${ivy.package.lib}/[artifact].[ext]"/> - - -- -+ - - -@@ -498,7 +467,6 @@ - - - -- - - - -@@ -541,7 +509,6 @@ - - - -- - - - -@@ -634,7 +601,7 @@ - - - - - -@@ -733,7 +700,7 @@ - - - - - -@@ -1094,9 +1061,6 @@ - - - -- -- -- - - - -@@ -1260,7 +1224,6 @@ - - - -- - - - -@@ -1304,50 +1267,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- Clover not found. Code coverage reports disabled. -- -- -- -- -- -- ################################################################## -- Clover not found. -- Please make sure clover.jar is in ANT_HOME/lib, or made available -- to Ant using other mechanisms like -lib or CLASSPATH. -- ################################################################## -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -@@ -1356,11 +1275,11 @@ - - - -+ classpath="${ivy.lib}/ant/ant-findbugs.jar" /> - - -- -+ - - - -@@ -1369,7 +1288,7 @@ - - - -- -+ - - - -@@ -1479,51 +1398,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -diff -Nru zookeeper-3.4.4/ivysettings.xml zookeeper-3.4.4-gil/ivysettings.xml ---- zookeeper-3.4.4/ivysettings.xml 2012-09-17 10:34:37.000000000 +0200 -+++ zookeeper-3.4.4-gil/ivysettings.xml 2012-10-12 17:02:35.706545077 +0200 -@@ -18,13 +18,13 @@ - --> - - -+ value="file:///usr/share/java/" override="false"/> - -+ value="file:///usr/share/java/" override="false"/> - -+ value="file:///usr/share/java/" override="false"/> - -+ value="[module]"/> - - - -diff -Nru zookeeper-3.4.4/ivy.xml zookeeper-3.4.4-gil/ivy.xml ---- zookeeper-3.4.4/ivy.xml 2012-09-17 10:34:37.000000000 +0200 -+++ zookeeper-3.4.4-gil/ivy.xml 2012-10-12 17:41:46.216338834 +0200 -@@ -39,36 +39,36 @@ - - - -- -- -+ -+ - - -- -- -+ -+ - -- -- -- -+ - -- -+ - -- -- -+ -- - -- -- - -- -+ - -+ rev="" conf="releaseaudit->default"/> - -+ rev="" conf="releaseaudit->default"/--> - - - diff --git a/zookeeper-3.4.5-build-contrib.patch b/zookeeper-3.4.5-build-contrib.patch deleted file mode 100644 index 8e988aa..0000000 --- a/zookeeper-3.4.5-build-contrib.patch +++ /dev/null @@ -1,133 +0,0 @@ -diff -Nru zookeeper-3.4.5/src/contrib/build-contrib.xml zookeeper-3.4.5-gil/src/contrib/build-contrib.xml ---- zookeeper-3.4.5/src/contrib/build-contrib.xml 2012-09-30 19:53:32.000000000 +0200 -+++ zookeeper-3.4.5-gil/src/contrib/build-contrib.xml 2013-04-27 11:51:59.684011892 +0200 -@@ -43,9 +43,9 @@ - - - -+ value="file:/usr/share/java/" /> - -- -+ - - - -@@ -70,24 +70,17 @@ - - - -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ - -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ - - - -@@ -103,7 +96,7 @@ - - - -- -+ - - - -@@ -133,7 +126,7 @@ - - - - -@@ -233,15 +226,9 @@ - - - -- -- - - - -- - - - -diff -Nru zookeeper-3.4.5/src/contrib/zooinspector/build.xml zookeeper-3.4.5-gil/src/contrib/zooinspector/build.xml ---- zookeeper-3.4.5/src/contrib/zooinspector/build.xml 2012-09-30 19:53:32.000000000 +0200 -+++ zookeeper-3.4.5-gil/src/contrib/zooinspector/build.xml 2013-04-27 11:42:13.257105341 +0200 -@@ -20,7 +20,7 @@ - - - -- -+ - - - -@@ -37,11 +37,11 @@ - - - -- -+ - - - -- -+ - - - -@@ -55,7 +55,6 @@ - - - -- - - - -@@ -140,12 +139,12 @@ - - - -- -+ - - - diff --git a/zookeeper-3.4.5-log4j.patch b/zookeeper-3.4.5-log4j.patch deleted file mode 100644 index a513ef3..0000000 --- a/zookeeper-3.4.5-log4j.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/conf/log4j.properties 2012-09-30 12:53:31.000000000 -0500 -+++ b/conf/log4j.properties 2013-06-25 12:28:56.833948571 -0500 -@@ -1,10 +1,11 @@ - # Define some default values that can be overridden by system properties --zookeeper.root.logger=INFO, CONSOLE -+zookeeper.root.logger=INFO, SYSTEMD - zookeeper.console.threshold=INFO --zookeeper.log.dir=. -+zookeeper.systemd.threshold=INFO -+zookeeper.log.dir=/var/log/zookeeper - zookeeper.log.file=zookeeper.log - zookeeper.log.threshold=DEBUG --zookeeper.tracelog.dir=. -+zookeeper.tracelog.dir=/var/log/zookeeper - zookeeper.tracelog.file=zookeeper_trace.log - - # -@@ -56,3 +57,8 @@ - log4j.appender.TRACEFILE.layout=org.apache.log4j.PatternLayout - ### Notice we are including log4j's NDC here (%x) - log4j.appender.TRACEFILE.layout.ConversionPattern=%d{ISO8601} [myid:%X{myid}] - %-5p [%t:%C{1}@%L][%x] - %m%n -+ -+log4j.appender.SYSTEMD=org.apache.log4j.ConsoleAppender -+log4j.appender.SYSTEMD.Threshold=${zookeeper.systemd.threshold} -+log4j.appender.SYSTEMD.layout=org.apache.log4j.PatternLayout -+log4j.appender.SYSTEMD.layout.ConversionPattern=[myid:%X{myid}] - %-5p [%t:%C{1}@%L] - %m%n diff --git a/zookeeper-3.4.6-ivy-build.patch b/zookeeper-3.4.6-ivy-build.patch new file mode 100644 index 0000000..437bd48 --- /dev/null +++ b/zookeeper-3.4.6-ivy-build.patch @@ -0,0 +1,52 @@ +diff --git a/build.xml b/build.xml +index 442d52e..bc1f4a2 100644 +--- a/build.xml ++++ b/build.xml +@@ -257,7 +257,7 @@ xmlns:maven="antlib:org.apache.maven.artifact.ant"> + + + +- ++ + + + +@@ -343,9 +343,9 @@ xmlns:maven="antlib:org.apache.maven.artifact.ant"> + + + +- ++ includes="ivy.jar" excludes="ivy.jar"/> ++ + + + +diff --git a/src/contrib/build-contrib.xml b/src/contrib/build-contrib.xml +index 0e57d08..708f64f 100644 +--- a/src/contrib/build-contrib.xml ++++ b/src/contrib/build-contrib.xml +@@ -103,7 +103,7 @@ + + + +- ++ + + + +@@ -219,9 +219,9 @@ + + + +- ++ includes="ivy.jar" excludes="ivy.jar"/> ++ + + + diff --git a/zookeeper.service b/zookeeper.service index 5cdb4b2..db4b2c9 100644 --- a/zookeeper.service +++ b/zookeeper.service @@ -6,17 +6,12 @@ ConditionPathExists=/etc/zookeeper/log4j.properties ConditionPathExists=/var/lib/zookeeper/data/myid [Service] -Type=simple +Type=forking User=zookeeper SyslogIdentifier=zookeeper WorkingDirectory=/var/lib/zookeeper - -#UMask=0027 -#Environment="CP=/etc/zookeeper:/usr/share/java/slf4j/slf4j-log4j12.jar:/usr/share/java/slf4j/slf4j-api.jar:/usr/share/java/netty.jar:/usr/share/java/log4j.jar:/usr/share/java/jline.jar:/usr/share/java/zookeeper/zookeeper.jar" -#Environment="IPv6=-Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true" -#Environment="JMX=-Dcom.sun.management.jmxremote" - -ExecStart=/usr/lib/jvm/jre-1.7.0/bin/java -cp $CP $JMX $IPv6 org.apache.zookeeper.server.quorum.QuorumPeerMain /etc/zookeeper/zoo.cfg +ExecStart=/usr/bin/zkServer.sh +#ExecStop= [Install] WantedBy=multi-user.target diff --git a/zookeeper.spec b/zookeeper.spec index 22b600d..ccde1b0 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -1,24 +1,22 @@ %global commit 601207e1151b2691112c431fc3b4130a85ac93b5 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global shortcommit %(c=%{commit}; echo ${c:0:7}) %global _hardened_build 1 +%global skiptests 1 Name: zookeeper Version: 3.4.6 Release: 1%{?dist} Summary: A high-performance coordination service for distributed applications -#Group: Development/Libraries License: ASL 2.0 and BSD URL: http://zookeeper.apache.org/ Source0: https://github.com/apache/zookeeper/archive/%{commit}/%{name}-%{version}-%{shortcommit}.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 - -#Patch2: %{name}-3.4.5-log4j.patch -#Patch2: %{name}-3.4.5-build-contrib.patch -#Patch5: %{name}-3.4.5-add-PIE-and-RELRO.patch +#Patch3: {name}-3.4.5-add-PIE-and-RELRO.patch BuildRequires: autoconf BuildRequires: automake @@ -43,8 +41,11 @@ BuildRequires: checkstyle BuildRequires: jline1 BuildRequires: jtoaster BuildRequires: junit -#BuildRequires: log4j12 -BuildRequires: log4j +%if 0%{?fedora} >= 21 +BuildRequires: mvn(org.slf4j:slf4j-log4j12) +%else +BuildRequires: mvn(log4j:log4j) +%endif BuildRequires: json_simple BuildRequires: mockito @@ -55,37 +56,6 @@ BuildRequires: xml-commons-apis BuildRequires: systemd -%description -ZooKeeper is a centralized service for maintaining configuration information, -naming, providing distributed synchronization, and providing group services. - -%package lib -Summary: Zookeeper C client library -#Group: System Environment/Libraries - -%description lib -ZooKeeper C client library for communicating with ZooKeeper Server. - -%package lib-devel -Summary: Development files for the %{name} library -#Group: Development/Libraries -Requires: %{name}-lib%{?_isa} = %{version}-%{release} - -%description lib-devel -Development files for the ZooKeeper C client library. - -%package lib-doc -Summary: Documentation for the %{name} library -#Group: Documentation -BuildArch: noarch - -%description lib-doc -Documentation for the ZooKeeper C client library. - -%package java -#Group: Development/Libraries -Summary: Zookeeper Java client library - Requires: checkstyle Requires: jline1 Requires: jtoaster @@ -94,56 +64,41 @@ Requires: log4j Requires: mockito Requires: netty3 Requires: slf4j - Requires: java Requires: jpackage-utils -BuildArch: noarch -%description java -This package provides a Java client interface to Zookeeper server. +%description +ZooKeeper is a centralized service for maintaining configuration information, +naming, providing distributed synchronization, and providing group services. + +%package devel +Summary: Development files for the %{name} library +Requires: %{name}-lib%{?_isa} = %{version}-%{release} + +%description devel +Development files for the ZooKeeper C client library. %package javadoc -#Group: Documentation Summary: Javadoc for %{name} -BuildArch: noarch %description javadoc This package contains javadoc for %{name}. -%package -n python-ZooKeeper -#Group: Development/Libraries -Summary: ZooKeeper python binding library +%package -n python-%{name} +Summary: Python support for %{name} Requires: %{name}-lib%{?_isa} = %{version}-%{release} Provides: zkpython%{?_isa} = %{version}-%{release} +Requires: python2 -%description -n python-ZooKeeper -ZooKeeper python binding library - -%package server -#Group: System Environment/Daemons -Summary: ZooKeeper server -Requires: %{name}-java = %{version}-%{release} -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd -Requires(pre): shadow-utils -BuildArch: noarch - -%description server -ZooKeeper server +%description -n python-%{name} +The python-%{name} package contains Python bindings for %{name}. %prep %setup -q -n %{name}-%{commit} %patch1 -p0 %patch2 -p1 -#%patch3 -p1 -#%patch4 -p1 - -# - -#cp -p %{SOURCE1} dist-maven/%{name}-%{version}-ZooInspector.pom -#sed -i "s|@version@|%{version}|" dist-maven/%{name}-%{version}-ZooInspector.pom +#%%patch3 -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 @@ -159,50 +114,54 @@ sed -i 's@^dataDir=.*$@dataDir=%{_sharedstatedir}/zookeeper/data\ndataLogDir=%{_ -Djavadoc.link.java=%{_javadocdir}/java \ -Dant.build.javac.source=1.5 \ -Dant.build.javac.target=1.5 \ --Ddist.dir=%{buildroot} \ -package-native +package -#Compile zktreeutil -# TODO - determine why it's not part of the default build -pushd src/contrib/zktreeutil -rm -rf autom4te.cache +pushd src/c autoreconf -if %configure %{__make} %{?_smp_mflags} popd +## TODO: install utilities? + %check -%ant -Divy.mode=local \ -test +%if %skiptests + echo "Testing disabled, please enable in mock" +%else + %ant -Divy.mode=local test +%endif %install +#install the c tools +pushd src/c +%make_install +popd + +# install the java dependencies. mkdir -p %{buildroot}%{_javadir}/%{name} install -pm 644 build/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar install -pm 644 build/%{name}-%{version}-test.jar %{buildroot}%{_javadir}/%{name}/%{name}-tests.jar install -pm 644 build/contrib/ZooInspector/%{name}-%{version}-ZooInspector.jar %{buildroot}%{_javadir}/%{name}/%{name}-ZooInspector.jar +install -pm 755 bin/zkCleanup.sh %{buildroot}%{_bindir} +install -pm 755 bin/zkCli.sh %{buildroot}%{_bindir} +install -pm 755 bin/zkServer.sh %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_libexecdir} +install -pm 755 %{SOURCE3} %{buildroot}%{_libexecdir} + +%if 0%{?fedora} >= 21 +mkdir -p %{buildroot}%{_datadir}/maven-metadata +mkdir -p %{buildroot}%{_datadir}/maven-poms/%{name} + +%add_maven_depmap %{name}-%{name}.pom %{name}/%{name}.jar +%add_maven_depmap org.apache.zookeeper:zookeeper::tests:%{version} %{name}/%{name}-tests.jar + +install -pm 644 %{SOURCE1} %{buildroot}%{_datadir}/maven-poms/%{name}/%{name}-%{name}-ZooInspector.pom +sed -i "s|@version@|%{version}|" %{buildroot}%{_datadir}/maven-poms/%{name}/%{name}-%{name}-ZooInspector.pom +%add_maven_depmap %{name}-%{name}-ZooInspector.pom %{name}/%{name}-ZooInspector.jar +%else mkdir -p %{buildroot}%{_mavenpomdir} -install -pm 644 build/%{name}-%{version}/dist-maven/%{name}.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom - -#################################################### -# we will need to do our pom cleanup here. -#%pom_remove_dep org.vafer:jdeb dist-maven/%{name}-%{version}.pom -# jdiff task deps -#%pom_remove_dep jdiff:jdiff dist-maven/%{name}-%{version}.pom -#%pom_remove_dep xerces:xerces dist-maven/%{name}-%{version}.pom -# rat-lib task deps -#%pom_remove_dep org.apache.rat:apache-rat-tasks dist-maven/%{name}-%{version}.pom -#%pom_remove_dep commons-collections:commons-collections dist-maven/%{name}-%{version}.pom -#%pom_remove_dep commons-lang:commons-lang dist-maven/%{name}-%{version}.pom - -#sed -i "s|0.9.94|1.0|" dist-maven/%{name}-%{version}.pom -#sed -i "s|3.2.2.Final|3.6.6.Final|" dist-maven/%{name}-%{version}.pom -#sed -i "s|org.jboss.netty|io.netty|" dist-maven/%{name}-%{version}.pom - -#sed -i "s|pom|jar|" dist-maven/%{name}-%{version}.pom -#sed -i "s|checkstyle|com.puppycrawl.tools|" dist-maven/%{name}-%{version}.pom -#sed -i "s|mockito-all|mockito-core|" dist-maven/%{name}-%{version}.pom -#################################################### +install -pm 644 build/%{name}-%{version}/dist-maven/%{name}-%{version}.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom %add_maven_depmap JPP.%{name}-%{name}.pom %{name}/%{name}.jar %add_maven_depmap org.apache.zookeeper:zookeeper::tests:%{version} %{name}/%{name}-tests.jar @@ -211,26 +170,19 @@ install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-ZooIn sed -i "s|@version@|%{version}|" %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-ZooInspector.pom %add_maven_depmap JPP.%{name}-%{name}-ZooInspector.pom %{name}/%{name}-ZooInspector.jar +%endif + mkdir -p %{buildroot}%{_javadocdir}/%{name} cp -pr build/docs/api/* %{buildroot}%{_javadocdir}/%{name}/ -#pushd build/c -#%{__make} install DESTDIR=%{buildroot} -# cleanup -#rm -f docs/html/*.map -#popd - -#pushd src/contrib/zktreeutil -#%{__make} install DESTDIR=%{buildroot} -#popd - -pushd build/contrib/zkpython +pushd src/contrib/zkpython %{__python} src/python/setup.py build --build-base=$PWD/build \ install --root=%{buildroot} ;\ chmod 0755 %{buildroot}%{python_sitearch}/zookeeper.so popd find %{buildroot} -name '*.la' -exec rm -f {} ';' +find %{buildroot} -name '*.a' -exec rm -f {} ';' mkdir -p %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_sysconfdir}/zookeeper @@ -244,68 +196,45 @@ install -p -m 0640 conf/zoo_sample.cfg %{buildroot}%{_sysconfdir}/zookeeper touch %{buildroot}%{_sysconfdir}/zookeeper/zoo.cfg touch %{buildroot}%{_sharedstatedir}/zookeeper/data/myid -# TODO -# bin/zkCleanup.sh -# bin/zkCli.sh -# bin/zkEnv.sh - -%post lib -p /sbin/ldconfig -%postun lib -p /sbin/ldconfig - -%pre server +%pre getent group zookeeper >/dev/null || groupadd -r zookeeper getent passwd zookeeper >/dev/null || \ useradd -r -g zookeeper -d %{_sharedstatedir}/zookeeper -s /sbin/nologin \ -c "ZooKeeper service account" zookeeper -%post server -%systemd_post zookeeper.service -%preun server +%post +%systemd_post zookeeper.service +/sbin/ldconfig + +%preun %systemd_preun zookeeper.service -%postun server +%postun %systemd_postun_with_restart zookeeper.service +/sbin/ldconfig %files %{_bindir}/cli_mt %{_bindir}/cli_st %{_bindir}/load_gen -%{_bindir}/zktreeutil -%doc src/c/ChangeLog src/c/LICENSE src/c/NOTICE.txt src/c/README src/contrib/zktreeutil/README.txt - -%files lib +%{_bindir}/zk*.sh +%{_libexecdir}/zkEnv.sh %{_libdir}/lib*.so.* -%doc src/c/LICENSE src/c/NOTICE.txt - -%files lib-devel -%dir %{_includedir}/%{name} -%{_includedir}/%{name}/*.h -%{_libdir}/*.so -%doc src/c/LICENSE src/c/NOTICE.txt - -%files lib-doc -%doc src/c/LICENSE src/c/NOTICE.txt src/c/docs/html/* - -%files java %dir %{_javadir}/%{name} %{_javadir}/%{name}/%{name}.jar %{_javadir}/%{name}/%{name}-tests.jar %{_javadir}/%{name}/%{name}-ZooInspector.jar + +%if 0%{?fedora} >= 21 +%{_datadir}/maven-poms/%{name}/%{name}-%{name}.pom +%{_datadir}/maven-poms/%{name}/%{name}-%{name}-ZooInspector.pom +%{_datadir}/maven-metadata/%{name}.xml +%else +%{_mavendepmapfragdir}/%{name} %{_mavenpomdir}/JPP.%{name}-%{name}.pom %{_mavenpomdir}/JPP.%{name}-%{name}-ZooInspector.pom -%{_mavendepmapfragdir}/%{name} -%doc CHANGES.txt LICENSE.txt NOTICE.txt README.txt +%endif -%files javadoc -%{_javadocdir}/%{name} -%doc LICENSE.txt NOTICE.txt - -%files -n python-ZooKeeper -%{python_sitearch}/ZooKeeper-?.?-py%{python_version}.egg-info -%{python_sitearch}/zookeeper.so -%doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README - -%files server %attr(0755,root,root) %dir %{_sysconfdir}/zookeeper %attr(0644,root,root) %ghost %config(noreplace) %{_sysconfdir}/zookeeper/zoo.cfg %attr(0644,root,root) %{_sysconfdir}/zookeeper/zoo_sample.cfg @@ -317,8 +246,27 @@ getent passwd zookeeper >/dev/null || \ %attr(0640,zookeeper,zookeeper) %ghost %{_sharedstatedir}/zookeeper/data/myid %attr(0750,zookeeper,zookeeper) %dir %{_sharedstatedir}/zookeeper/log %{_unitdir}/zookeeper.service +%doc CHANGES.txt LICENSE.txt NOTICE.txt README.txt + +%files devel +%{_includedir}/%{name}/ +%{_libdir}/*.so +%doc src/c/LICENSE src/c/NOTICE.txt + +%files javadoc +%{_javadocdir}/%{name} +%doc LICENSE.txt NOTICE.txt + +%files -n python-%{name} +%{python_sitearch}/ZooKeeper-?.?-py%{python_version}.egg-info +%{python_sitearch}/zookeeper.so +%doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Wed Oct 8 2014 Timothy St. Clair - 3.4.6-1 +- Update to latest stable series +- Cleanup and overhaul package + * Mon Aug 18 2014 Fedora Release Engineering - 3.4.5-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 4ae4bc6c6e2e15085b998059e3e7eb6af9fff9f7 Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Thu, 16 Oct 2014 11:09:30 -0500 Subject: [PATCH 27/73] Builds on f20 --- zookeeper-3.4.6-ivy-build.patch | 69 +++++++++++++++++++++++++++++++++ zookeeper.spec | 15 +++---- 2 files changed, 77 insertions(+), 7 deletions(-) diff --git a/zookeeper-3.4.6-ivy-build.patch b/zookeeper-3.4.6-ivy-build.patch index 437bd48..09c1e97 100644 --- a/zookeeper-3.4.6-ivy-build.patch +++ b/zookeeper-3.4.6-ivy-build.patch @@ -24,6 +24,62 @@ index 442d52e..bc1f4a2 100644 +diff --git a/ivy.xml b/ivy.xml +index 561832a..0d9e2ed 100644 +--- a/ivy.xml ++++ b/ivy.xml +@@ -58,12 +58,12 @@ + + +- + + +- + + + +- +- +- +- +- + + ++ + +- +- +- ++ + + +- +- +- ++ + + + diff --git a/src/contrib/build-contrib.xml b/src/contrib/build-contrib.xml index 0e57d08..708f64f 100644 --- a/src/contrib/build-contrib.xml @@ -50,3 +106,16 @@ index 0e57d08..708f64f 100644 +diff --git a/src/contrib/build.xml b/src/contrib/build.xml +index 7f7ba4f..701dfea 100644 +--- a/src/contrib/build.xml ++++ b/src/contrib/build.xml +@@ -20,7 +20,7 @@ + + + +- ++ + + + diff --git a/zookeeper.spec b/zookeeper.spec index ccde1b0..17e49ff 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -43,6 +43,7 @@ BuildRequires: jtoaster BuildRequires: junit %if 0%{?fedora} >= 21 BuildRequires: mvn(org.slf4j:slf4j-log4j12) +BuildRequires: javapackages-tools %else BuildRequires: mvn(log4j:log4j) %endif @@ -118,7 +119,7 @@ package pushd src/c autoreconf -if -%configure +%configure --disable-static --disable-rpath %{__make} %{?_smp_mflags} popd @@ -151,13 +152,14 @@ install -pm 755 %{SOURCE3} %{buildroot}%{_libexecdir} %if 0%{?fedora} >= 21 mkdir -p %{buildroot}%{_datadir}/maven-metadata -mkdir -p %{buildroot}%{_datadir}/maven-poms/%{name} +mkdir -p %{buildroot}%{_datadir}/maven-poms +install -pm 644 build/%{name}-%{version}/dist-maven/%{name}-%{version}.pom %{buildroot}%{_datadir}/maven-poms/%{name}-%{name}.pom %add_maven_depmap %{name}-%{name}.pom %{name}/%{name}.jar %add_maven_depmap org.apache.zookeeper:zookeeper::tests:%{version} %{name}/%{name}-tests.jar -install -pm 644 %{SOURCE1} %{buildroot}%{_datadir}/maven-poms/%{name}/%{name}-%{name}-ZooInspector.pom -sed -i "s|@version@|%{version}|" %{buildroot}%{_datadir}/maven-poms/%{name}/%{name}-%{name}-ZooInspector.pom +install -pm 644 %{SOURCE1} %{buildroot}%{_datadir}/maven-poms/%{name}-%{name}-ZooInspector.pom +sed -i "s|@version@|%{version}|" %{buildroot}%{_datadir}/maven-poms/%{name}-%{name}-ZooInspector.pom %add_maven_depmap %{name}-%{name}-ZooInspector.pom %{name}/%{name}-ZooInspector.jar %else mkdir -p %{buildroot}%{_mavenpomdir} @@ -169,7 +171,6 @@ install -pm 644 build/%{name}-%{version}/dist-maven/%{name}-%{version}.pom %{bui install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-ZooInspector.pom sed -i "s|@version@|%{version}|" %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-ZooInspector.pom %add_maven_depmap JPP.%{name}-%{name}-ZooInspector.pom %{name}/%{name}-ZooInspector.jar - %endif mkdir -p %{buildroot}%{_javadocdir}/%{name} @@ -226,8 +227,8 @@ getent passwd zookeeper >/dev/null || \ %{_javadir}/%{name}/%{name}-ZooInspector.jar %if 0%{?fedora} >= 21 -%{_datadir}/maven-poms/%{name}/%{name}-%{name}.pom -%{_datadir}/maven-poms/%{name}/%{name}-%{name}-ZooInspector.pom +%{_datadir}/maven-poms/%{name}-%{name}.pom +%{_datadir}/maven-poms/%{name}-%{name}-ZooInspector.pom %{_datadir}/maven-metadata/%{name}.xml %else %{_mavendepmapfragdir}/%{name} From fb05f8bb58d7a55e420f138824e01ebe02bdf95d Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Fri, 17 Oct 2014 14:53:59 -0500 Subject: [PATCH 28/73] stable builds --- zookeeper-3.4.6-ivy-build.patch | 492 +++++++++++++++++++++++++++++++- zookeeper.spec | 12 +- 2 files changed, 499 insertions(+), 5 deletions(-) diff --git a/zookeeper-3.4.6-ivy-build.patch b/zookeeper-3.4.6-ivy-build.patch index 09c1e97..075cbfa 100644 --- a/zookeeper-3.4.6-ivy-build.patch +++ b/zookeeper-3.4.6-ivy-build.patch @@ -25,9 +25,23 @@ index 442d52e..bc1f4a2 100644 diff --git a/ivy.xml b/ivy.xml -index 561832a..0d9e2ed 100644 +index 561832a..93176d5 100644 --- a/ivy.xml +++ b/ivy.xml +@@ -46,10 +46,10 @@ + + + +- +- ++ ++ + +- ++ + + + @@ -58,12 +58,12 @@ - - -+ ++ - @@ -119,3 +134,472 @@ 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 +--- a/src/contrib/rest/build.xml ++++ /dev/null +@@ -1,167 +0,0 @@ +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- Tests failed! +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +diff --git a/src/contrib/rest/ivy.xml b/src/contrib/rest/ivy.xml +deleted file mode 100644 +index 903d390..0000000 +--- a/src/contrib/rest/ivy.xml ++++ /dev/null +@@ -1,48 +0,0 @@ +- +- +- +- +- +- +- +- ZooKeeper REST +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +diff --git a/src/contrib/rest/oldbuild._xml b/src/contrib/rest/oldbuild._xml +new file mode 100644 +index 0000000..649dff7 +--- /dev/null ++++ b/src/contrib/rest/oldbuild._xml +@@ -0,0 +1,167 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ 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/zooinspector/ivy.xml b/src/contrib/zooinspector/ivy.xml +index 4e5107e..ac71a9b 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 ++ diff --git a/zookeeper.spec b/zookeeper.spec index 17e49ff..59d0d7f 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -17,6 +17,8 @@ Source3: zkEnv.sh Patch1: %{name}-3.4.5-zktreeutil-gcc.patch Patch2: %{name}-3.4.6-ivy-build.patch #Patch3: {name}-3.4.5-add-PIE-and-RELRO.patch +# The native bits don't compile on ARM +ExcludeArch: %{arm} BuildRequires: autoconf BuildRequires: automake @@ -41,12 +43,16 @@ BuildRequires: checkstyle BuildRequires: jline1 BuildRequires: jtoaster BuildRequires: junit +BuildRequires: jdiff %if 0%{?fedora} >= 21 BuildRequires: mvn(org.slf4j:slf4j-log4j12) BuildRequires: javapackages-tools +Requires: log4j12 %else BuildRequires: mvn(log4j:log4j) +Requires: log4j %endif + BuildRequires: json_simple BuildRequires: mockito @@ -55,13 +61,16 @@ BuildRequires: slf4j BuildRequires: xerces-j2 BuildRequires: xml-commons-apis +# remove later on. +BuildRequires: apache-commons-parent +BuildRequires: jetty-server +BuildRequires: jetty-servlet BuildRequires: systemd Requires: checkstyle Requires: jline1 Requires: jtoaster Requires: junit -Requires: log4j Requires: mockito Requires: netty3 Requires: slf4j @@ -111,6 +120,7 @@ sed -i 's@^dataDir=.*$@dataDir=%{_sharedstatedir}/zookeeper/data\ndataLogDir=%{_ %build %ant -Divy.mode=local \ +-DCLASSPATH=/usr/share/java/log4j12-1.2.17.jar \ -Dtarget.jdk=1.5 \ -Djavadoc.link.java=%{_javadocdir}/java \ -Dant.build.javac.source=1.5 \ From 8ba2394f55adb8149a3523d40333a1ca6458fb94 Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Tue, 21 Oct 2014 16:02:21 -0500 Subject: [PATCH 29/73] Updates for system testing --- zkEnv.sh | 32 +++----------------------------- zookeeper-3.4.6-server.patch | 20 ++++++++++++++++++++ zookeeper.service | 11 +++++++++-- zookeeper.spec | 31 ++++++++++++++++++++++++------- 4 files changed, 56 insertions(+), 38 deletions(-) create mode 100644 zookeeper-3.4.6-server.patch diff --git a/zkEnv.sh b/zkEnv.sh index 122a948..f06361d 100755 --- a/zkEnv.sh +++ b/zkEnv.sh @@ -26,6 +26,7 @@ ZOOBINDIR="${ZOOBINDIR:-/usr/bin}" ZOOKEEPER_PREFIX="${ZOOBINDIR}/.." ZOOCFGDIR="/etc/zookeeper" +ZOO_LOG_DIR="/var/log/zookeeper" if [ -f "${ZOOCFGDIR}/zookeeper-env.sh" ]; then . "${ZOOCFGDIR}/zookeeper-env.sh" @@ -59,33 +60,6 @@ else JAVA=java fi -## TSTCLAIR: TODO -# - +## TSTCLAIR: May need to add jar soup to classpath #add the zoocfg dir to classpath -CLASSPATH="$ZOOCFGDIR:$CLASSPATH" - -for i in "$ZOOBINDIR"/../src/java/lib/*.jar -do - CLASSPATH="$i:$CLASSPATH" -done - -#make it work in the binary package -#(use array for LIBPATH to account for spaces within wildcard expansion) -if [ -e "${ZOOKEEPER_PREFIX}"/share/zookeeper/zookeeper-*.jar ]; then - LIBPATH=("${ZOOKEEPER_PREFIX}"/share/zookeeper/*.jar) -else - #release tarball format - for i in "$ZOOBINDIR"/../zookeeper-*.jar - do - CLASSPATH="$i:$CLASSPATH" - done - LIBPATH=("${ZOOBINDIR}"/../lib/*.jar) -fi - -for i in "${LIBPATH[@]}" -do - CLASSPATH="$i:$CLASSPATH" -done - -#echo "CLASSPATH=$CLASSPATH" +CLASSPATH="/usr/share/java/objectweb-asm/asm.jar:/usr/share/java/antlr.jar:/usr/share/java/avalon-framework-api.jar:/usr/share/java/avalon-logkit.jar:/usr/share/java/cglib.jar:/usr/share/java/checkstyle.jar:/usr/share/java/commons-beanutils.jar:/usr/share/java/commons-cli.jar:/usr/share/java/commons-logging.jar:/usr/share/java/geronimo-jms_1.1_spec.jar:/usr/share/java/guava.jar:/usr/share/java/hamcrest/all.jar:/usr/share/java/hamcrest/core.jar:/usr/share/java/hamcrest/text.jar:/usr/share/java/hamcrest/library.jar:/usr/share/java/hamcrest/generator.jar:/usr/share/java/hamcrest/integration.jar:/usr/share/java/javax.mail/javax.mail.jar:/usr/share/java/jdiff.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jline.jar:/usr/share/java/jtoaster.jar:/usr/share/java/junit.jar:/usr/share/java/jzlib.jar:/usr/share/java/log4j.jar:/usr/share/java/mockito.jar:/usr/share/java/netty.jar:/usr/share/java/objenesis/objenesis-tck.jar:/usr/share/java/objenesis/objenesis.jar:/usr/share/java/slf4j/log4j12.jar:/usr/share/java/slf4j/api.jar:/usr/share/java/slf4j/slf4j-ext.jar:/usr/share/java/slf4j/slf4j-site.jar:/usr/share/java/slf4j/log4j-over-slf4j.jar:/usr/share/java/slf4j/jcl.jar:/usr/share/java/slf4j/jul-to-slf4j.jar:/usr/share/java/slf4j/ext.jar:/usr/share/java/slf4j/slf4j-jdk14.jar:/usr/share/java/slf4j/simple.jar:/usr/share/java/slf4j/nop.jar:/usr/share/java/slf4j/jcl-over-slf4j.jar:/usr/share/java/slf4j/slf4j-migrator.jar:/usr/share/java/slf4j/migrator.jar:/usr/share/java/slf4j/slf4j-simple.jar:/usr/share/java/slf4j/slf4j-log4j12.jar:/usr/share/java/slf4j/slf4j-api.jar:/usr/share/java/slf4j/slf4j-nop.jar:/usr/share/java/slf4j/site.jar:/usr/share/java/slf4j/jdk14.jar:/usr/share/java/slf4j/slf4j-jcl.jar:/usr/share/java/slf4j/log4j12.jar:/usr/share/java/slf4j/api.jar:/usr/share/java/slf4j/slf4j-ext.jar:/usr/share/java/slf4j/slf4j-site.jar:/usr/share/java/slf4j/log4j-over-slf4j.jar:/usr/share/java/slf4j/jcl.jar:/usr/share/java/slf4j/jul-to-slf4j.jar:/usr/share/java/slf4j/ext.jar:/usr/share/java/slf4j/slf4j-jdk14.jar:/usr/share/java/slf4j/simple.jar:/usr/share/java/slf4j/nop.jar:/usr/share/java/slf4j/jcl-over-slf4j.jar:/usr/share/java/slf4j/slf4j-migrator.jar:/usr/share/java/slf4j/migrator.jar:/usr/share/java/slf4j/slf4j-simple.jar:/usr/share/java/slf4j/slf4j-log4j12.jar:/usr/share/java/slf4j/slf4j-api.jar:/usr/share/java/slf4j/slf4j-nop.jar:/usr/share/java/slf4j/site.jar:/usr/share/java/slf4j/jdk14.jar:/usr/share/java/slf4j/slf4j-jcl.jar:/usr/share/java/tomcat-servlet-api.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar" diff --git a/zookeeper-3.4.6-server.patch b/zookeeper-3.4.6-server.patch new file mode 100644 index 0000000..d505ad3 --- /dev/null +++ b/zookeeper-3.4.6-server.patch @@ -0,0 +1,20 @@ +diff --git a/bin/zkServer.sh b/bin/zkServer.sh +index 0490982..b4766e5 100755 +--- a/bin/zkServer.sh ++++ b/bin/zkServer.sh +@@ -69,14 +69,7 @@ then + 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 ++KILL=kill + + echo "Using config: $ZOOCFG" >&2 + diff --git a/zookeeper.service b/zookeeper.service index db4b2c9..817bbc0 100644 --- a/zookeeper.service +++ b/zookeeper.service @@ -10,8 +10,15 @@ Type=forking User=zookeeper SyslogIdentifier=zookeeper WorkingDirectory=/var/lib/zookeeper -ExecStart=/usr/bin/zkServer.sh -#ExecStop= +ExecStart=/usr/bin/zkServer.sh start zoo.cfg +ExecStop=/usr/bin/zkServer.sh stop + +User=root +Group=root +# TODO: check updated permissions. +# Group=zookeeper +Restart=always +RestartSec=20 [Install] WantedBy=multi-user.target diff --git a/zookeeper.spec b/zookeeper.spec index 17e49ff..988c9bd 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -16,7 +16,10 @@ Source3: zkEnv.sh Patch1: %{name}-3.4.5-zktreeutil-gcc.patch Patch2: %{name}-3.4.6-ivy-build.patch -#Patch3: {name}-3.4.5-add-PIE-and-RELRO.patch +Patch3: %{name}-3.4.6-server.patch + +# The native bits don't compile on ARM +ExcludeArch: %{arm} BuildRequires: autoconf BuildRequires: automake @@ -41,12 +44,16 @@ BuildRequires: checkstyle BuildRequires: jline1 BuildRequires: jtoaster BuildRequires: junit +BuildRequires: jdiff %if 0%{?fedora} >= 21 BuildRequires: mvn(org.slf4j:slf4j-log4j12) BuildRequires: javapackages-tools +Requires: log4j12 %else BuildRequires: mvn(log4j:log4j) +Requires: log4j %endif + BuildRequires: json_simple BuildRequires: mockito @@ -55,13 +62,16 @@ BuildRequires: slf4j BuildRequires: xerces-j2 BuildRequires: xml-commons-apis +# remove later on. +BuildRequires: apache-commons-parent +BuildRequires: jetty-server +BuildRequires: jetty-servlet BuildRequires: systemd Requires: checkstyle Requires: jline1 Requires: jtoaster Requires: junit -Requires: log4j Requires: mockito Requires: netty3 Requires: slf4j @@ -74,20 +84,21 @@ naming, providing distributed synchronization, and providing group services. %package devel Summary: Development files for the %{name} library -Requires: %{name}-lib%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel Development files for the ZooKeeper C client library. %package javadoc Summary: Javadoc for %{name} +BuildArch: noarch %description javadoc This package contains javadoc for %{name}. %package -n python-%{name} Summary: Python support for %{name} -Requires: %{name}-lib%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Provides: zkpython%{?_isa} = %{version}-%{release} Requires: python2 @@ -99,7 +110,7 @@ The python-%{name} package contains Python bindings for %{name}. %patch1 -p0 %patch2 -p1 -#%%patch3 -p1 +%patch3 -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 @@ -133,6 +144,11 @@ popd %endif %install + +# the following is used to update zkEnv.sh +# find . -name "*.jar" -exec basename {} \; |sort|uniq +# remove items that don't belong and update execute build-classpath + #install the c tools pushd src/c %make_install @@ -241,11 +257,11 @@ getent passwd zookeeper >/dev/null || \ %attr(0644,root,root) %{_sysconfdir}/zookeeper/zoo_sample.cfg %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/zookeeper/log4j.properties -%attr(0750,zookeeper,zookeeper) %dir %{_localstatedir}/log/zookeeper +%attr(0755,zookeeper,zookeeper) %dir %{_localstatedir}/log/zookeeper %attr(0755,root,root) %dir %{_sharedstatedir}/zookeeper %attr(0750,zookeeper,zookeeper) %dir %{_sharedstatedir}/zookeeper/data %attr(0640,zookeeper,zookeeper) %ghost %{_sharedstatedir}/zookeeper/data/myid -%attr(0750,zookeeper,zookeeper) %dir %{_sharedstatedir}/zookeeper/log +%attr(0755,zookeeper,zookeeper) %dir %{_sharedstatedir}/zookeeper/log %{_unitdir}/zookeeper.service %doc CHANGES.txt LICENSE.txt NOTICE.txt README.txt @@ -267,6 +283,7 @@ getent passwd zookeeper >/dev/null || \ * Wed Oct 8 2014 Timothy St. Clair - 3.4.6-1 - Update to latest stable series - Cleanup and overhaul package +- Updated system integration * Mon Aug 18 2014 Fedora Release Engineering - 3.4.5-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From d34422e89f5ac46f37bf4b2d7f49d557fe45d3b6 Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Tue, 21 Oct 2014 16:07:32 -0500 Subject: [PATCH 30/73] update sources and changelog prior to build --- .gitignore | 1 + zookeeper.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f69aee1..2445ab2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /zookeeper-3.4.5.tar.gz +/zookeeper-3.4.6-601207e.tar.gz diff --git a/zookeeper.spec b/zookeeper.spec index 988c9bd..38652d7 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -280,7 +280,7 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog -* Wed Oct 8 2014 Timothy St. Clair - 3.4.6-1 +* Tue Oct 21 2014 Timothy St. Clair - 3.4.6-1 - Update to latest stable series - Cleanup and overhaul package - Updated system integration From 74f0681add25282a289b70f3e1462309e45feceb Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Wed, 22 Oct 2014 08:11:43 -0500 Subject: [PATCH 31/73] update for builds --- zookeeper.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/zookeeper.spec b/zookeeper.spec index f1d92f0..0c72135 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -39,25 +39,29 @@ BuildRequires: python-devel BuildRequires: ant BuildRequires: ant-junit BuildRequires: apache-ivy -BuildRequires: ivy-local BuildRequires: checkstyle -BuildRequires: jline1 +BuildRequires: ivy-local +BuildRequires: javapackages-tools + BuildRequires: jtoaster BuildRequires: junit BuildRequires: jdiff %if 0%{?fedora} >= 21 BuildRequires: mvn(org.slf4j:slf4j-log4j12) BuildRequires: javapackages-tools +BuildRequires: jline1 +BuildRequires: netty3 Requires: log4j12 %else BuildRequires: mvn(log4j:log4j) +BuildRequires: jline +BuildRequires: netty Requires: log4j %endif BuildRequires: json_simple BuildRequires: mockito -BuildRequires: netty3 BuildRequires: slf4j BuildRequires: xerces-j2 BuildRequires: xml-commons-apis From ac1ff2c22c4310ac2a80c8dba07abccdc6539be6 Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Wed, 22 Oct 2014 08:39:31 -0500 Subject: [PATCH 32/73] Minor Cleaning --- zookeeper.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index 0c72135..a4dcbc0 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -48,7 +48,6 @@ BuildRequires: junit BuildRequires: jdiff %if 0%{?fedora} >= 21 BuildRequires: mvn(org.slf4j:slf4j-log4j12) -BuildRequires: javapackages-tools BuildRequires: jline1 BuildRequires: netty3 Requires: log4j12 From 6935cdf440264638a0579bf789df6e5049d42f2c Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Wed, 22 Oct 2014 09:04:35 -0500 Subject: [PATCH 33/73] Update per mizdebsk recommendation --- zookeeper.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/zookeeper.spec b/zookeeper.spec index a4dcbc0..948e129 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -48,6 +48,7 @@ BuildRequires: junit BuildRequires: jdiff %if 0%{?fedora} >= 21 BuildRequires: mvn(org.slf4j:slf4j-log4j12) +BuildRequires: objectweb-pom BuildRequires: jline1 BuildRequires: netty3 Requires: log4j12 From ddc2a441e357609e8d73a3c4529303374b3c314d Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Wed, 22 Oct 2014 16:05:34 -0500 Subject: [PATCH 34/73] Update to enable arm again --- mt_adaptor.c.patch | 32 ++++++++++++++++++++++++++++++++ zookeeper.spec | 5 ++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 mt_adaptor.c.patch diff --git a/mt_adaptor.c.patch b/mt_adaptor.c.patch new file mode 100644 index 0000000..6d7563f --- /dev/null +++ b/mt_adaptor.c.patch @@ -0,0 +1,32 @@ +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 @@ + int32_t fetch_and_add(volatile int32_t* operand, int incr) + { + #ifndef WIN32 +- int32_t result; +- asm __volatile__( +- "lock xaddl %0,%1\n" +- : "=r"(result), "=m"(*(int *)operand) +- : "0"(incr) +- : "memory"); +- return result; ++ return __sync_fetch_and_add(operand, incr); + #else +- volatile int32_t result; +- _asm +- { +- mov eax, operand; //eax = v; +- mov ebx, incr; // ebx = i; +- mov ecx, 0x0; // ecx = 0; +- lock xadd dword ptr [eax], ecx; +- lock xadd dword ptr [eax], ebx; +- mov result, ecx; // result = ebx; +- } +- return result; ++ return InterlockedExchangeAdd(operand, incr); + #endif + } + diff --git a/zookeeper.spec b/zookeeper.spec index 948e129..20fdccc 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -17,9 +17,11 @@ 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 # The native bits don't compile on ARM -ExcludeArch: %{arm} +##ExcludeArch: %%{arm} BuildRequires: autoconf BuildRequires: automake @@ -115,6 +117,7 @@ The python-%{name} package contains Python bindings for %{name}. %patch1 -p0 %patch2 -p1 %patch3 -p1 +%patch4 -p0 -F2 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 From b1ff57a935272a733a65029ee189d13965aa49fc Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Thu, 23 Oct 2014 09:05:13 -0500 Subject: [PATCH 35/73] Fixes from last build --- zookeeper.spec | 49 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/zookeeper.spec b/zookeeper.spec index 20fdccc..7d612fa 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -5,7 +5,7 @@ Name: zookeeper Version: 3.4.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: http://zookeeper.apache.org/ @@ -20,8 +20,6 @@ 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 -# The native bits don't compile on ARM -##ExcludeArch: %%{arm} BuildRequires: autoconf BuildRequires: automake @@ -83,11 +81,13 @@ Requires: netty3 Requires: slf4j Requires: java Requires: jpackage-utils +Requires: %{name}-java = %{version}-%{release} %description ZooKeeper is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services. +############################################## %package devel Summary: Development files for the %{name} library Requires: %{name}%{?_isa} = %{version}-%{release} @@ -95,6 +95,16 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description devel Development files for the ZooKeeper C client library. +############################################## +%package java +Summary: Java interface for %{name} +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description java +The %{name}-java package contains Java bindings for %{name}. + +############################################## %package javadoc Summary: Javadoc for %{name} BuildArch: noarch @@ -245,20 +255,6 @@ getent passwd zookeeper >/dev/null || \ %{_bindir}/zk*.sh %{_libexecdir}/zkEnv.sh %{_libdir}/lib*.so.* -%dir %{_javadir}/%{name} -%{_javadir}/%{name}/%{name}.jar -%{_javadir}/%{name}/%{name}-tests.jar -%{_javadir}/%{name}/%{name}-ZooInspector.jar - -%if 0%{?fedora} >= 21 -%{_datadir}/maven-poms/%{name}-%{name}.pom -%{_datadir}/maven-poms/%{name}-%{name}-ZooInspector.pom -%{_datadir}/maven-metadata/%{name}.xml -%else -%{_mavendepmapfragdir}/%{name} -%{_mavenpomdir}/JPP.%{name}-%{name}.pom -%{_mavenpomdir}/JPP.%{name}-%{name}-ZooInspector.pom -%endif %attr(0755,root,root) %dir %{_sysconfdir}/zookeeper %attr(0644,root,root) %ghost %config(noreplace) %{_sysconfdir}/zookeeper/zoo.cfg @@ -273,6 +269,22 @@ getent passwd zookeeper >/dev/null || \ %{_unitdir}/zookeeper.service %doc CHANGES.txt LICENSE.txt NOTICE.txt README.txt +%files java +%dir %{_javadir}/%{name} +%{_javadir}/%{name}/%{name}.jar +%{_javadir}/%{name}/%{name}-tests.jar +%{_javadir}/%{name}/%{name}-ZooInspector.jar +%if 0%{?fedora} >= 21 +%{_datadir}/maven-poms/%{name}-%{name}.pom +%{_datadir}/maven-poms/%{name}-%{name}-ZooInspector.pom +%{_datadir}/maven-metadata/%{name}.xml +%else +%{_mavendepmapfragdir}/%{name} +%{_mavenpomdir}/JPP.%{name}-%{name}.pom +%{_mavenpomdir}/JPP.%{name}-%{name}-ZooInspector.pom +%endif +%doc CHANGES.txt LICENSE.txt NOTICE.txt README.txt + %files devel %{_includedir}/%{name}/ %{_libdir}/*.so @@ -288,6 +300,9 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Thu Oct 23 2014 Timothy St. Clair - 3.4.6-2 +- Add back -java subpackage + * Tue Oct 21 2014 Timothy St. Clair - 3.4.6-1 - Update to latest stable series - Cleanup and overhaul package From ee8d255f0a63408da802875f05273bfb5e37120f Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 27 Jan 2015 05:51:41 +0100 Subject: [PATCH 36/73] Rebuild for boost 1.57.0 --- zookeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index 7d612fa..8d98955 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -5,7 +5,7 @@ Name: zookeeper Version: 3.4.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: http://zookeeper.apache.org/ @@ -300,6 +300,9 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Tue Jan 27 2015 Petr Machata - 3.4.6-3 +- Rebuild for boost 1.57.0 + * Thu Oct 23 2014 Timothy St. Clair - 3.4.6-2 - Add back -java subpackage From 491a576dfc8601a471c66ddd3310b51b94eca323 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 15 Feb 2015 22:31:03 +0000 Subject: [PATCH 37/73] Update netty3 patch for 3.9.3 --- zookeeper-3.4.6-ivy-build.patch | 2 +- zookeeper.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/zookeeper-3.4.6-ivy-build.patch b/zookeeper-3.4.6-ivy-build.patch index 075cbfa..bc96443 100644 --- a/zookeeper-3.4.6-ivy-build.patch +++ b/zookeeper-3.4.6-ivy-build.patch @@ -38,7 +38,7 @@ index 561832a..93176d5 100644 + - -+ ++ diff --git a/zookeeper.spec b/zookeeper.spec index 8d98955..073e391 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -5,7 +5,7 @@ Name: zookeeper Version: 3.4.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: http://zookeeper.apache.org/ @@ -300,6 +300,9 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Sun Feb 15 2015 Peter Robinson 3.4.6-4 +- Update netty3 patch for 3.9.3 + * Tue Jan 27 2015 Petr Machata - 3.4.6-3 - Rebuild for boost 1.57.0 From f30e2b822698bc4b259bad22e83cc8bc92d91509 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:50:14 +0000 Subject: [PATCH 38/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- zookeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index 073e391..7f4bb47 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -5,7 +5,7 @@ Name: zookeeper Version: 3.4.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: http://zookeeper.apache.org/ @@ -300,6 +300,9 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 3.4.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sun Feb 15 2015 Peter Robinson 3.4.6-4 - Update netty3 patch for 3.9.3 From 6aa8404a129bbcb1bd200ac036d077d902edfb63 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 22 Jul 2015 22:40:33 +0200 Subject: [PATCH 39/73] rebuild for Boost 1.58 --- zookeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index 7f4bb47..a64011f 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -5,7 +5,7 @@ Name: zookeeper Version: 3.4.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: http://zookeeper.apache.org/ @@ -300,6 +300,9 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Wed Jul 22 2015 David Tardon - 3.4.6-6 +- rebuild for Boost 1.58 + * Fri Jun 19 2015 Fedora Release Engineering - 3.4.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 7f1b0885f5227a4c46c8c412a7fee2b6a729d9d4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 29 Jul 2015 13:39:00 -0500 Subject: [PATCH 40/73] - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 --- zookeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index a64011f..25aad24 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -5,7 +5,7 @@ Name: zookeeper Version: 3.4.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: http://zookeeper.apache.org/ @@ -300,6 +300,9 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Wed Jul 29 2015 Fedora Release Engineering - 3.4.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 + * Wed Jul 22 2015 David Tardon - 3.4.6-6 - rebuild for Boost 1.58 From d1dd2863f856b178f63463895730177f056fa55b Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 27 Aug 2015 16:19:25 +0100 Subject: [PATCH 41/73] Rebuilt for Boost 1.59 --- zookeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index 25aad24..f17cbaa 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -5,7 +5,7 @@ Name: zookeeper Version: 3.4.6 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: http://zookeeper.apache.org/ @@ -300,6 +300,9 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Thu Aug 27 2015 Jonathan Wakely - 3.4.6-8 +- Rebuilt for Boost 1.59 + * Wed Jul 29 2015 Fedora Release Engineering - 3.4.6-7 - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 From 216e5aeb0bdc5d2458e4e8c72b982d65c34a8b0c Mon Sep 17 00:00:00 2001 From: Christopher Tubbs Date: Fri, 16 Oct 2015 16:15:01 -0400 Subject: [PATCH 42/73] Update zkEnv.sh CLASSPATH to fix bz#1261458 --- zkEnv.sh | 17 ++++++++++++++++- zookeeper.spec | 5 ++++- 2 files changed, 20 insertions(+), 2 deletions(-) mode change 100755 => 100644 zkEnv.sh diff --git a/zkEnv.sh b/zkEnv.sh old mode 100755 new mode 100644 index f06361d..439ad1f --- a/zkEnv.sh +++ b/zkEnv.sh @@ -62,4 +62,19 @@ fi ## TSTCLAIR: May need to add jar soup to classpath #add the zoocfg dir to classpath -CLASSPATH="/usr/share/java/objectweb-asm/asm.jar:/usr/share/java/antlr.jar:/usr/share/java/avalon-framework-api.jar:/usr/share/java/avalon-logkit.jar:/usr/share/java/cglib.jar:/usr/share/java/checkstyle.jar:/usr/share/java/commons-beanutils.jar:/usr/share/java/commons-cli.jar:/usr/share/java/commons-logging.jar:/usr/share/java/geronimo-jms_1.1_spec.jar:/usr/share/java/guava.jar:/usr/share/java/hamcrest/all.jar:/usr/share/java/hamcrest/core.jar:/usr/share/java/hamcrest/text.jar:/usr/share/java/hamcrest/library.jar:/usr/share/java/hamcrest/generator.jar:/usr/share/java/hamcrest/integration.jar:/usr/share/java/javax.mail/javax.mail.jar:/usr/share/java/jdiff.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jline.jar:/usr/share/java/jtoaster.jar:/usr/share/java/junit.jar:/usr/share/java/jzlib.jar:/usr/share/java/log4j.jar:/usr/share/java/mockito.jar:/usr/share/java/netty.jar:/usr/share/java/objenesis/objenesis-tck.jar:/usr/share/java/objenesis/objenesis.jar:/usr/share/java/slf4j/log4j12.jar:/usr/share/java/slf4j/api.jar:/usr/share/java/slf4j/slf4j-ext.jar:/usr/share/java/slf4j/slf4j-site.jar:/usr/share/java/slf4j/log4j-over-slf4j.jar:/usr/share/java/slf4j/jcl.jar:/usr/share/java/slf4j/jul-to-slf4j.jar:/usr/share/java/slf4j/ext.jar:/usr/share/java/slf4j/slf4j-jdk14.jar:/usr/share/java/slf4j/simple.jar:/usr/share/java/slf4j/nop.jar:/usr/share/java/slf4j/jcl-over-slf4j.jar:/usr/share/java/slf4j/slf4j-migrator.jar:/usr/share/java/slf4j/migrator.jar:/usr/share/java/slf4j/slf4j-simple.jar:/usr/share/java/slf4j/slf4j-log4j12.jar:/usr/share/java/slf4j/slf4j-api.jar:/usr/share/java/slf4j/slf4j-nop.jar:/usr/share/java/slf4j/site.jar:/usr/share/java/slf4j/jdk14.jar:/usr/share/java/slf4j/slf4j-jcl.jar:/usr/share/java/slf4j/log4j12.jar:/usr/share/java/slf4j/api.jar:/usr/share/java/slf4j/slf4j-ext.jar:/usr/share/java/slf4j/slf4j-site.jar:/usr/share/java/slf4j/log4j-over-slf4j.jar:/usr/share/java/slf4j/jcl.jar:/usr/share/java/slf4j/jul-to-slf4j.jar:/usr/share/java/slf4j/ext.jar:/usr/share/java/slf4j/slf4j-jdk14.jar:/usr/share/java/slf4j/simple.jar:/usr/share/java/slf4j/nop.jar:/usr/share/java/slf4j/jcl-over-slf4j.jar:/usr/share/java/slf4j/slf4j-migrator.jar:/usr/share/java/slf4j/migrator.jar:/usr/share/java/slf4j/slf4j-simple.jar:/usr/share/java/slf4j/slf4j-log4j12.jar:/usr/share/java/slf4j/slf4j-api.jar:/usr/share/java/slf4j/slf4j-nop.jar:/usr/share/java/slf4j/site.jar:/usr/share/java/slf4j/jdk14.jar:/usr/share/java/slf4j/slf4j-jcl.jar:/usr/share/java/tomcat-servlet-api.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar" +CLASSPATH="/usr/share/java/objectweb-asm/asm.jar:/usr/share/java/antlr.jar:/usr/share/java/avalon-framework-api.jar:/usr/share/java/avalon-logkit.jar:/usr/share/java/cglib.jar:/usr/share/java/checkstyle.jar:/usr/share/java/commons-beanutils.jar:/usr/share/java/commons-cli.jar:/usr/share/java/commons-logging.jar:/usr/share/java/geronimo-jms_1.1_spec.jar:/usr/share/java/guava.jar:/usr/share/java/hamcrest/all.jar:/usr/share/java/hamcrest/core.jar:/usr/share/java/hamcrest/text.jar:/usr/share/java/hamcrest/library.jar:/usr/share/java/hamcrest/generator.jar:/usr/share/java/hamcrest/integration.jar:/usr/share/java/javax.mail/javax.mail.jar:/usr/share/java/jdiff.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jline.jar:/usr/share/java/jtoaster.jar:/usr/share/java/junit.jar:/usr/share/java/jzlib.jar:/usr/share/java/log4j.jar:/usr/share/java/mockito.jar:/usr/share/java/netty.jar:/usr/share/java/objenesis/objenesis-tck.jar:/usr/share/java/objenesis/objenesis.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/tomcat-servlet-api.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/api.jar:/usr/share/java/slf4j/slf4j-ext.jar:/usr/share/java/slf4j/slf4j-site.jar:/usr/share/java/slf4j/jcl.jar:/usr/share/java/slf4j/jul-to-slf4j.jar:/usr/share/java/slf4j/ext.jar:/usr/share/java/slf4j/jcl-over-slf4j.jar:/usr/share/java/slf4j/slf4j-migrator.jar:/usr/share/java/slf4j/migrator.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-api.jar:/usr/share/java/slf4j/site.jar:/usr/share/java/slf4j/jdk14.jar:/usr/share/java/slf4j/slf4j-jcl.jar" + +# We use slf4j-log4j12.jar as our logging binding +CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-log4j12.jar" +# These Conflict with slf4j-log4j12.jar +#/usr/share/java/slf4j/slf4j-simple.jar:/usr/share/java/slf4j/simple.jar: +#/usr/share/java/slf4j/slf4j-nop.jar + +# Explicitly add the log4j jars (from the log4j.noarch package) +CLASSPATH="$CLASSPATH:/usr/share/java/log4j-1.jar:/usr/share/java/log4j/log4j-core.jar:/usr/share/java/log4j/log4j-api.jar" + +# Not required according to https://issues.apache.org/jira/browse/SOLR-2369 +# CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-jdk14.jar/usr/share/java/slf4j/log4j-over-slf4j.jar" diff --git a/zookeeper.spec b/zookeeper.spec index f17cbaa..21c6232 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -5,7 +5,7 @@ Name: zookeeper Version: 3.4.6 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: http://zookeeper.apache.org/ @@ -300,6 +300,9 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Fri Oct 16 2015 Christopher Tubbs - 3.4.6-9 +- Update zkEnv.sh CLASSPATH to fix bz#1261458 + * Thu Aug 27 2015 Jonathan Wakely - 3.4.6-8 - Rebuilt for Boost 1.59 From 50d79a7be109a17f0f725b7bea2292c4b54b5293 Mon Sep 17 00:00:00 2001 From: Christopher Tubbs Date: Fri, 16 Oct 2015 17:49:25 -0400 Subject: [PATCH 43/73] Rollback changes for netty 3.9.3 for f21 only --- zookeeper-3.4.6-ivy-build.patch | 3 +-- zookeeper.spec | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/zookeeper-3.4.6-ivy-build.patch b/zookeeper-3.4.6-ivy-build.patch index bc96443..2280067 100644 --- a/zookeeper-3.4.6-ivy-build.patch +++ b/zookeeper-3.4.6-ivy-build.patch @@ -37,8 +37,7 @@ index 561832a..93176d5 100644 + + -- -+ + diff --git a/zookeeper.spec b/zookeeper.spec index 21c6232..94032e1 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -5,7 +5,7 @@ Name: zookeeper Version: 3.4.6 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: http://zookeeper.apache.org/ @@ -300,6 +300,9 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Fri Oct 16 2015 Christopher Tubbs - 3.4.6-10 +- Rollback changes for netty 3.9.3 for f21 only + * Fri Oct 16 2015 Christopher Tubbs - 3.4.6-9 - Update zkEnv.sh CLASSPATH to fix bz#1261458 From 44399179cca6e14c00bcabebe1de67a12caf5b70 Mon Sep 17 00:00:00 2001 From: Christopher Tubbs Date: Fri, 16 Oct 2015 17:59:07 -0400 Subject: [PATCH 44/73] Fix bad rollback. Rollback to netty 3.6.6, not 3.7.0 --- zookeeper-3.4.6-ivy-build.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zookeeper-3.4.6-ivy-build.patch b/zookeeper-3.4.6-ivy-build.patch index 2280067..075cbfa 100644 --- a/zookeeper-3.4.6-ivy-build.patch +++ b/zookeeper-3.4.6-ivy-build.patch @@ -37,7 +37,8 @@ index 561832a..93176d5 100644 + + - +- ++ From 733474f1c1311cafd14fcccfa42cc19bcf4abba1 Mon Sep 17 00:00:00 2001 From: Christopher Tubbs Date: Fri, 16 Oct 2015 18:13:37 -0400 Subject: [PATCH 45/73] Fix bad rollback. Rollback to netty 3.6.6, not 3.7.0 (f21 only) --- zookeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index 94032e1..df776e4 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -5,7 +5,7 @@ Name: zookeeper Version: 3.4.6 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: http://zookeeper.apache.org/ @@ -300,6 +300,9 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Fri Oct 16 2015 Christopher Tubbs - 3.4.6-11 +- Fix bad rollback. Rollback to netty 3.6.6, not 3.7.0 (f21 only) + * Fri Oct 16 2015 Christopher Tubbs - 3.4.6-10 - Rollback changes for netty 3.9.3 for f21 only From 82dc574314d10f89cb0cbdc43e7b8bfda7b0f2f2 Mon Sep 17 00:00:00 2001 From: Christopher Tubbs Date: Mon, 19 Oct 2015 20:59:06 -0400 Subject: [PATCH 46/73] Fix bz#1272694 Remove precondition on myid file for standalone defaults --- zookeeper.service | 1 - zookeeper.spec | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/zookeeper.service b/zookeeper.service index 817bbc0..f6939d9 100644 --- a/zookeeper.service +++ b/zookeeper.service @@ -3,7 +3,6 @@ Description=Apache ZooKeeper After=network.target ConditionPathExists=/etc/zookeeper/zoo.cfg ConditionPathExists=/etc/zookeeper/log4j.properties -ConditionPathExists=/var/lib/zookeeper/data/myid [Service] Type=forking diff --git a/zookeeper.spec b/zookeeper.spec index df776e4..44770ab 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -5,7 +5,7 @@ Name: zookeeper Version: 3.4.6 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: http://zookeeper.apache.org/ @@ -300,6 +300,9 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Mon Oct 19 2015 Christopher Tubbs - 3.4.6-12 +- Fix bz#1272694 Remove precondition on myid file for standalone defaults + * Fri Oct 16 2015 Christopher Tubbs - 3.4.6-11 - Fix bad rollback. Rollback to netty 3.6.6, not 3.7.0 (f21 only) From a0f8499a470cc5615a7e77e872a14cc790e7094d Mon Sep 17 00:00:00 2001 From: Christopher Tubbs Date: Tue, 3 Nov 2015 15:48:04 -0500 Subject: [PATCH 47/73] Remove unused build dependency log4cxx --- zookeeper.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/zookeeper.spec b/zookeeper.spec index 44770ab..9dba8f6 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -5,7 +5,7 @@ Name: zookeeper Version: 3.4.6 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: http://zookeeper.apache.org/ @@ -33,7 +33,6 @@ BuildRequires: java-javadoc BuildRequires: jpackage-utils BuildRequires: libtool BuildRequires: libxml2-devel -BuildRequires: log4cxx-devel BuildRequires: python-devel BuildRequires: ant @@ -300,6 +299,9 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Tue Nov 03 2015 Christopher Tubbs - 3.4.6-13 +- Remove unused build dependency log4cxx + * Mon Oct 19 2015 Christopher Tubbs - 3.4.6-12 - Fix bz#1272694 Remove precondition on myid file for standalone defaults From e584293943eb1f2765d900ed18b1172f289efc66 Mon Sep 17 00:00:00 2001 From: Christopher Tubbs Date: Sun, 15 Nov 2015 02:59:29 -0500 Subject: [PATCH 48/73] Remove duplicates and fix broken classpath items in zkEnv --- zkEnv.sh | 88 ++++++++++++++++++++++++++++++++++++++++++++------ zookeeper.spec | 5 ++- 2 files changed, 83 insertions(+), 10 deletions(-) diff --git a/zkEnv.sh b/zkEnv.sh index 439ad1f..2cd43e8 100644 --- a/zkEnv.sh +++ b/zkEnv.sh @@ -62,19 +62,89 @@ fi ## TSTCLAIR: May need to add jar soup to classpath #add the zoocfg dir to classpath -CLASSPATH="/usr/share/java/objectweb-asm/asm.jar:/usr/share/java/antlr.jar:/usr/share/java/avalon-framework-api.jar:/usr/share/java/avalon-logkit.jar:/usr/share/java/cglib.jar:/usr/share/java/checkstyle.jar:/usr/share/java/commons-beanutils.jar:/usr/share/java/commons-cli.jar:/usr/share/java/commons-logging.jar:/usr/share/java/geronimo-jms_1.1_spec.jar:/usr/share/java/guava.jar:/usr/share/java/hamcrest/all.jar:/usr/share/java/hamcrest/core.jar:/usr/share/java/hamcrest/text.jar:/usr/share/java/hamcrest/library.jar:/usr/share/java/hamcrest/generator.jar:/usr/share/java/hamcrest/integration.jar:/usr/share/java/javax.mail/javax.mail.jar:/usr/share/java/jdiff.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jline.jar:/usr/share/java/jtoaster.jar:/usr/share/java/junit.jar:/usr/share/java/jzlib.jar:/usr/share/java/log4j.jar:/usr/share/java/mockito.jar:/usr/share/java/netty.jar:/usr/share/java/objenesis/objenesis-tck.jar:/usr/share/java/objenesis/objenesis.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/tomcat-servlet-api.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/api.jar:/usr/share/java/slf4j/slf4j-ext.jar:/usr/share/java/slf4j/slf4j-site.jar:/usr/share/java/slf4j/jcl.jar:/usr/share/java/slf4j/jul-to-slf4j.jar:/usr/share/java/slf4j/ext.jar:/usr/share/java/slf4j/jcl-over-slf4j.jar:/usr/share/java/slf4j/slf4j-migrator.jar:/usr/share/java/slf4j/migrator.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-api.jar:/usr/share/java/slf4j/site.jar:/usr/share/java/slf4j/jdk14.jar:/usr/share/java/slf4j/slf4j-jcl.jar" +CLASSPATH="/usr/share/java/zookeeper/zookeeper.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/zookeeper/zookeeper-tests.jar" + +# This section is sorted for easy maintenance +CLASSPATH="$CLASSPATH:/usr/lib/java/jline1/jline-1.0.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/antlr.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/avalon-framework-api.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/avalon-logkit.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/cglib.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/checkstyle.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/commons-beanutils.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/commons-cli.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/commons-logging.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/geronimo-jms_1.1_spec.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/guava.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/hamcrest/all.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/hamcrest/core.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/hamcrest/generator.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/hamcrest/integration.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/hamcrest/library.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/hamcrest/text.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/javax.mail/javax.mail.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jdiff.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-annotations.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-client.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-continuation.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-deploy.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-http.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-io.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-jaas.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-jmx.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-jndi.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-jsp.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-maven-plugin.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-plus.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-proxy.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-rewrite.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-security.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-server.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-servlet.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-servlets.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-util-ajax.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-util.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-webapp.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-xml.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/websocket-api.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/websocket-client.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/websocket-common.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/websocket-server.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/websocket-servlet.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jtoaster.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/junit.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jzlib.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/mockito.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/netty.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/objectweb-asm/asm.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/objenesis/objenesis-tck.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/objenesis/objenesis.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/api.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/ext.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/jcl-over-slf4j.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/jul-to-slf4j.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/migrator.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/site.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-api.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-ext.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-migrator.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-site.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/tomcat-servlet-api.jar" # We use slf4j-log4j12.jar as our logging binding CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-log4j12.jar" # These Conflict with slf4j-log4j12.jar -#/usr/share/java/slf4j/slf4j-simple.jar:/usr/share/java/slf4j/simple.jar: -#/usr/share/java/slf4j/slf4j-nop.jar +#CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-jcl.jar" +#CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-nop.jar" +#CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-simple.jar" -# Explicitly add the log4j jars (from the log4j.noarch package) -CLASSPATH="$CLASSPATH:/usr/share/java/log4j-1.jar:/usr/share/java/log4j/log4j-core.jar:/usr/share/java/log4j/log4j-api.jar" +# Explicitly add the log4j 1.2 jars +CLASSPATH="$CLASSPATH:/usr/share/java/log4j-1.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/log4j.jar" # Not required according to https://issues.apache.org/jira/browse/SOLR-2369 -# CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-jdk14.jar/usr/share/java/slf4j/log4j-over-slf4j.jar" +#CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/log4j-over-slf4j.jar" +#CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-jdk14.jar" diff --git a/zookeeper.spec b/zookeeper.spec index 9dba8f6..0db9296 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -5,7 +5,7 @@ Name: zookeeper Version: 3.4.6 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: http://zookeeper.apache.org/ @@ -299,6 +299,9 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Sun Nov 15 2015 Christopher Tubbs - 3.4.6-14 +- Remove duplicates and fix broken classpath items in zkEnv + * Tue Nov 03 2015 Christopher Tubbs - 3.4.6-13 - Remove unused build dependency log4cxx From 87e2ba46a01b5c126a9b347bcfa1de4b880554da Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sat, 16 Jan 2016 04:54:57 +0000 Subject: [PATCH 49/73] Rebuilt for Boost 1.60 --- zookeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index 0db9296..eab4a9f 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -5,7 +5,7 @@ Name: zookeeper Version: 3.4.6 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: http://zookeeper.apache.org/ @@ -299,6 +299,9 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Sat Jan 16 2016 Jonathan Wakely - 3.4.6-15 +- Rebuilt for Boost 1.60 + * Sun Nov 15 2015 Christopher Tubbs - 3.4.6-14 - Remove duplicates and fix broken classpath items in zkEnv From b460c4def95a03b98459a3b24d10a6f17a13c150 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 04:08:41 +0000 Subject: [PATCH 50/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- zookeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index eab4a9f..5e899bd 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -5,7 +5,7 @@ Name: zookeeper Version: 3.4.6 -Release: 15%{?dist} +Release: 16%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: http://zookeeper.apache.org/ @@ -299,6 +299,9 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 3.4.6-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Sat Jan 16 2016 Jonathan Wakely - 3.4.6-15 - Rebuilt for Boost 1.60 From 9acdf5f18f0e03e3501c0975a5c2f9099694d4cd Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 15 Feb 2016 19:09:11 +0100 Subject: [PATCH 51/73] cppunit-config no longer exists, use pkg-config --- ...nfig-no-longer-exists-use-pkg-config.patch | 62 +++++++++++++++++++ zookeeper.spec | 12 +++- 2 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 0001-cppunit-config-no-longer-exists-use-pkg-config.patch diff --git a/0001-cppunit-config-no-longer-exists-use-pkg-config.patch b/0001-cppunit-config-no-longer-exists-use-pkg-config.patch new file mode 100644 index 0000000..506d4ad --- /dev/null +++ b/0001-cppunit-config-no-longer-exists-use-pkg-config.patch @@ -0,0 +1,62 @@ +From f5fe371100b44d667065c8bba2c1522b26224c23 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Mon, 15 Feb 2016 19:08:14 +0100 +Subject: [PATCH] cppunit-config no longer exists, use pkg-config + +--- + src/c/configure.ac | 4 +++- + src/recipes/lock/src/c/configure.ac | 2 +- + src/recipes/queue/src/c/configure.ac | 2 +- + 3 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/c/configure.ac b/src/c/configure.ac +index b4ed639..09860d9 100644 +--- a/src/c/configure.ac ++++ b/src/c/configure.ac +@@ -25,6 +25,8 @@ DX_INIT_DOXYGEN([zookeeper],[c-doc.Doxyfile],[docs]) + AM_INIT_AUTOMAKE([-Wall foreign]) + AC_CONFIG_HEADER([config.h]) + ++PKG_PROG_PKG_CONFIG ++ + # Checks for programs. + AC_ARG_WITH(cppunit, + [ --without-cppunit do not use CPPUNIT]) +@@ -34,7 +36,7 @@ if test "$with_cppunit" = "no" ; then + CPPUNIT_INCLUDE= + CPPUNIT_LIBS= + else +- AM_PATH_CPPUNIT(1.10.2) ++ PKG_CHECK_MODULES([CPPUNIT], [cppunit]) + fi + + if test "$CALLER" = "ANT" ; then +diff --git a/src/recipes/lock/src/c/configure.ac b/src/recipes/lock/src/c/configure.ac +index 3954123..f494058 100644 +--- a/src/recipes/lock/src/c/configure.ac ++++ b/src/recipes/lock/src/c/configure.ac +@@ -72,7 +72,7 @@ AC_C_VOLATILE + AC_PROG_CC + AC_PROG_LIBTOOL + #check for cppunit +-AM_PATH_CPPUNIT(1.10.2) ++PKG_CHECK_MODULES([CPPUNIT], [cppunit]) + # Checks for library functions. + AC_FUNC_UTIME_NULL + AC_CHECK_FUNCS([gettimeofday memset mkdir rmdir strdup strerror strstr strtol strtoul strtoull utime]) +diff --git a/src/recipes/queue/src/c/configure.ac b/src/recipes/queue/src/c/configure.ac +index a9fb7b1..a2b840d 100644 +--- a/src/recipes/queue/src/c/configure.ac ++++ b/src/recipes/queue/src/c/configure.ac +@@ -72,7 +72,7 @@ AC_C_VOLATILE + AC_PROG_CC + AC_PROG_LIBTOOL + #check for cppunit +-AM_PATH_CPPUNIT(1.10.2) ++PKG_CHECK_MODULES([CPPUNIT], [cppunit]) + # Checks for library functions. + AC_FUNC_UTIME_NULL + AC_CHECK_FUNCS([gettimeofday memset mkdir rmdir strdup strerror strstr strtol strtoul strtoull utime]) +-- +2.5.0 + diff --git a/zookeeper.spec b/zookeeper.spec index 5e899bd..061671e 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -19,12 +19,13 @@ 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 +Patch5: 0001-cppunit-config-no-longer-exists-use-pkg-config.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: boost-devel -BuildRequires: cppunit-devel +BuildRequires: pkgconfig(cppunit) BuildRequires: dos2unix BuildRequires: doxygen BuildRequires: graphviz @@ -127,6 +128,7 @@ The python-%{name} package contains Python bindings for %{name}. %patch2 -p1 %patch3 -p1 %patch4 -p0 -F2 +%patch5 -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 @@ -145,6 +147,14 @@ sed -i 's@^dataDir=.*$@dataDir=%{_sharedstatedir}/zookeeper/data\ndataLogDir=%{_ -Dant.build.javac.target=1.5 \ package +# cppunit-config patch touches configure.ac in these dirs +pushd src/recipes/lock/src/c +autoreconf -if +popd +pushd src/recipes/queue/src/c +autoreconf -if +popd + pushd src/c autoreconf -if %configure --disable-static --disable-rpath From 6bf81fc7b4569290ae7d283e6bd1dbc6e8d9c492 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 13:16:10 +0000 Subject: [PATCH 52/73] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- zookeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index 061671e..db6d2d5 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -5,7 +5,7 @@ Name: zookeeper Version: 3.4.6 -Release: 16%{?dist} +Release: 17%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: http://zookeeper.apache.org/ @@ -309,6 +309,9 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Tue Jul 19 2016 Fedora Release Engineering - 3.4.6-17 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Fri Feb 05 2016 Fedora Release Engineering - 3.4.6-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From b5809e5b2416a6dd54881b4b84e79865f9609e92 Mon Sep 17 00:00:00 2001 From: Christopher Tubbs Date: Wed, 21 Dec 2016 21:27:13 -0500 Subject: [PATCH 53/73] Update to 3.4.9; CVE-2016-5017 (bz#1377281) --- .gitignore | 1 + missing-pom.template.patch | 47 +++ mt_adaptor.c.patch | 10 +- sources | 2 +- ...eeper-3.4.5-disable-cygwin-detection.patch | 27 -- zookeeper-3.4.5-zktreeutil-gcc.patch | 4 +- ...d.patch => zookeeper-3.4.9-ivy-build.patch | 294 +++--------------- ...rver.patch => zookeeper-3.4.9-server.patch | 4 +- zookeeper.spec | 30 +- 9 files changed, 119 insertions(+), 300 deletions(-) create mode 100644 missing-pom.template.patch delete mode 100644 zookeeper-3.4.5-disable-cygwin-detection.patch rename zookeeper-3.4.6-ivy-build.patch => zookeeper-3.4.9-ivy-build.patch (61%) rename zookeeper-3.4.6-server.patch => zookeeper-3.4.9-server.patch (85%) 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 From 28fd01ed733105f335da8ca7cf7f4c803cf57b74 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 27 Jan 2017 20:39:27 +0000 Subject: [PATCH 54/73] Rebuilt for Boost 1.63 --- zookeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index 8fcd163..d38d754 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -3,7 +3,7 @@ Name: zookeeper Version: 3.4.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: https://zookeeper.apache.org/ @@ -302,6 +302,9 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Fri Jan 27 2017 Jonathan Wakely - 3.4.9-2 +- Rebuilt for Boost 1.63 + * Thu Dec 22 2016 Christopher Tubbs - 3.4.9-1 - Update to 3.4.9; CVE-2016-5017 (bz#1377281) From 948bffea54191a7733dbbf67244a2eac06078e55 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 18:26:44 +0000 Subject: [PATCH 55/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- zookeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index d38d754..c922414 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -3,7 +3,7 @@ Name: zookeeper Version: 3.4.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: https://zookeeper.apache.org/ @@ -302,6 +302,9 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 3.4.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Jan 27 2017 Jonathan Wakely - 3.4.9-2 - Rebuilt for Boost 1.63 From 6dcf78d99117e0cb3b30da20586e979cd1f36f82 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:45:40 +0000 Subject: [PATCH 56/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- zookeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index c922414..4df098a 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -3,7 +3,7 @@ Name: zookeeper Version: 3.4.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: https://zookeeper.apache.org/ @@ -302,6 +302,9 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 3.4.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 3.4.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 067171f9194d14572c029927a0fdb7fa47213476 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 11:13:24 +0000 Subject: [PATCH 57/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- zookeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index 4df098a..1125669 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -3,7 +3,7 @@ Name: zookeeper Version: 3.4.9 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: https://zookeeper.apache.org/ @@ -302,6 +302,9 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 3.4.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 3.4.9-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 4908b17ccc105be39c06260938f538df6304cbd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 19 Aug 2017 09:44:28 -0400 Subject: [PATCH 58/73] Python 2 binary package renamed to python2-zookeeper --- zookeeper.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/zookeeper.spec b/zookeeper.spec index 1125669..64481f5 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -3,7 +3,7 @@ Name: zookeeper Version: 3.4.9 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: https://zookeeper.apache.org/ @@ -111,13 +111,14 @@ BuildArch: noarch %description javadoc This package contains javadoc for %{name}. -%package -n python-%{name} +%package -n python2-%{name} +%{?python_provide:%python_provide python2-%{name}} Summary: Python support for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} Provides: zkpython%{?_isa} = %{version}-%{release} Requires: python2 -%description -n python-%{name} +%description -n python2-%{name} The python-%{name} package contains Python bindings for %{name}. %prep @@ -296,12 +297,16 @@ getent passwd zookeeper >/dev/null || \ %{_javadocdir}/%{name} %doc LICENSE.txt NOTICE.txt -%files -n python-%{name} +%files -n python2-%{name} %{python_sitearch}/ZooKeeper-?.?-py%{python_version}.egg-info %{python_sitearch}/zookeeper.so %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 3.4.9-6 +- Python 2 binary package renamed to python2-zookeeper + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + * Thu Aug 03 2017 Fedora Release Engineering - 3.4.9-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 41f35e70df945b41bfe8114e5aeb9888362ecd1b Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 7 Sep 2017 07:43:47 -0700 Subject: [PATCH 59/73] Cleanup spec file conditionals --- zookeeper.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/zookeeper.spec b/zookeeper.spec index 64481f5..d59b484 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -3,7 +3,7 @@ Name: zookeeper Version: 3.4.9 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: https://zookeeper.apache.org/ @@ -45,7 +45,7 @@ BuildRequires: javapackages-tools BuildRequires: jtoaster BuildRequires: junit BuildRequires: jdiff -%if 0%{?fedora} >= 21 +%if 0%{?fedora} >= 21 || 0%{?rhel} > 7 BuildRequires: mvn(org.slf4j:slf4j-log4j12) BuildRequires: objectweb-pom BuildRequires: jline1 @@ -187,7 +187,7 @@ install -pm 755 bin/zkServer.sh %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_libexecdir} install -pm 755 %{SOURCE3} %{buildroot}%{_libexecdir} -%if 0%{?fedora} >= 21 +%if 0%{?fedora} >= 21 || 0%{?rhel} > 7 mkdir -p %{buildroot}%{_datadir}/maven-metadata mkdir -p %{buildroot}%{_datadir}/maven-poms install -pm 644 build/%{name}-%{version}/dist-maven/%{name}-%{version}.pom %{buildroot}%{_datadir}/maven-poms/%{name}-%{name}.pom @@ -277,7 +277,7 @@ getent passwd zookeeper >/dev/null || \ %{_javadir}/%{name}/%{name}.jar %{_javadir}/%{name}/%{name}-tests.jar %{_javadir}/%{name}/%{name}-ZooInspector.jar -%if 0%{?fedora} >= 21 +%if 0%{?fedora} >= 21 || 0%{?rhel} > 7 %{_datadir}/maven-poms/%{name}-%{name}.pom %{_datadir}/maven-poms/%{name}-%{name}-ZooInspector.pom %{_datadir}/maven-metadata/%{name}.xml @@ -303,6 +303,9 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Thu Sep 07 2017 Troy Dawson - 3.4.9-7 +- Cleanup spec file conditionals + * Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 3.4.9-6 - Python 2 binary package renamed to python2-zookeeper See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 From b177e54080aa0b4d9f499c664882510e0c3bfbae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 22:31:35 +0000 Subject: [PATCH 60/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zookeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index d59b484..3da5b29 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -3,7 +3,7 @@ Name: zookeeper Version: 3.4.9 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: https://zookeeper.apache.org/ @@ -303,6 +303,9 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 3.4.9-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Sep 07 2017 Troy Dawson - 3.4.9-7 - Cleanup spec file conditionals From f40ae8e202839466b6bfaf4de71d9f6a87656071 Mon Sep 17 00:00:00 2001 From: Christopher Tubbs Date: Wed, 7 Mar 2018 20:18:49 -0500 Subject: [PATCH 61/73] Add gcc-c++ BuildRequires --- zookeeper.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index 3da5b29..0b20ed1 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -3,7 +3,7 @@ Name: zookeeper Version: 3.4.9 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: https://zookeeper.apache.org/ @@ -27,6 +27,7 @@ BuildRequires: boost-devel BuildRequires: pkgconfig(cppunit) BuildRequires: dos2unix BuildRequires: doxygen +BuildRequires: gcc-c++ BuildRequires: graphviz BuildRequires: java-devel BuildRequires: java-javadoc @@ -303,6 +304,9 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Thu Mar 08 2018 Christopher Tubbs - 3.4.9-9 +- Add gcc-c++ BuildRequires + * Fri Feb 09 2018 Fedora Release Engineering - 3.4.9-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 2e64010aa55aedc57ccbb8657c046c6c9db2c3d9 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Tue, 27 Mar 2018 02:09:24 +0200 Subject: [PATCH 62/73] Update Python 2 dependency declarations to new packaging standards --- zookeeper.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/zookeeper.spec b/zookeeper.spec index 0b20ed1..549d391 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -3,7 +3,7 @@ Name: zookeeper Version: 3.4.9 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: https://zookeeper.apache.org/ @@ -34,7 +34,7 @@ BuildRequires: java-javadoc BuildRequires: jpackage-utils BuildRequires: libtool BuildRequires: libxml2-devel -BuildRequires: python-devel +BuildRequires: python2-devel BuildRequires: ant BuildRequires: ant-junit @@ -304,6 +304,10 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Tue Mar 27 2018 Iryna Shcherbina - 3.4.9-10 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Thu Mar 08 2018 Christopher Tubbs - 3.4.9-9 - Add gcc-c++ BuildRequires From 76240bd96238fbffea485e3f97182910a0a3fb83 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:52:52 +0000 Subject: [PATCH 63/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zookeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index 549d391..e43e810 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -3,7 +3,7 @@ Name: zookeeper Version: 3.4.9 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: https://zookeeper.apache.org/ @@ -304,6 +304,9 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 3.4.9-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Mar 27 2018 Iryna Shcherbina - 3.4.9-10 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) From af8948718ccd1e691f0d82f5af213c2e2a0574a8 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 30 Jul 2018 00:22:27 +0200 Subject: [PATCH 64/73] =?UTF-8?q?%{python=5Fsitearch}=20=E2=86=92=20%{pyth?= =?UTF-8?q?on2=5Fsitearch}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Igor Gnatenko --- zookeeper.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zookeeper.spec b/zookeeper.spec index e43e810..57986c3 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -299,8 +299,8 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt %files -n python2-%{name} -%{python_sitearch}/ZooKeeper-?.?-py%{python_version}.egg-info -%{python_sitearch}/zookeeper.so +%{python2_sitearch}/ZooKeeper-?.?-py%{python_version}.egg-info +%{python2_sitearch}/zookeeper.so %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog From 6f0c66c3a4b193cb9cb4bc6a29705e7be9bdb464 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Wed, 28 Nov 2018 12:21:20 +0100 Subject: [PATCH 65/73] Switch to Python 3 --- zookeeper.spec | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/zookeeper.spec b/zookeeper.spec index 57986c3..8de10dc 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -3,7 +3,7 @@ Name: zookeeper Version: 3.4.9 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: https://zookeeper.apache.org/ @@ -34,7 +34,7 @@ BuildRequires: java-javadoc BuildRequires: jpackage-utils BuildRequires: libtool BuildRequires: libxml2-devel -BuildRequires: python2-devel +BuildRequires: python3-devel BuildRequires: ant BuildRequires: ant-junit @@ -112,15 +112,14 @@ BuildArch: noarch %description javadoc This package contains javadoc for %{name}. -%package -n python2-%{name} -%{?python_provide:%python_provide python2-%{name}} +%package -n python3-%{name} +%{?python_provide:%python_provide python3-%{name}} Summary: Python support for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Provides: zkpython%{?_isa} = %{version}-%{release} -Requires: python2 +Requires: python3 -%description -n python2-%{name} -The python-%{name} package contains Python bindings for %{name}. +%description -n python3-%{name} +Python bindings for %{name}. %prep %autosetup -p1 @@ -215,9 +214,9 @@ mkdir -p %{buildroot}%{_javadocdir}/%{name} cp -pr build/docs/api/* %{buildroot}%{_javadocdir}/%{name}/ pushd src/contrib/zkpython -%{__python} src/python/setup.py build --build-base=$PWD/build \ +%{__python3} src/python/setup.py build --build-base=$PWD/build \ install --root=%{buildroot} ;\ -chmod 0755 %{buildroot}%{python_sitearch}/zookeeper.so +chmod 0755 %{buildroot}%{python3_sitearch}/zookeeper.cpython-*.so popd find %{buildroot} -name '*.la' -exec rm -f {} ';' @@ -298,12 +297,16 @@ getent passwd zookeeper >/dev/null || \ %{_javadocdir}/%{name} %doc LICENSE.txt NOTICE.txt -%files -n python2-%{name} -%{python2_sitearch}/ZooKeeper-?.?-py%{python_version}.egg-info -%{python2_sitearch}/zookeeper.so +%files -n python3-%{name} +%{python3_sitearch}/ZooKeeper-?.?-py%{python3_version}.egg-info +%{python3_sitearch}/zookeeper.cpython-*.so %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Wed Nov 28 2018 Fedora Release Engineering - 3.4.9-12 +- Switch to Python 3 + https://bugzilla.redhat.com/show_bug.cgi?id=1630088 + * Sat Jul 14 2018 Fedora Release Engineering - 3.4.9-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 4f22cf54ba57e6a3c03940cf791921ff8a80fea8 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Wed, 28 Nov 2018 12:22:36 +0100 Subject: [PATCH 66/73] Disable -Werror for the C++ part --- zookeeper-3.4.9-no-werror.patch | 12 ++++++++++++ zookeeper.spec | 1 + 2 files changed, 13 insertions(+) create mode 100644 zookeeper-3.4.9-no-werror.patch diff --git a/zookeeper-3.4.9-no-werror.patch b/zookeeper-3.4.9-no-werror.patch new file mode 100644 index 0000000..6e6bb3a --- /dev/null +++ b/zookeeper-3.4.9-no-werror.patch @@ -0,0 +1,12 @@ +diff -U3 -r zookeeper-3.4.9-orig/src/c/Makefile.am zookeeper-3.4.9/src/c/Makefile.am +--- zookeeper-3.4.9-orig/src/c/Makefile.am 2016-08-23 09:39:24.000000000 +0200 ++++ zookeeper-3.4.9/src/c/Makefile.am 2018-11-28 12:11:08.361412829 +0100 +@@ -6,7 +6,7 @@ + SOLARIS_LIB_LDFLAGS = -lnsl -lsocket + endif + AM_CPPFLAGS = -I${srcdir}/include -I${srcdir}/tests -I${srcdir}/generated $(SOLARIS_CPPFLAGS) +-AM_CFLAGS = -Wall -Werror ++AM_CFLAGS = -Wall + AM_CXXFLAGS = -Wall $(USEIPV6) + + LIB_LDFLAGS = -no-undefined -version-info 2 $(SOLARIS_LIB_LDFLAGS) diff --git a/zookeeper.spec b/zookeeper.spec index 8de10dc..c1ef2ea 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -19,6 +19,7 @@ Patch3: %{name}-3.4.9-server.patch Patch4: mt_adaptor.c.patch Patch5: 0001-cppunit-config-no-longer-exists-use-pkg-config.patch Patch6: missing-pom.template.patch +Patch7: %{name}-3.4.9-no-werror.patch BuildRequires: autoconf From f9429ff8050d4b2239c9b19b8434da5e22927f2d Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Wed, 28 Nov 2018 12:56:36 +0100 Subject: [PATCH 67/73] Address review comments - Use sed instead of patch to remove -Werror - Remove unneeded Requires (python3-libs is brought in automatically) - Use my name in the changelog --- zookeeper-3.4.9-no-werror.patch | 12 ------------ zookeeper.spec | 7 ++++--- 2 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 zookeeper-3.4.9-no-werror.patch diff --git a/zookeeper-3.4.9-no-werror.patch b/zookeeper-3.4.9-no-werror.patch deleted file mode 100644 index 6e6bb3a..0000000 --- a/zookeeper-3.4.9-no-werror.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -U3 -r zookeeper-3.4.9-orig/src/c/Makefile.am zookeeper-3.4.9/src/c/Makefile.am ---- zookeeper-3.4.9-orig/src/c/Makefile.am 2016-08-23 09:39:24.000000000 +0200 -+++ zookeeper-3.4.9/src/c/Makefile.am 2018-11-28 12:11:08.361412829 +0100 -@@ -6,7 +6,7 @@ - SOLARIS_LIB_LDFLAGS = -lnsl -lsocket - endif - AM_CPPFLAGS = -I${srcdir}/include -I${srcdir}/tests -I${srcdir}/generated $(SOLARIS_CPPFLAGS) --AM_CFLAGS = -Wall -Werror -+AM_CFLAGS = -Wall - AM_CXXFLAGS = -Wall $(USEIPV6) - - LIB_LDFLAGS = -no-undefined -version-info 2 $(SOLARIS_LIB_LDFLAGS) diff --git a/zookeeper.spec b/zookeeper.spec index c1ef2ea..88b8b2a 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -19,7 +19,6 @@ Patch3: %{name}-3.4.9-server.patch Patch4: mt_adaptor.c.patch Patch5: 0001-cppunit-config-no-longer-exists-use-pkg-config.patch Patch6: missing-pom.template.patch -Patch7: %{name}-3.4.9-no-werror.patch BuildRequires: autoconf @@ -117,7 +116,6 @@ This package contains javadoc for %{name}. %{?python_provide:%python_provide python3-%{name}} Summary: Python support for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: python3 %description -n python3-%{name} Python bindings for %{name}. @@ -125,6 +123,9 @@ Python bindings for %{name}. %prep %autosetup -p1 +# Do not treat C compile-time warnings as errors +sed -i -e's/-Werror//' src/c/Makefile.am + 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 @@ -304,7 +305,7 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog -* Wed Nov 28 2018 Fedora Release Engineering - 3.4.9-12 +* Wed Nov 28 2018 Petr Viktorin - 3.4.9-12 - Switch to Python 3 https://bugzilla.redhat.com/show_bug.cgi?id=1630088 From 71fe4b677bf14164cefeaff4caeadaddd5da0947 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:32 +0100 Subject: [PATCH 68/73] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- zookeeper.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index 88b8b2a..c549e56 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -98,7 +98,6 @@ Development files for the ZooKeeper C client library. ############################################## %package java Summary: Java interface for %{name} -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} %description java From b1a6f30865d4aa6fe58b2320c14c4d815d4cb7e3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 13:14:29 +0000 Subject: [PATCH 69/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zookeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index c549e56..d7e5e3b 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -3,7 +3,7 @@ Name: zookeeper Version: 3.4.9 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: https://zookeeper.apache.org/ @@ -304,6 +304,9 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 3.4.9-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Nov 28 2018 Petr Viktorin - 3.4.9-12 - Switch to Python 3 https://bugzilla.redhat.com/show_bug.cgi?id=1630088 From a2d58c72fdb698a08cf0037223c958537c99abb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 13 Feb 2019 01:10:33 +0100 Subject: [PATCH 70/73] https://fedoraproject.org/wiki/Changes/Python_Extension_Flags --- zookeeper.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/zookeeper.spec b/zookeeper.spec index d7e5e3b..f644072 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -215,6 +215,7 @@ mkdir -p %{buildroot}%{_javadocdir}/%{name} cp -pr build/docs/api/* %{buildroot}%{_javadocdir}/%{name}/ pushd src/contrib/zkpython +%set_build_flags %{__python3} src/python/setup.py build --build-base=$PWD/build \ install --root=%{buildroot} ;\ chmod 0755 %{buildroot}%{python3_sitearch}/zookeeper.cpython-*.so From 634ef6e4a98ec8431dca791b8b2c3fcaecf29f14 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 05:04:35 +0000 Subject: [PATCH 71/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zookeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index f644072..4784300 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -3,7 +3,7 @@ Name: zookeeper Version: 3.4.9 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: https://zookeeper.apache.org/ @@ -305,6 +305,9 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 3.4.9-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 3.4.9-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 0d5aa2b5ab56340d5fb6f8f489775bc25ca6b555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 11:10:10 +0200 Subject: [PATCH 72/73] Rebuilt for Python 3.8 --- zookeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zookeeper.spec b/zookeeper.spec index 4784300..116552c 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -3,7 +3,7 @@ Name: zookeeper Version: 3.4.9 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: https://zookeeper.apache.org/ @@ -305,6 +305,9 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Mon Aug 19 2019 Miro Hrončok - 3.4.9-15 +- Rebuilt for Python 3.8 + * Sat Jul 27 2019 Fedora Release Engineering - 3.4.9-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 2345ba7bb1fa01087de9a311917c8ea161ea05ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 26 Dec 2019 14:07:12 +0100 Subject: [PATCH 73/73] Orphaned for 6+ weeks --- .gitignore | 3 - ...nfig-no-longer-exists-use-pkg-config.patch | 62 --- dead.package | 1 + missing-pom.template.patch | 47 -- mt_adaptor.c.patch | 32 -- sources | 1 - zkEnv.sh | 150 ------ zookeeper-3.4.5-add-PIE-and-RELRO.patch | 85 --- zookeeper-3.4.5-zktreeutil-gcc.patch | 10 - zookeeper-3.4.9-ivy-build.patch | 407 --------------- zookeeper-3.4.9-server.patch | 20 - zookeeper-ZooInspector-template.pom | 48 -- zookeeper.service | 23 - zookeeper.spec | 485 ------------------ 14 files changed, 1 insertion(+), 1373 deletions(-) delete mode 100644 .gitignore delete mode 100644 0001-cppunit-config-no-longer-exists-use-pkg-config.patch create mode 100644 dead.package delete mode 100644 missing-pom.template.patch delete mode 100644 mt_adaptor.c.patch delete mode 100644 sources delete mode 100644 zkEnv.sh delete mode 100644 zookeeper-3.4.5-add-PIE-and-RELRO.patch delete mode 100644 zookeeper-3.4.5-zktreeutil-gcc.patch delete mode 100644 zookeeper-3.4.9-ivy-build.patch delete mode 100644 zookeeper-3.4.9-server.patch delete mode 100644 zookeeper-ZooInspector-template.pom delete mode 100644 zookeeper.service delete mode 100644 zookeeper.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index cda2113..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/zookeeper-3.4.5.tar.gz -/zookeeper-3.4.6-601207e.tar.gz -/zookeeper-3.4.9.tar.gz diff --git a/0001-cppunit-config-no-longer-exists-use-pkg-config.patch b/0001-cppunit-config-no-longer-exists-use-pkg-config.patch deleted file mode 100644 index 506d4ad..0000000 --- a/0001-cppunit-config-no-longer-exists-use-pkg-config.patch +++ /dev/null @@ -1,62 +0,0 @@ -From f5fe371100b44d667065c8bba2c1522b26224c23 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Mon, 15 Feb 2016 19:08:14 +0100 -Subject: [PATCH] cppunit-config no longer exists, use pkg-config - ---- - src/c/configure.ac | 4 +++- - src/recipes/lock/src/c/configure.ac | 2 +- - src/recipes/queue/src/c/configure.ac | 2 +- - 3 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/c/configure.ac b/src/c/configure.ac -index b4ed639..09860d9 100644 ---- a/src/c/configure.ac -+++ b/src/c/configure.ac -@@ -25,6 +25,8 @@ DX_INIT_DOXYGEN([zookeeper],[c-doc.Doxyfile],[docs]) - AM_INIT_AUTOMAKE([-Wall foreign]) - AC_CONFIG_HEADER([config.h]) - -+PKG_PROG_PKG_CONFIG -+ - # Checks for programs. - AC_ARG_WITH(cppunit, - [ --without-cppunit do not use CPPUNIT]) -@@ -34,7 +36,7 @@ if test "$with_cppunit" = "no" ; then - CPPUNIT_INCLUDE= - CPPUNIT_LIBS= - else -- AM_PATH_CPPUNIT(1.10.2) -+ PKG_CHECK_MODULES([CPPUNIT], [cppunit]) - fi - - if test "$CALLER" = "ANT" ; then -diff --git a/src/recipes/lock/src/c/configure.ac b/src/recipes/lock/src/c/configure.ac -index 3954123..f494058 100644 ---- a/src/recipes/lock/src/c/configure.ac -+++ b/src/recipes/lock/src/c/configure.ac -@@ -72,7 +72,7 @@ AC_C_VOLATILE - AC_PROG_CC - AC_PROG_LIBTOOL - #check for cppunit --AM_PATH_CPPUNIT(1.10.2) -+PKG_CHECK_MODULES([CPPUNIT], [cppunit]) - # Checks for library functions. - AC_FUNC_UTIME_NULL - AC_CHECK_FUNCS([gettimeofday memset mkdir rmdir strdup strerror strstr strtol strtoul strtoull utime]) -diff --git a/src/recipes/queue/src/c/configure.ac b/src/recipes/queue/src/c/configure.ac -index a9fb7b1..a2b840d 100644 ---- a/src/recipes/queue/src/c/configure.ac -+++ b/src/recipes/queue/src/c/configure.ac -@@ -72,7 +72,7 @@ AC_C_VOLATILE - AC_PROG_CC - AC_PROG_LIBTOOL - #check for cppunit --AM_PATH_CPPUNIT(1.10.2) -+PKG_CHECK_MODULES([CPPUNIT], [cppunit]) - # Checks for library functions. - AC_FUNC_UTIME_NULL - AC_CHECK_FUNCS([gettimeofday memset mkdir rmdir strdup strerror strstr strtol strtoul strtoull utime]) --- -2.5.0 - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/missing-pom.template.patch b/missing-pom.template.patch deleted file mode 100644 index 162e4b8..0000000 --- a/missing-pom.template.patch +++ /dev/null @@ -1,47 +0,0 @@ -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 deleted file mode 100644 index c1f8ae4..0000000 --- a/mt_adaptor.c.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 -- int32_t result; -- asm __volatile__( -- "lock xaddl %0,%1\n" -- : "=r"(result), "=m"(*(int *)operand) -- : "0"(incr) -- : "memory"); -- return result; -+ return __sync_fetch_and_add(operand, incr); - #else -- volatile int32_t result; -- _asm -- { -- mov eax, operand; //eax = v; -- mov ebx, incr; // ebx = i; -- mov ecx, 0x0; // ecx = 0; -- lock xadd dword ptr [eax], ecx; -- lock xadd dword ptr [eax], ebx; -- mov result, ecx; // result = ebx; -- } -- return result; -+ return InterlockedExchangeAdd(operand, incr); - #endif - } - diff --git a/sources b/sources deleted file mode 100644 index dc39b1a..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (zookeeper-3.4.9.tar.gz) = 4f3e003c6ce5e3338f642f7deaa0fd2cfd1b30591d3ed4fe880492dded6c4bf01d30483e28f3a38b43bb6d2696ff4d819fc9577733224cec07e236437e88a657 diff --git a/zkEnv.sh b/zkEnv.sh deleted file mode 100644 index 2cd43e8..0000000 --- a/zkEnv.sh +++ /dev/null @@ -1,150 +0,0 @@ -#!/usr/bin/env bash - -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# This script should be sourced into other zookeeper -# scripts to setup the env variables - -# We use ZOOCFGDIR if defined, -# otherwise we use /etc/zookeeper -# or the conf directory that is -# a sibling of this script's directory - -ZOOBINDIR="${ZOOBINDIR:-/usr/bin}" -ZOOKEEPER_PREFIX="${ZOOBINDIR}/.." -ZOOCFGDIR="/etc/zookeeper" -ZOO_LOG_DIR="/var/log/zookeeper" - -if [ -f "${ZOOCFGDIR}/zookeeper-env.sh" ]; then - . "${ZOOCFGDIR}/zookeeper-env.sh" -fi - -if [ "x$ZOOCFG" = "x" ] -then - ZOOCFG="zoo.cfg" -fi - -ZOOCFG="$ZOOCFGDIR/$ZOOCFG" - -if [ -f "$ZOOCFGDIR/java.env" ] -then - . "$ZOOCFGDIR/java.env" -fi - -if [ "x${ZOO_LOG_DIR}" = "x" ] -then - ZOO_LOG_DIR="." -fi - -if [ "x${ZOO_LOG4J_PROP}" = "x" ] -then - ZOO_LOG4J_PROP="INFO,CONSOLE" -fi - -if [ "$JAVA_HOME" != "" ]; then - JAVA="$JAVA_HOME/bin/java" -else - JAVA=java -fi - -## TSTCLAIR: May need to add jar soup to classpath -#add the zoocfg dir to classpath -CLASSPATH="/usr/share/java/zookeeper/zookeeper.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/zookeeper/zookeeper-tests.jar" - -# This section is sorted for easy maintenance -CLASSPATH="$CLASSPATH:/usr/lib/java/jline1/jline-1.0.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/antlr.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/avalon-framework-api.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/avalon-logkit.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/cglib.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/checkstyle.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/commons-beanutils.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/commons-cli.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/commons-logging.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/geronimo-jms_1.1_spec.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/guava.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/hamcrest/all.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/hamcrest/core.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/hamcrest/generator.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/hamcrest/integration.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/hamcrest/library.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/hamcrest/text.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/javax.mail/javax.mail.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jdiff.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-annotations.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-client.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-continuation.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-deploy.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-http.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-io.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-jaas.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-jmx.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-jndi.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-jsp.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-maven-plugin.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-plus.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-proxy.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-rewrite.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-security.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-server.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-servlet.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-servlets.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-util-ajax.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-util.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-webapp.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-xml.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jetty/websocket-api.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jetty/websocket-client.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jetty/websocket-common.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jetty/websocket-server.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jetty/websocket-servlet.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jtoaster.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/junit.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/jzlib.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/mockito.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/netty.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/objectweb-asm/asm.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/objenesis/objenesis-tck.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/objenesis/objenesis.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/api.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/ext.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/jcl-over-slf4j.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/jul-to-slf4j.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/migrator.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/site.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-api.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-ext.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-migrator.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-site.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/tomcat-servlet-api.jar" - -# We use slf4j-log4j12.jar as our logging binding -CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-log4j12.jar" -# These Conflict with slf4j-log4j12.jar -#CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-jcl.jar" -#CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-nop.jar" -#CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-simple.jar" - -# Explicitly add the log4j 1.2 jars -CLASSPATH="$CLASSPATH:/usr/share/java/log4j-1.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/log4j.jar" - -# Not required according to https://issues.apache.org/jira/browse/SOLR-2369 -#CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/log4j-over-slf4j.jar" -#CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-jdk14.jar" diff --git a/zookeeper-3.4.5-add-PIE-and-RELRO.patch b/zookeeper-3.4.5-add-PIE-and-RELRO.patch deleted file mode 100644 index 7a40d93..0000000 --- a/zookeeper-3.4.5-add-PIE-and-RELRO.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff -Nru zookeeper-3.4.5/contrib/zktreeutil/src/Makefile.am zookeeper-3.4.5-gil/contrib/zktreeutil/src/Makefile.am ---- zookeeper-3.4.5/contrib/zktreeutil/src/Makefile.am 2012-09-30 19:53:30.000000000 +0200 -+++ zookeeper-3.4.5-gil/contrib/zktreeutil/src/Makefile.am 2013-06-11 18:09:15.097330579 +0200 -@@ -16,7 +16,7 @@ - - AM_CXXFLAGS = -I${ZOOKEEPER_PATH}/include -I${ZOOKEEPER_PATH}/generated \ - -I$(top_srcdir)/include -I${LOG4CXX_INCLUDE} -I/usr/include \ -- -I${XML2_INCLUDE} -+ -I${XML2_INCLUDE} -fPIE - - bin_PROGRAMS = zktreeutil - -diff -Nru zookeeper-3.4.5/recipes/lock/src/c/Makefile.am zookeeper-3.4.5-gil/recipes/lock/src/c/Makefile.am ---- zookeeper-3.4.5/recipes/lock/src/c/Makefile.am 2012-09-30 19:53:31.000000000 +0200 -+++ zookeeper-3.4.5-gil/recipes/lock/src/c/Makefile.am 2013-06-11 17:10:22.808629998 +0200 -@@ -17,14 +17,14 @@ - include $(top_srcdir)/aminclude.am - - AM_CFLAGS = -Wall -fPIC -I${ZOOKEEPER_PATH}/include -I${ZOOKEEPER_PATH}/generated \ -- -I$(top_srcdir)/include -I/usr/include -+ -I$(top_srcdir)/include -I/usr/include -fPIE - AM_CPPFLAGS = -Wall -I${ZOOKEEPER_PATH}/include -I${ZOOKEEPER_PATH}/generated\ -- -I${top_srcdir}/include -I/usr/include -+ -I${top_srcdir}/include -I/usr/include -fPIE - EXTRA_DIST = LICENSE - lib_LTLIBRARIES = libzoolock.la - libzoolock_la_SOURCES = src/zoo_lock.c include/zoo_lock.h - libzoolock_la_CPPFLAGS = -DDLOPEN_MODULE --libzoolock_la_LDFLAGS = -version-info 0:1:0 -+libzoolock_la_LDFLAGS = -version-info 0:1:0 -pie -Wl,-z,relro -Wl,-z,now - - #run the tests now - -diff -Nru zookeeper-3.4.5/recipes/queue/src/c/Makefile.am zookeeper-3.4.5-gil/recipes/queue/src/c/Makefile.am ---- zookeeper-3.4.5/recipes/queue/src/c/Makefile.am 2012-09-30 19:53:31.000000000 +0200 -+++ zookeeper-3.4.5-gil/recipes/queue/src/c/Makefile.am 2013-06-11 17:09:50.816288611 +0200 -@@ -17,14 +17,14 @@ - include $(top_srcdir)/aminclude.am - - AM_CFLAGS = -Wall -fPIC -I${ZOOKEEPER_PATH}/include -I${ZOOKEEPER_PATH}/generated \ -- -I$(top_srcdir)/include -I/usr/include -+ -I$(top_srcdir)/include -I/usr/include -fPIE - AM_CPPFLAGS = -Wall -I${ZOOKEEPER_PATH}/include -I${ZOOKEEPER_PATH}/generated\ -- -I${top_srcdir}/include -I/usr/include -+ -I${top_srcdir}/include -I/usr/include -fPIE - EXTRA_DIST = LICENSE - lib_LTLIBRARIES = libzooqueue.la - libzooqueue_la_SOURCES = src/zoo_queue.c include/zoo_queue.h - libzooqueue_la_CPPFLAGS = -DDLOPEN_MODULE --libzooqueue_la_LDFLAGS = -version-info 0:1:0 -+libzooqueue_la_LDFLAGS = -version-info 0:1:0 -pie -Wl,-z,relro -Wl,-z,now - - #run the tests now - -diff -Nru zookeeper-3.4.5/src/c/Makefile.am zookeeper-3.4.5-gil/src/c/Makefile.am ---- zookeeper-3.4.5/src/c/Makefile.am 2012-09-30 19:53:31.000000000 +0200 -+++ zookeeper-3.4.5-gil/src/c/Makefile.am 2013-06-11 17:02:31.701054099 +0200 -@@ -1,11 +1,11 @@ - # need this for Doxygen integration - include $(top_srcdir)/aminclude.am - --AM_CPPFLAGS = -I${srcdir}/include -I${srcdir}/tests -I${srcdir}/generated --AM_CFLAGS = -Wall -Werror --AM_CXXFLAGS = -Wall $(USEIPV6) -+AM_CPPFLAGS = -I${srcdir}/include -I${srcdir}/tests -I${srcdir}/generated -fPIE -+AM_CFLAGS = -Wall -Werror -fPIE -+AM_CXXFLAGS = -Wall $(USEIPV6) -fPIE - --LIB_LDFLAGS = -no-undefined -version-info 2 -+LIB_LDFLAGS = -no-undefined -version-info 2 -pie -Wl,-z,relro -Wl,-z,now - - pkginclude_HEADERS = include/zookeeper.h include/zookeeper_version.h include/zookeeper_log.h include/proto.h include/recordio.h generated/zookeeper.jute.h - EXTRA_DIST=LICENSE -diff -Nru zookeeper-3.4.5/src/contrib/zktreeutil/src/Makefile.am zookeeper-3.4.5-gil/src/contrib/zktreeutil/src/Makefile.am ---- zookeeper-3.4.5/src/contrib/zktreeutil/src/Makefile.am 2012-09-30 19:53:32.000000000 +0200 -+++ zookeeper-3.4.5-gil/src/contrib/zktreeutil/src/Makefile.am 2013-06-11 18:12:03.908634751 +0200 -@@ -16,7 +16,7 @@ - - AM_CXXFLAGS = -I${ZOOKEEPER_PATH}/include -I${ZOOKEEPER_PATH}/generated \ - -I$(top_srcdir)/include -I${LOG4CXX_INCLUDE} -I/usr/include \ -- -I${XML2_INCLUDE} -+ -I${XML2_INCLUDE} -fPIE - - bin_PROGRAMS = zktreeutil - diff --git a/zookeeper-3.4.5-zktreeutil-gcc.patch b/zookeeper-3.4.5-zktreeutil-gcc.patch deleted file mode 100644 index 5463c26..0000000 --- a/zookeeper-3.4.5-zktreeutil-gcc.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 - #include -+#include - - extern "C" { - #include "zookeeper.h" diff --git a/zookeeper-3.4.9-ivy-build.patch b/zookeeper-3.4.9-ivy-build.patch deleted file mode 100644 index f1e663b..0000000 --- a/zookeeper-3.4.9-ivy-build.patch +++ /dev/null @@ -1,407 +0,0 @@ -diff --git a/build.xml b/build.xml -index 8562000..7975f13 100644 ---- a/build.xml -+++ b/build.xml -@@ -257,7 +257,7 @@ xmlns:maven="antlib:org.apache.maven.artifact.ant"> - - - -- -+ - - - -@@ -343,9 +343,9 @@ xmlns:maven="antlib:org.apache.maven.artifact.ant"> - - - -- -+ includes="ivy.jar" excludes="ivy.jar"/> -+ - - - -diff --git a/ivy.xml b/ivy.xml -index 95b0e5a..0ea5c4d 100644 ---- a/ivy.xml -+++ b/ivy.xml -@@ -46,10 +46,10 @@ - - - -- -- -+ -+ - -- -+ - - - -@@ -58,14 +58,14 @@ - - -- - - -- -- - - - -- -- -- -- -- - - -+ - -- -- -- -+ - - -- -- -- -+ - - - -diff --git a/src/contrib/build-contrib.xml b/src/contrib/build-contrib.xml -index fab8a5f..80518a8 100644 ---- a/src/contrib/build-contrib.xml -+++ b/src/contrib/build-contrib.xml -@@ -103,7 +103,7 @@ - - - -- -+ - - - -@@ -219,9 +219,9 @@ - - - -- -+ includes="ivy.jar" excludes="ivy.jar"/> -+ - - - -diff --git a/src/contrib/build.xml b/src/contrib/build.xml -index 7f7ba4f..701dfea 100644 ---- a/src/contrib/build.xml -+++ b/src/contrib/build.xml -@@ -20,7 +20,7 @@ - - - -- -+ - - - -diff --git a/src/contrib/rest/build.xml b/src/contrib/rest/build.xml -deleted file mode 100644 -index fb628bc..0000000 ---- a/src/contrib/rest/build.xml -+++ /dev/null -@@ -1,183 +0,0 @@ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- Tests failed! -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -diff --git a/src/contrib/rest/ivy.xml b/src/contrib/rest/ivy.xml -deleted file mode 100644 -index 903d390..0000000 ---- a/src/contrib/rest/ivy.xml -+++ /dev/null -@@ -1,48 +0,0 @@ -- -- -- -- -- -- -- -- 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 bc02946..cb4061f 100644 ---- a/src/contrib/zooinspector/ivy.xml -+++ b/src/contrib/zooinspector/ivy.xml -@@ -35,7 +35,7 @@ - - - -- -+ - - diff --git a/zookeeper-3.4.9-server.patch b/zookeeper-3.4.9-server.patch deleted file mode 100644 index c27977a..0000000 --- a/zookeeper-3.4.9-server.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/bin/zkServer.sh b/bin/zkServer.sh -index 51dbe9f..bc9be90 100755 ---- a/bin/zkServer.sh -+++ b/bin/zkServer.sh -@@ -92,14 +92,7 @@ then - 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 -+KILL=kill - - echo "Using config: $ZOOCFG" >&2 - diff --git a/zookeeper-ZooInspector-template.pom b/zookeeper-ZooInspector-template.pom deleted file mode 100644 index c7b0a3c..0000000 --- a/zookeeper-ZooInspector-template.pom +++ /dev/null @@ -1,48 +0,0 @@ - - 4.0.0 - org.apache.zookeeper - zookeeper-ZooInspector - @version@ - - - org.apache.zookeeper - zookeeper - @version@ - - - org.slf4j - slf4j-api - any - - - org.slf4j - slf4j-log4j12 - any - - - log4j - log4j - any - - - org.jboss.netty - netty - any - - - jline - jline - any - - - com.nitido - jtoaster - any - - - xerces - xercesImpl - any - - - \ No newline at end of file diff --git a/zookeeper.service b/zookeeper.service deleted file mode 100644 index f6939d9..0000000 --- a/zookeeper.service +++ /dev/null @@ -1,23 +0,0 @@ -[Unit] -Description=Apache ZooKeeper -After=network.target -ConditionPathExists=/etc/zookeeper/zoo.cfg -ConditionPathExists=/etc/zookeeper/log4j.properties - -[Service] -Type=forking -User=zookeeper -SyslogIdentifier=zookeeper -WorkingDirectory=/var/lib/zookeeper -ExecStart=/usr/bin/zkServer.sh start zoo.cfg -ExecStop=/usr/bin/zkServer.sh stop - -User=root -Group=root -# TODO: check updated permissions. -# Group=zookeeper -Restart=always -RestartSec=20 - -[Install] -WantedBy=multi-user.target diff --git a/zookeeper.spec b/zookeeper.spec deleted file mode 100644 index 116552c..0000000 --- a/zookeeper.spec +++ /dev/null @@ -1,485 +0,0 @@ -%global _hardened_build 1 -%global skiptests 1 - -Name: zookeeper -Version: 3.4.9 -Release: 15%{?dist} -Summary: A high-performance coordination service for distributed applications -License: ASL 2.0 and BSD -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.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 -BuildRequires: automake -BuildRequires: boost-devel -BuildRequires: pkgconfig(cppunit) -BuildRequires: dos2unix -BuildRequires: doxygen -BuildRequires: gcc-c++ -BuildRequires: graphviz -BuildRequires: java-devel -BuildRequires: java-javadoc -BuildRequires: jpackage-utils -BuildRequires: libtool -BuildRequires: libxml2-devel -BuildRequires: python3-devel - -BuildRequires: ant -BuildRequires: ant-junit -BuildRequires: apache-ivy -BuildRequires: checkstyle -BuildRequires: ivy-local -BuildRequires: javapackages-tools - -BuildRequires: jtoaster -BuildRequires: junit -BuildRequires: jdiff -%if 0%{?fedora} >= 21 || 0%{?rhel} > 7 -BuildRequires: mvn(org.slf4j:slf4j-log4j12) -BuildRequires: objectweb-pom -BuildRequires: jline1 -BuildRequires: netty3 -Requires: log4j12 -%else -BuildRequires: mvn(log4j:log4j) -BuildRequires: jline -BuildRequires: netty -Requires: log4j -%endif - -BuildRequires: json_simple - -BuildRequires: mockito -BuildRequires: slf4j -BuildRequires: xerces-j2 -BuildRequires: xml-commons-apis - -# remove later on. -BuildRequires: apache-commons-parent -BuildRequires: jetty-server -BuildRequires: jetty-servlet -BuildRequires: systemd - -Requires: checkstyle -Requires: jline1 -Requires: jtoaster -Requires: junit -Requires: mockito -Requires: netty3 -Requires: slf4j -Requires: java -Requires: jpackage-utils -Requires: %{name}-java = %{version}-%{release} - -%description -ZooKeeper is a centralized service for maintaining configuration information, -naming, providing distributed synchronization, and providing group services. - -############################################## -%package devel -Summary: Development files for the %{name} library -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description devel -Development files for the ZooKeeper C client library. - -############################################## -%package java -Summary: Java interface for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description java -The %{name}-java package contains Java bindings for %{name}. - -############################################## -%package javadoc -Summary: Javadoc for %{name} -BuildArch: noarch - -%description javadoc -This package contains javadoc for %{name}. - -%package -n python3-%{name} -%{?python_provide:%python_provide python3-%{name}} -Summary: Python support for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description -n python3-%{name} -Python bindings for %{name}. - -%prep -%autosetup -p1 - -# Do not treat C compile-time warnings as errors -sed -i -e's/-Werror//' src/c/Makefile.am - -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 - -sed -i 's|||' build.xml -sed -i 's|||' build.xml - -sed -i 's@^dataDir=.*$@dataDir=%{_sharedstatedir}/zookeeper/data\ndataLogDir=%{_sharedstatedir}/zookeeper/log@' conf/zoo_sample.cfg - -%build -%ant -Divy.mode=local \ --DCLASSPATH=/usr/share/java/log4j12-1.2.17.jar \ --Dtarget.jdk=1.5 \ --Djavadoc.link.java=%{_javadocdir}/java \ --Dant.build.javac.source=1.5 \ --Dant.build.javac.target=1.5 \ -package - -# cppunit-config patch touches configure.ac in these dirs -pushd src/recipes/lock/src/c -autoreconf -if -popd -pushd src/recipes/queue/src/c -autoreconf -if -popd - -pushd src/c -autoreconf -if -%configure --disable-static --disable-rpath -%{__make} %{?_smp_mflags} -popd - -## TODO: install utilities? - -%check -%if %skiptests - echo "Testing disabled, please enable in mock" -%else - %ant -Divy.mode=local test -%endif - -%install - -# the following is used to update zkEnv.sh -# find . -name "*.jar" -exec basename {} \; |sort|uniq -# remove items that don't belong and update execute build-classpath - -#install the c tools -pushd src/c -%make_install -popd - -# install the java dependencies. -mkdir -p %{buildroot}%{_javadir}/%{name} -install -pm 644 build/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar -install -pm 644 build/%{name}-%{version}-test.jar %{buildroot}%{_javadir}/%{name}/%{name}-tests.jar -install -pm 644 build/contrib/ZooInspector/%{name}-%{version}-ZooInspector.jar %{buildroot}%{_javadir}/%{name}/%{name}-ZooInspector.jar - -install -pm 755 bin/zkCleanup.sh %{buildroot}%{_bindir} -install -pm 755 bin/zkCli.sh %{buildroot}%{_bindir} -install -pm 755 bin/zkServer.sh %{buildroot}%{_bindir} -mkdir -p %{buildroot}%{_libexecdir} -install -pm 755 %{SOURCE3} %{buildroot}%{_libexecdir} - -%if 0%{?fedora} >= 21 || 0%{?rhel} > 7 -mkdir -p %{buildroot}%{_datadir}/maven-metadata -mkdir -p %{buildroot}%{_datadir}/maven-poms -install -pm 644 build/%{name}-%{version}/dist-maven/%{name}-%{version}.pom %{buildroot}%{_datadir}/maven-poms/%{name}-%{name}.pom - -%add_maven_depmap %{name}-%{name}.pom %{name}/%{name}.jar -%add_maven_depmap org.apache.zookeeper:zookeeper::tests:%{version} %{name}/%{name}-tests.jar - -install -pm 644 %{SOURCE1} %{buildroot}%{_datadir}/maven-poms/%{name}-%{name}-ZooInspector.pom -sed -i "s|@version@|%{version}|" %{buildroot}%{_datadir}/maven-poms/%{name}-%{name}-ZooInspector.pom -%add_maven_depmap %{name}-%{name}-ZooInspector.pom %{name}/%{name}-ZooInspector.jar -%else -mkdir -p %{buildroot}%{_mavenpomdir} -install -pm 644 build/%{name}-%{version}/dist-maven/%{name}-%{version}.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom - -%add_maven_depmap JPP.%{name}-%{name}.pom %{name}/%{name}.jar -%add_maven_depmap org.apache.zookeeper:zookeeper::tests:%{version} %{name}/%{name}-tests.jar - -install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-ZooInspector.pom -sed -i "s|@version@|%{version}|" %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-ZooInspector.pom -%add_maven_depmap JPP.%{name}-%{name}-ZooInspector.pom %{name}/%{name}-ZooInspector.jar -%endif - -mkdir -p %{buildroot}%{_javadocdir}/%{name} -cp -pr build/docs/api/* %{buildroot}%{_javadocdir}/%{name}/ - -pushd src/contrib/zkpython -%set_build_flags -%{__python3} src/python/setup.py build --build-base=$PWD/build \ -install --root=%{buildroot} ;\ -chmod 0755 %{buildroot}%{python3_sitearch}/zookeeper.cpython-*.so -popd - -find %{buildroot} -name '*.la' -exec rm -f {} ';' -find %{buildroot} -name '*.a' -exec rm -f {} ';' - -mkdir -p %{buildroot}%{_unitdir} -mkdir -p %{buildroot}%{_sysconfdir}/zookeeper -mkdir -p %{buildroot}%{_localstatedir}/log/zookeeper -mkdir -p %{buildroot}%{_sharedstatedir}/zookeeper -mkdir -p %{buildroot}%{_sharedstatedir}/zookeeper/data -mkdir -p %{buildroot}%{_sharedstatedir}/zookeeper/log -install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir} -install -p -m 0640 conf/log4j.properties %{buildroot}%{_sysconfdir}/zookeeper -install -p -m 0640 conf/zoo_sample.cfg %{buildroot}%{_sysconfdir}/zookeeper -touch %{buildroot}%{_sysconfdir}/zookeeper/zoo.cfg -touch %{buildroot}%{_sharedstatedir}/zookeeper/data/myid - -%pre -getent group zookeeper >/dev/null || groupadd -r zookeeper -getent passwd zookeeper >/dev/null || \ - useradd -r -g zookeeper -d %{_sharedstatedir}/zookeeper -s /sbin/nologin \ - -c "ZooKeeper service account" zookeeper - -%post -%systemd_post zookeeper.service -/sbin/ldconfig - -%preun -%systemd_preun zookeeper.service - -%postun -%systemd_postun_with_restart zookeeper.service -/sbin/ldconfig - -%files -%{_bindir}/cli_mt -%{_bindir}/cli_st -%{_bindir}/load_gen -%{_bindir}/zk*.sh -%{_libexecdir}/zkEnv.sh -%{_libdir}/lib*.so.* - -%attr(0755,root,root) %dir %{_sysconfdir}/zookeeper -%attr(0644,root,root) %ghost %config(noreplace) %{_sysconfdir}/zookeeper/zoo.cfg -%attr(0644,root,root) %{_sysconfdir}/zookeeper/zoo_sample.cfg -%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/zookeeper/log4j.properties - -%attr(0755,zookeeper,zookeeper) %dir %{_localstatedir}/log/zookeeper -%attr(0755,root,root) %dir %{_sharedstatedir}/zookeeper -%attr(0750,zookeeper,zookeeper) %dir %{_sharedstatedir}/zookeeper/data -%attr(0640,zookeeper,zookeeper) %ghost %{_sharedstatedir}/zookeeper/data/myid -%attr(0755,zookeeper,zookeeper) %dir %{_sharedstatedir}/zookeeper/log -%{_unitdir}/zookeeper.service -%doc CHANGES.txt LICENSE.txt NOTICE.txt README.txt - -%files java -%dir %{_javadir}/%{name} -%{_javadir}/%{name}/%{name}.jar -%{_javadir}/%{name}/%{name}-tests.jar -%{_javadir}/%{name}/%{name}-ZooInspector.jar -%if 0%{?fedora} >= 21 || 0%{?rhel} > 7 -%{_datadir}/maven-poms/%{name}-%{name}.pom -%{_datadir}/maven-poms/%{name}-%{name}-ZooInspector.pom -%{_datadir}/maven-metadata/%{name}.xml -%else -%{_mavendepmapfragdir}/%{name} -%{_mavenpomdir}/JPP.%{name}-%{name}.pom -%{_mavenpomdir}/JPP.%{name}-%{name}-ZooInspector.pom -%endif -%doc CHANGES.txt LICENSE.txt NOTICE.txt README.txt - -%files devel -%{_includedir}/%{name}/ -%{_libdir}/*.so -%doc src/c/LICENSE src/c/NOTICE.txt - -%files javadoc -%{_javadocdir}/%{name} -%doc LICENSE.txt NOTICE.txt - -%files -n python3-%{name} -%{python3_sitearch}/ZooKeeper-?.?-py%{python3_version}.egg-info -%{python3_sitearch}/zookeeper.cpython-*.so -%doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README - -%changelog -* Mon Aug 19 2019 Miro Hrončok - 3.4.9-15 -- Rebuilt for Python 3.8 - -* Sat Jul 27 2019 Fedora Release Engineering - 3.4.9-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 3.4.9-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Nov 28 2018 Petr Viktorin - 3.4.9-12 -- Switch to Python 3 - https://bugzilla.redhat.com/show_bug.cgi?id=1630088 - -* Sat Jul 14 2018 Fedora Release Engineering - 3.4.9-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Mar 27 2018 Iryna Shcherbina - 3.4.9-10 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Thu Mar 08 2018 Christopher Tubbs - 3.4.9-9 -- Add gcc-c++ BuildRequires - -* Fri Feb 09 2018 Fedora Release Engineering - 3.4.9-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Sep 07 2017 Troy Dawson - 3.4.9-7 -- Cleanup spec file conditionals - -* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 3.4.9-6 -- Python 2 binary package renamed to python2-zookeeper - See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 - -* Thu Aug 03 2017 Fedora Release Engineering - 3.4.9-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 3.4.9-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 3.4.9-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Jan 27 2017 Jonathan Wakely - 3.4.9-2 -- Rebuilt for Boost 1.63 - -* 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 - -* Fri Feb 05 2016 Fedora Release Engineering - 3.4.6-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sat Jan 16 2016 Jonathan Wakely - 3.4.6-15 -- Rebuilt for Boost 1.60 - -* Sun Nov 15 2015 Christopher Tubbs - 3.4.6-14 -- Remove duplicates and fix broken classpath items in zkEnv - -* Tue Nov 03 2015 Christopher Tubbs - 3.4.6-13 -- Remove unused build dependency log4cxx - -* Mon Oct 19 2015 Christopher Tubbs - 3.4.6-12 -- Fix bz#1272694 Remove precondition on myid file for standalone defaults - -* Fri Oct 16 2015 Christopher Tubbs - 3.4.6-11 -- Fix bad rollback. Rollback to netty 3.6.6, not 3.7.0 (f21 only) - -* Fri Oct 16 2015 Christopher Tubbs - 3.4.6-10 -- Rollback changes for netty 3.9.3 for f21 only - -* Fri Oct 16 2015 Christopher Tubbs - 3.4.6-9 -- Update zkEnv.sh CLASSPATH to fix bz#1261458 - -* Thu Aug 27 2015 Jonathan Wakely - 3.4.6-8 -- Rebuilt for Boost 1.59 - -* Wed Jul 29 2015 Fedora Release Engineering - 3.4.6-7 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Wed Jul 22 2015 David Tardon - 3.4.6-6 -- rebuild for Boost 1.58 - -* Fri Jun 19 2015 Fedora Release Engineering - 3.4.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Feb 15 2015 Peter Robinson 3.4.6-4 -- Update netty3 patch for 3.9.3 - -* Tue Jan 27 2015 Petr Machata - 3.4.6-3 -- Rebuild for boost 1.57.0 - -* Thu Oct 23 2014 Timothy St. Clair - 3.4.6-2 -- Add back -java subpackage - -* Tue Oct 21 2014 Timothy St. Clair - 3.4.6-1 -- Update to latest stable series -- Cleanup and overhaul package -- Updated system integration - -* Mon Aug 18 2014 Fedora Release Engineering - 3.4.5-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 3.4.5-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri May 23 2014 Petr Machata - 3.4.5-18 -- Rebuild for boost 1.55.0 - -* Mon Feb 24 2014 Timothy St. Clair - 3.4.5-17 -- Update due to cascading dependencies around java-headless - -* Fri Jan 31 2014 Timothy St. Clair - 3.4.5-16 -- Update of tests.jar due to netty3 compat packaging conflicts - -* Fri Jan 24 2014 Timothy St. Clair - 3.4.5-15 -- Update jline and netty3 for f21 builds - -* Fri Oct 25 2013 Timothy St. Clair - 3.4.5-14 -- Update dependencies to jline1 - -* Wed Sep 18 2013 Timothy St. Clair - 3.4.5-13 -- Fixed the atomic patch which actually caused recursive crashing on zookeeper_close - -* Tue Jul 30 2013 Petr Machata - 3.4.5-12 -- Rebuild for boost 1.54.0 - -* Tue Jul 30 2013 gil cattaneo 3.4.5-11 -- fix changelog entries - -* Mon Jul 22 2013 Timothy St. Clair - 3.4.5-10 -- update permissions to be in line with default policies - -* Mon Jul 22 2013 gil cattaneo 3.4.5-9 -- removed not needed %%defattr (only required for rpm < 4.4) -- removed not needed Group fields (new package guideline) -- fix directory ownership in java sub package - -* Mon Jul 22 2013 Timothy St. Clair - 3.4.5-8 -- cleanup file ownership properties. - -* Sat Jun 15 2013 Jeffrey C. Ollie - 3.4.5-7 -- add server subpackage - -* Fri Jun 14 2013 Dan Horák - 3.4.5-6 -- use fetch_and_add from GCC, fixes build on non-x86 arches - -* Tue Jun 11 2013 gil cattaneo 3.4.5-5 -- fixed zookeeper.so non-standard-executable-perm thanks to Björn Esser - -* Tue Jun 11 2013 gil cattaneo 3.4.5-4 -- enabled hardened-builds -- fixed fully versioned dependency in subpackages (lib-devel and python) -- fixed License tag -- moved large documentation in lib-doc subpackage - -* Sat Apr 27 2013 gil cattaneo 3.4.5-3 -- built ZooInspector -- added additional poms files - -* Tue Apr 23 2013 gil cattaneo 3.4.5-2 -- building/packaging of the zookeeper-test.jar thanks to Robert Rati - -* Sun Dec 02 2012 gil cattaneo 3.4.5-1 -- update to 3.4.5 - -* Tue Oct 30 2012 gil cattaneo 3.4.4-3 -- fix missing hostname - -* Fri Oct 12 2012 gil cattaneo 3.4.4-2 -- add ant-junit as BR - -* Fri Oct 12 2012 gil cattaneo 3.4.4-1 -- update to 3.4.4 - -* Fri May 18 2012 gil cattaneo 3.4.3-1 -- initial rpm