- up to 4.1.3

diff --git a/cassandra-bin-jamm_path_fix.patch b/cassandra-bin-jamm_path_fix.patch
index 9fd615b0adc2c706d4bfadcfd150ace2c39e006c..3636aaf3483a72e717df27f315abe2a41f342df3 100644 (file)
--- a/cassandra-bin-jamm_path_fix.patch
+++ b/cassandra-bin-jamm_path_fix.patch
@@ -1,11 +1,11 @@
 --- ./conf/cassandra-env.sh.jamm_path_fix      2014-10-21 16:31:37.000000000 +0200
 +++ ./conf/cassandra-env.sh    2015-01-12 21:31:40.086273885 +0100
 @@ -168,7 +168,7 @@ JMX_PORT="7199"
- JVM_OPTS="$JVM_OPTS -ea"
+ JVM_OPTS="$JVM_OPTS -XX:CompileCommandFile=$CASSANDRA_CONF/hotspot_compiler"
  
  # add the jamm javaagent
--JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.3.0.jar"
-+JVM_OPTS="$JVM_OPTS -javaagent:/usr/share/cassandra/jamm-0.3.0.jar"
+-JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.3.2.jar"
++JVM_OPTS="$JVM_OPTS -javaagent:/usr/share/cassandra/jamm-0.3.2.jar"
  
- # some JVMs will fill up their heap when accessed via JMX, see CASSANDRA-6541
- JVM_OPTS="$JVM_OPTS -XX:+CMSClassUnloadingEnabled"
+ # set jvm HeapDumpPath with CASSANDRA_HEAPDUMP_DIR
+ if [ "x$CASSANDRA_HEAPDUMP_DIR" != "x" ]; then

diff --git a/cassandra-bin-pld-env.patch b/cassandra-bin-pld-env.patch
index 56aca29b25599405d352690bb7f3f1d815a30369..20e82dc85006baf784523e7bd508a0e9b586b5e9 100644 (file)
--- a/cassandra-bin-pld-env.patch
+++ b/cassandra-bin-pld-env.patch
@@ -1,11 +1,11 @@
---- apache-cassandra-3.0.10/conf/cassandra-env.ps1.pld-env     2016-12-12 16:51:23.612423230 +0100
-+++ apache-cassandra-3.0.10/conf/cassandra-env.ps1     2016-12-12 16:53:06.880817179 +0100
-@@ -311,7 +311,7 @@ Function SetCassandraEnvironment
-     $env:CASSANDRA_CONF = "$env:CASSANDRA_HOME\conf"\r
-     $env:CASSANDRA_PARAMS="-Dcassandra -Dlogback.configurationFile=logback.xml"\r
- \r
--    $logdir = "$env:CASSANDRA_HOME\logs"\r
-+    $logdir = "/var/log/cassandra"\r
-     $storagedir = "$env:CASSANDRA_HOME\data"\r
-     $env:CASSANDRA_PARAMS = $env:CASSANDRA_PARAMS + " -Dcassandra.logdir=""$logdir"" -Dcassandra.storagedir=""$storagedir"""\r
- \r
+--- apache-cassandra-4.1.3/conf/cassandra-env.sh.orig  2023-09-19 16:24:07.002998112 +0200
++++ apache-cassandra-4.1.3/conf/cassandra-env.sh       2023-09-19 16:24:38.427311610 +0200
+@@ -88,7 +88,7 @@
+ 
+ # Sets the path where logback and GC logs are written.
+ if [ "x$CASSANDRA_LOG_DIR" = "x" ] ; then
+-    CASSANDRA_LOG_DIR="$CASSANDRA_HOME/logs"
++    CASSANDRA_LOG_DIR="/var/log/cassandra"
+ fi
+ 
+ #GC log path has to be defined here because it needs to access CASSANDRA_HOME

diff --git a/cassandra-bin.spec b/cassandra-bin.spec
index a81c2e5ff0104227ca18598ae31db6bdf31b5915..b3b410872373173eb644b8ca3872779e6d8e5f1b 100644 (file)
--- a/cassandra-bin.spec
+++ b/cassandra-bin.spec
@@ -9,18 +9,17 @@
 Summary:       Cassandra database binary package
 Summary(pl.UTF-8):     Binarna redystrybucja bazy danych Cassandra
 Name:          cassandra-bin
-Version:       3.0.12
+Version:       4.1.3
 Release:       1
 License:       ASF
 Group:         Applications/Databases
-Source0:       ftp://ftp.task.gda.pl/pub/www/apache/dist/cassandra/%{version}/apache-cassandra-%{version}-bin.tar.gz
-# Source0-md5: 71ebbfdae273a59ca202c4019e1f74a7
+Source0:       https://dlcdn.apache.org/cassandra/%{version}/apache-cassandra-%{version}-bin.tar.gz
+# Source0-md5: f2f148d0c7af65375caedb074dde93d1
 Source1:       cassandra.in.sh
 Source3:       %{name}.tmpfiles
 Source4:       %{shname}.service
 Patch0:                %{name}-jamm_path_fix.patch
 Patch3:                %{name}-pld-env.patch
-
 URL:           http://cassandra.apache.org/
 BuildRequires: python-distribute
 BuildRequires: rpm-javaprov
@@ -56,7 +55,7 @@ oparty na ColumnFamily, bogatszy niż typowe systemy klucza i wartości.
 %build
 # current version of cqlsh supports only python 2.
 cd pylib
-%py_build %{?with_tests:test}
+%py3_build %{?with_tests:test}
 cd ..
 
 %install
@@ -67,7 +66,6 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{shname},%{_bindir},%{_sbindir},%{_da
 
 cp -p %{SOURCE4} $RPM_BUILD_ROOT%{systemdunitdir}/%{shname}.service
 
-rm bin/*.bat
 cp -p bin/{cqlsh*,*sstable*,*tool} $RPM_BUILD_ROOT%{_bindir}
 cp -p bin/cassandra $RPM_BUILD_ROOT%{_sbindir}
 cp -p %{SOURCE1} lib/*.jar $RPM_BUILD_ROOT%{_datadir}/%{shname}
@@ -75,13 +73,13 @@ cp -p %{SOURCE1} lib/*.jar $RPM_BUILD_ROOT%{_datadir}/%{shname}
 # cp -p %{SOURCE1} lib/cql-internal-only-1.4.2.zip $RPM_BUILD_ROOT%{_datadir}/%{shname}
 # cp -p %{SOURCE1} lib/thrift-python-internal-only-0.9.1.zip $RPM_BUILD_ROOT%{_datadir}/%{shname}
 cp -p %{SOURCE1} lib/*.zip $RPM_BUILD_ROOT%{_datadir}/%{shname}
-cp -p conf/{*.properties,*.yaml,*.xml,cassandra-env.sh,hotspot_compiler,jvm.options,README.txt} $RPM_BUILD_ROOT/var/lib/%{shname}/conf
+cp -p conf/{*.properties,*.yaml,*.xml,cassandra-env.sh,hotspot_compiler,README.txt} $RPM_BUILD_ROOT/var/lib/%{shname}/conf
 install -d $RPM_BUILD_ROOT/var/lib/%{shname}/conf/triggers
 cp -p conf/triggers/*.txt  $RPM_BUILD_ROOT/var/lib/%{shname}/conf/triggers
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{shname}.conf
 
 cd pylib
-%py_install
+%py3_install
 cd ..
 
 %clean
@@ -124,7 +122,6 @@ fi
 %attr(640,root,cassandra) %config(noreplace) %verify(not md5 mtime size) /var/lib/%{shname}/conf/*.properties
 %attr(755,root,cassandra) %config(noreplace) %verify(not md5 mtime size) /var/lib/%{shname}/conf/*.sh
 %attr(640,root,cassandra) /var/lib/%{shname}/conf/*.txt
-%attr(640,root,cassandra) /var/lib/%{shname}/conf/jvm.options
 %attr(640,root,cassandra) %config(noreplace) %verify(not md5 mtime size) /var/lib/%{shname}/conf/*.yaml
 %attr(640,root,cassandra) %config(noreplace) %verify(not md5 mtime size) /var/lib/%{shname}/conf/*.xml
 %attr(640,root,cassandra) %config(noreplace) %verify(not md5 mtime size) /var/lib/%{shname}/conf/hotspot_compiler
@@ -133,7 +130,5 @@ fi
 
 %attr(750,cassandra,cassandra) %dir /var/log/%{shname}
 %attr(750,cassandra,cassandra) %dir /var/run/%{shname}
-%{py_sitedir}/cqlshlib
-%if "%{py_ver}" > "2.4"
-       %{py_sitedir}/cassandra_pylib-0.0.0-py*.egg-info
-%endif
+%{py3_sitedir}/cqlshlib
+%{py3_sitedir}/cassandra_pylib-0.0.0-py*.egg-info