4 files changed, 27 insertions, 5 deletions
diff --git a/system/apache-cassandra/README b/system/apache-cassandra/README
index b243ee862a..f868fc0643 100644
--- a/system/apache-cassandra/README
+++ b/system/apache-cassandra/README
@@ -2,3 +2,5 @@ The Apache Cassandra Project develops a
 highly scalable second-generation distributed database,
 bringing together Dynamo's fully distributed design and 
 Bigtable's ColumnFamily-based data model.
+
+apache-cassandra requires Java >= 1.6
diff --git a/system/apache-cassandra/apache-cassandra.SlackBuild b/system/apache-cassandra/apache-cassandra.SlackBuild
index 7b55ce97f8..7e5d6866fe 100644
--- a/system/apache-cassandra/apache-cassandra.SlackBuild
+++ b/system/apache-cassandra/apache-cassandra.SlackBuild
@@ -25,7 +25,7 @@
 # based on apache-tomcat.SlackBuild by Heinz Wiesinger and Vincent Batts
 
 PRGNAM=apache-cassandra
-VERSION=0.6.4
+VERSION=0.6.5
 ARCH=noarch	
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -56,6 +56,7 @@ mkdir -p $PKG/var/log/cassandra
 mkdir -p $PKG/var/lib/cassandra
 rm -f bin/*.bat 
 
+#####
 cp -f  $CWD/cassandra.in.sh $PKG/etc/$PRGNAM
 cp -rf conf/* interface     $PKG/etc/$PRGNAM
 cp -rf bin lib 		    $PKG/opt/$PRGNAM
@@ -86,6 +87,7 @@ cp -a CHANGES.txt  LICENSE.txt  NEWS.txt  NOTICE.txt  README.txt \
 cp -rf javadoc $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+####
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/system/apache-cassandra/apache-cassandra.info b/system/apache-cassandra/apache-cassandra.info
index 23d94d30a9..5e2f2a57f4 100644
--- a/system/apache-cassandra/apache-cassandra.info
+++ b/system/apache-cassandra/apache-cassandra.info
@@ -1,8 +1,8 @@
 PRGNAM="apache-cassandra"
-VERSION="0.6.4"
+VERSION="0.6.5"
 HOMEPAGE="http://cassandra.apache.org/"
-DOWNLOAD="http://www.apache.org/dist/cassandra/0.6.4/apache-cassandra-0.6.4-bin.tar.gz"
-MD5SUM="3bb41737ef8f1f76cd5d13cb6db5e079"
+DOWNLOAD="http://www.apache.org/dist/cassandra/0.6.5/apache-cassandra-0.6.5-bin.tar.gz"
+MD5SUM="2807f5c2e04ead1534a6087087676210"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Manlio Modugno"
diff --git a/system/apache-cassandra/doinst.sh b/system/apache-cassandra/doinst.sh
index 95008b7254..c7632ed9b2 100644
--- a/system/apache-cassandra/doinst.sh
+++ b/system/apache-cassandra/doinst.sh
@@ -11,7 +11,7 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-# Keep same perms on rc.tomcat.new:
+# Keep same perms on rc.cassandra.new:
 if [ -e etc/rc.d/rc.cassandra ]; then
   cp -a etc/rc.d/rc.cassandra etc/rc.d/rc.cassandra.new.incoming
   cat etc/rc.d/rc.cassandra.new > etc/rc.d/rc.cassandra.new.incoming
@@ -19,3 +19,21 @@ if [ -e etc/rc.d/rc.cassandra ]; then
 fi
 
 config etc/rc.d/rc.cassandra.new
+
+# Keep same perms on storage-conf.xml.new:
+if [ -e etc/apache-cassandra/storage-conf.xml ]; then
+  cp -a etc/apache-cassandra/storage-conf.xml etc/apache-cassandra/storage-conf.xml.new.incoming
+  cat etc/apache-cassandra/storage-conf.xml.new > etc/apache-cassandra/storage-conf.xml.new.incoming
+  mv etc/apache-cassandra/storage-conf.xml.new.incoming etc/apache-cassandra/storage-conf.xml.new
+fi
+
+config etc/apache-cassandra/storage-conf.xml.new
+
+# Keep same perms on cassandra.in.sh.new:
+if [ -e etc/apache-cassandra/cassandra.in.sh ]; then
+  cp -a etc/apache-cassandra/cassandra.in.sh etc/apache-cassandra/cassandra.in.sh.new.incoming
+  cat etc/apache-cassandra/cassandra.in.sh.new > etc/apache-cassandra/cassandra.in.sh.new.incoming
+  mv etc/apache-cassandra/cassandra.in.sh.new.incoming etc/apache-cassandra/cassandra.in.sh.new
+fi
+
+config etc/apache-cassandra/cassandra.in.sh.new
+\ No newline at end of file