openpkg-packages/cassandra/cassandra.patch

Index: bin/cassandra.in.sh
--- bin/cassandra.in.sh.orig	2016-02-29 21:24:27.000000000 +0100
+++ bin/cassandra.in.sh	2016-04-05 23:04:16.967330025 +0200
@@ -15,19 +15,19 @@
 # limitations under the License.
 
 if [ "x$CASSANDRA_HOME" = "x" ]; then
-    CASSANDRA_HOME="`dirname "$0"`/.."
+    CASSANDRA_HOME="`dirname "$0"`/../.."
 fi
 
 # The directory where Cassandra's configs live (required)
 if [ "x$CASSANDRA_CONF" = "x" ]; then
-    CASSANDRA_CONF="$CASSANDRA_HOME/conf"
+    CASSANDRA_CONF="$CASSANDRA_HOME/etc/cassandra"
 fi
 
 # This can be the path to a jar file, or a directory containing the 
 # compiled classes. NOTE: This isn't needed by the startup script,
 # it's just used here in constructing the classpath.
-cassandra_bin="$CASSANDRA_HOME/build/classes/main"
-cassandra_bin="$cassandra_bin:$CASSANDRA_HOME/build/classes/thrift"
+#cassandra_bin="$CASSANDRA_HOME/build/classes/main"
+#cassandra_bin="$cassandra_bin:$CASSANDRA_HOME/build/classes/thrift"
 #cassandra_bin="$CASSANDRA_HOME/build/cassandra.jar"
 
 # the default location for commitlogs, sstables, and saved caches
@@ -38,9 +38,9 @@
 #JAVA_HOME=/usr/local/jdk6
 
 # The java classpath (required)
-CLASSPATH="$CASSANDRA_CONF:$cassandra_bin"
+CLASSPATH="$CASSANDRA_CONF"
 
-for jar in "$CASSANDRA_HOME"/lib/*.jar; do
+for jar in "$CASSANDRA_HOME"/lib/cassandra/*.jar; do
     CLASSPATH="$CLASSPATH:$jar"
 done
 
Index: bin/cqlsh
--- bin/cqlsh.orig	2016-04-05 23:04:16.967330000 +0200
+++ bin/cqlsh	2016-04-05 23:05:00.697352417 +0200
@@ -17,8 +17,8 @@
 
 # bash code here; finds a suitable python interpreter and execs this file.
 # prefer unqualified "python" if suitable:
-python -c 'import sys; sys.exit(not (0x020700b0 < sys.hexversion < 0x03000000))' 2>/dev/null \
-    && exec python "`python -c "import os;print(os.path.dirname(os.path.realpath('$0')))"`/cqlsh.py" "$@"
+@l_prefix@/bin/python -c 'import sys; sys.exit(not (0x020700b0 < sys.hexversion < 0x03000000))' 2>/dev/null \
+    && exec @l_prefix@/bin/python "`python -c "import os;print(os.path.dirname(os.path.realpath('$0')))"`/cqlsh.py" "$@"
 for pyver in 2.7; do
     which python$pyver > /dev/null 2>&1 && exec python$pyver "`python$pyver -c "import os;print(os.path.dirname(os.path.realpath('$0')))"`/cqlsh.py" "$@"
 done
Index: cassandra-driver-3.1.1/setup.py
--- cassandra-driver-3.1.1/setup.py.orig	2016-03-10 22:43:43.000000000 +0100
+++ cassandra-driver-3.1.1/setup.py	2016-04-05 23:04:16.967330025 +0200
@@ -146,9 +146,9 @@
 
 libev_ext = Extension('cassandra.io.libevwrapper',
                       sources=['cassandra/io/libevwrapper.c'],
-                      include_dirs=['/usr/include/libev', '/usr/local/include', '/opt/local/include'],
+                      include_dirs=['@l_prefix@/include/ev'],
                       libraries=['ev'],
-                      library_dirs=['/usr/local/lib', '/opt/local/lib'])
+                      library_dirs=['@l_prefix@/lib'])
 
 platform_unsupported_msg = \
 """
Index: conf/cassandra-env.sh
--- conf/cassandra-env.sh.orig	2016-02-29 21:24:27.000000000 +0100
+++ conf/cassandra-env.sh	2016-04-05 23:04:16.967330025 +0200
@@ -207,7 +207,7 @@
 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:$CASSANDRA_HOME/lib/cassandra/jamm-0.3.0.jar"
 
 # set jvm HeapDumpPath with CASSANDRA_HEAPDUMP_DIR
 if [ "x$CASSANDRA_HEAPDUMP_DIR" != "x" ]; then
Index: conf/cassandra.yaml
--- conf/cassandra.yaml.orig	2016-02-29 21:24:27.000000000 +0100
+++ conf/cassandra.yaml	2016-04-05 23:04:16.967330025 +0200
@@ -69,6 +69,7 @@
 # Directory where Cassandra should store hints.
 # If not set, the default directory is $CASSANDRA_HOME/data/hints.
 # hints_directory: /var/lib/cassandra/hints
+hints_directory: @l_prefix@/var/cassandra/db/hints
 
 # How often hints should be flushed from the internal buffers to disk.
 # Will *not* trigger fsync.
@@ -185,13 +186,13 @@
 # will spread data evenly across them, subject to the granularity of
 # the configured compaction strategy.
 # If not set, the default directory is $CASSANDRA_HOME/data/data.
-# data_file_directories:
-#     - /var/lib/cassandra/data
+data_file_directories:
+    - @l_prefix@/var/cassandra/db/data
 
 # commit log.  when running on magnetic HDD, this should be a
 # separate spindle than the data directories.
 # If not set, the default directory is $CASSANDRA_HOME/data/commitlog.
-# commitlog_directory: /var/lib/cassandra/commitlog
+commitlog_directory: @l_prefix@/var/cassandra/db/commitlog
 
 # policy for data disk failures:
 # die: shut down gossip and client transports and kill the JVM for any fs errors or
@@ -303,7 +304,7 @@
 
 # saved caches
 # If not set, the default directory is $CASSANDRA_HOME/data/saved_caches.
-# saved_caches_directory: /var/lib/cassandra/saved_caches
+saved_caches_directory: @l_prefix@/var/cassandra/db/saved_caches
 
 # commitlog_sync may be either "periodic" or "batch." 
 # 
Index: conf/logback.xml
--- conf/logback.xml.orig	2016-02-29 21:24:27.000000000 +0100
+++ conf/logback.xml	2016-04-05 23:04:16.967330025 +0200
@@ -32,9 +32,9 @@
     <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
       <level>INFO</level>
     </filter>
-    <file>${cassandra.logdir}/system.log</file>
+    <file>@l_prefix@/var/cassandra/log/cassandra.system.log</file>
     <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>${cassandra.logdir}/system.log.%i.zip</fileNamePattern>
+      <fileNamePattern>@l_prefix@/var/cassandra/log/cassandra.system.log.%i.zip</fileNamePattern>
       <minIndex>1</minIndex>
       <maxIndex>20</maxIndex>
     </rollingPolicy>
@@ -49,9 +49,9 @@
   <!-- DEBUGLOG rolling file appender to debug.log (all levels) -->
 
   <appender name="DEBUGLOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${cassandra.logdir}/debug.log</file>
+      <file>@l_prefix@/var/cassandra/log/cassandra.debug.log</file>
     <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>${cassandra.logdir}/debug.log.%i.zip</fileNamePattern>
+      <fileNamePattern>@l_prefix@/var/cassandra/log/cassandra.debug.log.%i.zip</fileNamePattern>
       <minIndex>1</minIndex>
       <maxIndex>20</maxIndex>
     </rollingPolicy>