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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] dev/dilfridge:master commit in: www-misc/zoneminder/files/, www-misc/zoneminder/
@ 2013-12-17 23:38 Andreas Hüttel
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Hüttel @ 2013-12-17 23:38 UTC (permalink / raw
  To: gentoo-commits

commit:     1dfc9a183863d98ec3568c72769048709667482c
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 17 23:38:42 2013 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Dec 17 23:38:42 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=1dfc9a18

[www-misc/zoneminder] add unreviewed ebuild from bug 494560 - this still needs LOTS of cleanup

---
 www-misc/zoneminder/Manifest                 |  38 +--------
 www-misc/zoneminder/files/init.d             |   4 +
 www-misc/zoneminder/zoneminder-1.26.5.ebuild | 121 +++++++++++++++++++++++++++
 3 files changed, 127 insertions(+), 36 deletions(-)

diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
index 444f220..3480b11 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -1,36 +1,2 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX 1.24.2/Makefile.am.patch 899 RMD160 2ffe9cbb75d433353769759d55580be9d0d8ccd8 SHA1 84024eb973f86e28d0fefa40c9a233f90c52a262 SHA256 301f23e57099c6841601017aed5a834a2ffc5e95a4b2f7e273272d4b11344ac3
-AUX 1.24.2/db_upgrade_script_location.patch 412 RMD160 368052be3fc8f32276cd59a146fd99a3b23b05f8 SHA1 a7a04bb212c0ca6ec693ca821d4c5de56b3e65c9 SHA256 3ffaa44c013dd27c3e5e937de77158c60b4cd37f28e1fc42dd7283f80075b067
-AUX 1.24.2/zm_build_fix.patch 407 RMD160 ac45177bb3f06dd0fd9cd1f938b90ba2297d07d2 SHA1 d7c6978c9fc71baf3c86b2405959fbe3da5eec99 SHA256 51f1effb3551bc8f9fbfe9e516db5f318091965f83dbf9e9772e6c7a02d2e640
-AUX 1.24.2/zm_create.sql.in.patch 16846 RMD160 c1b3b4ad6c5e70f4497f60a840a358a886125849 SHA1 7299c116be6f4a9cd97e55eb75c87d686a43d41c SHA256 edd4476e34c2b3b0e533809bce36827d8c84482cf25a9fca167453174866016f
-AUX 1.24.2/zm_jpeg.patch 2661 RMD160 e4d95b98a46a0b77874862a4afaa937e4c2814ef SHA1 58852307e7ed7df47660d2795199e91fa13319c7 SHA256 e8ac509821d9b0629c8cccb31ce25908b2b0bb7831aa7d710440b0551ad5ef3a
-AUX 1.24.2/zm_remote_camera_http.patch 1566 RMD160 644a681789d0ecf424156cde4b4ea8f6c5065197 SHA1 74dbe274d129997826b9a775c672c28286b60e3f SHA256 f554f2bcc7977e5ac151bd87aa2b8a0b7a9eeb9099839afe0d8b2b60a37ce04e
-AUX 1.25.0/Makefile.am.2.patch 1573 RMD160 e4102ea7addfb6194c3e0ea6eb72e7bb41cd455c SHA1 52fc3ee71cb4fd45fed11605840680421b4234f5 SHA256 b860455e1162982b6a186fded5bd565a75762fb79b806fefae56310a55a90943
-AUX 1.25.0/Makefile.am.patch 1428 RMD160 84602cce700964f208a4048074787a5d25ace3e5 SHA1 e777de35b9190d5b01c6b1991b35368a891943bc SHA256 ca42c55acc95c28053a7f9498efe216a40041b8dd0f330de812c7aafdb2c62c8
-AUX 10_zoneminder.conf 462 RMD160 d032813c63f4676e06658da3668c50f88886efab SHA1 9c834372d5bab84fe3e368be94bd951c2122ed7a SHA256 96306fd39bcffeaf15db4309b8f5f08e54a2409029f92d4a84b6f3e42f05434f
-AUX conf.d 138 RMD160 e7c71690bac83c1bee63c6b602b15910d3a8967c SHA1 719a2cb400a0a107accb28be3bd17f6269d41f76 SHA256 65e935cb63bf3d072b9317842944d808550ef3f933d834bb95aaacf3253bd85c
-AUX init.d 398 RMD160 d124ef1c1e6f5b0a9e4535d96620e46de71457c4 SHA1 5afc09eb838d9ebb28e9e91ffa0f482830862396 SHA256 b5dd459ddd0a331f625b5fa0b9441b9236f676ad2e6f6ea2da896ed4056cb0c6
-DIST ZoneMinder-1.25.0.tar.gz 1119091 RMD160 32a4f503770103e55bfe592864c1cab82e7395a6 SHA1 a93a976a5cd82f1e197f4d7bd626d3f0387c4231 SHA256 ec63ef47d8f4cb8af21a3bc84ff1de6968805146682dd7f10982bde975d9bb5d
-EBUILD zoneminder-1.25.0.ebuild 3938 RMD160 48e3438dc3957f515d2b3eee122e4cb7d1187f87 SHA1 470f3326d44d3d882a4bafa3829d9c6b916a9655 SHA256 5af20660770319dfbd5ff3dc75319b34e8ab67932d33424a00937f81e0537e99
-MISC ChangeLog 8699 RMD160 724d8c4577b846e3f00ac12f87954d1ba9b8e486 SHA1 081045739edb85cdd41360c2dd70f21580288aa0 SHA256 940765521bc7f47cee23b82f4c2d4dee79789aabfb56e3b572189873ad0d44df
-MISC metadata.xml 262 RMD160 24e1a7cfcbca1e2f41e8c062c448d9150f6320b8 SHA1 951224aa9eb92e898209936836a18e844ae1f169 SHA256 7e8dde52c550f9cfc6d74b78c19f6900a8cc241f2bf136610a4fc3b0aa95f3f5
-MISC todo.txt 54 RMD160 299f967aceee631738eb7f98065cc6b9800d8a4e SHA1 decfd0d06576f2f7960c31ae9fd44266f15e520f SHA256 c0d390b686d5e36c490c54f9eda41edc9328311b3b41eaaa29091ea48dd0cae5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJOdlYZAAoJENwGBM22xffeurQP/2rmLNUhU5dzgsvVooX1beNY
-sU+oN33IXeGFWMmi7SfFUdyqfVIPDJHYSgyoFAAm6RGKqPj7p216fXOlNlZimkcJ
-azz0NKtHZGlLYJ5nVkgHkJAEpG+Z9qmNzgdoZn7B5o/zOesM7uIjwq1R+1frBrfz
-jWD9WWYGlT09VcKCSepgjBUHsgZCaRDgRKyRU6SRAYg3blY6Q8D0z6too+0Kdofu
-/mpjBCo9yUMRN7zYHhA3UDaIipbichoWXnSppAk0cyqjBaNoFpcFTjb1vFzD+mFT
-iD4vJ5kB9bYxXG9XJL7YV5pz+ACrSmWB4rig0mzW6QzbHDMoGLdqtuGeGhl9bu2c
-lU/c7zIQecQHstbTQunxQ+xeCxNnf883DA/AKVi9vs6Qa/7L2iYB1tYRM/6ZJHjZ
-Fm++bFdhcBysSOZ+BZLvpIdHRNjBAxyKX0FKHvvwq6ygS9qP/lSQfjJSP6r/c4jT
-gTkz8N1FeSDufUsn0ylC9oNEi3I9wGHgDFz2Mx+HJ+x6Gu4G8Ox9dhp70VoY+0eo
-QC+11U+k65yc4gluT4t9cQFGRkuSePDiYWCjsE68Pj3VlWSHxBDdttd4sd+jiRI6
-BawSCt0IIV0dGN0fVw44CrwjINO1TIzlRsY9qBwK1wH/raih6GwZIn+MEVCtknrf
-NtDmV36nHrdBnHCKsSQD
-=AvU6
------END PGP SIGNATURE-----
+DIST ZoneMinder-1.25.0.tar.gz 1119091 SHA256 ec63ef47d8f4cb8af21a3bc84ff1de6968805146682dd7f10982bde975d9bb5d
+DIST v1.26.5.tar.gz 1107153 SHA256 a10acfea5066bd2fbcdcb40f2ddfa81a00f1eaf9123b6090aca69d3318281eec SHA512 0cd63d9271f8a8284597db41f52d8ba764bd3644c54be50a03c8b72695347104266ed14e1a399949d986af370a15885aceec833980f4cdc4f7b953ee74d44cce WHIRLPOOL b1510c873d7a9262276a08392ca5e598563183946db7e2acf270067e29b9241c4d1ae39ee63bd2998948b76448311af7adf8d0e51c546345f130a9f191e5aac3

diff --git a/www-misc/zoneminder/files/init.d b/www-misc/zoneminder/files/init.d
index 5fba3dd..ffb8667 100644
--- a/www-misc/zoneminder/files/init.d
+++ b/www-misc/zoneminder/files/init.d
@@ -7,6 +7,10 @@ depend() {
 	use mysql
 }
 
+start_pre() {
+	checkpath -d -m 0775 -o apache:apache /var/run/zm
+}
+
 start() {
 	ebegin "Starting zoneminder"
 	${CMD_START}

diff --git a/www-misc/zoneminder/zoneminder-1.26.5.ebuild b/www-misc/zoneminder/zoneminder-1.26.5.ebuild
new file mode 100644
index 0000000..e2787a4
--- /dev/null
+++ b/www-misc/zoneminder/zoneminder-1.26.5.ebuild
@@ -0,0 +1,121 @@
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils base cmake-utils depend.php 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"
+
+LICENSE="GPL-2"
+KEYWORDS=""
+IUSE="gcrypt gnutls no-ffmpeg no-mmap no-x10 openssl pcre zlib"
+SLOT="0"
+
+DEPEND="
+	zlib? ( sys-libs/zlib )
+	virtual/jpeg
+	openssl? ( dev-libs/openssl )
+	dev-lang/perl
+	pcre? ( dev-libs/libpcre )
+	virtual/mysql
+	gcrypt? ( dev-libs/libgcrypt )
+	gnutls? ( net-libs/gnutls )
+	!no-ffmpeg? ( virtual/ffmpeg )
+	virtual/perl-Sys-Syslog
+	dev-perl/DBI
+	dev-perl/DBD-mysql
+	virtual/perl-Getopt-Long
+	virtual/perl-Time-HiRes
+	dev-perl/DateManip
+	dev-perl/libwww-perl
+	virtual/perl-ExtUtils-MakeMaker
+	!no-mmap? ( dev-perl/Sys-Mmap )
+"
+S=${WORKDIR}/${MY_PN}-${PV}
+CMAKE_IN_SOURCE_BUILD="ON"
+
+need_apache
+need_php_httpd
+
+pkg_setup() {
+	require_php_with_use mysql sockets apache2
+}
+
+src_configure() {
+	append-cxxflags -D__STDC_CONSTANT_MACROS
+
+	mycmakeargs="
+		-DZM_WEBDIR=/var/www/zoneminder/htdocs
+		-DZM_CGIDIR=/var/www/zoneminder/cgi-bin
+		-DZM_WEB_USER=apache
+		-DZM_WEB_GROUP=apache
+	"
+	if use no-mmap; then
+		mycmakeargs="${mycmakeargs} -DZM_NO_MMAP=ON"
+	fi
+	if use no-x10; then
+		mycmakeargs="${mycmakeargs} -DZM_NO_X10=ON"
+	fi
+	if use no-ffmpeg; then
+		mycmakeargs="${mycmakeargs} -DZM_NO_FFMPEG=ON"
+	fi
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	einfo "${PN} does not parallel build... using forcing make -j1..."
+	cmake-utils_src_make
+}
+
+src_install() {
+	keepdir /var/log/zm
+
+	cmake-utils_src_install
+
+	fperms 0640 /etc/zm.conf
+
+	fowners apache:apache /var/log/zm
+
+	newinitd "${FILESDIR}"/init.d zoneminder
+	newconfd "${FILESDIR}"/conf.d zoneminder
+
+	dodoc AUTHORS BUGS COPYING ChangeLog INSTALL LICENSE NEWS README.md 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 /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 " cd /usr/share/${PN}"
+	elog " mysql -u  -p  < db/zm_create.sql"
+	elog ""
+	elog "1.  Set your database settings in /etc/zm.conf"
+	elog ""
+	elog "2.  Enable PHP in your webserver configuration, enable short_open_tags in php.ini,"
+	elog "    set the time zone in php.ini, and restart/reload the webserver"
+	elog ""
+	elog "3.  Start the ${PN} daemon:"
+	elog "  /etc/init.d/${PN} start"
+	elog ""
+	elog "4. Finally point your browser to http://localhost/${PN}"
+	elog ""
+	elog "If you are upgrading, you will need to run the zmupdate.pl script:"
+	elog " /usr/bin/zmupdate.pl version= [--user= --pass=]"
+	elog ""
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] dev/dilfridge:master commit in: www-misc/zoneminder/files/, www-misc/zoneminder/
@ 2013-12-25 18:18 Andreas Hüttel
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Hüttel @ 2013-12-25 18:18 UTC (permalink / raw
  To: gentoo-commits

commit:     350948771b8f21cc8af9dd0e42b4953791b75d61
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 25 18:20:11 2013 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Dec 25 18:20:11 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=35094877

[www-misc/zoneminder] lots more fixes

Package-Manager: portage-2.2.7

---
 www-misc/zoneminder/files/init.d                   |  1 +
 .../files/zoneminder-1.26.5-automagic.patch        | 34 ++++++++++
 www-misc/zoneminder/zoneminder-1.26.5.ebuild       | 74 ++++++++++++----------
 3 files changed, 75 insertions(+), 34 deletions(-)

diff --git a/www-misc/zoneminder/files/init.d b/www-misc/zoneminder/files/init.d
index ffb8667..00c5045 100644
--- a/www-misc/zoneminder/files/init.d
+++ b/www-misc/zoneminder/files/init.d
@@ -9,6 +9,7 @@ depend() {
 
 start_pre() {
 	checkpath -d -m 0775 -o apache:apache /var/run/zm
+	checkpath -d -m 0775 -o apache:apache /var/tmp/zm
 }
 
 start() {

diff --git a/www-misc/zoneminder/files/zoneminder-1.26.5-automagic.patch b/www-misc/zoneminder/files/zoneminder-1.26.5-automagic.patch
new file mode 100644
index 0000000..266bd64
--- /dev/null
+++ b/www-misc/zoneminder/files/zoneminder-1.26.5-automagic.patch
@@ -0,0 +1,34 @@
+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/zoneminder-1.26.5.ebuild b/www-misc/zoneminder/zoneminder-1.26.5.ebuild
index a6693fd..0f507d9 100644
--- a/www-misc/zoneminder/zoneminder-1.26.5.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.26.5.ebuild
@@ -3,7 +3,18 @@
 # $Header: $
 
 # TO DO:
-# permissions on /tmp/zm, or use alternate directory
+# * 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:
+# 	app-admin/sudo
+# 	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
 
@@ -17,7 +28,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 KEYWORDS=""
-IUSE="gcrypt gnutls +openssl debug ffmpeg mmap vlc"
+IUSE="gcrypt gnutls mmap +openssl vlc"
 SLOT="0"
 
 REQUIRED_USE="
@@ -25,40 +36,28 @@ REQUIRED_USE="
 "
 
 DEPEND="
-	virtual/perl-Sys-Syslog
-	dev-perl/DBI
-	dev-perl/DBD-mysql
-	virtual/perl-Getopt-Long
-	virtual/perl-Time-HiRes
-	dev-perl/DateManip
-	dev-perl/libwww-perl
-	virtual/perl-ExtUtils-MakeMaker
-	virtual/mysql
 	dev-lang/perl
 	dev-libs/libpcre
+	dev-perl/DateManip
+	dev-perl/DBD-mysql
+	dev-perl/DBI
+	dev-perl/libwww-perl
 	sys-libs/zlib
+	virtual/ffmpeg
 	virtual/jpeg
+	virtual/mysql
+	virtual/perl-ExtUtils-MakeMaker
+	virtual/perl-Getopt-Long
+	virtual/perl-Sys-Syslog
+	virtual/perl-Time-HiRes
 	gcrypt? ( dev-libs/libgcrypt )
 	gnutls? ( net-libs/gnutls )
-	openssl? ( dev-libs/openssl )
-	ffmpeg? ( virtual/ffmpeg )
 	mmap? ( dev-perl/Sys-Mmap )
+	openssl? ( dev-libs/openssl )
 	vlc? ( media-video/vlc )
 "
-
 RDEPEND="${DEPEND}"
 
-# dependencies of unknown status:
-# 	app-admin/sudo
-# 	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
-
 # 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
@@ -66,8 +65,9 @@ need_php_httpd
 
 S=${WORKDIR}/${MY_PN}-${PV}
 
-#PATCHES=(
-#)
+PATCHES=(
+	"${FILESDIR}/${PN}-1.26.5"-automagic.patch
+)
 
 pkg_setup() {
 	require_php_with_use mysql sockets apache2
@@ -80,12 +80,16 @@ src_configure() {
 		-DZM_WEBDIR=/var/www/zm/htdocs
 		-DZM_CGIDIR=/var/www/zm/cgi-bin
 		-DZM_CONTENTDIR=/var/lib/zm
+		-DZM_TMPDIR=/var/tmp/zm
 		-DZM_WEB_USER=apache
 		-DZM_WEB_GROUP=apache
 		$(cmake-utils_useno mmap ZM_NO_MMAP)
 		-DZM_NO_X10=OFF
-		$(cmake-utils_useno ffmpeg ZM_NO_FFMPEG)
+		-DZM_NO_FFMPEG=OFF
 		$(cmake-utils_useno vlc ZM_NO_VLC)
+		$(cmake-utils_useno openssl CMAKE_DISABLE_FIND_PACKAGE_OpenSSL)
+		$(cmake-utils_use_has gnutls)
+		$(cmake-utils_use_has gcrypt)
 	)
 
 	cmake-utils_src_configure
@@ -113,24 +117,26 @@ src_install() {
 	done
 
 	DOC_CONTENTS="
-0. If this is a new installation, you will need to create a MySQL\n
+1. If this is a new installation, you will need to create a MySQL\n
    database for ${PN} to use\n
    (see http://www.gentoo.org/doc/en/mysql-howto.xml).\n
    Once you completed that you should execute the following:\n
  cd /usr/share/${PN}\n
- mysql -u  -p  < db/zm_create.sql\n
+ mysql -u -p < db/zm_create.sql\n
+\n
+2.  Set your database settings in /etc/zm.conf\n
 \n
-1.  Set your database settings in /etc/zm.conf\n
+3. Check /etc/apache2/vhosts.d/10_zoneminder.conf\n
 \n
-2.  Enable PHP in your webserver configuration, \n
+4.  Enable PHP in your webserver configuration, \n
     enable short_open_tags in php.ini,\n
     set the time zone in php.ini, \n
     and restart/reload the webserver.\n
 \n
-3.  Start the ${PN} daemon:\n
+5.  Start the ${PN} daemon:\n
   /etc/init.d/${PN} start\n
 \n
-4. Finally point your browser to http://localhost/${PN}\n
+6. Finally point your browser to http://localhost/${PN}\n
 \n
 If you are upgrading, you will need to run the zmupdate.pl script:\n
  /usr/bin/zmupdate.pl version= [--user= --pass=]\n


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] dev/dilfridge:master commit in: www-misc/zoneminder/files/, www-misc/zoneminder/
@ 2013-12-25 21:24 Andreas Hüttel
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Hüttel @ 2013-12-25 21:24 UTC (permalink / raw
  To: gentoo-commits

commit:     7c77f35dc83592e650d3aaf32829aeb1e565a1b8
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 25 21:26:26 2013 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Dec 25 21:26:26 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=7c77f35d

[www-misc/zoneminder] fix path in apache conf, deps in init script, install instructions, permissions of zm.conf

Package-Manager: portage-2.2.7

---
 www-misc/zoneminder/files/10_zoneminder.conf | 10 +++++-----
 www-misc/zoneminder/files/init.d             |  3 ++-
 www-misc/zoneminder/zoneminder-1.26.5.ebuild | 10 +++++++---
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/www-misc/zoneminder/files/10_zoneminder.conf b/www-misc/zoneminder/files/10_zoneminder.conf
index 0ddb675..1190fad 100644
--- a/www-misc/zoneminder/files/10_zoneminder.conf
+++ b/www-misc/zoneminder/files/10_zoneminder.conf
@@ -1,16 +1,16 @@
-ScriptAlias /cgi-bin/zms "/var/www/zoneminder/cgi-bin/zms"
-ScriptAlias /cgi-bin/nph-zms "/var/www/zoneminder/cgi-bin/nph-zms"
+ScriptAlias /cgi-bin/zms "/var/www/zm/cgi-bin/zms"
+ScriptAlias /cgi-bin/nph-zms "/var/www/zm/cgi-bin/nph-zms"
 
-<Directory "/var/www/zoneminder/cgi-bin">
+<Directory "/var/www/zm/cgi-bin">
   AllowOverride All
   Options ExecCGI
   Order allow,deny
   Allow from all
 </Directory> 
 
-Alias /zoneminder "/var/www/zoneminder/htdocs"
+Alias /zoneminder "/var/www/zm/htdocs"
 
-<Directory "/var/www/zoneminder/htdocs">
+<Directory "/var/www/zm/htdocs">
   Options -Indexes MultiViews FollowSymLinks
   AllowOverride All
   Order allow,deny

diff --git a/www-misc/zoneminder/files/init.d b/www-misc/zoneminder/files/init.d
index 00c5045..30a9b13 100644
--- a/www-misc/zoneminder/files/init.d
+++ b/www-misc/zoneminder/files/init.d
@@ -4,7 +4,8 @@
 # $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/files/Attic/init.d,v 1.3 2009/01/01 16:47:24 gentoofan23 Exp $
 
 depend() {
-	use mysql
+	need mysql
+	need apache2
 }
 
 start_pre() {

diff --git a/www-misc/zoneminder/zoneminder-1.26.5.ebuild b/www-misc/zoneminder/zoneminder-1.26.5.ebuild
index 0f507d9..aae3093 100644
--- a/www-misc/zoneminder/zoneminder-1.26.5.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.26.5.ebuild
@@ -101,6 +101,7 @@ src_install() {
 	cmake-utils_src_install
 
 	fperms 0640 /etc/zm.conf
+	fowners root:apache /etc/zm.conf
 
 	fowners apache:apache /var/log/zm
 
@@ -119,10 +120,13 @@ src_install() {
 	DOC_CONTENTS="
 1. If this is a new installation, you will need to create a MySQL\n
    database for ${PN} to use\n
-   (see http://www.gentoo.org/doc/en/mysql-howto.xml).\n
+   (see https://wiki.gentoo.org/wiki/MySQL/Startup_Guide).\n
+   E.g., when logged into mysql as root,\n
+     mysql> CREATE DATABASE 'zm';\n
+     mysql> GRANT ALL ON zm.* TO 'zmuser'@'localhost' IDENTIFIED BY 'topsecretpassword';\n
    Once you completed that you should execute the following:\n
- cd /usr/share/${PN}\n
- mysql -u -p < db/zm_create.sql\n
+     cd /usr/share/${PN}\n
+     mysql -u zmuser -p < db/zm_create.sql\n
 \n
 2.  Set your database settings in /etc/zm.conf\n
 \n


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] dev/dilfridge:master commit in: www-misc/zoneminder/files/, www-misc/zoneminder/
@ 2014-04-25 10:11 Andreas Hüttel
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Hüttel @ 2014-04-25 10:11 UTC (permalink / raw
  To: gentoo-commits

commit:     07b388fddbfab0af99255f5d40d4043f2a3d6702
Author:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 25 10:10:19 2014 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Apr 25 10:10:19 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=07b388fd

[www-misc/zoneminder] fix perl location, extra README file

Package-Manager: portage-2.2.8-r1

---
 www-misc/zoneminder/files/README.gentoo      | 26 +++++++++++++++++++
 www-misc/zoneminder/zoneminder-1.26.5.ebuild | 37 ++++------------------------
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/www-misc/zoneminder/files/README.gentoo b/www-misc/zoneminder/files/README.gentoo
new file mode 100644
index 0000000..b942043
--- /dev/null
+++ b/www-misc/zoneminder/files/README.gentoo
@@ -0,0 +1,26 @@
+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 ALL ON zm.* TO 'zmuser'@'localhost' IDENTIFIED BY 'topsecretpassword';
+   Once you completed that you should execute the following:
+     cd /usr/share/zoneminder
+     mysql -u zmuser -p < db/zm_create.sql
+
+2. Set your database settings in /etc/zm.conf, including above topsecretpassword
+
+3. Check /etc/apache2/vhosts.d/10_zoneminder.conf
+
+4.  Enable PHP in your webserver configuration, 
+    enable short_open_tags in php.ini,
+    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://localhost/zoneminder
+
+If you are upgrading, you will need to run the zmupdate.pl script:
+      /usr/bin/zmupdate.pl --version=oldversionnumber [--user=zmuser --pass=topsecretpassword]

diff --git a/www-misc/zoneminder/zoneminder-1.26.5.ebuild b/www-misc/zoneminder/zoneminder-1.26.5.ebuild
index 7bd7ee3..df6b509 100644
--- a/www-misc/zoneminder/zoneminder-1.26.5.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.26.5.ebuild
@@ -21,7 +21,9 @@
 
 EAPI=5
 
-inherit readme.gentoo eutils base cmake-utils depend.php depend.apache multilib flag-o-matic
+PERL_EXPORT_PHASE_FUNCTIONS=no
+
+inherit perl-module readme.gentoo eutils base cmake-utils depend.php depend.apache multilib flag-o-matic
 
 MY_PN="ZoneMinder"
 
@@ -78,10 +80,10 @@ pkg_setup() {
 
 src_configure() {
 	append-cxxflags -D__STDC_CONSTANT_MACROS
-
-
+	perl_set_version
 
 	mycmakeargs=(
+		-DZM_PERL_SUBPREFIX=${VENDOR_LIB}
 		-DZM_TMPDIR=/var/tmp/zm
 		-DZM_WEB_USER=apache
 		-DZM_WEB_GROUP=apache
@@ -119,34 +121,5 @@ src_install() {
 #	    dodir /var/www/zoneminder/htdocs/${DIR}
 #	done
 
-	DOC_CONTENTS="
-1. If this is a new installation, you will need to create a MySQL\n
-   database for ${PN} to use\n
-   (see https://wiki.gentoo.org/wiki/MySQL/Startup_Guide).\n
-   E.g., when logged into mysql as root,\n
-     mysql> CREATE DATABASE \`zm\`;\n
-     mysql> GRANT ALL ON zm.* TO 'zmuser'@'localhost' IDENTIFIED BY 'topsecretpassword';\n
-   Once you completed that you should execute the following:\n
-     cd /usr/share/${PN}\n
-     mysql -u zmuser -p < db/zm_create.sql\n
-\n
-2.  Set your database settings in /etc/zm.conf, including above topsecretpassword\n
-\n
-3. Check /etc/apache2/vhosts.d/10_zoneminder.conf\n
-\n
-4.  Enable PHP in your webserver configuration, \n
-    enable short_open_tags in php.ini,\n
-    set the time zone in php.ini, \n
-    and restart/reload the webserver.\n
-\n
-5.  Start the ${PN} daemon:\n
-  /etc/init.d/${PN} start\n
-\n
-6. Finally point your browser to http://localhost/${PN}\n
-\n
-If you are upgrading, you will need to run the zmupdate.pl script:\n
- /usr/bin/zmupdate.pl version= [--user= --pass=]\n
-"
-
 	readme.gentoo_src_install
 }


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] dev/dilfridge:master commit in: www-misc/zoneminder/files/, www-misc/zoneminder/
@ 2014-04-25 12:43 Andreas Hüttel
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Hüttel @ 2014-04-25 12:43 UTC (permalink / raw
  To: gentoo-commits

commit:     a7e0313f68859c5327f0f94acc182b5cfbd4de92
Author:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 25 12:42:01 2014 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Apr 25 12:42:01 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=a7e0313f

[www-misc/zoneminder] fix apache integration, non-automatic so far

Package-Manager: portage-2.2.8-r1

---
 www-misc/zoneminder/files/10_zoneminder.conf | 10 ++++-----
 www-misc/zoneminder/files/README.gentoo      | 17 ++++++++-------
 www-misc/zoneminder/zoneminder-1.26.5.ebuild | 32 ++++++++++++++++------------
 3 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/www-misc/zoneminder/files/10_zoneminder.conf b/www-misc/zoneminder/files/10_zoneminder.conf
index 1190fad..277d680 100644
--- a/www-misc/zoneminder/files/10_zoneminder.conf
+++ b/www-misc/zoneminder/files/10_zoneminder.conf
@@ -1,16 +1,16 @@
-ScriptAlias /cgi-bin/zms "/var/www/zm/cgi-bin/zms"
-ScriptAlias /cgi-bin/nph-zms "/var/www/zm/cgi-bin/nph-zms"
+ScriptAlias /cgi-bin/zms "/usr/libexec/zoneminder/cgi-bin/zms"
+ScriptAlias /cgi-bin/nph-zms "/usr/libexec/zoneminder/cgi-bin/nph-zms"
 
-<Directory "/var/www/zm/cgi-bin">
+<Directory "/usr/libexec/zoneminder/cgi-bin">
   AllowOverride All
   Options ExecCGI
   Order allow,deny
   Allow from all
 </Directory> 
 
-Alias /zoneminder "/var/www/zm/htdocs"
+Alias /zoneminder "%ZM_WEBDIR%"
 
-<Directory "/var/www/zm/htdocs">
+<Directory "%ZM_WEBDIR%">
   Options -Indexes MultiViews FollowSymLinks
   AllowOverride All
   Order allow,deny

diff --git a/www-misc/zoneminder/files/README.gentoo b/www-misc/zoneminder/files/README.gentoo
index b942043..2ada7c7 100644
--- a/www-misc/zoneminder/files/README.gentoo
+++ b/www-misc/zoneminder/files/README.gentoo
@@ -10,17 +10,18 @@
 
 2. Set your database settings in /etc/zm.conf, including above topsecretpassword
 
-3. Check /etc/apache2/vhosts.d/10_zoneminder.conf
+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,
-    set the time zone in php.ini, 
-    and restart/reload the webserver.
+4. Enable PHP in your webserver configuration,
+   enable short_open_tags in php.ini,
+   set the time zone in php.ini,
+   and restart/reload the webserver.
 
-5.  Start the zoneminder daemon:
-      /etc/init.d/zoneminder start
+5. Start the zoneminder daemon:
+     /etc/init.d/zoneminder start
 
-6. Finally point your browser to http://localhost/zoneminder
+6. Finally point your browser to http://your.webserver/zoneminder
 
 If you are upgrading, you will need to run the zmupdate.pl script:
       /usr/bin/zmupdate.pl --version=oldversionnumber [--user=zmuser --pass=topsecretpassword]

diff --git a/www-misc/zoneminder/zoneminder-1.26.5.ebuild b/www-misc/zoneminder/zoneminder-1.26.5.ebuild
index df6b509..64670f0 100644
--- a/www-misc/zoneminder/zoneminder-1.26.5.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.26.5.ebuild
@@ -6,7 +6,6 @@
 # * 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:
-# 	app-admin/sudo
 # 	dev-perl/Archive-Zip
 # 	dev-perl/Device-SerialPort
 # 	dev-perl/MIME-Lite
@@ -15,9 +14,6 @@
 # 	virtual/perl-Archive-Tar
 # 	virtual/perl-libnet
 # 	virtual/perl-Module-Load
-# * apache integration
-# * installation of files into real webdir
-# * the perl modules go into weird places atm
 
 EAPI=5
 
@@ -74,6 +70,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.26.5"-automagic.patch
 )
 
+MY_ZM_WEBDIR=/usr/share/zoneminder/www
+
 pkg_setup() {
 	require_php_with_use mysql sockets apache2
 }
@@ -87,6 +85,7 @@ src_configure() {
 		-DZM_TMPDIR=/var/tmp/zm
 		-DZM_WEB_USER=apache
 		-DZM_WEB_GROUP=apache
+		-DZM_WEBDIR=${MY_ZM_WEBDIR}
 		$(cmake-utils_useno mmap ZM_NO_MMAP)
 		-DZM_NO_X10=OFF
 		-DZM_NO_FFMPEG=OFF
@@ -100,26 +99,31 @@ src_configure() {
 }
 
 src_install() {
+	cmake-utils_src_install
+
+	# the log directory
 	keepdir /var/log/zm
+	fowners apache:apache /var/log/zm
 
-	cmake-utils_src_install
+	# now we duplicate the work of zmlinkcontent.sh
+	dodir /var/lib/zoneminder /var/lib/zoneminder/images /var/lib/zoneminder/events
+	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
 
+	# the configuration file
 	fperms 0640 /etc/zm.conf
 	fowners root:apache /etc/zm.conf
 
-	fowners apache:apache /var/log/zm
-
+	# init scripts etc
 	newinitd "${FILESDIR}"/init.d zoneminder
 	newconfd "${FILESDIR}"/conf.d zoneminder
 
-	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README.md TODO
+	cp "${FILESDIR}"/10_zoneminder.conf "${T}"/10_zoneminder.conf
+	sed -i "${T}"/10_zoneminder.conf -e "s:%ZM_WEBDIR%:${MY_ZM_WEBDIR}:g"
 
-#	insinto /etc/apache2/vhosts.d
-#	doins "${FILESDIR}"/10_zoneminder.conf
-#
-#	for DIR in events images sound; do
-#	    dodir /var/www/zoneminder/htdocs/${DIR}
-#	done
+	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README.md TODO "${T}"/10_zoneminder.conf
 
 	readme.gentoo_src_install
 }


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] dev/dilfridge:master commit in: www-misc/zoneminder/files/, www-misc/zoneminder/
@ 2014-04-25 14:44 Andreas Hüttel
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Hüttel @ 2014-04-25 14:44 UTC (permalink / raw
  To: gentoo-commits

commit:     b291c30a99dee4e0810d87095afee1f84600dac9
Author:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 25 14:43:53 2014 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Apr 25 14:43:53 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=b291c30a

[www-misc/zoneminder] moved to main tree

---
 www-misc/zoneminder/Manifest                       |   2 -
 www-misc/zoneminder/files/10_zoneminder.conf       |  18 ---
 www-misc/zoneminder/files/README.gentoo            |  27 -----
 www-misc/zoneminder/files/conf.d                   |   6 -
 www-misc/zoneminder/files/init.d                   |  26 -----
 ...eminder-1.24.2-db_upgrade_script_location.patch |  11 --
 .../files/zoneminder-1.26.5-automagic.patch        |  34 ------
 www-misc/zoneminder/metadata.xml                   |  13 ---
 www-misc/zoneminder/zoneminder-1.26.5.ebuild       | 129 ---------------------
 www-misc/zoneminder/zoneminder-1.27.0.ebuild       | 129 ---------------------
 10 files changed, 395 deletions(-)

diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
deleted file mode 100644
index adad46c..0000000
--- a/www-misc/zoneminder/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST zoneminder-1.26.5.tar.gz 1107153 SHA256 a10acfea5066bd2fbcdcb40f2ddfa81a00f1eaf9123b6090aca69d3318281eec SHA512 0cd63d9271f8a8284597db41f52d8ba764bd3644c54be50a03c8b72695347104266ed14e1a399949d986af370a15885aceec833980f4cdc4f7b953ee74d44cce WHIRLPOOL b1510c873d7a9262276a08392ca5e598563183946db7e2acf270067e29b9241c4d1ae39ee63bd2998948b76448311af7adf8d0e51c546345f130a9f191e5aac3
-DIST zoneminder-1.27.0.tar.gz 1262653 SHA256 2f31c10e6c5930aedfa9f08edfa074ef1b168e5bdffb77a147d4e631bfb03ef2 SHA512 8a349558399381a9062365ddc8bd8f815e3800929914096b2e4ea63e4d6dd12054f7b849fab5bea4bcfc87ea60739479a55734c7075a74aab0622d35f1d2bb14 WHIRLPOOL 869811e289e11343ff0cd0bd078a477db3511ed3cc96574d71163e1ab9eaf703e26f7c526841164a41f8d1e1aae47eb7f198831999b0c39f2729199fe81f43c0

diff --git a/www-misc/zoneminder/files/10_zoneminder.conf b/www-misc/zoneminder/files/10_zoneminder.conf
deleted file mode 100644
index 277d680..0000000
--- a/www-misc/zoneminder/files/10_zoneminder.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-ScriptAlias /cgi-bin/zms "/usr/libexec/zoneminder/cgi-bin/zms"
-ScriptAlias /cgi-bin/nph-zms "/usr/libexec/zoneminder/cgi-bin/nph-zms"
-
-<Directory "/usr/libexec/zoneminder/cgi-bin">
-  AllowOverride All
-  Options ExecCGI
-  Order allow,deny
-  Allow from all
-</Directory> 
-
-Alias /zoneminder "%ZM_WEBDIR%"
-
-<Directory "%ZM_WEBDIR%">
-  Options -Indexes MultiViews FollowSymLinks
-  AllowOverride All
-  Order allow,deny
-  Allow from all
-</Directory> 

diff --git a/www-misc/zoneminder/files/README.gentoo b/www-misc/zoneminder/files/README.gentoo
deleted file mode 100644
index 2ada7c7..0000000
--- 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 ALL ON zm.* TO 'zmuser'@'localhost' IDENTIFIED BY 'topsecretpassword';
-   Once you completed that you should execute the following:
-     cd /usr/share/zoneminder
-     mysql -u zmuser -p < db/zm_create.sql
-
-2. Set your database settings in /etc/zm.conf, including above topsecretpassword
-
-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,
-   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
-
-If you are upgrading, you will need to run the zmupdate.pl script:
-      /usr/bin/zmupdate.pl --version=oldversionnumber [--user=zmuser --pass=topsecretpassword]

diff --git a/www-misc/zoneminder/files/conf.d b/www-misc/zoneminder/files/conf.d
deleted file mode 100644
index d2e0336..0000000
--- 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 30a9b13..0000000
--- a/www-misc/zoneminder/files/init.d
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/files/Attic/init.d,v 1.3 2009/01/01 16:47:24 gentoofan23 Exp $
-
-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.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..0000000
--- 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.000000000 +0000
-+++ ZoneMinder-1.24.1/zm.conf.in	2009-03-23 13:57:22.000000000 +0000
-@@ -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/files/zoneminder-1.26.5-automagic.patch b/www-misc/zoneminder/files/zoneminder-1.26.5-automagic.patch
deleted file mode 100644
index 266bd64..0000000
--- 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/metadata.xml b/www-misc/zoneminder/metadata.xml
deleted file mode 100644
index bd56d97..0000000
--- 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>
-		<email>dilfridge@gentoo.org</email>
-		<name>Andreas K. Huettel</name>
-	</maintainer>
-	<use>
-		<flag name="gcrypt">...</flag>
-		<flag name="vlc">...</flag>
-		<flag name="openssl">...</flag>
-	</use>
-</pkgmetadata>

diff --git a/www-misc/zoneminder/zoneminder-1.26.5.ebuild b/www-misc/zoneminder/zoneminder-1.26.5.ebuild
deleted file mode 100644
index 64670f0..0000000
--- a/www-misc/zoneminder/zoneminder-1.26.5.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# 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.php 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=""
-IUSE="gcrypt gnutls mmap +openssl vlc"
-SLOT="0"
-
-REQUIRED_USE="
-	|| ( openssl gnutls )
-"
-
-DEPEND="
-	dev-lang/perl:=
-	dev-libs/libpcre
-	dev-perl/DateManip
-	dev-perl/DBD-mysql
-	dev-perl/DBI
-	dev-perl/libwww-perl
-	sys-libs/zlib
-	virtual/ffmpeg
-	virtual/jpeg
-	virtual/mysql
-	virtual/perl-ExtUtils-MakeMaker
-	virtual/perl-Getopt-Long
-	virtual/perl-Sys-Syslog
-	virtual/perl-Time-HiRes
-	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
-need_php_httpd
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.26.5"-automagic.patch
-)
-
-MY_ZM_WEBDIR=/usr/share/zoneminder/www
-
-pkg_setup() {
-	require_php_with_use mysql sockets apache2
-}
-
-src_configure() {
-	append-cxxflags -D__STDC_CONSTANT_MACROS
-	perl_set_version
-
-	mycmakeargs=(
-		-DZM_PERL_SUBPREFIX=${VENDOR_LIB}
-		-DZM_TMPDIR=/var/tmp/zm
-		-DZM_WEB_USER=apache
-		-DZM_WEB_GROUP=apache
-		-DZM_WEBDIR=${MY_ZM_WEBDIR}
-		$(cmake-utils_useno mmap ZM_NO_MMAP)
-		-DZM_NO_X10=OFF
-		-DZM_NO_FFMPEG=OFF
-		$(cmake-utils_useno vlc ZM_NO_VLC)
-		$(cmake-utils_useno openssl CMAKE_DISABLE_FIND_PACKAGE_OpenSSL)
-		$(cmake-utils_use_has gnutls)
-		$(cmake-utils_use_has gcrypt)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# the log directory
-	keepdir /var/log/zm
-	fowners apache:apache /var/log/zm
-
-	# now we duplicate the work of zmlinkcontent.sh
-	dodir /var/lib/zoneminder /var/lib/zoneminder/images /var/lib/zoneminder/events
-	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
-
-	# 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
-
-	cp "${FILESDIR}"/10_zoneminder.conf "${T}"/10_zoneminder.conf
-	sed -i "${T}"/10_zoneminder.conf -e "s:%ZM_WEBDIR%:${MY_ZM_WEBDIR}:g"
-
-	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README.md TODO "${T}"/10_zoneminder.conf
-
-	readme.gentoo_src_install
-}

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 64670f0..0000000
--- a/www-misc/zoneminder/zoneminder-1.27.0.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# 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.php 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=""
-IUSE="gcrypt gnutls mmap +openssl vlc"
-SLOT="0"
-
-REQUIRED_USE="
-	|| ( openssl gnutls )
-"
-
-DEPEND="
-	dev-lang/perl:=
-	dev-libs/libpcre
-	dev-perl/DateManip
-	dev-perl/DBD-mysql
-	dev-perl/DBI
-	dev-perl/libwww-perl
-	sys-libs/zlib
-	virtual/ffmpeg
-	virtual/jpeg
-	virtual/mysql
-	virtual/perl-ExtUtils-MakeMaker
-	virtual/perl-Getopt-Long
-	virtual/perl-Sys-Syslog
-	virtual/perl-Time-HiRes
-	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
-need_php_httpd
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.26.5"-automagic.patch
-)
-
-MY_ZM_WEBDIR=/usr/share/zoneminder/www
-
-pkg_setup() {
-	require_php_with_use mysql sockets apache2
-}
-
-src_configure() {
-	append-cxxflags -D__STDC_CONSTANT_MACROS
-	perl_set_version
-
-	mycmakeargs=(
-		-DZM_PERL_SUBPREFIX=${VENDOR_LIB}
-		-DZM_TMPDIR=/var/tmp/zm
-		-DZM_WEB_USER=apache
-		-DZM_WEB_GROUP=apache
-		-DZM_WEBDIR=${MY_ZM_WEBDIR}
-		$(cmake-utils_useno mmap ZM_NO_MMAP)
-		-DZM_NO_X10=OFF
-		-DZM_NO_FFMPEG=OFF
-		$(cmake-utils_useno vlc ZM_NO_VLC)
-		$(cmake-utils_useno openssl CMAKE_DISABLE_FIND_PACKAGE_OpenSSL)
-		$(cmake-utils_use_has gnutls)
-		$(cmake-utils_use_has gcrypt)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# the log directory
-	keepdir /var/log/zm
-	fowners apache:apache /var/log/zm
-
-	# now we duplicate the work of zmlinkcontent.sh
-	dodir /var/lib/zoneminder /var/lib/zoneminder/images /var/lib/zoneminder/events
-	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
-
-	# 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
-
-	cp "${FILESDIR}"/10_zoneminder.conf "${T}"/10_zoneminder.conf
-	sed -i "${T}"/10_zoneminder.conf -e "s:%ZM_WEBDIR%:${MY_ZM_WEBDIR}:g"
-
-	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README.md TODO "${T}"/10_zoneminder.conf
-
-	readme.gentoo_src_install
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2014-04-25 14:44 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-25 10:11 [gentoo-commits] dev/dilfridge:master commit in: www-misc/zoneminder/files/, www-misc/zoneminder/ Andreas Hüttel
  -- strict thread matches above, loose matches on Subject: below --
2014-04-25 14:44 Andreas Hüttel
2014-04-25 12:43 Andreas Hüttel
2013-12-25 21:24 Andreas Hüttel
2013-12-25 18:18 Andreas Hüttel
2013-12-17 23:38 Andreas Hüttel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox