Attachment #210016 for bug #242692

View | Details | Raw Unified | Return to bug 242692
Collapse All | Expand All

Lines 1-7 Link Here

(-)Makefile (-2 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= cassandra	3	PORTNAME= cassandra
4	DISTVERSION= 3.11.4	4	DISTVERSION= 3.11.5
5	PORTREVISION= 1	5	PORTREVISION= 1
6	CATEGORIES= databases java	6	CATEGORIES= databases java
7	MASTER_SITES= APACHE/cassandra/${PORTVERSION}:apache \	7	MASTER_SITES= APACHE/cassandra/${PORTVERSION}:apache \
Lines 9-15 Link Here
9	PKGNAMESUFFIX= 3	9	PKGNAMESUFFIX= 3
10	DISTNAME= apache-${PORTNAME}-${PORTVERSION}-src	10	DISTNAME= apache-${PORTNAME}-${PORTVERSION}-src
11	DISTFILES= ${DISTNAME}.tar.gz:apache \	11	DISTFILES= ${DISTNAME}.tar.gz:apache \
12	apache-${PORTNAME}-${PORTVERSION}-repo.tar.gz:repo	12	apache-${PORTNAME}-3.11.4-repo.tar.gz:repo
13		13
14	MAINTAINER= language.devel@gmail.com	14	MAINTAINER= language.devel@gmail.com
15	COMMENT= Highly scalable distributed database	15	COMMENT= Highly scalable distributed database

Lines 1-5 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1551608918	1	TIMESTAMP = 1576515047
2	SHA256 (apache-cassandra-3.11.4-src.tar.gz) = b01fea1b0a987adcc6078eef1f7e7fc43aacc3b4b0bfa3f29bc8a1cc9ba02cc6	2	SHA256 (apache-cassandra-3.11.5-src.tar.gz) = d5363386b6ddbee59cf7dbbb2564a5f23ca236e728eebce12daf83b5ccdd50d8
3	SIZE (apache-cassandra-3.11.4-src.tar.gz) = 39719274	3	SIZE (apache-cassandra-3.11.5-src.tar.gz) = 39798994
4	SHA256 (apache-cassandra-3.11.4-repo.tar.gz) = e0ae04f002295b7477e1d73b76c8dab2301d015b273bc086ad7482178dfaed44	4	SHA256 (apache-cassandra-3.11.4-repo.tar.gz) = e0ae04f002295b7477e1d73b76c8dab2301d015b273bc086ad7482178dfaed44
5	SIZE (apache-cassandra-3.11.4-repo.tar.gz) = 44524889	5	SIZE (apache-cassandra-3.11.4-repo.tar.gz) = 44524889

Lines 1-11 Link Here

(-)files/patch-bin_cassandra (-9 / +18 lines)
1	--- bin/cassandra.orig 2018-09-07 13:43:49 UTC	1	--- bin/cassandra.orig 2019-12-13 12:50:29 UTC
2	+++ bin/cassandra	2	+++ bin/cassandra
3	@@ -189,7 +189,7 @@ launch_service()	3	@@ -30,7 +30,7 @@
4	props="$3"	4	# JVM_OPTS -- Additional arguments to the JVM for heap size, etc
5	class="$4"	5	# JVM_ON_OUT_OF_MEMORY_ERROR_OPT -- The OnOutOfMemoryError JVM option if specified
6	cassandra_parms="-Dlogback.configurationFile=logback.xml"	6	# CASSANDRA_CONF -- Directory containing Cassandra configuration files.
7	- cassandra_parms="$cassandra_parms -Dcassandra.logdir=$CASSANDRA_HOME/logs"	7	-# CASSANDRA_LOG_DIR -- Directory containing logs(default: $CASSANDRA_HOME/logs).
8	+ cassandra_parms="$cassandra_parms -Dcassandra.logdir=/var/log/cassandra"	8	+# CASSANDRA_LOG_DIR -- Directory containing logs(default: /var/log/cassandra).
9	cassandra_parms="$cassandra_parms -Dcassandra.storagedir=$cassandra_storagedir"	9	#
		10	# As a convenience, a fragment of shell is sourced in order to set one or
		11	# more of these variables. This so-called `include' can be placed in a
		12	@@ -127,7 +127,7 @@ if [ -f "$CASSANDRA_CONF/cassandra-env.sh" ]; then
		13	fi
10		14
11	if [ "x$pidpath" != "x" ]; then	15	if [ -z "$CASSANDRA_LOG_DIR" ]; then
		16	- CASSANDRA_LOG_DIR=$CASSANDRA_HOME/logs
		17	+ CASSANDRA_LOG_DIR=/var/log/cassandra
		18	fi
		19
		20	# Special-case path variables.




--- build.xml.orig	2019-10-24 16:42:10 UTC
+++ build.xml
@@ -23,6 +23,7 @@
     <property file="build.properties" />

+    <property name="pycmd" value="python"/>
 
     <!-- default version and SCM information -->
     <property name="base.version" value="3.11.5"/>
@@ -78,14 +79,14 @@
     <condition property="version" value="${base.version}">
       <isset property="release"/>
     </condition>

-    <property name="maven-ant-tasks.local" value="${user.home}/.m2/repository/org/apache/maven/maven-ant-tasks"/>
+    <property name="maven-ant-tasks.local" value="${localm2}/org/apache/maven/maven-ant-tasks"/>
     <property name="maven-ant-tasks.url"
               value="https://repo.maven.apache.org/maven2/org/apache/maven/maven-ant-tasks" />
     <!-- details of how and which Maven repository we publish to -->
@@ -244,8 +245,7 @@
         <artifact:dependencies pathId="wikitext.classpath">
             <dependency groupId="com.datastax.wikitext" artifactId="wikitext-core-ant" version="1.3"/>
             <dependency groupId="org.fusesource.wikitext" artifactId="textile-core" version="1.3"/>

         </artifact:dependencies>
         <taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" />
         <wikitext-to-html markupLanguage="Textile">
@@ -258,6 +258,7 @@
     <target name="gen-doc" depends="maven-ant-tasks-init" description="Generate documentation">
         <exec executable="make" osfamily="unix" dir="${doc.dir}">
             <arg value="html"/>

         </exec>
         <exec executable="cmd" osfamily="dos" dir="${doc.dir}">
             <arg value="/c"/>
@@ -300,10 +301,6 @@
             description="Initialize Maven ANT Tasks">
       <typedef uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
 

       <macrodef name="install">
         <attribute name="pomFile"/>
         <attribute name="file"/>
@@ -682,16 +679,14 @@
                              filesetId="build-dependency-jars"
                              cacheDependencyRefs="true"
                              dependencyRefsBuildFile="${build.dir}/build-dependencies.xml">

       </artifact:dependencies>
       <copy todir="${build.dir.lib}/jars">
           <fileset refid="build-dependency-jars"/>
@@ -704,7 +699,7 @@
       <!-- code coverage tools -->
       <artifact:dependencies pomRefId="coverage-deps-pom"
                              filesetId="coverage-dependency-jars">

       </artifact:dependencies>
       <copy todir="${build.dir.lib}/jars">
           <fileset refid="coverage-dependency-jars"/>
@@ -725,8 +720,7 @@
                              sourcesFilesetId="test-dependency-sources"
                              cacheDependencyRefs="true"
                              dependencyRefsBuildFile="${build.dir}/test-dependencies.xml">

       </artifact:dependencies>
       <copy todir="${test.lib}/jars">
         <fileset refid="test-dependency-jars"/>
@@ -1021,6 +1015,88 @@
       </jar>
     </target>
 

     <!-- creates release tarballs -->
     <target name="artifacts" depends="jar,javadoc,gen-doc"
             description="Create Cassandra release artifacts">
@@ -1771,8 +1847,8 @@
     <exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false">
       <arg value="--all"/>
     </exec>

       <arg value="-n"/>
       <arg value="hw.ncpu"/>
     </exec>
@@ -1792,6 +1868,11 @@
     <exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
       <arg value="-n"/>
       <arg value="hw.memsize"/>

Lines 1-6 Link Here

(-)files/patch-src_java_org_apache_cassandra_config_Config.java (-2 / +2 lines)
1	--- src/java/org/apache/cassandra/config/Config.java.orig 2018-03-06 21:16:18 UTC	1	--- src/java/org/apache/cassandra/config/Config.java.orig 2019-10-24 16:42:10 UTC
2	+++ src/java/org/apache/cassandra/config/Config.java	2	+++ src/java/org/apache/cassandra/config/Config.java
3	@@ -252,7 +252,7 @@ public class Config	3	@@ -260,7 +260,7 @@ public class Config
4	public volatile int key_cache_save_period = 14400;	4	public volatile int key_cache_save_period = 14400;
5	public volatile int key_cache_keys_to_save = Integer.MAX_VALUE;	5	public volatile int key_cache_keys_to_save = Integer.MAX_VALUE;
6		6

Return to bug 242692

Lines 1-4 Link Here

(-)files/patch-build.xml (-13 / +13 lines)
1	--- build.xml.orig 2019-02-02 22:06:43 UTC	1	--- build.xml.orig 2019-10-24 16:42:10 UTC
2	+++ build.xml	2	+++ build.xml
3	@@ -23,6 +23,7 @@	3	@@ -23,6 +23,7 @@
4	<property file="build.properties" />	4	<property file="build.properties" />
Lines 7-14 Link Here
7	+ <property name="pycmd" value="python"/>	7	+ <property name="pycmd" value="python"/>
8		8
9	<!-- default version and SCM information -->	9	<!-- default version and SCM information -->
10	<property name="base.version" value="3.11.4"/>	10	<property name="base.version" value="3.11.5"/>
11	@@ -77,14 +78,14 @@	11	@@ -78,14 +79,14 @@
12	<condition property="version" value="${base.version}">	12	<condition property="version" value="${base.version}">
13	<isset property="release"/>	13	<isset property="release"/>
14	</condition>	14	</condition>
Lines 23-31 Link Here
23	- <property name="maven-ant-tasks.local" value="${user.home}/.m2/repository/org/apache/maven/maven-ant-tasks"/>	23	- <property name="maven-ant-tasks.local" value="${user.home}/.m2/repository/org/apache/maven/maven-ant-tasks"/>
24	+ <property name="maven-ant-tasks.local" value="${localm2}/org/apache/maven/maven-ant-tasks"/>	24	+ <property name="maven-ant-tasks.local" value="${localm2}/org/apache/maven/maven-ant-tasks"/>
25	<property name="maven-ant-tasks.url"	25	<property name="maven-ant-tasks.url"
26	value="http://repo2.maven.org/maven2/org/apache/maven/maven-ant-tasks" />	26	value="https://repo.maven.apache.org/maven2/org/apache/maven/maven-ant-tasks" />
27	<!-- details of how and which Maven repository we publish to -->	27	<!-- details of how and which Maven repository we publish to -->
28	@@ -247,8 +248,7 @@	28	@@ -244,8 +245,7 @@
29	<artifact:dependencies pathId="wikitext.classpath">	29	<artifact:dependencies pathId="wikitext.classpath">
30	<dependency groupId="com.datastax.wikitext" artifactId="wikitext-core-ant" version="1.3"/>	30	<dependency groupId="com.datastax.wikitext" artifactId="wikitext-core-ant" version="1.3"/>
31	<dependency groupId="org.fusesource.wikitext" artifactId="textile-core" version="1.3"/>	31	<dependency groupId="org.fusesource.wikitext" artifactId="textile-core" version="1.3"/>
Lines 35-41 Link Here
35	</artifact:dependencies>	35	</artifact:dependencies>
36	<taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" />	36	<taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" />
37	<wikitext-to-html markupLanguage="Textile">	37	<wikitext-to-html markupLanguage="Textile">
38	@@ -261,6 +261,7 @@	38	@@ -258,6 +258,7 @@
39	<target name="gen-doc" depends="maven-ant-tasks-init" description="Generate documentation">	39	<target name="gen-doc" depends="maven-ant-tasks-init" description="Generate documentation">
40	<exec executable="make" osfamily="unix" dir="${doc.dir}">	40	<exec executable="make" osfamily="unix" dir="${doc.dir}">
41	<arg value="html"/>	41	<arg value="html"/>
Lines 43-49 Link Here
43	</exec>	43	</exec>
44	<exec executable="cmd" osfamily="dos" dir="${doc.dir}">	44	<exec executable="cmd" osfamily="dos" dir="${doc.dir}">
45	<arg value="/c"/>	45	<arg value="/c"/>
46	@@ -303,10 +304,6 @@	46	@@ -300,10 +301,6 @@
47	description="Initialize Maven ANT Tasks">	47	description="Initialize Maven ANT Tasks">
48	<typedef uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />	48	<typedef uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
49		49
Lines 54-60 Link Here
54	<macrodef name="install">	54	<macrodef name="install">
55	<attribute name="pomFile"/>	55	<attribute name="pomFile"/>
56	<attribute name="file"/>	56	<attribute name="file"/>
57	@@ -685,16 +682,14 @@	57	@@ -682,16 +679,14 @@
58	filesetId="build-dependency-jars"	58	filesetId="build-dependency-jars"
59	cacheDependencyRefs="true"	59	cacheDependencyRefs="true"
60	dependencyRefsBuildFile="${build.dir}/build-dependencies.xml">	60	dependencyRefsBuildFile="${build.dir}/build-dependencies.xml">
Lines 73-79 Link Here
73	</artifact:dependencies>	73	</artifact:dependencies>
74	<copy todir="${build.dir.lib}/jars">	74	<copy todir="${build.dir.lib}/jars">
75	<fileset refid="build-dependency-jars"/>	75	<fileset refid="build-dependency-jars"/>
76	@@ -707,7 +702,7 @@	76	@@ -704,7 +699,7 @@
77	<!-- code coverage tools -->	77	<!-- code coverage tools -->
78	<artifact:dependencies pomRefId="coverage-deps-pom"	78	<artifact:dependencies pomRefId="coverage-deps-pom"
79	filesetId="coverage-dependency-jars">	79	filesetId="coverage-dependency-jars">
Lines 82-88 Link Here
82	</artifact:dependencies>	82	</artifact:dependencies>
83	<copy todir="${build.dir.lib}/jars">	83	<copy todir="${build.dir.lib}/jars">
84	<fileset refid="coverage-dependency-jars"/>	84	<fileset refid="coverage-dependency-jars"/>
85	@@ -728,8 +723,7 @@	85	@@ -725,8 +720,7 @@
86	sourcesFilesetId="test-dependency-sources"	86	sourcesFilesetId="test-dependency-sources"
87	cacheDependencyRefs="true"	87	cacheDependencyRefs="true"
88	dependencyRefsBuildFile="${build.dir}/test-dependencies.xml">	88	dependencyRefsBuildFile="${build.dir}/test-dependencies.xml">
Lines 92-98 Link Here
92	</artifact:dependencies>	92	</artifact:dependencies>
93	<copy todir="${test.lib}/jars">	93	<copy todir="${test.lib}/jars">
94	<fileset refid="test-dependency-jars"/>	94	<fileset refid="test-dependency-jars"/>
95	@@ -1024,6 +1018,88 @@	95	@@ -1021,6 +1015,88 @@
96	</jar>	96	</jar>
97	</target>	97	</target>
98		98
Lines 181-187 Link Here
181	<!-- creates release tarballs -->	181	<!-- creates release tarballs -->
182	<target name="artifacts" depends="jar,javadoc,gen-doc"	182	<target name="artifacts" depends="jar,javadoc,gen-doc"
183	description="Create Cassandra release artifacts">	183	description="Create Cassandra release artifacts">
184	@@ -1767,8 +1843,8 @@	184	@@ -1771,8 +1847,8 @@
185	<exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false">	185	<exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false">
186	<arg value="--all"/>	186	<arg value="--all"/>
187	</exec>	187	</exec>
Lines 192-198 Link Here
192	<arg value="-n"/>	192	<arg value="-n"/>
193	<arg value="hw.ncpu"/>	193	<arg value="hw.ncpu"/>
194	</exec>	194	</exec>
195	@@ -1788,6 +1864,11 @@	195	@@ -1792,6 +1868,11 @@
196	<exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">	196	<exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
197	<arg value="-n"/>	197	<arg value="-n"/>
198	<arg value="hw.memsize"/>	198	<arg value="hw.memsize"/>