Version bump. Fix bug #155077, bug #157676.

(Portage version: 2.1.2_rc1-r5)
 (Signed Manifest commit)

3 files changed, 26 insertions, 103 deletions

diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
index 083a99d90c4b..9fe96cab001f 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX Makefile.am.patch 833 RMD160 599a72ad1f14a8ee8950c8646e67d2cf40b17002 SHA1 61c6156e3c640321565765a4e0034c0587f25ef8 SHA256 8a40bddee62cf52ad354e61258a98357c6b9246d9cd75cf8acd7132a02770aad
 MD5 1aecf82bff0009b04884bd618cb742ab files/Makefile.am.patch 833
 RMD160 599a72ad1f14a8ee8950c8646e67d2cf40b17002 files/Makefile.am.patch 833
@@ -18,19 +21,30 @@ AUX postupgrade.txt 463 RMD160 2ffe191845a0aad2ee2429708d3a55871a246997 SHA1 0b9
 MD5 cfa6cb66424994a2ace6b983a81a9eed files/postupgrade.txt 463
 RMD160 2ffe191845a0aad2ee2429708d3a55871a246997 files/postupgrade.txt 463
 SHA256 d25b259fe650ba385c6aa4b313a78d829a429d0ba0d15ee2d0acd14d3c4e39eb files/postupgrade.txt 463
-DIST ZoneMinder-1.22.2.tar.gz 1246851 RMD160 ec84f03e26573a4ab9965c5d365368b78cd9e333 SHA1 917b6734764a192fbdcd6733f46bddc6ef4e33ff SHA256 f8d0ee7e19eb17ff793cd0cc92629919233f1e52e07d5dbc73e02b7a611bd360
-EBUILD zoneminder-1.22.2.ebuild 2140 RMD160 b20fc94cac9d46d2de298a1bb77ae72ef1b8a10b SHA1 b5adec42ce722e84537bfc7123557e1e4ad1b055 SHA256 7973a55eacc5e620a99f39e1c13fb9ce0ea70ec5122fb8068c9e4a7807c71a68
-MD5 7732f4262c0c213cb836d1edc0b37c11 zoneminder-1.22.2.ebuild 2140
-RMD160 b20fc94cac9d46d2de298a1bb77ae72ef1b8a10b zoneminder-1.22.2.ebuild 2140
-SHA256 7973a55eacc5e620a99f39e1c13fb9ce0ea70ec5122fb8068c9e4a7807c71a68 zoneminder-1.22.2.ebuild 2140
-MISC ChangeLog 3587 RMD160 f5d2b624d3c3162efc54446caa7957f6906d9b87 SHA1 6e395b12369802e24600d6dc9c241c3a6376e0f5 SHA256 0f248d7edad834724401251d00b084a19dcd8e3b7c31942fddb882346e2c3210
-MD5 0123f408c74011572c37a5d7a9bd21b9 ChangeLog 3587
-RMD160 f5d2b624d3c3162efc54446caa7957f6906d9b87 ChangeLog 3587
-SHA256 0f248d7edad834724401251d00b084a19dcd8e3b7c31942fddb882346e2c3210 ChangeLog 3587
+AUX zm_create.sql.in.diff 18897 RMD160 bb7dea7b31d81e43da7307a7fe2420bd69c7e90e SHA1 c7e1dfe00ca5c94bf45bb4484aa5f094ae7fa62d SHA256 eaa9cfd549f4ff678b934d77a6e43922b028627416bb2a066b30630f93f6e76b
+MD5 546b6c2bcca5b19ad25dc7762348547a files/zm_create.sql.in.diff 18897
+RMD160 bb7dea7b31d81e43da7307a7fe2420bd69c7e90e files/zm_create.sql.in.diff 18897
+SHA256 eaa9cfd549f4ff678b934d77a6e43922b028627416bb2a066b30630f93f6e76b files/zm_create.sql.in.diff 18897
+DIST ZoneMinder-1.22.3.tar.gz 1258311 RMD160 0752e77333d3eb2f320bb692905eeec9ae7a311e SHA1 4e86dee31acc5f080c8a6f8ce29228b450067201 SHA256 6bee02be8d5e21d3435c17def157a87727330ee6480be3a8fa5b1966cc10a6bc
+EBUILD zoneminder-1.22.3.ebuild 2382 RMD160 e55f901472940ecb459a994244280ac4cc313565 SHA1 f60243e5fbed7a85d49efd747e4d156c41a9497c SHA256 dde59d8bdc42046acfb7d03b6bf46766ff6579f61b75592f33bb7f6a667b3814
+MD5 ef595b8f24ccdc5f454c3aca1f8a5960 zoneminder-1.22.3.ebuild 2382
+RMD160 e55f901472940ecb459a994244280ac4cc313565 zoneminder-1.22.3.ebuild 2382
+SHA256 dde59d8bdc42046acfb7d03b6bf46766ff6579f61b75592f33bb7f6a667b3814 zoneminder-1.22.3.ebuild 2382
+MISC ChangeLog 3800 RMD160 e7a40081de6912342431aa55e132595179682867 SHA1 eaff45af92508295134cac4f2503ade4f632c989 SHA256 6e3d70f7d84c1b52f1600ea56f99cd2da24850c0ee493e13403ab14e8bf3378a
+MD5 af3baaeb136697995ba7c56990fd6b4e ChangeLog 3800
+RMD160 e7a40081de6912342431aa55e132595179682867 ChangeLog 3800
+SHA256 6e3d70f7d84c1b52f1600ea56f99cd2da24850c0ee493e13403ab14e8bf3378a ChangeLog 3800
 MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b metadata.xml 161
 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 metadata.xml 161
-MD5 ef69908feb613e3ecb96f8bed2056645 files/digest-zoneminder-1.22.2 256
-RMD160 47f2521f4bcf82323179e87109e624ca2f15d479 files/digest-zoneminder-1.22.2 256
-SHA256 0d06e592aa18069445ec2176f379064c2d9ffb8f5c0e5944ff9cc35de84ca36d files/digest-zoneminder-1.22.2 256
+MD5 e2c036752a6417d9cbdf1e71c96cbf34 files/digest-zoneminder-1.22.3 256
+RMD160 5c7e662b9729ab86956cf6f89b46a95f5085a953 files/digest-zoneminder-1.22.3 256
+SHA256 7496c5e6c8d416931924cb490f539fb4eae1aaf0b72f7ddc4bbd20dffacec571 files/digest-zoneminder-1.22.3 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFfLvlEzitwsaoONoRAkprAKDZuHf2D9VylJGiS3K/BTI9iP9LxACfb8h2
+j3u4xORUjZBYOG6BNjkWQmg=
+=o1t7
+-----END PGP SIGNATURE-----
diff --git a/www-misc/zoneminder/files/digest-zoneminder-1.22.2 b/www-misc/zoneminder/files/digest-zoneminder-1.22.2
deleted file mode 100644
index 4bee10255c81..000000000000
--- a/www-misc/zoneminder/files/digest-zoneminder-1.22.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b38ad6ff8c71c589e04d32f8352d2b9c ZoneMinder-1.22.2.tar.gz 1246851
-RMD160 ec84f03e26573a4ab9965c5d365368b78cd9e333 ZoneMinder-1.22.2.tar.gz 1246851
-SHA256 f8d0ee7e19eb17ff793cd0cc92629919233f1e52e07d5dbc73e02b7a611bd360 ZoneMinder-1.22.2.tar.gz 1246851
diff --git a/www-misc/zoneminder/zoneminder-1.22.2.ebuild b/www-misc/zoneminder/zoneminder-1.22.2.ebuild
deleted file mode 100644
index cf0bd036a902..000000000000
--- a/www-misc/zoneminder/zoneminder-1.22.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/zoneminder-1.22.2.ebuild,v 1.3 2006/11/23 17:21:13 vivo Exp $
-
-inherit eutils webapp autotools depend.php
-
-WEBAPP_MANUAL_SLOT="yes"
-SLOT="0"
-MY_PV=${PV/_/-}
-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="http://www.zoneminder.com/downloads/${MY_PN}-${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-IUSE="mpeg mysql"
-
-DEPEND="mysql? ( virtual/mysql )
-	>=media-libs/jpeg-6b
-	>=net-www/apache-1.3.27-r3
-	>=dev-lang/perl-5.6.0
-	dev-perl/DBI
-	dev-perl/DBD-mysql
-	perl-core/Getopt-Long
-	perl-core/Time-HiRes
-	dev-perl/DateManip
-	dev-perl/libwww-perl
-	dev-perl/Device-SerialPort
-	perl-core/libnet
-	dev-perl/Archive-Tar
-	dev-perl/Archive-Zip
-	dev-perl/MIME-Lite
-	dev-perl/MIME-tools
-	|| ( perl-core/Sys-Syslog >=dev-lang/perl-5.8.8 )
-	dev-perl/X10
-"
-
-need_php
-
-RDEPEND="mpeg? ( media-video/ffmpeg )
-	media-libs/netpbm
-	dev-perl/DBD-mysql"
-
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/Makefile.am.patch
-}
-
-src_compile() {
-	eautoreconf
-
-	local MY_CONF="--with-mysql=/usr \
-		--with-webdir=${MY_HTDOCSDIR} \
-		--with-cgidir=${MY_CGIBINDIR} \
-		--with-webuser=apache \
-		--with-webgroup=apache"
-	use mpeg && MY_CONF="${MY_CONF} --with-ffmpeg=/usr"
-
-	econf ${MY_CONF} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodir /var/run/zm
-	emake -j1 DESTDIR=${D} install || die "emake install failed"
-	dodoc AUTHORS ChangeLog INSTALL NEWS README README.[prt]* TODO
-	dohtml README.html
-
-	dodir /usr/share/${PN}/db
-	cp db/zm_u* db/zm_create.sql ${D}/usr/share/${PN}/db
-
-	keepdir /var/log/${PN}
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-2.txt
-	webapp_postupgrade_txt en ${FILESDIR}/postupgrade.txt
-	webapp_src_install
-	fperms 0644 /etc/zm.conf
-	fowners apache:apache /var/log/${PN}
-
-	newinitd ${FILESDIR}/init.d zoneminder
-	newconfd ${FILESDIR}/conf.d zoneminder
-}