diff options
| -rw-r--r-- | pcr/zoneminder/Controls_Orbit.sql | 3 | ||||
| -rw-r--r-- | pcr/zoneminder/arm-context.patch | 18 | ||||
| -rwxr-xr-x | pcr/zoneminder/customdb | 31 | ||||
| -rw-r--r-- | pcr/zoneminder/zm.service | 9 | ||||
| -rwxr-xr-x | pcr/zoneminder/zmeventbackup | 48 | ||||
| -rw-r--r-- | pcr/zoneminder/zminit.arch | 143 |
6 files changed, 0 insertions, 252 deletions
diff --git a/pcr/zoneminder/Controls_Orbit.sql b/pcr/zoneminder/Controls_Orbit.sql deleted file mode 100644 index 23224e4aa..000000000 --- a/pcr/zoneminder/Controls_Orbit.sql +++ /dev/null @@ -1,3 +0,0 @@ - -INSERT INTO `Controls` VALUES (7,'Orbit','Remote','mjpgStreamer',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,1,-7000,7000,200,200,1,100,100,0,0,1,-2000,2000,10,100,1,200,200,0,0,0,0); - diff --git a/pcr/zoneminder/arm-context.patch b/pcr/zoneminder/arm-context.patch deleted file mode 100644 index a6fbb5328..000000000 --- a/pcr/zoneminder/arm-context.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- src/zm_signal.cpp.orig 2012-08-30 13:24:16.479872021 -0700 -+++ src/zm_signal.cpp 2012-08-30 13:27:35.909871996 -0700 -@@ -82,13 +82,13 @@ - int trace_size = 0; - - #if HAVE_STRUCT_SIGCONTEXT_EIP -- Error( "Signal address is %p, from %p", (void *)context.cr2, (void *)context.eip ); -+ Error( "Signal address is %p, from %p", (void *)context.fault_address, (void *)context.eip ); - - trace_size = backtrace( trace, TRACE_SIZE ); - // overwrite sigaction with caller's address - trace[1] = (void *)context.eip; - #elif HAVE_STRUCT_SIGCONTEXT -- Error( "Signal address is %p, no eip", (void *)context.cr2 ); -+ Error( "Signal address is %p, no eip", (void *)context.fault_address ); - - trace_size = backtrace( trace, TRACE_SIZE ); - #else // HAVE_STRUCT_SIGCONTEXT diff --git a/pcr/zoneminder/customdb b/pcr/zoneminder/customdb deleted file mode 100755 index afd295935..000000000 --- a/pcr/zoneminder/customdb +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -DBHOST=$1 -DBNAME=$2 -USERNAME=$3 -PASSWORD=$4 - -ZM_PATH_ZMS=/cgi-bin/nph-zms -ZM_PATH_SOCKS=/srv/zoneminder/socks -ZM_PATH_LOGS=/var/log/zm -ZM_WEB_LIST_THUMBS=1 -ZM_WEB_MONTAGE_WIDTH=320 -ZM_WEB_MONTAGE_HEIGHT=240 -ZM_OPT_CAMBOZOLA=1 -ZM_OPT_MPEG=ffmpeg -ZM_PATH_FFMPEG=/usr/bin/ffmpeg -ZM_OPT_NETPBM=1 -ZM_EXTRA_DEBUG_LOG=/var/log/zm/zm_debug.log -ZM_OPT_USE_AUTH=0 - -sql=/tmp/$$ -echo "" >$sql -for n in ZM_PATH_ZMS ZM_PATH_SOCKS ZM_PATH_LOGS ZM_WEB_LIST_THUMBS ZM_WEB_MONTAGE_WIDTH ZM_WEB_MONTAGE_HEIGHT ZM_OPT_CAMBOZOLA ZM_OPT_MPEG ZM_PATH_FFMPEG ZM_OPT_NETPBM ZM_EXTRA_DEBUG_LOG ZM_OPT_USE_AUTH; do - eval "val=\$$n" - echo "UPDATE Config SET Value='$val' WHERE Name='$n';" >>$sql -done - -cat $sql | mysql --user=$USERNAME --password=$PASSWORD --host=$DBHOST $DBNAME -rm -f $sql - - -exit 0 diff --git a/pcr/zoneminder/zm.service b/pcr/zoneminder/zm.service deleted file mode 100644 index ccf1f3334..000000000 --- a/pcr/zoneminder/zm.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Capture, analyse, record and monitor video security cameras - -[Service] -Type=forking -ExecStart=/usr/sbin/zm - -[Install] -WantedBy=multi-user.target diff --git a/pcr/zoneminder/zmeventbackup b/pcr/zoneminder/zmeventbackup deleted file mode 100755 index a14ee22a1..000000000 --- a/pcr/zoneminder/zmeventbackup +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash -#=============================================================================== -# -# FILE: eventdump.sh -# -# USAGE: ./eventdump.sh -# -# DESCRIPTION: Uses mysqldump to create a .sql file for individual zm -# events to make Event table recovery possible by doing a -# 'find' search in ZoneMinder the events directory -# -# OPTIONS: --- -# REQUIREMENTS: --- mysqldump -# BUGS: --- -# NOTES: --- -# AUTHOR: Ross Melin <rdmelin@gmail.com> -# COMPANY: -# VERSION: 1.0 -# CREATED: 03/06/2008 11:51:19 AM PST -# REVISION: --- -#=============================================================================== - -# Edit these to suit your configuration -ZM_CONFIG=/etc/zm.conf -MYSQLDUMP=/usr/bin/mysqldump -EVENTSDIR=/srv/zoneminder/www/events - -# The rest should not need editing - -# Get the mysql user and password -source $ZM_CONFIG -MYDUMPOPTS="--user=$ZM_DB_USER --password=$ZM_DB_PASS --skip-opt --compact --quick --no-create-info" - - -for tag in $(find $EVENTSDIR -amin -65 -name ".[0-9]*") - do - EVENT_PATH=$(echo $tag |cut -f 1 -d .) - EVENT_ID=$(echo $tag |cut -f 2 -d .) - # Dump the sql statements needed to reload the Events, Frames and Stats tables - - echo "-- ZM_DB_VERSION=$ZM_VERSION -" > $EVENT_PATH.sql - - $MYSQLDUMP $MYDUMPOPTS --where="Id=$EVENT_ID" zm Events >> $EVENT_PATH.sql - $MYSQLDUMP $MYDUMPOPTS --where="Eventid=$EVENT_ID" zm Frames >> $EVENT_PATH.sql - $MYSQLDUMP $MYDUMPOPTS --where="Eventid=$EVENT_ID" zm Stats >> $EVENT_PATH.sql - -done diff --git a/pcr/zoneminder/zminit.arch b/pcr/zoneminder/zminit.arch deleted file mode 100644 index 01b6658a7..000000000 --- a/pcr/zoneminder/zminit.arch +++ /dev/null @@ -1,143 +0,0 @@ -#!/bin/sh - - -ZM_CONFIG=/etc/zm.conf - - - -loadcfg() { - if [ -f $ZM_CONFIG ]; then - . $ZM_CONFIG - else - echo "ERROR: $ZM_CONFIG not found." - exit 1 - fi - } -chkmysql(){ - #FIXME - /etc/rc.d/mysqld restart || (echo "mysql is not availible" && exit 1 ) - } - -getmylogin(){ - echo "Enter MySQL Administrator username" - echo "(Default: root and password is blank)" - echo -n "MySQL Admin: " - read MYADMIN - echo -n "Password: " - read MYPASS - if [ "X$MYPASS" != "X" ]; then MYPASS="-p$MYPASS"; fi - echo "\q" |mysql -u $MYADMIN $MYPASS || exit 0 - - } - -checkdb() -{ - # Check database exisits and version - exists=$(echo "show databases" |mysql -u $MYADMIN "$MYPASS" |grep zm) - if [ "$exists" = "zm" ]; then - OLD_VERSION=$(echo "select Value from Config where Name = 'ZM_DYN_DB_VERSION';" | mysql -u $MYADMIN $MYPASS zm |grep -v '^Value') - - case $OLD_VERSION in - "") - echo "A zm database exists, but the version is unknown" - echo "Updating is unlikely to succeed" - ;; - "$ZM_VERSION") - echo "The zm database appears to be up to date" - echo "If this is incorrect, edit $ZM_CONFIG to reflect the current version" - ;; - *) - echo "A database fron zm-$OLD_VERSION exists already" - ;; - esac - - while [ true ] - do - echo "Choose one of the following options:" - echo "[U]pdate the database" - echo "[D]rop the old database and reinitialize" - echo "[E]xit and do nothing" - read OPTION - case $OPTION in - "U"|"u") - /etc/rc.d/zm restart - exit 0 - ;; - "D"|"d") - echo "drop database zm;"|mysql -u $MYADMIN $MYPASS - return - ;; - "E"|"e") - exit 0 - ;; - esac - done - fi -} - -checkcfg(){ -for n in ZM_DB_HOST ZM_DB_NAME ZM_DB_USER ZM_DB_PASS; do - eval "val=\$$n" - if [ "$val" = "" ]; then - echo "ERROR($ZM_CONFIG): $n should not be empty." - echo "Enter a $n for ZM to use the Database." - if [ "$n" = "ZM_DB_PASS" ]; then - echo -n "Will not echo on screen $n : " - stty -echo # Turns off screen echo. - read newval - stty echo # Restores screen echo. - echo "" - ### The following can be used to generate a random password - # randstr newval 16 - else - echo -n "$n : " - read newval - fi - cp $ZM_CONFIG /tmp/$$ && - sed 's/^'$n='.*$/'$n=$newval'/g' /tmp/$$ >$ZM_CONFIG - - fi -done - -if [ "$ZM_DB_HOST" = "localhost" ]; then - ClientHost=localhost -else - ClientHost=`hostname` -fi -} - -reloadcfg(){ -loadcfg -} - -initdb(){ -sql=/tmp/zm.crdb.sql -echo "" >$sql -chmod 600 $sql - -echo "CREATE DATABASE $ZM_DB_NAME;" >>$sql -echo "USE $ZM_DB_NAME;" >>$sql - -echo "GRANT all on $ZM_DB_NAME.* TO '$ZM_DB_USER'@'$ClientHost' IDENTIFIED BY '$ZM_DB_PASS';" >>$sql - -cat $sql | mysql -B -h $ZM_DB_HOST -u $MYADMIN $MYPASS -rm -f $sql - -cat $ZM_PATH_UPDATE/zm_create.sql | mysql -h $ZM_DB_HOST -u $ZM_DB_USER -p$ZM_DB_PASS $ZM_DB_NAME -( cd $ZM_PATH_UPDATE; perl $ZM_PATH_BIN/zmupdate.pl -f ) - - $ZM_PATH_UPDATE/customdb $ZM_DB_HOST $ZM_DB_NAME $ZM_DB_USER $ZM_DB_PASS -} - - - -loadcfg -getmylogin -checkdb -checkcfg -reloadcfg -initdb - - - - |