Adding zoneminder-1.23.3 to the tree (sec issue #219694, bugs #212150 and

#216678)
Package-Manager: portage-2.1.4.4

4 files changed, 167 insertions, 6 deletions

diff --git a/www-misc/zoneminder/ChangeLog b/www-misc/zoneminder/ChangeLog
index 12b53cd5788c..78f4fe008edc 100644
--- a/www-misc/zoneminder/ChangeLog
+++ b/www-misc/zoneminder/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-misc/zoneminder
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/ChangeLog,v 1.24 2008/02/23 14:39:39 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/ChangeLog,v 1.25 2008/05/06 10:00:23 wrobel Exp $
+
+*zoneminder-1.23.3 (06 May 2008)
+
+  06 May 2008; wrobel@gentoo.org +files/10_zoneminder.conf,
+  +zoneminder-1.23.3.ebuild:
+  Adding zoneminder-1.23.3 to the tree (sec issue #219694, bugs #212150 and
+  #216678)
 
 *zoneminder-1.23.1 (23 Feb 2008)
 
diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
index 02d9ea640763..f09006e5904b 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -5,6 +5,7 @@ AUX 1.23.1/Makefile.am.patch 899 RMD160 2ffe9cbb75d433353769759d55580be9d0d8ccd8
 AUX 1.23.1/zm_create.sql.in.patch 19013 RMD160 076dbeb30a4758e4ff708139e40302d6db7ac3f0 SHA1 cc8d2874e4eb382e081e84ff35491f23cb7ba2e1 SHA256 2f60f8f27e9d670859a8dfa5c30e45279a663a40227d9a259b11262e7f97b0d7
 AUX 1.23.1/zm_mpeg_ofc.patch 381 RMD160 cd7be2d702f4df9c425142fdaec393c1517dff1c SHA1 40f2639e8a90f068dae9d4ec1ecd64ab980c2d8d SHA256 1af8db1736a373ea38ff7ece376e37233c28aee3925b93fd72991979e71ba3eb
 AUX 1.23.1/zm_remote_camera.patch 1551 RMD160 03024108ba012b7e39620ed950b96df1c4ab63f3 SHA1 cfda28aa3a17c8dda9d5e7dc014dda6a81b5a0a1 SHA256 fdce259c8bbe18bde09c99c270e8615531f4340db98eb28461177b2b305ed097
+AUX 10_zoneminder.conf 462 RMD160 d032813c63f4676e06658da3668c50f88886efab SHA1 9c834372d5bab84fe3e368be94bd951c2122ed7a SHA256 96306fd39bcffeaf15db4309b8f5f08e54a2409029f92d4a84b6f3e42f05434f
 AUX Makefile.am.patch 833 RMD160 599a72ad1f14a8ee8950c8646e67d2cf40b17002 SHA1 61c6156e3c640321565765a4e0034c0587f25ef8 SHA256 8a40bddee62cf52ad354e61258a98357c6b9246d9cd75cf8acd7132a02770aad
 AUX conf.d 138 RMD160 e7c71690bac83c1bee63c6b602b15910d3a8967c SHA1 719a2cb400a0a107accb28be3bd17f6269d41f76 SHA256 65e935cb63bf3d072b9317842944d808550ef3f933d834bb95aaacf3253bd85c
 AUX ffmpeg.patch 314 RMD160 a44b49741362f26770fceea62b93a7fceecb0a6b SHA1 3b935d8530b61fabb5e0411f89911f346ae99161 SHA256 0b404f229edb18a120becf20506c7564d292669ee2478ec407f817c2cd3fc326
@@ -14,14 +15,16 @@ AUX postupgrade.txt 463 RMD160 2ffe191845a0aad2ee2429708d3a55871a246997 SHA1 0b9
 AUX zm_create.sql.in.diff 18897 RMD160 bb7dea7b31d81e43da7307a7fe2420bd69c7e90e SHA1 c7e1dfe00ca5c94bf45bb4484aa5f094ae7fa62d SHA256 eaa9cfd549f4ff678b934d77a6e43922b028627416bb2a066b30630f93f6e76b
 DIST ZoneMinder-1.22.3.tar.gz 1258311 RMD160 0752e77333d3eb2f320bb692905eeec9ae7a311e SHA1 4e86dee31acc5f080c8a6f8ce29228b450067201 SHA256 6bee02be8d5e21d3435c17def157a87727330ee6480be3a8fa5b1966cc10a6bc
 DIST ZoneMinder-1.23.1.tar.gz 744316 RMD160 20f6ce258d1e8054aada57baecdfeb948593ee09 SHA1 29d15d32e76e68fd07de465daaa27fb540084799 SHA256 185ca8aa2e809af8ac55f055c7e58b619a0eb37bd463a8693b76f7a40a439bf8
+DIST ZoneMinder-1.23.3.tar.gz 764528 RMD160 cf04dcd61891a5b8b1a30d738a8b1274ecefad70 SHA1 aaca4fb26b2f09d57b1901f49c538d7e46963254 SHA256 76cba999bf602b1d561921cfcbbf7a9eab64370f349a0b389efff75f4b0c3af2
 EBUILD zoneminder-1.22.3.ebuild 2538 RMD160 0b34a0bdf59127f65a3693b7813e85dff495f143 SHA1 fcc1266de1f5ed711b3f25c639e6a31c38215ecd SHA256 4be442c4e1fa66172504f9ef5c29b3285ba2409208cb22a925c063d743f5391f
 EBUILD zoneminder-1.23.1.ebuild 2763 RMD160 2edea45d3a7451b2d2d1bd6215fa7024eec028bc SHA1 a3647c171fa51f6d79e5911834333e1a6f8ffb9d SHA256 999e453d4716b13e691538e328ffd9e4588bce3bedfdcf084e8dbbf889677c17
-MISC ChangeLog 4480 RMD160 8ef6d43456751f1b3dd7f0e12f0f4803615f06a8 SHA1 0d89d283a28a493561979a8c4daffee9ab8c473c SHA256 7030015f2138fb71f13f132a1522d92fdceca5edcf68930255786afa79a07eb8
+EBUILD zoneminder-1.23.3.ebuild 3520 RMD160 f788eae6c73f47a4db4f54429b00b6662277c8b1 SHA1 bfac77d638e5711d797076ee498e57c8bc6265a9 SHA256 4cbd97d7ff780604cf4a50af39b9fc073bf36ddd556ebfb43bce8aeb10d529df
+MISC ChangeLog 4691 RMD160 5631d01b6313f78820c16838f0e6d20654cbec1b SHA1 c5a2b80f2e69488fc5989c1c76a8ffc149a0acbb SHA256 3a7c277aeb96217ee1fa4a78d107eeb8be744a3d0852000f7e28b494170c5744
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkfAMD8ACgkQmPFBzbX68WFlLACfZPeCt2nua7Kzx71o7GG83/DI
-7FEAn3mhApGJ1twzrp49FugCS6OQG8O8
-=9RW7
+iD8DBQFIICxJEEcxCpcDQ74RAlMgAJ9jH1yq33jfr0LJQptpkL1jF6YDqACfVCO9
+L1aZhsMfV0F/8m1rIpVctIk=
+=+cGP
 -----END PGP SIGNATURE-----
diff --git a/www-misc/zoneminder/files/10_zoneminder.conf b/www-misc/zoneminder/files/10_zoneminder.conf
new file mode 100644
index 000000000000..0ddb6755877f
--- /dev/null
+++ b/www-misc/zoneminder/files/10_zoneminder.conf
@@ -0,0 +1,18 @@
+ScriptAlias /cgi-bin/zms "/var/www/zoneminder/cgi-bin/zms"
+ScriptAlias /cgi-bin/nph-zms "/var/www/zoneminder/cgi-bin/nph-zms"
+
+<Directory "/var/www/zoneminder/cgi-bin">
+  AllowOverride All
+  Options ExecCGI
+  Order allow,deny
+  Allow from all
+</Directory> 
+
+Alias /zoneminder "/var/www/zoneminder/htdocs"
+
+<Directory "/var/www/zoneminder/htdocs">
+  Options -Indexes MultiViews FollowSymLinks
+  AllowOverride All
+  Order allow,deny
+  Allow from all
+</Directory> 
diff --git a/www-misc/zoneminder/zoneminder-1.23.3.ebuild b/www-misc/zoneminder/zoneminder-1.23.3.ebuild
new file mode 100644
index 000000000000..36af2ca21924
--- /dev/null
+++ b/www-misc/zoneminder/zoneminder-1.23.3.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/zoneminder-1.23.3.ebuild,v 1.1 2008/05/06 10:00:23 wrobel Exp $
+
+inherit eutils autotools depend.php depend.apache multilib
+
+MY_PV=${PV/_/-}
+MY_PN="ZoneMinder"
+
+PATCH_PV="1.23.1"
+
+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="~amd64 ~x86"
+IUSE="debug ffmpeg X10"
+SLOT="0"
+
+DEPEND="app-admin/sudo
+	dev-libs/libpcre
+	>=media-libs/jpeg-6b
+	net-libs/gnutls
+	>=dev-lang/perl-5.6.0
+	dev-perl/Archive-Tar
+	dev-perl/Archive-Zip
+	dev-perl/DateManip
+	dev-perl/DBD-mysql
+	dev-perl/DBI
+	dev-perl/Device-SerialPort
+	dev-perl/libwww-perl
+	dev-perl/MIME-Lite
+	dev-perl/MIME-tools
+	dev-perl/PHP-Serialization
+	virtual/perl-Getopt-Long
+	virtual/perl-libnet
+	virtual/perl-Sys-Syslog
+	virtual/perl-Time-HiRes
+	X10? ( dev-perl/X10 )"
+
+RDEPEND="dev-perl/DBD-mysql
+	ffmpeg? ( media-video/ffmpeg )
+	media-libs/netpbm"
+
+# 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
+need_php_httpd
+
+S="${WORKDIR}"/${MY_PN}-${MY_PV}
+
+pkg_setup() {
+	require_php_with_use mysql
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PATCH_PV}/Makefile.am.patch
+	epatch "${FILESDIR}"/${PATCH_PV}/zm_create.sql.in.patch
+	epatch "${FILESDIR}"/${PATCH_PV}/zm_mpeg_ofc.patch
+	epatch "${FILESDIR}"/${PATCH_PV}/zm_remote_camera.patch
+
+	eautoreconf
+}
+
+src_compile() {
+	econf --with-libarch=$(get_libdir) \
+		--with-mysql=/usr \
+		$(use_with ffmpeg ffmpeg /usr) \
+		$(use_enable debug) \
+		$(use_enable debug crashtrace) \
+		--with-webdir="${ROOT}/var/www/zoneminder/htdocs" \
+		--with-cgidir="${ROOT}/var/www/zoneminder/cgi-bin" \
+		--with-webuser=apache \
+		--with-webgroup=apache \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+
+	keepdir /var/run/zm
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+
+	fperms 0644 /etc/zm.conf
+
+	keepdir /var/log/${PN}
+	fowners apache:apache /var/log/${PN}
+	fowners apache:apache /var/run/zm
+
+	newinitd "${FILESDIR}"/init.d zoneminder
+	newconfd "${FILESDIR}"/conf.d zoneminder
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+
+	insinto /usr/share/${PN}/db
+	doins db/zm_u* db/zm_create.sql
+
+	insinto /etc/apache2/vhosts.d
+	doins "${FILESDIR}"/10_zoneminder.conf
+
+	for DIR in events images sound; do
+		dodir "${ROOT}"/var/www/zoneminder/htdocs/${DIR}
+	done
+
+}
+
+pkg_postinst() {
+	elog ""
+	elog "0. If this is a new installation, you will need to create a MySQL database"
+	elog "   for ${PN} to use. (see http://www.gentoo.org/doc/en/mysql-howto.xml)."
+	elog "   Once you completed that you should execute the following:"
+	elog ""
+	elog " cd /usr/share/${PN}"
+	elog " mysql -u <my_database_user> -p<my_database_pass> <my_zoneminder_db> < db/zm_create.sql"
+	elog ""
+	elog "1.  Set your database settings in /etc/zm.conf"
+	elog ""
+	elog "2.  Start the ${PN} daemon:"
+	elog ""
+	elog "  /etc/init.d/${PN} start"
+	elog ""
+	elog "3. Finally point your browser to http://localhos/${PN}"
+	elog ""
+	elog ""
+	elog "If you are upgrading, you will need to run the zmupdate.pl script:"
+	elog ""
+	elog " /usr/bin/zmupdate.pl version=<from version> [--user=<my_database_user> --pass=<my_database_pass>]"
+	elog ""
+}