Attachment #202517 for bug #236128

Lines 1-7 Link Here

(-)Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= cassandra	3	PORTNAME= cassandra
4	DISTVERSION= 3.11.3	4	DISTVERSION= 3.11.4
5	CATEGORIES= databases java	5	CATEGORIES= databases java
6	MASTER_SITES= APACHE/cassandra/${PORTVERSION}:apache \	6	MASTER_SITES= APACHE/cassandra/${PORTVERSION}:apache \
7	LOCAL/yuri:repo	7	LOCAL/yuri:repo

Lines 1-5 Link Here

(-)distinfo (-5 / +5 lines)
1	TIMESTAMP = 1538922434	1	TIMESTAMP = 1551608918
2	SHA256 (apache-cassandra-3.11.3-src.tar.gz) = f4c7a3627e04ff9505a626334eb113ef6dbe310e8b69b747cc4c488eac8b558f	2	SHA256 (apache-cassandra-3.11.4-src.tar.gz) = b01fea1b0a987adcc6078eef1f7e7fc43aacc3b4b0bfa3f29bc8a1cc9ba02cc6
3	SIZE (apache-cassandra-3.11.3-src.tar.gz) = 34885851	3	SIZE (apache-cassandra-3.11.4-src.tar.gz) = 39719274
4	SHA256 (apache-cassandra-3.11.3-repo.tar.gz) = da696b7bdc5c36e131bf480e11cae092e88dc65bc3098aa5aa7f01202b6ce584	4	SHA256 (apache-cassandra-3.11.4-repo.tar.gz) = e0ae04f002295b7477e1d73b76c8dab2301d015b273bc086ad7482178dfaed44
5	SIZE (apache-cassandra-3.11.3-repo.tar.gz) = 44530570	5	SIZE (apache-cassandra-3.11.4-repo.tar.gz) = 44524889

Lines 36-41 Link Here

(-)files/cassandra.in (+1 lines)
36	{	36	{
37	export JAVA_HOME=%%JAVA_HOME%%	37	export JAVA_HOME=%%JAVA_HOME%%
38	install -d -o ${cassandra_user} /var/run/cassandra	38	install -d -o ${cassandra_user} /var/run/cassandra
		39	install -d -o ${cassandra_user} /var/log/cassandra
39	}	40	}
40		41
41	run_rc_command "$1"	42	run_rc_command "$1"

Lines 1-4 Link Here

(-)files/patch-bin_cassandra.in.sh (-2 / +2 lines)
1	--- bin/cassandra.in.sh.orig 2018-03-01 13:35:20 UTC	1	--- bin/cassandra.in.sh.orig 2019-02-02 22:06:43 UTC
2	+++ bin/cassandra.in.sh	2	+++ bin/cassandra.in.sh
3	@@ -26,8 +26,8 @@ fi	3	@@ -26,8 +26,8 @@ fi
4	# This can be the path to a jar file, or a directory containing the	4	# This can be the path to a jar file, or a directory containing the
Lines 11-17 Link Here
11	#cassandra_bin="$CASSANDRA_HOME/build/cassandra.jar"	11	#cassandra_bin="$CASSANDRA_HOME/build/cassandra.jar"
12		12
13	# the default location for commitlogs, sstables, and saved caches	13	# the default location for commitlogs, sstables, and saved caches
14	@@ -38,7 +38,7 @@ cassandra_storagedir="$CASSANDRA_HOME/da	14	@@ -38,7 +38,7 @@ cassandra_storagedir="$CASSANDRA_HOME/data"
15	#JAVA_HOME=/usr/local/jdk6	15	#JAVA_HOME=/usr/local/jdk6
16		16
17	# The java classpath (required)	17	# The java classpath (required)




--- build.xml.orig	2019-02-02 22:06:43 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.4"/>
@@ -77,14 +78,14 @@
     <condition property="version" value="${base.version}">
       <isset property="release"/>
     </condition>

     <property name="maven-ant-tasks.url"
               value="http://repo2.maven.org/maven2/org/apache/maven/maven-ant-tasks" />
     <!-- details of how and which Maven repository we publish to -->
@@ -247,8 +248,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">
@@ -261,6 +261,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"/>
@@ -303,10 +304,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"/>
@@ -685,16 +682,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"/>
@@ -707,7 +702,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"/>
@@ -728,8 +723,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"/>
@@ -1024,6 +1018,88 @@
       </jar>
     </target>
 

     <!-- creates release tarballs -->
     <target name="artifacts" depends="jar,javadoc,gen-doc"
             description="Create Cassandra release artifacts">
@@ -1767,8 +1843,8 @@
     <exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false">
       <arg value="--all"/>
     </exec>
-    <!-- support for Mac OS X -->
-    <exec executable="sysctl" outputproperty="cores.count" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
+    <!-- support for Mac OS X and FreeBSD -->
+    <exec executable="sysctl" outputproperty="cores.count" os="Mac,Mac OS X,Darwin,FreeBSD" failifexecutionfails="false">
       <arg value="-n"/>
       <arg value="hw.ncpu"/>
     </exec>
@@ -1788,6 +1864,11 @@
     <exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
       <arg value="-n"/>
       <arg value="hw.memsize"/>
+    </exec>
+    <!-- support for FreeBSD -->
+    <exec executable="sysctl" outputproperty="mem.size" os="FreeBSD" failifexecutionfails="false">
+      <arg value="-n"/>
+      <arg value="hw.physmem"/>
     </exec>
     <echo message="Mem size : ${mem.size}"/>
   </target>

Lines 1-4 Link Here

(-)files/patch-conf_cassandra.yaml (-2 / +2 lines)
1	--- conf/cassandra.yaml.orig 2018-02-14 20:43:59 UTC	1	--- conf/cassandra.yaml.orig 2019-02-02 22:09:01 UTC
2	+++ conf/cassandra.yaml	2	+++ conf/cassandra.yaml
3	@@ -70,7 +70,7 @@ max_hints_delivery_threads: 2	3	@@ -70,7 +70,7 @@ max_hints_delivery_threads: 2
4		4
Lines 9-15 Link Here
9		9
10	# How often hints should be flushed from the internal buffers to disk.	10	# How often hints should be flushed from the internal buffers to disk.
11	# Will not trigger fsync.	11	# Will not trigger fsync.
12	@@ -187,13 +187,13 @@ partitioner: org.apache.cassandra.dht.Mu	12	@@ -187,13 +187,13 @@ partitioner: org.apache.cassandra.dht.Murmur3Partition
13	# will spread data evenly across them, subject to the granularity of	13	# will spread data evenly across them, subject to the granularity of
14	# the configured compaction strategy.	14	# the configured compaction strategy.
15	# If not set, the default directory is $CASSANDRA_HOME/data/data.	15	# If not set, the default directory is $CASSANDRA_HOME/data/data.

Lines 1-4 Link Here

(-)files/patch-doc_Makefile (-2 / +2 lines)
1	--- doc/Makefile.orig 2018-02-22 15:43:58 UTC	1	--- doc/Makefile.orig 2019-02-02 22:06:43 UTC
2	+++ doc/Makefile	2	+++ doc/Makefile
3	@@ -3,7 +3,7 @@	3	@@ -3,7 +3,7 @@
4		4
Lines 9-15 Link Here
9	PAPER =	9	PAPER =
10	BUILDDIR = build	10	BUILDDIR = build
11		11
12	@@ -17,7 +17,7 @@ I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $	12	@@ -17,7 +17,7 @@ I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) s
13	YAML_DOC_INPUT=../conf/cassandra.yaml	13	YAML_DOC_INPUT=../conf/cassandra.yaml
14	YAML_DOC_OUTPUT=source/configuration/cassandra_config_file.rst	14	YAML_DOC_OUTPUT=source/configuration/cassandra_config_file.rst
15		15

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-02-02 22:06:43 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	@@ -253,7 +253,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

Lines 1-4 Link Here

(-)files/patch-tools_bin_cassandra.in.sh (-2 / +2 lines)
1	--- tools/bin/cassandra.in.sh.orig 2018-03-01 14:02:52 UTC	1	--- tools/bin/cassandra.in.sh.orig 2019-02-02 22:06:43 UTC
2	+++ tools/bin/cassandra.in.sh	2	+++ tools/bin/cassandra.in.sh
3	@@ -26,9 +26,9 @@ fi	3	@@ -26,9 +26,9 @@ fi
4	# This can be the path to a jar file, or a directory containing the	4	# This can be the path to a jar file, or a directory containing the
Lines 13-19 Link Here
13	#cassandra_bin="$cassandra_home/build/cassandra.jar"	13	#cassandra_bin="$cassandra_home/build/cassandra.jar"
14		14
15	# the default location for commitlogs, sstables, and saved caches	15	# the default location for commitlogs, sstables, and saved caches
16	@@ -39,7 +39,7 @@ cassandra_storagedir="$CASSANDRA_HOME/da	16	@@ -39,7 +39,7 @@ cassandra_storagedir="$CASSANDRA_HOME/data"
17	#JAVA_HOME=/usr/local/jdk6	17	#JAVA_HOME=/usr/local/jdk6
18		18
19	# The java classpath (required)	19	# The java classpath (required)




%%DATADIR%%/LICENSE.txt
%%DATADIR%%/NEWS.txt
%%DATADIR%%/NOTICE.txt
%%DATADIR%%/pylib/cassandra-cqlsh-tests.sh
%%DATADIR%%/pylib/cqlshlib/__init__.py
%%DATADIR%%/pylib/cqlshlib/copyutil.py
%%DATADIR%%/pylib/cqlshlib/cql3handling.py

%%DATADIR%%/pylib/cqlshlib/helptopics.py
%%DATADIR%%/pylib/cqlshlib/pylexotron.py
%%DATADIR%%/pylib/cqlshlib/saferscanner.py
%%DATADIR%%/pylib/cqlshlib/setup.cfg
%%DATADIR%%/pylib/cqlshlib/sslhandling.py
%%DATADIR%%/pylib/cqlshlib/test/__init__.py
%%DATADIR%%/pylib/cqlshlib/test/ansi_colors.py

%%DATADIR%%/pylib/cqlshlib/tracing.py
%%DATADIR%%/pylib/cqlshlib/util.py
%%DATADIR%%/pylib/cqlshlib/wcwidth.py
%%DATADIR%%/pylib/requirements.txt
%%DATADIR%%/pylib/setup.py
%%DATADIR%%/tools/bin/cassandra-stress
%%DATADIR%%/tools/bin/cassandra-stressd

Return to bug 236128

Lines 1-4 Link Here

(-)files/patch-build.xml (-10 / +33 lines)
1	--- build.xml.orig 2018-10-07 14:44:46 UTC	1	--- build.xml.orig 2019-02-02 22:06:43 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.3"/>	10	<property name="base.version" value="3.11.4"/>
11	@@ -75,14 +76,14 @@	11	@@ -77,14 +78,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 25-31 Link Here
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="http://repo2.maven.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	@@ -244,8 +245,7 @@	28	@@ -247,8 +248,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	@@ -258,6 +258,7 @@	38	@@ -261,6 +261,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	@@ -300,10 +301,6 @@	46	@@ -303,10 +304,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	@@ -682,16 +679,14 @@	57	@@ -685,16 +682,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	@@ -704,7 +699,7 @@	76	@@ -707,7 +702,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	@@ -725,8 +720,7 @@	85	@@ -728,8 +723,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	@@ -1021,6 +1015,88 @@	95	@@ -1024,6 +1018,88 @@
96	</jar>	96	</jar>
97	</target>	97	</target>
98		98
Lines 181-183 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 @@
		185	<exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false">
		186	<arg value="--all"/>
		187	</exec>
		188	- <!-- support for Mac OS X -->
		189	- <exec executable="sysctl" outputproperty="cores.count" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
		190	+ <!-- support for Mac OS X and FreeBSD -->
		191	+ <exec executable="sysctl" outputproperty="cores.count" os="Mac,Mac OS X,Darwin,FreeBSD" failifexecutionfails="false">
		192	<arg value="-n"/>
		193	<arg value="hw.ncpu"/>
		194	</exec>
		195	@@ -1788,6 +1864,11 @@
		196	<exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
		197	<arg value="-n"/>
		198	<arg value="hw.memsize"/>
		199	+ </exec>
		200	+ <!-- support for FreeBSD -->
		201	+ <exec executable="sysctl" outputproperty="mem.size" os="FreeBSD" failifexecutionfails="false">
		202	+ <arg value="-n"/>
		203	+ <arg value="hw.physmem"/>
		204	</exec>
		205	<echo message="Mem size : ${mem.size}"/>
		206	</target>

Lines 121-126 Link Here

(-)pkg-plist (+3 lines)
121	%%DATADIR%%/LICENSE.txt	121	%%DATADIR%%/LICENSE.txt
122	%%DATADIR%%/NEWS.txt	122	%%DATADIR%%/NEWS.txt
123	%%DATADIR%%/NOTICE.txt	123	%%DATADIR%%/NOTICE.txt
		124	%%DATADIR%%/pylib/cassandra-cqlsh-tests.sh
124	%%DATADIR%%/pylib/cqlshlib/__init__.py	125	%%DATADIR%%/pylib/cqlshlib/__init__.py
125	%%DATADIR%%/pylib/cqlshlib/copyutil.py	126	%%DATADIR%%/pylib/cqlshlib/copyutil.py
126	%%DATADIR%%/pylib/cqlshlib/cql3handling.py	127	%%DATADIR%%/pylib/cqlshlib/cql3handling.py
Lines 131-136 Link Here
131	%%DATADIR%%/pylib/cqlshlib/helptopics.py	132	%%DATADIR%%/pylib/cqlshlib/helptopics.py
132	%%DATADIR%%/pylib/cqlshlib/pylexotron.py	133	%%DATADIR%%/pylib/cqlshlib/pylexotron.py
133	%%DATADIR%%/pylib/cqlshlib/saferscanner.py	134	%%DATADIR%%/pylib/cqlshlib/saferscanner.py
		135	%%DATADIR%%/pylib/cqlshlib/setup.cfg
134	%%DATADIR%%/pylib/cqlshlib/sslhandling.py	136	%%DATADIR%%/pylib/cqlshlib/sslhandling.py
135	%%DATADIR%%/pylib/cqlshlib/test/__init__.py	137	%%DATADIR%%/pylib/cqlshlib/test/__init__.py
136	%%DATADIR%%/pylib/cqlshlib/test/ansi_colors.py	138	%%DATADIR%%/pylib/cqlshlib/test/ansi_colors.py
Lines 148-153 Link Here
148	%%DATADIR%%/pylib/cqlshlib/tracing.py	150	%%DATADIR%%/pylib/cqlshlib/tracing.py
149	%%DATADIR%%/pylib/cqlshlib/util.py	151	%%DATADIR%%/pylib/cqlshlib/util.py
150	%%DATADIR%%/pylib/cqlshlib/wcwidth.py	152	%%DATADIR%%/pylib/cqlshlib/wcwidth.py
		153	%%DATADIR%%/pylib/requirements.txt
151	%%DATADIR%%/pylib/setup.py	154	%%DATADIR%%/pylib/setup.py
152	%%DATADIR%%/tools/bin/cassandra-stress	155	%%DATADIR%%/tools/bin/cassandra-stress
153	%%DATADIR%%/tools/bin/cassandra-stressd	156	%%DATADIR%%/tools/bin/cassandra-stressd