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

[Joonas Niilola]

commit:     c66a9574205fcefe13c0b13a778af774f2703a0b
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue May  5 07:17:24 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue May  5 07:24:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c66a9574

www-misc/zoneminder: remove package

Closes: https://bugs.gentoo.org/642952
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 profiles/package.mask                              |   6 -
 www-misc/zoneminder/Manifest                       |   2 -
 www-misc/zoneminder/files/10_zoneminder.conf       |  16 --
 www-misc/zoneminder/files/README.gentoo            |  27 ----
 www-misc/zoneminder/files/conf.d                   |   6 -
 www-misc/zoneminder/files/init.d                   |  25 ---
 .../files/zoneminder-1.30.2-diskspace.patch        |  15 --
 .../zoneminder/files/zoneminder-1.30.4-gcc7.patch  |  28 ----
 .../files/zoneminder-1.30.4-glibc226.patch         |  24 ---
 .../files/zoneminder-1.30.4-path_zms.patch         |  16 --
 www-misc/zoneminder/files/zoneminder.service       |  11 --
 www-misc/zoneminder/metadata.xml                   |  13 --
 www-misc/zoneminder/zoneminder-1.30.4-r2.ebuild    | 178 ---------------------
 13 files changed, 367 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 8573974ee13..7e341e8262e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -705,12 +705,6 @@ dev-tcltk/tcl-mccp
 # Masked for testing
 >=dev-libs/libressl-3.1.0
 
-# Joonas Niilola <juippis@g.o> (2020-04-05)
-# Not maintained in Gentoo, doesn't build for 2 years, has only
-# deprecated version present in Gentoo. Has a huge number of open
-# bugs. Removal in 30 days. #642952
-www-misc/zoneminder
-
 # Michał Górny <mgorny@g.o> (2020-04-04)
 # Package that used to provide test data for dev-python/cryptography.
 # The modern versions fetch it via SRC_URI and the last version

diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
deleted file mode 100644
index 186187f5099..00000000000
--- a/www-misc/zoneminder/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST Crud-3.1.0.tar.gz 72993 BLAKE2B d11938a0a667f6747bbe3609e51ccc5665b8d243e1787a5779319c679f1f20301afd6b0a14c5489976b9f66f57b5f18ef3ae0ee5a24e1368702cb43a5d564dd5 SHA512 7ec84afaa336b1bd582b7f39724f77081bdb3008947c4124ad96e4bc7755a03fbe31e01666d4d1939ebe17b342db37bf3766a42d88fbed0e99706807ff5b9d01
-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
deleted file mode 100644
index eb9961d1322..00000000000
--- a/www-misc/zoneminder/files/10_zoneminder.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-ScriptAlias /zm/cgi-bin "/usr/libexec/zoneminder/cgi-bin/"
-
-<Directory "/usr/libexec/zoneminder/cgi-bin">
-  AllowOverride All
-  Options +ExecCGI
-  Require all granted
-</Directory>
-
-Alias /zm "%ZM_WEBDIR%"
-
-<Directory "%ZM_WEBDIR%">
-  Options -Indexes +MultiViews +FollowSymLinks
-  AllowOverride All
-  Require all granted
-</Directory>
-

diff --git a/www-misc/zoneminder/files/README.gentoo b/www-misc/zoneminder/files/README.gentoo
deleted file mode 100644
index 8713fda6f78..00000000000
--- a/www-misc/zoneminder/files/README.gentoo
+++ /dev/null
@@ -1,27 +0,0 @@
-1. If this is a new installation, you will need to create a MySQL
-   database for zoneminder to use
-   (see https://wiki.gentoo.org/wiki/MySQL/Startup_Guide).
-   E.g., when logged into mysql as root,
-     mysql> CREATE DATABASE \`zm\`;
-     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:
-     mysql -p < /usr/share/zoneminder/db/zm_create.sql
-
-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.
-
-4. Enable PHP in your webserver configuration,
-   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/zm
-
-If you are upgrading, you will need to run the zmupdate.pl script: 
-   /usr/bin/zmupdate.pl

diff --git a/www-misc/zoneminder/files/conf.d b/www-misc/zoneminder/files/conf.d
deleted file mode 100644
index d2e03363867..00000000000
--- a/www-misc/zoneminder/files/conf.d
+++ /dev/null
@@ -1,6 +0,0 @@
-ZM_SCRIPT=/usr/bin/zmpkg.pl
-
-# Commands for starting and stopping the server
-
-CMD_START="${ZM_SCRIPT} start"
-CMD_STOP="${ZM_SCRIPT} stop"

diff --git a/www-misc/zoneminder/files/init.d b/www-misc/zoneminder/files/init.d
deleted file mode 100644
index 6ee8a160155..00000000000
--- a/www-misc/zoneminder/files/init.d
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need mysql
-	need apache2
-}
-
-start_pre() {
-	checkpath -d -m 0775 -o apache:apache /var/run/zm
-	checkpath -d -m 0775 -o apache:apache /var/tmp/zm
-}
-
-start() {
-	ebegin "Starting zoneminder"
-	${CMD_START}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping zoneminder"
-	${CMD_STOP}
-	eend $?
-}

diff --git a/www-misc/zoneminder/files/zoneminder-1.30.2-diskspace.patch b/www-misc/zoneminder/files/zoneminder-1.30.2-diskspace.patch
deleted file mode 100644
index fee5b783c35..00000000000
--- a/www-misc/zoneminder/files/zoneminder-1.30.2-diskspace.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://forums.zoneminder.com/viewtopic.php?t=24534
-& personal message by simon@××××××××××.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.000000000 +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/files/zoneminder-1.30.4-gcc7.patch b/www-misc/zoneminder/files/zoneminder-1.30.4-gcc7.patch
deleted file mode 100644
index b022fbe35e1..00000000000
--- a/www-misc/zoneminder/files/zoneminder-1.30.4-gcc7.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 97380f009b0e6a8bb6ee4ecbf0436045342cdf1e Mon Sep 17 00:00:00 2001
-From: abishai <abi@××××××.ru>
-Date: Tue, 31 Jan 2017 10:42:57 +0300
-Subject: [PATCH] implement platform-agnostic comparison without abs()
-
----
- src/zm_image.cpp | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/src/zm_image.cpp b/src/zm_image.cpp
-index 9c8c12fda..80a821376 100644
---- a/src/zm_image.cpp
-+++ b/src/zm_image.cpp
-@@ -1658,11 +1658,9 @@ Image *Image::Highlight( unsigned int n_images, Image *images[], const Rgb thres
-       {
-         uint8_t *psrc = images[j]->buffer+c;
- 
--#ifndef SOLARIS
--        if ( (unsigned)abs((*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
-+	    unsigned int diff = ((*psrc)-RGB_VAL(ref_colour,c)) > 0 ? (*psrc)-RGB_VAL(ref_colour,c) : RGB_VAL(ref_colour,c) - (*psrc);
-+
-+	    if (diff >= RGB_VAL(threshold,c))
-         {
-           count++;
-         }

diff --git a/www-misc/zoneminder/files/zoneminder-1.30.4-glibc226.patch b/www-misc/zoneminder/files/zoneminder-1.30.4-glibc226.patch
deleted file mode 100644
index 34afe0cb3b6..00000000000
--- a/www-misc/zoneminder/files/zoneminder-1.30.4-glibc226.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 417421b1d869d1b71c8ec1a1e3b082fcede6ce58 Mon Sep 17 00:00:00 2001
-From: Andrew Bauer <zonexpertconsulting@×××××××.com>
-Date: Tue, 13 Jun 2017 14:39:12 -0500
-Subject: [PATCH] move include <sys/uio.h> outside defined(BSD) block (#1919)
-
----
- src/zm_comms.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/zm_comms.h b/src/zm_comms.h
-index cf108c1ea..ae5fd5b08 100644
---- a/src/zm_comms.h
-+++ b/src/zm_comms.h
-@@ -30,9 +30,9 @@
- 
- #include <set>
- #include <vector>
-+#include <sys/uio.h>
- 
- #if defined(BSD)
--#include <sys/uio.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #endif

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
deleted file mode 100644
index 54772a14769..00000000000
--- a/www-misc/zoneminder/files/zoneminder-1.30.4-path_zms.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-duplicate the work of utils/zmeditconfigdata.sh
-https://github.com/ZoneMinder/ZoneMinder/commit/5a59a0375dd19f8e5af9b2acadec9f2bb16ee56c
-
-diff -ruN ZoneMinder-1.30.4.orig/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in ZoneMinder-1.30.4/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
---- ZoneMinder-1.30.4.orig/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in   2017-08-30 14:55:31.894727925 +0100
-+++ ZoneMinder-1.30.4/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in        2017-08-30 14:57:05.050731752 +0100
-@@ -507,7 +507,7 @@
-   },
-   {
-     name        => "ZM_PATH_ZMS",
--    default     => "/cgi-bin/nph-zms",
-+    default     => "/zm/cgi-bin/nph-zms",
-     description => "Web path to zms streaming server",
-     help        => qqq("
-       The ZoneMinder streaming server is required to send streamed
-

diff --git a/www-misc/zoneminder/files/zoneminder.service b/www-misc/zoneminder/files/zoneminder.service
deleted file mode 100644
index 9ef5bc6ee55..00000000000
--- a/www-misc/zoneminder/files/zoneminder.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[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/metadata.xml b/www-misc/zoneminder/metadata.xml
deleted file mode 100644
index c59068288ec..00000000000
--- a/www-misc/zoneminder/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<use>
-		<flag name="curl">Enable using net-misc/curl for streaming from cameras</flag>
-		<flag name="gcrypt">...</flag>
-		<flag name="vlc">Enable using media-libs/vlc for streaming from cameras</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">ZoneMinder/ZoneMinder</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/www-misc/zoneminder/zoneminder-1.30.4-r2.ebuild b/www-misc/zoneminder/zoneminder-1.30.4-r2.ebuild
deleted file mode 100644
index b376f103bc8..00000000000
--- a/www-misc/zoneminder/zoneminder-1.30.4-r2.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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 eapi7-ver 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="~amd64"
-IUSE="curl ffmpeg gcrypt gnutls +mmap +ssl libressl vlc"
-SLOT="0"
-
-REQUIRED_USE="
-	|| ( ssl gnutls )
-"
-
-DEPEND="
-	app-eselect/eselect-php[apache2]
-	dev-db/mysql-connector-c:0=
-	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
-	dev-perl/Sys-MemInfo
-	dev-perl/URI-Encode
-	dev-perl/libwww-perl
-	dev-php/pecl-apcu:*
-	sys-auth/polkit
-	sys-libs/zlib
-	media-video/ffmpeg
-	virtual/httpd-php:*
-	virtual/jpeg:0
-	virtual/perl-ExtUtils-MakeMaker
-	virtual/perl-Getopt-Long
-	virtual/perl-Sys-Syslog
-	virtual/perl-Time-HiRes
-	www-servers/apache
-	curl? ( net-misc/curl )
-	gcrypt? ( dev-libs/libgcrypt:0= )
-	gnutls? ( net-libs/gnutls )
-	mmap? ( dev-perl/Sys-Mmap )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	vlc? ( media-video/vlc[live] )
-"
-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
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.30.2"-diskspace.patch
-	"${FILESDIR}/${PN}-1.30.4"-path_zms.patch
-	"${FILESDIR}/${PN}-1.30.4"-glibc226.patch
-	"${FILESDIR}/${PN}-1.30.4"-gcc7.patch
-)
-
-MY_ZM_WEBDIR=/usr/share/zoneminder/www
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	rmdir "${S}/web/api/app/Plugin/Crud" || die
-	mv "${WORKDIR}/crud-${MY_CRUD_VERSION}" "${S}/web/api/app/Plugin/Crud" || die
-}
-
-src_configure() {
-	append-cxxflags -D__STDC_CONSTANT_MACROS
-	perl_set_version
-	export TZ=UTC # bug 630470
-	mycmakeargs=(
-		-DZM_PERL_SUBPREFIX=${VENDOR_LIB#/usr}
-		-DZM_TMPDIR=/var/tmp/zm
-		-DZM_SOCKDIR=/var/run/zm
-		-DZM_WEB_USER=apache
-		-DZM_WEB_GROUP=apache
-		-DZM_WEBDIR=${MY_ZM_WEBDIR}
-		-DZM_NO_MMAP="$(usex mmap OFF ON)"
-		-DZM_NO_X10=OFF
-		-DZM_NO_FFMPEG="$(usex ffmpeg OFF ON)"
-		-DZM_NO_CURL="$(usex curl OFF ON)"
-		-DZM_NO_LIBVLC="$(usex vlc OFF ON)"
-		-DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL="$(usex ssl OFF ON)"
-		-DHAVE_GNUTLS="$(usex gnutls ON OFF)"
-		-DHAVE_GCRYPT="$(usex gcrypt ON OFF)"
-	)
-
-	cmake-utils_src_configure
-
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# the log directory
-	keepdir /var/log/zm
-	fowners apache:apache /var/log/zm
-
-	# the logrotate script
-	insinto /etc/logrotate.d
-	newins distros/ubuntu1204/zoneminder.logrotate zoneminder
-
-	# now we duplicate the work of zmlinkcontent.sh
-	keepdir /var/lib/zoneminder /var/lib/zoneminder/images /var/lib/zoneminder/events /var/lib/zoneminder/api_tmp
-	fperms -R 0775 /var/lib/zoneminder
-	fowners -R apache:apache /var/lib/zoneminder
-	dosym /var/lib/zoneminder/images ${MY_ZM_WEBDIR}/images
-	dosym /var/lib/zoneminder/events ${MY_ZM_WEBDIR}/events
-	dosym /var/lib/zoneminder/api_tmp ${MY_ZM_WEBDIR}/api/app/tmp
-
-	# bug 523058
-	keepdir ${MY_ZM_WEBDIR}/temp
-	fowners -R apache:apache ${MY_ZM_WEBDIR}/temp
-
-	# the configuration file
-	fperms 0640 /etc/zm.conf
-	fowners root:apache /etc/zm.conf
-
-	# init scripts etc
-	newinitd "${FILESDIR}"/init.d zoneminder
-	newconfd "${FILESDIR}"/conf.d zoneminder
-
-	# systemd unit file
-	systemd_dounit "${FILESDIR}"/zoneminder.service
-
-	cp "${FILESDIR}"/10_zoneminder.conf "${T}"/10_zoneminder.conf || die
-	sed -i "${T}"/10_zoneminder.conf -e "s:%ZM_WEBDIR%:${MY_ZM_WEBDIR}:g" || die
-
-	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README.md TODO "${T}"/10_zoneminder.conf
-
-	perl_delete_packlist
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test ${PV} -gt ${v}; then
-			elog "You have upgraded zoneminder and may have to upgrade your database now using the 'zmupdate.pl' script."
-		fi
-	done
-}