Gentoo Archives: gentoo-commits

From: "Andreas Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/dilfridge:master commit in: www-misc/zoneminder/files/, www-misc/zoneminder/, ...
Date: Thu, 01 Sep 2011 20:59:20
Message-Id: 4388d41275985371c317803339184b5edd33833c.dilfridge@gentoo
1 commit: 4388d41275985371c317803339184b5edd33833c
2 Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
3 AuthorDate: Thu Sep 1 20:08:36 2011 +0000
4 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 1 20:58:55 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=4388d412
7
8 [www-misc/zoneminder] Copied from CVS attic
9
10 (Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
11
12 ---
13 www-misc/zoneminder/ChangeLog | 202 ++++++++++++++++++++
14 www-misc/zoneminder/Manifest | 33 ++++
15 www-misc/zoneminder/files/1.24.2/Makefile.am.patch | 15 ++
16 .../files/1.24.2/db_upgrade_script_location.patch | 11 +
17 .../zoneminder/files/1.24.2/zm_build_fix.patch | 11 +
18 .../zoneminder/files/1.24.2/zm_create.sql.in.patch | 28 +++
19 www-misc/zoneminder/files/1.24.2/zm_jpeg.patch | 59 ++++++
20 .../files/1.24.2/zm_remote_camera_http.patch | 55 ++++++
21 www-misc/zoneminder/files/10_zoneminder.conf | 18 ++
22 www-misc/zoneminder/files/conf.d | 6 +
23 www-misc/zoneminder/files/init.d | 20 ++
24 www-misc/zoneminder/metadata.xml | 9 +
25 www-misc/zoneminder/zoneminder-1.24.2.ebuild | 150 +++++++++++++++
26 13 files changed, 617 insertions(+), 0 deletions(-)
27
28 diff --git a/www-misc/zoneminder/ChangeLog b/www-misc/zoneminder/ChangeLog
29 new file mode 100644
30 index 0000000..bdedef9
31 --- /dev/null
32 +++ b/www-misc/zoneminder/ChangeLog
33 @@ -0,0 +1,202 @@
34 +# ChangeLog for www-misc/zoneminder
35 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
36 +# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/Attic/ChangeLog,v 1.41 2011/04/04 12:11:35 scarabeus Exp $
37 +
38 +---------------------------------------------------------------------------
39 +Copied from CVS attic to dilfridge overlay
40 +---------------------------------------------------------------------------
41 +
42 + 04 Apr 2011; Tomáš Chvátal <scarabeus@g.o>
43 + zoneminder-1.24.2.ebuild:
44 + Move to virtual/ffmpeg from media-video/ffmpeg.
45 +
46 + 27 Feb 2011; Samuli Suominen <ssuominen@g.o> zoneminder-1.23.3.ebuild,
47 + zoneminder-1.24.2.ebuild:
48 + Use virtual/jpeg wrt #356747 by "LuVar".
49 +
50 + 02 Jun 2010; Alex Alexander <wired@g.o>
51 + +files/1.24.2/zm_build_fix.patch, zoneminder-1.24.2.ebuild:
52 + fixed 1.24.2 build error
53 +
54 + 22 Feb 2010; Samuli Suominen <ssuominen@g.o>
55 + +files/1.24.2/zm_jpeg.patch, zoneminder-1.24.2.ebuild:
56 + Fix building with jpeg-8 (previous declaration of jpeg_mem_src and
57 + jpeg_mem_dest) wrt #305201, thanks to Alex. P. Burlutsky for patch.
58 +
59 + 16 Sep 2009; Thomas Anderson <tanderson@g.o> metadata.xml:
60 + Fix email address.
61 +
62 +*zoneminder-1.24.2 (03 Aug 2009)
63 +
64 + 03 Aug 2009; Thomas Anderson <tanderson@g.o>
65 + +files/1.24.2/Makefile.am.patch, +zoneminder-1.24.2.ebuild,
66 + +files/1.24.2/db_upgrade_script_location.patch,
67 + +files/1.24.2/zm_create.sql.in.patch,
68 + +files/1.24.2/zm_remote_camera_http.patch:
69 + Add www-misc/zoneminder-1.24.2; fixes bug #262019 and security bug
70 + #236517.
71 +
72 + 16 Jul 2009; Torsten Veller <tove@g.o> zoneminder-1.23.3.ebuild,
73 + metadata.xml:
74 + dev-perl/X10 was removed
75 +
76 + 08 Feb 2009; Thomas Anderson <tanderson@g.o>
77 + zoneminder-1.23.3.ebuild:
78 + Fix empty directory installation.
79 +
80 + 08 Feb 2009; Thomas Anderson <tanderson@g.o>
81 + zoneminder-1.23.3.ebuild:
82 + Fix ROOT abuse, bug 258116
83 +
84 + 26 Jan 2009; Peter Volkov <pva@g.o> zoneminder-1.23.3.ebuild:
85 + Fixed perllocal.pod collision, bug #252862. Thank rinus for the report and fix.
86 +
87 + 01 Jan 2009; Thomas Anderson <tanderson@g.o> files/init.d,
88 + metadata.xml:
89 + Update init.d script to use mysql, add myself as a maintainer
90 +
91 + 28 Dec 2008; Gunnar Wrobel <wrobel@g.o> zoneminder-1.23.3.ebuild:
92 + fixed #250715.
93 +
94 + 18 Nov 2008; Torsten Veller <tove@g.o> zoneminder-1.23.3.ebuild:
95 + New virtuals: Archive-Tar
96 +
97 + 16 Aug 2008; Doug Goldstein <cardoe@g.o> metadata.xml:
98 + add GLEP 56 USE flag desc from use.local.desc
99 +
100 + 29 Jun 2008; Peter Alfredsen <loki_val@g.o>
101 + -files/1.23.1/zm_mpeg_ofc.patch, zoneminder-1.23.3.ebuild:
102 + Fix compatibility with ffmpeg-0.4.9_p20080326 with judicious sedding. Drop
103 + patch which caused build error against 0.4.9_p20080326. Raise deps to
104 + >=ffmpeg-0.4.9_p20080326. Fixes bug #228731.
105 +
106 + 17 May 2008; wrobel@g.o -files/postinstall-2.txt,
107 + -files/Makefile.am.patch, -files/ffmpeg.patch, -files/postupgrade.txt,
108 + -files/zm_create.sql.in.diff, -zoneminder-1.22.3.ebuild,
109 + -zoneminder-1.23.1.ebuild, zoneminder-1.23.3.ebuild:
110 + Cleaned the problematic zoneminder ebuilds and fixed bug #222079.
111 +
112 +*zoneminder-1.23.3 (06 May 2008)
113 +
114 + 06 May 2008; wrobel@g.o +files/10_zoneminder.conf,
115 + +zoneminder-1.23.3.ebuild:
116 + Adding zoneminder-1.23.3 to the tree (sec issue #219694, bugs #212150 and
117 + #216678)
118 +
119 +*zoneminder-1.23.1 (23 Feb 2008)
120 +
121 + 23 Feb 2008; Benedikt Böhm <hollow@g.o>
122 + +files/1.23.1/Makefile.am.patch, +files/1.23.1/zm_create.sql.in.patch,
123 + +files/1.23.1/zm_mpeg_ofc.patch, +files/1.23.1/zm_remote_camera.patch,
124 + metadata.xml, +zoneminder-1.23.1.ebuild:
125 + version bump #204297, fixes #197621
126 +
127 + 23 Feb 2008; Benedikt Böhm <hollow@g.o> zoneminder-1.22.3.ebuild:
128 + ebuild cleanup wrt #208584, also fixes #207481
129 +
130 + 26 May 2007; Renat Lumpau <rl03@g.o> +files/ffmpeg.patch,
131 + zoneminder-1.22.3.ebuild:
132 + Fix bugs #175261, #174616.
133 +
134 + 19 Apr 2007; Christian Faulhammer <opfer@g.o>
135 + zoneminder-1.22.3.ebuild:
136 + keyworded ~amd64, bug 168375
137 +
138 +*zoneminder-1.22.3 (11 Dec 2006)
139 +
140 + 11 Dec 2006; Renat Lumpau <rl03@g.o> +files/zm_create.sql.in.diff,
141 + -zoneminder-1.22.2.ebuild, +zoneminder-1.22.3.ebuild:
142 + Version bump. Fix bug #155077, bug #157676.
143 +
144 + 23 Nov 2006; Francesco Riosa <vivo@g.o> zoneminder-1.22.2.ebuild:
145 + dev-db/mysql => virtual/mysql
146 +
147 + 21 Nov 2006; Renat Lumpau <rl03@g.o> files/postinstall-2.txt,
148 + files/init.d, -files/postinstall.txt, -files/zmconfig-gentoo.txt,
149 + -zoneminder-1.21.4.ebuild:
150 + Housekeeping
151 +
152 + 01 Nov 2006; Renat Lumpau <rl03@g.o> files/postinstall-2.txt:
153 + Fix postinstall instructions, bug #153585.
154 +
155 + 03 Aug 2006; Renat Lumpau <rl03@g.o> zoneminder-1.22.2.ebuild:
156 + emake install needs -j1. bug #142662.
157 +
158 +*zoneminder-1.22.2 (01 Jul 2006)
159 +
160 + 01 Jul 2006; Renat Lumpau <rl03@g.o> files/postinstall-2.txt,
161 + files/postupgrade.txt, -zoneminder-1.22.0.ebuild,
162 + +zoneminder-1.22.2.ebuild:
163 + Version bump
164 +
165 + 08 Feb 2006; Renat Lumpau <rl03@g.o> files/postinstall-2.txt:
166 + Mention which database to use
167 +
168 + 08 Feb 2006; Renat Lumpau <rl03@g.o> zoneminder-1.22.0.ebuild:
169 + Show the right postinstall instructions
170 +
171 +*zoneminder-1.22.0 (06 Feb 2006)
172 +
173 + 06 Feb 2006; Renat Lumpau <rl03@g.o> +files/postinstall-2.txt,
174 + +files/Makefile.am.patch, +files/conf.d, +files/init.d,
175 + +files/postupgrade.txt, +zoneminder-1.22.0.ebuild:
176 + Version bump
177 +
178 + 06 Feb 2006; Renat Lumpau <rl03@g.o> -zoneminder-0.9.12.ebuild,
179 + -zoneminder-1.21.2.ebuild, -zoneminder-1.21.3.ebuild:
180 + Housekeeping
181 +
182 + 06 Feb 2006; Renat Lumpau <rl03@g.o> zoneminder-1.21.4.ebuild:
183 + Fixed #121752.
184 +
185 +*zoneminder-1.21.4 (05 Jan 2006)
186 +
187 + 05 Jan 2006; Renat Lumpau <rl03@g.o> files/postinstall.txt,
188 + +zoneminder-1.21.4.ebuild:
189 + Version bump (bug #117944), fixes for bug #106913.
190 +
191 + 12 Dec 2005; Carsten Lohrke <carlo@g.o> +metadata.xml:
192 + now maintained by the webapp herd, as arranged with rl03
193 +
194 +*zoneminder-1.21.3 (08 Aug 2005)
195 +
196 + 08 Aug 2005; Renat Lumpau <rl03@g.o> +zoneminder-1.21.3.ebuild:
197 + Added 1.21.3
198 +
199 +*zoneminder-1.21.2 (07 Jul 2005)
200 +
201 + 07 Jul 2005; Renat Lumpau <rl03@g.o> +files/postinstall.txt,
202 + +files/zmconfig-gentoo.txt, +zoneminder-1.21.2.ebuild:
203 + Version bump. Create log dirs (wrt #72002).
204 +
205 + 06 May 2005; Sven Wegener <swegener@g.o> zoneminder-0.9.12.ebuild:
206 + Removed * postfix from <, <=, >= and > dependencies.
207 +
208 + 22 Nov 2004; Daniel Black <dragonheart@g.o> zoneminder-0.9.12.ebuild:
209 + added dev-perl/DBD-mysql RDEPEND as per bug #72003. Thanks Jakub Sadowski
210 + <JakubSadowski@×××××.com> for the bug report
211 +
212 + 05 Sep 2004; Sven Wegener <swegener@g.o> :
213 + Fixed ChangeLog header.
214 +
215 + 31 Aug 2004; David Holm <dholm@g.o> zoneminder-0.9.12.ebuild:
216 + Added to ~ppc.
217 +
218 +*zoneminder-0.9.12 (15 Aug 2004)
219 +
220 + 15 Aug 2004; Stuart Herbert <stuart@g.o> +zoneminder-0.9.12.ebuild:
221 + Moved from net-www/zoneminder to www-misc/zoneminder.
222 +
223 + 27 Apr 2004; Aron Griffis <agriffis@g.o> zoneminder-0.9.12.ebuild:
224 + Add inherit eutils
225 +
226 +*zoneminder-0.9.12 (20 Jun 2003)
227 +
228 + 20 Jun 2003; mkeadle <mkeadle@g.o> zoneminder-0.9.12.ebuild:
229 + initial import. very impressive program. much thanks go to MAL
230 + <mal@×××××××.com> for putting this all together very well in bug #22665. MALs
231 + ebuild used its own internal vars to track where to install the web content. I
232 + switched this over to the datadir format used by the apache ebuilds. This lets
233 + zoneminder install to the same location apache was installed to without user
234 + interaction, but still leaves the door open for customization.
235 +
236
237 diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
238 new file mode 100644
239 index 0000000..9255575
240 --- /dev/null
241 +++ b/www-misc/zoneminder/Manifest
242 @@ -0,0 +1,33 @@
243 +-----BEGIN PGP SIGNED MESSAGE-----
244 +Hash: SHA512
245 +
246 +AUX 1.24.2/Makefile.am.patch 899 RMD160 2ffe9cbb75d433353769759d55580be9d0d8ccd8 SHA1 84024eb973f86e28d0fefa40c9a233f90c52a262 SHA256 301f23e57099c6841601017aed5a834a2ffc5e95a4b2f7e273272d4b11344ac3
247 +AUX 1.24.2/db_upgrade_script_location.patch 412 RMD160 368052be3fc8f32276cd59a146fd99a3b23b05f8 SHA1 a7a04bb212c0ca6ec693ca821d4c5de56b3e65c9 SHA256 3ffaa44c013dd27c3e5e937de77158c60b4cd37f28e1fc42dd7283f80075b067
248 +AUX 1.24.2/zm_build_fix.patch 407 RMD160 ac45177bb3f06dd0fd9cd1f938b90ba2297d07d2 SHA1 d7c6978c9fc71baf3c86b2405959fbe3da5eec99 SHA256 51f1effb3551bc8f9fbfe9e516db5f318091965f83dbf9e9772e6c7a02d2e640
249 +AUX 1.24.2/zm_create.sql.in.patch 16846 RMD160 c1b3b4ad6c5e70f4497f60a840a358a886125849 SHA1 7299c116be6f4a9cd97e55eb75c87d686a43d41c SHA256 edd4476e34c2b3b0e533809bce36827d8c84482cf25a9fca167453174866016f
250 +AUX 1.24.2/zm_jpeg.patch 2661 RMD160 e4d95b98a46a0b77874862a4afaa937e4c2814ef SHA1 58852307e7ed7df47660d2795199e91fa13319c7 SHA256 e8ac509821d9b0629c8cccb31ce25908b2b0bb7831aa7d710440b0551ad5ef3a
251 +AUX 1.24.2/zm_remote_camera_http.patch 1566 RMD160 644a681789d0ecf424156cde4b4ea8f6c5065197 SHA1 74dbe274d129997826b9a775c672c28286b60e3f SHA256 f554f2bcc7977e5ac151bd87aa2b8a0b7a9eeb9099839afe0d8b2b60a37ce04e
252 +AUX 10_zoneminder.conf 462 RMD160 d032813c63f4676e06658da3668c50f88886efab SHA1 9c834372d5bab84fe3e368be94bd951c2122ed7a SHA256 96306fd39bcffeaf15db4309b8f5f08e54a2409029f92d4a84b6f3e42f05434f
253 +AUX conf.d 138 RMD160 e7c71690bac83c1bee63c6b602b15910d3a8967c SHA1 719a2cb400a0a107accb28be3bd17f6269d41f76 SHA256 65e935cb63bf3d072b9317842944d808550ef3f933d834bb95aaacf3253bd85c
254 +AUX init.d 398 RMD160 d124ef1c1e6f5b0a9e4535d96620e46de71457c4 SHA1 5afc09eb838d9ebb28e9e91ffa0f482830862396 SHA256 b5dd459ddd0a331f625b5fa0b9441b9236f676ad2e6f6ea2da896ed4056cb0c6
255 +DIST ZoneMinder-1.24.2.tar.gz 965521 RMD160 3ec5ca1a6d418feeeecd6dc3c4a78a79f5ead373 SHA1 ea854c941b83374a352d7d794a4462e279fea487 SHA256 fd8475138ccee8870534f1210a3d1e3e1990e963dd73146a6d310dc71c463dca
256 +EBUILD zoneminder-1.24.2.ebuild 4084 RMD160 ca439d5f50282c1da78147a6668bbd136dfa6528 SHA1 ef75e0b0abb4a280cab57b93088f3c2d28447df2 SHA256 136436c29def540e5abd519440dc43b57cf012458fbc073c2001928b0e6c0df5
257 +MISC ChangeLog 7615 RMD160 1076c8a97c96eb16b38a65e61b419f8c85a83c20 SHA1 590c0fe09b124e6e714035de0890f21600f87ad5 SHA256 a209c01ca9c52c69728a11f9d6439a74aeb72c6e63e343fd996e9a2aab0db76a
258 +MISC metadata.xml 262 RMD160 24e1a7cfcbca1e2f41e8c062c448d9150f6320b8 SHA1 951224aa9eb92e898209936836a18e844ae1f169 SHA256 7e8dde52c550f9cfc6d74b78c19f6900a8cc241f2bf136610a4fc3b0aa95f3f5
259 +-----BEGIN PGP SIGNATURE-----
260 +Version: GnuPG v2.0.17 (GNU/Linux)
261 +
262 +iQIcBAEBCgAGBQJOX+ZEAAoJENwGBM22xffeM70P/jniU2ri1KBlOfGep4diUnMO
263 +iu2BJXBOS2bc82fxl2AHtb4AXXndM7EGS8WYXebUjU8aKUHgnCyFr8BoLqzw4M3j
264 +bSxvLM/crFPMiLVROQltXUIXGXAUZHSVByPA4HjReN2Sehji+OC/9wC4xAJf41/f
265 +c8z5GK+CBheyQbXMIIkh7g4NqUvu8vTPPCCFDSP3lLo5M1Uuao57CG3AZE9y2UQs
266 +asPzj0gaV9hPgROTZCYOUBRMeKLPr2H2XuLtrhrL0DiU0x5HfKlmfqP8nZh2Dvnh
267 +ddVHto3O63h69ORbNcY7hXt9kdumpBoyJfbaNvfSIs9XXQRcbHCotErbmNEV3SQG
268 +PHDJzYXYrnJpmJiTDJ0XKbBVPPgkpOYpLuqv0VhW7/8l+gpO1mnO0C0Gv7JIulEF
269 +1v8Sgo7ZTFd5oYV+nUq+jVyNjcGIzxq0ykqb+/bqDdyl3RNS/kYC7Wcxb4fe6PJa
270 +b2lK1ji8phg9I4nm6wDuU+Tqdi4B6TOtm4al3iw9xkA1YmuQmFhErvop0g9MSL2E
271 +xBwGCQ3uEGcUxH0mA4WJGpH9Cb975C8oIZwwHiVeB1fbMHCnQ/UfEhIORu7Y+wAG
272 +vx4x0xW+IqtmJuZr8gcd6NCKTCRCQZh328X0Rzs/LO8itLHlP8IcRM2oiPJmnuT7
273 +sogEhkuXIiTuMYczRWE7
274 +=C6EF
275 +-----END PGP SIGNATURE-----
276
277 diff --git a/www-misc/zoneminder/files/1.24.2/Makefile.am.patch b/www-misc/zoneminder/files/1.24.2/Makefile.am.patch
278 new file mode 100644
279 index 0000000..90dd476
280 --- /dev/null
281 +++ b/www-misc/zoneminder/files/1.24.2/Makefile.am.patch
282 @@ -0,0 +1,15 @@
283 +Index: ZoneMinder-1.23.1/Makefile.am
284 +===================================================================
285 +--- ZoneMinder-1.23.1.orig/Makefile.am
286 ++++ ZoneMinder-1.23.1/Makefile.am
287 +@@ -19,8 +19,8 @@ EXTRA_DIST = \
288 + # Yes, you are correct. This is a HACK!
289 + install-data-hook:
290 + ( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) )
291 +- -( if ! test -e $(RUNDIR); then mkdir $(RUNDIR); fi )
292 +- ( if ! test -e $(ZM_RUNDIR); then mkdir $(ZM_RUNDIR); fi; chown $(webuser):$(webgroup) $(ZM_RUNDIR); chmod u+w $(ZM_RUNDIR) )
293 ++ -( if ! test -e $(DESTDIR)$(RUNDIR); then mkdir $(DESTDIR)$(RUNDIR); fi )
294 ++ ( if ! test -e $(DESTDIR)$(ZM_RUNDIR); then mkdir $(DESTDIR)$(ZM_RUNDIR); fi; chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_RUNDIR); chmod u+w $(DESTDIR)$(ZM_RUNDIR) )
295 +
296 + uninstall-hook:
297 + @-( cd $(DESTDIR)$(webdir); rm -rf events graphics images sounds temp )
298
299 diff --git a/www-misc/zoneminder/files/1.24.2/db_upgrade_script_location.patch b/www-misc/zoneminder/files/1.24.2/db_upgrade_script_location.patch
300 new file mode 100644
301 index 0000000..41b537c
302 --- /dev/null
303 +++ b/www-misc/zoneminder/files/1.24.2/db_upgrade_script_location.patch
304 @@ -0,0 +1,11 @@
305 +--- ZoneMinder-1.24.1/zm.conf.in.orig 2009-03-23 13:55:43.000000000 +0000
306 ++++ ZoneMinder-1.24.1/zm.conf.in 2009-03-23 13:57:22.000000000 +0000
307 +@@ -13,7 +13,7 @@
308 + ZM_VERSION=@VERSION@
309 +
310 + # Path to build directory, used mostly for finding DB upgrade scripts
311 +-ZM_PATH_BUILD=@PATH_BUILD@
312 ++ZM_PATH_BUILD=/usr/share/zoneminder
313 +
314 + # Build time, used to record when to trigger various checks
315 + ZM_TIME_BUILD=@TIME_BUILD@
316
317 diff --git a/www-misc/zoneminder/files/1.24.2/zm_build_fix.patch b/www-misc/zoneminder/files/1.24.2/zm_build_fix.patch
318 new file mode 100644
319 index 0000000..164a106
320 --- /dev/null
321 +++ b/www-misc/zoneminder/files/1.24.2/zm_build_fix.patch
322 @@ -0,0 +1,11 @@
323 +diff -u -ru ZoneMinder-1.24.2-old//src/zm_utils.cpp ZoneMinder-1.24.2/src/zm_utils.cpp
324 +--- ZoneMinder-1.24.2-old//src/zm_utils.cpp 2010-06-03 01:34:27.981235559 +0300
325 ++++ ZoneMinder-1.24.2/src/zm_utils.cpp 2010-06-03 01:44:52.108291327 +0300
326 +@@ -20,6 +20,7 @@
327 + //#include "zm_debug.h"
328 + #include "zm_utils.h"
329 +
330 ++#include <cstdio>
331 + #include <stdarg.h>
332 +
333 + const std::string stringtf( const char *format, ... )
334
335 diff --git a/www-misc/zoneminder/files/1.24.2/zm_create.sql.in.patch b/www-misc/zoneminder/files/1.24.2/zm_create.sql.in.patch
336 new file mode 100644
337 index 0000000..55be4e4
338 --- /dev/null
339 +++ b/www-misc/zoneminder/files/1.24.2/zm_create.sql.in.patch
340 @@ -0,0 +1,28 @@
341 +diff --git ZoneMinder-1.24.2/db/zm_create.sql.in ZoneMinder-1.24.2-ta/db/zm_create.sql.in
342 +index fc7eb5d..e2bda24 100644
343 +--- ZoneMinder-1.24.2/db/zm_create.sql.in
344 ++++ ZoneMinder-1.24.2-ta/db/zm_create.sql.in
345 +@@ -642,7 +642,7 @@ insert into Config set Id = 38, Name = 'ZM_HTTP_TIMEOUT', Value = '2500', Type =
346 + insert into Config set Id = 39, Name = 'ZM_MIN_RTP_PORT', Value = '40200', Type = 'integer', DefaultValue = '40200', Hint = 'integer', Pattern = '(?-xism:^(\d+)$)', Format = ' $1 ', Prompt = 'Minimum port that ZoneMinder will listen for RTP traffic on', Help = 'When ZoneMinder communicates with MPEG4 capable cameras using RTP with the unicast method it must open ports for the camera to connect back to for control and streaming purposes. This setting specifies the minimum port number that ZoneMinder will use. Ordinarily two adjacent ports are used for each camera, one for control packets and one for data packets. This port should be set to an even number, you may also need to open up a hole in your firewall to allow cameras to connect back if you wish to use unicasting.', Category = 'network', Readonly = '0', Requires = '';
347 + insert into Config set Id = 40, Name = 'ZM_MAX_RTP_PORT', Value = '40499', Type = 'integer', DefaultValue = '40499', Hint = 'integer', Pattern = '(?-xism:^(\d+)$)', Format = ' $1 ', Prompt = 'Maximum port that ZoneMinder will listen for RTP traffic on', Help = 'When ZoneMinder communicates with MPEG4 capable cameras using RTP with the unicast method it must open ports for the camera to connect back to for control and streaming purposes. This setting specifies the maximum port number that ZoneMinder will use. Ordinarily two adjacent ports are used for each camera, one for control packets and one for data packets. This port should be set to an even number, you may also need to open up a hole in your firewall to allow cameras to connect back if you wish to use unicasting. You should also ensure that you have opened up at least two ports for each monitor that will be connecting to unicasting network cameras.', Category = 'network', Readonly = '0', Requires = '';
348 + insert into Config set Id = 41, Name = 'ZM_OPT_FFMPEG', Value = '1', Type = 'boolean', DefaultValue = 'yes', Hint = 'yes|no', Pattern = '(?i-xsm:^([yn]))', Format = ' ($1 =~ /^y/) ? \"yes\" : \"no\" ', Prompt = 'Is the ffmpeg video encoder/decoder installed', Help = 'ZoneMinder can optionally encode a series of video images into an MPEG encoded movie file for viewing, downloading or storage. This option allows you to specify whether you have the ffmpeg tools installed. Note that creating MPEG files can be fairly CPU and disk intensive and is not a required option as events can still be reviewed as video streams without it.', Category = 'images', Readonly = '0', Requires = '';
349 +-insert into Config set Id = 42, Name = 'ZM_PATH_FFMPEG', Value = '/usr/local/bin/ffmpeg', Type = 'string', DefaultValue = '/usr/local/bin/ffmpeg', Hint = '/absolute/path/to/somewhere', Pattern = '(?-xism:^((?:/[^/]*)+?)/?$)', Format = ' $1 ', Prompt = 'Path to (optional) ffmpeg mpeg encoder', Help = 'This path should point to where ffmpeg has been installed.', Category = 'images', Readonly = '0', Requires = 'ZM_OPT_FFMPEG=1';
350 ++insert into Config set Id = 42, Name = 'ZM_PATH_FFMPEG', Value = '/usr/bin/ffmpeg', Type = 'string', DefaultValue = '/usr/bin/ffmpeg', Hint = '/absolute/path/to/somewhere', Pattern = '(?-xism:^((?:/[^/]*)+?)/?$)', Format = ' $1 ', Prompt = 'Path to (optional) ffmpeg mpeg encoder', Help = 'This path should point to where ffmpeg has been installed.', Category = 'images', Readonly = '0', Requires = 'ZM_OPT_FFMPEG=1';
351 + insert into Config set Id = 43, Name = 'ZM_FFMPEG_INPUT_OPTIONS', Value = '', Type = 'string', DefaultValue = '', Hint = 'string', Pattern = '(?-xism:^(.+)$)', Format = ' $1 ', Prompt = 'Additional input options to ffmpeg', Help = 'Ffmpeg can take many options on the command line to control the quality of video produced. This option allows you to specify your own set that apply to the input to ffmpeg (options that are given before the -i option). Check the ffmpeg documentation for a full list of options which may be used here.', Category = 'images', Readonly = '0', Requires = 'ZM_OPT_FFMPEG=1';
352 + insert into Config set Id = 44, Name = 'ZM_FFMPEG_OUTPUT_OPTIONS', Value = '-r 25', Type = 'string', DefaultValue = '-r 25', Hint = 'string', Pattern = '(?-xism:^(.+)$)', Format = ' $1 ', Prompt = 'Additional output options to ffmpeg', Help = 'Ffmpeg can take many options on the command line to control the quality of video produced. This option allows you to specify your own set that apply to the output from ffmpeg (options that are given after the -i option). Check the ffmpeg documentation for a full list of options which may be used here. The most common one will often be to force an output frame rate supported by the video encoder.', Category = 'images', Readonly = '0', Requires = 'ZM_OPT_FFMPEG=1';
353 + insert into Config set Id = 45, Name = 'ZM_FFMPEG_FORMATS', Value = 'mpg mpeg wmv asf avi* mov swf 3gp**', Type = 'string', DefaultValue = 'mpg mpeg wmv asf avi* mov swf 3gp**', Hint = 'string', Pattern = '(?-xism:^(.+)$)', Format = ' $1 ', Prompt = 'Formats to allow for ffmpeg video generation', Help = 'Ffmpeg can generate video in many different formats. This option allows you to list the ones you want to be able to select. As new formats are supported by ffmpeg you can add them here and be able to use them immediately. Adding a \'*\' after a format indicates that this will be the default format used for web video, adding \'**\' defines the default format for phone video.', Category = 'images', Readonly = '0', Requires = 'ZM_OPT_FFMPEG=1';
354 +@@ -653,11 +653,11 @@ insert into Config set Id = 49, Name = 'ZM_RECORD_DIAG_IMAGES', Value = '0', Typ
355 + insert into Config set Id = 50, Name = 'ZM_EXTRA_DEBUG', Value = '0', Type = 'boolean', DefaultValue = 'no', Hint = 'yes|no', Pattern = '(?i-xsm:^([yn]))', Format = ' ($1 =~ /^y/) ? \"yes\" : \"no\" ', Prompt = 'Switch additional debugging on', Help = 'ZoneMinder binary components usually have several levels of debug information they can output. Normally this is set to a fairly low level to avoid filling logs too quickly. This options lets you switch on other options that allow you to configure additional debug information to be output. Components will pick up this instruction when they are restarted.', Category = 'debug', Readonly = '0', Requires = '';
356 + insert into Config set Id = 51, Name = 'ZM_EXTRA_DEBUG_TARGET', Value = '', Type = 'string', DefaultValue = '', Hint = 'string', Pattern = '(?-xism:^(.+)$)', Format = ' $1 ', Prompt = 'What components should have extra debug enabled', Help = 'There are three scopes of debug available. Leaving this option blank means that all components will use extra debug (not recommended). Setting this option to \'_<component>\', e.g. _zmc, will limit extra debug to that component only. Setting this option to \'_<component>_<identity>\', e.g. \'_zmc_m1\' will limit extra debug to that instance of the component only. This is ordinarily what you probably want to do.', Category = 'debug', Readonly = '0', Requires = 'ZM_EXTRA_DEBUG=1';
357 + insert into Config set Id = 52, Name = 'ZM_EXTRA_DEBUG_LEVEL', Value = '0', Type = 'integer', DefaultValue = '0', Hint = '0|1|2|3|4|5|6|7|8|9', Pattern = '(?-xism:^(\d+)$)', Format = ' $1 ', Prompt = 'What level of extra debug should be enabled', Help = 'There are 9 levels of debug available, with higher numbers being more debug and level 0 being no debug. However not all levels are used by all components. Also if there is debug at a high level it is usually likely to be output at such a volume that it may obstruct normal operation. For this reason you should set the level carefully and cautiously until the degree of debug you wish to see is present.', Category = 'debug', Readonly = '0', Requires = 'ZM_EXTRA_DEBUG=1';
358 +-insert into Config set Id = 53, Name = 'ZM_EXTRA_DEBUG_LOG', Value = '/tmp/zm_debug.log+', Type = 'string', DefaultValue = '/tmp/zm_debug.log+', Hint = 'string', Pattern = '(?-xism:^(.+)$)', Format = ' $1 ', Prompt = 'Where extra debug is output to', Help = 'Depending on your system configuration you may find that only errors, warning and informational messages are logged to your system log. This option allows you to specify an additional target for these messages and debug. This also has the advantage of partitioning debug for the component you are tracing, from messages from other components. Be warned however that if this is a simple filename and you are debugging several components then they will all try and write to the same file with undesirable consequences. Appending a \'+\' to the filename will cause the file to be created with a \'.<pid>\' suffix containing your process id. In this way debug from each run of a component is kept separate. This is the recommended se
359 tting as it will also prevent subsequent runs from overwriting the same log.', Category = 'debug', Readonly = '0', Requires = 'ZM_EXTRA_DEBUG=1';
360 ++insert into Config set Id = 53, Name = 'ZM_EXTRA_DEBUG_LOG', Value = '/var/log/zoneminder/zm_debug.log+', Type = 'string', DefaultValue = '/var/log/zoneminder/zm_debug.log+', Hint = 'string', Pattern = '(?-xism:^(.+)$)', Format = ' $1 ', Prompt = 'Where extra debug is output to', Help = 'Depending on your system configuration you may find that only errors, warning and informational messages are logged to your system log. This option allows you to specify an additional target for these messages and debug. This also has the advantage of partitioning debug for the component you are tracing, from messages from other components. Be warned however that if this is a simple filename and you are debugging several components then they will all try and write to the same file with undesirable consequences. Appending a \'+\' to the filename will cause the file to be created with a \'.<pid>\' suffix containing your process id. In this way debug from each run of a component is kept separa
361 te. This is the recommended setting as it will also prevent subsequent runs from overwriting the same log.', Category = 'debug', Readonly = '0', Requires = 'ZM_EXTRA_DEBUG=1';
362 + insert into Config set Id = 54, Name = 'ZM_DUMP_CORES', Value = '0', Type = 'boolean', DefaultValue = 'no', Hint = 'yes|no', Pattern = '(?i-xsm:^([yn]))', Format = ' ($1 =~ /^y/) ? \"yes\" : \"no\" ', Prompt = 'Create core files on unexpected process failure.', Help = 'When an unrecoverable error occurs in a ZoneMinder binary process is has traditionally been trapped and the details written to logs to aid in remote analysis. However in some cases it is easier to diagnose the error if a core file, which is a memory dump of the process at the time of the error, is created. This can be interactively analysed in the debugger and may reveal more or better information than that available from the logs. This option is recommended for advanced users only otherwise leave at the default. Note using this option to trigger core files will mean that there will be no indication in the binary logs that a process has died, they will just stop, however the zmdc log will still contain an ent
363 ry. Also note that you may have to explicitly enable core file creation on your system via the \'ulimit -c\' command or other means otherwise no file will be created regardless of the value of this option.', Category = 'debug', Readonly = '0', Requires = '';
364 + insert into Config set Id = 55, Name = 'ZM_PATH_MAP', Value = '/dev/shm', Type = 'string', DefaultValue = '/dev/shm', Hint = '/absolute/path/to/somewhere', Pattern = '(?-xism:^((?:/[^/]*)+?)/?$)', Format = ' $1 ', Prompt = 'Path to the mapped memory files that that ZoneMinder can use', Help = 'ZoneMinder has historically used IPC shared memory for shared data between processes. This has it\'s advantages and limitations. This version of ZoneMinder can use an alternate method, mapped memory, instead with can be enabled with the --enable--mmap directive to configure. This requires less system configuration and is generally more flexible. However it requires each shared data segment to map onto a filesystem file. This option indicates where those mapped files go. You should ensure that this location has sufficient space for these files and for the best performance it should be a tmpfs file system or ramdisk otherwise disk access may render this method slower than the regular sh
365 ared memory one.', Category = 'paths', Readonly = '0', Requires = '';
366 +-insert into Config set Id = 56, Name = 'ZM_PATH_SOCKS', Value = '/tmp', Type = 'string', DefaultValue = '/tmp', Hint = '/absolute/path/to/somewhere', Pattern = '(?-xism:^((?:/[^/]*)+?)/?$)', Format = ' $1 ', Prompt = 'Path to the various Unix domain socket files that ZoneMinder uses', Help = 'ZoneMinder generally uses Unix domain sockets where possible. This reduces the need for port assignments and prevents external applications from possibly compromising the daemons. However each Unix socket requires a .sock file to be created. This option indicates where those socket files go.', Category = 'paths', Readonly = '0', Requires = '';
367 +-insert into Config set Id = 57, Name = 'ZM_PATH_LOGS', Value = '/tmp', Type = 'string', DefaultValue = '/tmp', Hint = '/absolute/path/to/somewhere', Pattern = '(?-xism:^((?:/[^/]*)+?)/?$)', Format = ' $1 ', Prompt = 'Path to the various logs that the ZoneMinder daemons generate', Help = 'There are various daemons that are used by ZoneMinder to perform various tasks. Most generate helpful log files and this is where they go. They can be deleted if not required for debugging.', Category = 'paths', Readonly = '0', Requires = '';
368 ++insert into Config set Id = 56, Name = 'ZM_PATH_SOCKS', Value = '/var/run/zm', Type = 'string', DefaultValue = '/var/run/zm', Hint = '/absolute/path/to/somewhere', Pattern = '(?-xism:^((?:/[^/]*)+?)/?$)', Format = ' $1 ', Prompt = 'Path to the various Unix domain socket files that ZoneMinder uses', Help = 'ZoneMinder generally uses Unix domain sockets where possible. This reduces the need for port assignments and prevents external applications from possibly compromising the daemons. However each Unix socket requires a .sock file to be created. This option indicates where those socket files go.', Category = 'paths', Readonly = '0', Requires = '';
369 ++insert into Config set Id = 57, Name = 'ZM_PATH_LOGS', Value = '/var/log/zoneminder', Type = 'string', DefaultValue = '/var/log/zoneminder', Hint = '/absolute/path/to/somewhere', Pattern = '(?-xism:^((?:/[^/]*)+?)/?$)', Format = ' $1 ', Prompt = 'Path to the various logs that the ZoneMinder daemons generate', Help = 'There are various daemons that are used by ZoneMinder to perform various tasks. Most generate helpful log files and this is where they go. They can be deleted if not required for debugging.', Category = 'paths', Readonly = '0', Requires = '';
370 + insert into Config set Id = 58, Name = 'ZM_PATH_SWAP', Value = '/tmp', Type = 'string', DefaultValue = '/tmp', Hint = '/absolute/path/to/somewhere', Pattern = '(?-xism:^((?:/[^/]*)+?)/?$)', Format = ' $1 ', Prompt = 'Path to location for temporary swap images used in streaming', Help = 'Buffered playback requires temporary swap images to be stored for each instance of the streaming daemons. This option determines where these images will be stored. The images will actually be stored in sub directories beneath this location and will be automatically cleaned up after a period of time.', Category = 'paths', Readonly = '0', Requires = '';
371 + insert into Config set Id = 59, Name = 'ZM_WEB_TITLE_PREFIX', Value = 'ZM', Type = 'string', DefaultValue = 'ZM', Hint = 'string', Pattern = '(?-xism:^(.+)$)', Format = ' $1 ', Prompt = 'The title prefix displayed on each window', Help = 'If you have more than one installation of ZoneMinder it can be helpful to display different titles for each one. Changing this option allows you to customise the window titles to include further information to aid identification.', Category = 'web', Readonly = '0', Requires = '';
372 + insert into Config set Id = 60, Name = 'ZM_WEB_RESIZE_CONSOLE', Value = '1', Type = 'boolean', DefaultValue = 'yes', Hint = 'yes|no', Pattern = '(?i-xsm:^([yn]))', Format = ' ($1 =~ /^y/) ? \"yes\" : \"no\" ', Prompt = 'Should the console window resize itself to fit', Help = 'Traditionally the main ZoneMinder web console window has resized itself to shrink to a size small enough to list only the monitors that are actually present. This is intended to make the window more unobtrusize but may not be to everyones tastes, especially if opened in a tab in browsers which support this kind if layout. Switch this option off to have the console window size left to the users preference', Category = 'web', Readonly = '0', Requires = '';
373
374 diff --git a/www-misc/zoneminder/files/1.24.2/zm_jpeg.patch b/www-misc/zoneminder/files/1.24.2/zm_jpeg.patch
375 new file mode 100644
376 index 0000000..4d3dbad
377 --- /dev/null
378 +++ b/www-misc/zoneminder/files/1.24.2/zm_jpeg.patch
379 @@ -0,0 +1,59 @@
380 +diff -ur ZoneMinder-1.24.2.orig/src/zm_image.cpp ZoneMinder-1.24.2/src/zm_image.cpp
381 +--- ZoneMinder-1.24.2.orig/src/zm_image.cpp 2009-05-25 21:04:00.000000000 +0300
382 ++++ ZoneMinder-1.24.2/src/zm_image.cpp 2010-02-22 17:43:14.000000000 +0200
383 +@@ -461,7 +461,7 @@
384 + return( false );
385 + }
386 +
387 +- jpeg_mem_src( cinfo, inbuffer, inbuffer_size );
388 ++ zm_jpeg_mem_src( cinfo, inbuffer, inbuffer_size );
389 +
390 + jpeg_read_header( cinfo, TRUE );
391 +
392 +@@ -523,7 +523,7 @@
393 + jpeg_create_compress( cinfo );
394 + }
395 +
396 +- jpeg_mem_dest( cinfo, outbuffer, outbuffer_size );
397 ++ zm_jpeg_mem_dest( cinfo, outbuffer, outbuffer_size );
398 +
399 + cinfo->image_width = width; /* image width and height, in pixels */
400 + cinfo->image_height = height;
401 +diff -ur ZoneMinder-1.24.2.orig/src/zm_jpeg.c ZoneMinder-1.24.2/src/zm_jpeg.c
402 +--- ZoneMinder-1.24.2.orig/src/zm_jpeg.c 2009-03-20 14:07:00.000000000 +0200
403 ++++ ZoneMinder-1.24.2/src/zm_jpeg.c 2010-02-22 17:43:14.000000000 +0200
404 +@@ -173,7 +173,7 @@
405 + * for closing it after finishing compression.
406 + */
407 +
408 +-void jpeg_mem_dest (j_compress_ptr cinfo, JOCTET *outbuffer, int *outbuffer_size )
409 ++void zm_jpeg_mem_dest (j_compress_ptr cinfo, JOCTET *outbuffer, int *outbuffer_size )
410 + {
411 + mem_dest_ptr dest;
412 +
413 +@@ -350,12 +350,12 @@
414 + * for closing it after finishing decompression.
415 + */
416 +
417 +-void jpeg_mem_src( j_decompress_ptr cinfo, const JOCTET *inbuffer, int inbuffer_size )
418 ++void zm_jpeg_mem_src( j_decompress_ptr cinfo, const JOCTET *inbuffer, int inbuffer_size )
419 + {
420 + mem_src_ptr src;
421 +
422 + /* The source object and input buffer are made permanent so that a series
423 +- * of JPEG images can be read from the same file by calling jpeg_mem_src
424 ++ * of JPEG images can be read from the same file by calling zm_jpeg_mem_src
425 + * only before the first one. (If we discarded the buffer at the end of
426 + * one image, we'd likely lose the start of the next one.)
427 + * This makes it unsafe to use this manager and a different source
428 +diff -ur ZoneMinder-1.24.2.orig/src/zm_jpeg.h ZoneMinder-1.24.2/src/zm_jpeg.h
429 +--- ZoneMinder-1.24.2.orig/src/zm_jpeg.h 2009-03-20 14:07:00.000000000 +0200
430 ++++ ZoneMinder-1.24.2/src/zm_jpeg.h 2010-02-22 17:43:14.000000000 +0200
431 +@@ -36,5 +36,5 @@
432 + void zm_jpeg_emit_message( j_common_ptr cinfo, int msg_level );
433 +
434 + // Prototypes for memory compress/decompression object */
435 +-void jpeg_mem_src(j_decompress_ptr cinfo, const JOCTET *inbuffer, int inbuffer_size );
436 +-void jpeg_mem_dest(j_compress_ptr cinfo, JOCTET *outbuffer, int *outbuffer_size );
437 ++void zm_jpeg_mem_src(j_decompress_ptr cinfo, const JOCTET *inbuffer, int inbuffer_size );
438 ++void zm_jpeg_mem_dest(j_compress_ptr cinfo, JOCTET *outbuffer, int *outbuffer_size );
439
440 diff --git a/www-misc/zoneminder/files/1.24.2/zm_remote_camera_http.patch b/www-misc/zoneminder/files/1.24.2/zm_remote_camera_http.patch
441 new file mode 100644
442 index 0000000..ca937b6
443 --- /dev/null
444 +++ b/www-misc/zoneminder/files/1.24.2/zm_remote_camera_http.patch
445 @@ -0,0 +1,55 @@
446 +Index: ZoneMinder-1.24.1/src/zm_remote_camera_http.cpp
447 +===================================================================
448 +--- ZoneMinder-1.24.1.orig/src/zm_remote_camera_http.cpp
449 ++++ ZoneMinder-1.24.1/src/zm_remote_camera_http.cpp
450 +@@ -356,6 +356,14 @@ int RemoteCamera::GetResponse()
451 + format = JPEG;
452 + state = CONTENT;
453 + }
454 ++ else if ( !strcasecmp( content_type, "image/mpeg" ) )
455 ++ {
456 ++ // Single image
457 ++ mode = SINGLE_IMAGE;
458 ++ format = JPEG;
459 ++ state = CONTENT;
460 ++
461 ++ }
462 + else if ( !strcasecmp( content_type, "image/x-rgb" ) )
463 + {
464 + // Single image
465 +@@ -453,6 +461,10 @@ int RemoteCamera::GetResponse()
466 + {
467 + format = JPEG;
468 + }
469 ++ else if ( !strcasecmp( content_type, "image/mpeg" ) )
470 ++ {
471 ++ format = JPEG;
472 ++ }
473 + else if ( !strcasecmp( content_type, "image/x-rgb" ) )
474 + {
475 + format = X_RGB;
476 +@@ -783,6 +795,13 @@ int RemoteCamera::GetResponse()
477 + format = JPEG;
478 + state = CONTENT;
479 + }
480 ++ else if ( !strcasecmp( content_type, "image/mpeg" ) )
481 ++ {
482 ++ // Single image
483 ++ mode = SINGLE_IMAGE;
484 ++ format = JPEG;
485 ++ state = CONTENT;
486 ++ }
487 + else if ( !strcasecmp( content_type, "image/x-rgb" ) )
488 + {
489 + // Single image
490 +@@ -947,6 +966,10 @@ int RemoteCamera::GetResponse()
491 + {
492 + format = JPEG;
493 + }
494 ++ else if ( !strcasecmp( content_type, "image/mpeg" ) )
495 ++ {
496 ++ format = JPEG;
497 ++ }
498 + else if ( !strcasecmp( content_type, "image/x-rgb" ) )
499 + {
500 + format = X_RGB;
501
502 diff --git a/www-misc/zoneminder/files/10_zoneminder.conf b/www-misc/zoneminder/files/10_zoneminder.conf
503 new file mode 100644
504 index 0000000..0ddb675
505 --- /dev/null
506 +++ b/www-misc/zoneminder/files/10_zoneminder.conf
507 @@ -0,0 +1,18 @@
508 +ScriptAlias /cgi-bin/zms "/var/www/zoneminder/cgi-bin/zms"
509 +ScriptAlias /cgi-bin/nph-zms "/var/www/zoneminder/cgi-bin/nph-zms"
510 +
511 +<Directory "/var/www/zoneminder/cgi-bin">
512 + AllowOverride All
513 + Options ExecCGI
514 + Order allow,deny
515 + Allow from all
516 +</Directory>
517 +
518 +Alias /zoneminder "/var/www/zoneminder/htdocs"
519 +
520 +<Directory "/var/www/zoneminder/htdocs">
521 + Options -Indexes MultiViews FollowSymLinks
522 + AllowOverride All
523 + Order allow,deny
524 + Allow from all
525 +</Directory>
526
527 diff --git a/www-misc/zoneminder/files/conf.d b/www-misc/zoneminder/files/conf.d
528 new file mode 100644
529 index 0000000..d2e0336
530 --- /dev/null
531 +++ b/www-misc/zoneminder/files/conf.d
532 @@ -0,0 +1,6 @@
533 +ZM_SCRIPT=/usr/bin/zmpkg.pl
534 +
535 +# Commands for starting and stopping the server
536 +
537 +CMD_START="${ZM_SCRIPT} start"
538 +CMD_STOP="${ZM_SCRIPT} stop"
539
540 diff --git a/www-misc/zoneminder/files/init.d b/www-misc/zoneminder/files/init.d
541 new file mode 100644
542 index 0000000..5fba3dd
543 --- /dev/null
544 +++ b/www-misc/zoneminder/files/init.d
545 @@ -0,0 +1,20 @@
546 +#!/sbin/runscript
547 +# Copyright 1999-2006 Gentoo Foundation
548 +# Distributed under the terms of the GNU General Public License v2
549 +# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/files/Attic/init.d,v 1.3 2009/01/01 16:47:24 gentoofan23 Exp $
550 +
551 +depend() {
552 + use mysql
553 +}
554 +
555 +start() {
556 + ebegin "Starting zoneminder"
557 + ${CMD_START}
558 + eend $?
559 +}
560 +
561 +stop() {
562 + ebegin "Stopping zoneminder"
563 + ${CMD_STOP}
564 + eend $?
565 +}
566
567 diff --git a/www-misc/zoneminder/metadata.xml b/www-misc/zoneminder/metadata.xml
568 new file mode 100644
569 index 0000000..90e3ad4
570 --- /dev/null
571 +++ b/www-misc/zoneminder/metadata.xml
572 @@ -0,0 +1,9 @@
573 +<?xml version="1.0" encoding="UTF-8"?>
574 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
575 +<pkgmetadata>
576 + <herd>no-herd</herd>
577 + <maintainer>
578 + <email>dilfridge@g.o</email>
579 + <name>Andreas K. Huettel</name>
580 + </maintainer>
581 +</pkgmetadata>
582
583 diff --git a/www-misc/zoneminder/zoneminder-1.24.2.ebuild b/www-misc/zoneminder/zoneminder-1.24.2.ebuild
584 new file mode 100644
585 index 0000000..3ffc802
586 --- /dev/null
587 +++ b/www-misc/zoneminder/zoneminder-1.24.2.ebuild
588 @@ -0,0 +1,150 @@
589 +# Copyright 1999-2011 Gentoo Foundation
590 +# Distributed under the terms of the GNU General Public License v2
591 +# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/Attic/zoneminder-1.24.2.ebuild,v 1.6 2011/04/04 12:11:35 scarabeus Exp $
592 +
593 +inherit eutils autotools depend.php depend.apache multilib
594 +
595 +MY_PV=${PV/_/-}
596 +MY_PN="ZoneMinder"
597 +
598 +PATCH_PV="1.24.2"
599 +
600 +DESCRIPTION="ZoneMinder allows you to capture, analyse, record and monitor any cameras attached to your system."
601 +HOMEPAGE="http://www.zoneminder.com/"
602 +SRC_URI="http://www.zoneminder.com/downloads/${MY_PN}-${MY_PV}.tar.gz"
603 +
604 +LICENSE="GPL-2"
605 +KEYWORDS="~amd64 ~ppc ~x86"
606 +IUSE="debug ffmpeg"
607 +#IUSE="debug ffmpeg mmap"
608 +SLOT="0"
609 +
610 +DEPEND="app-admin/sudo
611 + dev-libs/libpcre
612 + virtual/jpeg
613 + net-libs/gnutls
614 + >=dev-lang/perl-5.6.0
615 + virtual/perl-Archive-Tar
616 + dev-perl/Archive-Zip
617 + dev-perl/DateManip
618 + dev-perl/DBD-mysql
619 + dev-perl/DBI
620 + dev-perl/Device-SerialPort
621 + dev-perl/libwww-perl
622 + dev-perl/MIME-Lite
623 + dev-perl/MIME-tools
624 + dev-perl/PHP-Serialization
625 + virtual/perl-Getopt-Long
626 + virtual/perl-libnet
627 + virtual/perl-Module-Load
628 + virtual/perl-Sys-Syslog
629 + virtual/perl-Time-HiRes"
630 +
631 +RDEPEND="dev-perl/DBD-mysql
632 + ffmpeg? ( virtual/ffmpeg )
633 + media-libs/netpbm"
634 +
635 +# we cannot use need_httpd_cgi here, since we need to setup permissions for the
636 +# webserver in global scope (/etc/zm.conf etc), so we hardcode apache here.
637 +need_apache
638 +need_php_httpd
639 +
640 +S=${WORKDIR}/${MY_PN}-${MY_PV}
641 +
642 +pkg_setup() {
643 + require_php_with_use mysql sockets apache2
644 +}
645 +
646 +src_unpack() {
647 + unpack ${A}
648 + cd "${S}"
649 +
650 + epatch "${FILESDIR}"/${PATCH_PV}/Makefile.am.patch
651 + epatch "${FILESDIR}"/${PATCH_PV}/zm_create.sql.in.patch
652 + epatch "${FILESDIR}"/${PATCH_PV}/zm_remote_camera_http.patch
653 + epatch "${FILESDIR}"/${PATCH_PV}/db_upgrade_script_location.patch
654 + epatch "${FILESDIR}"/${PATCH_PV}/zm_jpeg.patch
655 + epatch "${FILESDIR}"/${PATCH_PV}/zm_build_fix.patch
656 +
657 + eautoreconf
658 +}
659 +
660 +src_compile() {
661 + local myconf
662 +
663 +# To enable mmap support we need a dependancy of Sys::Mmap
664 +# It installs fine via g-cpan, but there's no ebuild currently in portage.
665 +# if use mmap; then
666 +# myconf="${myconf} --enable-mmap=yes"
667 +# else
668 +# myconf="${myconf} --enable-mmap=no"
669 +# fi
670 +
671 + if use debug; then
672 + myconf="${myconf} --enable-debug=yes --enable-crashtrace=yes"
673 + else
674 + myconf="${myconf} --enable-debug=no --enable-crashtrace=no"
675 + fi
676 +
677 + econf --with-libarch=$(get_libdir) \
678 + --with-mysql=/usr \
679 + $(use_with ffmpeg) \
680 + --with-webdir="${ROOT}var/www/zoneminder/htdocs" \
681 + --with-cgidir="${ROOT}var/www/zoneminder/cgi-bin" \
682 + --with-webuser=apache \
683 + --with-webgroup=apache \
684 + ${myconf}
685 +
686 + einfo "${PN} does not parallel build... using forcing make -j1..."
687 + emake -j1 || die "emake failed"
688 +}
689 +
690 +src_install() {
691 + keepdir /var/run/zm
692 + emake -j1 DESTDIR="${D}" install || die "emake install failed"
693 +
694 + fperms 0640 /etc/zm.conf
695 +
696 + keepdir /var/log/${PN}
697 + fowners apache:apache /var/log/${PN}
698 + fowners apache:apache /var/run/zm
699 +
700 + newinitd "${FILESDIR}"/init.d zoneminder
701 + newconfd "${FILESDIR}"/conf.d zoneminder
702 +
703 + dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
704 +
705 + insinto /usr/share/${PN}/db
706 + doins db/zm_u* db/zm_create.sql
707 +
708 + insinto /etc/apache2/vhosts.d
709 + doins "${FILESDIR}"/10_zoneminder.conf
710 +
711 + for DIR in events images sound; do
712 + dodir /var/www/zoneminder/htdocs/${DIR}
713 + done
714 +}
715 +
716 +pkg_postinst() {
717 + elog ""
718 + elog "0. If this is a new installation, you will need to create a MySQL database"
719 + elog " for ${PN} to use. (see http://www.gentoo.org/doc/en/mysql-howto.xml)."
720 + elog " Once you completed that you should execute the following:"
721 + elog ""
722 + elog " cd /usr/share/${PN}"
723 + elog " mysql -u <my_database_user> -p<my_database_pass> <my_zoneminder_db> < db/zm_create.sql"
724 + elog ""
725 + elog "1. Set your database settings in /etc/zm.conf"
726 + elog ""
727 + elog "2. Start the ${PN} daemon:"
728 + elog ""
729 + elog " /etc/init.d/${PN} start"
730 + elog ""
731 + elog "3. Finally point your browser to http://localhost/${PN}"
732 + elog ""
733 + elog ""
734 + elog "If you are upgrading, you will need to run the zmupdate.pl script:"
735 + elog ""
736 + elog " /usr/bin/zmupdate.pl version=<from version> [--user=<my_database_user> --pass=<my_database_pass>]"
737 + elog ""
738 +}