rpms/zookeeper
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Orphaned for 6+ weeks

Browse source
This commit is contained in:
Miro Hrončok 2019-12-26 14:07:12 +01:00
commit 2345ba7bb1
14 changed files with 1 additions and 1373 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -1,3 +0,0 @@
/zookeeper-3.4.5.tar.gz
/zookeeper-3.4.6-601207e.tar.gz
/zookeeper-3.4.9.tar.gz

62
0001-cppunit-config-no-longer-exists-use-pkg-config.patch
View file

@ -1,62 +0,0 @@
From f5fe371100b44d667065c8bba2c1522b26224c23 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
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

1
dead.package Normal file
View file

@ -0,0 +1 @@
Orphaned for 6+ weeks

47
missing-pom.template.patch
View file

@ -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 ***************************************************************
+<?xml version="1.0" encoding="UTF-8"?>
+${ivy.pom.license}
+${ivy.pom.header}
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>${ivy.pom.groupId}</groupId>
+ <artifactId>${ivy.pom.artifactId}</artifactId>
+ <packaging>${ivy.pom.packaging}</packaging>
+ <version>${ivy.pom.version}</version>
+ <name>${ivy.pom.name}</name>
+ <description>${ivy.pom.description}</description>
+ <url>${ivy.pom.url}</url>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+</project>

32
mt_adaptor.c.patch
View file

@ -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
}

1
sources
View file

@ -1 +0,0 @@
SHA512 (zookeeper-3.4.9.tar.gz) = 4f3e003c6ce5e3338f642f7deaa0fd2cfd1b30591d3ed4fe880492dded6c4bf01d30483e28f3a38b43bb6d2696ff4d819fc9577733224cec07e236437e88a657

150
zkEnv.sh
View file

@ -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"

85
zookeeper-3.4.5-add-PIE-and-RELRO.patch
View file

@ -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

10
zookeeper-3.4.5-zktreeutil-gcc.patch
View file

@ -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 <string>
#include <vector>
+#include <unistd.h>
extern "C" {
#include "zookeeper.h"

407
zookeeper-3.4.9-ivy-build.patch
View file

@ -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">
<mkdir dir="${ivy.package.lib}"/>
<mkdir dir="${ivy.test.lib}"/>
<condition property="ivy.jar.exists">
- <available file="${lib.dir}/ivy-${ivy.version}.jar"/>
+ <available file="/usr/share/java/ivy.jar"/>
</condition>
<tstamp>
@@ -343,9 +343,9 @@ xmlns:maven="antlib:org.apache.maven.artifact.ant">
<target name="ivy-download" unless="ivy.jar.exists" depends="init">
<delete dir="${lib.dir}"
- includes="ivy-*.jar" excludes="ivy-${ivy.version}.jar"/>
- <get src="${ivy.url}/${ivy.version}/ivy-${ivy.version}.jar"
- dest="${lib.dir}/ivy-${ivy.version}.jar" usetimestamp="true"/>
+ includes="ivy.jar" excludes="ivy.jar"/>
+ <get src="${ivy.url}/ivy.jar"
+ dest="${lib.dir}/ivy.jar" usetimestamp="true"/>
</target>
<target name="ivy-taskdef" unless="ivy.initialized">
diff --git a/ivy.xml b/ivy.xml
index 95b0e5a..0ea5c4d 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -46,10 +46,10 @@
<dependency org="org.apache.maven.wagon" name="wagon-http" rev="2.4" conf="mvn-ant-task->default"/>
<dependency org="org.apache.maven" name="maven-ant-tasks" rev="2.1.3" conf="mvn-ant-task->default"/>
<!-- transitive false turns off dependency checking, log4j deps seem borked -->
- <dependency org="log4j" name="log4j" rev="1.2.16" transitive="false" conf="default"/>
- <dependency org="jline" name="jline" rev="0.9.94" transitive="false" conf="default"/>
+ <dependency org="log4j" name="log4j" rev="1.2.17" transitive="false" conf="default"/>
+ <dependency org="jline" name="jline" rev="1.0" transitive="false" conf="default"/>
- <dependency org="io.netty" name="netty" conf="default" rev="3.10.5.Final">
+ <dependency org="io.netty" name="netty" conf="default" rev="3.9.3.Final">
<artifact name="netty" type="jar" conf="default"/>
</dependency>
@@ -58,14 +58,14 @@
<dependency org="junit" name="junit" rev="4.8.1" conf="test->default"/>
<dependency org="org.mockito" name="mockito-all" rev="1.8.2"
conf="test->default"/>
- <dependency org="checkstyle" name="checkstyle" rev="5.0"
+ <dependency org="com.puppycrawl.tools" name="checkstyle" rev="5.6"
conf="test->default"/>
<dependency org="commons-collections" name="commons-collections"
rev="3.2.2" conf="test->default"/>
- <dependency org="jdiff" name="jdiff" rev="1.0.9"
+ <dependency org="jdiff" name="jdiff" rev="1.1.1"
conf="jdiff->default"/>
- <dependency org="xerces" name="xerces" rev="1.4.4"
+ <dependency org="xerces" name="xercesImpl" rev="1.4.4"
conf="jdiff->default"/>
<dependency org="org.apache.rat" name="apache-rat-tasks"
diff --git a/ivysettings.xml b/ivysettings.xml
index 52cfa52..595dd4c 100644
--- a/ivysettings.xml
+++ b/ivysettings.xml
@@ -17,29 +17,14 @@
limitations under the License.
-->
- <property name="repo.maven.org"
- value="http://repo1.maven.org/maven2/" override="false"/>
- <property name="repo.jboss.org"
- value="http://repository.jboss.org/nexus/content/groups/public/" override="false"/>
- <property name="repo.sun.org"
- value="http://download.java.net/maven/2/" override="false"/>
- <property name="maven2.pattern"
- value="[organisation]/[module]/[revision]/[module]-[revision]"/>
- <property name="maven2.pattern.ext" value="${maven2.pattern}.[ext]"/>
<include url="${ivy.default.conf.dir}/ivyconf-local.xml"/>
<settings defaultResolver="default"/>
+ <typedef name="xmvn" classname="org.fedoraproject.xmvn.connector.ivy.IvyResolver"/>
<resolvers>
- <ibiblio name="maven2" root="${repo.maven.org}"
- pattern="${maven2.pattern.ext}" m2compatible="true"/>
- <ibiblio name="jboss-maven2" root="${repo.jboss.org}"
- pattern="${maven2.pattern.ext}" m2compatible="true"/>
- <ibiblio name="sun-maven2" root="${repo.sun.org}"
- pattern="${maven2.pattern.ext}" m2compatible="true"/>
+ <xmvn name="XMvn"/>
<chain name="default" dual="true">
- <resolver ref="maven2"/>
- <resolver ref="jboss-maven2"/>
- <resolver ref="sun-maven2"/>
+ <resolver ref="XMvn"/>
</chain>
</resolvers>
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 @@
<mkdir dir="${ivy.lib}"/>
<mkdir dir="${ivy.test.lib}"/>
<condition property="ivy.jar.exists">
- <available file="${lib.dir}/ivy-${ivy.version}.jar"/>
+ <available file="/usr/share/java/ivy.jar"/>
</condition>
<antcall target="init-contrib"/>
@@ -219,9 +219,9 @@
<!-- ====================================================== -->
<target name="ivy-download" unless="ivy.jar.exists" depends="init">
<delete dir="${lib.dir}"
- includes="ivy-*.jar" excludes="ivy-${ivy.version}.jar"/>
- <get src="${ivy.url}/${ivy.version}/ivy-${ivy.version}.jar"
- dest="${lib.dir}/ivy-${ivy.version}.jar" usetimestamp="true"/>
+ includes="ivy.jar" excludes="ivy.jar"/>
+ <get src="${ivy.url}/ivy.jar"
+ dest="${lib.dir}/ivy.jar" usetimestamp="true"/>
</target>
<target name="ivy-init" depends="ivy-download" unless="ivy.initialized">
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 @@
<project name="zookeepercontrib" default="compile" basedir=".">
<property name="contribfilesetincludes" value="*/build.xml" />
- <property name="contribfilesetexcludes" value="" />
+ <property name="contribfilesetexcludes" value="rest/build.xml" />
<fileset id="contribfileset" dir=".">
<include name="${contribfilesetincludes}"/>
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 @@
-<?xml version="1.0"?>
-
-<!--
- 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.
--->
-
-<project name="rest" default="jar">
- <import file="../build-contrib.xml"/>
-
- <property name="test.build.dir" value="${build.test}" />
- <property name="test.src.dir" value="src/test"/>
- <property name="test.log.dir" value="${test.build.dir}/logs" />
- <property name="test.data.dir" value="${test.build.dir}/data" />
- <property name="test.data.upgrade.dir" value="${test.data.dir}/upgrade" />
- <property name="test.tmp.dir" value="${test.build.dir}/tmp" />
- <property name="test.output" value="no" />
- <property name="test.timeout" value="900000" />
- <property name="test.junit.output.format" value="plain" />
- <property name="test.junit.fork.mode" value="perTest" />
- <property name="test.junit.printsummary" value="yes" />
- <property name="test.junit.haltonfailure" value="no" />
- <property name="test.junit.maxmem" value="512m" />
-
- <!-- ====================================================== -->
- <!-- Macro definitions -->
- <!-- ====================================================== -->
- <macrodef name="macro_tar" description="Worker Macro for tar">
- <attribute name="param.destfile"/>
- <element name="param.listofitems"/>
- <sequential>
- <tar compression="gzip" longfile="gnu"
- destfile="@{param.destfile}">
- <param.listofitems/>
- </tar>
- </sequential>
- </macrodef>
-
- <target name="package" depends="jar" unless="skip.contrib">
- <echo message="contrib: ${name}"/>
- <mkdir dir="${dist.dir}${package.share}/contrib/${name}"/>
- <copy todir="${dist.dir}${package.share}/contrib/${name}">
- <fileset dir="${build.dir}">
- <include name="zookeeper-${version}-${name}.jar" />
- </fileset>
- </copy>
- <copy todir="${dist.dir}${package.share}/contrib/${name}/lib">
- <fileset dir="${build.dir}/lib" />
- </copy>
- <copy todir="${dist.dir}${package.share}/contrib/${name}/conf">
- <fileset dir="conf" />
- </copy>
- </target>
-
- <target name="setjarname">
- <property name="jarname"
- value="${build.dir}/zookeeper-${version}-${name}.jar"/>
- </target>
-
- <target name="compile" depends="ivy-retrieve,zookeeperbuildcontrib.compile"/>
-
- <target name="test"
- depends="compile-test,test-init,test-category,test-start,junit.run,test-stop" />
-
- <target name="compile-test" depends="ivy-retrieve-test,compile">
- <property name="target.jdk" value="${ant.java.version}" />
- <property name="src.test.local" location="${basedir}/src/test" />
- <mkdir dir="${build.test}"/>
- <javac srcdir="${src.test.local}"
- destdir="${build.test}"
- target="${target.jdk}"
- debug="on" >
- <classpath refid="classpath" />
- </javac>
- </target>
-
- <target name="test-init" depends="jar,compile-test">
- <delete dir="${test.log.dir}" />
- <delete dir="${test.tmp.dir}" />
- <delete dir="${test.data.dir}" />
- <mkdir dir="${test.log.dir}" />
- <mkdir dir="${test.tmp.dir}" />
- <mkdir dir="${test.data.dir}" />
- </target>
-
- <target name="test-start">
- <exec executable="${test.src.dir}/zkServer.sh">
- <arg value="startClean"/>
- </exec>
- </target>
-
- <target name="test-stop">
- <exec executable="${test.src.dir}/zkServer.sh">
- <arg value="stop"/>
- </exec>
- </target>
-
- <target name="test-category">
- <property name="test.category" value=""/>
- </target>
-
- <target name="junit.run">
- <echo message="${test.src.dir}" />
- <junit showoutput="${test.output}"
- printsummary="${test.junit.printsummary}"
- haltonfailure="${test.junit.haltonfailure}"
- fork="yes"
- forkmode="${test.junit.fork.mode}"
- maxmemory="${test.junit.maxmem}"
- dir="${basedir}" timeout="${test.timeout}"
- errorProperty="tests.failed" failureProperty="tests.failed">
- <sysproperty key="build.test.dir" value="${test.tmp.dir}" />
- <sysproperty key="test.data.dir" value="${test.data.dir}" />
- <sysproperty key="log4j.configuration"
- value="file:${basedir}/conf/log4j.properties" />
- <classpath refid="classpath"/>
- <classpath>
- <pathelement path="${build.test}" />
- </classpath>
- <formatter type="${test.junit.output.format}" />
- <batchtest todir="${test.log.dir}" unless="testcase">
- <fileset dir="${test.src.dir}"
- includes="**/*${test.category}Test.java"/>
- </batchtest>
- <batchtest todir="${test.log.dir}" if="testcase">
- <fileset dir="${test.src.dir}" includes="**/${testcase}.java"/>
- </batchtest>
- </junit>
- <fail if="tests.failed">Tests failed!</fail>
- </target>
-
- <target name="jar" depends="checkMainCompiled, setjarname, compile">
- <echo message="contrib: ${name}"/>
- <jar jarfile="${jarname}">
- <fileset file="${zk.root}/LICENSE.txt" />
- <fileset dir="${build.classes}"/>
- <fileset dir="${build.test}"/>
- </jar>
- </target>
-
- <target name="run" depends="jar">
- <echo message="contrib: ${name}"/>
- <java classname="org.apache.zookeeper.server.jersey.RestMain" fork="true">
- <classpath>
- <pathelement path="${jarname}" />
- <fileset dir="${build.dir}/lib" includes="*.jar"/>
- <fileset dir="${zk.root}/build" includes="zookeeper-*.jar"/>
- <pathelement path="${zk.root}/src/contrib/${name}/conf" />
- <fileset dir="${zk.root}/src/java/lib">
- <include name="**/*.jar" />
- </fileset>
- </classpath>
- </java>
- </target>
-
- <target name="tar" depends="clean, jar">
- <echo message="building tar.gz: ${name}" />
- <macro_tar param.destfile="${build.dir}/zookeeper-${version}-${name}.tar.gz">
- <param.listofitems>
- <tarfileset dir="${build.dir}/lib" prefix="lib" includes="**/*.jar" />
- <tarfileset file="${build.dir}/zookeeper-*-rest.jar" />
- <tarfileset dir="${zk.root}/build" includes="zookeeper-*.jar" prefix="lib" />
- <tarfileset dir="${zk.root}/src/contrib/${name}/conf" prefix="conf" />
- <tarfileset dir="${zk.root}/src/java/lib" prefix="lib" includes="**/*.jar" />
- <tarfileset file="${zk.root}/src/contrib/${name}/rest.sh" />
- </param.listofitems>
- </macro_tar>
- </target>
-
-</project>
-
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 @@
-<!--
- 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.
--->
-
-<ivy-module version="2.0"
- xmlns:e="http://ant.apache.org/ivy/extra">
-
- <info organisation="org.apache.zookeeper"
- module="${name}" revision="${version}">
- <license name="Apache 2.0"/>
- <ivyauthor name="Apache ZooKeeper" url="http://zookeeper.apache.org"/>
- <description>ZooKeeper REST</description>
- </info>
-
- <configurations defaultconfmapping="default">
- <conf name="default"/>
- <conf name="test"/>
- </configurations>
-
- <dependencies>
- <dependency org="org.slf4j" name="slf4j-api" rev="1.6.1"/>
- <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" transitive="false"/>
-
- <!-- transitive false turns off dependency checking, log4j deps seem borked -->
- <dependency org="log4j" name="log4j" rev="1.2.15" transitive="false"/>
- <dependency org="asm" name="asm" rev="3.1" />
- <dependency org="com.sun.grizzly" name="grizzly-servlet-webserver" rev="1.9.8" />
- <dependency org="com.sun.jersey" name="jersey-server" rev="1.1.5.1" />
- <dependency org="com.sun.jersey" name="jersey-json" rev="1.1.5.1" />
-
- <dependency org="junit" name="junit" rev="4.8.1" conf="test->default"/>
- <dependency org="com.sun.jersey" name="jersey-client" rev="1.1.5.1" conf="test->default"/>
- </dependencies>
-
-</ivy-module>
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 @@
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" transitive="false"/>
<!-- transitive false turns off dependency checking, log4j deps seem borked -->
- <dependency org="log4j" name="log4j" rev="1.2.15" transitive="false"/>
+ <dependency org="log4j" name="log4j" rev="1.2.17" transitive="false"/>
<dependency org="org.eclipse.jetty" name="jetty-server" rev="7.0.1.v20091125" />
<dependency org="org.eclipse.jetty" name="jetty-servlet" rev="7.0.1.v20091125" />
<dependency org="com.googlecode.json-simple" name="json-simple" rev="1.1" />
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 @@
<dependency org="org.slf4j" name="slf4j-api" rev="1.6.1"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" transitive="false"/>
- <dependency org="log4j" name="log4j" rev="1.2.15" transitive="false"/>
+ <dependency org="log4j" name="log4j" rev="1.2.17" transitive="false"/>
<dependency org="junit" name="junit" rev="4.7" conf="test->default"/>
<dependency org="org.apache.rat" name="apache-rat-tasks"
rev="0.6" conf="releaseaudit->default"/>

20
zookeeper-3.4.9-server.patch
View file

@ -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

48
zookeeper-ZooInspector-template.pom
View file

@ -1,48 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-ZooInspector</artifactId>
<version>@version@</version>
<dependencies>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>@version@</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>any</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>any</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>any</version>
</dependency>
<dependency>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
<version>any</version>
</dependency>
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
<version>any</version>
</dependency>
<dependency>
<groupId>com.nitido</groupId>
<artifactId>jtoaster</artifactId>
<version>any</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>any</version>
</dependency>
</dependencies>
</project>

23
zookeeper.service
View file

@ -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

485
zookeeper.spec
View file

@ -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|<exec executable="hostname" outputproperty="host.name"/>|<!--exec executable="hostname" outputproperty="host.name"/-->|' build.xml
sed -i 's|<attribute name="Built-On" value="${host.name}" />|<attribute name="Built-On" value="${user.name}" />|' 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 <mhroncok@redhat.com> - 3.4.9-15
- Rebuilt for Python 3.8
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.9-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.9-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Wed Nov 28 2018 Petr Viktorin <pviktori@redhat.com> - 3.4.9-12
- Switch to Python 3
https://bugzilla.redhat.com/show_bug.cgi?id=1630088
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.9-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Mar 27 2018 Iryna Shcherbina <ishcherb@redhat.com> - 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 <ctubbsii@fedoraproject.org> - 3.4.9-9
- Add gcc-c++ BuildRequires
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.9-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Sep 07 2017 Troy Dawson <tdawson@redhat.com> - 3.4.9-7
- Cleanup spec file conditionals
* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 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 <releng@fedoraproject.org> - 3.4.9-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.9-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Fri Jan 27 2017 Jonathan Wakely <jwakely@redhat.com> - 3.4.9-2
- Rebuilt for Boost 1.63
* Thu Dec 22 2016 Christopher Tubbs <ctubbsii@fedoraproject.org> - 3.4.9-1
- Update to 3.4.9; CVE-2016-5017 (bz#1377281)
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.4.6-17
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.6-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Sat Jan 16 2016 Jonathan Wakely <jwakely@redhat.com> - 3.4.6-15
- Rebuilt for Boost 1.60
* Sun Nov 15 2015 Christopher Tubbs <ctubbsii-fedora@apache.org> - 3.4.6-14
- Remove duplicates and fix broken classpath items in zkEnv
* Tue Nov 03 2015 Christopher Tubbs <ctubbsii-fedora@apache.org> - 3.4.6-13
- Remove unused build dependency log4cxx
* Mon Oct 19 2015 Christopher Tubbs <ctubbsii-fedora@apache.org> - 3.4.6-12
- Fix bz#1272694 Remove precondition on myid file for standalone defaults
* Fri Oct 16 2015 Christopher Tubbs <ctubbsii-fedora@apache.org> - 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 <ctubbsii-fedora@apache.org> - 3.4.6-10
- Rollback changes for netty 3.9.3 for f21 only
* Fri Oct 16 2015 Christopher Tubbs <ctubbsii-fedora@apache.org> - 3.4.6-9
- Update zkEnv.sh CLASSPATH to fix bz#1261458
* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 3.4.6-8
- Rebuilt for Boost 1.59
* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.4.6-7
- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 3.4.6-6
- rebuild for Boost 1.58
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.4.6-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sun Feb 15 2015 Peter Robinson <pbrobinson@fedoraproject.org> 3.4.6-4
- Update netty3 patch for 3.9.3
* Tue Jan 27 2015 Petr Machata <pmachata@redhat.com> - 3.4.6-3
- Rebuild for boost 1.57.0
* Thu Oct 23 2014 Timothy St. Clair <tstclair@redhat.com> - 3.4.6-2
- Add back -java subpackage
* Tue Oct 21 2014 Timothy St. Clair <tstclair@redhat.com> - 3.4.6-1
- Update to latest stable series
- Cleanup and overhaul package
- Updated system integration
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.4.5-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.4.5-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Fri May 23 2014 Petr Machata <pmachata@redhat.com> - 3.4.5-18
- Rebuild for boost 1.55.0
* Mon Feb 24 2014 Timothy St. Clair <tstclair@redhat.com> - 3.4.5-17
- Update due to cascading dependencies around java-headless
* Fri Jan 31 2014 Timothy St. Clair <tstclair@redhat.com> - 3.4.5-16
- Update of tests.jar due to netty3 compat packaging conflicts
* Fri Jan 24 2014 Timothy St. Clair <tstclair@redhat.com> - 3.4.5-15
- Update jline and netty3 for f21 builds
* Fri Oct 25 2013 Timothy St. Clair <tstclair@redhat.com> - 3.4.5-14
- Update dependencies to jline1
* Wed Sep 18 2013 Timothy St. Clair <tstclair@redhat.com> - 3.4.5-13
- Fixed the atomic patch which actually caused recursive crashing on zookeeper_close
* Tue Jul 30 2013 Petr Machata <pmachata@redhat.com> - 3.4.5-12
- Rebuild for boost 1.54.0
* Tue Jul 30 2013 gil cattaneo <puntogil@libero.it> 3.4.5-11
- fix changelog entries
* Mon Jul 22 2013 Timothy St. Clair <tstclair@redhat.com> - 3.4.5-10
- update permissions to be in line with default policies
* Mon Jul 22 2013 gil cattaneo <puntogil@libero.it> 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 <tstclair@redhat.com> - 3.4.5-8
- cleanup file ownership properties.
* Sat Jun 15 2013 Jeffrey C. Ollie <jeff@ocjtech.us> - 3.4.5-7
- add server subpackage
* Fri Jun 14 2013 Dan Horák <dan[at]danny.cz> - 3.4.5-6
- use fetch_and_add from GCC, fixes build on non-x86 arches
* Tue Jun 11 2013 gil cattaneo <puntogil@libero.it> 3.4.5-5
- fixed zookeeper.so non-standard-executable-perm thanks to Björn Esser
* Tue Jun 11 2013 gil cattaneo <puntogil@libero.it> 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 <puntogil@libero.it> 3.4.5-3
- built ZooInspector
- added additional poms files
* Tue Apr 23 2013 gil cattaneo <puntogil@libero.it> 3.4.5-2
- building/packaging of the zookeeper-test.jar thanks to Robert Rati
* Sun Dec 02 2012 gil cattaneo <puntogil@libero.it> 3.4.5-1
- update to 3.4.5
* Tue Oct 30 2012 gil cattaneo <puntogil@libero.it> 3.4.4-3
- fix missing hostname
* Fri Oct 12 2012 gil cattaneo <puntogil@libero.it> 3.4.4-2
- add ant-junit as BR
* Fri Oct 12 2012 gil cattaneo <puntogil@libero.it> 3.4.4-1
- update to 3.4.4
* Fri May 18 2012 gil cattaneo <puntogil@libero.it> 3.4.3-1
- initial rpm