[gentoo-commits] repo/gentoo:master commit in: www-misc/zoneminder/files/, www-misc/zoneminder/

2018-02-22 Thread Andreas Hüttel 
commit: 1400ae64025d6b75ceb945235b31a4a87bccab5a
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Thu Feb 22 22:43:19 2018 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Thu Feb 22 22:48:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1400ae64

www-misc/zoneminder: Remove old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 www-misc/zoneminder/Manifest   |   3 -
 www-misc/zoneminder/files/10_zoneminder.conf-r1|  17 --
 .../files/zoneminder-1.26.5-automagic.patch|  34 
 .../zoneminder-1.28.1-mysql_include_path.patch |  20 ---
 www-misc/zoneminder/zoneminder-1.30.0.ebuild   | 176 
 www-misc/zoneminder/zoneminder-1.30.2-r1.ebuild| 177 -
 www-misc/zoneminder/zoneminder-1.30.2.ebuild   | 176 
 7 files changed, 603 deletions(-)

diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
index 7352a3c915e..186187f5099 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -1,5 +1,2 @@
-DIST Crud-3.0.10.tar.gz 72960 BLAKE2B 
d7dd9d7f7d465dab910708ce34f1348983d14e80ac06d43273ce53d70fbe540dc3fcae66ffeb54501e6b897e59b660fd1268c4baea95b912059dfabb12031816
 SHA512 
2f60557f2c783bb448e06c1ca40b536a1d7d5f3caf0626fa6716a28f808492d4799e238f16c022571be96921105b074b6763920fd7b9cc77b76d17ceadae2040
 DIST Crud-3.1.0.tar.gz 72993 BLAKE2B 
d11938a0a667f6747bbe3609e51ccc5665b8d243e1787a5779319c679f1f20301afd6b0a14c5489976b9f66f57b5f18ef3ae0ee5a24e1368702cb43a5d564dd5
 SHA512 
7ec84afaa336b1bd582b7f39724f77081bdb3008947c4124ad96e4bc7755a03fbe31e01666d4d1939ebe17b342db37bf3766a42d88fbed0e99706807ff5b9d01
-DIST zoneminder-1.30.0.tar.gz 9757409 BLAKE2B 
b67340b9cf8f0875a5ea5c4aef2c4a2770532987e8482952a3e81036006efe6f84dc142309ca2926c33d72fca9b157739daf15d9f6716e31b56a00fd704921e7
 SHA512 
cbff14447a568648a0475e878be5cd19cb694c65814fe33c20774752410e31f3f4ff9e5695667d4d50634b3193dc50aaca2d950efc151bbb968d3f9609d35db4
-DIST zoneminder-1.30.2.tar.gz 9931753 BLAKE2B 
3c48d5886053ed72788028b0c7a1f483ca2f659b6614bf0cbc1a5de7c9a7ed21aa730b614ba7400b96b057e076724364d24958e3ee5ff8e1134aeb9f142c38fd
 SHA512 
98bd6d42ecc19bcd317a30e1a9c57bd6bd295593bcc6c12e2fbe1beddfe43fb0301e042323a88969fd5f7da1dc45a1c01324878837633e5a5ed4fa54bed8690a
 DIST zoneminder-1.30.4.tar.gz 9937220 BLAKE2B 
feab8251b3f36f3fb91e1ea52a25b06e131a81c398f8c97a4ef304848bc65abaf5514bded1783c1ab6ec2287e279baa69d406e24191d59276315d7131af42104
 SHA512 
b55b2541bcaba08f89b95fdfb06b6cf3fc7b462b1f3fac2bb3fd6e8ee890735d4fac343c7625cf59b22fd25c19585900050cb5305b35aa8f6557421be09450b3

diff --git a/www-misc/zoneminder/files/10_zoneminder.conf-r1 
b/www-misc/zoneminder/files/10_zoneminder.conf-r1
deleted file mode 100644
index 441c793d189..000
--- a/www-misc/zoneminder/files/10_zoneminder.conf-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-ScriptAlias /zm/cgi-bin/ "/usr/libexec/zoneminder/cgi-bin/"
-
-
-  AllowOverride All
-  Options ExecCGI
-  Order allow,deny
-  Allow from all
- 
-
-Alias /zoneminder "%ZM_WEBDIR%"
-
-
-  Options -Indexes MultiViews FollowSymLinks
-  AllowOverride All
-  Order allow,deny
-  Allow from all
- 

diff --git a/www-misc/zoneminder/files/zoneminder-1.26.5-automagic.patch 
b/www-misc/zoneminder/files/zoneminder-1.26.5-automagic.patch
deleted file mode 100644
index 266bd649baa..000
--- a/www-misc/zoneminder/files/zoneminder-1.26.5-automagic.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 83e9d81..8619c8b 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -171,6 +171,7 @@ else(PCRE_LIBRARIES)
-   set(optlibsnotfound "${optlibsnotfound} PCRE")
- endif(PCRE_LIBRARIES)
- 
-+if(HAVE_GCRYPT)
- # gcrypt (using find_library and find_path)
- find_library(GCRYPT_LIBRARIES gcrypt)
- if(GCRYPT_LIBRARIES)
-@@ -187,7 +188,11 @@ if(GCRYPT_LIBRARIES)
- else(GCRYPT_LIBRARIES)
-   set(optlibsnotfound "${optlibsnotfound} GCrypt")
- endif(GCRYPT_LIBRARIES)
-+else(HAVE_GCRYPT)
-+  set(optlibsnotfound "${optlibsnotfound} GCrypt")
-+endif(HAVE_GCRYPT)
- 
-+if(HAVE_GNUTLS)
- # gnutls (using find_library and find_path)
- find_library(GNUTLS_LIBRARIES gnutls)
- if(GNUTLS_LIBRARIES)
-@@ -205,6 +210,9 @@ if(GNUTLS_LIBRARIES)
- else(GNUTLS_LIBRARIES)
-   set(optlibsnotfound "${optlibsnotfound} GnuTLS")
- endif(GNUTLS_LIBRARIES)
-+else(HAVE_GNUTLS)
-+  set(optlibsnotfound "${optlibsnotfound} GnuTLS")
-+endif(HAVE_GNUTLS)
- 
- # mysqlclient (using find_library and find_path)
- find_library(MYSQLCLIENT_LIBRARIES mysqlclient PATH_SUFFIXES mysql)

diff --git 
a/www-misc/zoneminder/files/zoneminder-1.28.1-mysql_include_path.patch 
b/www-misc/zoneminder/files/zoneminder-1.28.1-mysql_include_path.patch
deleted file mode 100644
index cb645528c05..000
--- a/www-misc/zoneminder/files/zoneminder-1.28.1-mysql_include_path.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 a/CMakeLists.txt   2015-10-27 17:28:48.059203421 +
-+++

[gentoo-commits] repo/gentoo:master commit in: www-misc/zoneminder/files/, www-misc/zoneminder/

2018-02-22 Thread Andreas Hüttel 
commit: f8796ea819bb3bc16ea85ec84c43dd9f21010982
Author: MalakymR  esdf  uk>
AuthorDate: Wed Sep  6 14:06:22 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Thu Feb 22 22:48:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8796ea8

www-misc/zoneminder: version bump to 1.30.4

* sample modified to work with new 2.4 apache syntax
* README: import schema as root

Closes: https://github.com/gentoo/gentoo/pull/5661

 www-misc/zoneminder/Manifest   |   1 +
 www-misc/zoneminder/files/10_zoneminder.conf   |  20 ++-
 www-misc/zoneminder/files/README.gentoo|  12 +-
 .../files/zoneminder-1.30.4-path_zms.patch |  16 ++
 www-misc/zoneminder/zoneminder-1.30.4.ebuild   | 178 +
 5 files changed, 210 insertions(+), 17 deletions(-)

diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
index e8f8359c774..7352a3c915e 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -2,3 +2,4 @@ DIST Crud-3.0.10.tar.gz 72960 BLAKE2B 
d7dd9d7f7d465dab910708ce34f1348983d14e80ac
 DIST Crud-3.1.0.tar.gz 72993 BLAKE2B 
d11938a0a667f6747bbe3609e51ccc5665b8d243e1787a5779319c679f1f20301afd6b0a14c5489976b9f66f57b5f18ef3ae0ee5a24e1368702cb43a5d564dd5
 SHA512 
7ec84afaa336b1bd582b7f39724f77081bdb3008947c4124ad96e4bc7755a03fbe31e01666d4d1939ebe17b342db37bf3766a42d88fbed0e99706807ff5b9d01
 DIST zoneminder-1.30.0.tar.gz 9757409 BLAKE2B 
b67340b9cf8f0875a5ea5c4aef2c4a2770532987e8482952a3e81036006efe6f84dc142309ca2926c33d72fca9b157739daf15d9f6716e31b56a00fd704921e7
 SHA512 
cbff14447a568648a0475e878be5cd19cb694c65814fe33c20774752410e31f3f4ff9e5695667d4d50634b3193dc50aaca2d950efc151bbb968d3f9609d35db4
 DIST zoneminder-1.30.2.tar.gz 9931753 BLAKE2B 
3c48d5886053ed72788028b0c7a1f483ca2f659b6614bf0cbc1a5de7c9a7ed21aa730b614ba7400b96b057e076724364d24958e3ee5ff8e1134aeb9f142c38fd
 SHA512 
98bd6d42ecc19bcd317a30e1a9c57bd6bd295593bcc6c12e2fbe1beddfe43fb0301e042323a88969fd5f7da1dc45a1c01324878837633e5a5ed4fa54bed8690a
+DIST zoneminder-1.30.4.tar.gz 9937220 BLAKE2B 
feab8251b3f36f3fb91e1ea52a25b06e131a81c398f8c97a4ef304848bc65abaf5514bded1783c1ab6ec2287e279baa69d406e24191d59276315d7131af42104
 SHA512 
b55b2541bcaba08f89b95fdfb06b6cf3fc7b462b1f3fac2bb3fd6e8ee890735d4fac343c7625cf59b22fd25c19585900050cb5305b35aa8f6557421be09450b3

diff --git a/www-misc/zoneminder/files/10_zoneminder.conf 
b/www-misc/zoneminder/files/10_zoneminder.conf
index 277d680d24b..eb9961d1322 100644
--- a/www-misc/zoneminder/files/10_zoneminder.conf
+++ b/www-misc/zoneminder/files/10_zoneminder.conf
@@ -1,18 +1,16 @@
-ScriptAlias /cgi-bin/zms "/usr/libexec/zoneminder/cgi-bin/zms"
-ScriptAlias /cgi-bin/nph-zms "/usr/libexec/zoneminder/cgi-bin/nph-zms"
+ScriptAlias /zm/cgi-bin "/usr/libexec/zoneminder/cgi-bin/"
 
 
   AllowOverride All
-  Options ExecCGI
-  Order allow,deny
-  Allow from all
- 
+  Options +ExecCGI
+  Require all granted
+
 
-Alias /zoneminder "%ZM_WEBDIR%"
+Alias /zm "%ZM_WEBDIR%"
 
 
-  Options -Indexes MultiViews FollowSymLinks
+  Options -Indexes +MultiViews +FollowSymLinks
   AllowOverride All
-  Order allow,deny
-  Allow from all
- 
+  Require all granted
+
+

diff --git a/www-misc/zoneminder/files/README.gentoo 
b/www-misc/zoneminder/files/README.gentoo
index 07995214d1c..8713fda6f78 100644
--- a/www-misc/zoneminder/files/README.gentoo
+++ b/www-misc/zoneminder/files/README.gentoo
@@ -3,12 +3,12 @@
(see https://wiki.gentoo.org/wiki/MySQL/Startup_Guide).
E.g., when logged into mysql as root,
  mysql> CREATE DATABASE \`zm\`;
- mysql> GRANT ALL ON zm.* TO 'zmuser'@'localhost' IDENTIFIED BY 
'topsecretpassword';
+ mysql> grant select,insert,alter,update,lock tables,delete on zm.* to 
'zmuser'@localhost identified by 'zmpass';
+ mysql> flush privileges;
Once you completed that you should execute the following:
- cd /usr/share/zoneminder
- mysql -u zmuser -p < db/zm_create.sql
+ mysql -p < /usr/share/zoneminder/db/zm_create.sql
 
-2. Set your database settings in /etc/zm.conf, including above 
topsecretpassword
+2. Set your database settings in /etc/zm.conf, including above zmpass
 
 3. Configure apache to use zoneminder, see 
/usr/share/doc/zoneminder*/10_zoneminder.conf
for an example configuration snippet.
@@ -23,5 +23,5 @@
 
 6. Finally point your browser to http://your.webserver/zm
 
-If you are upgrading, you will need to run the zmupdate.pl script:
-   /usr/bin/zmupdate.pl --version=oldversionnumber [--user=zmuser 
--pass=topsecretpassword]
+If you are upgrading, you will need to run the zmupdate.pl script: 
+   /usr/bin/zmupdate.pl

diff --git a/www-misc/zoneminder/files/zoneminder-1.30.4-path_zms.patch 
b/www-misc/zoneminder/files/zoneminder-1.30.4-path_zms.patch
new file mode 100644
index 000..54772a14769
--- /dev/null
+++ b/www-misc/zoneminder/files/zoneminder-1.30.4-path_zms.patch
@@ -0,0 +1,16 @@
+duplicate the work of utils/zmeditconfigdata.sh

[gentoo-commits] repo/gentoo:master commit in: www-misc/zoneminder/files/, www-misc/zoneminder/

2017-04-16 Thread Andreas Hüttel 
commit: f2e466918b4367d5d96582a2bba599383225308c
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Apr 16 19:25:24 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sun Apr 16 19:25:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2e46691

www-misc/zoneminder: Various fixes, work in progress

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 www-misc/zoneminder/files/10_zoneminder.conf-r1|  17 ++
 www-misc/zoneminder/files/README.gentoo|   6 +-
 .../files/zoneminder-1.30.2-diskspace.patch|  15 ++
 www-misc/zoneminder/zoneminder-1.30.2-r1.ebuild| 177 +
 4 files changed, 212 insertions(+), 3 deletions(-)

diff --git a/www-misc/zoneminder/files/10_zoneminder.conf-r1 
b/www-misc/zoneminder/files/10_zoneminder.conf-r1
new file mode 100644
index 000..441c793d189
--- /dev/null
+++ b/www-misc/zoneminder/files/10_zoneminder.conf-r1
@@ -0,0 +1,17 @@
+ScriptAlias /zm/cgi-bin/ "/usr/libexec/zoneminder/cgi-bin/"
+
+
+  AllowOverride All
+  Options ExecCGI
+  Order allow,deny
+  Allow from all
+ 
+
+Alias /zoneminder "%ZM_WEBDIR%"
+
+
+  Options -Indexes MultiViews FollowSymLinks
+  AllowOverride All
+  Order allow,deny
+  Allow from all
+ 

diff --git a/www-misc/zoneminder/files/README.gentoo 
b/www-misc/zoneminder/files/README.gentoo
index 2ada7c7d0a4..07995214d1c 100644
--- a/www-misc/zoneminder/files/README.gentoo
+++ b/www-misc/zoneminder/files/README.gentoo
@@ -14,14 +14,14 @@
for an example configuration snippet.
 
 4. Enable PHP in your webserver configuration,
-   enable short_open_tags in php.ini,
+   enable short_open_tags in php.ini (likely on by default now)
set the time zone in php.ini,
and restart/reload the webserver.
 
 5. Start the zoneminder daemon:
  /etc/init.d/zoneminder start
 
-6. Finally point your browser to http://your.webserver/zoneminder
+6. Finally point your browser to http://your.webserver/zm
 
 If you are upgrading, you will need to run the zmupdate.pl script:
-  /usr/bin/zmupdate.pl --version=oldversionnumber [--user=zmuser 
--pass=topsecretpassword]
+   /usr/bin/zmupdate.pl --version=oldversionnumber [--user=zmuser 
--pass=topsecretpassword]

diff --git a/www-misc/zoneminder/files/zoneminder-1.30.2-diskspace.patch 
b/www-misc/zoneminder/files/zoneminder-1.30.2-diskspace.patch
new file mode 100644
index 000..fee5b783c35
--- /dev/null
+++ b/www-misc/zoneminder/files/zoneminder-1.30.2-diskspace.patch
@@ -0,0 +1,15 @@
+https://forums.zoneminder.com/viewtopic.php?t=24534
+& personal message by simon@rustyspoon.co_m
+
+diff -ruN ZoneMinder-1.30.2.orig/web/includes/functions.php 
ZoneMinder-1.30.2/web/includes/functions.php
+--- ZoneMinder-1.30.2.orig/web/includes/functions.php  2017-03-30 
20:43:06.0 +0200
 ZoneMinder-1.30.2/web/includes/functions.php   2017-04-16 
21:13:43.841371345 +0200
+@@ -1442,7 +1442,7 @@
+   return( $load[0] );
+ }
+ 
+-function getDiskPercent($path = ZM_DIR_EVENTS) {
++function getDiskPercent($path = ZM_PATH_WEB.'/'.ZM_DIR_EVENTS) {
+   $total = disk_total_space($path);
+   if ( $total === false ) {
+ Error("disk_total_space returned false. Verify the web account user has 
access to " . $path );

diff --git a/www-misc/zoneminder/zoneminder-1.30.2-r1.ebuild 
b/www-misc/zoneminder/zoneminder-1.30.2-r1.ebuild
new file mode 100644
index 000..d37f30cc0bf
--- /dev/null
+++ b/www-misc/zoneminder/zoneminder-1.30.2-r1.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TO DO:
+# * dependencies of unknown status:
+#  dev-perl/Device-SerialPort
+#  dev-perl/MIME-Lite
+#  dev-perl/MIME-tools
+#  dev-perl/PHP-Serialization
+#  virtual/perl-Archive-Tar
+#  virtual/perl-libnet
+#  virtual/perl-Module-Load
+
+EAPI=6
+
+inherit versionator perl-functions readme.gentoo-r1 cmake-utils depend.apache 
flag-o-matic systemd
+
+MY_PN="ZoneMinder"
+
+MY_CRUD_VERSION="3.1.0"
+
+DESCRIPTION="Capture, analyse, record and monitor any cameras attached to your 
system"
+HOMEPAGE="http://www.zoneminder.com/;
+SRC_URI="
+   https://github.com/${MY_PN}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+   
https://github.com/FriendsOfCake/crud/archive/v${MY_CRUD_VERSION}.tar.gz -> 
Crud-${MY_CRUD_VERSION}.tar.gz
+"
+
+LICENSE="GPL-2"
+KEYWORDS=""
+IUSE="curl ffmpeg gcrypt gnutls +mmap +ssl libressl vlc"
+SLOT="0"
+
+REQUIRED_USE="
+   || ( ssl gnutls )
+"
+
+DEPEND="
+   app-eselect/eselect-php[apache2]
+   dev-lang/perl:=
+   dev-lang/php:*[apache2,cgi,curl,gd,inifile,pdo,mysql,mysqli,sockets]
+   dev-libs/libpcre
+   dev-perl/Archive-Zip
+   dev-perl/Class-Std-Fast
+   dev-perl/Data-Dump
+   dev-perl/Date-Manip
+   dev-perl/Data-UUID
+   dev-perl/DBD-mysql
+   dev-perl/DBI
+   dev-perl/IO-Socket-Multicast
+   dev-perl/SOAP-WSDL
+   dev-perl/Sys-CPU
+

[gentoo-commits] repo/gentoo:master commit in: www-misc/zoneminder/files/, www-misc/zoneminder/

2016-12-10 Thread Andreas Hüttel 
commit: 468dde31d7865052011e4e0bff49b21407f6f1b3
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Dec 10 20:42:58 2016 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sat Dec 10 20:43:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=468dde31

www-misc/zoneminder: Version bump, fixing bug 546842, bug 564278, and bug 574006

In addition a lot of QA cleanup and an EAPI bump has been done.

Thanks to
* Russell Knighton  annunaki2k2.co.uk>
* Jason Oliveira  medicalcannab.is>
* Aaron Burnett  gmail.com>
for their contributions.

Package-Manager: portage-2.3.2

 www-misc/zoneminder/Manifest   |   2 +
 .../zoneminder-1.28.1-mysql_include_path.patch |  20 +++
 www-misc/zoneminder/files/zoneminder.service   |  11 ++
 www-misc/zoneminder/zoneminder-1.30.0.ebuild   | 173 +
 4 files changed, 206 insertions(+)

diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
index 23834a1..8f92963 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -1,2 +1,4 @@
+DIST Crud-3.0.10.tar.gz 72960 SHA256 
462d05e21d17cc6b11cdc441971d1a7f07688512b5f7903217a574c6c39efd91 SHA512 
2f60557f2c783bb448e06c1ca40b536a1d7d5f3caf0626fa6716a28f808492d4799e238f16c022571be96921105b074b6763920fd7b9cc77b76d17ceadae2040
 WHIRLPOOL 
6c8d78dd30e8373a2b014fe4f6d17a4e2ec1051a6dc09d8b0759c6cd76ae78cb633e2c1eaab125aa29e66903de201337da979b3e412e8861a2431588251d817b
 DIST zoneminder-1.28.0.tar.gz 2804199 SHA256 
b9ee65635753e094dcad6cdb480acc42bff8b8f023ee008790883a4308273ca2 SHA512 
ac2a036adac436d76db8bb0b161d063111cc7cc7f6bcb9ca1b46862cfb0285b291926df716df645c0be47b7465bbbf3b1050c85529ff5068bdcc34f1c8ba6df1
 WHIRLPOOL 
012a088ab6411cf7a1ec1e0c4d9c9f1e61889c3729ea736baafb5174a20f61a82c280b7c5bfd669e031b3e1844abe1de0a577e73f82295b080d88b4ae43b627b
 DIST zoneminder-1.28.1.tar.gz 3864811 SHA256 
e55fa6ce1fd6c27912cd1de67fca3f80fad579f330020a384dc82838704d11ba SHA512 
0ae29870e12b7ad0852510a17439df49dd35245aa1486a5d0ff71e17dbf89840d08c65b4485c93739f1fbcc253599162e28e0382c28927aa84cd734248587ea1
 WHIRLPOOL 
62a52810437c0360fb83eb6f8210d6f089448bc6b9cf7b46e6ad8db7f952c3e3ba9832f2e25be65a476655991e3dd7ae70ed83198c7a4563cff68283e7f06226
+DIST zoneminder-1.30.0.tar.gz 9757409 SHA256 
e7c964c339305f42a044ca8e34fa4e6a33c452fdaf33642458735daf8b864325 SHA512 
cbff14447a568648a0475e878be5cd19cb694c65814fe33c20774752410e31f3f4ff9e5695667d4d50634b3193dc50aaca2d950efc151bbb968d3f9609d35db4
 WHIRLPOOL 
af901055bb1ac9ae668fae23f80aff20632d6ee785e0fe5ab6f71f86fe6e1a8ca2e4dae919c1754ac84025f7bc614cc9cea7470209b2a7a35d3b27746eb9a46b

diff --git 
a/www-misc/zoneminder/files/zoneminder-1.28.1-mysql_include_path.patch 
b/www-misc/zoneminder/files/zoneminder-1.28.1-mysql_include_path.patch
new file mode 100644
index ..cb64552
--- /dev/null
+++ b/www-misc/zoneminder/files/zoneminder-1.28.1-mysql_include_path.patch
@@ -0,0 +1,20 @@
+--- a/CMakeLists.txt   2015-10-27 17:28:48.059203421 +
 b/CMakeLists.txt   2015-10-27 17:30:11.951226715 +
+@@ -255,7 +255,16 @@
+ if(MYSQLCLIENT_LIBRARIES)
+   set(HAVE_LIBMYSQLCLIENT 1)
+   list(APPEND ZM_BIN_LIBS "${MYSQLCLIENT_LIBRARIES}")
+-  find_path(MYSQLCLIENT_INCLUDE_DIR mysql/mysql.h)
++  find_file(MYSQL_CONFIG mysql_config)
++  if(MYSQL_CONFIG)
++  execute_process(COMMAND ${MYSQL_CONFIG}
++  --variable=pkgincludedir OUTPUT_VARIABLE
++  MYSQLCLIENT_INCLUDE_DIR)
++  STRING(REGEX REPLACE "\n" "" MYSQLCLIENT_INCLUDE_DIR
++  ${MYSQLCLIENT_INCLUDE_DIR})
++  else()
++  find_path(MYSQLCLIENT_INCLUDE_DIR mysql/mysql.h)
++  endif()
+   if(MYSQLCLIENT_INCLUDE_DIR)
+   include_directories("${MYSQLCLIENT_INCLUDE_DIR}")
+   set(CMAKE_REQUIRED_INCLUDES "${MYSQLCLIENT_INCLUDE_DIR}")

diff --git a/www-misc/zoneminder/files/zoneminder.service 
b/www-misc/zoneminder/files/zoneminder.service
new file mode 100644
index ..9ef5bc6
--- /dev/null
+++ b/www-misc/zoneminder/files/zoneminder.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Video Security and Survellance System
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/zmpkg.pl start
+ExecReload=/usr/bin/zmpkg.pl reload
+PIDFile=/run/zm/zm.pid
+
+[Install]
+WantedBy=multi-user.target

diff --git a/www-misc/zoneminder/zoneminder-1.30.0.ebuild 
b/www-misc/zoneminder/zoneminder-1.30.0.ebuild
new file mode 100644
index ..60f3915
--- /dev/null
+++ b/www-misc/zoneminder/zoneminder-1.30.0.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TO DO:
+# * dependencies of unknown status:
+#  dev-perl/Device-SerialPort
+#  dev-perl/MIME-Lite
+#  dev-perl/MIME-tools
+#  dev-perl/PHP-Serialization
+#  virtual/perl-Archive-Tar
+#  virtual/perl-libnet
+#  virtual/perl-Module-Load
+

[gentoo-commits] repo/gentoo:master commit in: www-misc/zoneminder/files/, www-misc/zoneminder/

2016-11-28 Thread Andreas Hüttel 
commit: 8367217841b68e3d2ea01aaef9d41cd8e7850f31
Author: Andreas K. Huettel  gentoo  org>
AuthorDate: Mon Nov 28 16:21:35 2016 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Mon Nov 28 16:28:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83672178

www-misc/zoneminder: Remove old

Package-Manager: portage-2.3.2

 www-misc/zoneminder/Manifest   |   1 -
 ...eminder-1.24.2-db_upgrade_script_location.patch |  11 --
 www-misc/zoneminder/zoneminder-1.27.0.ebuild   | 131 -
 3 files changed, 143 deletions(-)

diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
index f62a219..23834a1 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -1,3 +1,2 @@
-DIST zoneminder-1.27.0.tar.gz 1262653 SHA256 
2f31c10e6c5930aedfa9f08edfa074ef1b168e5bdffb77a147d4e631bfb03ef2 SHA512 
8a349558399381a9062365ddc8bd8f815e3800929914096b2e4ea63e4d6dd12054f7b849fab5bea4bcfc87ea60739479a55734c7075a74aab0622d35f1d2bb14
 WHIRLPOOL 
869811e289e11343ff0cd0bd078a477db3511ed3cc96574d71163e1ab9eaf703e26f7c526841164a41f8d1e1aae47eb7f198831999b0c39f2729199fe81f43c0
 DIST zoneminder-1.28.0.tar.gz 2804199 SHA256 
b9ee65635753e094dcad6cdb480acc42bff8b8f023ee008790883a4308273ca2 SHA512 
ac2a036adac436d76db8bb0b161d063111cc7cc7f6bcb9ca1b46862cfb0285b291926df716df645c0be47b7465bbbf3b1050c85529ff5068bdcc34f1c8ba6df1
 WHIRLPOOL 
012a088ab6411cf7a1ec1e0c4d9c9f1e61889c3729ea736baafb5174a20f61a82c280b7c5bfd669e031b3e1844abe1de0a577e73f82295b080d88b4ae43b627b
 DIST zoneminder-1.28.1.tar.gz 3864811 SHA256 
e55fa6ce1fd6c27912cd1de67fca3f80fad579f330020a384dc82838704d11ba SHA512 
0ae29870e12b7ad0852510a17439df49dd35245aa1486a5d0ff71e17dbf89840d08c65b4485c93739f1fbcc253599162e28e0382c28927aa84cd734248587ea1
 WHIRLPOOL 
62a52810437c0360fb83eb6f8210d6f089448bc6b9cf7b46e6ad8db7f952c3e3ba9832f2e25be65a476655991e3dd7ae70ed83198c7a4563cff68283e7f06226

diff --git 
a/www-misc/zoneminder/files/zoneminder-1.24.2-db_upgrade_script_location.patch 
b/www-misc/zoneminder/files/zoneminder-1.24.2-db_upgrade_script_location.patch
deleted file mode 100644
index 41b537c..
--- 
a/www-misc/zoneminder/files/zoneminder-1.24.2-db_upgrade_script_location.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 ZoneMinder-1.24.1/zm.conf.in.orig  2009-03-23 13:55:43.0 +
-+++ ZoneMinder-1.24.1/zm.conf.in   2009-03-23 13:57:22.0 +
-@@ -13,7 +13,7 @@
- ZM_VERSION=@VERSION@
- 
- # Path to build directory, used mostly for finding DB upgrade scripts
--ZM_PATH_BUILD=@PATH_BUILD@
-+ZM_PATH_BUILD=/usr/share/zoneminder
- 
- # Build time, used to record when to trigger various checks
- ZM_TIME_BUILD=@TIME_BUILD@

diff --git a/www-misc/zoneminder/zoneminder-1.27.0.ebuild 
b/www-misc/zoneminder/zoneminder-1.27.0.ebuild
deleted file mode 100644
index 52ebe8f..
--- a/www-misc/zoneminder/zoneminder-1.27.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# TO DO:
-# * ffmpeg support can be disabled in CMakeLists.txt but it does not build then
-#  $(cmake-utils_useno ffmpeg ZM_NO_FFMPEG)
-# * dependencies of unknown status:
-#  dev-perl/Archive-Zip
-#  dev-perl/Device-SerialPort
-#  dev-perl/MIME-Lite
-#  dev-perl/MIME-tools
-#  dev-perl/PHP-Serialization
-#  virtual/perl-Archive-Tar
-#  virtual/perl-libnet
-#  virtual/perl-Module-Load
-
-EAPI=5
-
-PERL_EXPORT_PHASE_FUNCTIONS=no
-
-inherit perl-module readme.gentoo eutils base cmake-utils depend.apache 
multilib flag-o-matic
-
-MY_PN="ZoneMinder"
-
-DESCRIPTION="ZoneMinder allows you to capture, analyse, record and monitor any 
cameras attached to your system"
-HOMEPAGE="http://www.zoneminder.com/;
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64"
-IUSE="curl gcrypt gnutls +mmap +openssl vlc"
-SLOT="0"
-
-REQUIRED_USE="
-   || ( openssl gnutls )
-"
-
-DEPEND="
-   dev-lang/perl:=
-   dev-libs/libpcre
-   dev-perl/Date-Manip
-   dev-perl/DBD-mysql
-   dev-perl/DBI
-   dev-perl/libwww-perl
-   sys-libs/zlib
-   virtual/ffmpeg
-   virtual/httpd-php
-   virtual/jpeg
-   virtual/mysql
-   virtual/perl-ExtUtils-MakeMaker
-   virtual/perl-Getopt-Long
-   virtual/perl-Sys-Syslog
-   virtual/perl-Time-HiRes
-   curl? ( net-misc/curl )
-   gcrypt? ( dev-libs/libgcrypt )
-   gnutls? ( net-libs/gnutls )
-   mmap? ( dev-perl/Sys-Mmap )
-   openssl? ( dev-libs/openssl )
-   vlc? ( media-video/vlc )
-"
-RDEPEND="${DEPEND}"
-
-# we cannot use need_httpd_cgi here, since we need to setup permissions for the
-# webserver in global scope (/etc/zm.conf etc), so we hardcode apache here.
-need_apache
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-PATCHES=(
-   "${FILESDIR}/${PN}-1.26.5"-automagic.patch
-)
-