1 |
commit: a5aa609c955ebef36a33e405fad156b1f12c25f4 |
2 |
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de> |
3 |
AuthorDate: Thu Sep 1 20:58:34 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=a5aa609c |
7 |
|
8 |
[www-misc/zoneminder] Started working on version bump |
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 | 7 +++ |
14 |
www-misc/zoneminder/Manifest | 33 ++++++++------- |
15 |
www-misc/zoneminder/files/1.25.0/Makefile.am.patch | 19 ++++++++ |
16 |
...nder-1.24.2.ebuild => zoneminder-1.25.0.ebuild} | 44 ++++++++++---------- |
17 |
4 files changed, 65 insertions(+), 38 deletions(-) |
18 |
|
19 |
diff --git a/www-misc/zoneminder/ChangeLog b/www-misc/zoneminder/ChangeLog |
20 |
index bdedef9..cf71c0c 100644 |
21 |
--- a/www-misc/zoneminder/ChangeLog |
22 |
+++ b/www-misc/zoneminder/ChangeLog |
23 |
@@ -2,6 +2,13 @@ |
24 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
25 |
# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/Attic/ChangeLog,v 1.41 2011/04/04 12:11:35 scarabeus Exp $ |
26 |
|
27 |
+*zoneminder-1.25.0 (01 Sep 2011) |
28 |
+ |
29 |
+ 01 Sep 2011; Andreas K. Huettel <dilfridge@g.o> |
30 |
+ +files/1.25.0/Makefile.am.patch, -zoneminder-1.24.2.ebuild, |
31 |
+ +zoneminder-1.25.0.ebuild: |
32 |
+ Started working on version bump |
33 |
+ |
34 |
--------------------------------------------------------------------------- |
35 |
Copied from CVS attic to dilfridge overlay |
36 |
--------------------------------------------------------------------------- |
37 |
|
38 |
diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest |
39 |
index 9255575..615747c 100644 |
40 |
--- a/www-misc/zoneminder/Manifest |
41 |
+++ b/www-misc/zoneminder/Manifest |
42 |
@@ -7,27 +7,28 @@ AUX 1.24.2/zm_build_fix.patch 407 RMD160 ac45177bb3f06dd0fd9cd1f938b90ba2297d07d |
43 |
AUX 1.24.2/zm_create.sql.in.patch 16846 RMD160 c1b3b4ad6c5e70f4497f60a840a358a886125849 SHA1 7299c116be6f4a9cd97e55eb75c87d686a43d41c SHA256 edd4476e34c2b3b0e533809bce36827d8c84482cf25a9fca167453174866016f |
44 |
AUX 1.24.2/zm_jpeg.patch 2661 RMD160 e4d95b98a46a0b77874862a4afaa937e4c2814ef SHA1 58852307e7ed7df47660d2795199e91fa13319c7 SHA256 e8ac509821d9b0629c8cccb31ce25908b2b0bb7831aa7d710440b0551ad5ef3a |
45 |
AUX 1.24.2/zm_remote_camera_http.patch 1566 RMD160 644a681789d0ecf424156cde4b4ea8f6c5065197 SHA1 74dbe274d129997826b9a775c672c28286b60e3f SHA256 f554f2bcc7977e5ac151bd87aa2b8a0b7a9eeb9099839afe0d8b2b60a37ce04e |
46 |
+AUX 1.25.0/Makefile.am.patch 1424 RMD160 7a9708fa416f7e37bfbf8c6934d382541c066c37 SHA1 cc452ac6f332d7932c8ee456347d537fa625b7b6 SHA256 53f476ddd7300f5bfced08a7665c433c9be3f0286723ade8af3283d9b9b06a71 |
47 |
AUX 10_zoneminder.conf 462 RMD160 d032813c63f4676e06658da3668c50f88886efab SHA1 9c834372d5bab84fe3e368be94bd951c2122ed7a SHA256 96306fd39bcffeaf15db4309b8f5f08e54a2409029f92d4a84b6f3e42f05434f |
48 |
AUX conf.d 138 RMD160 e7c71690bac83c1bee63c6b602b15910d3a8967c SHA1 719a2cb400a0a107accb28be3bd17f6269d41f76 SHA256 65e935cb63bf3d072b9317842944d808550ef3f933d834bb95aaacf3253bd85c |
49 |
AUX init.d 398 RMD160 d124ef1c1e6f5b0a9e4535d96620e46de71457c4 SHA1 5afc09eb838d9ebb28e9e91ffa0f482830862396 SHA256 b5dd459ddd0a331f625b5fa0b9441b9236f676ad2e6f6ea2da896ed4056cb0c6 |
50 |
-DIST ZoneMinder-1.24.2.tar.gz 965521 RMD160 3ec5ca1a6d418feeeecd6dc3c4a78a79f5ead373 SHA1 ea854c941b83374a352d7d794a4462e279fea487 SHA256 fd8475138ccee8870534f1210a3d1e3e1990e963dd73146a6d310dc71c463dca |
51 |
-EBUILD zoneminder-1.24.2.ebuild 4084 RMD160 ca439d5f50282c1da78147a6668bbd136dfa6528 SHA1 ef75e0b0abb4a280cab57b93088f3c2d28447df2 SHA256 136436c29def540e5abd519440dc43b57cf012458fbc073c2001928b0e6c0df5 |
52 |
-MISC ChangeLog 7615 RMD160 1076c8a97c96eb16b38a65e61b419f8c85a83c20 SHA1 590c0fe09b124e6e714035de0890f21600f87ad5 SHA256 a209c01ca9c52c69728a11f9d6439a74aeb72c6e63e343fd996e9a2aab0db76a |
53 |
+DIST ZoneMinder-1.25.0.tar.gz 1119091 RMD160 32a4f503770103e55bfe592864c1cab82e7395a6 SHA1 a93a976a5cd82f1e197f4d7bd626d3f0387c4231 SHA256 ec63ef47d8f4cb8af21a3bc84ff1de6968805146682dd7f10982bde975d9bb5d |
54 |
+EBUILD zoneminder-1.25.0.ebuild 3916 RMD160 41445ccf66dd51bcf9065bf0a729dea6fe84e970 SHA1 4a116c4af0559e7b9aae9178725d49cb798dff0b SHA256 9b435a1fd7a867314ee6ad8c7400796ea09d573ce3875b49c681c92dfa406b7c |
55 |
+MISC ChangeLog 7832 RMD160 6ee9be50b5925df5ad39347aa7e4c477808096fc SHA1 20aa4fb2abf94e250e608ce32f42bf8a4eb5a063 SHA256 0c42075e7a943aaa795ec73e0f978e53e84cb26cc39c80f4fa097d16e9898345 |
56 |
MISC metadata.xml 262 RMD160 24e1a7cfcbca1e2f41e8c062c448d9150f6320b8 SHA1 951224aa9eb92e898209936836a18e844ae1f169 SHA256 7e8dde52c550f9cfc6d74b78c19f6900a8cc241f2bf136610a4fc3b0aa95f3f5 |
57 |
-----BEGIN PGP SIGNATURE----- |
58 |
Version: GnuPG v2.0.17 (GNU/Linux) |
59 |
|
60 |
-iQIcBAEBCgAGBQJOX+ZEAAoJENwGBM22xffeM70P/jniU2ri1KBlOfGep4diUnMO |
61 |
-iu2BJXBOS2bc82fxl2AHtb4AXXndM7EGS8WYXebUjU8aKUHgnCyFr8BoLqzw4M3j |
62 |
-bSxvLM/crFPMiLVROQltXUIXGXAUZHSVByPA4HjReN2Sehji+OC/9wC4xAJf41/f |
63 |
-c8z5GK+CBheyQbXMIIkh7g4NqUvu8vTPPCCFDSP3lLo5M1Uuao57CG3AZE9y2UQs |
64 |
-asPzj0gaV9hPgROTZCYOUBRMeKLPr2H2XuLtrhrL0DiU0x5HfKlmfqP8nZh2Dvnh |
65 |
-ddVHto3O63h69ORbNcY7hXt9kdumpBoyJfbaNvfSIs9XXQRcbHCotErbmNEV3SQG |
66 |
-PHDJzYXYrnJpmJiTDJ0XKbBVPPgkpOYpLuqv0VhW7/8l+gpO1mnO0C0Gv7JIulEF |
67 |
-1v8Sgo7ZTFd5oYV+nUq+jVyNjcGIzxq0ykqb+/bqDdyl3RNS/kYC7Wcxb4fe6PJa |
68 |
-b2lK1ji8phg9I4nm6wDuU+Tqdi4B6TOtm4al3iw9xkA1YmuQmFhErvop0g9MSL2E |
69 |
-xBwGCQ3uEGcUxH0mA4WJGpH9Cb975C8oIZwwHiVeB1fbMHCnQ/UfEhIORu7Y+wAG |
70 |
-vx4x0xW+IqtmJuZr8gcd6NCKTCRCQZh328X0Rzs/LO8itLHlP8IcRM2oiPJmnuT7 |
71 |
-sogEhkuXIiTuMYczRWE7 |
72 |
-=C6EF |
73 |
+iQIcBAEBCgAGBQJOX/H6AAoJENwGBM22xffehgsP/RXqKFmBqdtHV7hBVgofOTpS |
74 |
+0xw24nn9SL0sI48HFpmt4kp/F2yalrZoHG7/N5cyUV0ho+6lGdn4ZrRM/WyRKrQM |
75 |
+B5jnGIPIHLftrRgM2XAh8lyavTkpq5x18MUtbBVx0oSs2g+Z+teBf95BMa6mQHCC |
76 |
+8eQX1ZR6GOItkLrL/z0IWXmp83wWepOjQlg0HxK8NRkw9PMFYChp/SklJatdcNZh |
77 |
+KliwKr0RUUAh6NnKhpwimdTyFg7maB3EN9BYiGh6LrklfW5BR4zFdWVviQ/oktQb |
78 |
+vxZiHNhGl5uUKFtMGy13M5/RR6d6G7LnFXbgANlZV1xHW6H1TkU3XiLGgDnVIdli |
79 |
+veDnV8OlwAr8J/nqQupLaXu0xuskqXvuUuX4de20njGO6+jQpoewAEpl68pRoIVq |
80 |
+y54E5UUrMEiUJNW2y0J4D6hqiByFz7W6x+NBCBeTTBV9YESu2T5Yu6g8eLBVGkNB |
81 |
+9Oe+kib0AZxzxO/LR6lpxyUINJSBW/Soz8zUjf/XAT6+ZipwhJgIuIlKqxmv9F8y |
82 |
+Ne7Vp0hz9a4TW3YoL0Azg/Se/LCOjkkURUfikXPaBD6WfEFIbJEKKiS+Dah5MS3Q |
83 |
+1gP4LK6ruZe0WQ1bvOtsDFzVQjVvz3SW9KZ0LgHSxKAYNLgvZUvTEx/Ca4IgQCnX |
84 |
+3wE/Rd5hLLNbHIhPKLE6 |
85 |
+=jxHs |
86 |
-----END PGP SIGNATURE----- |
87 |
|
88 |
diff --git a/www-misc/zoneminder/files/1.25.0/Makefile.am.patch b/www-misc/zoneminder/files/1.25.0/Makefile.am.patch |
89 |
new file mode 100644 |
90 |
index 0000000..bba895e |
91 |
--- /dev/null |
92 |
+++ b/www-misc/zoneminder/files/1.25.0/Makefile.am.patch |
93 |
@@ -0,0 +1,19 @@ |
94 |
+diff -ruN ZoneMinder-1.25.0-0-vanilla/Makefile.am ZoneMinder-1.25.0/Makefile.am |
95 |
+--- ZoneMinder-1.25.0-0-vanilla/Makefile.am 2011-05-20 11:39:37.000000000 +0200 |
96 |
++++ ZoneMinder-1.25.0/Makefile.am 2011-09-01 22:52:32.000000000 +0200 |
97 |
+@@ -19,11 +19,12 @@ |
98 |
+ zmconfgen.pl.in |
99 |
+ |
100 |
+ # Yes, you are correct. This is a HACK! |
101 |
++# we need to set the permissions in the ebuild anyway since the installer may be running userpriv |
102 |
+ install-data-hook: |
103 |
+ ( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) ) |
104 |
+- ( if ! test -e $(ZM_RUNDIR); then mkdir -p $(ZM_RUNDIR); fi; if test "$(ZM_RUNDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(ZM_RUNDIR); chmod u+w $(ZM_RUNDIR); fi ) |
105 |
+- ( if ! test -e $(ZM_TMPDIR); then mkdir -m 700 -p $(ZM_TMPDIR); fi; if test "$(ZM_TMPDIR)" != "/tmp"; then chown $(webuser):$(webgroup) $(ZM_TMPDIR); chmod u+w $(ZM_TMPDIR); fi ) |
106 |
+- ( if ! test -e $(ZM_LOGDIR); then mkdir -p $(ZM_LOGDIR); fi; if test "$(ZM_LOGDIR)" != "/var/log"; then chown $(webuser):$(webgroup) $(ZM_LOGDIR); chmod u+w $(ZM_LOGDIR); fi ) |
107 |
++ ( if ! test -e $(DESTDIR)$(ZM_RUNDIR); then mkdir -p $(DESTDIR)$(ZM_RUNDIR); fi; ) |
108 |
++ ( if ! test -e $(DESTDIR)$(ZM_TMPDIR); then mkdir -m 700 -p $(DESTDIR)$(ZM_TMPDIR); ) |
109 |
++ ( if ! test -e $(DESTDIR)$(ZM_LOGDIR); then mkdir -p $(DESTDIR)$(ZM_LOGDIR); fi; ) |
110 |
+ |
111 |
+ uninstall-hook: |
112 |
+ @-( cd $(DESTDIR)$(webdir); rm -rf events graphics images sounds temp ) |
113 |
|
114 |
diff --git a/www-misc/zoneminder/zoneminder-1.24.2.ebuild b/www-misc/zoneminder/zoneminder-1.25.0.ebuild |
115 |
similarity index 82% |
116 |
rename from www-misc/zoneminder/zoneminder-1.24.2.ebuild |
117 |
rename to www-misc/zoneminder/zoneminder-1.25.0.ebuild |
118 |
index 3ffc802..b95fa0b 100644 |
119 |
--- a/www-misc/zoneminder/zoneminder-1.24.2.ebuild |
120 |
+++ b/www-misc/zoneminder/zoneminder-1.25.0.ebuild |
121 |
@@ -2,21 +2,19 @@ |
122 |
# Distributed under the terms of the GNU General Public License v2 |
123 |
# $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 $ |
124 |
|
125 |
-inherit eutils autotools depend.php depend.apache multilib |
126 |
+EAPI=4 |
127 |
|
128 |
-MY_PV=${PV/_/-} |
129 |
-MY_PN="ZoneMinder" |
130 |
+inherit eutils base autotools depend.php depend.apache multilib |
131 |
|
132 |
-PATCH_PV="1.24.2" |
133 |
+MY_PN="ZoneMinder" |
134 |
|
135 |
DESCRIPTION="ZoneMinder allows you to capture, analyse, record and monitor any cameras attached to your system." |
136 |
HOMEPAGE="http://www.zoneminder.com/" |
137 |
-SRC_URI="http://www.zoneminder.com/downloads/${MY_PN}-${MY_PV}.tar.gz" |
138 |
+SRC_URI="http://www.zoneminder.com/downloads/${MY_PN}-${PV}.tar.gz" |
139 |
|
140 |
LICENSE="GPL-2" |
141 |
-KEYWORDS="~amd64 ~ppc ~x86" |
142 |
+KEYWORDS="" |
143 |
IUSE="debug ffmpeg" |
144 |
-#IUSE="debug ffmpeg mmap" |
145 |
SLOT="0" |
146 |
|
147 |
DEPEND="app-admin/sudo |
148 |
@@ -49,27 +47,27 @@ RDEPEND="dev-perl/DBD-mysql |
149 |
need_apache |
150 |
need_php_httpd |
151 |
|
152 |
-S=${WORKDIR}/${MY_PN}-${MY_PV} |
153 |
+S=${WORKDIR}/${MY_PN}-${PV} |
154 |
+ |
155 |
+PATCHES=( |
156 |
+ "${FILESDIR}"/1.25.0/Makefile.am.patch |
157 |
+ "${FILESDIR}"/1.24.2/zm_create.sql.in.patch |
158 |
+ "${FILESDIR}"/1.24.2/zm_remote_camera_http.patch |
159 |
+ "${FILESDIR}"/1.24.2/db_upgrade_script_location.patch |
160 |
+ "${FILESDIR}"/1.24.2/zm_jpeg.patch |
161 |
+ "${FILESDIR}"/1.24.2/zm_build_fix.patch |
162 |
+) |
163 |
|
164 |
pkg_setup() { |
165 |
require_php_with_use mysql sockets apache2 |
166 |
} |
167 |
|
168 |
-src_unpack() { |
169 |
- unpack ${A} |
170 |
- cd "${S}" |
171 |
- |
172 |
- epatch "${FILESDIR}"/${PATCH_PV}/Makefile.am.patch |
173 |
- epatch "${FILESDIR}"/${PATCH_PV}/zm_create.sql.in.patch |
174 |
- epatch "${FILESDIR}"/${PATCH_PV}/zm_remote_camera_http.patch |
175 |
- epatch "${FILESDIR}"/${PATCH_PV}/db_upgrade_script_location.patch |
176 |
- epatch "${FILESDIR}"/${PATCH_PV}/zm_jpeg.patch |
177 |
- epatch "${FILESDIR}"/${PATCH_PV}/zm_build_fix.patch |
178 |
- |
179 |
+src_prepare() { |
180 |
+ base_src_prepare |
181 |
eautoreconf |
182 |
} |
183 |
|
184 |
-src_compile() { |
185 |
+src_configure() { |
186 |
local myconf |
187 |
|
188 |
# To enable mmap support we need a dependancy of Sys::Mmap |
189 |
@@ -94,14 +92,16 @@ src_compile() { |
190 |
--with-webuser=apache \ |
191 |
--with-webgroup=apache \ |
192 |
${myconf} |
193 |
+} |
194 |
|
195 |
+src_compile() { |
196 |
einfo "${PN} does not parallel build... using forcing make -j1..." |
197 |
- emake -j1 || die "emake failed" |
198 |
+ emake -j1 |
199 |
} |
200 |
|
201 |
src_install() { |
202 |
keepdir /var/run/zm |
203 |
- emake -j1 DESTDIR="${D}" install || die "emake install failed" |
204 |
+ emake -j1 DESTDIR="${D}" install |
205 |
|
206 |
fperms 0640 /etc/zm.conf |