diff options
| -rw-r--r-- | pcr/zoneminder/PKGBUILD | 150 | ||||
| -rw-r--r-- | pcr/zoneminder/fabs.patch | 11 | ||||
| -rw-r--r-- | pcr/zoneminder/httpd-zoneminder.conf | 20 | ||||
| -rw-r--r-- | pcr/zoneminder/log.txt | 23 | ||||
| -rw-r--r-- | pcr/zoneminder/uio.patch | 22 | ||||
| -rw-r--r-- | pcr/zoneminder/zm_rtp_ctrl.h.quick_fix_for_gcc6.diff | 4 | ||||
| -rw-r--r-- | pcr/zoneminder/zoneminder-tmpfile.conf | 1 | ||||
| -rw-r--r-- | pcr/zoneminder/zoneminder.install | 130 | ||||
| -rw-r--r-- | pcr/zoneminder/zoneminder.service | 15 |
9 files changed, 0 insertions, 376 deletions
diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD deleted file mode 100644 index ba6c7bc02..000000000 --- a/pcr/zoneminder/PKGBUILD +++ /dev/null @@ -1,150 +0,0 @@ -# Maintainer (AUR): Mesmer <mesmer@fisica.if.uff.br> -# Contributor (AUR): Troy Will <troydwill at gmail dot com> -# Contributor (AUR): /dev/rs0 </dev/rs0@secretco.de.com> -# Contributor (AUR): Jacek Burghardt <jacek@hebe.us> -# Contributor (AUR): Vojtech Aschenbrenner <v@asch.cz> -# Contributor (AUR): Jason Gardner <buhrietoe@gmail.com> -# Contributor (AUR): Ross melin <rdmelin@gmail.com> -# Contributor (AUR): Charles Spence IV <cspence@unomaha.edu> -# Contributor (AUR): Joe Julian <me@joejulian.name> -# Contributor: Márcio Silva <coadde@hyperbola.info> -# Contributor: André Silva <emulatorman@hyperbola.info> -# Orginally based on a Debian Squeeze package - -# parabola changes and rationale: -# - corrected license -# - renamed tarball to avoid collisions - -_pkgname=zoneminder -pkgname=zoneminder -pkgver=1.30.4 -pkgrel=1 -pkgdesc='Capture, analyse, record and monitor video security cameras' -arch=( i686 x86_64 armv7h ) -backup=( etc/zm.conf ) -url="https://github.com/$pkgname/$pkgname/releases" -license=( GPL2 ) -depends=( - mariadb perl-dbd-mysql perl-dbi - apache php php-apache php-gd php-mcrypt perl-php-serialization - perl-libwww perl-net-sftp-foreign - ffmpeg vlc perl-sys-mmap - gnutls polkit - perl-expect perl-archive-zip perl-date-manip - perl-mime-lite perl-mime-tools -) -makedepends=( - cmake netpbm git -) -optdepends=( - 'php-apcu-bci: Bring back the API for android control' - netpbm - cambozola - perl-time-modules - perl-x10 - perl-astro-suntime -) -install=$_pkgname.install - -source=( - $pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/$pkgver.tar.gz - httpd-zoneminder.conf - zoneminder.service - uio.patch - fabs.patch - zoneminder-tmpfile.conf -) -sha256sums=('879f57fdb1e013b3f17b1b0e87c5935683dad14922951d5f29d1370c1e490f2e' - 'ff7382b38ac07dadead0ad4d583e3dbcf8da4aaa06b76d048ee334f69f95db67' - '043d77a995553c533d62f48db4b719d29cf6c7074f215d866130e97be57ed646' - 'd1816cac69be5e807d22c37fcbe6fef99e38151a5c71233b875c0ebf101fb460' - 'fd20faed09eaf825933c2a87b1d04febf99d183b2b36b0041df1e2b2990c49c2' - 'cc8af737c3c07750fc71317c81999376e4bbb39da883780164a8747b3d7c95a7') - - -prepare () { - cd $srcdir/$pkgname-$pkgver/web/api/app/Plugin/ - if [ ! -d "crud" ]; then - git clone -b 3.0 https://github.com/FriendsOfCake/crud.git - mkdir -p Crud - mv crud/* Crud - fi - patch $srcdir/$pkgname-$pkgver/src/zm_image.cpp < $srcdir/fabs.patch - patch $srcdir/$pkgname-$pkgver/src/zm_comms.h < $srcdir/uio.patch -} - -build() { - cd $srcdir/$pkgname-$pkgver - - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DZM_PERL_SUBPREFIX=/lib/perl5 \ - -DZM_WEBDIR=/srv/http/zoneminder \ - -DZM_CGIDIR=/srv/http/cgi-bin \ - -DZM_WEB_USER=http \ - -DZM_CONTENTDIR=/var/cache/zoneminder \ - -DZM_LOGDIR=/var/log/zoneminder \ - -DZM_RUNDIR=/run/zoneminder \ - -DZM_TMPDIR=/var/lib/zoneminder/temp \ - -DZM_SOCKDIR=/var/lib/zoneminder/sock . - - make V=0 -} - -package() { - - cd $srcdir/$pkgname-$pkgver - - DESTDIR=$pkgdir make install - - # Change Polkit directory permissions to Arch Linux policy - chmod -v 700 $pkgdir/usr/share/polkit-1/rules.d/ - chown -v polkitd $pkgdir/usr/share/polkit-1/rules.d/ - - # BEGIN CREATE_ZONEMINDER_DIRECTORIES - mkdir -pv $pkgdir/var/{cache/zoneminder,log/zoneminder} - chown -Rv http.http $pkgdir/var/{cache/zoneminder,log/zoneminder} - - # corresponds to -DZM_SOCKDIR=/var/lib/zoneminder/sock - mkdir -pv $pkgdir/var/lib/zoneminder/sock - chown -v http.http $pkgdir/var/lib/zoneminder/sock - - # corresponds to -DZM_TMPDIR=/var/lib/zoneminder/temp - mkdir -pv $pkgdir/var/lib/zoneminder/temp - chown -v http.http $pkgdir/var/lib/zoneminder/temp - - chown -v http.http $pkgdir/etc/zm.conf - chmod 0700 $pkgdir/etc/zm.conf - # END CREATE_ZONEMINDER_DIRECTORIES - - # Make content directories in /var/cache/zoneminder and to link them in /srv/http/zoneminder - for i in events images temp; do - mkdir $pkgdir/var/cache/$_pkgname/$i - chown -v http.http $pkgdir/var/cache/$_pkgname/$i - ln -s /var/cache/$_pkgname/$i $pkgdir/srv/http/$_pkgname/$i - chown -v --no-dereference http.http $pkgdir/srv/http/$_pkgname/$i - done - - # Create a link to the Zoneminder cgi binaries - ln -sv /srv/http/cgi-bin $pkgdir/srv/http/$_pkgname - - chown -h http.http $pkgdir/srv/http/{cgi-bin,$_pkgname,$_pkgname/cgi-bin} - - # Link Cambozola - # ln -s /usr/share/cambozola/cambozola.jar $pkgdir/srv/http/$_pkgname - - # Install configuration files - mkdir -p $pkgdir/etc/httpd/conf/extra - install -D -m 644 $srcdir/httpd-$_pkgname.conf $pkgdir/etc/httpd/conf/extra - - mkdir -p $pkgdir/usr/lib/systemd/system - install -D -m 644 $srcdir/$_pkgname.service $pkgdir/usr/lib/systemd/system - - install -D -m 644 COPYING $pkgdir/usr/share/license/$_pkgname - install -D -m 644 db/zm*.sql $pkgdir/usr/share/$_pkgname/db - - mkdir -p $pkgdir/usr/share/doc/$_pkgname - # install -D -m 644 $srcdir/README $pkgdir/usr/share/doc/$_pkgname - - install -Dm644 ../zoneminder-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/zoneminder.conf - -} diff --git a/pcr/zoneminder/fabs.patch b/pcr/zoneminder/fabs.patch deleted file mode 100644 index b0a62e3db..000000000 --- a/pcr/zoneminder/fabs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/ZoneMinder-1.30.4/src/zm_image.cpp 2017-06-17 04:20:45.808503543 -0300 -+++ src/ZoneMinder-1.30.4/src/zm_image.cpp.2 2017-06-17 04:20:40.221794330 -0300 -@@ -1659,7 +1659,7 @@ - uint8_t *psrc = images[j]->buffer+c; - - #ifndef SOLARIS -- if ( (unsigned)abs((*psrc)-RGB_VAL(ref_colour,c)) >= RGB_VAL(threshold,c) ) -+ if ( (unsigned)fabs((*psrc)-RGB_VAL(ref_colour,c)) >= RGB_VAL(threshold,c) ) - #else - if ( (unsigned)std::abs((*psrc)-RGB_VAL(ref_colour,c)) >= RGB_VAL(threshold,c) ) - #endif diff --git a/pcr/zoneminder/httpd-zoneminder.conf b/pcr/zoneminder/httpd-zoneminder.conf deleted file mode 100644 index 41b364f13..000000000 --- a/pcr/zoneminder/httpd-zoneminder.conf +++ /dev/null @@ -1,20 +0,0 @@ -# /etc/httpd/conf/extra/httpd-zoneminder.conf -# Config for zoneminder web app - -Alias /zm "/srv/http/zoneminder" -<Directory "/srv/http/zoneminder"> - Options -Indexes +MultiViews +FollowSymLinks - AllowOverride None - Order allow,deny - Allow from all - # Provide PHP directory and file access, see http://php.net/manual/en/ini.core.php#ini.open-basedir - php_admin_value open_basedir "/tmp/:/etc/zm.conf:/srv/http/zoneminder/:/var/cache/zoneminder/:/var/lib/zoneminder/:/var/log/zoneminder/" -</Directory> - -ScriptAlias /cgi-bin "/srv/http/cgi-bin" -<Directory "/srv/http/cgi-bin"> - AllowOverride None - Options +ExecCGI +FollowSymLinks - Order allow,deny - Allow from all -</Directory> diff --git a/pcr/zoneminder/log.txt b/pcr/zoneminder/log.txt deleted file mode 100644 index 09e54b17e..000000000 --- a/pcr/zoneminder/log.txt +++ /dev/null @@ -1,23 +0,0 @@ -==> Making package: zoneminder 1.30.4-1 (Fri Sep 15 20:35:45 UTC 2017) -==> Checking runtime dependencies... -==> Missing dependencies: - -> mariadb - -> perl-dbd-mysql - -> perl-dbi - -> apache - -> php - -> php-apache - -> php-gd - -> php-mcrypt - -> perl-libwww - -> vlc - -> perl-archive-zip - -> perl-date-manip - -> perl-mime-lite - -> perl-mime-tools -==> Checking buildtime dependencies... -==> Missing dependencies: - -> netpbm -==> ERROR: Could not resolve all dependencies. - -==> ERROR: An unknown error has occurred. Exiting... diff --git a/pcr/zoneminder/uio.patch b/pcr/zoneminder/uio.patch deleted file mode 100644 index a892e29b1..000000000 --- a/pcr/zoneminder/uio.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- src/ZoneMinder-1.30.4/src/zm_comms.h 2017-05-09 14:54:48.000000000 +0000 -+++ src/ZoneMinder-1.30.4/src/zm_comms.fix.h 2017-09-15 20:49:46.992445289 +0000 -@@ -21,7 +21,6 @@ - #define ZM_COMMS_H - - #include "zm_exception.h" -- - #include <string.h> - #include <unistd.h> - #include <netdb.h> -@@ -31,11 +30,9 @@ - #include <set> - #include <vector> - --#if defined(BSD) - #include <sys/uio.h> - #include <sys/socket.h> - #include <netinet/in.h> --#endif - - class CommsException : public Exception - { diff --git a/pcr/zoneminder/zm_rtp_ctrl.h.quick_fix_for_gcc6.diff b/pcr/zoneminder/zm_rtp_ctrl.h.quick_fix_for_gcc6.diff deleted file mode 100644 index ae076e72f..000000000 --- a/pcr/zoneminder/zm_rtp_ctrl.h.quick_fix_for_gcc6.diff +++ /dev/null @@ -1,4 +0,0 @@ -126c126 -< struct Bye ---- -> struct diff --git a/pcr/zoneminder/zoneminder-tmpfile.conf b/pcr/zoneminder/zoneminder-tmpfile.conf deleted file mode 100644 index 84362b52b..000000000 --- a/pcr/zoneminder/zoneminder-tmpfile.conf +++ /dev/null @@ -1 +0,0 @@ -d /run/zoneminder 0755 http http - diff --git a/pcr/zoneminder/zoneminder.install b/pcr/zoneminder/zoneminder.install deleted file mode 100644 index d16779e3b..000000000 --- a/pcr/zoneminder/zoneminder.install +++ /dev/null @@ -1,130 +0,0 @@ -post_install() { - - systemd-tmpfiles --create zoneminder.conf - - # edit /etc/php.ini for Zoneminder - sed -e ' - # Enable these libraries by removing the leading comment character - \|^;extension=ftp.so$| s|^;||; - \|^;extension=gd.so$| s|^;||; - \|^;extension=gettext.so$| s|^;||; - \|^;extension=mcrypt.so$| s|^;||; - \|^;extension=openssl.so$| s|^;||; - \|^;extension=pdo_mysql.so$| s|^;||; - \|^;extension=sockets.so$| s|^;||; - \|^;extension=zip.so$| s|^;||; - ' /etc/php/php.ini > /tmp/php.ini.zoneminder - - # edit /etc/httpd/conf/httpd.conf for Zoneminder - sed -e ' - # Use mod_mpm_prefork instead of mod_mpm_event.so (FS#39218). - s|^LoadModule mpm_event_module modules/mod_mpm_event.so$|#&\nLoadModule mpm_prefork_module modules/mod_mpm_prefork.so|; - - # Zoneminder needs Apache configured to permit CGI execution - \|^\t#LoadModule cgi_module modules/mod_cgi.so$| s|\t#|\t|; - - # libphp7 - \|^LoadModule php7_module modules/libphp7.so$|d; - s|^#*LoadModule rewrite_module modules/mod_rewrite.so$|&\nLoadModule php7_module modules/libphp7.so|; - \|^Include /etc/httpd/conf/extra/php7_module.conf|d; - s|^Include conf/extra/httpd-default.conf$|&\nInclude /etc/httpd/conf/extra/php7_module.conf|; - - # Include httpd-zoneminder.conf - \|^Include /etc/httpd/conf/extra/httpd-zoneminder.conf$|d; - s|^# Server-pool management (MPM specific)$|\nInclude /etc/httpd/conf/extra/httpd-zoneminder.conf\n&|; - ' /etc/httpd/conf/httpd.conf > /tmp/httpd.conf.zoneminder - - cat << EOF - - Zoneminder database setup: - -------------------------- - Zoneminder operation requires a database named 'zm' which is defined in /usr/share/zoneminder/db/zm_create.sql - - Create the Zoneminder database (with a password): - "mysqladmin --defaults-file=/etc/mysql/my.cnf -p -f reload" - "cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/my.cnf -p" - "echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/my.cnf -p mysql" - (or without a password): - "mysqladmin --defaults-file=/etc/mysql/my.cnf -f reload" - "cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/my.cnf" - "echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/my.cnf mysql" - - PHP configuration - ----------------- - * Check and make sure these are uncommented in /etc/php/php.ini: - extension=ftp.so - extension=gd.so - extension=gettext.so - extension=mcrypt.so - extension=openssl.so - extension=pdo_mysql.so - extension=sockets.so - extension=zip.so - * Set your timezone in php.ini: - date.timezone = <your_country>/<your_city> - - Apache configuration - -------------------- - Edit /etc/httpd/conf/httpd.conf and add the line: - "LoadModule php7_module modules/libphp7.so" - and: - "Include /etc/httpd/conf/extra/php7_module.conf" - "Include /etc/httpd/conf/extra/httpd-zoneminder.conf" - -EOF -} - -post_upgrade() { - post_install - /usr/bin/zmupdate.pl -f >/dev/null -} - -post_remove() { - if [[ -d /tmp/zoneminder ]]; then - rm -vr /tmp/zoneminder - fi - # sed -i -e ' - # /^open_basedir/ s/:\/srv\/http\/zoneminder//; - # /^open_basedir/ s/:\/srv\/http\/zoneminder\///; - # ' /etc/php/php.ini || read - # sed -i -e ' - # /^# ZoneMinder/d; - # /Include \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/d; - # ' /etc/httpd/conf/httpd.conf || read - - cat << EOF -Note: -==> To clean Zoneminder mysql database, run as root (with password): -==> "echo 'delete from user where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf -p mysql" -==> "echo 'delete from db where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf -p mysql" -==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -p -f drop zm" -==> (or without password): -==> "echo 'delete from user where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf mysql" -==> "echo 'delete from db where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf mysql" -==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -f drop zm" - -==> Disable http with php if it isn't needed with others servers, -==> comment or remove that lines in /etc/httpd/conf/httpd.conf: -==> "LoadModule php7_module modules/libphp7.so" -==> "Include /etc/httpd/conf/extra/php7_module.conf" - -==> Remove line in /etc/httpd/conf/httpd.conf: -==> "Include /etc/httpd/conf/extra/httpd-zoneminder.conf" - -==> Disable php with mysql if it isn't needed with others servers, -==> comment that lines in /etc/php/php.ini: - # extension=ftp.so - # extension=gd.so - # extension=gettext.so - # extension=mcrypt.so - # extension=openssl.so - # extension=pdo_mysql.so - # extension=sockets.so - # extension=zip.so - # "date.timezone = <my_country>/<my_city>" - -==> Remove log files and "zoneminder" directory in "/var/log/zoneminder". - -==> Backup and remove "events", "images" and "temp" dirs in "/var/cache/zoneminder". -EOF -} diff --git a/pcr/zoneminder/zoneminder.service b/pcr/zoneminder/zoneminder.service deleted file mode 100644 index 48268f139..000000000 --- a/pcr/zoneminder/zoneminder.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=ZoneMinder CCTV recording and security system -After=network.target mysqld.service httpd.service -Requires=mysqld.service httpd.service - -[Service] -User=http -Type=forking -ExecStart=/usr/bin/zmpkg.pl start -ExecReload=/usr/bin/zmpkg.pl restart -ExecStop=/usr/bin/zmpkg.pl stop -PIDFile=/run/zoneminder/zm.pid - -[Install] -WantedBy=multi-user.target |